serverless-offline 10.0.0 → 10.0.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "dedicatedTo": "Blue, a great migrating bird.",
   "name": "serverless-offline",
-  "version": "10.0.0",
+  "version": "10.0.1",
   "description": "Emulate AWS λ and API Gateway locally when developing your Serverless project",
   "license": "MIT",
   "exports": {
@@ -17,6 +17,7 @@
     "prepare": "husky install",
     "prepare-release": "standard-version && prettier --write CHANGELOG.md",
     "prepublishOnly": "npm run lint",
+    "prettier": "prettier --check .",
     "prettier-check": "prettier -c --ignore-path .gitignore \"**/*.{css,html,js,json,md,yaml,yml}\"",
     "prettier-check:updated": "pipe-git-updated --ext=css --ext=html --ext=js --ext=json --ext=md --ext=yaml --ext=yml -- prettier -c",
     "prettify": "prettier --write --ignore-path .gitignore \"**/*.{css,html,js,json,md,yaml,yml}\"",
@@ -52,12 +53,6 @@
     "websocket"
   ],
   "author": "David Hérault <dherault@gmail.com> (https://github.com/dherault)",
-  "maintainers": [
-    "Bilal Soylu (https://github.com/Bilal-S)",
-    "Daniel Cottone <daniel.cottone@gmail.com> (https://github.com/daniel-cottone)",
-    "Leonardo Alifraco (https://github.com/leonardoalifraco)",
-    "Michael Staub (https://github.com/mikestaub)"
-  ],
   "contributors": [
     "Adam Sweeting (https://github.com/adamelliottsweeting)",
     "Adrien (https://github.com/AdrienGiboire)",
@@ -191,7 +186,7 @@
     "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.2.2",
     "@serverless/utils": "^6.7.0",
-    "aws-sdk": "^2.1209.0",
+    "aws-sdk": "^2.1213.0",
     "boxen": "^7.0.0",
     "chalk": "^5.0.1",
     "execa": "^6.1.0",

package/src/ServerlessOffline.js

@@ -134,7 +134,7 @@ export default class ServerlessOffline {
   async #startWithExplicitEnd() {
     await this.start()
     await this.#ready()
-    this.end()
+    await this.end()
   }
 
   async #listenForTermination() {

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

@@ -7,11 +7,12 @@ import {
   lowerCaseKeys,
   nullIfEmpty,
   parseHeaders,
+  parseQueryStringParametersForPayloadV2,
 } from '../../../utils/index.js'
 
 const { isArray } = Array
 const { parse } = JSON
-const { assign, entries, fromEntries } = Object
+const { assign, entries } = Object
 
 // https://www.serverless.com/framework/docs/providers/aws/events/http-api/
 // https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
@@ -142,7 +143,7 @@ export default class LambdaProxyIntegrationEventV2 {
       isBase64Encoded: false,
       pathParameters: nullIfEmpty(pathParams),
       queryStringParameters: this.#request.url.search
-        ? fromEntries(Array.from(this.#request.url.searchParams))
+        ? parseQueryStringParametersForPayloadV2(this.#request.url.searchParams)
         : null,
       rawPath: this.#request.url.pathname,
       rawQueryString: this.#request.url.searchParams.toString(),

package/src/utils/index.js

@@ -12,6 +12,7 @@ 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 parseQueryStringParametersForPayloadV2 } from './parseQueryStringParametersForPayloadV2.js'
 export { default as splitHandlerPathAndName } from './splitHandlerPathAndName.js'
 
 // export { default as baseImage } from './baseImage.js'

package/src/utils/parseQueryStringParametersForPayloadV2.js

@@ -0,0 +1,22 @@
+/**
+ *
+ * @description Instead of using `multiValueQueryStringParameters` API Gateway HTTP API combines
+ * duplicate query string keys with commas in the `queryStringParameters` field.
+ * https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
+ *
+ * @param { URLSearchParams } searchParams
+ */
+export default function parseQueryStringParametersForPayloadV2(searchParams) {
+  const keyValuePairs = Array.from(searchParams)
+
+  if (keyValuePairs.length === 0) {
+    return null
+  }
+
+  return keyValuePairs.reduce((previousValue, [key, value]) => {
+    if (!previousValue[key]) {
+      return { ...previousValue, [key]: value }
+    }
+    return { ...previousValue, [key]: [previousValue[key], value].join(',') }
+  }, {})
+}