fix: TTL needs to be in seconds not milliseconds (#114)

Author: reconbot

.github/workflows/test.yml

@@ -12,7 +12,6 @@ jobs:
         with:
           node-version: 14
       - run: npm ci
-      - run: npm run build # needs to happen until I figure out a way to hotload it
       - name: Test
         run: npm run test
   lint:

lib/pubsub/getFilteredSubs-test.ts

@@ -13,7 +13,7 @@ describe('collapseKeys', () => {
       'b.d': 'hi',
       'b.e.f': false,
     })
-    assert.deepEqual(collapseKeys({ a: [1,2,3, { b: 4, c: [], d: null, e: undefined }] }), {
+    assert.deepEqual(collapseKeys({ a: [1, 2, 3, { b: 4, c: [], d: null, e: undefined }] }), {
       'a.0': 1,
       'a.1': 2,
       'a.2': 3,
@@ -42,13 +42,13 @@ describe('getFilteredSubs', () => {
     const subscription = {
       id: '1',
       topic,
-      filter: { },
+      filter: {},
       subscriptionId: '1',
-      subscription: { } as any,
+      subscription: {} as any,
       connectionId: 'abcd',
       connectionInitPayload: {},
       requestContext: {} as any,
-      ttl: Date.now() + 100000,
+      ttl: Math.floor(Date.now() / 1000) + 100000,
       createdAt: Date.now(),
     }
 
@@ -64,11 +64,11 @@ describe('getFilteredSubs', () => {
       topic,
       filter: { language: 'en' },
       subscriptionId: '2',
-      subscription: { } as any,
+      subscription: {} as any,
       connectionId: 'abcd',
       connectionInitPayload: {},
       requestContext: {} as any,
-      ttl: Date.now() + 100000,
+      ttl: Math.floor(Date.now() / 1000) + 100000,
       createdAt: Date.now(),
     }
 
@@ -86,11 +86,11 @@ describe('getFilteredSubs', () => {
       topic,
       filter: { language: 'en ' },
       subscriptionId: '12345',
-      subscription: { } as any,
+      subscription: {} as any,
       connectionId: '1234',
       connectionInitPayload: {},
       requestContext: {} as any,
-      ttl: Date.now() + 100000,
+      ttl: Math.floor(Date.now() / 1000) + 100000,
       createdAt: Date.now(),
     }
 

lib/utils/defaultTTL.ts

@@ -1 +1,4 @@
-export const defaultTTL = (): number => Date.now() + 3 * 1000 * 60 * 60
+/**
+ * Three hours from now
+ */
+export const defaultTTL = (hours = 3): number => Math.floor(Date.now() / 1000) + (hours * 60 * 60)

mocks/arc-basic-events/app.arc

@@ -3,6 +3,9 @@ basic-events
 
 @ws
 
+@static
+folder dist
+
 @tables
 Connection
   id *String
@@ -15,7 +18,6 @@ Subscription
 
 Subscription
   connectionId *String
-#  topicAndKey **String
   name ConnectionIndex
 
 Subscription

mocks/arc-basic-events/lib/graphql.js

@@ -1,7 +1,8 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
+require('esbuild-register')
 const { makeExecutableSchema } = require('@graphql-tools/schema')
 const { tables: arcTables } = require('@architect/functions')
-const { makeServer, subscribe } = require('../../../dist')
+const { makeServer, subscribe } = require('../../../lib')
 const { ApiGatewayManagementApi } = require('aws-sdk')
 const { GraphQLError } = require('graphql')