serverless-offline 9.1.4 → 9.1.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "9.1.4",
+  "version": "9.1.7",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "./src/index.js",

package/src/ServerlessOffline.js

@@ -23,38 +23,38 @@ export default class ServerlessOffline {
 
   #webSocket = null
 
-  constructor(serverless, cliOptions) {
-    this.#cliOptions = cliOptions
-    this.#serverless = serverless
-
-    this.commands = {
-      offline: {
-        // add start nested options
-        commands: {
-          functionsUpdated: {
-            lifecycleEvents: ['cleanup'],
-            type: 'entrypoint',
-          },
-          start: {
-            lifecycleEvents: ['init', 'ready', 'end'],
-            options: commandOptions,
-            usage:
-              'Simulates API Gateway to call your lambda functions offline using backward compatible initialization.',
-          },
+  commands = {
+    offline: {
+      // add start nested options
+      commands: {
+        functionsUpdated: {
+          lifecycleEvents: ['cleanup'],
+          type: 'entrypoint',
+        },
+        start: {
+          lifecycleEvents: ['init', 'ready', 'end'],
+          options: commandOptions,
+          usage:
+            'Simulates API Gateway to call your lambda functions offline using backward compatible initialization.',
         },
-        lifecycleEvents: ['start'],
-        options: commandOptions,
-        usage: 'Simulates API Gateway to call your lambda functions offline.',
       },
-    }
+      lifecycleEvents: ['start'],
+      options: commandOptions,
+      usage: 'Simulates API Gateway to call your lambda functions offline.',
+    },
+  }
 
-    this.hooks = {
-      'offline:functionsUpdated:cleanup': this.#cleanupFunctions.bind(this),
-      'offline:start': this.#startWithExplicitEnd.bind(this),
-      'offline:start:end': this.end.bind(this),
-      'offline:start:init': this.start.bind(this),
-      'offline:start:ready': this.#ready.bind(this),
-    }
+  hooks = {
+    'offline:functionsUpdated:cleanup': this.#cleanupFunctions.bind(this),
+    'offline:start': this.#startWithExplicitEnd.bind(this),
+    'offline:start:end': this.end.bind(this),
+    'offline:start:init': this.start.bind(this),
+    'offline:start:ready': this.#ready.bind(this),
+  }
+
+  constructor(serverless, cliOptions) {
+    this.#cliOptions = cliOptions
+    this.#serverless = serverless
   }
 
   // Entry point for the plugin (sls offline) when running 'sls offline start'

package/src/config/defaultOptions.js

@@ -17,7 +17,7 @@ export default {
   hideStackTraces: false,
   host: 'localhost',
   httpPort: 3000,
-  httpsProtocol: '',
+  httpsProtocol: null,
   lambdaPort: 3002,
   layersDir: null,
   localEnvironment: false,

package/src/events/http/HttpServer.js

@@ -49,6 +49,18 @@ export default class HttpServer {
     this.#serverless = serverless
   }
 
+  async #loadCerts(httpsProtocol) {
+    const [cert, key] = await Promise.all([
+      readFile(resolve(httpsProtocol, 'cert.pem'), 'utf-8'),
+      readFile(resolve(httpsProtocol, 'key.pem'), 'utf-8'),
+    ])
+
+    return {
+      cert,
+      key,
+    }
+  }
+
   async createServer() {
     const {
       enforceSecureCookies,
@@ -77,14 +89,10 @@ export default class HttpServer {
             isSameSite: false,
             isSecure: false,
           },
-    }
-
-    // HTTPS support
-    if (typeof httpsProtocol === 'string' && httpsProtocol.length > 0) {
-      serverOptions.tls = {
-        cert: readFile(resolve(httpsProtocol, 'cert.pem'), 'ascii'),
-        key: readFile(resolve(httpsProtocol, 'key.pem'), 'ascii'),
-      }
+      // https support
+      ...(httpsProtocol != null && {
+        tls: await this.#loadCerts(httpsProtocol),
+      }),
     }
 
     // Hapijs server creation
@@ -103,7 +111,9 @@ export default class HttpServer {
           ? request.response.output
           : request.response
 
-        const explicitlySetHeaders = { ...response.headers }
+        const explicitlySetHeaders = {
+          ...response.headers,
+        }
 
         if (
           this.#serverless.service.provider.httpApi &&
@@ -1010,7 +1020,9 @@ export default class HttpServer {
       auth: authStrategyName,
       cors,
       state,
-      timeout: { socket: false },
+      timeout: {
+        socket: false,
+      },
     }
 
     // skip HEAD routes as hapi will fail with 'Method name not allowed: HEAD ...'

package/src/events/http/lambda-events/LambdaProxyIntegrationEvent.js

@@ -146,7 +146,10 @@ export default class LambdaProxyIntegrationEvent {
     const httpMethod = method.toUpperCase()
     const requestTime = formatToClfTime(received)
     const requestTimeEpoch = received
-    const resource = this.#routeKey || route.path.replace(`/${this.#stage}`, '')
+    // NOTE replace * added by generateHapiPath util so api gateway event is accurate
+    const resource =
+      this.#routeKey ||
+      route.path.replace(`/${this.#stage}`, '').replace('*', '+')
 
     return {
       body,

package/src/events/schedule/ScheduleEvent.js

@@ -1,18 +1,26 @@
 import { createUniqueId } from '../../utils/index.js'
 
 export default class ScheduleEvent {
-  constructor(region) {
-    // format of aws displaying the time, e.g.: 2020-02-09T14:13:57Z
-    const time = new Date().toISOString().replace(/\.(.*)(?=Z)/g, '')
+  account = createUniqueId()
+
+  detail = {};
+
+  ['detail-type'] = 'Scheduled Event'
+
+  id = createUniqueId()
+
+  region = null
 
-    this.account = createUniqueId()
-    this.detail = {}
-    this['detail-type'] = 'Scheduled Event'
-    this.id = createUniqueId()
+  resources = []
+
+  source = 'aws.events'
+
+  // format of aws displaying the time, e.g.: 2020-02-09T14:13:57Z
+  time = new Date().toISOString().replace(/\.(.*)(?=Z)/g, '')
+
+  version = '0'
+
+  constructor(region) {
     this.region = region
-    this.resources = []
-    this.source = 'aws.events'
-    this.time = time
-    this.version = '0'
   }
 }

package/src/events/websocket/HttpServer.js

@@ -50,8 +50,8 @@ export default class HttpServer {
     }
 
     log.notice(
-      `Offline [http for websocket] listening on http${
-        httpsProtocol ? 's' : ''
+      `Offline [http for websocket] listening on ${
+        httpsProtocol ? 'https' : 'http'
       }://${host}:${websocketPort}`,
     )
   }

package/src/events/websocket/WebSocketServer.js

@@ -58,8 +58,8 @@ export default class WebSocketServer {
     const { host, httpsProtocol, websocketPort } = this.#options
 
     log.notice(
-      `Offline [websocket] listening on ws${
-        httpsProtocol ? 's' : ''
+      `Offline [websocket] listening on ${
+        httpsProtocol ? 'wss' : 'ws'
       }://${host}:${websocketPort}`,
     )
   }

package/src/events/websocket/lambda-events/WebSocketConnectEvent.js

@@ -37,7 +37,7 @@ export default class WebSocketConnectEvent {
     //   'X-Amzn-Trace-Id': `Root=${createUniqueId()}`,
     //   'X-Forwarded-For': '127.0.0.1',
     //   'X-Forwarded-Port': String(this.#websocketPort),
-    //   'X-Forwarded-Proto': `http${this.#httpsProtocol ? 's' : ''}`,
+    //   'X-Forwarded-Proto': ${httpsProtocol ? 'https' : 'http'},
     // }
 
     const headers = parseHeaders(this.#rawHeaders)

package/src/lambda/HttpServer.js

@@ -44,13 +44,15 @@ export default class HttpServer {
     }
 
     log.notice(
-      `Offline [http for lambda] listening on http${
-        httpsProtocol ? 's' : ''
+      `Offline [http for lambda] listening on ${
+        httpsProtocol ? 'https' : 'http'
       }://${host}:${lambdaPort}`,
     )
 
     // Print all the invocation routes to debug
-    const basePath = `http${httpsProtocol ? 's' : ''}://${host}:${lambdaPort}`
+    const basePath = `${
+      httpsProtocol ? 'https' : 'http'
+    }://${host}:${lambdaPort}`
     const funcNamePairs = this.#lambda.listFunctionNamePairs()
 
     log.notice(

package/src/lambda/handler-runner/child-process-runner/ChildProcessRunner.js

@@ -41,19 +41,6 @@ export default class ChildProcessRunner {
       },
     )
 
-    let message
-
-    try {
-      message = new Promise((res, rej) => {
-        childProcess.on('message', (data) => {
-          if (data.error) rej(data.error)
-          else res(data)
-        })
-      })
-    } finally {
-      childProcess.kill()
-    }
-
     childProcess.send({
       context,
       event,
@@ -63,12 +50,21 @@ export default class ChildProcessRunner {
     let result
 
     try {
-      result = await message
+      result = await new Promise((res, rej) => {
+        childProcess.on('message', (data) => {
+          if (data.error) {
+            rej(data.error)
+            return
+          }
+          res(data)
+        })
+      })
     } catch (err) {
       // TODO
       log.error(err)
-
       throw err
+    } finally {
+      childProcess.kill()
     }
 
     return result