Config v6

.eslintignore

@@ -4,5 +4,5 @@ dist/
 lib/
 node_modules/
 src/Semver.ts
-src/Sha1.ts
+src/Hash.ts
 src/lib.*.d.ts

package.json

@@ -6,7 +6,7 @@
   "types": "lib/index.d.ts",
   "module": "lib/esm/index.js",
   "scripts": {
-    "coverage": "nyc npm run test",
+    "coverage": "cross-env nyc npm run test",
     "build": "tsc -p tsconfig.build.cjs.json && tsc -p tsconfig.build.esm.json",
     "prepare": "npm run build",
     "test": "cross-env TS_NODE_PROJECT=./tsconfig.mocha.json node --expose-gc node_modules/mocha/bin/_mocha --require ts-node/register 'test/**/*.ts' --exit --timeout 30000",
@@ -37,6 +37,7 @@
     "@types/chai": "4.3.4",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.11.18",
+    "@types/tunnel": "^0.0.5",
     "@typescript-eslint/eslint-plugin": "^5.53.0",
     "@typescript-eslint/parser": "^5.53.0",
     "chai": "^4.3.7",
@@ -45,9 +46,10 @@
     "eslint-plugin-import": "^2.27.5",
     "mocha": "^10.2.0",
     "moq.ts": "^7.4.1",
-    "nyc": "^15.1.0",
+    "nyc": "^14.1.1",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.1",
+    "tunnel": "^0.0.6",
     "typescript": "^4.0.2"
   },
   "repository": {
@@ -68,8 +70,8 @@
       "src"
     ],
     "exclude": [
-      "src/Semver.ts",
-      "src/Sha1.ts"
+      "src/Hash.ts",
+      "src/Semver.ts"
     ]
   },
   "sideEffects": false

samples/deno-sandbox/import_map.json

@@ -12,16 +12,17 @@
     "../../src/ConfigFetcher": "../../src/ConfigFetcher.ts",
     "../../src/ConfigServiceBase": "../../src/ConfigServiceBase.ts",
     "../../src/DefaultEventEmitter": "../../src/DefaultEventEmitter.ts",
+    "../../src/EvaluateLogBuilder": "../../src/EvaluateLogBuilder.ts",
     "../../src/EventEmitter": "../../src/EventEmitter.ts",
     "../../src/FlagOverrides": "../../src/FlagOverrides.ts",
+    "../../src/Hash": "../../src/Hash.ts",
     "../../src/Hooks": "../../src/Hooks.ts",
     "../../src/LazyLoadConfigService": "../../src/LazyLoadConfigService.ts",
     "../../src/ManualPollConfigService": "../../src/ManualPollConfigService.ts",
     "../../src/Polyfills": "../../src/Polyfills.ts",
     "../../src/ProjectConfig": "../../src/ProjectConfig.ts",
     "../../src/RolloutEvaluator": "../../src/RolloutEvaluator.ts",
     "../../src/Semver": "../../src/Semver.ts",
-    "../../src/Sha1": "../../src/Sha1.ts",
     "../../src/Utils": "../../src/Utils.ts"
   }
 }

samples/deno-sandbox/sample.json

@@ -1 +1,119 @@
-{"p":{"u":"https://cdn-global.configcat.com","r":0},"f":{"isAwesomeFeatureEnabled":{"v":true,"i":"ca36009d","t":0,"p":[{"o":0,"v":true,"p":0,"i":"ca36009d"},{"o":1,"v":false,"p":100,"i":"2bdcee75"}],"r":[{"o":0,"a":"Identifier","t":0,"c":"gdf","v":false,"i":"2bdcee75"},{"o":1,"a":"Identifier","t":0,"c":"dfgdf","v":false,"i":"2bdcee75"}]},"isPOCFeatureEnabled":{"v":false,"i":"430bded3","t":0,"p":[],"r":[{"o":0,"a":"Email","t":2,"c":"@something.com","v":false,"i":"430bded3"},{"o":1,"a":"Email","t":2,"c":"@example.com","v":true,"i":"9f21c24c"}]}}}
+{
+  "p": {
+    "u": "https://cdn-global.configcat.com",
+    "r": 0,
+    "s": "unEpMhsXD/Zv9MH0gkBqS0Hr97LCGUKpHHOhEfzTcY4="
+  },
+  "f": {
+    "isAwesomeFeatureEnabled": {
+      "t": 0,
+      "r": [
+        {
+          "c": [
+            {
+              "u": {
+                "a": "Identifier",
+                "c": 0,
+                "l": [
+                  "gdf"
+                ]
+              }
+            }
+          ],
+          "s": {
+            "v": {
+              "b": false
+            },
+            "i": "2bdcee75"
+          }
+        },
+        {
+          "c": [
+            {
+              "u": {
+                "a": "Identifier",
+                "c": 0,
+                "l": [
+                  "dfgdf"
+                ]
+              }
+            }
+          ],
+          "s": {
+            "v": {
+              "b": false
+            },
+            "i": "2bdcee75"
+          }
+        }
+      ],
+      "p": [
+        {
+          "p": 0,
+          "v": {
+            "b": true
+          },
+          "i": "ca36009d"
+        },
+        {
+          "p": 100,
+          "v": {
+            "b": false
+          },
+          "i": "2bdcee75"
+        }
+      ],
+      "v": {
+        "b": true
+      },
+      "i": "ca36009d"
+    },
+    "isPOCFeatureEnabled": {
+      "t": 0,
+      "r": [
+        {
+          "c": [
+            {
+              "u": {
+                "a": "Email",
+                "c": 2,
+                "l": [
+                  "@something.com"
+                ]
+              }
+            }
+          ],
+          "s": {
+            "v": {
+              "b": false
+            },
+            "i": "430bded3"
+          }
+        },
+        {
+          "c": [
+            {
+              "u": {
+                "a": "Email",
+                "c": 2,
+                "l": [
+                  "@example.com"
+                ]
+              }
+            }
+          ],
+          "s": {
+            "v": {
+              "b": true
+            },
+            "i": "9f21c24c"
+          }
+        }
+      ],
+      "v": {
+        "b": false
+      },
+      "i": "430bded3"
+    }
+  }
+}

src/ConfigCatCache.ts

@@ -74,7 +74,7 @@ export class ExternalConfigCache implements IConfigCache {
   }
 
   private updateCachedConfig(externalSerializedConfig: string | null | undefined): void {
-    if (externalSerializedConfig === null || externalSerializedConfig === void 0 || externalSerializedConfig === this.cachedSerializedConfig) {
+    if (externalSerializedConfig == null || externalSerializedConfig === this.cachedSerializedConfig) {
       return;
     }
 

src/ConfigCatClient.ts

@@ -12,10 +12,10 @@ import type { HookEvents, Hooks, IProvidesHooks } from "./Hooks";
 import { LazyLoadConfigService } from "./LazyLoadConfigService";
 import { ManualPollConfigService } from "./ManualPollConfigService";
 import { getWeakRefStub, isWeakRefAvailable } from "./Polyfills";
-import type { IConfig, ProjectConfig, RolloutPercentageItem, RolloutRule, Setting, SettingValue } from "./ProjectConfig";
+import type { IConfig, PercentageOption, ProjectConfig, Setting, SettingValue } from "./ProjectConfig";
 import type { IEvaluationDetails, IRolloutEvaluator, SettingTypeOf, User } from "./RolloutEvaluator";
 import { RolloutEvaluator, checkSettingsAvailable, evaluate, evaluateAll, evaluationDetailsFromDefaultValue, getTimestampAsDate, isAllowedValue } from "./RolloutEvaluator";
-import { errorToString } from "./Utils";
+import { errorToString, isArray, throwError } from "./Utils";
 
 /** ConfigCat SDK client. */
 export interface IConfigCatClient extends IProvidesHooks {
@@ -241,18 +241,23 @@ export class ConfigCatClient implements IConfigCatClient {
   private static get instanceCache() { return clientInstanceCache; }
 
   static get<TMode extends PollingMode>(sdkKey: string, pollingMode: TMode, options: OptionsForPollingMode<TMode> | undefined | null, configCatKernel: IConfigCatKernel): IConfigCatClient {
+    const invalidSdkKeyError = "Invalid 'sdkKey' value";
     if (!sdkKey) {
-      throw new Error("Invalid 'sdkKey' value");
+      throw new Error(invalidSdkKeyError);
     }
 
     const optionsClass =
       pollingMode === PollingMode.AutoPoll ? AutoPollOptions :
       pollingMode === PollingMode.ManualPoll ? ManualPollOptions :
       pollingMode === PollingMode.LazyLoad ? LazyLoadOptions :
-      (() => { throw new Error("Invalid 'pollingMode' value"); })();
+      throwError(new Error("Invalid 'pollingMode' value"));
 
     const actualOptions = new optionsClass(sdkKey, configCatKernel.sdkType, configCatKernel.sdkVersion, options, configCatKernel.defaultCacheFactory, configCatKernel.eventEmitterFactory);
 
+    if (actualOptions.flagOverrides?.behaviour !== OverrideBehaviour.LocalOnly && !isValidSdkKey(sdkKey, actualOptions.baseUrlOverriden)) {
+      throw new Error(invalidSdkKeyError);
+    }
+
     const [instance, instanceAlreadyCreated] = clientInstanceCache.getOrCreate(actualOptions, configCatKernel);
 
     if (instanceAlreadyCreated && options) {
@@ -294,7 +299,7 @@ export class ConfigCatClient implements IConfigCatClient {
         options instanceof AutoPollOptions ? new AutoPollConfigService(configCatKernel.configFetcher, options) :
         options instanceof ManualPollOptions ? new ManualPollConfigService(configCatKernel.configFetcher, options) :
         options instanceof LazyLoadOptions ? new LazyLoadConfigService(configCatKernel.configFetcher, options) :
-        (() => { throw new Error("Invalid 'options' value"); })();
+        throwError(new Error("Invalid 'options' value"));
     }
     else {
       this.options.hooks.emit("clientReady", ClientCacheState.HasLocalOverrideFlagDataOnly);
@@ -489,22 +494,30 @@ export class ConfigCatClient implements IConfigCatClient {
           return new SettingKeyValue(settingKey, setting.value);
         }
 
-        const rolloutRules = settings[settingKey].targetingRules;
-        if (rolloutRules && rolloutRules.length > 0) {
-          for (let i = 0; i < rolloutRules.length; i++) {
-            const rolloutRule: RolloutRule = rolloutRules[i];
-            if (variationId === rolloutRule.variationId) {
-              return new SettingKeyValue(settingKey, rolloutRule.value);
+        const targetingRules = settings[settingKey].targetingRules;
+        if (targetingRules && targetingRules.length > 0) {
+          for (let i = 0; i < targetingRules.length; i++) {
+            const then = targetingRules[i].then;
+            if (isArray(then)) {
+              for (let j = 0; j < then.length; j++) {
+                const percentageOption: PercentageOption = then[j];
+                if (variationId === percentageOption.variationId) {
+                  return new SettingKeyValue(settingKey, percentageOption.value);
+                }
+              }
+            }
+            else if (variationId === then.variationId) {
+              return new SettingKeyValue(settingKey, then.value);
             }
           }
         }
 
-        const percentageItems = settings[settingKey].percentageOptions;
-        if (percentageItems && percentageItems.length > 0) {
-          for (let i = 0; i < percentageItems.length; i++) {
-            const percentageItem: RolloutPercentageItem = percentageItems[i];
-            if (variationId === percentageItem.variationId) {
-              return new SettingKeyValue(settingKey, percentageItem.value);
+        const percentageOptions = settings[settingKey].percentageOptions;
+        if (percentageOptions && percentageOptions.length > 0) {
+          for (let i = 0; i < percentageOptions.length; i++) {
+            const percentageOption: PercentageOption = percentageOptions[i];
+            if (variationId === percentageOption.variationId) {
+              return new SettingKeyValue(settingKey, percentageOption.value);
             }
           }
         }
@@ -746,14 +759,31 @@ export class SettingKeyValue<TValue = SettingValue> {
     public settingValue: TValue) { }
 }
 
+function isValidSdkKey(sdkKey: string, customBaseUrl: boolean) {
+  const proxyPrefix = "configcat-proxy/";
+
+  // NOTE: String.prototype.startsWith was introduced after ES5. We'd rather work around it instead of polyfilling it.
+  if (customBaseUrl && sdkKey.length > proxyPrefix.length && sdkKey.lastIndexOf(proxyPrefix, 0) === 0) {
+    return true;
+  }
+
+  const components = sdkKey.split("/");
+  const keyLength = 22;
+  switch (components.length) {
+    case 2: return components[0].length === keyLength && components[1].length === keyLength;
+    case 3: return components[0] === "configcat-sdk-1" && components[1].length === keyLength && components[2].length === keyLength;
+    default: return false;
+  }
+}
+
 function validateKey(key: string): void {
   if (!key) {
     throw new Error("Invalid 'key' value");
   }
 }
 
 function ensureAllowedDefaultValue(value: SettingValue): void {
-  if (!isAllowedValue(value)) {
+  if (value != null && !isAllowedValue(value)) {
     throw new TypeError("The default value must be boolean, number, string, null or undefined.");
   }
 }

src/ConfigCatClientOptions.ts

@@ -6,11 +6,11 @@ import type { ClientCacheState } from "./ConfigServiceBase";
 import { DefaultEventEmitter } from "./DefaultEventEmitter";
 import type { IEventEmitter } from "./EventEmitter";
 import type { FlagOverrides } from "./FlagOverrides";
+import { sha1 } from "./Hash";
 import type { IProvidesHooks } from "./Hooks";
 import { Hooks } from "./Hooks";
 import { ProjectConfig } from "./ProjectConfig";
 import type { User } from "./RolloutEvaluator";
-import { sha1 } from "./Sha1";
 
 /** Specifies the supported polling modes. */
 export enum PollingMode {
@@ -129,7 +129,7 @@ export type OptionsForPollingMode<TMode extends PollingMode> =
 
 export abstract class OptionsBase {
 
-  private static readonly configFileName = "config_v5.json";
+  private static readonly configFileName = "config_v6.json";
 
   logger: LoggerWrapper;
 
@@ -253,11 +253,11 @@ export class AutoPollOptions extends OptionsBase {
 
     if (options) {
 
-      if (options.pollIntervalSeconds !== void 0 && options.pollIntervalSeconds !== null) {
+      if (options.pollIntervalSeconds != null) {
         this.pollIntervalSeconds = options.pollIntervalSeconds;
       }
 
-      if (options.maxInitWaitTimeSeconds !== void 0 && options.maxInitWaitTimeSeconds !== null) {
+      if (options.maxInitWaitTimeSeconds != null) {
         this.maxInitWaitTimeSeconds = options.maxInitWaitTimeSeconds;
       }
     }
@@ -296,7 +296,7 @@ export class LazyLoadOptions extends OptionsBase {
     super(apiKey, sdkType + "/l-" + sdkVersion, options, defaultCacheFactory, eventEmitterFactory);
 
     if (options) {
-      if (options.cacheTimeToLiveSeconds !== void 0 && options.cacheTimeToLiveSeconds !== null) {
+      if (options.cacheTimeToLiveSeconds != null) {
         this.cacheTimeToLiveSeconds = options.cacheTimeToLiveSeconds;
       }
     }