@queue-it/fastly 2.0.0-beta.0 → 2.0.0-beta.2

package/README.md

@@ -40,13 +40,16 @@ There are two methods of installation:
   You need to edit the Host and name it **origin**.
 - Create a second host that has the hostname of `{yourCustomerId}.queue-it.net` and name it **queue-it**.  
   Edit the host, go to advanced options and fill in the same hostname in **Override host**
-- Go to **Dictionaries** and create a new dictionary named `IntegrationConfiguration`.  
-  Add the following items in the dictionary:
+- Go to **Resources -> Config stores** and create a new config store named `IntegrationConfiguration`.
+  - Add the following items in the config store (you can find these values in the Go Queue-It self-service platform):
     - customerId: Your customer ID
     - apiKey: The API key for your account
     - secret: Your KnownUserV3 secret
     - queueItOrigin: The name of the queue-it host, in this case it's `queue-it`  
-      You can find these values in the Go Queue-It self-service platform.
+  - Go to **Linked Services** and click on `Link Service`
+    - Select your service and click `Next`
+    - Click `Link and activate` to link the `Config store` to your service. It should generate a new version
+  - You can verify that the `Config store` has been linked by going to your service and see it in the section `Config stores`
 - Download the latest package from the releases page and unarchive it.
 - Edit the `fastly.toml` file and copy the ID of your service (you can see this by opening up the service in Fastly) and
   replace __{YourServiceId}__ with it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@queue-it/fastly",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.2",
   "description": "Queue-it connector for Fastly",
   "main": "src/index.ts",
   "author": "devs@queue-it.com",

package/src/contextProvider.ts

@@ -68,7 +68,13 @@ export class FastlyHttpRequest implements IHttpRequest {
         if (this.parsedCookieDic.size == 0) {
             this.parseCookies(this.getHeader('cookie'))
         }
-        return this.parsedCookieDic.has(cookieKey) ? decodeURIComponent(this.parsedCookieDic.get(cookieKey)!) : '';
+        if (!this.parsedCookieDic.has(cookieKey)) return '';
+        const cookieVal = this.parsedCookieDic.get(cookieKey)!;
+        try {
+            return decodeURIComponent(cookieVal);
+        } catch {
+            return cookieVal;
+        }
     }
 
     getHeader(name: string): string {

package/src/helper.ts

@@ -2,7 +2,7 @@ import { Utils } from "./sdk/QueueITHelpers";
 import { hmacString } from "./sdk/helpers/crypto";
 
 export class QueueITHelper {
-  static readonly KUP_VERSION: string = "fastly-1.1.0";
+  static readonly KUP_VERSION: string = "fastly-2.0.0";
 
   static configureKnownUserHashing(): void {
     Utils.generateSHA256Hash = hmacString;

package/src/integrationConfigProvider.ts

@@ -1,3 +1,4 @@
+import { ConfigStore } from "fastly:config-store";
 import { RequestLogger } from "./helper";
 
 export async function getIntegrationConfig(

package/src/sdk/QueueITHelpers.ts

@@ -33,7 +33,11 @@ export class Utils {
     }
 
     static decodeUrl(url: string): string {
-        return decodeURIComponent(url);
+        try {
+            return decodeURIComponent(url);
+        } catch {
+            return url;
+        }
     }
 
     static generateSHA256Hash: (a: string, b: string) => string = (secretKey: string, stringToHash: string): string => "";
@@ -107,11 +111,15 @@ export class Utils {
         const regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)');
         const results = regex.exec(url);
         if (results === null) return '';
-        if (results.length < 3) {
+        if (results.length < 3 || results[2] === null || results[2] === undefined) {
             return '';
         }
 
-        return decodeURIComponent(results[2].replaceAll('+', ' '));
+        try {
+            return decodeURIComponent(results[2].replaceAll('+', ' '));
+        } catch {
+            return results[2];
+        }
     }
 
     static removeQueueItToken(url: string): string {

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Queue-it
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.