serverless-offline 9.1.3 → 9.1.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "9.1.3",
+  "version": "9.1.6",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "main": "./src/index.js",
@@ -194,7 +194,8 @@
     "@hapi/boom": "^10.0.0",
     "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.2.2",
-    "aws-sdk": "^2.1186.0",
+    "@serverless/utils": "^6.7.0",
+    "aws-sdk": "^2.1187.0",
     "boxen": "^7.0.0",
     "chalk": "^5.0.1",
     "execa": "^6.1.0",
@@ -204,7 +205,7 @@
     "jsonpath-plus": "^7.0.0",
     "jsonschema": "^1.4.1",
     "jsonwebtoken": "^8.5.1",
-    "jszip": "^3.10.0",
+    "jszip": "^3.10.1",
     "luxon": "^3.0.1",
     "node-fetch": "^3.2.10",
     "node-schedule": "^2.1.0",
@@ -230,7 +231,6 @@
     "standard-version": "^9.5.0"
   },
   "peerDependencies": {
-    "@serverless/utils": "^6.7.0",
     "serverless": "^3.2.0"
   }
 }

package/src/events/http/HttpServer.js

@@ -79,11 +79,16 @@ export default class HttpServer {
           },
     }
 
-    // HTTPS support
+    // https support
     if (typeof httpsProtocol === 'string' && httpsProtocol.length > 0) {
+      const [cert, key] = await Promise.all([
+        readFile(resolve(httpsProtocol, 'cert.pem'), 'utf-8'),
+        readFile(resolve(httpsProtocol, 'key.pem'), 'utf-8'),
+      ])
+
       serverOptions.tls = {
-        cert: readFile(resolve(httpsProtocol, 'cert.pem'), 'ascii'),
-        key: readFile(resolve(httpsProtocol, 'key.pem'), 'ascii'),
+        cert,
+        key,
       }
     }
 
@@ -103,7 +108,9 @@ export default class HttpServer {
           ? request.response.output
           : request.response
 
-        const explicitlySetHeaders = { ...response.headers }
+        const explicitlySetHeaders = {
+          ...response.headers,
+        }
 
         if (
           this.#serverless.service.provider.httpApi &&

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/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