serverless-offline 14.5.0 → 14.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-offline",
-  "version": "14.5.0",
+  "version": "14.7.0",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -13,9 +13,9 @@
     "code-quality": "npm run prettier && npm run lint",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "list-contributors": "echo 'clone https://github.com/mgechev/github-contributors-list.git first, then run npm install' && cd ../github-contributors-list && node bin/githubcontrib --owner dherault --repo serverless-offline --sortBy contributions --showlogin true --sortOrder desc > contributors.md",
-    "prepare-release": "commit-and-tag-version && prettier --write CHANGELOG.md",
+    "list-contributors": "echo 'clone https://github.com/mgechev/github-contributors-list.git first, then run npm install' && cd ../github-contributors-list && node bin/githubcontrib --owner dherault --repo serverless-offline --sortBy contributions --sortOrder desc > contributors.md",
     "prepublishOnly": "npm run lint",
+    "changelog": "auto-changelog",
     "prettier": "prettier --check .",
     "prettier:fix": "prettier --write .",
     "test": "mocha --require ./tests/mochaHooks.cjs",
@@ -51,72 +51,53 @@
   "engines": {
     "node": ">=20.0.0"
   },
-  "commit-and-tag-version": {
-    "skip": {
-      "commit": true,
-      "tag": true
-    },
-    "types": [
-      {
-        "type": "feat",
-        "section": "Features"
-      },
-      {
-        "type": "fix",
-        "section": "Bug Fixes"
-      },
-      {
-        "type": "perf",
-        "section": "Performance Improvements"
-      },
-      {
-        "type": "refactor",
-        "section": "Maintenance Improvements"
-      }
-    ]
+  "auto-changelog": {
+    "output": "CHANGELOG.md",
+    "unreleased": false,
+    "commitLimit": false,
+    "hideCredit": true
   },
   "dependencies": {
-    "@aws-sdk/client-lambda": "^3.636.0",
+    "@aws-sdk/client-lambda": "^3.1052.0",
     "@hapi/boom": "^10.0.1",
     "@hapi/h2o2": "^10.0.4",
-    "@hapi/hapi": "^21.3.10",
+    "@hapi/hapi": "^21.4.9",
     "array-unflat-js": "^0.1.3",
     "boxen": "^7.1.1",
-    "chalk": "^5.3.0",
+    "chalk": "^5.6.2",
     "desm": "^1.3.1",
     "execa": "^8.0.1",
-    "fs-extra": "^11.2.0",
-    "is-wsl": "^3.1.0",
+    "is-wsl": "^3.1.1",
     "java-invoke-local": "0.0.6",
     "jose": "^5.7.0",
     "js-string-escape": "^1.0.1",
-    "jsonpath-plus": "^10.2.0",
-    "jsonschema": "^1.4.1",
+    "jsonpath-plus": "^10.4.0",
+    "jsonschema": "^1.5.0",
     "jszip": "^3.10.1",
-    "luxon": "^3.5.0",
+    "luxon": "^3.7.2",
     "nock": "^13.5.6",
     "node-fetch": "^3.3.2",
     "node-schedule": "^2.1.1",
     "p-memoize": "^7.1.1",
     "tree-kill": "^1.2.2",
-    "tsx": "^4.17.0",
-    "velocityjs": "^2.0.6",
-    "ws": "^8.18.0"
+    "tsx": "^4.22.3",
+    "velocityjs": "^2.1.6",
+    "ws": "^8.21.0"
   },
   "devDependencies": {
-    "@istanbuljs/esm-loader-hook": "^0.2.0",
+    "@istanbuljs/esm-loader-hook": "^0.3.0",
     "archiver": "^7.0.1",
-    "commit-and-tag-version": "^12.4.1",
+    "auto-changelog": "^2.5.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.2.1",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-unicorn": "^54.0.0",
-    "mocha": "^10.7.3",
+    "mocha": "^11.7.6",
     "nyc": "^17.0.0",
-    "prettier": "^3.3.3",
-    "serverless": "^4.2.1"
+    "prettier": "^3.8.3",
+    "serverless": "^4.36.1"
   },
   "peerDependencies": {
     "serverless": "^4.0.0"

package/src/config/commandOptions.js

@@ -116,6 +116,11 @@ export default {
     type: "boolean",
     usage: "Turns on loading of your HTTP proxy settings from serverless.yml.",
   },
+  rubyWatchDirs: {
+    type: "string",
+    usage:
+      "Comma-separated list of directories to watch for Ruby (.rb) file changes. When set, the persistent Ruby process is automatically restarted on change for hot reload.",
+  },
   terminateIdleLambdaTime: {
     type: "string",
     usage:

package/src/config/defaultOptions.js

@@ -23,6 +23,7 @@ export default {
   preLoadModules: "",
   reloadHandler: false,
   resourceRoutes: false,
+  rubyWatchDirs: [],
   terminateIdleLambdaTime: 60,
   useDocker: false,
   useInProcess: false,

package/src/config/supportedRuntimes.js

@@ -24,6 +24,7 @@ export const supportedRuntimesArchitecture = {
   "ruby2.7": [ARM64, X86_64],
   "ruby3.2": [ARM64, X86_64],
   "ruby3.3": [ARM64, X86_64],
+  "ruby3.4": [ARM64, X86_64],
   java8: [X86_64],
   "java8.al2": [ARM64, X86_64],
   java11: [ARM64, X86_64],
@@ -68,7 +69,12 @@ export const supportedPython = new Set([
 ])
 
 // RUBY
-export const supportedRuby = new Set(["ruby2.7", "ruby3.2", "ruby3.3"])
+export const supportedRuby = new Set([
+  "ruby2.7",
+  "ruby3.2",
+  "ruby3.3",
+  "ruby3.4",
+])
 
 export const supportedRuntimes = new Set([
   // ...supportedDotnetcore,

package/src/events/alb/HttpServer.js

@@ -294,10 +294,11 @@ export default class HttpServer {
   }
 
   createRoutes(functionKey, albEvent) {
-    let method = "ANY"
+    let methods = ["ANY"]
     if ((albEvent.conditions.method || []).length > 0) {
-      method = albEvent.conditions.method[0].toUpperCase()
+      methods = albEvent.conditions.method.map((m) => m.toUpperCase())
     }
+    methods = methods.includes("ANY") ? ["ANY"] : methods
 
     const path = albEvent.conditions.path[0]
     const hapiPath = generateAlbHapiPath(path, this.#options, this.#serverless)
@@ -306,51 +307,53 @@ export default class HttpServer {
     const { host, albPort, httpsProtocol } = this.#options
     const server = `${httpsProtocol ? "https" : "http"}://${host}:${albPort}`
 
-    this.#terminalInfo.push({
-      invokePath: `/2015-03-31/functions/${functionKey}/invocations`,
-      method,
-      path: hapiPath,
-      server,
-      stage: this.#options.noPrependStageInUrl ? null : stage,
-    })
+    methods.forEach((method) => {
+      this.#terminalInfo.push({
+        invokePath: `/2015-03-31/functions/${functionKey}/invocations`,
+        method,
+        path: hapiPath,
+        server,
+        stage: this.#options.noPrependStageInUrl ? null : stage,
+      })
 
-    const hapiMethod = method === "ANY" ? "*" : method
-    const hapiOptions = {
-      response: {
-        emptyStatusCode: 200,
-      },
-    }
+      const hapiMethod = method === "ANY" ? "*" : method
+      const hapiOptions = {
+        response: {
+          emptyStatusCode: 200,
+        },
+      }
 
-    // skip HEAD routes as hapi will fail with 'Method name not allowed: HEAD ...'
-    // for more details, check https://github.com/dherault/serverless-offline/issues/204
-    if (hapiMethod === "HEAD") {
-      log.notice(
-        "HEAD method event detected. Skipping HAPI server route mapping",
-      )
+      // skip HEAD routes as hapi will fail with 'Method name not allowed: HEAD ...'
+      // for more details, check https://github.com/dherault/serverless-offline/issues/204
+      if (hapiMethod === "HEAD") {
+        log.notice(
+          "HEAD method event detected. Skipping HAPI server route mapping",
+        )
 
-      return
-    }
+        return
+      }
 
-    if (hapiMethod !== "HEAD" && hapiMethod !== "GET") {
-      // maxBytes: Increase request size from 1MB default limit to 10MB.
-      // Cf AWS API GW payload limits.
-      hapiOptions.payload = {
-        maxBytes: 1024 * 1024 * 10,
-        parse: false,
+      if (hapiMethod !== "HEAD" && hapiMethod !== "GET") {
+        // maxBytes: Increase request size from 1MB default limit to 10MB.
+        // Cf AWS API GW payload limits.
+        hapiOptions.payload = {
+          maxBytes: 1024 * 1024 * 10,
+          parse: false,
+        }
       }
-    }
 
-    const hapiHandler = this.#createHapiHandler({
-      functionKey,
-      method,
-      stage,
-    })
+      const hapiHandler = this.#createHapiHandler({
+        functionKey,
+        method,
+        stage,
+      })
 
-    this.#server.route({
-      handler: hapiHandler,
-      method: hapiMethod,
-      options: hapiOptions,
-      path: hapiPath,
+      this.#server.route({
+        handler: hapiHandler,
+        method: hapiMethod,
+        options: hapiOptions,
+        path: hapiPath,
+      })
     })
   }
 

package/src/lambda/LambdaFunction.js

@@ -1,10 +1,9 @@
 import crypto from "node:crypto"
-import { readFile, writeFile } from "node:fs/promises"
+import { mkdir, readFile, rm, writeFile } from "node:fs/promises"
 import { dirname, join, resolve } from "node:path"
 import process from "node:process"
 import { performance } from "node:perf_hooks"
 import { setTimeout } from "node:timers/promises"
-import { emptyDir, ensureDir, remove } from "fs-extra"
 import jszip from "jszip"
 import { log } from "../utils/log.js"
 import renderIntrinsicFunction from "../utils/renderIntrinsicFunction.js"
@@ -226,7 +225,7 @@ export default class LambdaFunction {
     // TODO console.log('lambda cleanup')
     await this.#handlerRunner.cleanup()
     if (this.#lambdaDir) {
-      await remove(this.#lambdaDir)
+      await rm(this.#lambdaDir, { force: true, recursive: true })
     }
   }
 
@@ -246,7 +245,8 @@ export default class LambdaFunction {
       return
     }
 
-    await emptyDir(this.#codeDir)
+    await rm(this.#codeDir, { force: true, recursive: true })
+    await mkdir(this.#codeDir, { recursive: true })
 
     const data = await readFile(this.#artifact)
     const zip = await jszip.loadAsync(data)
@@ -257,7 +257,7 @@ export default class LambdaFunction {
         if (filename.endsWith("/")) {
           return undefined
         }
-        await ensureDir(join(this.#codeDir, dirname(filename)))
+        await mkdir(join(this.#codeDir, dirname(filename)), { recursive: true })
         return writeFile(join(this.#codeDir, filename), fileData, {
           mode: jsZipObj.unixPermissions,
         })

package/src/lambda/handler-runner/HandlerRunner.js

@@ -52,16 +52,14 @@ export default class HandlerRunner {
 
     if (supportedNodejs.has(runtime)) {
       if (useInProcess) {
-        const { default: InProcessRunner } = await import(
-          "./in-process-runner/index.js"
-        )
+        const { default: InProcessRunner } =
+          await import("./in-process-runner/index.js")
 
         return new InProcessRunner(this.#funOptions, this.#env)
       }
 
-      const { default: WorkerThreadRunner } = await import(
-        "./worker-thread-runner/index.js"
-      )
+      const { default: WorkerThreadRunner } =
+        await import("./worker-thread-runner/index.js")
 
       return new WorkerThreadRunner(this.#funOptions, this.#env)
     }
@@ -81,7 +79,7 @@ export default class HandlerRunner {
     if (supportedRuby.has(runtime)) {
       const { default: RubyRunner } = await import("./ruby-runner/index.js")
 
-      return new RubyRunner(this.#funOptions, this.#env)
+      return new RubyRunner(this.#funOptions, this.#env, this.#options)
     }
 
     if (supportedJava.has(runtime)) {

package/src/lambda/handler-runner/docker-runner/DockerContainer.js

@@ -1,11 +1,10 @@
 import { createHash } from "node:crypto"
-import { createWriteStream } from "node:fs"
-import { readFile, unlink, writeFile } from "node:fs/promises"
+import { createWriteStream, existsSync } from "node:fs"
+import { mkdir, readFile, unlink, writeFile } from "node:fs/promises"
 import { platform } from "node:os"
 import { dirname, join, sep } from "node:path"
 import { LambdaClient, GetLayerVersionCommand } from "@aws-sdk/client-lambda"
 import { execa } from "execa"
-import { ensureDir, pathExists } from "fs-extra"
 import isWsl from "is-wsl"
 import jszip from "jszip"
 import { log, progress } from "../../../utils/log.js"
@@ -103,7 +102,7 @@ export default class DockerContainer {
 
         layerDir = join(layerDir, this.#getLayersSha256())
 
-        if (await pathExists(layerDir)) {
+        if (existsSync(layerDir)) {
           log.verbose(
             `Layers already exist for this function. Skipping download.`,
           )
@@ -143,7 +142,7 @@ export default class DockerContainer {
     } else {
       log.debug("Looking for bootstrap file")
       const bootstrapDir = join(this.#servicePath, "bootstrap")
-      if (await pathExists(bootstrapDir)) {
+      if (existsSync(bootstrapDir)) {
         log.debug(`Found bootstrap file at ${bootstrapDir}`)
         dockerArgs.push(
           "-v",
@@ -262,7 +261,7 @@ export default class DockerContainer {
       const { CodeSize: layerSize, Location: layerUrl } = layer.Content
       // const layerSha = layer.Content.CodeSha256
 
-      await ensureDir(layerDir)
+      await mkdir(layerDir, { recursive: true })
 
       log.verbose(
         `Retrieving "${layerName}": Downloading ${this.#formatBytes(
@@ -311,7 +310,7 @@ export default class DockerContainer {
           if (filename.endsWith(sep)) {
             return undefined
           }
-          await ensureDir(join(layerDir, dirname(filename)))
+          await mkdir(join(layerDir, dirname(filename)), { recursive: true })
           return writeFile(join(layerDir, filename), fileData, {
             mode: zip.files[filename].unixPermissions,
           })