Revert "[FSSDK-8651] added support for user agent parser for odp (#854)"

This reverts commit b85af27.

Author: raju-opti

Diff for: .vscode/settings.json

@@ -1,6 +1,5 @@
 {
     "jest.rootPath": "/workspaces/javascript-sdk/packages/optimizely-sdk",
     "jest.jestCommandLine": "./node_modules/.bin/jest",
-    "jest.autoRevealOutput": "on-exec-error",
-    "editor.tabSize": 2
+    "jest.autoRevealOutput": "on-exec-error"
 }

Diff for: lib/core/odp/odp_event_manager.ts

@@ -23,7 +23,6 @@ import { OdpEvent } from './odp_event';
 import { OdpConfig } from './odp_config';
 import { IOdpEventApiManager } from './odp_event_api_manager';
 import { invalidOdpDataFound } from './odp_utils';
-import { IUserAgentParser } from './user_agent_parser';
 
 const MAX_RETRIES = 3;
 
@@ -124,19 +123,6 @@ export abstract class OdpEventManager implements IOdpEventManager {
    */
   private readonly clientVersion: string;
 
-  /**
-   * Version of the client being used
-   * @private
-   */
-  private readonly userAgentParser?: IUserAgentParser;
-
-
-  /**
-   * Information about the user agent
-   * @private
-   */
-  private readonly userAgentData?: Map<string, unknown>;
-
   constructor({
     odpConfig,
     apiManager,
@@ -146,7 +132,6 @@ export abstract class OdpEventManager implements IOdpEventManager {
     queueSize,
     batchSize,
     flushInterval,
-    userAgentParser,
   }: {
     odpConfig: OdpConfig;
     apiManager: IOdpEventApiManager;
@@ -156,7 +141,6 @@ export abstract class OdpEventManager implements IOdpEventManager {
     queueSize?: number;
     batchSize?: number;
     flushInterval?: number;
-    userAgentParser?: IUserAgentParser;
   }) {
     this.odpConfig = odpConfig;
     this.apiManager = apiManager;
@@ -165,22 +149,6 @@ export abstract class OdpEventManager implements IOdpEventManager {
     this.clientVersion = clientVersion;
     this.initParams(batchSize, queueSize, flushInterval);
     this.state = STATE.STOPPED;
-    this.userAgentParser = userAgentParser;
-
-    if (userAgentParser) {
-      const { os, device } = userAgentParser.parseUserAgentInfo();
-
-      const userAgentInfo: Record<string, unknown> = {
-        'os': os.name,
-        'os_version': os.version,
-        'device_type': device.type,
-        'model': device.model,
-      };
-
-      this.userAgentData = new Map<string, unknown>(
-        Object.entries(userAgentInfo).filter(([key, value]) => value != null && value != undefined)
-      );
-    }
 
     this.apiManager.updateSettings(odpConfig);
   }
@@ -440,8 +408,7 @@ export abstract class OdpEventManager implements IOdpEventManager {
    * @private
    */
   private augmentCommonData(sourceData: Map<string, unknown>): Map<string, unknown> {
-    const data = new Map<string, unknown>(this.userAgentData);
-  
+    const data = new Map<string, unknown>();
     data.set('idempotence_id', uuid());
     data.set('data_source_type', 'sdk');
     data.set('data_source', this.clientEngine);

Diff for: lib/core/odp/user_agent_info.ts

@@ -67,10 +67,6 @@ if (!global.window) {
   }
 }
 
-const pause = (timeoutMilliseconds) => {
-  return new Promise(resolve => setTimeout(resolve, timeoutMilliseconds));
-};
-
 describe('javascript-sdk (Browser)', function() {
   var clock;
   beforeEach(function() {
@@ -842,53 +838,6 @@ describe('javascript-sdk (Browser)', function() {
         sinon.assert.called(fakeEventManager.sendEvent);
       });
 
-      it('should augment odp events with user agent data if userAgentParser is provided', async () => {
-        const userAgentParser = {
-          parseUserAgentInfo() {
-            return {
-              os: { 'name': 'windows', 'version': '11' },
-              device: { 'type': 'laptop', 'model': 'thinkpad' },
-            }
-          }
-        }
-
-        const fakeRequestHandler = {
-          makeRequest: sinon.spy(function (requestUrl, headers, method, data) {
-            return {
-              abort: () => {},
-              responsePromise: Promise.resolve({ statusCode: 200 }),
-            }
-          })
-        };
-
-        const client = optimizelyFactory.createInstance({
-          datafile: testData.getOdpIntegratedConfigWithSegments(),
-          errorHandler: fakeErrorHandler,
-          eventDispatcher: fakeEventDispatcher,
-          eventBatchSize: null,
-          logger,
-          odpOptions: {
-            userAgentParser,
-            eventRequestHandler: fakeRequestHandler,
-          },
-        });
-        const readyData = await client.onReady();
-
-        assert.equal(readyData.success, true);
-        assert.isUndefined(readyData.reason);
-
-        client.sendOdpEvent('test', '', new Map([['eamil', '[email protected]']]), new Map([['key', 'value']]));
-        clock.tick(10000);
-        
-        const eventRequestUrl = new URL(fakeRequestHandler.makeRequest.lastCall.args[0]);
-        const searchParams = eventRequestUrl.searchParams;
-
-        assert.equal(searchParams.get('os'), 'windows');
-        assert.equal(searchParams.get('os_version'), '11');
-        assert.equal(searchParams.get('device_type'), 'laptop');
-        assert.equal(searchParams.get('model'), 'thinkpad');
-      });
-
       it('should convert fs-user-id, FS-USER-ID, and FS_USER_ID to fs_user_id identifier when calling sendOdpEvent', async () => {
         const fakeEventManager = {
           updateSettings: sinon.spy(),

Diff for: lib/core/odp/user_agent_parser.ts

@@ -28,8 +28,6 @@ import { OptimizelyDecideOption, Client, Config, OptimizelyOptions } from './sha
 import { createHttpPollingDatafileManager } from './plugins/datafile_manager/browser_http_polling_datafile_manager';
 import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
 import Optimizely from './optimizely';
-import { IUserAgentParser } from './core/odp/user_agent_parser';
-import { getUserAgentParser } from './plugins/odp/user_agent_parser/index.browser';
 
 const logger = getLogger();
 logHelper.setLogHandler(loggerPlugin.createLogger());
@@ -166,7 +164,6 @@ const __internalResetRetryState = function(): void {
 
 const setLogHandler = logHelper.setLogHandler;
 const setLogLevel = logHelper.setLogLevel;
-
 export {
   loggerPlugin as logging,
   defaultErrorHandler as errorHandler,
@@ -177,8 +174,6 @@ export {
   createInstance,
   __internalResetRetryState,
   OptimizelyDecideOption,
-  IUserAgentParser,
-  getUserAgentParser,
 };
 
 export default {
@@ -191,7 +186,6 @@ export default {
   createInstance,
   __internalResetRetryState,
   OptimizelyDecideOption,
-  getUserAgentParser,
 };
 
 export * from './export_types';

Diff for: lib/index.browser.tests.js

@@ -118,7 +118,6 @@ export class BrowserOdpManager extends OdpManager {
         flushInterval: odpOptions?.eventFlushInterval,
         batchSize: odpOptions?.eventBatchSize,
         queueSize: odpOptions?.eventQueueSize,
-        userAgentParser: odpOptions?.userAgentParser,
       });
     }
 

Diff for: lib/index.browser.ts

@@ -35,7 +35,6 @@ import { IOdpSegmentManager } from './core/odp/odp_segment_manager';
 import { IOdpEventApiManager } from './core/odp/odp_event_api_manager';
 import { IOdpEventManager } from './core/odp/odp_event_manager';
 import { IOdpManager } from './core/odp/odp_manager';
-import { IUserAgentParser } from './core/odp/user_agent_parser';
 
 export interface BucketerParams {
   experimentId: string;
@@ -106,7 +105,6 @@ export interface OdpOptions {
   eventApiTimeout?: number;
   eventRequestHandler?: RequestHandler;
   eventManager?: IOdpEventManager;
-  userAgentParser?: IUserAgentParser;
 }
 
 export interface ListenerPayload {

Diff for: lib/plugins/odp/user_agent_parser/index.browser.ts

@@ -45,7 +45,6 @@
     "decompress-response": "^4.2.1",
     "json-schema": "^0.4.0",
     "murmurhash": "^2.0.1",
-    "ua-parser-js": "^1.0.35",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
@@ -58,7 +57,6 @@
     "@types/mocha": "^5.2.7",
     "@types/nise": "^1.4.0",
     "@types/node": "^18.7.18",
-    "@types/ua-parser-js": "^0.7.36",
     "@types/uuid": "^3.4.4",
     "@typescript-eslint/eslint-plugin": "^5.33.0",
     "@typescript-eslint/parser": "^5.33.0",

Diff for: lib/plugins/odp_manager/index.browser.ts

@@ -23,8 +23,6 @@ import { anything, capture, instance, mock, resetCalls, spy, verify, when } from
 import { IOdpEventApiManager } from '../lib/core/odp/odp_event_api_manager';
 import { LogHandler, LogLevel } from '../lib/modules/logging';
 import { OdpEvent } from '../lib/core/odp/odp_event';
-import { IUserAgentParser } from '../lib/core/odp/user_agent_parser';
-import { UserAgentInfo } from '../lib/core/odp/user_agent_info';
 
 const API_KEY = 'test-api-key';
 const API_HOST = 'https://odp.example.com';
@@ -374,41 +372,6 @@ describe('OdpEventManager', () => {
     expect(events[1].data.size).toEqual(PROCESSED_EVENTS[1].data.size);
   });
 
-  it('should augment events with data from user agent parser', async () => {
-    const userAgentParser : IUserAgentParser = {
-      parseUserAgentInfo: function (): UserAgentInfo {
-        return {
-          os: { 'name': 'windows', 'version': '11' },
-          device: { 'type': 'laptop', 'model': 'thinkpad' },
-        }
-      }
-    }
-
-    const eventManager = new OdpEventManager({
-      odpConfig,
-      apiManager,
-      logger,
-      clientEngine,
-      clientVersion,
-      batchSize: 10,
-      flushInterval: 100,
-      userAgentParser,
-    });
-
-    eventManager.start();
-    EVENTS.forEach(event => eventManager.sendEvent(event));
-    await pause(1000);
-
-    verify(mockApiManager.sendEvents(anything())).called();
-    const [events] = capture(mockApiManager.sendEvents).last();
-    const event = events[0];
-
-    expect(event.data.get('os')).toEqual('windows');
-    expect(event.data.get('os_version')).toEqual('11');
-    expect(event.data.get('device_type')).toEqual('laptop');
-    expect(event.data.get('model')).toEqual('thinkpad');
-  });
-
   it('should retry failed events', async () => {
     // all events should fail ie shouldRetry = true
     when(mockApiManager.sendEvents(anything())).thenResolve(true);