@queue-it/fastly 5.0.0 → 5.0.1-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@queue-it/fastly",
-  "version": "5.0.0",
+  "version": "5.0.1-beta.0",
   "description": "Queue-it connector for Fastly",
   "main": "src/index.ts",
   "author": "devs@queue-it.com",
@@ -20,7 +20,7 @@
   ],
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "bundle": "esbuild src/index.ts --bundle --outfile=bin/index.js --platform=node --target=es2022 && js-compute-runtime bin/index.js bin/main.wasm",
+    "bundle": "esbuild src/index.ts --bundle --outfile=bin/index.js --platform=node --target=es2022 --external:fastly:* && js-compute-runtime bin/index.js bin/main.wasm",
     "build": "fastly compute build",
     "deploy": "fastly compute deploy"
   },

package/src/contextProvider.ts

@@ -17,9 +17,10 @@ export function getHttpHandler(
     req: Request,
     clientIp: string = '',
     bodyString: string = '',
+    decodeRequestBody: boolean = false,
     directActionsSettings?: FastlyDirectActionsSettings
 ): FastlyHttpContextProvider {
-    return new FastlyHttpContextProvider(req, clientIp, bodyString, directActionsSettings);
+    return new FastlyHttpContextProvider(req, clientIp, bodyString, decodeRequestBody, directActionsSettings);
 }
 
 export class FastlyHttpContextProvider implements IConnectorContextProvider {
@@ -35,9 +36,10 @@ export class FastlyHttpContextProvider implements IConnectorContextProvider {
         fReq: Request,
         clientIp: string = '',
         bodyString: string = '',
+        decodeRequestBody: boolean = false,
         directActionsSettings?: FastlyDirectActionsSettings
     ) {
-        this._httpRequest = new FastlyHttpRequest(fReq, clientIp, bodyString);
+        this._httpRequest = new FastlyHttpRequest(fReq, clientIp, bodyString, decodeRequestBody);
         this._httpResponse = new FastlyHttpResponse();
         this._normalizationProvider = new DefaultNormalizationProvider();
         this._cryptoProvider = new FastlyCryptoProvider();
@@ -102,7 +104,12 @@ export class FastlyHttpContextProvider implements IConnectorContextProvider {
 class FastlyHttpRequest implements IHttpRequest {
     private _parsedCookieDic: Record<string, string> | null = null;
 
-    constructor(private baseReq: Request, private _clientIp: string = '', private _bodyString: string = '') {}
+    constructor(
+        private baseReq: Request,
+        private _clientIp: string = '',
+        private _bodyString: string = '',
+        private _decodeRequestBody: boolean = false
+    ) {}
 
     getUserAgent(): string {
         return this.getHeader('user-agent');
@@ -141,6 +148,13 @@ class FastlyHttpRequest implements IHttpRequest {
     }
 
     getRequestBodyAsString(): string {
+        if (this._decodeRequestBody) {
+            try {
+                return decodeURIComponent(this._bodyString);
+            } catch {
+                // fall through to return the raw body
+            }
+        }
         return this._bodyString;
     }
 

package/src/helper.ts

@@ -1,5 +1,5 @@
 export class QueueITHelper {
-  static readonly KUP_VERSION: string = "fastly-5.0.0";
+  static readonly KUP_VERSION: string = "fastly-5.0.1";
 
   static addKUPlatformVersion(redirectQueueUrl: string): string {
     return `${redirectQueueUrl}&kupver=${QueueITHelper.KUP_VERSION}`;

package/src/integrationConfigProvider.ts

@@ -61,6 +61,7 @@ const integrationCustomerId = "customerId",
   enqueueTokenValidityTimeKey = "enqueueTokenValidityTime",
   enqueueTokenKeyEnabledKey = "enqueueTokenKeyEnabled",
   requestBodyEnabledKey = "requestBodyEnabled",
+  decodeRequestBodyKey = "decodeRequestBody",
   directActionsDisabledKey = "directActionsDisabled",
   directActionsProxyKeyKey = "directActionsProxyKey",
   directPassTimeoutKey = "directPassTimeout",
@@ -107,6 +108,12 @@ export function resolveIntegrationDetails(): IntegrationDetails | null {
     requestBodyEnabled = requestBodyEnabledVal.toLowerCase() === "true";
   }
 
+  let decodeRequestBody = false;
+  const decodeRequestBodyVal = dict.get(decodeRequestBodyKey);
+  if (decodeRequestBodyVal !== null) {
+    decodeRequestBody = decodeRequestBodyVal.toLowerCase() === "true";
+  }
+
   let directActionsDisabled = false;
   const directActionsDisabledVal = dict.get(directActionsDisabledKey);
   if (directActionsDisabledVal !== null) {
@@ -150,6 +157,7 @@ export function resolveIntegrationDetails(): IntegrationDetails | null {
     enqueueTokenValidityTime,
     enqueueTokenKeyEnabled,
     requestBodyEnabled,
+    decodeRequestBody,
     new QueueItIntegrationEndpointProvider(),
     new MockLogger(),
     {
@@ -227,6 +235,7 @@ export class IntegrationDetails {
     public enqueueTokenValidityTime: number = 240000,
     public enqueueTokenKeyEnabled: boolean = false,
     public requestBodyEnabled: boolean = false,
+    public decodeRequestBody: boolean = false,
     public provider: IntegrationEndpointProvider = new QueueItIntegrationEndpointProvider(),
     public logger: RequestLogger = new MockLogger(),
     directActionsSettings?: FastlyDirectActionsSettings

package/src/requestResponseHandler.ts

@@ -38,7 +38,7 @@ export async function onQueueITRequest(
     bodyString = ((await req.clone().text()) || '').substring(0, 2048);
   }
 
-  httpProvider = getHttpHandler(req, conf.clientIp, bodyString, conf.directActionsSettings);
+  httpProvider = getHttpHandler(req, conf.clientIp, bodyString, conf.decodeRequestBody, conf.directActionsSettings);
   sendNoCacheHeaders = false;
 
   if (conf.enqueueTokenEnabled) {