serverless-offline 12.0.2 → 12.0.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "12.0.2",
+  "version": "12.0.4",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -24,12 +24,8 @@
     "prettify:updated": "pipe-git-updated --ext=css --ext=html --ext=js --ext=json --ext=md --ext=yaml --ext=yml -- prettier --write",
     "test": "mocha --require ./tests/mochaHooks.cjs",
     "test:cov": "NODE_OPTIONS='--experimental-loader @istanbuljs/esm-loader-hook' nyc --reporter=html npm test",
-    "old-test:jest": "npm run build && jest --verbose --silent --runInBand",
-    "old-test:cov": "npm run build && jest --coverage --silent --runInBand --collectCoverageFrom=src/**/*.js",
-    "old-test:log": "npm run build && jest --verbose",
-    "old-test:noBuild": "jest --verbose --runInBand --bail",
-    "old-test:unit": "jest --verbose --silent --runInBand --config jest.config.units.js",
-    "old-test:watch": "SKIP_SETUP=true jest --verbose --watch"
+    "test:node": "TEST=unit mocha --require ./tests/mochaHooks.cjs",
+    "test:unit": "TEST=unit mocha --require ./tests/mochaHooks.cjs"
   },
   "repository": {
     "type": "git",
@@ -82,23 +78,25 @@
     ]
   },
   "dependencies": {
-    "@aws-sdk/client-lambda": "^3.226.0",
+    "@aws-sdk/client-lambda": "^3.241.0",
     "@hapi/boom": "^10.0.0",
     "@hapi/h2o2": "^10.0.0",
     "@hapi/hapi": "^21.1.0",
     "@serverless/utils": "^6.8.2",
-    "boxen": "^7.0.0",
+    "array-unflat-js": "^0.1.3",
+    "boxen": "^7.0.1",
     "chalk": "^5.2.0",
+    "desm": "^1.3.0",
     "execa": "^6.1.0",
     "fs-extra": "^11.1.0",
     "is-wsl": "^2.2.0",
     "java-invoke-local": "0.0.6",
-    "jose": "^4.11.1",
+    "jose": "^4.11.2",
     "js-string-escape": "^1.0.1",
     "jsonpath-plus": "^7.2.0",
     "jsonschema": "^1.4.1",
     "jszip": "^3.10.1",
-    "luxon": "^3.1.1",
+    "luxon": "^3.2.0",
     "node-fetch": "^3.3.0",
     "node-schedule": "^2.1.0",
     "object.hasown": "^1.1.2",
@@ -110,18 +108,19 @@
   "devDependencies": {
     "@istanbuljs/esm-loader-hook": "^0.2.0",
     "archiver": "^5.3.1",
-    "eslint": "^8.29.0",
+    "eslint": "^8.31.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-unicorn": "^45.0.2",
     "git-list-updated": "^1.2.1",
-    "husky": "^8.0.2",
+    "husky": "^8.0.3",
     "lint-staged": "^13.1.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
     "prettier": "^2.8.1",
-    "serverless": "^3.25.1",
+    "serverless": "^3.26.0",
     "standard-version": "^9.5.0"
   },
   "peerDependencies": {

package/src/events/http/Endpoint.js

@@ -1,20 +1,17 @@
 import { existsSync, readFileSync } from 'node:fs'
-import { dirname, resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { log } from '@serverless/utils/log.js'
+import { join } from 'desm'
 import OfflineEndpoint from './OfflineEndpoint.js'
 
 const { entries } = Object
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
-
 // velocity template defaults
 const defaultRequestTemplate = readFileSync(
-  resolve(__dirname, 'templates/offline-default.req.vm'),
+  join(import.meta.url, 'templates/offline-default.req.vm'),
   'utf8',
 )
 const defaultResponseTemplate = readFileSync(
-  resolve(__dirname, 'templates/offline-default.res.vm'),
+  join(import.meta.url, 'templates/offline-default.res.vm'),
   'utf8',
 )
 

package/src/events/http/HttpServer.js

@@ -57,8 +57,8 @@ export default class HttpServer {
 
   async #loadCerts(httpsProtocol) {
     const [cert, key] = await Promise.all([
-      readFile(resolve(httpsProtocol, 'cert.pem'), 'utf-8'),
-      readFile(resolve(httpsProtocol, 'key.pem'), 'utf-8'),
+      readFile(resolve(httpsProtocol, 'cert.pem'), 'utf8'),
+      readFile(resolve(httpsProtocol, 'key.pem'), 'utf8'),
     ])
 
     return {
@@ -328,9 +328,9 @@ export default class HttpServer {
         'method.request.header.Authorization',
       identityValidationExpression:
         serverlessAuthorizerOptions?.identityValidationExpression || '(.*)',
-      payloadVersion: !endpoint.isHttpApi
-        ? '1.0'
-        : serverlessAuthorizerOptions?.payloadVersion || '2.0',
+      payloadVersion: endpoint.isHttpApi
+        ? serverlessAuthorizerOptions?.payloadVersion || '2.0'
+        : '1.0',
       resultTtlInSeconds:
         serverlessAuthorizerOptions?.resultTtlInSeconds || '300',
     }
@@ -502,9 +502,9 @@ export default class HttpServer {
           : ''
 
       const schemas =
-        endpoint?.request?.schemas !== undefined
-          ? endpoint.request.schemas[contentType]
-          : ''
+        endpoint?.request?.schemas === undefined
+          ? ''
+          : endpoint.request.schemas[contentType]
 
       // https://hapijs.com/api#route-configuration doesn't seem to support selectively parsing
       // so we have to do it ourselves
@@ -519,7 +519,7 @@ export default class HttpServer {
         request.payload.length > 1
       ) {
         try {
-          if (!request.payload || request.payload.length < 1) {
+          if (!request.payload || request.payload.length === 0) {
             request.payload = '{}'
           }
 
@@ -640,7 +640,7 @@ export default class HttpServer {
         for (const [key, value] of entries(endpoint.responses)) {
           if (
             key !== 'default' &&
-            errorMessage.match(`^${value.selectionPattern || key}$`)
+            `^${value.selectionPattern || key}$`.test(errorMessage)
           ) {
             responseName = key
             break
@@ -685,11 +685,8 @@ export default class HttpServer {
                 headerValue = valueArray[3]
                   ? jsonPath(result, valueArray.slice(3).join('.'))
                   : result
-                if (headerValue === undefined || headerValue === null) {
-                  headerValue = ''
-                } else {
-                  headerValue = headerValue.toString()
-                }
+
+                headerValue = headerValue == null ? '' : String(headerValue)
               } else {
                 log.notice()
 
@@ -702,7 +699,7 @@ export default class HttpServer {
                 log.notice()
               }
             } else {
-              headerValue = value.match(/^'.*'$/) ? value.slice(1, -1) : value // See #34
+              headerValue = /^'.*'$/.test(value) ? value.slice(1, -1) : value // See #34
             }
             // Applies the header;
             if (headerValue === '') {
@@ -748,7 +745,7 @@ export default class HttpServer {
         const { responseTemplates } = chosenResponse
 
         if (typeof responseTemplates === 'object') {
-          if (keys(responseTemplates).length) {
+          if (keys(responseTemplates).length > 0) {
             // BAD IMPLEMENTATION: first key in responseTemplates
             const responseTemplate = responseTemplates[responseContentType]
 
@@ -1137,7 +1134,7 @@ export default class HttpServer {
 
     const resourceRoutes = parseResources(this.#serverless.service.resources)
 
-    if (!resourceRoutes || !keys(resourceRoutes).length) {
+    if (!resourceRoutes || keys(resourceRoutes).length === 0) {
       return
     }
 

package/src/events/http/createJWTAuthScheme.js

@@ -67,7 +67,7 @@ export default function createAuthScheme(jwtOptions) {
         }
 
         let scopes = null
-        if (jwtOptions.scopes && jwtOptions.scopes.length) {
+        if (jwtOptions.scopes && jwtOptions.scopes.length > 0) {
           if (!scope) {
             log.notice(`JWT Token missing valid scope`)
 

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

@@ -33,20 +33,25 @@ function renderVelocityString(velocityString, context) {
 
   // Haaaa Velocity... this language sure loves strings a lot
   switch (renderResult) {
-    case 'undefined':
-      return undefined // But we don't, we want JavaScript types
+    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
+    }
 
-    default:
+    default: {
       return tryToParseJSON(renderResult)
+    }
   }
 }
 

package/src/events/schedule/Schedule.js

@@ -78,21 +78,25 @@ export default class Schedule {
 
     switch (unit) {
       case 'minute':
-      case 'minutes':
+      case 'minutes': {
         return `*/${number} * * * *`
+      }
 
       case 'hour':
-      case 'hours':
+      case 'hours': {
         return `0 */${number} * * *`
+      }
 
       case 'day':
-      case 'days':
+      case 'days': {
         return `0 0 */${number} * *`
+      }
 
-      default:
+      default: {
         log.error(`scheduler: Invalid rate syntax '${rate}', will not schedule`)
 
         return null
+      }
     }
   }
 

package/src/events/websocket/HttpServer.js

@@ -19,8 +19,8 @@ export default class HttpServer {
 
   async #loadCerts(httpsProtocol) {
     const [cert, key] = await Promise.all([
-      readFile(resolve(httpsProtocol, 'cert.pem'), 'utf-8'),
-      readFile(resolve(httpsProtocol, 'key.pem'), 'utf-8'),
+      readFile(resolve(httpsProtocol, 'cert.pem'), 'utf8'),
+      readFile(resolve(httpsProtocol, 'key.pem'), 'utf8'),
     ])
 
     return {

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('utf-8'),
+      payload.toString('utf8'),
     )
 
     return clientExisted

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

@@ -95,13 +95,7 @@ export default class DockerContainer {
     if (this.#layers.length > 0) {
       log.verbose(`Found layers, checking provider type`)
 
-      if (this.#provider.name.toLowerCase() !== 'aws') {
-        log.warning(
-          `Provider ${
-            this.#provider.name
-          } is Unsupported. Layers are only supported on aws.`,
-        )
-      } else {
+      if (this.#provider.name.toLowerCase() === 'aws') {
         let layerDir = this.#dockerOptions.layersDir
 
         if (!layerDir) {
@@ -142,6 +136,12 @@ export default class DockerContainer {
           )
         }
         dockerArgs.push('-v', `${layerDir}:/opt:ro,delegated`)
+      } else {
+        log.warning(
+          `Provider ${
+            this.#provider.name
+          } is Unsupported. Layers are only supported on aws.`,
+        )
       }
     }
 

package/src/lambda/handler-runner/go-runner/GoRunner.js

@@ -106,7 +106,7 @@ export default class GoRunner {
     // Get go env to run this locally
     if (!this.#goEnv) {
       const goEnvResponse = await execa('go', ['env'], {
-        encoding: 'utf-8',
+        encoding: 'utf8',
         stdio: 'pipe',
       })
 
@@ -136,7 +136,7 @@ export default class GoRunner {
     }
 
     const { stdout, stderr } = await execa(`./tmp`, {
-      encoding: 'utf-8',
+      encoding: 'utf8',
       env: {
         ...this.#env,
         ...this.#goEnv,

package/src/lambda/handler-runner/python-runner/PythonRunner.js

@@ -1,17 +1,15 @@
 import { spawn } from 'node:child_process'
 import { EOL, platform } from 'node:os'
-import { delimiter, dirname, join, relative, resolve } from 'node:path'
+import { delimiter, join as pathJoin, relative } from 'node:path'
 import process, { cwd, nextTick } from 'node:process'
 import { createInterface } from 'node:readline'
-import { fileURLToPath } from 'node:url'
 import { log } from '@serverless/utils/log.js'
+import { join } from 'desm'
 import { splitHandlerPathAndName } from '../../../utils/index.js'
 
 const { parse, stringify } = JSON
 const { assign, hasOwn } = Object
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
-
 export default class PythonRunner {
   static #payloadIdentifier = '__offline_payload__'
 
@@ -32,7 +30,7 @@ export default class PythonRunner {
       const runtimeDir = platform() === 'win32' ? 'Scripts' : 'bin'
 
       process.env.PATH = [
-        join(process.env.VIRTUAL_ENV, runtimeDir),
+        pathJoin(process.env.VIRTUAL_ENV, runtimeDir),
         delimiter,
         process.env.PATH,
       ].join('')
@@ -44,7 +42,7 @@ export default class PythonRunner {
       pythonExecutable,
       [
         '-u',
-        resolve(__dirname, 'invoke.py'),
+        join(import.meta.url, 'invoke.py'),
         relative(cwd(), handlerPath),
         handlerName,
       ],

package/src/lambda/handler-runner/ruby-runner/RubyRunner.js

@@ -1,16 +1,14 @@
 import { EOL, platform } from 'node:os'
-import { dirname, relative, resolve } from 'node:path'
+import { relative } from 'node:path'
 import { cwd } from 'node:process'
-import { fileURLToPath } from 'node:url'
 import { log } from '@serverless/utils/log.js'
+import { join } from 'desm'
 import { execa } from 'execa'
 import { splitHandlerPathAndName } from '../../../utils/index.js'
 
 const { parse, stringify } = JSON
 const { hasOwn } = Object
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
-
 export default class RubyRunner {
   static #payloadIdentifier = '__offline_payload__'
 
@@ -86,7 +84,7 @@ export default class RubyRunner {
     const { stderr, stdout } = await execa(
       runtime,
       [
-        resolve(__dirname, 'invoke.rb'),
+        join(import.meta.url, 'invoke.rb'),
         relative(cwd(), this.#handlerPath),
         this.#handlerName,
       ],

package/src/lambda/handler-runner/worker-thread-runner/WorkerThreadRunner.js

@@ -1,9 +1,5 @@
-import { dirname, resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { MessageChannel, Worker } from 'node:worker_threads'
-
-const __dirname = dirname(fileURLToPath(import.meta.url))
-const workerThreadHelperPath = resolve(__dirname, 'workerThreadHelper.js')
+import { join } from 'desm'
 
 export default class WorkerThreadRunner {
   #workerThread = null
@@ -11,17 +7,20 @@ export default class WorkerThreadRunner {
   constructor(funOptions, env) {
     const { codeDir, functionKey, handler, servicePath, timeout } = funOptions
 
-    this.#workerThread = new Worker(workerThreadHelperPath, {
-      // don't pass process.env from the main process!
-      env,
-      workerData: {
-        codeDir,
-        functionKey,
-        handler,
-        servicePath,
-        timeout,
+    this.#workerThread = new Worker(
+      join(import.meta.url, 'workerThreadHelper.js'),
+      {
+        // don't pass process.env from the main process!
+        env,
+        workerData: {
+          codeDir,
+          functionKey,
+          handler,
+          servicePath,
+          timeout,
+        },
       },
-    })
+    )
   }
 
   // () => Promise<number>

package/src/lambda/routes/invocations/invocationsRoute.js

@@ -25,11 +25,11 @@ export default function invocationsRoute(lambda, options) {
       // check client context header was set
       if (clientContextHeader) {
         const clientContextBuffer = Buffer.from(clientContextHeader, 'base64')
-        clientContext = parse(clientContextBuffer.toString('utf-8'))
+        clientContext = parse(clientContextBuffer.toString('utf8'))
       }
 
       // check if payload was set, if not, default event is an empty object
-      const event = payload.length > 0 ? parse(payload.toString('utf-8')) : {}
+      const event = payload.length > 0 ? parse(payload.toString('utf8')) : {}
 
       const invokeResults = await invocationsController.invoke(
         functionName,

package/src/lambda/routes/invoke-async/invokeAsyncRoute.js

@@ -13,7 +13,7 @@ export default function invokeRoute(lambda, options) {
         payload,
       } = request
 
-      const event = parse(payload.toString('utf-8'))
+      const event = parse(payload.toString('utf8'))
 
       return invokeAsyncController.invokeAsync(functionName, event)
     },

package/src/utils/checkGoVersion.js

@@ -5,7 +5,7 @@ export default async function checkGoVersion() {
 
   try {
     const { stdout } = await execa('go', ['version'])
-    if (stdout.match(/go1.\d+/g)) {
+    if (/go1.\d+/g.test(stdout)) {
       goVersion = '1.x'
     }
   } catch {

package/src/utils/parseHeaders.js

@@ -1,4 +1,4 @@
-import unflatten from './unflatten.js'
+import unflat from 'array-unflat-js'
 
 const { fromEntries } = Object
 
@@ -8,7 +8,7 @@ export default function parseHeaders(rawHeaders) {
     return null
   }
 
-  const unflattened = unflatten(rawHeaders, 2)
+  const unflattened = unflat(rawHeaders)
 
   return fromEntries(unflattened)
 }

package/src/utils/parseMultiValueHeaders.js

@@ -1,4 +1,4 @@
-import unflatten from './unflatten.js'
+import unflat from 'array-unflat-js'
 
 const { fromEntries } = Object
 
@@ -10,7 +10,7 @@ export default function parseMultiValueHeaders(rawHeaders) {
   }
 
   const map = new Map()
-  const unflattened = unflatten(rawHeaders, 2)
+  const unflattened = unflat(rawHeaders)
 
   // eslint-disable-next-line no-restricted-syntax
   for (const [key, value] of unflattened) {

package/src/utils/splitHandlerPathAndName.js

@@ -8,7 +8,7 @@ export default function splitHandlerPathAndName(handler) {
   //  filename: source
   //  path: ./src/somefolder/source
   //  name: LambdaFunctions::Handler.process
-  if (handler.match(/::/)) {
+  if (/::/.test(handler)) {
     const prepathDelimiter = handler.lastIndexOf('/')
     const prepath = handler.substr(0, prepathDelimiter + 1) // include '/' for path
     const postpath = handler.substr(prepathDelimiter + 1)

package/src/utils/unflatten.js

@@ -1,11 +0,0 @@
-// [0, 1, 2, 3, 4 ,5] => [[0, 1], [2, 3], [4, 5]]
-export default function unflatten(value, size) {
-  const unflattened = []
-
-  for (let i = 0; i < value.length; i += size) {
-    const slice = value.slice(i, i + size)
-    unflattened.push(slice)
-  }
-
-  return unflattened
-}