nit fixes

Author: andrewleap-optimizely

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

@@ -16,7 +16,7 @@
 
 import { LogHandler, LogLevel } from '../../modules/logging';
 import { OdpEvent } from './odp_event';
-import { browserMode } from './odp_utils';
+import { isBrowserContext } from './odp_utils';
 import { RequestHandler } from '../../utils/http_request_handler/http';
 import { ODP_EVENT_BROWSER_ENDPOINT } from '../../utils/enums';
 
@@ -35,7 +35,7 @@ export interface IOdpEventApiManager {
 export class OdpEventApiManager implements IOdpEventApiManager {
   private readonly logger: LogHandler;
   private readonly requestHandler: RequestHandler;
-  private readonly browserMode: boolean;
+  private readonly isBrowser: boolean;
 
   /**
    * Creates instance to access Optimizely Data Platform (ODP) REST API
@@ -45,7 +45,7 @@ export class OdpEventApiManager implements IOdpEventApiManager {
   constructor(requestHandler: RequestHandler, logger: LogHandler) {
     this.requestHandler = requestHandler;
     this.logger = logger;
-    this.browserMode = browserMode()
+    this.isBrowser = isBrowserContext()
   }
 
   /**
@@ -68,14 +68,14 @@ export class OdpEventApiManager implements IOdpEventApiManager {
       return shouldRetry;
     }
 
-    if (events.length > 1 && this.browserMode) {
+    if (events.length > 1 && this.isBrowser) {
       this.logger.log(LogLevel.ERROR, `${EVENT_SENDING_FAILURE_MESSAGE} (browser only supports batch size 1)`);
       return shouldRetry;
     }
 
     let method, endpoint, headers, data;
 
-    if (this.browserMode) {
+    if (this.isBrowser) {
       method = 'GET';
       const event = events[0];
       const url = new URL(ODP_EVENT_BROWSER_ENDPOINT);

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

@@ -22,7 +22,7 @@ import { ERROR_MESSAGES, ODP_USER_KEY, ODP_DEFAULT_EVENT_TYPE, ODP_EVENT_ACTION
 import { OdpEvent } from './odp_event';
 import { OdpConfig } from './odp_config';
 import { OdpEventApiManager } from './odp_event_api_manager';
-import { invalidOdpDataFound, browserMode } from './odp_utils';
+import { invalidOdpDataFound, isBrowserContext } from './odp_utils';
 
 const MAX_RETRIES = 3;
 const DEFAULT_BATCH_SIZE = 10;
@@ -97,12 +97,12 @@ export class OdpEventManager implements IOdpEventManager {
    */
   private readonly queueSize: number;
   /**
-   * Maximum number of events to process at once
+   * Maximum number of events to process at once. Ignored in browser context
    * @private
    */
   private readonly batchSize: number;
   /**
-   * Milliseconds between setTimeout() to process new batches
+   * Milliseconds between setTimeout() to process new batches. Ignored in browser context
    * @private
    */
   private readonly flushInterval: number;
@@ -142,7 +142,7 @@ export class OdpEventManager implements IOdpEventManager {
     this.clientEngine = clientEngine;
     this.clientVersion = clientVersion;
 
-    const isBrowser = browserMode();
+    const isBrowser = isBrowserContext();
 
     const defaultQueueSize = isBrowser ? DEFAULT_BROWSER_QUEUE_SIZE : DEFAULT_SERVER_QUEUE_SIZE;
     this.queueSize = queueSize || defaultQueueSize;
@@ -402,7 +402,7 @@ export class OdpEventManager implements IOdpEventManager {
       return true;
     }
 
-    if (!browserMode()) {
+    if (!isBrowserContext()) {
       // 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>();

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

@@ -36,7 +36,7 @@ export function invalidOdpDataFound(data: Map<string, any>): boolean {
  * @returns True if in the browser
  * @private
  */
-export function browserMode(): boolean {
+export function isBrowserContext(): boolean {
    return !(typeof process !== "undefined" &&
     process.versions != null &&
     process.versions.node != null);

packages/optimizely-sdk/lib/index.browser.tests.js

@@ -30,7 +30,7 @@ import { BrowserOdpManager } from './plugins/odp_manager/index.browser';
 import { OdpConfig } from './core/odp/odp_config';
 import { OdpEventManager } from './core/odp/odp_event_manager';
 import { OdpEventApiManager } from './core/odp/odp_event_api_manager';
-import { browserMode } from './core/odp/odp_utils';
+import { isBrowserContext } from './core/odp/odp_utils';
 
 var LocalStoragePendingEventsDispatcher = eventProcessor.LocalStoragePendingEventsDispatcher;
 
@@ -589,10 +589,10 @@ describe('javascript-sdk (Browser)', function() {
       const requestParams = new Map;
       const mockRequestHandler = {
         makeRequest: (endpoint, headers, method, data) => {
-          requestParams.endpoint = endpoint;
-          requestParams.headers = headers;
-          requestParams.method = method;
-          requestParams.data = data;
+          requestParams.set('endpoint', endpoint);
+          requestParams.set('headers', headers);
+          requestParams.set('method', method);
+          requestParams.set('data', data);
           return {responsePromise: (async()=>{return {statusCode: 200}})()}
         },
         args: requestParams
@@ -825,7 +825,7 @@ describe('javascript-sdk (Browser)', function() {
       });
 
       it('should log a warning when attempting to use an event batch size other than 1', async () => {
-        if (!browserMode()) {
+        if (!isBrowserContext()) {
           return
         }
         const client = optimizelyFactory.createInstance({
@@ -851,7 +851,7 @@ describe('javascript-sdk (Browser)', function() {
       });
 
       it('should send an odp event to the browser endpoint', async () => {
-        if (!browserMode()) {
+        if (!isBrowserContext()) {
           return
         }
         const odpConfig = new OdpConfig();
@@ -884,9 +884,9 @@ describe('javascript-sdk (Browser)', function() {
 
         let publicKey = datafile.integrations[0].publicKey;
 
-        let requestEndpoint = new URL(requestParams.endpoint);
+        let requestEndpoint = new URL(requestParams.get('endpoint'));
         assert.equal(requestEndpoint.origin + requestEndpoint.pathname, ODP_EVENT_BROWSER_ENDPOINT)
-        assert.equal(requestParams.method, 'GET')
+        assert.equal(requestParams.get('method'), 'GET')
 
         let searchParams = requestEndpoint.searchParams;
         assert.lengthOf(searchParams.get('idempotence_id'), 36);