serverless-offline 11.2.0 → 11.2.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "11.2.0",
+  "version": "11.2.2",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -82,17 +82,17 @@
     ]
   },
   "dependencies": {
+    "@aws-sdk/client-lambda": "^3.199.0",
     "@hapi/boom": "^10.0.0",
     "@hapi/h2o2": "^10.0.0",
     "@hapi/hapi": "^20.2.2",
     "@serverless/utils": "^6.8.1",
-    "aws-sdk": "^2.1241.0",
     "boxen": "^7.0.0",
     "chalk": "^5.1.2",
     "execa": "^6.1.0",
     "fs-extra": "^10.1.0",
     "java-invoke-local": "0.0.6",
-    "jose": "^4.10.3",
+    "jose": "^4.10.4",
     "js-string-escape": "^1.0.1",
     "jsonpath-plus": "^7.2.0",
     "jsonschema": "^1.4.1",

package/src/events/http/HttpServer.js

@@ -74,6 +74,9 @@ export default class HttpServer {
     const serverOptions = {
       host,
       port: httpPort,
+      router: {
+        stripTrailingSlash: true,
+      },
       state: enforceSecureCookies
         ? {
             isHttpOnly: true,

package/src/events/websocket/HttpServer.js

@@ -35,6 +35,9 @@ export default class HttpServer {
     const serverOptions = {
       host,
       port: websocketPort,
+      router: {
+        stripTrailingSlash: true,
+      },
       // https support
       ...(httpsProtocol != null && {
         tls: await this.#loadCerts(httpsProtocol),

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

@@ -3,8 +3,8 @@ import { createWriteStream } from 'node:fs'
 import { 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 { log, progress } from '@serverless/utils/log.js'
-import aws from 'aws-sdk'
 import { execa } from 'execa'
 import { ensureDir, pathExists } from 'fs-extra'
 import jszip from 'jszip'
@@ -31,7 +31,7 @@ export default class DockerContainer {
 
   #imageNameTag = null
 
-  #lambda = null
+  #lambdaClient = null
 
   #layers = null
 
@@ -114,23 +114,21 @@ export default class DockerContainer {
             `Layers already exist for this function. Skipping download.`,
           )
         } else {
-          const layers = []
-
           log.verbose(`Storing layers at ${layerDir}`)
 
           // Only initialise if we have layers, we're using AWS, and they don't already exist
-          this.#lambda = new aws.Lambda({
+          this.#lambdaClient = new LambdaClient({
             apiVersion: '2015-03-31',
             region: this.#provider.region,
           })
 
           log.verbose(`Getting layers`)
 
-          for (const layerArn of this.#layers) {
-            layers.push(this.#downloadLayer(layerArn, layerDir))
-          }
-
-          await Promise.all(layers)
+          await Promise.all(
+            this.#layers.map((layerArn) =>
+              this.#downloadLayer(layerArn, layerDir),
+            ),
+          )
         }
 
         if (
@@ -227,24 +225,24 @@ export default class DockerContainer {
   }
 
   async #downloadLayer(layerArn, layerDir) {
-    const layerName = layerArn.split(':layer:')[1]
+    const [, layerName] = layerArn.split(':layer:')
     const layerZipFile = `${layerDir}/${layerName}.zip`
     const layerProgress = progress.get(`layer-${layerName}`)
 
     log.verbose(`[${layerName}] ARN: ${layerArn}`)
 
-    const params = {
-      Arn: layerArn,
-    }
-
     log.verbose(`[${layerName}] Getting Info`)
     layerProgress.notice(`Retrieving "${layerName}": Getting info`)
 
+    const getLayerVersionCommand = new GetLayerVersionCommand({
+      LayerName: layerArn,
+    })
+
     try {
       let layer = null
 
       try {
-        layer = await this.#lambda.getLayerVersionByArn(params).promise()
+        layer = await this.#lambdaClient.send(getLayerVersionCommand)
       } catch (err) {
         log.warning(`[${layerName}] ${err.code}: ${err.message}`)
 
@@ -264,11 +262,9 @@ export default class DockerContainer {
         return
       }
 
-      const layerUrl = layer.Content.Location
+      const { CodeSize: layerSize, Location: layerUrl } = layer.Content
       // const layerSha = layer.Content.CodeSha256
 
-      const layerSize = layer.Content.CodeSize
-
       await ensureDir(layerDir)
 
       log.verbose(
@@ -282,9 +278,7 @@ export default class DockerContainer {
         )}`,
       )
 
-      const res = await fetch(layerUrl, {
-        method: 'get',
-      })
+      const res = await fetch(layerUrl)
 
       if (!res.ok) {
         log.warning(

package/src/utils/generateHapiPath.js

@@ -1,5 +1,4 @@
 export default function generateHapiPath(path, options, serverless) {
-  // path must start with '/'
   let hapiPath = path.startsWith('/') ? path : `/${path}`
 
   if (!options.noPrependStageInUrl) {
@@ -12,7 +11,7 @@ export default function generateHapiPath(path, options, serverless) {
     hapiPath = `/${options.prefix}${hapiPath}`
   }
 
-  if (hapiPath !== '/' && hapiPath.endsWith('/') && hapiPath.endsWith('+}/')) {
+  if (hapiPath !== '/' && hapiPath.endsWith('/')) {
     hapiPath = hapiPath.slice(0, -1)
   }