serverless-offline 8.8.1 → 9.1.1

package/src/utils/checkGoVersion.js

@@ -0,0 +1,16 @@
+import { execa } from 'execa'
+
+export default async function checkGoVersion() {
+  let goVersion
+
+  try {
+    const { stdout } = await execa('go', ['version'])
+    if (stdout.match(/go1.\d+/g)) {
+      goVersion = '1.x'
+    }
+  } catch {
+    // @ignore
+  }
+
+  return goVersion
+}

package/src/utils/createApiKey.js

@@ -0,0 +1,5 @@
+import { createHash } from 'node:crypto'
+
+export default function createApiKey() {
+  return createHash('md5').digest('hex')
+}

package/src/utils/createUniqueId.js

@@ -0,0 +1,5 @@
+import { randomUUID } from 'node:crypto'
+
+export default function createUniqueId() {
+  return randomUUID()
+}

package/src/utils/detectExecutable.js

@@ -0,0 +1,11 @@
+import { execa } from 'execa'
+
+export default async function detectExecutable(exe, versionFlag = '--version') {
+  try {
+    const { failed } = await execa(exe, [versionFlag])
+
+    return failed === false
+  } catch {
+    return false
+  }
+}

package/{dist → src}/utils/formatToClfTime.js

@@ -1,15 +1,8 @@
-"use strict";
+import { DateTime } from 'luxon'
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = formatToClfTime;
+const { fromMillis } = DateTime
 
-var _luxon = require("luxon");
-
-const {
-  fromMillis
-} = _luxon.DateTime; // CLF -> Common Log Format
+// CLF -> Common Log Format
 // https://httpd.apache.org/docs/1.3/logs.html#common
 // [day/month/year:hour:minute:second zone]
 // day = 2*digit
@@ -19,7 +12,6 @@ const {
 // minute = 2*digit
 // second = 2*digit
 // zone = (`+' | `-') 4*digit
-
-function formatToClfTime(millis) {
-  return fromMillis(millis).toFormat('dd/MMM/yyyy:HH:mm:ss ZZZ');
-}
+export default function formatToClfTime(millis) {
+  return fromMillis(millis).toFormat('dd/MMM/yyyy:HH:mm:ss ZZZ')
+}

package/src/utils/generateHapiPath.js

@@ -0,0 +1,26 @@
+export default function generateHapiPath(path, options, serverless) {
+  // path must start with '/'
+  let hapiPath = path.startsWith('/') ? path : `/${path}`
+
+  if (!options.noPrependStageInUrl) {
+    const stage = options.stage || serverless.service.provider.stage
+    // prepend the stage to path
+    hapiPath = `/${stage}${hapiPath}`
+  }
+
+  if (options.prefix) {
+    hapiPath = `/${options.prefix}${hapiPath}`
+  }
+
+  if (
+    hapiPath !== '/' &&
+    hapiPath.endsWith('/') &&
+    (!options.noStripTrailingSlashInUrl || hapiPath.endsWith('+}/'))
+  ) {
+    hapiPath = hapiPath.slice(0, -1)
+  }
+
+  hapiPath = hapiPath.replace(/\+}/g, '*}')
+
+  return hapiPath
+}

package/src/utils/getHttpApiCorsConfig.js

@@ -0,0 +1,28 @@
+import { log } from '@serverless/utils/log.js'
+
+export default function getHttpApiCorsConfig(httpApiCors) {
+  if (httpApiCors === true) {
+    // default values that should be set by serverless
+    // https://www.serverless.com/framework/docs/providers/aws/events/http-api/
+    const c = {
+      allowedHeaders: [
+        'Authorization',
+        'Content-Type',
+        'X-Amz-Date',
+        'X-Amz-Security-Token',
+        'X-Amz-User-Agent',
+        'X-Api-Key',
+      ],
+      allowedMethods: ['DELETE', 'GET', 'OPTIONS', 'PATCH', 'POST', 'PUT'],
+      allowedOrigins: ['*'],
+    }
+
+    log.debug('Using CORS policy', c)
+
+    return c
+  }
+
+  log.debug('Using CORS policy', httpApiCors)
+
+  return httpApiCors
+}

package/src/utils/index.js

@@ -0,0 +1,42 @@
+export { default as createApiKey } from './createApiKey.js'
+export { default as createUniqueId } from './createUniqueId.js'
+export { default as detectExecutable } from './detectExecutable.js'
+export { default as formatToClfTime } from './formatToClfTime.js'
+export { default as getHttpApiCorsConfig } from './getHttpApiCorsConfig.js'
+export { default as jsonPath } from './jsonPath.js'
+export { default as lowerCaseKeys } from './lowerCaseKeys.js'
+export { default as parseHeaders } from './parseHeaders.js'
+export { default as parseMultiValueHeaders } from './parseMultiValueHeaders.js'
+export { default as parseMultiValueQueryStringParameters } from './parseMultiValueQueryStringParameters.js'
+export { default as parseQueryStringParameters } from './parseQueryStringParameters.js'
+export { default as splitHandlerPathAndName } from './splitHandlerPathAndName.js'
+export { default as checkDockerDaemon } from './checkDockerDaemon.js'
+export { default as checkGoVersion } from './checkGoVersion.js'
+export { default as generateHapiPath } from './generateHapiPath.js'
+// export { default as baseImage } from './baseImage.js'
+
+const { isArray } = Array
+const { keys } = Object
+
+// 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')
+    ? 'binary'
+    : 'utf8'
+}
+
+export function nullIfEmpty(obj) {
+  return obj && (keys(obj).length > 0 ? obj : null)
+}
+
+export function isPlainObject(obj) {
+  return typeof obj === 'object' && !isArray(obj) && obj != null
+}
+
+export function toPlainOrEmptyObject(obj) {
+  return typeof obj === 'object' && !isArray(obj) ? obj : {}
+}

package/src/utils/jsonPath.js

@@ -0,0 +1,13 @@
+import { JSONPath } from 'jsonpath-plus'
+
+export default function jsonPath(json, path) {
+  // NOTE: JSONPath returns undefined if 'json' is e.g. null, undefined, string,
+  // number (anything other than JSON)
+  const [result] =
+    JSONPath({
+      json,
+      path,
+    }) || []
+
+  return result
+}

package/src/utils/logRoutes.js

@@ -0,0 +1,64 @@
+import boxen from 'boxen'
+import chalk from 'chalk'
+
+const { max } = Math
+
+const dodgerblue = chalk.hex('#1e90ff')
+const grey = chalk.hex('#808080')
+const lime = chalk.hex('#00ff00')
+const orange = chalk.hex('#ffa500')
+const peachpuff = chalk.hex('#ffdab9')
+const plum = chalk.hex('#dda0dd')
+const red = chalk.hex('#ff0000')
+const yellow = chalk.hex('#ffff00')
+
+const colorMethodMapping = new Map([
+  ['DELETE', red],
+  ['GET', dodgerblue],
+  // ['HEAD', ...],
+  ['PATCH', orange],
+  ['POST', plum],
+  ['PUT', dodgerblue],
+])
+
+// logs based on:
+// https://github.com/serverless/serverless/blob/master/lib/classes/CLI.js
+
+function logRoute(method, server, path, maxLength, dimPath = false) {
+  const methodColor = colorMethodMapping.get(method) ?? peachpuff
+  const methodFormatted = method.padEnd(maxLength, ' ')
+
+  return `${methodColor(methodFormatted)} ${yellow.dim('|')} ${grey.dim(
+    server,
+  )}${dimPath ? grey.dim(path) : lime(path)}`
+}
+
+function getMaxHttpMethodNameLength(routeInfo) {
+  return max(...routeInfo.map(({ method }) => method.length))
+}
+
+export default function logRoutes(routeInfo) {
+  const boxenOptions = {
+    borderColor: 'yellow',
+    dimBorder: true,
+    margin: 1,
+    padding: 1,
+  }
+  const maxLength = getMaxHttpMethodNameLength(routeInfo)
+
+  // eslint-disable-next-line no-console
+  console.log(
+    boxen(
+      routeInfo
+        .map(
+          ({ method, path, server, invokePath }) =>
+            // eslint-disable-next-line prefer-template
+            logRoute(method, server, path, maxLength) +
+            '\n' +
+            logRoute('POST', server, invokePath, maxLength, true),
+        )
+        .join('\n'),
+      boxenOptions,
+    ),
+  )
+}

package/src/utils/lowerCaseKeys.js

@@ -0,0 +1,6 @@
+const { entries, fromEntries } = Object
+
+// (obj: { [string]: string }): { [Lowercase<string>]: string }
+export default function parseHeaders(obj) {
+  return fromEntries(entries(obj).map(([k, v]) => [k.toLowerCase(), v]))
+}

package/src/utils/parseHeaders.js

@@ -0,0 +1,14 @@
+import unflatten from './unflatten.js'
+
+const { fromEntries } = Object
+
+// (rawHeaders: Array<string>): { [string]: string }
+export default function parseHeaders(rawHeaders) {
+  if (rawHeaders.length === 0) {
+    return null
+  }
+
+  const unflattened = unflatten(rawHeaders, 2)
+
+  return fromEntries(unflattened)
+}

package/src/utils/parseMultiValueHeaders.js

@@ -0,0 +1,27 @@
+import unflatten from './unflatten.js'
+
+const { fromEntries } = Object
+
+// https://aws.amazon.com/blogs/compute/support-for-multi-value-parameters-in-amazon-api-gateway/
+// (rawHeaders: Array<string>): { [string]: Array<string> }
+export default function parseMultiValueHeaders(rawHeaders) {
+  if (rawHeaders.length === 0) {
+    return null
+  }
+
+  const map = new Map()
+  const unflattened = unflatten(rawHeaders, 2)
+
+  // eslint-disable-next-line no-restricted-syntax
+  for (const [key, value] of unflattened) {
+    const item = map.get(key)
+
+    if (item) {
+      item.push(value)
+    } else {
+      map.set(key, [value])
+    }
+  }
+
+  return fromEntries(map)
+}

package/src/utils/parseMultiValueQueryStringParameters.js

@@ -0,0 +1,31 @@
+import { BASE_URL_PLACEHOLDER } from '../config/index.js'
+
+const { fromEntries } = Object
+
+// https://aws.amazon.com/blogs/compute/support-for-multi-value-parameters-in-amazon-api-gateway/
+// [ [ 'petType', 'dog' ], [ 'petType', 'fish' ] ]
+// => { petType: [ 'dog', 'fish' ] },
+export default function parseMultiValueQueryStringParameters(url) {
+  // dummy placeholder url for the WHATWG URL constructor
+  // https://github.com/nodejs/node/issues/12682
+  const { searchParams } = new URL(url, BASE_URL_PLACEHOLDER)
+
+  if (Array.from(searchParams).length === 0) {
+    return null
+  }
+
+  const map = new Map()
+
+  // eslint-disable-next-line no-restricted-syntax
+  for (const [key, value] of searchParams) {
+    const item = map.get(key)
+
+    if (item) {
+      item.push(value)
+    } else {
+      map.set(key, [value])
+    }
+  }
+
+  return fromEntries(map)
+}

package/src/utils/parseQueryStringParameters.js

@@ -0,0 +1,15 @@
+import { BASE_URL_PLACEHOLDER } from '../config/index.js'
+
+const { fromEntries } = Object
+
+export default function parseQueryStringParameters(url) {
+  // dummy placeholder url for the WHATWG URL constructor
+  // https://github.com/nodejs/node/issues/12682
+  const { searchParams } = new URL(url, BASE_URL_PLACEHOLDER)
+
+  if (Array.from(searchParams).length === 0) {
+    return null
+  }
+
+  return fromEntries(searchParams)
+}

package/src/utils/splitHandlerPathAndName.js

@@ -0,0 +1,31 @@
+// some-folder/src.index => some-folder/src
+export default function splitHandlerPathAndName(handler) {
+  // Split handler into method name and path i.e. handler.run
+  // Support Ruby paths with namespace resolution operators e.g.
+  //  ./src/somefolder/source.LambdaFunctions::Handler.process
+  //  prepath: ./src/somefolder/
+  //  postpath: source.LambdaFunctions::Handler.process
+  //  filename: source
+  //  path: ./src/somefolder/source
+  //  name: LambdaFunctions::Handler.process
+  if (handler.match(/::/)) {
+    const prepathDelimiter = handler.lastIndexOf('/')
+    const prepath = handler.substr(0, prepathDelimiter + 1) // include '/' for path
+    const postpath = handler.substr(prepathDelimiter + 1)
+    const nameDelimiter = postpath.indexOf('.')
+    const filename = postpath.substr(0, nameDelimiter)
+    const path = prepath + filename
+    const name = postpath.substr(nameDelimiter + 1)
+
+    return [path, name]
+  }
+
+  // Support nested paths i.e. ./src/somefolder/.handlers/handler.run
+  //  path: ./src/somefoler/.handlers/handler
+  //  name: run
+  const delimiter = handler.lastIndexOf('.')
+  const path = handler.substr(0, delimiter)
+  const name = handler.substr(delimiter + 1)
+
+  return [path, name]
+}

package/src/utils/unflatten.js

@@ -0,0 +1,11 @@
+// [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
+}

package/CHANGELOG.md

@@ -1,78 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-### [8.8.1](https://github.com/dherault/serverless-offline/compare/v8.8.0...v8.8.1) (2022-07-09)
-
-### Maintenance Improvements
-
-- remove update-notifier ([fbcd41e](https://github.com/dherault/serverless-offline/commit/fbcd41eb29fd5aa60d3ce52a734b89ed4113d893))
-
-## [8.8.0](https://github.com/dherault/serverless-offline/compare/v8.7.0...v8.8.0) (2022-05-17)
-
-### Features
-
-- Support using go build ([#1334](https://github.com/dherault/serverless-offline/issues/1334)) ([#1356](https://github.com/dherault/serverless-offline/issues/1356)) ([a79b15c](https://github.com/dherault/serverless-offline/commit/a79b15c529b60ac0d037716cf6e475bcda8f822e))
-
-### Bug Fixes
-
-- lowercase API gateway V2 event headers ([#1288](https://github.com/dherault/serverless-offline/issues/1288)) ([9ff4cf3](https://github.com/dherault/serverless-offline/commit/9ff4cf38c4f620545d95d815d0b420d134be5cb1))
-- remove (now) useless worker thread support check ([#1406](https://github.com/dherault/serverless-offline/issues/1406)) ([1b2ae00](https://github.com/dherault/serverless-offline/commit/1b2ae0016cec385416c240b55669df038ddc5d1e))
-- remove babel-eslint ([17adeb5](https://github.com/dherault/serverless-offline/commit/17adeb5b923d990f64e96e234297999baaca30a0))
-- remove engine check ([#1407](https://github.com/dherault/serverless-offline/issues/1407)) ([58b2199](https://github.com/dherault/serverless-offline/commit/58b21998e2ced5eeab3ebf0a30fd1849e974befe))
-- remove unneeded deps ([95e1fe5](https://github.com/dherault/serverless-offline/commit/95e1fe5bbc4aceb83bd8135503c3c4123006d61b))
-- solve merge issues ([99a2578](https://github.com/dherault/serverless-offline/commit/99a25789ce6d4be718dcae470e99bde5f3ab8b86))
-- temporary revert nested modules ([#1419](https://github.com/dherault/serverless-offline/issues/1419)) ([f4317e4](https://github.com/dherault/serverless-offline/commit/f4317e4f6bd818ed6d243b440cab9d7030b1c30d))
-
-### Maintenance Improvements
-
-- import from namespace ([#1405](https://github.com/dherault/serverless-offline/issues/1405)) ([ed9d6cd](https://github.com/dherault/serverless-offline/commit/ed9d6cd48fbdba26cf7a4b5aa096464fba94193e))
-- import process explicit ([#1418](https://github.com/dherault/serverless-offline/issues/1418)) ([8893c67](https://github.com/dherault/serverless-offline/commit/8893c67718259b7d760194c74f31ee56fcd7e789))
-- prettify docs ([2ee5b1e](https://github.com/dherault/serverless-offline/commit/2ee5b1ef56133aecbc120f2d20858411b30956d3))
-- remove extend module, replace with Object.assign ([#1417](https://github.com/dherault/serverless-offline/issues/1417)) ([90d5169](https://github.com/dherault/serverless-offline/commit/90d516909c3c41e907d728afd47cf436f078bf97))
-
-## [8.7.0](https://github.com/dherault/serverless-offline/compare/v8.6.0...v8.7.0) (2022-04-13)
-
-- [Validate authorizer context response to better mimic API Gateway](https://github.com/dherault/serverless-offline/pull/1376)
-- [Add support for the AUTHORIZER env variable for LambdaIntegration](https://github.com/dherault/serverless-offline/pull/1308)
-
-## [8.6.0](https://github.com/dherault/serverless-offline/compare/v8.5.0...v8.6.0) (2022-04-13)
-
-- [POC for externally triggering cleanup of lambda functions](https://github.com/dherault/serverless-offline/pull/1093)
-- [Fixing AWS env vars](https://github.com/dherault/serverless-offline/pull/1108)
-- [Ensure gateway IP is truthy before adding to docker args](https://github.com/dherault/serverless-offline/pull/1174)
-- [update debugging instructions](https://github.com/dherault/serverless-offline/pull/1221)
-- [Never remove cached node_modules or binary modules](https://github.com/dherault/serverless-offline/pull/1230)
-- [Handle multiple cookies with the same name in the same way API Gateway does.](https://github.com/dherault/serverless-offline/pull/1249)
-
-## [8.5.0](https://github.com/dherault/serverless-offline/compare/v8.4.0...v8.5.0) (2022-02-18)
-
-### Features
-
-- Add `httpEvent.operationId` to the request context ([#1325](https://github.com/dherault/serverless-offline/issues/1325)) ([e217fcb](https://github.com/dherault/serverless-offline/commit/e217fcba61fe3eae110f506268c71b350e1937da)) ([Quenby Mitchell](https://github.com/qswinson))
-- Ensure `websocket` parity with API Gateway ([#1301](https://github.com/dherault/serverless-offline/issues/1301)) ([8f02226](https://github.com/dherault/serverless-offline/commit/8f0222644e5946c2bba8853c7ee6c224e7a33b41)) ([Christian Nuss](https://github.com/cnuss))
-- Introduce header to override authorizer response ([#1328](https://github.com/dherault/serverless-offline/issues/1328)) ([a5158a4](https://github.com/dherault/serverless-offline/commit/a5158a489048ceee007cefa41441f841b51db59c)) ([ericctsf](https://github.com/ericctsf))
-- Support injection of custom authentication strategy ([#1314](https://github.com/dherault/serverless-offline/issues/1314)) ([febfe77](https://github.com/dherault/serverless-offline/commit/febfe77d470b2e5e4fbfe5243b265d6a27fb84f3)) ([tom-stclair](https://github.com/tom-stclair))
-
-### Bug Fixes
-
-- Fix payload normalization ([#1332](https://github.com/dherault/serverless-offline/issues/1332)) ([e9e8169](https://github.com/dherault/serverless-offline/commit/e9e816996e8da9605a4a9856a60ddfbbe885e1b1)) ([Taras Romaniv](https://github.com/trsrm))
-- Skip clearing undefined modules in `InProcessRunner` ([#1339](https://github.com/dherault/serverless-offline/issues/1339)) ([5026e43](https://github.com/dherault/serverless-offline/commit/5026e43974dd73de66bf2c82b742cc7341f7c55b)) ([Kevin Rueter](https://github.com/kerueter))
-
-## [8.4.0](https://github.com/dherault/serverless-offline/compare/v8.3.1...v8.4.0) (2022-01-28)
-
-### Features
-
-- `go-runner` implementation ([#1320](https://github.com/dherault/serverless-offline/issues/1320)) ([6bb54fd](https://github.com/dherault/serverless-offline/commit/6bb54fdccebd3db61221a9b8f709414876086324))
-- `--disableScheduledEvents` CLI param support ([#1185](https://github.com/dherault/serverless-offline/issues/1185)) ([4503567](https://github.com/dherault/serverless-offline/commit/4503567cdb8fa31ac9df98b667a403b0408f8444))
-
-### Bug Fixes
-
-- Handle custom authorizer 401 in non in-process runners ([#1319](https://github.com/dherault/serverless-offline/issues/1319)) ([8d61bde](https://github.com/dherault/serverless-offline/commit/8d61bde74cdfb37410a5c1952ca608e815eeb1cf))
-- Support `httpApi` payload override on function level ([#1312](https://github.com/dherault/serverless-offline/issues/1312)) ([8db63dd](https://github.com/dherault/serverless-offline/commit/8db63dda6054198775ed3b567dc3c1dbf73eb574))
-
-### [8.3.1](https://github.com/dherault/serverless-offline/compare/v8.3.0...v8.3.1) (2021-11-25)
-
-### Bug Fixes
-
-- Fix handling of modern logs (`Cannot read properties of undefined (reading 'notice')` error)