serverless-offline 13.3.1 → 13.3.3

package/src/events/websocket/WebSocketClients.js

@@ -1,20 +1,20 @@
-import { WebSocket } from 'ws'
-import { isBoom } from '@hapi/boom'
-import { log } from '@serverless/utils/log.js'
+import { WebSocket } from "ws"
+import { isBoom } from "@hapi/boom"
+import { log } from "@serverless/utils/log.js"
 import {
   WebSocketAuthorizerEvent,
   WebSocketConnectEvent,
   WebSocketDisconnectEvent,
   WebSocketEvent,
-} from './lambda-events/index.js'
-import authCanExecuteResource from '../authCanExecuteResource.js'
-import authFunctionNameExtractor from '../authFunctionNameExtractor.js'
-import authValidateContext from '../authValidateContext.js'
+} from "./lambda-events/index.js"
+import authCanExecuteResource from "../authCanExecuteResource.js"
+import authFunctionNameExtractor from "../authFunctionNameExtractor.js"
+import authValidateContext from "../authValidateContext.js"
 import {
   DEFAULT_WEBSOCKETS_API_ROUTE_SELECTION_EXPRESSION,
   DEFAULT_WEBSOCKETS_ROUTE,
-} from '../../config/index.js'
-import { jsonPath } from '../../utils/index.js'
+} from "../../config/index.js"
+import { jsonPath } from "../../utils/index.js"
 
 const { parse, stringify } = JSON
 
@@ -72,7 +72,7 @@ export default class WebSocketClients {
     const timeoutId = setTimeout(() => {
       log.debug(`timeout:hard:${connectionId}`)
 
-      client.close(1001, 'Going away')
+      client.close(1001, "Going away")
     }, this.#options.webSocketHardTimeout * 1000)
 
     this.#hardTimeouts.set(client, timeoutId)
@@ -91,7 +91,7 @@ export default class WebSocketClients {
 
     const timeoutId = setTimeout(() => {
       log.debug(`timeout:idle:${connectionId}:trigger`)
-      client.close(1001, 'Going away')
+      client.close(1001, "Going away")
     }, this.#options.webSocketIdleTimeout * 1000)
     this.#idleTimeouts.set(client, timeoutId)
   }
@@ -102,7 +102,7 @@ export default class WebSocketClients {
   }
 
   async verifyClient(connectionId, request) {
-    const routeName = '$connect'
+    const routeName = "$connect"
     const route = this.#webSocketRoutes.get(routeName)
     if (!route) {
       return {
@@ -137,7 +137,7 @@ export default class WebSocketClients {
 
       try {
         const result = await authorizerFunction.runHandler()
-        if (result === 'Unauthorized') {
+        if (result === "Unauthorized") {
           return {
             statusCode: 401,
             verified: false,
@@ -189,14 +189,14 @@ export default class WebSocketClients {
 
         this.#webSocketAuthorizersCache.set(connectionId, {
           authorizer: {
-            integrationLatency: '42',
+            integrationLatency: "42",
             principalId: policy.principalId,
             ...policy.context,
           },
           identity: {
             apiKey: policy.usageIdentifierKey,
             sourceIp: authorizeEvent.requestContext.sourceIp,
-            userAgent: authorizeEvent.headers['user-agent'] || '',
+            userAgent: authorizeEvent.headers["user-agent"] || "",
           },
         })
       } catch (err) {
@@ -251,8 +251,8 @@ export default class WebSocketClients {
   async #processEvent(websocketClient, connectionId, routeKey, event) {
     let route = this.#webSocketRoutes.get(routeKey)
 
-    if (!route && routeKey !== '$disconnect') {
-      route = this.#webSocketRoutes.get('$default')
+    if (!route && routeKey !== "$disconnect") {
+      route = this.#webSocketRoutes.get("$default")
     }
 
     if (!route) {
@@ -264,8 +264,8 @@ export default class WebSocketClients {
         websocketClient.send(
           stringify({
             connectionId,
-            message: 'Internal server error',
-            requestId: '1234567890',
+            message: "Internal server error",
+            requestId: "1234567890",
           }),
         )
       }
@@ -289,8 +289,8 @@ export default class WebSocketClients {
       const { body } = await lambdaFunction.runHandler()
       if (
         body &&
-        routeKey !== '$disconnect' &&
-        route.definition.routeResponseSelectionExpression === '$default'
+        routeKey !== "$disconnect" &&
+        route.definition.routeResponseSelectionExpression === "$default"
       ) {
         // https://docs.aws.amazon.com/apigateway/latest/developerguide/apigateway-websocket-api-selection-expressions.html#apigateway-websocket-api-route-response-selection-expressions
         // TODO: Once API gateway supports RouteResponses, this will need to change to support that functionality
@@ -314,11 +314,11 @@ export default class WebSocketClients {
     }
 
     const routeSelectionExpression =
-      this.#websocketsApiRouteSelectionExpression.replace('request.body', '')
+      this.#websocketsApiRouteSelectionExpression.replace("request.body", "")
 
     const route = jsonPath(json, routeSelectionExpression)
 
-    if (typeof route !== 'string') {
+    if (typeof route !== "string") {
       return DEFAULT_WEBSOCKETS_ROUTE
     }
 
@@ -328,7 +328,7 @@ export default class WebSocketClients {
   addClient(webSocketClient, connectionId) {
     this.#addWebSocketClient(webSocketClient, connectionId)
 
-    webSocketClient.on('close', () => {
+    webSocketClient.on("close", () => {
       log.debug(`disconnect:${connectionId}`)
 
       this.#removeWebSocketClient(webSocketClient)
@@ -349,12 +349,12 @@ export default class WebSocketClients {
       this.#processEvent(
         webSocketClient,
         connectionId,
-        '$disconnect',
+        "$disconnect",
         disconnectEvent,
       ).finally(() => this.#webSocketAuthorizersCache.delete(connectionId))
     })
 
-    webSocketClient.on('message', (data, isBinary) => {
+    webSocketClient.on("message", (data, isBinary) => {
       const message = isBinary ? data : String(data)
 
       log.debug(`message:${message}`)
@@ -377,9 +377,9 @@ export default class WebSocketClients {
 
   #extractAuthFunctionName(endpoint) {
     if (
-      typeof endpoint.authorizer === 'object' &&
+      typeof endpoint.authorizer === "object" &&
       endpoint.authorizer.type &&
-      endpoint.authorizer.type.toUpperCase() === 'TOKEN'
+      endpoint.authorizer.type.toUpperCase() === "TOKEN"
     ) {
       log.debug(`Websockets does not support the TOKEN authorization type`)
 
@@ -396,7 +396,7 @@ export default class WebSocketClients {
       return
     }
 
-    if (endpoint.route === '$connect') {
+    if (endpoint.route === "$connect") {
       const authFunctionName = this.#extractAuthFunctionName(endpoint)
 
       if (!authFunctionName) {

package/src/events/websocket/WebSocketEventDefinition.js

@@ -5,7 +5,7 @@ export default class WebSocketEventDefinition {
     let rest
     let route
 
-    if (typeof rawWebSocketEventDefinition === 'string') {
+    if (typeof rawWebSocketEventDefinition === "string") {
       route = rawWebSocketEventDefinition
     } else {
       ;({ route, ...rest } = rawWebSocketEventDefinition)

package/src/events/websocket/WebSocketServer.js

@@ -1,6 +1,6 @@
-import { log } from '@serverless/utils/log.js'
-import { WebSocketServer as WsWebSocketServer } from 'ws'
-import { createUniqueId } from '../../utils/index.js'
+import crypto from "node:crypto"
+import { log } from "@serverless/utils/log.js"
+import { WebSocketServer as WsWebSocketServer } from "ws"
 
 export default class WebSocketServer {
   #connectionIds = new Map()
@@ -21,8 +21,8 @@ export default class WebSocketServer {
     const server = new WsWebSocketServer({
       server: this.#sharedServer,
       verifyClient: async ({ req }, cb) => {
-        const connectionId = createUniqueId()
-        const key = req.headers['sec-websocket-key']
+        const connectionId = crypto.randomUUID()
+        const key = req.headers["sec-websocket-key"]
 
         log.debug(`verifyClient:${key} ${connectionId}`)
 
@@ -45,11 +45,11 @@ export default class WebSocketServer {
       },
     })
 
-    server.on('connection', (webSocketClient, request) => {
-      log.notice('received connection')
+    server.on("connection", (webSocketClient, request) => {
+      log.notice("received connection")
 
       const { headers } = request
-      const key = headers['sec-websocket-key']
+      const key = headers["sec-websocket-key"]
 
       const connectionId = this.#connectionIds.get(key)
 
@@ -64,7 +64,7 @@ export default class WebSocketServer {
 
     log.notice(
       `Offline [websocket] listening on ${
-        httpsProtocol ? 'wss' : 'ws'
+        httpsProtocol ? "wss" : "ws"
       }://${host}:${websocketPort}`,
     )
   }

package/src/events/websocket/http-routes/_catchAll/catchAllRoute.js

@@ -1,4 +1,4 @@
-import { log } from '@serverless/utils/log.js'
+import { log } from "@serverless/utils/log.js"
 
 export default function catchAllRoute() {
   return {
@@ -10,7 +10,7 @@ export default function catchAllRoute() {
       return h.response(null).code(426)
     },
 
-    method: 'GET',
-    path: '/{path*}',
+    method: "GET",
+    path: "/{path*}",
   }
 }

package/src/events/websocket/http-routes/_catchAll/index.js

@@ -1 +1 @@
-export { default } from './catchAllRoute.js'
+export { default } from "./catchAllRoute.js"

package/src/events/websocket/http-routes/connections/ConnectionsController.js

@@ -14,7 +14,7 @@ export default class ConnectionsController {
     const clientExisted = this.#webSocketClients.send(
       connectionId,
       // payload is a Buffer
-      payload.toString('utf8'),
+      payload.toString("utf8"),
     )
 
     return clientExisted

package/src/events/websocket/http-routes/connections/connectionsRoutes.js

@@ -1,5 +1,5 @@
-import { log } from '@serverless/utils/log.js'
-import ConnectionsController from './ConnectionsController.js'
+import { log } from "@serverless/utils/log.js"
+import ConnectionsController from "./ConnectionsController.js"
 
 export default function connectionsRoutes(webSocketClients) {
   const connectionsController = new ConnectionsController(webSocketClients)
@@ -29,13 +29,13 @@ export default function connectionsRoutes(webSocketClients) {
         return null
       },
 
-      method: 'POST',
+      method: "POST",
       options: {
         payload: {
           parse: false,
         },
       },
-      path: '/@connections/{connectionId}',
+      path: "/@connections/{connectionId}",
     },
 
     {
@@ -58,13 +58,13 @@ export default function connectionsRoutes(webSocketClients) {
         return h.response(null).code(204)
       },
 
-      method: 'DELETE',
+      method: "DELETE",
       options: {
         payload: {
           parse: false,
         },
       },
-      path: '/@connections/{connectionId}',
+      path: "/@connections/{connectionId}",
     },
   ]
 }

package/src/events/websocket/http-routes/connections/index.js

@@ -1 +1 @@
-export { default } from './connectionsRoutes.js'
+export { default } from "./connectionsRoutes.js"

package/src/events/websocket/http-routes/index.js

@@ -1,2 +1,2 @@
-export { default as catchAllRoute } from './_catchAll/index.js'
-export { default as connectionsRoutes } from './connections/index.js'
+export { default as catchAllRoute } from "./_catchAll/index.js"
+export { default as connectionsRoutes } from "./connections/index.js"

package/src/events/websocket/index.js

@@ -1 +1 @@
-export { default } from './WebSocket.js'
+export { default } from "./WebSocket.js"

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

@@ -1,10 +1,10 @@
-import WebSocketRequestContext from './WebSocketRequestContext.js'
+import WebSocketRequestContext from "./WebSocketRequestContext.js"
 import {
   parseHeaders,
   parseMultiValueHeaders,
   parseMultiValueQueryStringParameters,
   parseQueryStringParameters,
-} from '../../../utils/index.js'
+} from "../../../utils/index.js"
 
 export default class WebSocketAuthorizerEvent {
   #connectionId = null
@@ -39,8 +39,8 @@ export default class WebSocketAuthorizerEvent {
     const queryStringParameters = parseQueryStringParameters(this.#url)
 
     const requestContext = new WebSocketRequestContext(
-      'CONNECT',
-      '$connect',
+      "CONNECT",
+      "$connect",
       this.#connectionId,
     ).create()
 
@@ -55,7 +55,7 @@ export default class WebSocketAuthorizerEvent {
       }),
       ...(queryStringParameters && { queryStringParameters }),
       requestContext,
-      type: 'REQUEST',
+      type: "REQUEST",
     }
   }
 }

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

@@ -1,10 +1,11 @@
-import WebSocketRequestContext from './WebSocketRequestContext.js'
+// import crypto from 'node:crypto'
+import WebSocketRequestContext from "./WebSocketRequestContext.js"
 import {
   parseHeaders,
   parseMultiValueHeaders,
   parseMultiValueQueryStringParameters,
   parseQueryStringParameters,
-} from '../../../utils/index.js'
+} from "../../../utils/index.js"
 
 export default class WebSocketConnectEvent {
   #connectionId = null
@@ -32,9 +33,9 @@ export default class WebSocketConnectEvent {
     // const headers = {
     //   Host: 'localhost',
     //   'Sec-WebSocket-Extensions': 'permessage-deflate; client_max_window_bits',
-    //   'Sec-WebSocket-Key': createUniqueId(),
+    //   'Sec-WebSocket-Key': crypto.randomUUID(),
     //   'Sec-WebSocket-Version': '13',
-    //   'X-Amzn-Trace-Id': `Root=${createUniqueId()}`,
+    //   'X-Amzn-Trace-Id': `Root=${crypto.randomUUID()}`,
     //   'X-Forwarded-For': '127.0.0.1',
     //   'X-Forwarded-Port': String(this.#websocketPort),
     //   'X-Forwarded-Proto': ${httpsProtocol ? 'https' : 'http'},
@@ -47,8 +48,8 @@ export default class WebSocketConnectEvent {
     const queryStringParameters = parseQueryStringParameters(this.#url)
 
     const requestContext = new WebSocketRequestContext(
-      'CONNECT',
-      '$connect',
+      "CONNECT",
+      "$connect",
       this.#connectionId,
     ).create()
 

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

@@ -1,5 +1,5 @@
-import WebSocketRequestContext from './WebSocketRequestContext.js'
-import { parseHeaders, parseMultiValueHeaders } from '../../../utils/index.js'
+import WebSocketRequestContext from "./WebSocketRequestContext.js"
+import { parseHeaders, parseMultiValueHeaders } from "../../../utils/index.js"
 
 export default class WebSocketDisconnectEvent {
   #connectionId = null
@@ -10,14 +10,14 @@ export default class WebSocketDisconnectEvent {
 
   create() {
     // TODO FIXME not sure where the headers come from
-    const rawHeaders = ['Host', 'localhost', 'x-api-key', '', 'x-restapi', '']
+    const rawHeaders = ["Host", "localhost", "x-api-key", "", "x-restapi", ""]
 
     const headers = parseHeaders(rawHeaders)
     const multiValueHeaders = parseMultiValueHeaders(rawHeaders)
 
     const requestContext = new WebSocketRequestContext(
-      'DISCONNECT',
-      '$disconnect',
+      "DISCONNECT",
+      "$disconnect",
       this.#connectionId,
     ).create()
 

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

@@ -1,4 +1,4 @@
-import WebSocketRequestContext from './WebSocketRequestContext.js'
+import WebSocketRequestContext from "./WebSocketRequestContext.js"
 
 export default class WebSocketEvent {
   #connectionId = null
@@ -15,7 +15,7 @@ export default class WebSocketEvent {
 
   create() {
     const requestContext = new WebSocketRequestContext(
-      'MESSAGE',
+      "MESSAGE",
       this.#route,
       this.#connectionId,
     ).create()

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

@@ -1,4 +1,5 @@
-import { createUniqueId, formatToClfTime } from '../../../utils/index.js'
+import crypto from "node:crypto"
+import { formatToClfTime } from "../../../utils/index.js"
 
 const { now } = Date
 
@@ -18,13 +19,13 @@ export default class WebSocketRequestContext {
     this.#eventType = eventType
     this.#route = route
 
-    if (eventType === 'CONNECT') {
+    if (eventType === "CONNECT") {
       connectedAt.set(connectionId, now())
     }
 
     this.#connectedAt = connectedAt.get(connectionId)
 
-    if (eventType === 'DISCONNECT') {
+    if (eventType === "DISCONNECT") {
       connectedAt.delete(connectionId)
     }
   }
@@ -33,12 +34,12 @@ export default class WebSocketRequestContext {
     const timeEpoch = now()
 
     const requestContext = {
-      apiId: 'private',
+      apiId: "private",
       connectedAt: this.#connectedAt,
       connectionId: this.#connectionId,
-      domainName: 'localhost',
+      domainName: "localhost",
       eventType: this.#eventType,
-      extendedRequestId: createUniqueId(),
+      extendedRequestId: crypto.randomUUID(),
       identity: {
         accessKey: null,
         accountId: null,
@@ -48,18 +49,18 @@ export default class WebSocketRequestContext {
         cognitoIdentityId: null,
         cognitoIdentityPoolId: null,
         principalOrgId: null,
-        sourceIp: '127.0.0.1',
+        sourceIp: "127.0.0.1",
         user: null,
         userAgent: null,
         userArn: null,
       },
-      messageDirection: 'IN',
-      messageId: createUniqueId(),
-      requestId: createUniqueId(),
+      messageDirection: "IN",
+      messageId: crypto.randomUUID(),
+      requestId: crypto.randomUUID(),
       requestTime: formatToClfTime(timeEpoch),
       requestTimeEpoch: timeEpoch,
       routeKey: this.#route,
-      stage: 'local',
+      stage: "local",
     }
 
     return requestContext

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

@@ -1,4 +1,4 @@
-export { default as WebSocketConnectEvent } from './WebSocketConnectEvent.js'
-export { default as WebSocketDisconnectEvent } from './WebSocketDisconnectEvent.js'
-export { default as WebSocketEvent } from './WebSocketEvent.js'
-export { default as WebSocketAuthorizerEvent } from './WebSocketAuthorizerEvent.js'
+export { default as WebSocketConnectEvent } from "./WebSocketConnectEvent.js"
+export { default as WebSocketDisconnectEvent } from "./WebSocketDisconnectEvent.js"
+export { default as WebSocketEvent } from "./WebSocketEvent.js"
+export { default as WebSocketAuthorizerEvent } from "./WebSocketAuthorizerEvent.js"

package/src/index.js

@@ -1 +1 @@
-export { default } from './ServerlessOffline.js'
+export { default } from "./ServerlessOffline.js"

package/src/lambda/HttpServer.js

@@ -1,7 +1,7 @@
-import { exit } from 'node:process'
-import { Server } from '@hapi/hapi'
-import { log } from '@serverless/utils/log.js'
-import { invocationsRoute, invokeAsyncRoute } from './routes/index.js'
+import { exit } from "node:process"
+import { Server } from "@hapi/hapi"
+import { log } from "@serverless/utils/log.js"
+import { invocationsRoute, invokeAsyncRoute } from "./routes/index.js"
 
 export default class HttpServer {
   #lambda = null
@@ -45,13 +45,13 @@ export default class HttpServer {
 
     log.notice(
       `Offline [http for lambda] listening on ${
-        httpsProtocol ? 'https' : 'http'
+        httpsProtocol ? "https" : "http"
       }://${host}:${lambdaPort}`,
     )
 
     // Print all the invocation routes to debug
     const basePath = `${
-      httpsProtocol ? 'https' : 'http'
+      httpsProtocol ? "https" : "http"
     }://${host}:${lambdaPort}`
     const funcNamePairs = this.#lambda.listFunctionNamePairs()
 
@@ -64,7 +64,7 @@ export default class HttpServer {
             (functionName) =>
               `           * ${funcNamePairs[functionName]}: ${functionName}`,
           ),
-      ].join('\n'),
+      ].join("\n"),
     )
     log.debug(
       [
@@ -76,11 +76,11 @@ export default class HttpServer {
               `           * ${
                 invRoute.method
               } ${basePath}${invRoute.path.replace(
-                '{functionName}',
+                "{functionName}",
                 functionName,
               )}`,
           ),
-      ].join('\n'),
+      ].join("\n"),
     )
 
     log.debug(
@@ -93,11 +93,11 @@ export default class HttpServer {
               `           * ${
                 invAsyncRoute.method
               } ${basePath}${invAsyncRoute.path.replace(
-                '{functionName}',
+                "{functionName}",
                 functionName,
               )}`,
           ),
-      ].join('\n'),
+      ].join("\n"),
     )
   }
 

package/src/lambda/Lambda.js

@@ -1,5 +1,5 @@
-import HttpServer from './HttpServer.js'
-import LambdaFunctionPool from './LambdaFunctionPool.js'
+import HttpServer from "./HttpServer.js"
+import LambdaFunctionPool from "./LambdaFunctionPool.js"
 
 const { assign } = Object
 

package/src/lambda/LambdaContext.js

@@ -10,7 +10,7 @@ export default class LambdaContext {
       callbackWaitsForEmptyEventLoop: true,
       clientContext: undefined,
       functionName,
-      functionVersion: '$LATEST',
+      functionVersion: "$LATEST",
       identity: undefined,
       invokedFunctionArn: `offline_invokedFunctionArn_for_${functionName}`,
       logGroupName: `offline_logGroupName_for_${functionName}`,