Merge branch 'master' into junaed/fssdk-11483-browser-content-length-removal

Author: junaed-optimizely

lib/common_exports.ts

@@ -19,10 +19,10 @@ export { createStaticProjectConfigManager } from './project_config/config_manage
 export { LogLevel } from './logging/logger';
 
 export {
-  DebugLog,
-  InfoLog,
-  WarnLog,
-  ErrorLog,
+  DEBUG,
+  INFO,
+  WARN,
+  ERROR,
 } from './logging/logger_factory';
 
 export { createLogger } from './logging/logger_factory';

lib/entrypoint.test-d.ts

@@ -78,10 +78,10 @@ export type Entrypoint = {
 
   // logger related exports
   LogLevel: typeof LogLevel;
-  DebugLog: OpaqueLevelPreset,
-  InfoLog: OpaqueLevelPreset,
-  WarnLog: OpaqueLevelPreset,
-  ErrorLog: OpaqueLevelPreset,
+  DEBUG: OpaqueLevelPreset,
+  INFO: OpaqueLevelPreset,
+  WARN: OpaqueLevelPreset,
+  ERROR: OpaqueLevelPreset,
   createLogger: (config: LoggerConfig) => OpaqueLogger;
 
   // error related exports

lib/entrypoint.universal.test-d.ts

@@ -49,6 +49,9 @@ import { LogLevel } from './logging/logger';
 
 import { OptimizelyDecideOption } from './shared_types';
 import { UniversalConfig } from './index.universal';
+import { OpaqueOdpManager } from './odp/odp_manager_factory';
+
+import { UniversalOdpManagerOptions } from './odp/odp_manager_factory.universal';
 
 export type UniversalEntrypoint = {
   // client factory
@@ -63,18 +66,17 @@ export type UniversalEntrypoint = {
   createForwardingEventProcessor: (eventDispatcher: EventDispatcher) => OpaqueEventProcessor;
   createBatchEventProcessor: (options: UniversalBatchEventProcessorOptions) => OpaqueEventProcessor;
 
-  // TODO: odp manager related exports
-  // createOdpManager: (options: OdpManagerOptions) => OpaqueOdpManager;
+  createOdpManager: (options: UniversalOdpManagerOptions) => OpaqueOdpManager;
 
   // TODO: vuid manager related exports
   // createVuidManager: (options: VuidManagerOptions) => OpaqueVuidManager;
 
   // logger related exports
   LogLevel: typeof LogLevel;
-  DebugLog: OpaqueLevelPreset,
-  InfoLog: OpaqueLevelPreset,
-  WarnLog: OpaqueLevelPreset,
-  ErrorLog: OpaqueLevelPreset,
+  DEBUG: OpaqueLevelPreset,
+  INFO: OpaqueLevelPreset,
+  WARN: OpaqueLevelPreset,
+  ERROR: OpaqueLevelPreset,
   createLogger: (config: LoggerConfig) => OpaqueLogger;
 
   // error related exports

lib/event_processor/batch_event_processor.spec.ts

@@ -179,7 +179,7 @@ describe('BatchEventProcessor', async () => {
         batchSize: 100,
       });
 
-      expect(processor.process(createImpressionEvent('id-1'))).rejects.toThrow();
+      await expect(processor.process(createImpressionEvent('id-1'))).rejects.toThrow();
     });
 
     it('should enqueue event without dispatching immediately', async () => {

lib/export_types.ts

@@ -39,6 +39,10 @@ export type {
   OpaqueOdpManager,
 } from './odp/odp_manager_factory';
 
+export type {
+  UserAgentParser,
+} from './odp/ua_parser/user_agent_parser';
+
 // Vuid manager related types
 export type {
   VuidManagerOptions,

lib/index.universal.ts

@@ -39,8 +39,9 @@ export { createPollingProjectConfigManager } from './project_config/config_manag
 
 export { createForwardingEventProcessor, createBatchEventProcessor } from './event_processor/event_processor_factory.universal';
 
-// TODO: decide on universal odp manager factory interface
-// export { createOdpManager } from './odp/odp_manager_factory.node';
+export { createOdpManager } from './odp/odp_manager_factory.universal';
+
+// TODO: decide on vuid manager API for universal
 // export { createVuidManager } from './vuid/vuid_manager_factory.node';
 
 export * from './common_exports';
@@ -67,6 +68,15 @@ export type {
 
 export type { UniversalBatchEventProcessorOptions } from './event_processor/event_processor_factory.universal';
 
+// odp manager related types
+export type {
+  UniversalOdpManagerOptions,
+} from './odp/odp_manager_factory.universal';
+
+export type {
+  UserAgentParser,
+} from './odp/ua_parser/user_agent_parser';
+
 export type {
   OpaqueEventProcessor,
 } from './event_processor/event_processor_factory';

lib/logging/logger_factory.spec.ts

@@ -25,7 +25,7 @@ vi.mock('./logger', async (importOriginal) => {
 });
 
 import { OptimizelyLogger, ConsoleLogHandler, LogLevel } from './logger';
-import { createLogger, extractLogger, InfoLog } from './logger_factory';
+import { createLogger, extractLogger, INFO } from './logger_factory';
 import { errorResolver, infoResolver } from '../message/message_resolver';
 
 describe('create', () => {
@@ -41,7 +41,7 @@ describe('create', () => {
     const mockLogHandler = { log: vi.fn() };
 
     const logger = extractLogger(createLogger({
-      level: InfoLog,
+      level: INFO,
       logHandler: mockLogHandler,
     }));
 
@@ -56,7 +56,7 @@ describe('create', () => {
 
   it('should use a ConsoleLogHandler if no logHandler is provided', () => {
     const logger = extractLogger(createLogger({
-      level: InfoLog,
+      level: INFO,
     }));
 
     expect(logger).toBe(MockedOptimizelyLogger.mock.instances[0]);

lib/logging/logger_factory.ts

@@ -50,19 +50,19 @@ export type OpaqueLevelPreset = {
   [levelPresetSymbol]: unknown;
 };
 
-export const DebugLog: OpaqueLevelPreset = {
+export const DEBUG: OpaqueLevelPreset = {
   [levelPresetSymbol]: debugPreset,
 };
 
-export const InfoLog: OpaqueLevelPreset = {
+export const INFO: OpaqueLevelPreset = {
   [levelPresetSymbol]: infoPreset,
 };
 
-export const WarnLog: OpaqueLevelPreset = {
+export const WARN: OpaqueLevelPreset = {
   [levelPresetSymbol]: warnPreset,
 };
 
-export const ErrorLog: OpaqueLevelPreset = {
+export const ERROR: OpaqueLevelPreset = {
   [levelPresetSymbol]: errorPreset,
 };
 

lib/odp/odp_manager_factory.browser.spec.ts

@@ -117,9 +117,7 @@ describe('createOdpManager', () => {
       segmentsCache: {} as any,
       segmentsCacheSize: 11,
       segmentsCacheTimeout: 2025,
-      segmentManager: {} as any,
       eventFlushInterval: 2222,
-      eventManager: {} as any,
       userAgentParser: {} as any,
     };
     const odpManager = createOdpManager(options);

lib/odp/odp_manager_factory.node.spec.ts

@@ -117,8 +117,6 @@ describe('createOdpManager', () => {
       segmentsCache: {} as any,
       segmentsCacheSize: 11,
       segmentsCacheTimeout: 2025,
-      segmentManager: {} as any,
-      eventManager: {} as any,
       userAgentParser: {} as any,
     };
     const odpManager = createOdpManager(options);

lib/odp/odp_manager_factory.node.ts

@@ -16,7 +16,6 @@
 
 import { NodeRequestHandler } from '../utils/http_request_handler/request_handler.node';
 import { eventApiRequestGenerator } from './event_manager/odp_event_api_manager';
-import { OdpManager } from './odp_manager';
 import { getOpaqueOdpManager, OdpManagerOptions, OpaqueOdpManager } from './odp_manager_factory';
 
 export const NODE_DEFAULT_API_TIMEOUT = 10_000;

lib/odp/odp_manager_factory.react_native.spec.ts

@@ -117,8 +117,6 @@ describe('createOdpManager', () => {
       segmentsCache: {} as any,
       segmentsCacheSize: 11,
       segmentsCacheTimeout: 2025,
-      segmentManager: {} as any,
-      eventManager: {} as any,
       userAgentParser: {} as any,
     };
     const odpManager = createOdpManager(options);

lib/odp/odp_manager_factory.spec.ts

@@ -90,22 +90,7 @@ describe('getOdpManager', () => {
     MockExponentialBackoff.mockClear();
   });
 
-  it('should use provided segment manager', () => {
-    const segmentManager = {} as any;
-
-    const odpManager = getOdpManager({
-      segmentManager,
-      segmentRequestHandler: getMockRequestHandler(),
-      eventRequestHandler: getMockRequestHandler(),
-      eventRequestGenerator: vi.fn(),
-    });
-
-    expect(Object.is(odpManager, MockDefaultOdpManager.mock.instances[0])).toBe(true);
-    const { segmentManager: usedSegmentManager } = MockDefaultOdpManager.mock.calls[0][0];
-    expect(usedSegmentManager).toBe(segmentManager);
-  });
-
-  describe('when no segment manager is provided', () => {
+  describe('segment manager', () => {
     it('should create a default segment manager with default api manager using the passed eventRequestHandler', () => {
       const segmentRequestHandler = getMockRequestHandler();
       const odpManager = getOdpManager({
@@ -205,22 +190,7 @@ describe('getOdpManager', () => {
     });
   });
 
-  it('uses provided event manager', () => {
-    const eventManager = {} as any;
-
-    const odpManager = getOdpManager({
-      eventManager,
-      segmentRequestHandler: getMockRequestHandler(),
-      eventRequestHandler: getMockRequestHandler(),
-      eventRequestGenerator: vi.fn(),
-    });
-
-    expect(odpManager).toBe(MockDefaultOdpManager.mock.instances[0]);
-    const { eventManager: usedEventManager } = MockDefaultOdpManager.mock.calls[0][0];
-    expect(usedEventManager).toBe(eventManager);
-  });
-
-  describe('when no event manager is provided', () => {
+  describe('event manager', () => {
     it('should use a default event manager with default api manager using the passed eventRequestHandler and eventRequestGenerator', () => {
       const eventRequestHandler = getMockRequestHandler();
       const eventRequestGenerator = vi.fn();

lib/odp/odp_manager_factory.ts

@@ -45,11 +45,9 @@ export type OdpManagerOptions = {
   segmentsCacheSize?: number;
   segmentsCacheTimeout?: number;
   segmentsApiTimeout?: number;
-  segmentManager?: OdpSegmentManager;
   eventFlushInterval?: number;
   eventBatchSize?: number;
   eventApiTimeout?: number;
-  eventManager?: OdpEventManager;
   userAgentParser?: UserAgentParser;
 };
 
@@ -90,8 +88,8 @@ const getDefaultEventManager = (options: OdpManagerFactoryOptions) => {
 }
 
 export const getOdpManager = (options: OdpManagerFactoryOptions): OdpManager => {
-  const segmentManager = options.segmentManager || getDefaultSegmentManager(options);
-  const eventManager = options.eventManager || getDefaultEventManager(options);
+  const segmentManager = getDefaultSegmentManager(options);
+  const eventManager = getDefaultEventManager(options);
 
   return new DefaultOdpManager({
     segmentManager,

lib/odp/odp_manager_factory.universal.ts

@@ -0,0 +1,38 @@
+/**
+ * Copyright 2025, Optimizely
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { RequestHandler } from '../utils/http_request_handler/http';
+import { eventApiRequestGenerator } from './event_manager/odp_event_api_manager';
+import { getOpaqueOdpManager, OdpManagerOptions, OpaqueOdpManager } from './odp_manager_factory';
+
+export const DEFAULT_API_TIMEOUT = 10_000;
+export const DEFAULT_BATCH_SIZE = 1;
+export const DEFAULT_FLUSH_INTERVAL = 1000;
+
+export type UniversalOdpManagerOptions = OdpManagerOptions & {
+  requestHandler: RequestHandler;
+};
+
+export const createOdpManager = (options: UniversalOdpManagerOptions): OpaqueOdpManager => {
+  return getOpaqueOdpManager({
+    ...options,
+    segmentRequestHandler: options.requestHandler,
+    eventRequestHandler: options.requestHandler,
+    eventBatchSize: options.eventBatchSize || DEFAULT_BATCH_SIZE,
+    eventFlushInterval: options.eventFlushInterval || DEFAULT_FLUSH_INTERVAL,
+    eventRequestGenerator: eventApiRequestGenerator,
+  });
+};

lib/odp/ua_parser/ua_parser.browser.ts renamed to lib/odp/ua_parser/ua_parser.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import { UAParser } from 'ua-parser-js';
 import { UserAgentInfo } from './user_agent_info';
 import { UserAgentParser } from './user_agent_parser';
@@ -30,4 +29,3 @@ const userAgentParser: UserAgentParser = {
 export function getUserAgentParser(): UserAgentParser {
   return userAgentParser;
 }
-

lib/project_config/polling_datafile_manager.spec.ts

@@ -495,7 +495,7 @@ describe('PollingDatafileManager', () => {
       manager.start();
       for(let i = 0; i < 2; i++) {
         const ret = repeater.execute(0);
-        expect(ret).rejects.toThrow();
+        await expect(ret).rejects.toThrow();
       }
 
       repeater.execute(0);

lib/vuid/vuid_manager_factory.browser.ts

@@ -26,4 +26,3 @@ export const createVuidManager = (options: VuidManagerOptions = {}): OpaqueVuidM
     enableVuid: options.enableVuid
   }));
 };
-