vuidman test

Author: raju-opti

lib/odp/odp_manager.ts

@@ -25,7 +25,7 @@ import { OdpEvent } from './event_manager/odp_event';
 import { resolvablePromise, ResolvablePromise } from '../utils/promise/resolvablePromise';
 import { BaseService, Service, ServiceState } from '../service';
 import { UserAgentParser } from './ua_parser/user_agent_parser';
-import { CLIENT_VERSION, ERROR_MESSAGES, JAVASCRIPT_CLIENT_ENGINE } from '../utils/enums';
+import { CLIENT_VERSION, JAVASCRIPT_CLIENT_ENGINE } from '../utils/enums';
 import { ODP_DEFAULT_EVENT_TYPE, ODP_EVENT_ACTION, ODP_USER_KEY } from './constant';
 import { isVuid } from '../vuid/vuid';
 import { Maybe } from '../utils/type';

lib/optimizely/index.ts

@@ -63,9 +63,6 @@ import {
   NOTIFICATION_TYPES,
   NODE_CLIENT_ENGINE,
   CLIENT_VERSION,
-  ODP_DEFAULT_EVENT_TYPE,
-  FS_USER_ID_ALIAS,
-  ODP_USER_KEY,
 } from '../utils/enums';
 import { Fn } from '../utils/type';
 import { resolvablePromise } from '../utils/promise/resolvablePromise';
@@ -184,7 +181,7 @@ export default class Optimizely implements Client {
     this.readyPromise = Promise.all([
       projectConfigManagerRunningPromise,
       eventProcessorRunningPromise,
-      config.odpManager ? config.odpManager.onReady() : Promise.resolve(),
+      config.odpManager ? config.odpManager.onRunning() : Promise.resolve(),
     ]);
 
     this.readyTimeouts = {};
@@ -1229,13 +1226,10 @@ export default class Optimizely implements Client {
    */
   close(): Promise<{ success: boolean; reason?: string }> {
     try {
-      if (this.odpManager) {
-        this.odpManager.stop();
-      }
-
-      this.notificationCenter.clearAllNotificationListeners();
-
+      this.projectConfigManager.stop();
       this.eventProcessor?.stop();
+      this.odpManager?.stop();
+      this.notificationCenter.clearAllNotificationListeners();
 
       const eventProcessorStoppedPromise = this.eventProcessor ? this.eventProcessor.onTerminated() :
         Promise.resolve();
@@ -1244,9 +1238,7 @@ export default class Optimizely implements Client {
         this.disposeOnUpdate();
         this.disposeOnUpdate = undefined;
       }
-      if (this.projectConfigManager) {
-        this.projectConfigManager.stop();
-      }
+
       Object.keys(this.readyTimeouts).forEach((readyTimeoutId: string) => {
         const readyTimeoutRecord = this.readyTimeouts[readyTimeoutId];
         clearTimeout(readyTimeoutRecord.readyTimeout);
@@ -1654,29 +1646,8 @@ export default class Optimizely implements Client {
       return;
     }
 
-    const odpEventType = type ?? ODP_DEFAULT_EVENT_TYPE;
-
-    const odpIdentifiers = new Map(identifiers);
-
-    if (identifiers && identifiers.size > 0) {
-      try {
-        identifiers.forEach((identifier_value, identifier_key) => {
-          // Catch for fs-user-id, FS-USER-ID, and FS_USER_ID and assign value to fs_user_id identifier.
-          if (
-            FS_USER_ID_ALIAS === identifier_key.toLowerCase() ||
-            ODP_USER_KEY.FS_USER_ID === identifier_key.toLowerCase()
-          ) {
-            odpIdentifiers.delete(identifier_key);
-            odpIdentifiers.set(ODP_USER_KEY.FS_USER_ID, identifier_value);
-          }
-        });
-      } catch (e) {
-        this.logger.warn(LOG_MESSAGES.ODP_SEND_EVENT_IDENTIFIER_CONVERSION_FAILED);
-      }
-    }
-
     try {
-      const odpEvent = new OdpEvent(odpEventType, action, odpIdentifiers, data);
+      const odpEvent = new OdpEvent(type || '', action, identifiers, data);
       this.odpManager.sendEvent(odpEvent);
     } catch (e) {
       this.logger.error(ERROR_MESSAGES.ODP_EVENT_FAILED, e);

lib/plugins/vuid_manager/index.ts

@@ -26,15 +26,13 @@ import { NOTIFICATION_TYPES } from './utils/enums';
 
 import { IOptimizelyUserContext as OptimizelyUserContext } from './optimizely_user_context';
 
-import { ICache } from './utils/lru_cache';
 import { RequestHandler } from './utils/http_request_handler/http';
 import { OptimizelySegmentOption } from './odp/segment_manager/optimizely_segment_option';
 import { OdpSegmentApiManager } from './odp/segment_manager/odp_segment_api_manager';
 import { OdpSegmentManager } from './odp/segment_manager/odp_segment_manager';
 import { DefaultOdpEventApiManager } from './odp/event_manager/odp_event_api_manager';
 import { OdpEventManager } from './odp/event_manager/odp_event_manager';
 import { OdpManager } from './odp/odp_manager';
-import { UserAgentParser } from './odp/ua_parser/user_agent_parser';
 import PersistentCache from './plugins/key_value_cache/persistentKeyValueCache';
 import { ProjectConfig } from './project_config/project_config';
 import { ProjectConfigManager } from './project_config/project_config_manager';
@@ -43,6 +41,7 @@ import { EventProcessor } from './event_processor/event_processor';
 
 export { EventDispatcher } from './event_processor/event_dispatcher/event_dispatcher';
 export { EventProcessor } from './event_processor/event_processor';
+export { OdpManager } from './odp/odp_manager';
 export interface BucketerParams {
   experimentId: string;
   experimentKey: string;
@@ -98,23 +97,6 @@ export interface DatafileOptions {
   datafileAccessToken?: string;
 }
 
-export interface OdpOptions {
-  disabled?: boolean;
-  segmentsCache?: ICache<string, string[]>;
-  segmentsCacheSize?: number;
-  segmentsCacheTimeout?: number;
-  segmentsApiTimeout?: number;
-  segmentsRequestHandler?: RequestHandler;
-  segmentManager?: OdpSegmentManager;
-  eventFlushInterval?: number;
-  eventBatchSize?: number;
-  eventQueueSize?: number;
-  eventApiTimeout?: number;
-  eventRequestHandler?: RequestHandler;
-  eventManager?: OdpEventManager;
-  userAgentParser?: UserAgentParser;
-}
-
 export interface ListenerPayload {
   userId: string;
   attributes?: UserAttributes;
@@ -398,7 +380,6 @@ export interface Config extends ConfigLite {
   // eventFlushInterval?: number; // Maximum time for an event to be enqueued
   // eventMaxQueueSize?: number; // Maximum size for the event queue
   sdkKey?: string;
-  odpOptions?: OdpOptions;
   persistentCacheProvider?: PersistentCacheProvider;
 }
 
@@ -429,6 +410,7 @@ export interface ConfigLite {
   clientEngine?: string;
   clientVersion?: string;
   isSsr?: boolean;
+  odpManager?: OdpManager;
 }
 
 export type OptimizelyExperimentsMap = {
@@ -551,7 +533,6 @@ export interface OptimizelyForcedDecision {
 // ODP Exports
 
 export {
-  ICache,
   RequestHandler,
   OptimizelySegmentOption,
   OdpSegmentApiManager as IOdpSegmentApiManager,

lib/shared_types.ts

@@ -57,6 +57,11 @@ export function keyBy<K>(arr: K[], key: string): { [key: string]: K } {
   });
 }
 
+
+function isNumber(value: unknown): boolean {
+  return typeof value === 'number';
+}
+
 export function uuid(): string {
   return v4();
 }
@@ -166,6 +171,7 @@ export default {
   isSafeInteger,
   keyBy,
   uuid,
+  isNumber,
   getTimestamp,
   isValidEnum,
   groupBy,