serverless-offline 10.1.0 → 10.2.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "10.1.0",
+  "version": "10.2.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -86,7 +86,7 @@
     "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.2.2",
     "@serverless/utils": "^6.7.0",
-    "aws-sdk": "^2.1215.0",
+    "aws-sdk": "^2.1222.0",
     "boxen": "^7.0.0",
     "chalk": "^5.0.1",
     "execa": "^6.1.0",
@@ -104,7 +104,7 @@
     "p-memoize": "^7.1.0",
     "p-retry": "^5.1.1",
     "velocityjs": "^2.0.6",
-    "ws": "^8.8.1"
+    "ws": "^8.9.0"
   },
   "devDependencies": {
     "@istanbuljs/esm-loader-hook": "^0.2.0",

package/src/ServerlessOffline.js

@@ -206,9 +206,11 @@ export default class ServerlessOffline {
       this.#lambda,
     )
 
+    await this.#webSocket.createServer()
+
     this.#webSocket.create(events)
 
-    return this.#webSocket.start()
+    await this.#webSocket.start()
   }
 
   #mergeOptions() {
@@ -335,7 +337,7 @@ export default class ServerlessOffline {
             }
           }
 
-          if (http && http.private) {
+          if (http?.private) {
             hasPrivateHttpEvent = true
           }
 

package/src/events/websocket/HttpServer.js

@@ -1,3 +1,5 @@
+import { readFile } from 'node:fs/promises'
+import { resolve } from 'node:path'
 import { exit } from 'node:process'
 import { Server } from '@hapi/hapi'
 import { log } from '@serverless/utils/log.js'
@@ -13,8 +15,22 @@ export default class HttpServer {
   constructor(options, webSocketClients) {
     this.#options = options
     this.#webSocketClients = webSocketClients
+  }
+
+  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,
+    }
+  }
 
-    const { host, websocketPort } = options
+  async createServer() {
+    const { host, websocketPort, httpsProtocol } = this.#options
 
     const serverOptions = {
       host,
@@ -24,6 +40,10 @@ export default class HttpServer {
         // e.g. : /my-path is the same as /my-path/
         stripTrailingSlash: true,
       },
+      // https support
+      ...(httpsProtocol != null && {
+        tls: await this.#loadCerts(httpsProtocol),
+      }),
     }
 
     this.#server = new Server(serverOptions)

package/src/events/websocket/WebSocket.js

@@ -6,19 +6,39 @@ import WebSocketServer from './WebSocketServer.js'
 export default class WebSocket {
   #httpServer = null
 
+  #lambda = null
+
+  #options = null
+
+  #serverless = null
+
   #webSocketServer = null
 
   constructor(serverless, options, lambda) {
-    const webSocketClients = new WebSocketClients(serverless, options, lambda)
+    this.#lambda = lambda
+    this.#options = options
+    this.#serverless = serverless
+  }
 
-    this.#httpServer = new HttpServer(options, webSocketClients)
+  async createServer() {
+    const webSocketClients = new WebSocketClients(
+      this.#serverless,
+      this.#options,
+      this.#lambda,
+    )
+
+    this.#httpServer = new HttpServer(this.#options, webSocketClients)
+
+    await this.#httpServer.createServer()
 
     // share server
     this.#webSocketServer = new WebSocketServer(
-      options,
+      this.#options,
       webSocketClients,
       this.#httpServer.server,
     )
+
+    await this.#webSocketServer.createServer()
   }
 
   start() {

package/src/events/websocket/WebSocketServer.js

@@ -7,14 +7,19 @@ export default class WebSocketServer {
 
   #options = null
 
+  #sharedServer = null
+
   #webSocketClients = null
 
   constructor(options, webSocketClients, sharedServer) {
     this.#options = options
+    this.#sharedServer = sharedServer
     this.#webSocketClients = webSocketClients
+  }
 
+  async createServer() {
     const server = new WsWebSocketServer({
-      server: sharedServer,
+      server: this.#sharedServer,
       verifyClient: async ({ req }, cb) => {
         const connectionId = createUniqueId()
         const key = req.headers['sec-websocket-key']