serverless-offline 13.3.2 → 13.3.3

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

@@ -1,14 +1,14 @@
-import { Buffer } from 'node:buffer'
-import { env } from 'node:process'
-import { log } from '@serverless/utils/log.js'
-import { decodeJwt } from 'jose'
+import { Buffer } from "node:buffer"
+import { env } from "node:process"
+import { log } from "@serverless/utils/log.js"
+import { decodeJwt } from "jose"
 import {
   formatToClfTime,
   lowerCaseKeys,
   nullIfEmpty,
   parseHeaders,
   parseQueryStringParametersForPayloadV2,
-} from '../../../utils/index.js'
+} from "../../../utils/index.js"
 
 const { isArray } = Array
 const { parse } = JSON
@@ -49,7 +49,7 @@ export default class LambdaProxyIntegrationEventV2 {
         authAuthorizer = parse(env.AUTHORIZER)
       } catch {
         log.error(
-          'Could not parse process.env.AUTHORIZER, make sure it is correct JSON',
+          "Could not parse process.env.AUTHORIZER, make sure it is correct JSON",
         )
       }
     }
@@ -61,36 +61,36 @@ export default class LambdaProxyIntegrationEventV2 {
     // NOTE FIXME request.raw.req.rawHeaders can only be null for testing (hapi shot inject())
     const headers = lowerCaseKeys(parseHeaders(rawHeaders || [])) || {}
 
-    if (headers['sls-offline-authorizer-override']) {
+    if (headers["sls-offline-authorizer-override"]) {
       try {
-        authAuthorizer = parse(headers['sls-offline-authorizer-override'])
+        authAuthorizer = parse(headers["sls-offline-authorizer-override"])
       } catch {
         log.error(
-          'Could not parse header sls-offline-authorizer-override, make sure it is correct JSON',
+          "Could not parse header sls-offline-authorizer-override, make sure it is correct JSON",
         )
       }
     }
 
     if (body) {
-      if (typeof body !== 'string') {
+      if (typeof body !== "string") {
         // this.#request.payload is NOT the same as the rawPayload
         body = this.#request.rawPayload
       }
 
       if (
-        !headers['content-length'] &&
-        (typeof body === 'string' ||
+        !headers["content-length"] &&
+        (typeof body === "string" ||
           body instanceof Buffer ||
           body instanceof ArrayBuffer)
       ) {
-        headers['content-length'] = String(Buffer.byteLength(body))
+        headers["content-length"] = String(Buffer.byteLength(body))
       }
 
       // Set a default Content-Type if not provided.
-      if (!headers['content-type']) {
-        headers['content-type'] = 'application/json'
+      if (!headers["content-type"]) {
+        headers["content-type"] = "application/json"
       }
-    } else if (body === undefined || body === '') {
+    } else if (body === undefined || body === "") {
       body = null
     }
 
@@ -99,8 +99,8 @@ export default class LambdaProxyIntegrationEventV2 {
 
     let token = headers.Authorization || headers.authorization
 
-    if (token && token.split(' ')[0] === 'Bearer') {
-      ;[, token] = token.split(' ')
+    if (token && token.split(" ")[0] === "Bearer") {
+      ;[, token] = token.split(" ")
     }
 
     let claims
@@ -110,7 +110,7 @@ export default class LambdaProxyIntegrationEventV2 {
       try {
         claims = decodeJwt(token)
         if (claims.scope) {
-          scopes = claims.scope.split(' ')
+          scopes = claims.scope.split(" ")
           // In AWS HTTP Api the scope property is removed from the decoded JWT
           // I'm leaving this property because I'm not sure how all of the authorizers
           // for AWS REST Api handle JWT.
@@ -153,8 +153,8 @@ export default class LambdaProxyIntegrationEventV2 {
       rawPath: this.#request.url.pathname,
       rawQueryString: this.#request.url.searchParams.toString(),
       requestContext: {
-        accountId: 'offlineContext_accountId',
-        apiId: 'offlineContext_apiId',
+        accountId: "offlineContext_accountId",
+        apiId: "offlineContext_apiId",
         authorizer:
           authAuthorizer ||
           assign(lambdaAuthContext, {
@@ -163,17 +163,17 @@ export default class LambdaProxyIntegrationEventV2 {
               scopes,
             },
           }),
-        domainName: 'offlineContext_domainName',
-        domainPrefix: 'offlineContext_domainPrefix',
+        domainName: "offlineContext_domainName",
+        domainPrefix: "offlineContext_domainPrefix",
         http: {
           method: httpMethod,
           path: this.#request.url.pathname,
-          protocol: 'HTTP/1.1',
+          protocol: "HTTP/1.1",
           sourceIp: remoteAddress,
-          userAgent: _headers['user-agent'] || '',
+          userAgent: _headers["user-agent"] || "",
         },
         operationName: this.#additionalRequestContext.operationName,
-        requestId: 'offlineContext_resourceId',
+        requestId: "offlineContext_resourceId",
         routeKey: this.#routeKey,
         stage: this.#stage,
         time: requestTime,
@@ -181,7 +181,7 @@ export default class LambdaProxyIntegrationEventV2 {
       },
       routeKey: this.#routeKey,
       stageVariables: null,
-      version: '2.0',
+      version: "2.0",
     }
   }
 }

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

@@ -1,20 +1,16 @@
-import { Buffer } from 'node:buffer'
-import { env } from 'node:process'
-import jsEscapeString from 'js-string-escape'
-import { decodeJwt } from 'jose'
-import {
-  createUniqueId,
-  isPlainObject,
-  jsonPath,
-  parseHeaders,
-} from '../../../utils/index.js'
+import { Buffer } from "node:buffer"
+import crypto from "node:crypto"
+import { env } from "node:process"
+import jsEscapeString from "js-string-escape"
+import { decodeJwt } from "jose"
+import { isPlainObject, jsonPath, parseHeaders } from "../../../utils/index.js"
 
 const { parse, stringify } = JSON
 const { assign, entries, fromEntries } = Object
 
 function escapeJavaScript(x) {
-  if (typeof x === 'string') {
-    return jsEscapeString(x).replaceAll('\\n', '\n') // See #26,
+  if (typeof x === "string") {
+    return jsEscapeString(x).replaceAll("\\n", "\n") // See #26,
   }
 
   if (isPlainObject(x)) {
@@ -25,7 +21,7 @@ function escapeJavaScript(x) {
     return stringify(result) // Is this really how APIG does it?
   }
 
-  if (typeof x.toString === 'function') {
+  if (typeof x.toString === "function") {
     return escapeJavaScript(x.toString())
   }
 
@@ -70,8 +66,8 @@ export default class VelocityContext {
 
     let token = headers && (headers.Authorization || headers.authorization)
 
-    if (token && token.split(' ')[0] === 'Bearer') {
-      ;[, token] = token.split(' ')
+    if (token && token.split(" ")[0] === "Bearer") {
+      ;[, token] = token.split(" ")
     }
 
     if (!authorizer) authorizer = {}
@@ -79,7 +75,7 @@ export default class VelocityContext {
     authorizer.principalId =
       authPrincipalId ||
       env.PRINCIPAL_ID ||
-      'offlineContext_authorizer_principalId' // See #24
+      "offlineContext_authorizer_principalId" // See #24
 
     if (token) {
       try {
@@ -91,24 +87,24 @@ export default class VelocityContext {
 
     return {
       context: {
-        apiId: 'offlineContext_apiId',
+        apiId: "offlineContext_apiId",
         authorizer,
         httpMethod: this.#request.method.toUpperCase(),
         identity: {
-          accountId: 'offlineContext_accountId',
-          apiKey: 'offlineContext_apiKey',
-          apiKeyId: 'offlineContext_apiKeyId',
-          caller: 'offlineContext_caller',
+          accountId: "offlineContext_accountId",
+          apiKey: "offlineContext_apiKey",
+          apiKeyId: "offlineContext_apiKeyId",
+          caller: "offlineContext_caller",
           cognitoAuthenticationProvider:
-            'offlineContext_cognitoAuthenticationProvider',
-          cognitoAuthenticationType: 'offlineContext_cognitoAuthenticationType',
+            "offlineContext_cognitoAuthenticationProvider",
+          cognitoAuthenticationType: "offlineContext_cognitoAuthenticationType",
           sourceIp: this.#request.info.remoteAddress,
-          user: 'offlineContext_user',
-          userAgent: this.#request.headers['user-agent'] || '',
-          userArn: 'offlineContext_userArn',
+          user: "offlineContext_user",
+          userAgent: this.#request.headers["user-agent"] || "",
+          userArn: "offlineContext_userArn",
         },
-        requestId: createUniqueId(),
-        resourceId: 'offlineContext_resourceId',
+        requestId: crypto.randomUUID(),
+        resourceId: "offlineContext_resourceId",
         resourcePath: this.#path,
         stage: this.#stage,
       },
@@ -116,7 +112,7 @@ export default class VelocityContext {
         body: this.#payload, // Not a string yet, todo
         json: (x) => stringify(path(x)),
         params: (x) =>
-          typeof x === 'string'
+          typeof x === "string"
             ? this.#request.params[x] || this.#request.query[x] || headers[x]
             : {
                 header: headers,
@@ -131,12 +127,12 @@ export default class VelocityContext {
       },
       util: {
         base64Decode: (x) =>
-          Buffer.from(x.toString(), 'base64').toString('binary'),
+          Buffer.from(x.toString(), "base64").toString("binary"),
         base64Encode: (x) =>
-          Buffer.from(x.toString(), 'binary').toString('base64'),
+          Buffer.from(x.toString(), "binary").toString("base64"),
         escapeJavaScript,
         parseJson: parse,
-        urlDecode: (x) => decodeURIComponent(x.replaceAll('+', ' ')),
+        urlDecode: (x) => decodeURIComponent(x.replaceAll("+", " ")),
         urlEncode: encodeURI,
       },
     }

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

@@ -1,4 +1,4 @@
-export { default as LambdaIntegrationEvent } from './LambdaIntegrationEvent.js'
-export { default as LambdaProxyIntegrationEvent } from './LambdaProxyIntegrationEvent.js'
-export { default as renderVelocityTemplateObject } from './renderVelocityTemplateObject.js'
-export { default as VelocityContext } from './VelocityContext.js'
+export { default as LambdaIntegrationEvent } from "./LambdaIntegrationEvent.js"
+export { default as LambdaProxyIntegrationEvent } from "./LambdaProxyIntegrationEvent.js"
+export { default as renderVelocityTemplateObject } from "./renderVelocityTemplateObject.js"
+export { default as VelocityContext } from "./VelocityContext.js"

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

@@ -1,7 +1,7 @@
-import { log } from '@serverless/utils/log.js'
-import velocityjs from 'velocityjs'
-import runInPollutedScope from '../javaHelpers.js'
-import { isPlainObject } from '../../../utils/index.js'
+import { log } from "@serverless/utils/log.js"
+import velocityjs from "velocityjs"
+import runInPollutedScope from "../javaHelpers.js"
+import { isPlainObject } from "../../../utils/index.js"
 
 const { parse } = JSON
 const { entries } = Object
@@ -29,23 +29,23 @@ function renderVelocityString(velocityString, context) {
     }).render(context, null, true),
   )
 
-  log.debug('Velocity rendered:', renderResult || 'undefined')
+  log.debug("Velocity rendered:", renderResult || "undefined")
 
   // Haaaa Velocity... this language sure loves strings a lot
   switch (renderResult) {
-    case 'undefined': {
+    case "undefined": {
       return undefined
     } // But we don't, we want JavaScript types
 
-    case 'null': {
+    case "null": {
       return null
     }
 
-    case 'true': {
+    case "true": {
       return true
     }
 
-    case 'false': {
+    case "false": {
       return false
     }
 
@@ -65,16 +65,16 @@ export default function renderVelocityTemplateObject(templateObject, context) {
   let toProcess = templateObject
 
   // In some projects, the template object is a string, let us see if it's JSON
-  if (typeof toProcess === 'string') {
+  if (typeof toProcess === "string") {
     toProcess = tryToParseJSON(toProcess)
   }
 
   // Let's check again
   if (isPlainObject(toProcess)) {
     entries(toProcess).forEach(([key, value]) => {
-      log.debug('Processing key:', key, '- value:', value)
+      log.debug("Processing key:", key, "- value:", value)
 
-      if (typeof value === 'string') {
+      if (typeof value === "string") {
         result[key] = renderVelocityString(value, context)
         // Go deeper
       } else if (isPlainObject(value)) {
@@ -85,7 +85,7 @@ export default function renderVelocityTemplateObject(templateObject, context) {
       }
     })
     // Still a string? Maybe it's some complex Velocity stuff
-  } else if (typeof toProcess === 'string') {
+  } else if (typeof toProcess === "string") {
     // If the plugin threw here then you should consider reviewing your template or posting an issue.
     const alternativeResult = tryToParseJSON(
       renderVelocityString(toProcess, context),

package/src/events/http/parseResources.js

@@ -1,9 +1,9 @@
 const { entries, fromEntries, keys } = Object
 
-const APIGATEWAY_INTEGRATION_TYPE_HTTP_PROXY = 'HTTP_PROXY'
-const APIGATEWAY_ROOT_ID = 'RootResourceId'
-const APIGATEWAY_TYPE_METHOD = 'AWS::ApiGateway::Method'
-const APIGATEWAY_TYPE_RESOURCE = 'AWS::ApiGateway::Resource'
+const APIGATEWAY_INTEGRATION_TYPE_HTTP_PROXY = "HTTP_PROXY"
+const APIGATEWAY_ROOT_ID = "RootResourceId"
+const APIGATEWAY_TYPE_METHOD = "AWS::ApiGateway::Method"
+const APIGATEWAY_TYPE_RESOURCE = "AWS::ApiGateway::Resource"
 
 function getApiGatewayTemplateObjects(resources) {
   const Resources = resources && resources.Resources
@@ -68,7 +68,7 @@ function getParentId(resourceObj) {
   const { Ref } = parentIdObj
   if (Ref) return Ref
 
-  const getAtt = parentIdObj['Fn::GetAtt'] || []
+  const getAtt = parentIdObj["Fn::GetAtt"] || []
 
   return getAtt[1]
 }
@@ -91,7 +91,7 @@ function getFullPath(pathObjects, resourceId) {
     return undefined
   }
 
-  return `/${arrPath.join('/')}`
+  return `/${arrPath.join("/")}`
 }
 
 /* Example of an HTTP Proxy Method Object

package/src/events/http/payloadSchemaValidator.js

@@ -1,4 +1,4 @@
-import { validate } from 'jsonschema'
+import { validate } from "jsonschema"
 
 export default function payloadSchemaValidator(model, body) {
   const result = validate(body, model)
@@ -7,7 +7,7 @@ export default function payloadSchemaValidator(model, body) {
     throw new Error(
       `Request body validation failed: ${result.errors
         .map((e) => e.message)
-        .join(', ')}`,
+        .join(", ")}`,
     )
   }
 }

package/src/events/schedule/Schedule.js

@@ -1,10 +1,10 @@
 // based on:
 // https://github.com/ajmath/serverless-offline-scheduler
 
-import { log } from '@serverless/utils/log.js'
-import nodeSchedule from 'node-schedule'
-import ScheduleEvent from './ScheduleEvent.js'
-import ScheduleEventDefinition from './ScheduleEventDefinition.js'
+import { log } from "@serverless/utils/log.js"
+import nodeSchedule from "node-schedule"
+import ScheduleEvent from "./ScheduleEvent.js"
+import ScheduleEventDefinition from "./ScheduleEventDefinition.js"
 
 const CRON_LENGTH_WITH_YEAR = 6
 
@@ -31,7 +31,7 @@ export default class Schedule {
 
     // Convert string rate to array to support Serverless v2.57.0 and lower.
     let rates = rate
-    if (typeof rate === 'string') {
+    if (typeof rate === "string") {
       rates = [rate]
     }
 
@@ -40,7 +40,7 @@ export default class Schedule {
 
       log.notice(
         `Scheduling [${functionKey}] cron: [${cron}]${
-          input ? ` input: ${stringify(input)}` : ''
+          input ? ` input: ${stringify(input)}` : ""
         }`,
       )
 
@@ -66,29 +66,29 @@ export default class Schedule {
   }
 
   #convertCronSyntax(cronString) {
-    if (cronString.split(' ').length < CRON_LENGTH_WITH_YEAR) {
+    if (cronString.split(" ").length < CRON_LENGTH_WITH_YEAR) {
       return cronString
     }
 
-    return cronString.replace(/\s\S+$/, '')
+    return cronString.replace(/\s\S+$/, "")
   }
 
   #convertRateToCron(rate) {
-    const [number, unit] = rate.split(' ')
+    const [number, unit] = rate.split(" ")
 
     switch (unit) {
-      case 'minute':
-      case 'minutes': {
+      case "minute":
+      case "minutes": {
         return `*/${number} * * * *`
       }
 
-      case 'hour':
-      case 'hours': {
+      case "hour":
+      case "hours": {
         return `0 */${number} * * *`
       }
 
-      case 'day':
-      case 'days': {
+      case "day":
+      case "days": {
         return `0 0 */${number} * *`
       }
 
@@ -102,19 +102,19 @@ export default class Schedule {
 
   #convertExpressionToCron(scheduleEvent) {
     const params = scheduleEvent
-      .replace('rate(', '')
-      .replace('cron(', '')
-      .replace(')', '')
+      .replace("rate(", "")
+      .replace("cron(", "")
+      .replace(")", "")
 
-    if (scheduleEvent.startsWith('cron(')) {
+    if (scheduleEvent.startsWith("cron(")) {
       return this.#convertCronSyntax(params)
     }
 
-    if (scheduleEvent.startsWith('rate(')) {
+    if (scheduleEvent.startsWith("rate(")) {
       return this.#convertRateToCron(params)
     }
 
-    log.error('scheduler: invalid, schedule syntax')
+    log.error("scheduler: invalid, schedule syntax")
 
     return undefined
   }

package/src/events/schedule/ScheduleEvent.js

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

package/src/events/schedule/ScheduleEventDefinition.js

@@ -6,7 +6,7 @@ export default class ScheduleEventDefinition {
     let rate
     let rest
 
-    if (typeof rawHttpEventDefinition === 'string') {
+    if (typeof rawHttpEventDefinition === "string") {
       rate = rawHttpEventDefinition
     } else {
       ;({ enabled, rate, ...rest } = rawHttpEventDefinition)

package/src/events/schedule/index.js

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

package/src/events/websocket/HttpServer.js

@@ -1,9 +1,9 @@
-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'
-import { catchAllRoute, connectionsRoutes } from './http-routes/index.js'
+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"
+import { catchAllRoute, connectionsRoutes } from "./http-routes/index.js"
 
 export default class HttpServer {
   #options = null
@@ -19,8 +19,8 @@ export default class HttpServer {
 
   async #loadCerts(httpsProtocol) {
     const [cert, key] = await Promise.all([
-      readFile(resolve(httpsProtocol, 'cert.pem'), 'utf8'),
-      readFile(resolve(httpsProtocol, 'key.pem'), 'utf8'),
+      readFile(resolve(httpsProtocol, "cert.pem"), "utf8"),
+      readFile(resolve(httpsProtocol, "key.pem"), "utf8"),
     ])
 
     return {
@@ -69,7 +69,7 @@ export default class HttpServer {
 
     log.notice(
       `Offline [http for websocket] listening on ${
-        httpsProtocol ? 'https' : 'http'
+        httpsProtocol ? "https" : "http"
       }://${host}:${websocketPort}`,
     )
   }

package/src/events/websocket/WebSocket.js

@@ -1,7 +1,7 @@
-import HttpServer from './HttpServer.js'
-import WebSocketEventDefinition from './WebSocketEventDefinition.js'
-import WebSocketClients from './WebSocketClients.js'
-import WebSocketServer from './WebSocketServer.js'
+import HttpServer from "./HttpServer.js"
+import WebSocketEventDefinition from "./WebSocketEventDefinition.js"
+import WebSocketClients from "./WebSocketClients.js"
+import WebSocketServer from "./WebSocketServer.js"
 
 export default class WebSocket {
   #httpServer = null