Various Implementation Fixes for Demo Build

Author: opti-jnguyen

.gitignore

@@ -10,3 +10,6 @@ dist/
 # user-specific ignores ought to be defined in user's `core.excludesfile`
 .idea/*
 .DS_STORE
+
+browserstack.err
+local.log

packages/optimizely-sdk/lib/core/odp/odp_event_manager.ts

@@ -140,7 +140,17 @@ export class OdpEventManager implements IOdpEventManager {
     this.clientEngine = clientEngine;
     this.clientVersion = clientVersion;
 
-    this.queueSize = queueSize || (process ? DEFAULT_SERVER_QUEUE_SIZE : DEFAULT_BROWSER_QUEUE_SIZE);
+    let defaultQueueSize = DEFAULT_BROWSER_QUEUE_SIZE;
+
+    try {
+      if (process) {
+        defaultQueueSize = DEFAULT_SERVER_QUEUE_SIZE;
+      }
+    } catch (e) {
+      // TODO: Create Browser and Non-Browser specific variants of ODP Event Manager to avoid this try/catch
+    }
+
+    this.queueSize = queueSize || defaultQueueSize;
     this.batchSize = batchSize || DEFAULT_BATCH_SIZE;
     this.flushInterval = flushInterval || DEFAULT_FLUSH_INTERVAL_MSECS;
 
@@ -381,14 +391,20 @@ export class OdpEventManager implements IOdpEventManager {
       return true;
     }
 
-    if (process) {
-      // if Node/server-side context, empty queue items before ready state
-      this.logger.log(LogLevel.WARNING, 'ODPConfig not ready. Discarding events in queue.');
-      this.queue = new Array<OdpEvent>();
-    } else {
-      // in Browser/client-side context, give debug message but leave events in queue
+    try {
+      if (process) {
+        // if Node/server-side context, empty queue items before ready state
+        this.logger.log(LogLevel.WARNING, 'ODPConfig not ready. Discarding events in queue.');
+        this.queue = new Array<OdpEvent>();
+      } else {
+        // in Browser/client-side context, give debug message but leave events in queue
+        this.logger.log(LogLevel.DEBUG, 'ODPConfig not ready. Leaving events in queue.');
+      }
+    } catch (e) {
+      // TODO: Create Browser and Non-Browser specific variants of ODP Event Manager to avoid this try/catch
       this.logger.log(LogLevel.DEBUG, 'ODPConfig not ready. Leaving events in queue.');
     }
+
     return false;
   }
 

packages/optimizely-sdk/lib/core/odp/odp_segment_api_manager.ts

@@ -130,14 +130,14 @@ export class OdpSegmentApiManager implements IOdpSegmentApiManager {
    */
   private toGraphQLJson = (userKey: string, userValue: string, segmentsToCheck: string[]): string =>
     [
-      '{"query" : "query {customer"',
-      `(${userKey} : "${userValue}") `,
+      '{"query" : "query {customer',
+      `(${userKey} : \\"${userValue}\\") `,
       '{audiences',
       '(subset: [',
       ...(segmentsToCheck?.map(
         (segment, index) => `\\"${segment}\\"${index < segmentsToCheck.length - 1 ? ',' : ''}`
       ) || ''),
-      '] {edges {node {name state}}}}}"}',
+      ']) {edges {node {name state}}}}}"}',
     ].join('');
 
   /**

packages/optimizely-sdk/lib/export_types.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright 2022, Optimizely
+ * Copyright 2022-2023, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,5 +37,5 @@ export {
   Client,
   ActivateListenerPayload,
   TrackListenerPayload,
-  NotificationCenter
-} from './shared_types'
+  NotificationCenter,
+} from './shared_types';

packages/optimizely-sdk/lib/plugins/vuid_manager/index.ts

@@ -125,7 +125,7 @@ export class VuidManager implements IVuidManager {
    * @param vuid VistorId to check
    * @returns *true* if the VisitorId is valid otherwise *false* for invalid
    */
-  static isVuid = (vuid: string): boolean => vuid.startsWith(VuidManager.vuid_prefix);
+  static isVuid = (vuid: string): boolean => vuid?.startsWith(VuidManager.vuid_prefix) || false;
 
   /**
    * Function used in unit testing to reset the VuidManager

packages/optimizely-sdk/lib/shared_types.ts

@@ -490,6 +490,7 @@ export interface OptimizelyUserContext {
   getForcedDecision(context: OptimizelyDecisionContext): OptimizelyForcedDecision | null;
   removeForcedDecision(context: OptimizelyDecisionContext): boolean;
   removeAllForcedDecisions(): boolean;
+  fetchQualifiedSegments(): Promise<boolean>;
   isQualifiedFor(segment: string): boolean;
 }
 

packages/optimizely-sdk/lib/utils/json_schema_validator/index.ts

@@ -28,7 +28,11 @@ const MODULE_NAME = 'JSON_SCHEMA_VALIDATOR';
  * @param {boolean} shouldThrowOnError Should validation throw if invalid JSON object
  * @return {boolean} true if the given object is valid; throws or false if invalid
  */
-export function validate(jsonObject: unknown, validationSchema: JSONSchema4 = schema, shouldThrowOnError = true): boolean {
+export function validate(
+  jsonObject: unknown,
+  validationSchema: JSONSchema4 = schema,
+  shouldThrowOnError = true
+): boolean {
   const moduleTitle = `${MODULE_NAME} (${validationSchema.title})`;
 
   if (typeof jsonObject !== 'object' || jsonObject === null) {
@@ -46,7 +50,7 @@ export function validate(jsonObject: unknown, validationSchema: JSONSchema4 = sc
 
   if (Array.isArray(result.errors)) {
     throw new Error(
-      sprintf(ERROR_MESSAGES.INVALID_DATAFILE, moduleTitle, result.errors[0].property, result.errors[0].message),
+      sprintf(ERROR_MESSAGES.INVALID_DATAFILE, moduleTitle, result.errors[0].property, result.errors[0].message)
     );
   }
 

packages/optimizely-sdk/rollup.config.js

@@ -69,21 +69,18 @@ const umdBundle = {
     commonjs({
       namedExports: {
         '@optimizely/js-sdk-event-processor': ['LogTierV1EventProcessor', 'LocalStoragePendingEventsDispatcher'],
+        'json-schema': ['validate'],
       },
     }),
     typescript(typescriptPluginOptions),
   ],
-  external: ['json-schema'],
   input: 'lib/index.browser.ts',
   output: [
     {
       name: 'optimizelySdk',
       format: 'umd',
       file: 'dist/optimizely.browser.umd.js',
       exports: 'named',
-      globals: {
-        'json-schema': 'json-schema',
-      },
     },
     {
       name: 'optimizelySdk',
@@ -92,9 +89,6 @@ const umdBundle = {
       exports: 'named',
       plugins: [terser()],
       sourcemap: true,
-      globals: {
-        'json-schema': 'json-schema',
-      },
     },
   ],
 };

packages/optimizely-sdk/tests/odpSegmentApiManager.spec.ts

@@ -133,7 +133,7 @@ describe('OdpSegmentApiManager', () => {
     const response = manager['toGraphQLJson'](USER_KEY, USER_VALUE, SEGMENTS_TO_CHECK);
 
     expect(response).toBe(
-      `{"query" : "query {customer"(${USER_KEY} : "${USER_VALUE}") {audiences(subset: [\\"has_email\\",\\"has_email_opted_in\\",\\"push_on_sale\\"] {edges {node {name state}}}}}"}`
+      `{"query" : "query {customer(${USER_KEY} : \\"${USER_VALUE}\\") {audiences(subset: [\\"has_email\\",\\"has_email_opted_in\\",\\"push_on_sale\\"]) {edges {node {name state}}}}}"}`
     );
   });