fix: load iot endpoint async on lambda init (for lambdas that might s…

…end messages).
tradle · Dec 16, 2017 · 9a2b5c5 · 9a2b5c5
1 parent 53a92d3
commit 9a2b5c5
Show file tree

Hide file tree

Showing 27 changed files with 201 additions and 38 deletions.
diff --git a/lib/bot/index.js b/lib/bot/index.js
diff --git a/lib/bot/lambda/onmessage.js b/lib/bot/lambda/onmessage.js
diff --git a/lib/bot/lambda/onmessagestream.js b/lib/bot/lambda/onmessagestream.js
diff --git a/lib/errors.js b/lib/errors.js
diff --git a/lib/lambda/http/inbox.js b/lib/lambda/http/inbox.js
diff --git a/lib/lambda/http/onmessage.js b/lib/lambda/http/onmessage.js
diff --git a/lib/lambda/mqtt/onconnect.js b/lib/lambda/mqtt/onconnect.js
diff --git a/lib/lambda/mqtt/onsubscribe.js b/lib/lambda/mqtt/onsubscribe.js
diff --git a/lib/push.js b/lib/push.js
diff --git a/lib/task-manager.js b/lib/task-manager.js
diff --git a/lib/test/utils.test.js b/lib/test/utils.test.js
diff --git a/lib/user.js b/lib/user.js
diff --git a/lib/utils.js b/lib/utils.js
diff --git a/serverless-uncompiled.yml b/serverless-uncompiled.yml
@@ -639,7 +639,7 @@ functions:
 
   inbox:
     handler: lib/lambda/http/inbox.handler
-    memorySize: 1024
+    memorySize: 2048
     events:
       - http:
           path: inbox
@@ -714,7 +714,7 @@ functions:
   # and passes off to bot engine
   onmessage:
     handler: lib/lambda/mqtt/onmessage.handler
-    memorySize: 1024
+    memorySize: 2048
     #   BOT_ONMESSAGE: ${{self:custom.bot_onmessage}}
     #   SERVERLESS_PREFIX: ${{self:custom.prefix}}
     #   SERVERLESS_STAGE: ${{self:custom.stage}}
@@ -921,7 +921,7 @@ functions:
     # make sure graphql route gets loaded
     handler: lib/samplebot/lambda/http/graphql.handler
     # handler: lib/lambda/http/default.handler
-    memorySize: 512
+    memorySize: 1024
     events:
       - http:
           path: graphql

diff --git a/src/bot/index.ts b/src/bot/index.ts
@@ -35,7 +35,7 @@ const { TYPE, SIG } = constants
 const promisePassThrough = data => Promise.resolve(data)
 
 const PROXY_TO_TRADLE = [
-  'aws', 'objects', 'db', 'dbUtils', 'lambdaUtils', 'seals',
+  'aws', 'objects', 'db', 'dbUtils', 'lambdaUtils', 'iot', 'seals',
   'identities', 'history', 'messages', 'friends',
   'resources', 'env', 'router', 'buckets', 'tables',
   'serviceMap', 'version', 'apiBaseUrl', 'tasks'

diff --git a/src/bot/lambda/onmessage.ts b/src/bot/lambda/onmessage.ts
@@ -9,6 +9,11 @@ export const createLambda = (opts) => {
 }
 
 export const outfitLambda = (lambda, opts) => {
+  lambda.tasks.add({
+    name: 'getiotendpoint',
+    promiser: lambda.bot.iot.getEndpoint
+  })
+
   lambda.use(onmessage(lambda, opts))
   return lambda
 }
diff --git a/src/bot/lambda/onmessagestream.ts b/src/bot/lambda/onmessagestream.ts
@@ -26,6 +26,11 @@ export const outfitLambda = (lambda, opts) => {
     }
   }
 
+  lambda.tasks.add({
+    name: 'getiotendpoint',
+    promiser: bot.iot.getEndpoint
+  })
+
   lambda.use(async (ctx, next) => {
     const { event } = ctx
     event.bot = bot

diff --git a/src/errors.ts b/src/errors.ts
@@ -77,7 +77,15 @@ const rethrow = (err, type) => {
   }
 }
 
-const HttpError = createError('HttpError')
+const _HttpError = createError('HttpError')
+class HttpError extends Error {
+  public status: number
+  constructor(code, message) {
+    super(message)
+    this.status = code || 500
+  }
+}
+
 const errors = {
   ClientUnreachable: createError('ClientUnreachable'),
   NotFound: createError('NotFound'),
@@ -96,11 +104,7 @@ const errors = {
   TimeTravel: createError('TimeTravel'),
   ExecutionTimeout: createError('ExecutionTimeout'),
   Exists: createError('Exists'),
-  HttpError: (code, message) => {
-    const err = new HttpError(message)
-    err.status = code
-    return err
-  },
+  HttpError,
   Timeout: createError('Timeout'),
   export: (err:Error): {
     type:string,

diff --git a/src/lambda/http/inbox.ts b/src/lambda/http/inbox.ts
@@ -26,6 +26,11 @@ const lambda = new Lambda({
   tradle
 })
 
+lambda.tasks.add({
+  name: 'getiotendpoint',
+  promiser: tradle.iot.getEndpoint
+})
+
 lambda.use(cors())
 lambda.use(bodyParser({ jsonLimit: '10mb' }))
 

diff --git a/src/lambda/http/onmessage.ts b/src/lambda/http/onmessage.ts
@@ -9,6 +9,11 @@ const lambda = new Lambda({
   tradle
 })
 
+lambda.tasks.add({
+  name: 'getiotendpoint',
+  promiser: tradle.iot.getEndpoint
+})
+
 const messageHandler = async (ctx) => {
   const { message } = ctx.event
   // the user sent us a message

diff --git a/src/lambda/mqtt/onconnect.ts b/src/lambda/mqtt/onconnect.ts
@@ -6,6 +6,11 @@ const lambda = new Lambda({
   tradle
 })
 
+lambda.tasks.add({
+  name: 'getiotendpoint',
+  promiser: tradle.iot.getEndpoint
+})
+
 lambda.use(async ({ event, context }) => {
   lambda.logger.debug('client connected', event)
   const { clientId } = event

diff --git a/src/lambda/mqtt/onsubscribe.ts b/src/lambda/mqtt/onsubscribe.ts
@@ -6,6 +6,11 @@ const lambda = new Lambda({
   tradle
 })
 
+lambda.tasks.add({
+  name: 'getiotendpoint',
+  promiser: lambda.tradle.iot.getEndpoint
+})
+
 lambda.use(async ({ event, context }) => {
   const { clientId, topics } = event
   await tradle.user.onSubscribed({ clientId, topics })