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

package/package.json

@@ -1,40 +1,35 @@
 {
   "name": "@queue-it/fastly",
-  "version": "1.1.0",
+  "version": "2.0.0-beta.1",
   "description": "Queue-it connector for Fastly",
-  "main": "assembly/index.ts",
-  "ascMain": "assembly/index.ts",
+  "main": "src/index.ts",
   "author": "devs@queue-it.com",
   "repository": "https://github.com/queueit/KnownUser.V3.Fastly",
   "license": "MIT",
   "files": [
     "package.json",
     "README.md",
-    "assembly/sdk",
-    "assembly/contextProvider.ts",
-    "assembly/helper.ts",
-    "assembly/integrationConfigProvider.ts",
-    "assembly/requestResponseHandler.ts",
-    "assembly/index.ts"
+    "src/sdk",
+    "src/contextProvider.ts",
+    "src/helper.ts",
+    "src/integrationConfigProvider.ts",
+    "src/requestResponseHandler.ts",
+    "src/index.ts"
   ],
   "scripts": {
-    "test": "npx asp --config assembly/__tests__/as-pect.config.js --verbose",
-    "asbuild:untouched": "asc assembly/index.ts --target debug",
-    "asbuild:optimized": "asc assembly/index.ts --target release",
-    "asbuild": "npm run asbuild:untouched && npm run asbuild:optimized",
+    "test": "jest",
+    "bundle": "esbuild src/index.ts --bundle --outfile=bin/index.js --platform=node --target=es2022 && js-compute-runtime bin/index.js bin/main.wasm",
     "build": "fastly compute build",
     "deploy": "fastly compute deploy"
   },
   "dependencies": {
-    "@assemblyscript/loader": "^0.19.16",
-    "@fastly/as-compute": "^0.4.1",
-    "as-wasi": "^0.4.6",
-    "assemblyscript-json": "^1.1.0",
-    "assemblyscript-regex": "^1.6.3"
+    "@fastly/js-compute": "^3.0.0"
   },
   "devDependencies": {
-    "@as-pect/cli": "^6.2.4",
-    "@as-pect/core": "^6.2.1",
-    "assemblyscript": "^0.19.16"
+    "@types/jest": "^29.5.0",
+    "esbuild": "^0.27.3",
+    "jest": "^29.5.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^5.4.0"
   }
 }

package/{assembly → src}/contextProvider.ts

@@ -1,5 +1,4 @@
 import {IHttpContextProvider, IHttpRequest, IHttpResponse} from "./sdk/HttpContextProvider";
-import {Request, Fastly, Headers} from "@fastly/as-compute";
 import {decodeURIComponent, encodeURIComponent} from "./sdk/helpers/Uri";
 
 export function getHttpHandler(req: Request): FastlyHttpContextProvider {
@@ -7,9 +6,8 @@ export function getHttpHandler(req: Request): FastlyHttpContextProvider {
 }
 
 export class FastlyHttpContextProvider implements IHttpContextProvider {
-    isError: bool = false;
+    isError: boolean = false;
     private readonly req: FastlyHttpRequest;
-    // @ts-ignore
     private readonly res: FastlyHttpResponse;
 
     constructor(fReq: Request) {
@@ -28,7 +26,7 @@ export class FastlyHttpContextProvider implements IHttpContextProvider {
 
 export class FastlyHttpRequest implements IHttpRequest {
     private parsedCookieDic: Map<string, string>
-    private bodyFetched: bool = false;
+    private bodyFetched: boolean = false;
     private body: string = '';
 
     constructor(private baseReq: Request) {
@@ -67,10 +65,16 @@ export class FastlyHttpRequest implements IHttpRequest {
     }
 
     getCookieValue(cookieKey: string): string {
-        if (this.parsedCookieDic.keys().length == 0) {
+        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 {
@@ -95,7 +99,7 @@ export class FastlyHttpRequest implements IHttpRequest {
     }
 
     getUserHostAddress(): string {
-        return Fastly.getClientIpAddressString();
+        return this.baseReq.headers.get('Fastly-Client-IP') ?? '';
     }
 }
 
@@ -106,7 +110,7 @@ export class FastlyHttpResponse implements IHttpResponse {
         this.headers = new Headers();
     }
 
-    setCookie(cookieName: string, cookieValue: string, domain: string, expiration: i64): void {
+    setCookie(cookieName: string, cookieValue: string, domain: string, expiration: number): void {
         const expirationDate = new Date(expiration * 1000);
         let setCookieString = cookieName + "=" + encodeURIComponent(cookieValue) + "; expires=" + expirationDate.toUTCString() + ";";
         if (domain != "") {

package/{assembly → src}/index.ts

@@ -1,3 +1,3 @@
-export {IntegrationDetails, IntegrationEndpointProvider, IntegrationEndpointCacheConfig} from "./integrationConfigProvider"
+export {IntegrationDetails, IntegrationEndpointProvider, IntegrationEndpointCacheConfig, resolveIntegrationDetails} from "./integrationConfigProvider"
 export {onQueueITRequest, onQueueITResponse} from "./requestResponseHandler";
 export {RequestLogger} from "./helper";

package/{assembly → src}/integrationConfigProvider.ts

@@ -1,10 +1,9 @@
-import { Fastly, Headers, Request } from "@fastly/as-compute";
 import { RequestLogger } from "./helper";
 
-export function getIntegrationConfig(
+export async function getIntegrationConfig(
   details: IntegrationDetails,
   endpointProvider: IntegrationEndpointProvider
-): string {
+): Promise<string> {
   const headers = new Headers();
   headers.set("api-key", details.apiKey);
   headers.set("host", endpointProvider.getHostname(details.customerId));
@@ -16,19 +15,16 @@ export function getIntegrationConfig(
       headers: headers,
     }
   );
-  let cacheOverride = new Fastly.CacheOverride();
-  let cacheConf = endpointProvider.getCacheConfig();
-  if (cacheConf.maxAge != -1) {
-    cacheOverride.setTTL(cacheConf.maxAge);
-  }
-  if (cacheConf.staleWhileRevalidate != -1) {
-    cacheOverride.setSWR(cacheConf.staleWhileRevalidate);
-  }
+  const cacheConf = endpointProvider.getCacheConfig();
+  const cacheInit: { ttl?: number; swr?: number } = {};
+  if (cacheConf.maxAge !== -1) cacheInit.ttl = cacheConf.maxAge;
+  if (cacheConf.staleWhileRevalidate !== -1) cacheInit.swr = cacheConf.staleWhileRevalidate;
+  const cacheOverride = new CacheOverride("override", cacheInit);
 
-  let beresp = Fastly.fetch(request, {
+  const beresp = await fetch(request, {
     backend: details.queueItOrigin,
     cacheOverride: cacheOverride,
-  }).wait();
+  });
 
   if (!(details.logger instanceof MockLogger)) {
     let cacheState = beresp.headers.get("x-cache");
@@ -41,7 +37,7 @@ export function getIntegrationConfig(
   if (beresp.status != 200) {
     return "";
   }
-  return beresp.text();
+  return await beresp.text();
 }
 
 const integrationCustomerId = "customerId",
@@ -52,19 +48,20 @@ const integrationCustomerId = "customerId",
   workerHost = "workerHost";
 
 export function resolveIntegrationDetails(): IntegrationDetails | null {
-  const dict = new Fastly.Dictionary(integrationDictionary);
+  const dict = new ConfigStore(integrationDictionary);
   if (
-    !dict.contains(integrationCustomerId) ||
-    !dict.contains(integrationApiKey) ||
-    !dict.contains(integrationSecret) ||
-    !dict.contains(integrationQueueItOrigin)
+    dict.get(integrationCustomerId) === null ||
+    dict.get(integrationApiKey) === null ||
+    dict.get(integrationSecret) === null ||
+    dict.get(integrationQueueItOrigin) === null
   ) {
     return null;
   }
 
   let workerHostValue = "";
-  if (dict.contains(workerHost)) {
-    workerHostValue = dict.get(workerHost)!;
+  const workerHostVal = dict.get(workerHost);
+  if (workerHostVal !== null) {
+    workerHostValue = workerHostVal;
   }
 
   return new IntegrationDetails(
@@ -77,8 +74,8 @@ export function resolveIntegrationDetails(): IntegrationDetails | null {
 }
 
 export class IntegrationEndpointCacheConfig {
-  maxAge: i16 = -1;
-  staleWhileRevalidate: i16 = -1;
+  maxAge: number = -1;
+  staleWhileRevalidate: number = -1;
 }
 
 export interface IntegrationEndpointProvider {

package/{assembly → src}/requestResponseHandler.ts

@@ -1,4 +1,3 @@
-import { Request, Response, Headers } from "@fastly/as-compute";
 import { KnownUser } from "./sdk/KnownUser";
 import { QueueITHelper } from "./helper";
 import { FastlyHttpContextProvider, getHttpHandler } from "./contextProvider";
@@ -13,18 +12,17 @@ import { Utils } from "./sdk/QueueITHelpers";
 const QUEUEIT_FAILED_HEADERNAME = "x-queueit-failed";
 let httpProvider: FastlyHttpContextProvider | null = null;
 
-export function onQueueITRequest(
+export async function onQueueITRequest(
   req: Request,
   conf: IntegrationDetails | null = null
-): Response | null {
+): Promise<Response | null> {
   if (conf == null) {
     conf = resolveIntegrationDetails();
   }
   if (conf == null) {
-    return new Response(String.UTF8.encode("No integration details found."), {
+    return new Response("No integration details found.", {
       headers: new Headers(),
       status: 404,
-      url: "",
     });
   }
 
@@ -35,7 +33,7 @@ export function onQueueITRequest(
   QueueITHelper.configureKnownUserHashing();
   httpProvider = getHttpHandler(req);
 
-  let integrationConfigJson = getIntegrationConfig(conf, integrationProvider);
+  let integrationConfigJson = await getIntegrationConfig(conf, integrationProvider);
   const requestUrl: string = conf.resolveWorkerRequestUrl(req.url);
 
   const queueItToken = Utils.getParameterByName(
@@ -66,7 +64,6 @@ export function onQueueITRequest(
       let response = new Response(null, {
         status: 200,
         headers: httpProvider!.getHttpResponse().getHeaders(),
-        url: "",
       });
       // In case of ajax call send the user to the queue by sending a custom queue-it header and redirecting user to queue from javascript
       response.headers.set("Access-Control-Expose-Headers", validationResult.getAjaxQueueRedirectHeaderKey());
@@ -82,7 +79,6 @@ export function onQueueITRequest(
       let response = new Response(null, {
         status: 302,
         headers: httpProvider!.getHttpResponse().getHeaders(),
-        url: "",
       });
       // Send the user to the queue - either because hash was missing or because is was invalid
       response.headers.set(
@@ -104,7 +100,6 @@ export function onQueueITRequest(
       let response = new Response(null, {
         status: 302,
         headers: httpProvider!.getHttpResponse().getHeaders(),
-        url: requestUrlWithoutToken,
       });
       response.headers.set("Location", requestUrlWithoutToken);
       Utils.addNoCacheHeaders(response);
@@ -123,15 +118,14 @@ export function onQueueITRequest(
 //Fill in the Queue-it headers
 export function onQueueITResponse(res: Response): void {
   const contextHeaders = httpProvider!.getHttpResponse().getHeaders();
-  const contextHeaderKeys = contextHeaders.keys();
 
   if (httpProvider!.isError) {
     res.headers.append(QUEUEIT_FAILED_HEADERNAME, "true");
   }
-  for (let i = 0; i < contextHeaderKeys.length; i++) {
-    if (contextHeaderKeys[i].length == 0) continue;
-    let value = contextHeaders.get(contextHeaderKeys[i]);
-    if (value != null && value!.length > 0)
-      res.headers.append(contextHeaderKeys[i], value!);
+  for (const key of contextHeaders.keys()) {
+    if (key.length == 0) continue;
+    const value = contextHeaders.get(key);
+    if (value != null && value.length > 0)
+      res.headers.append(key, value);
   }
 }

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

@@ -1,4 +1,3 @@
-import { Headers } from "@fastly/as-compute";
 
 export interface IHttpRequest {
     getUserAgent(): string;
@@ -10,7 +9,7 @@ export interface IHttpRequest {
 }
 
 export interface IHttpResponse {
-    setCookie(cookieName: string, cookieValue: string, domain: string, expiration: i64): void;
+    setCookie(cookieName: string, cookieValue: string, domain: string, expiration: number): void;
     getHeaders(): Headers;
 }
 

package/src/sdk/IntegrationConfig/CustomerIntegrationDecodingHandler.ts

@@ -0,0 +1,57 @@
+import {
+    CustomerIntegration,
+    IntegrationConfigModel,
+    TriggerModel,
+    TriggerPart
+} from "./IntegrationConfigModel";
+
+export class CustomerIntegrationDecodingHandler {
+    static deserialize(integrationsConfigString: string): CustomerIntegration {
+        const result = new CustomerIntegration();
+        if (!integrationsConfigString) return result;
+
+        const parsed = JSON.parse(integrationsConfigString);
+        result.Version = parsed.Version ?? 0;
+        result.Description = parsed.Description ?? '';
+
+        if (Array.isArray(parsed.Integrations)) {
+            result.Integrations = parsed.Integrations.map((item: any) => {
+                const model = new IntegrationConfigModel();
+                model.Name = item.Name ?? '';
+                model.EventId = item.EventId ?? '';
+                model.CookieDomain = item.CookieDomain ?? '';
+                model.LayoutName = item.LayoutName ?? '';
+                model.Culture = item.Culture ?? '';
+                model.ExtendCookieValidity = item.ExtendCookieValidity ?? false;
+                model.CookieValidityMinute = item.CookieValidityMinute ?? 0;
+                model.QueueDomain = item.QueueDomain ?? '';
+                model.RedirectLogic = item.RedirectLogic ?? '';
+                model.ForcedTargetUrl = item.ForcedTargetUrl ?? '';
+                model.ActionType = item.ActionType ?? '';
+
+                model.Triggers = (item.Triggers ?? []).map((trigger: any) => {
+                    const t = new TriggerModel();
+                    t.LogicalOperator = trigger.LogicalOperator ?? '';
+                    t.TriggerParts = (trigger.TriggerParts ?? []).map((part: any) => {
+                        const tp = new TriggerPart();
+                        tp.ValidatorType = part.ValidatorType ?? '';
+                        tp.Operator = part.Operator ?? '';
+                        tp.ValueToCompare = part.ValueToCompare ?? '';
+                        tp.ValuesToCompare = part.ValuesToCompare ?? [];
+                        tp.IsNegative = part.IsNegative ?? false;
+                        tp.IsIgnoreCase = part.IsIgnoreCase ?? false;
+                        tp.UrlPart = part.UrlPart ?? '';
+                        tp.CookieName = part.CookieName ?? '';
+                        tp.HttpHeaderName = part.HttpHeaderName ?? '';
+                        return tp;
+                    });
+                    return t;
+                });
+
+                return model;
+            });
+        }
+
+        return result;
+    }
+}

package/{assembly → src}/sdk/IntegrationConfig/IntegrationConfigHelpers.ts

@@ -1,8 +1,6 @@
 import * as IntegrationModels from './IntegrationConfigModel'
 import {KnownUserException} from '../Models'
 import {IHttpRequest} from '../HttpContextProvider'
-//@ts-ignore
-import {URL} from '@fastly/as-url';
 
 export interface IIntegrationEvaluator {
     getMatchedIntegrationConfig(
@@ -35,7 +33,7 @@ export class IntegrationEvaluator implements IIntegrationEvaluator {
         return null;
     }
 
-    private evaluateTrigger(trigger: IntegrationModels.TriggerModel, currentPageUrl: string, request: IHttpRequest): bool {
+    private evaluateTrigger(trigger: IntegrationModels.TriggerModel, currentPageUrl: string, request: IHttpRequest): boolean {
         if (trigger.LogicalOperator == IntegrationModels.LogicalOperatorType.Or) {
             for (let i = 0; i < trigger.TriggerParts.length; i++) {
                 let part = trigger.TriggerParts[i];
@@ -54,7 +52,7 @@ export class IntegrationEvaluator implements IIntegrationEvaluator {
         }
     }
 
-    private evaluateTriggerPart(triggerPart: IntegrationModels.TriggerPart, currentPageUrl: string, request: IHttpRequest): bool {
+    private evaluateTriggerPart(triggerPart: IntegrationModels.TriggerPart, currentPageUrl: string, request: IHttpRequest): boolean {
         if (triggerPart.ValidatorType == IntegrationModels.ValidatorType.UrlValidator) {
             return UrlValidatorHelper.evaluate(triggerPart, currentPageUrl);
         } else if (triggerPart.ValidatorType == IntegrationModels.ValidatorType.CookieValidator) {
@@ -72,7 +70,7 @@ export class IntegrationEvaluator implements IIntegrationEvaluator {
 }
 
 export class UrlValidatorHelper {
-    public static evaluate(triggerPart: IntegrationModels.TriggerPart, url: string): bool {
+    public static evaluate(triggerPart: IntegrationModels.TriggerPart, url: string): boolean {
         let urlpart = this.getUrlPart(triggerPart, url);
         return ComparisonOperatorHelper.evaluate(
             triggerPart.Operator,
@@ -107,7 +105,7 @@ export class UrlValidatorHelper {
 }
 
 export class CookieValidatorHelper {
-    public static evaluate(triggerPart: IntegrationModels.TriggerPart, request: IHttpRequest): bool {
+    public static evaluate(triggerPart: IntegrationModels.TriggerPart, request: IHttpRequest): boolean {
         return ComparisonOperatorHelper.evaluate(triggerPart.Operator,
             triggerPart.IsNegative,
             triggerPart.IsIgnoreCase,
@@ -122,7 +120,7 @@ export class CookieValidatorHelper {
 }
 
 export class UserAgentValidatorHelper {
-    public static evaluate(triggerPart: IntegrationModels.TriggerPart, userAgent: string): bool {
+    public static evaluate(triggerPart: IntegrationModels.TriggerPart, userAgent: string): boolean {
 
         return ComparisonOperatorHelper.evaluate(triggerPart.Operator,
             triggerPart.IsNegative,
@@ -134,7 +132,7 @@ export class UserAgentValidatorHelper {
 }
 
 export class RequestBodyValidatorHelper {
-    public static evaluate(triggerPart: IntegrationModels.TriggerPart, bodyString: string): bool {
+    public static evaluate(triggerPart: IntegrationModels.TriggerPart, bodyString: string): boolean {
 
         return ComparisonOperatorHelper.evaluate(triggerPart.Operator,
             triggerPart.IsNegative,
@@ -146,7 +144,7 @@ export class RequestBodyValidatorHelper {
 }
 
 export class HttpHeaderValidatorHelper {
-    public static evaluate(triggerPart: IntegrationModels.TriggerPart, headerValue: string): bool {
+    public static evaluate(triggerPart: IntegrationModels.TriggerPart, headerValue: string): boolean {
         return ComparisonOperatorHelper.evaluate(triggerPart.Operator,
             triggerPart.IsNegative,
             triggerPart.IsIgnoreCase,
@@ -158,11 +156,11 @@ export class HttpHeaderValidatorHelper {
 
 export class ComparisonOperatorHelper {
     public static evaluate(opt: string,
-                           isNegative: bool,
-                           isIgnoreCase: bool,
+                           isNegative: boolean,
+                           isIgnoreCase: boolean,
                            value: string,
                            valueToCompare: string,
-                           valuesToCompare: Array<string> | null): bool {
+                           valuesToCompare: Array<string> | null): boolean {
         if (valuesToCompare == null) {
             valuesToCompare = new Array<string>();
         }
@@ -179,7 +177,7 @@ export class ComparisonOperatorHelper {
         }
     }
 
-    private static contains(value: string, valueToCompare: string, isNegative: bool, ignoreCase: bool): bool {
+    private static contains(value: string, valueToCompare: string, isNegative: boolean, ignoreCase: boolean): boolean {
         if (valueToCompare == "*" && value != "")
             return true;
 
@@ -196,7 +194,7 @@ export class ComparisonOperatorHelper {
             return evaluation;
     }
 
-    private static equalS(value: string, valueToCompare: string, isNegative: bool, ignoreCase: bool): bool {
+    private static equalS(value: string, valueToCompare: string, isNegative: boolean, ignoreCase: boolean): boolean {
         let evaluation = false;
 
         if (ignoreCase)
@@ -210,7 +208,7 @@ export class ComparisonOperatorHelper {
             return evaluation;
     }
 
-    private static equalsAny(value: string, valuesToCompare: Array<string>, isNegative: bool, isIgnoreCase: bool): bool {
+    private static equalsAny(value: string, valuesToCompare: Array<string>, isNegative: boolean, isIgnoreCase: boolean): boolean {
         for (let i = 0; i < valuesToCompare.length; i++) {
             let valueToCompare = valuesToCompare[i];
             if (ComparisonOperatorHelper.equalS(value, valueToCompare, false, isIgnoreCase))
@@ -220,7 +218,7 @@ export class ComparisonOperatorHelper {
         return isNegative;
     }
 
-    private static containsAny(value: string, valuesToCompare: Array<string>, isNegative: bool, isIgnoreCase: bool): bool {
+    private static containsAny(value: string, valuesToCompare: Array<string>, isNegative: boolean, isIgnoreCase: boolean): boolean {
         for (let i = 0; i < valuesToCompare.length; i++) {
             let valueToCompare = valuesToCompare[i];
             if (ComparisonOperatorHelper.contains(value, valueToCompare, false, isIgnoreCase))

package/{assembly → src}/sdk/IntegrationConfig/IntegrationConfigModel.ts

@@ -9,8 +9,8 @@ export class IntegrationConfigModel {
     CookieDomain: string = "";
     LayoutName: string = "";
     Culture: string = "";
-    ExtendCookieValidity: bool = false;
-    CookieValidityMinute: i64 = 0;
+    ExtendCookieValidity: boolean = false;
+    CookieValidityMinute: number = 0;
     QueueDomain: string = "";
     RedirectLogic: string = "";
     ForcedTargetUrl: string = "";
@@ -24,7 +24,7 @@ export class IntegrationConfigModel {
 
 export class CustomerIntegration {
     Integrations: Array<IntegrationConfigModel>;
-    Version: i64;
+    Version: number;
     Description: string;
 
     constructor() {
@@ -39,8 +39,8 @@ export class TriggerPart {
     Operator: string = "";
     ValueToCompare: string = "";
     ValuesToCompare: Array<string>;
-    IsNegative: bool = false;
-    IsIgnoreCase: bool = false;
+    IsNegative: boolean = false;
+    IsIgnoreCase: boolean = false;
     UrlPart: string = ""; // UrlValidator
     CookieName: string = ""; // CookieValidator
     HttpHeaderName: string = ""; // HttpHeaderValidator

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

@@ -30,7 +30,7 @@ export class KnownUser {
     }
 
     private static isQueueAjaxCall(
-        httpContextProvider: IHttpContextProvider): bool {
+        httpContextProvider: IHttpContextProvider): boolean {
         const ajaxHeader = httpContextProvider.getHttpRequest().getHeader(this.QueueITAjaxHeaderKey);
         return ajaxHeader != '';
     }
@@ -61,9 +61,7 @@ export class KnownUser {
         debugEntries: Map<string, string>,
         httpContextProvider: IHttpContextProvider): void {
         let cookieValue = "";
-        let entryKeys = debugEntries.keys();
-        for (let i = 0; i < entryKeys.length; i++) {
-            let key: string = entryKeys[i];
+        for (const key of debugEntries.keys()) {
             cookieValue += key + "=" + debugEntries.get(key) + "|";
         }
 
@@ -90,7 +88,7 @@ export class KnownUser {
         httpContextProvider: IHttpContextProvider,
         dateTimeProvider: IDateTimeProvider,
         debugEntries: Map<string, string>,
-        isDebug: bool): ValidationResult {
+        isDebug: boolean): ValidationResult {
 
         if (isDebug) {
             debugEntries.set("SdkVersion", UserInQueueService.SDK_VERSION);
@@ -133,7 +131,7 @@ export class KnownUser {
         httpContextProvider: IHttpContextProvider,
         dateTimeProvider: IDateTimeProvider,
         debugEntries: Map<string, string>,
-        isDebug: bool): ValidationResult {
+        isDebug: boolean): ValidationResult {
 
         targetUrl = this.generateTargetUrl(targetUrl, httpContextProvider);
 
@@ -177,7 +175,7 @@ export class KnownUser {
         httpContextProvider: IHttpContextProvider,
         dateTimeProvider: IDateTimeProvider,
         debugEntries: Map<string, string>,
-        isDebug: bool): ValidationResult {
+        isDebug: boolean): ValidationResult {
         let targetUrl: string;
 
         if (matchedConfig.RedirectLogic == "ForcedTargetUrl") {
@@ -211,7 +209,7 @@ export class KnownUser {
         httpContextProvider: IHttpContextProvider,
         dateTimeProvider: IDateTimeProvider,
         debugEntries: Map<string, string>,
-        isDebug: bool): ValidationResult {
+        isDebug: boolean): ValidationResult {
         const cancelEventConfig = new CancelEventConfig(
             matchedConfig.EventId,
             matchedConfig.QueueDomain,
@@ -235,7 +233,7 @@ export class KnownUser {
 
     public static extendQueueCookie(
         eventId: string,
-        cookieValidityMinute: i64,
+        cookieValidityMinute: number,
         cookieDomain: string,
         secretKey: string,
         httpContextProvider: IHttpContextProvider): KnownUserException | null {

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

@@ -20,10 +20,10 @@ export class QueueEventConfig {
         public layoutName: string,
         public culture: string,
         public queueDomain: string,
-        public extendCookieValidity: bool,
-        public cookieValidityMinute: i64,
+        public extendCookieValidity: boolean,
+        public cookieValidityMinute: number,
         public cookieDomain: string,
-        public version: i64,
+        public version: number,
         public actionName: string = 'unspecified') {
     }
 
@@ -44,7 +44,7 @@ export class CancelEventConfig {
     constructor(public eventId: string,
                 public queueDomain: string,
                 public cookieDomain: string,
-                public version: i64,
+                public version: number,
                 public actionName: string = 'unspecified') {
     }
 
@@ -68,9 +68,9 @@ export class RequestValidationResult {
     ) {
     }
 
-    public isAjaxResult: bool;
+    public isAjaxResult: boolean = false;
 
-    public doRedirect(): bool {
+    public doRedirect(): boolean {
         return this.redirectUrl.length > 0;
     }