serverless-offline 13.5.1 → 13.7.0

package/package.json

@@ -1,7 +1,6 @@
 {
-  "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "13.5.1",
+  "version": "13.7.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -77,10 +76,10 @@
     ]
   },
   "dependencies": {
-    "@aws-sdk/client-lambda": "^3.509.0",
+    "@aws-sdk/client-lambda": "^3.636.0",
     "@hapi/boom": "^10.0.1",
     "@hapi/h2o2": "^10.0.4",
-    "@hapi/hapi": "^21.3.3",
+    "@hapi/hapi": "^21.3.10",
     "array-unflat-js": "^0.1.3",
     "boxen": "^7.1.1",
     "chalk": "^5.3.0",
@@ -89,31 +88,31 @@
     "fs-extra": "^11.2.0",
     "is-wsl": "^3.1.0",
     "java-invoke-local": "0.0.6",
-    "jose": "^5.2.1",
+    "jose": "^5.7.0",
     "js-string-escape": "^1.0.1",
-    "jsonpath-plus": "^8.0.0",
+    "jsonpath-plus": "^9.0.0",
     "jsonschema": "^1.4.1",
     "jszip": "^3.10.1",
-    "luxon": "^3.4.4",
+    "luxon": "^3.5.0",
     "node-schedule": "^2.1.1",
     "p-memoize": "^7.1.1",
     "velocityjs": "^2.0.6",
-    "ws": "^8.16.0"
+    "ws": "^8.18.0"
   },
   "devDependencies": {
     "@istanbuljs/esm-loader-hook": "^0.2.0",
-    "archiver": "^6.0.1",
-    "commit-and-tag-version": "^12.2.0",
-    "eslint": "^8.56.0",
+    "archiver": "^7.0.1",
+    "commit-and-tag-version": "^12.4.1",
+    "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-unicorn": "^51.0.1",
-    "mocha": "^10.3.0",
-    "nyc": "^15.1.0",
-    "prettier": "^3.2.5",
-    "serverless": "^3.38.0"
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-unicorn": "^54.0.0",
+    "mocha": "^10.7.3",
+    "nyc": "^17.0.0",
+    "prettier": "^3.3.3",
+    "serverless": "^3.2.0"
   },
   "peerDependencies": {
     "serverless": "^3.2.0"

package/src/ServerlessOffline.js

@@ -1,5 +1,6 @@
 import process, { exit } from "node:process"
 import { log, setLogUtils } from "./utils/log.js"
+import logSponsor from "./utils/logSponsor.js"
 import {
   commandOptions,
   CUSTOM_OPTION,
@@ -64,6 +65,12 @@ export default class ServerlessOffline {
   async start() {
     this.#mergeOptions()
 
+    if (this.#cliOptions.noSponsor) {
+      log.notice()
+    } else {
+      logSponsor()
+    }
+
     const {
       albEvents,
       httpEvents,
@@ -278,13 +285,11 @@ export default class ServerlessOffline {
       origin: this.#options.corsAllowOrigin,
     }
 
-    log.notice()
     log.notice(
       `Starting Offline at stage ${
         this.#options.stage || provider.stage
       } ${gray(`(${this.#options.region || provider.region})`)}`,
     )
-    log.notice()
     log.debug("options:", this.#options)
   }
 

package/src/config/commandOptions.js

@@ -89,6 +89,10 @@ export default {
     type: "boolean",
     usage: "Don't prepend http routes with the stage.",
   },
+  noSponsor: {
+    type: "boolean",
+    usage: "Remove sponsor message from the output.",
+  },
   noTimeout: {
     shortcut: "t",
     type: "boolean",

package/src/config/supportedRuntimes.js

@@ -31,6 +31,7 @@ export const supportedRuntimesArchitecture = {
   provided: [X86_64],
   dotnet6: [ARM64, X86_64],
   "provided.al2": [ARM64, X86_64],
+  "provided.al2023": [ARM64, X86_64],
 }
 
 // GO
@@ -48,7 +49,11 @@ export const supportedNodejs = new Set([
 ])
 
 // PROVIDED
-export const supportedProvided = new Set(["provided", "provided.al2"])
+export const supportedProvided = new Set([
+  "provided",
+  "provided.al2",
+  "provided.al2023",
+])
 
 // PYTHON
 export const supportedPython = new Set([

package/src/events/alb/HttpServer.js

@@ -267,6 +267,8 @@ export default class HttpServer {
         override: false,
       })
 
+      response.headers = headers
+
       if (typeof result === "string") {
         response.source = stringify(result)
       } else if (result && result.body !== undefined) {

package/src/events/authMatchPolicyResource.js

@@ -1,7 +1,8 @@
 function parseResource(resource) {
-  const [, region, accountId, restApiId, path] = resource.match(
-    /arn:aws:execute-api:(.*?):(.*?):(.*?)\/(.*)/,
-  )
+  const [, region = "*", accountId = "*", restApiId = "*", path = "*"] =
+    resource.match(
+      /arn:aws:execute-api:([^\s:]+)(?::([^\s:]+))?(?::([^\s/:]+))?(?:\/(.*))?/,
+    )
 
   return {
     accountId,
@@ -26,10 +27,6 @@ export default function authMatchPolicyResource(policyResource, resource) {
     return true
   }
 
-  if (policyResource === "arn:aws:execute-api:*:*:*") {
-    return true
-  }
-
   if (policyResource.includes("*") || policyResource.includes("?")) {
     // Policy contains a wildcard resource
 
@@ -61,7 +58,7 @@ export default function authMatchPolicyResource(policyResource, resource) {
     // for the requested resource and the resource defined in the policy
     // Need to create a regex replacing ? with one character and * with any number of characters
     const regExp = new RegExp(
-      parsedPolicyResource.path.replaceAll("*", ".*").replaceAll("?", "."),
+      `${parsedPolicyResource.path.replaceAll("*", ".*").replaceAll("?", ".")}$`,
     )
 
     return regExp.test(parsedResource.path)

package/src/events/http/HttpServer.js

@@ -295,7 +295,7 @@ export default class HttpServer {
       return null
     }
 
-    const authFunctionName = this.#extractAuthFunctionName(endpoint)
+    let authFunctionName = this.#extractAuthFunctionName(endpoint)
 
     if (!authFunctionName) {
       return null
@@ -303,16 +303,32 @@ export default class HttpServer {
 
     log.notice(`Configuring Authorization: ${path} ${authFunctionName}`)
 
+    const standardFunctionExists =
+      this.#serverless.service.functions &&
+      this.#serverless.service.functions[authFunctionName]
+    const serverlessAuthorizerOptions =
+      this.#serverless.service.provider.httpApi &&
+      this.#serverless.service.provider.httpApi.authorizers &&
+      this.#serverless.service.provider.httpApi.authorizers[authFunctionName]
+
+    if (
+      !standardFunctionExists &&
+      endpoint.isHttpApi &&
+      serverlessAuthorizerOptions &&
+      serverlessAuthorizerOptions.functionName
+    ) {
+      log.notice(
+        `Redirecting authorizer function: ${authFunctionName} to ${serverlessAuthorizerOptions.functionName}`,
+      )
+      authFunctionName = serverlessAuthorizerOptions.functionName
+    }
+
     const authFunction = this.#serverless.service.getFunction(authFunctionName)
 
     if (!authFunction) {
       log.error(`Authorization function ${authFunctionName} does not exist`)
       return null
     }
-    const serverlessAuthorizerOptions =
-      this.#serverless.service.provider.httpApi &&
-      this.#serverless.service.provider.httpApi.authorizers &&
-      this.#serverless.service.provider.httpApi.authorizers[authFunctionName]
 
     const authorizerOptions = {
       enableSimpleResponses:
@@ -326,7 +342,8 @@ export default class HttpServer {
         ? serverlessAuthorizerOptions?.payloadVersion || "2.0"
         : "1.0",
       resultTtlInSeconds:
-        serverlessAuthorizerOptions?.resultTtlInSeconds || "300",
+        serverlessAuthorizerOptions?.resultTtlInSeconds ?? "300",
+      type: endpoint.isHttpApi ? serverlessAuthorizerOptions?.type : undefined,
     }
 
     if (
@@ -339,11 +356,10 @@ export default class HttpServer {
       return null
     }
 
-    if (typeof endpoint.authorizer === "string") {
-      authorizerOptions.name = authFunctionName
-    } else {
+    if (typeof endpoint.authorizer !== "string") {
       assign(authorizerOptions, endpoint.authorizer)
     }
+    authorizerOptions.name = authFunctionName
 
     if (
       !authorizerOptions.identitySource &&
@@ -443,7 +459,7 @@ export default class HttpServer {
       request.payload = request.payload && request.payload.toString(encoding)
       request.rawPayload = request.payload
 
-      // incomming request message
+      // incoming request message
       log.notice()
 
       log.notice()

package/src/events/http/createAuthScheme.js

@@ -143,6 +143,8 @@ export default function createAuthScheme(authorizerOptions, provider, lambda) {
           event = {
             ...event,
             identitySource: [finalAuthorization],
+            pathParameters: nullIfEmpty(pathParams),
+            queryStringParameters: parseQueryStringParameters(url),
             rawPath: request.path,
             rawQueryString: getRawQueryParams(url),
             requestContext: {

package/src/events/http/createJWTAuthScheme.js

@@ -5,7 +5,7 @@ import { log } from "../../utils/log.js"
 const { isArray } = Array
 const { now } = Date
 
-export default function createAuthScheme(jwtOptions) {
+export default function createJWTAuthScheme(jwtOptions) {
   const authorizerName = jwtOptions.name
 
   const identitySourceMatch = /^\$request.header.((?:\w+-?)+\w+)$/.exec(
@@ -43,7 +43,7 @@ export default function createAuthScheme(jwtOptions) {
           return Boom.unauthorized("JWT Token expired")
         }
 
-        const { aud, iss, scope, client_id: clientId } = claims
+        const { aud, iss, scope, scp, client_id: clientId } = claims
         if (iss !== jwtOptions.issuerUrl) {
           log.notice(`JWT Token not from correct issuer url`)
 
@@ -68,13 +68,13 @@ export default function createAuthScheme(jwtOptions) {
 
         let scopes = null
         if (jwtOptions.scopes && jwtOptions.scopes.length > 0) {
-          if (!scope) {
+          if (!scope && !scp) {
             log.notice(`JWT Token missing valid scope`)
 
             return Boom.forbidden("JWT Token missing valid scope")
           }
 
-          scopes = scope.split(" ")
+          scopes = scp || scope.split(" ")
           if (scopes.every((s) => !jwtOptions.scopes.includes(s))) {
             log.notice(`JWT Token missing valid scope`)
 
@@ -85,7 +85,6 @@ export default function createAuthScheme(jwtOptions) {
         log.notice(`JWT Token validated`)
 
         // Set the credentials for the rest of the pipeline
-        // return resolve(
         return h.authenticated({
           credentials: {
             claims,

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

@@ -134,8 +134,8 @@ export default class LambdaProxyIntegrationEvent {
     if (token) {
       try {
         claims = decodeJwt(token)
-        if (claims.scope) {
-          scopes = claims.scope.split(" ")
+        if (claims.scp || claims.scope) {
+          scopes = claims.scp || 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.

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

@@ -120,8 +120,8 @@ export default class LambdaProxyIntegrationEventV2 {
     if (token) {
       try {
         claims = decodeJwt(token)
-        if (claims.scope) {
-          scopes = claims.scope.split(" ")
+        if (claims.scp || claims.scope) {
+          scopes = claims.scp || 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.

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

@@ -10,7 +10,7 @@ const { assign, entries, fromEntries } = Object
 
 function escapeJavaScript(x) {
   if (typeof x === "string") {
-    return jsEscapeString(x).replaceAll("\\n", "\n") // See #26,
+    return jsEscapeString(x).replaceAll(String.raw`\n`, "\n") // See #26,
   }
 
   if (isPlainObject(x)) {

package/src/lambda/HttpServer.js

@@ -62,7 +62,7 @@ export default class HttpServer {
           .listFunctionNames()
           .map(
             (functionName) =>
-              `           * ${funcNamePairs[functionName]}: ${functionName}`,
+              `   * ${funcNamePairs[functionName]}: ${functionName}`,
           ),
       ].join("\n"),
     )
@@ -73,9 +73,7 @@ export default class HttpServer {
           .listFunctionNames()
           .map(
             (functionName) =>
-              `           * ${
-                invRoute.method
-              } ${basePath}${invRoute.path.replace(
+              `   * ${invRoute.method} ${basePath}${invRoute.path.replace(
                 "{functionName}",
                 functionName,
               )}`,
@@ -90,7 +88,7 @@ export default class HttpServer {
           .listFunctionNames()
           .map(
             (functionName) =>
-              `           * ${
+              `   * ${
                 invAsyncRoute.method
               } ${basePath}${invAsyncRoute.path.replace(
                 "{functionName}",

package/src/lambda/handler-runner/in-process-runner/aws-lambda-ric/UserFunction.js

@@ -1,3 +1,6 @@
+/* eslint-disable unicorn/no-abusive-eslint-disable */
+/* eslint-disable */
+
 "use strict"
 
 const { pathToFileURL } = require("node:url")
@@ -20,7 +23,7 @@ const { pathToFileURL } = require("node:url")
     "Errors.js": function (exports2, module2) {
       "use strict"
 
-      const util = require("util")
+      const util = require("node:util")
       function _isError(obj) {
         return (
           obj &&
@@ -53,7 +56,7 @@ const { pathToFileURL } = require("node:url")
             errorMessage: error.toString(),
             trace: [],
           }
-        } catch (_err) {
+        } catch {
           return {
             errorType: "handled",
             errorMessage:
@@ -67,7 +70,7 @@ const { pathToFileURL } = require("node:url")
           return `      ${JSON.stringify(error, (_k, v) =>
             _withEnumerableProperties(v),
           )}`
-        } catch (err) {
+        } catch {
           return `      ${JSON.stringify(toRapidResponse(error))}`
         }
       }
@@ -118,9 +121,9 @@ const { pathToFileURL } = require("node:url")
           return 0
         }
         try {
-          const verbosity = parseInt(process.env[EnvVarName])
+          const verbosity = Number.parseInt(process.env[EnvVarName])
           return verbosity < 0 ? 0 : verbosity > 3 ? 3 : verbosity
-        } catch (_) {
+        } catch {
           return 0
         }
       })()
@@ -128,17 +131,17 @@ const { pathToFileURL } = require("node:url")
         return {
           verbose() {
             if (Verbosity >= 1) {
-              console.log.apply(null, [Tag, category, ...arguments])
+              Reflect.apply(console.log, null, [Tag, category, ...arguments])
             }
           },
           vverbose() {
             if (Verbosity >= 2) {
-              console.log.apply(null, [Tag, category, ...arguments])
+              Reflect.apply(console.log, null, [Tag, category, ...arguments])
             }
           },
           vvverbose() {
             if (Verbosity >= 3) {
-              console.log.apply(null, [Tag, category, ...arguments])
+              Reflect.apply(console.log, null, [Tag, category, ...arguments])
             }
           },
         }
@@ -166,8 +169,8 @@ const { pathToFileURL } = require("node:url")
       module2.exports.HttpResponseStream = HttpResponseStream2
     },
   })
-  const path = require("path")
-  const fs = require("fs")
+  const path = require("node:path")
+  const fs = require("node:fs")
   const {
     HandlerNotFound,
     MalformedHandlerName,
@@ -306,7 +309,10 @@ const { pathToFileURL } = require("node:url")
       if (e instanceof SyntaxError) {
         throw new UserCodeSyntaxError(e)
       } else if (e.code !== void 0 && e.code === "MODULE_NOT_FOUND") {
-        verbose("globalPaths", JSON.stringify(require("module").globalPaths))
+        verbose(
+          "globalPaths",
+          JSON.stringify(require("node:module").globalPaths),
+        )
         throw new ImportModuleError(e)
       } else {
         throw e
@@ -322,7 +328,7 @@ const { pathToFileURL } = require("node:url")
   }
   function _isHandlerStreaming(handler) {
     if (
-      typeof handler[HANDLER_STREAMING] === "undefined" ||
+      handler[HANDLER_STREAMING] === undefined ||
       handler[HANDLER_STREAMING] === null ||
       handler[HANDLER_STREAMING] === false
     ) {

package/src/lambda/handler-runner/python-runner/invoke.py

@@ -1,6 +1,7 @@
 # copy/pasted entirely as is from:
 # https://github.com/serverless/serverless/blob/v1.50.0/lib/plugins/aws/invokeLocal/invoke.py
 
+import base64
 import subprocess
 import argparse
 import json
@@ -10,6 +11,7 @@ import os
 from time import strftime, time
 from importlib import import_module
 
+
 class FakeLambdaContext(object):
     def __init__(self, name='Fake', version='LATEST', timeout=6, **kwargs):
         self.name = name
@@ -102,5 +104,9 @@ if __name__ == '__main__':
             '__offline_payload__': result
         }
 
+        if isinstance(result['body'], bytes):
+            data['__offline_payload__']['body'] = base64.b64encode(result['body']).decode('utf-8')
+            data['isBase64Encoded'] = True
+
         sys.stdout.write(json.dumps(data))
         sys.stdout.write('\n')

package/src/utils/index.js

@@ -21,13 +21,20 @@ export { generateAlbHapiPath } from "./generateHapiPath.js"
 const { isArray } = Array
 const { keys } = Object
 
+const possibleBinaryContentTypes = [
+  "application/octet-stream",
+  "multipart/form-data",
+]
+
 // Detect the toString encoding from the request headers content-type
 // enhance if further content types need to be non utf8 encoded.
 export function detectEncoding(request) {
   const contentType = request.headers["content-type"]
 
   return typeof contentType === "string" &&
-    contentType.includes("multipart/form-data")
+    possibleBinaryContentTypes.some((possibleBinaryContentType) =>
+      contentType.includes(possibleBinaryContentType),
+    )
     ? "binary"
     : "utf8"
 }

package/src/utils/logRoutes.js

@@ -10,8 +10,7 @@ import {
   yellow,
 } from "../config/colors.js"
 
-const { max } = Math
-
+const post = "POST"
 const colorMethodMapping = new Map([
   ["DELETE", red],
   ["GET", dodgerblue],
@@ -28,13 +27,13 @@ function logRoute(method, server, path, maxLength, dimPath = false) {
   const methodColor = colorMethodMapping.get(method) ?? peachpuff
   const methodFormatted = method.padEnd(maxLength, " ")
 
-  return `${methodColor(methodFormatted)} ${yellow.dim("|")} ${gray.dim(
-    server,
-  )}${dimPath ? gray.dim(path) : lime(path)}`
+  return `${methodColor(methodFormatted)} ${yellow.dim("|")} ${gray.dim(server)}${dimPath ? gray.dim(path) : lime(path)}`
 }
 
 function getMaxHttpMethodNameLength(routeInfo) {
-  return max(...routeInfo.map(({ method }) => method.length))
+  return Math.max(
+    ...routeInfo.map(({ method }) => Math.max(method.length, post.length)),
+  )
 }
 
 export default function logRoutes(routeInfo) {
@@ -55,7 +54,7 @@ export default function logRoutes(routeInfo) {
             // eslint-disable-next-line prefer-template
             logRoute(method, server, path, maxLength) +
             "\n" +
-            logRoute("POST", server, invokePath, maxLength, true),
+            logRoute(post, server, invokePath, maxLength, true),
         )
         .join("\n"),
       boxenOptions,

package/src/utils/logSponsor.js

@@ -0,0 +1,69 @@
+/* eslint-disable no-use-before-define */
+/* eslint-disable no-console */
+import process from "node:process"
+
+import boxen from "boxen"
+import { gray, dodgerblue } from "../config/colors.js"
+
+const boxenOptions = {
+  borderColor: "blue",
+  margin: 1,
+  padding: 1,
+}
+
+// Promotion starts on August 22, 2024
+const startAt = new Date("2024-08-22T00:00:00.000Z")
+// By October 22, 2024, the promotion will be displayed to 100% of users
+const endAt = new Date("2024-10-22T00:00:00.000Z")
+const nDays = diffDays(startAt, endAt)
+
+function logSponsor() {
+  if (!shouldDisplaySponsor()) {
+    console.log()
+
+    return
+  }
+
+  console.log(
+    boxen(
+      `Sponsored by ${dodgerblue("Arccode, the RPG for developers")}\nhttps://arccode.dev?ref=so\n${gray.dim(
+        "Disable with --noSponsor",
+      )}`,
+      boxenOptions,
+    ),
+  )
+}
+
+// Display the message progressively over time to 100% of users
+function shouldDisplaySponsor() {
+  const ratio = diffDays(startAt, new Date()) / nDays
+
+  if (ratio >= 1) return true
+
+  try {
+    const nonce = Number(
+      encodeStringToNumber(process.cwd()).toString().padStart(2, "0").slice(-2),
+    )
+
+    return nonce <= ratio * 100
+  } catch {
+    //
+  }
+
+  return false
+}
+
+function encodeStringToNumber(string) {
+  let sum = 0
+
+  for (let i = 0; i < string.length; i += 1) {
+    sum += Number(string.codePointAt(i).toString(10))
+  }
+
+  return sum
+}
+
+function diffDays(a, b) {
+  return Math.round((b - a) / (1000 * 60 * 60 * 24))
+}
+export default logSponsor