@queue-it/fastly 1.1.0 → 2.0.0-beta.1

package/{assembly → src}/sdk/QueueITHelpers.ts

@@ -1,19 +1,15 @@
-//@ts-ignore
-import {RegExp} from "assemblyscript-regex";
 import {KeyValuePair, RequestValidationResult} from "./Models";
 import {IDateTimeProvider} from "./HttpContextProvider";
-import {Date as WasiDate} from "as-wasi";
 import {encodeURIComponent, decodeURIComponent} from "./helpers/Uri";
 import {KnownUser} from "./KnownUser";
-import {Response} from "@fastly/as-compute";
 import {UserInQueueService} from "./UserInQueueService";
 
 export class QueueUrlParams {
-    public timeStamp: i64 = 0;
+    public timeStamp: number = 0;
     public eventId: string = "";
     public hashCode: string = "";
-    public extendableCookie: bool = false;
-    public cookieValidityMinutes: i64 = 0;
+    public extendableCookie: boolean = false;
+    public cookieValidityMinutes: number = 0;
     public queueITToken: string = "";
     public queueITTokenWithoutHash: string = "";
     public queueId: string = "";
@@ -37,12 +33,16 @@ 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 => "";
 
-    static endsWith(str: string, search: string): bool {
+    static endsWith(str: string, search: string): boolean {
         if (str == search)
             return true;
         if (str.length == 0 || search.length == 0)
@@ -50,11 +50,11 @@ export class Utils {
         return str.substring(str.length - search.length, str.length) == search;
     }
 
-    static getCurrentTime(): i64 {
-        return Math.floor((WasiDate.now() / 1000) as f64) as i64;
+    static getCurrentTime(): number {
+        return Math.floor(Date.now() / 1000);
     }
 
-    private static _hex2bin: u8[] = [
+    private static _hex2bin: number[] = [
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -78,8 +78,8 @@ export class Utils {
         let rv = '';
         let i = 0;
 
-        let c1: i32;
-        let c2: i32;
+        let c1: number;
+        let c2: number;
 
         while (len > 1) {
             let h1 = str.charAt(i++);
@@ -101,29 +101,33 @@ export class Utils {
     }
 
     static getParameterByName(url: string, name: string): string {
-        const namePart = new RegExp(`[\[\]]`, 'g')
+        const namePart = /[\[\]]/g;
         let match = namePart.exec(name);
-        while (match != null) {
-            let rxmatch = match.matches[0];
+        while (match !== null) {
+            let rxmatch = match[0];
             name = name.replaceAll(rxmatch, '\\$&')
             match = namePart.exec(name);
         }
         const regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)');
         const results = regex.exec(url);
-        if (results == null) return '';
-        if (results.matches.length < 3) {
+        if (results === null) return '';
+        if (results.length < 3 || results[2] === null || results[2] === undefined) {
             return '';
         }
 
-        return decodeURIComponent(results.matches[2].replaceAll('+', ' '));
+        try {
+            return decodeURIComponent(results[2].replaceAll('+', ' '));
+        } catch {
+            return results[2];
+        }
     }
 
     static removeQueueItToken(url: string): string {
-        const pattern = new RegExp("([\?&])(" + KnownUser.QueueITTokenKey + "=[^&]*)", 'gi');
+        const pattern = new RegExp("([?&])(" + KnownUser.QueueITTokenKey + "=[^&]*)", 'gi');
         const match = pattern.exec(url);
-        if (match == null) return url;
+        if (match === null) return url;
 
-        url = url.replaceAll(match.matches[0], '')
+        url = url.replaceAll(match[0], '')
         return url;
     }
 }
@@ -159,9 +163,9 @@ export class QueueParameterHelper {
             if (keyValueArr[0] == QueueParameterHelper.HashKey) {
                 result.hashCode = keyValueArr[1];
             } else if (keyValueArr[0] == QueueParameterHelper.TimeStampKey) {
-                result.timeStamp = I64.parseInt(keyValueArr[1]);
+                result.timeStamp = parseInt(keyValueArr[1], 10) || 0;
             } else if (keyValueArr[0] == QueueParameterHelper.CookieValidityMinutesKey) {
-                result.cookieValidityMinutes = I64.parseInt(keyValueArr[1]);
+                result.cookieValidityMinutes = parseInt(keyValueArr[1], 10) || 0;
             } else if (keyValueArr[0] == QueueParameterHelper.EventIdKey) {
                 result.eventId = keyValueArr[1];
             } else if (keyValueArr[0] == QueueParameterHelper.ExtendableCookieKey) {
@@ -211,9 +215,9 @@ export class CookieHelper {
 }
 
 export class ConnectorDiagnostics {
-    public isEnabled: bool = false;
-    public hasError: bool = false;
-    public validationResult: RequestValidationResult | null
+    public isEnabled: boolean = false;
+    public hasError: boolean = false;
+    public validationResult: RequestValidationResult | null = null
 
     private setStateWithTokenError(customerId: string, errorCode: string): void {
         this.hasError = true;
@@ -258,6 +262,6 @@ export class ConnectorDiagnostics {
 
 export class DateTimeProvider implements IDateTimeProvider {
     getCurrentTime(): Date {
-        return new Date(i64(WasiDate.now()));
+        return new Date(Date.now());
     }
 }

package/{assembly → src}/sdk/UserInQueueService.ts

@@ -81,7 +81,7 @@ export class UserInQueueService {
     private getQueryString(
         customerId: string,
         eventId: string,
-        configVersion: i64,
+        configVersion: number,
         culture: string,
         layoutName: string,
         actionName: string)
@@ -143,7 +143,7 @@ export class UserInQueueService {
         const queueParams = QueueParameterHelper.extractQueueParams(queueitToken);
 
         let requestValidationResult: RequestValidationResult | null;
-        let isTokenValid: bool = false;
+        let isTokenValid: boolean = false;
 
         if (queueParams != null) {
             const tokenValidationResult = this.validateToken(config, queueParams, secretKey);
@@ -201,7 +201,7 @@ export class UserInQueueService {
 
     public extendQueueCookie(
         eventId: string,
-        cookieValidityMinutes: i64,
+        cookieValidityMinutes: number,
         cookieDomain: string,
         secretKey: string): void {
         this.userInQueueStateRepository.reissueQueueCookie(eventId, cookieValidityMinutes, cookieDomain, secretKey)
@@ -237,7 +237,7 @@ export class UserInQueueService {
 
 class TokenValidationResult {
     constructor(
-        public isValid: bool,
+        public isValid: boolean,
         public errorCode: string) {
 
     }

package/{assembly → src}/sdk/UserInQueueStateCookieRepository.ts

@@ -1,6 +1,5 @@
 import {IHttpContextProvider} from './HttpContextProvider'
 import {Utils, CookieHelper} from './QueueITHelpers'
-import {Date as WasiDate} from "as-wasi";
 import {KeyValuePair} from "./Models";
 
 export class UserInQueueStateCookieRepository {
@@ -19,7 +18,7 @@ export class UserInQueueStateCookieRepository {
         return UserInQueueStateCookieRepository._QueueITDataKey + "_" + eventId;
     }
 
-    public store(eventId: string, queueId: string, fixedCookieValidityMinutes: i64,
+    public store(eventId: string, queueId: string, fixedCookieValidityMinutes: number,
                  cookieDomain: string, redirectType: string, secretKey: string): void {
         this.createCookie(
             eventId, queueId,
@@ -52,8 +51,8 @@ export class UserInQueueStateCookieRepository {
             UserInQueueStateCookieRepository._HashKey,
             this.generateHash(eventId.toLowerCase(), queueId, fixedCookieValidityMinutes, redirectType.toLowerCase(), issueTime, secretKey)
         ));
-        const tomorrow: Date = new Date(i64(WasiDate.now()) + 1000 * 60 * 60 * 24);
-        const expire: i32 = Math.floor((tomorrow.getTime() / 1000) as f64) as i32;
+        const tomorrow: Date = new Date(Date.now() + 1000 * 60 * 60 * 24);
+        const expire: number = Math.floor(tomorrow.getTime() / 1000);
         let cookieValue = CookieHelper.toValueFromKeyValueCollection(cookieValues);
 
         this.httpContextProvider.getHttpResponse().setCookie(cookieKey,
@@ -61,7 +60,7 @@ export class UserInQueueStateCookieRepository {
             cookieDomain, expire);
     }
 
-    public getState(eventId: string, cookieValidityMinutes: i64, secretKey: string, validateTime: bool): StateInfo {
+    public getState(eventId: string, cookieValidityMinutes: number, secretKey: string, validateTime: boolean): StateInfo {
         const cookieKey = UserInQueueStateCookieRepository.getCookieKey(eventId);
         const cookie = this.httpContextProvider.getHttpRequest().getCookieValue(cookieKey);
 
@@ -74,37 +73,37 @@ export class UserInQueueStateCookieRepository {
             return new StateInfo(true, false, "", 0, "");
         }
 
-        const fixedCookieValidity: i64 = cookieValues.has(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey)
-            ? I64.parseInt(cookieValues.get(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey))
+        const fixedCookieValidity: number = cookieValues.has(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey)
+            ? parseInt(cookieValues.get(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey)!, 10)
             : 0;
 
         return new StateInfo(
             true,
             true,
-            cookieValues.get(UserInQueueStateCookieRepository._QueueIdKey),
+            cookieValues.get(UserInQueueStateCookieRepository._QueueIdKey)!,
             fixedCookieValidity,
-            cookieValues.get(UserInQueueStateCookieRepository._RedirectTypeKey));
+            cookieValues.get(UserInQueueStateCookieRepository._RedirectTypeKey)!);
     }
 
     private isCookieValid(
         secretKey: string,
         cookieValueMap: Map<string, string>,
         eventId: string,
-        cookieValidityMinutes: i64,
-        validateTime: bool): bool {
+        cookieValidityMinutes: number,
+        validateTime: boolean): boolean {
 
         const storedHash = cookieValueMap.has(UserInQueueStateCookieRepository._HashKey) ?
-            cookieValueMap.get(UserInQueueStateCookieRepository._HashKey) : "";
+            cookieValueMap.get(UserInQueueStateCookieRepository._HashKey)! : "";
         const issueTimeString = cookieValueMap.has(UserInQueueStateCookieRepository._IssueTimeKey) ?
-            cookieValueMap.get(UserInQueueStateCookieRepository._IssueTimeKey) : "";
+            cookieValueMap.get(UserInQueueStateCookieRepository._IssueTimeKey)! : "";
         const queueId = cookieValueMap.has(UserInQueueStateCookieRepository._QueueIdKey) ?
-            cookieValueMap.get(UserInQueueStateCookieRepository._QueueIdKey) : "";
+            cookieValueMap.get(UserInQueueStateCookieRepository._QueueIdKey)! : "";
         const eventIdFromCookie = cookieValueMap.has(UserInQueueStateCookieRepository._EventIdKey) ?
-            cookieValueMap.get(UserInQueueStateCookieRepository._EventIdKey) : "";
+            cookieValueMap.get(UserInQueueStateCookieRepository._EventIdKey)! : "";
         const redirectType = cookieValueMap.has(UserInQueueStateCookieRepository._RedirectTypeKey) ?
-            cookieValueMap.get(UserInQueueStateCookieRepository._RedirectTypeKey) : "";
+            cookieValueMap.get(UserInQueueStateCookieRepository._RedirectTypeKey)! : "";
         let fixedCookieValidityMinutes = cookieValueMap.has(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey) ?
-            cookieValueMap.get(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey) : "";
+            cookieValueMap.get(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey)! : "";
 
         const expectedHash = this.generateHash(
             eventIdFromCookie,
@@ -124,8 +123,8 @@ export class UserInQueueStateCookieRepository {
             return false;
 
         if (validateTime) {
-            let validity: i64 = fixedCookieValidityMinutes.length > 0 ? I64.parseInt(fixedCookieValidityMinutes) : cookieValidityMinutes;
-            let expirationTime: i64 = I64.parseInt(issueTimeString) + validity * 60;
+            let validity: number = fixedCookieValidityMinutes.length > 0 ? parseInt(fixedCookieValidityMinutes, 10) : cookieValidityMinutes;
+            let expirationTime: number = parseInt(issueTimeString, 10) + validity * 60;
 
             if (expirationTime < Utils.getCurrentTime())
                 return false;
@@ -138,7 +137,7 @@ export class UserInQueueStateCookieRepository {
         this.httpContextProvider.getHttpResponse().setCookie(cookieKey, "", cookieDomain, 0);
     }
 
-    public reissueQueueCookie(eventId: string, cookieValidityMinutes: i64, cookieDomain: string, secretKey: string): void {
+    public reissueQueueCookie(eventId: string, cookieValidityMinutes: number, cookieDomain: string, secretKey: string): void {
         const cookieKey = UserInQueueStateCookieRepository.getCookieKey(eventId);
         const cookie = this.httpContextProvider.getHttpRequest().getCookieValue(cookieKey);
 
@@ -152,14 +151,14 @@ export class UserInQueueStateCookieRepository {
 
         let fixedCookieValidityMinutes = "";
         if (cookieValues.has(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey)) {
-            fixedCookieValidityMinutes = cookieValues.get(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey).toString();
+            fixedCookieValidityMinutes = cookieValues.get(UserInQueueStateCookieRepository._FixedCookieValidityMinutesKey)!.toString();
         }
 
         this.createCookie(
             eventId,
-            cookieValues.get(UserInQueueStateCookieRepository._QueueIdKey),
+            cookieValues.get(UserInQueueStateCookieRepository._QueueIdKey)!,
             fixedCookieValidityMinutes,
-            cookieValues.get(UserInQueueStateCookieRepository._RedirectTypeKey),
+            cookieValues.get(UserInQueueStateCookieRepository._RedirectTypeKey)!,
             cookieDomain, secretKey);
     }
 
@@ -176,14 +175,14 @@ export class UserInQueueStateCookieRepository {
 }
 
 export class StateInfo {
-    constructor(public isFound: bool,
-                public isValid: bool,
+    constructor(public isFound: boolean,
+                public isValid: boolean,
                 public queueId: string,
-                public fixedCookieValidityMinutes: i64,
+                public fixedCookieValidityMinutes: number,
                 public redirectType: string) {
     }
 
-    isStateExtendable(): bool {
+    isStateExtendable(): boolean {
         return this.isValid && !this.fixedCookieValidityMinutes;
     }
 }

package/src/sdk/helpers/Uri.ts

@@ -0,0 +1,4 @@
+export const encodeURI = globalThis.encodeURI;
+export const decodeURI = globalThis.decodeURI;
+export const encodeURIComponent = globalThis.encodeURIComponent;
+export const decodeURIComponent = globalThis.decodeURIComponent;

package/{assembly → src}/sdk/helpers/crypto.ts

@@ -1,16 +1,16 @@
 // Hash implements SHA256 hash algorithm.
 export class Hash {
-    blockSize: i32;
-    digestLength: i32;
+    blockSize: number;
+    digestLength: number;
     private readonly state: Int32Array;
     private readonly temp: Int32Array;
     private readonly buffer: Uint8Array;
-    private bufferLength: i32;
-    private bytesHashed: i32;
-    finished: bool = false
+    private bufferLength: number;
+    private bytesHashed: number;
+    finished: boolean = false
 
     // SHA-256 constants
-    static K: u64[] = [
+    static K: number[] = [
         0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b,
         0x59f111f1, 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01,
         0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7,
@@ -73,7 +73,7 @@ export class Hash {
 
     // Throws error when trying to update already finalized hash:
     // instance must be reset to use it again.
-    update(data: Uint8Array, dataLength: i32 = 0): Hash {
+    update(data: Uint8Array, dataLength: number = 0): Hash {
         if (dataLength == 0) {
             dataLength = data.length;
         }
@@ -81,7 +81,7 @@ export class Hash {
             throw new Error("SHA256: can't update because hash was finished.");
         }
 
-        let dataPos: i32 = 0;
+        let dataPos: number = 0;
         this.bytesHashed += dataLength;
         if (this.bufferLength > 0) {
             while (this.bufferLength < 64 && dataLength > 0) {
@@ -109,11 +109,11 @@ export class Hash {
     // If hash was already finalized, puts the same value.
     finish(out: Uint8Array): Hash {
         if (!this.finished) {
-            let bytesHashed: i32 = this.bytesHashed;
-            let left: i32 = this.bufferLength;
-            let bitLenHi: u32 = (bytesHashed / 0x20000000) | 0;
-            let bitLenLo: u32 = bytesHashed << 3;
-            let padLength: i32 = (bytesHashed % 64 < 56) ? 64 : 128;
+            let bytesHashed: number = this.bytesHashed;
+            let left: number = this.bufferLength;
+            let bitLenHi: number = (bytesHashed / 0x20000000) | 0;
+            let bitLenLo: number = bytesHashed << 3;
+            let padLength: number = (bytesHashed % 64 < 56) ? 64 : 128;
             this.buffer[left] = 0x80;
             for (let i = left + 1; i < padLength - 8; i++) {
                 this.buffer[i] = 0;
@@ -154,7 +154,7 @@ export class Hash {
     };
 
     // Internal function for use in HMAC for optimization.
-    _restoreState(from: Uint32Array, bytesHashed: i32): void {
+    _restoreState(from: Uint32Array, bytesHashed: number): void {
         for (let i = 0; i < this.state.length; i++) {
             this.state[i] = from[i];
         }
@@ -163,8 +163,8 @@ export class Hash {
         this.bufferLength = 0;
     };
 
-    static hashBlocks(w: Int32Array, v: Int32Array, p: Uint8Array, pos: i32, len: u64): i32 {
-        let a: i32, b: i32, c: i32, d: i32, e: i32, f: i32, g: i32, h: i32, u: i32, i: i8, j: i32, t1: i32, t2: i32;
+    static hashBlocks(w: Int32Array, v: Int32Array, p: Uint8Array, pos: number, len: number): number {
+        let a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, u: number, i: number, j: number, t1: number, t2: number;
         while (len >= 64) {
             a = v[0];
             b = v[1];
@@ -176,10 +176,10 @@ export class Hash {
             h = v[7];
             for (i = 0; i < 16; i++) {
                 j = pos + i * 4;
-                let p1 = (((p[j] as i32) & 0xff) << 24);
-                let p2 = (((p[j + 1] as i32) & 0xff) << 16);
-                let p3 = (((p[j + 2] as i32) & 0xff) << 8);
-                let p4 = ((p[j + 3] as i32) & 0xff);
+                let p1 = ((p[j] & 0xff) << 24);
+                let p2 = ((p[j + 1] & 0xff) << 16);
+                let p3 = ((p[j + 2] & 0xff) << 8);
+                let p4 = (p[j + 3] & 0xff);
                 w[i] = p1 | p2 | p3 | p4;
             }
 
@@ -193,7 +193,7 @@ export class Hash {
             for (i = 0; i < 64; i++) {
                 t1 = (((((e >>> 6 | e << (32 - 6)) ^ (e >>> 11 | e << (32 - 11)) ^
                     (e >>> 25 | e << (32 - 25))) + ((e & f) ^ (~e & g))) | 0) +
-                    ((h + (((Hash.K[i] as i32) + w[i]) | 0)) | 0)) | 0;
+                    ((h + ((Hash.K[i] + w[i]) | 0)) | 0)) | 0;
                 t2 = (((a >>> 2 | a << (32 - 2)) ^ (a >>> 13 | a << (32 - 13)) ^
                     (a >>> 22 | a << (32 - 22))) + ((a & b) ^ (a & c) ^ (b & c))) | 0;
                 h = g;
@@ -224,8 +224,8 @@ export class Hash {
 export class HMAC {
     private inner: Hash
     private outer: Hash
-    blockSize: i32
-    digestLength: i32
+    blockSize: number
+    digestLength: number
     private readonly istate: Uint32Array
     private readonly ostate: Uint32Array
 
@@ -311,7 +311,7 @@ export function hash(data: Uint8Array): Uint8Array {
 }
 
 export function hashString(data: string): string {
-    return toHex(hash(Uint8Array.wrap(String.UTF8.encode(data))))
+    return toHex(hash(new TextEncoder().encode(data)));
 }
 
 // Returns HMAC-SHA256 of data under the key.
@@ -324,17 +324,15 @@ export function hmac(key: Uint8Array, data: Uint8Array): Uint8Array {
 
 export function toHex(byteArray: Uint8Array): string {
     let acc = '';
-    for(let i=0; i<byteArray.length; i++){
+    for (let i = 0; i < byteArray.length; i++) {
         let val = byteArray[i];
         acc += ('0' + val.toString(16)).slice(-2);
     }
     return acc;
-    //return byteArray.reduce((acc, val) => (acc + ('0' + val.toString(16)).slice(-2)), '');
 }
 
 export function hmacString(key: string, data: string): string {
-    const hash = hmac(
-        Uint8Array.wrap(String.UTF8.encode(key)),
-        Uint8Array.wrap(String.UTF8.encode(data)));
-    return toHex(hash)
+    const encoder = new TextEncoder();
+    const result = hmac(encoder.encode(key), encoder.encode(data));
+    return toHex(result);
 }

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.