upd

Author: raju-opti

lib/event_processor/event_processor_factory.browser.ts

@@ -18,7 +18,12 @@ import { getForwardingEventProcessor } from './forwarding_event_processor';
 import { EventDispatcher } from './event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor';
 import { EventWithId } from './batch_event_processor';
-import { getOpaqueBatchEventProcessor, BatchEventProcessorOptions, OpaqueEventProcessor } from './event_processor_factory';
+import { 
+  getOpaqueBatchEventProcessor,
+  BatchEventProcessorOptions,
+  OpaqueEventProcessor,
+  wrapEventProcessor,
+} from './event_processor_factory';
 import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
 import sendBeaconEventDispatcher from './event_dispatcher/send_beacon_dispatcher.browser';
 import { LocalStorageCache } from '../utils/cache/local_storage_cache.browser';
@@ -27,8 +32,8 @@ import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_process
 
 export const createForwardingEventProcessor = (
   eventDispatcher: EventDispatcher = defaultEventDispatcher,
-): EventProcessor => {
-  return getForwardingEventProcessor(eventDispatcher);
+): OpaqueEventProcessor => {
+  return wrapEventProcessor(getForwardingEventProcessor(eventDispatcher));
 };
 
 const identity = <T>(v: T): T => v;

lib/event_processor/event_processor_factory.node.ts

@@ -15,17 +15,22 @@
  */
 import { getForwardingEventProcessor } from './forwarding_event_processor';
 import { EventDispatcher } from './event_dispatcher/event_dispatcher';
-import { EventProcessor } from './event_processor';
 import defaultEventDispatcher from './event_dispatcher/default_dispatcher.node';
-import { BatchEventProcessorOptions, FAILED_EVENT_RETRY_INTERVAL, getOpaqueBatchEventProcessor, getPrefixEventStore, OpaqueEventProcessor } from './event_processor_factory';
+import { 
+  BatchEventProcessorOptions,
+  FAILED_EVENT_RETRY_INTERVAL,
+  getOpaqueBatchEventProcessor,
+  getPrefixEventStore,
+  OpaqueEventProcessor,
+  wrapEventProcessor,
+} from './event_processor_factory';
 
 export const createForwardingEventProcessor = (
   eventDispatcher: EventDispatcher = defaultEventDispatcher,
-): EventProcessor => {
-  return getForwardingEventProcessor(eventDispatcher);
+): OpaqueEventProcessor => {
+  return wrapEventProcessor(getForwardingEventProcessor(eventDispatcher));
 };
 
-
 export const createBatchEventProcessor = (
   options: BatchEventProcessorOptions
 ): OpaqueEventProcessor => {

lib/event_processor/event_processor_factory.react_native.ts

@@ -17,7 +17,13 @@ import { getForwardingEventProcessor } from './forwarding_event_processor';
 import { EventDispatcher } from './event_dispatcher/event_dispatcher';
 import { EventProcessor } from './event_processor';
 import defaultEventDispatcher from './event_dispatcher/default_dispatcher.browser';
-import { BatchEventProcessorOptions, getOpaqueBatchEventProcessor, getPrefixEventStore, OpaqueEventProcessor } from './event_processor_factory';
+import { 
+  BatchEventProcessorOptions,
+  getOpaqueBatchEventProcessor,
+  getPrefixEventStore, 
+  OpaqueEventProcessor,
+  wrapEventProcessor,
+} from './event_processor_factory';
 import { EVENT_STORE_PREFIX, FAILED_EVENT_RETRY_INTERVAL } from './event_processor_factory';
 import { AsyncPrefixCache } from '../utils/cache/cache';
 import { BatchEventProcessor, EventWithId } from './batch_event_processor';
@@ -27,8 +33,8 @@ import { isAvailable as isNetInfoAvailable } from '../utils/import.react_native/
 
 export const createForwardingEventProcessor = (
   eventDispatcher: EventDispatcher = defaultEventDispatcher,
-): EventProcessor => {
-  return getForwardingEventProcessor(eventDispatcher);
+): OpaqueEventProcessor => {
+  return wrapEventProcessor(getForwardingEventProcessor(eventDispatcher));
 };
 
 const identity = <T>(v: T): T => v;

lib/event_processor/event_processor_factory.ts

@@ -126,13 +126,17 @@ export const getBatchEventProcessor = (
   });
 }
 
+export const wrapEventProcessor = (eventProcessor: EventProcessor): OpaqueEventProcessor => {
+  return {
+    [eventProcessorSymbol]: eventProcessor,
+  };
+}
+
 export const getOpaqueBatchEventProcessor = (
   options: BatchEventProcessorFactoryOptions,
   EventProcessorConstructor: typeof BatchEventProcessor = BatchEventProcessor
 ): OpaqueEventProcessor => {
-  return {
-    [eventProcessorSymbol]: getBatchEventProcessor(options, EventProcessorConstructor),
-  };
+  return wrapEventProcessor(getBatchEventProcessor(options, EventProcessorConstructor));
 }
 
 export const extractEventProcessor = (eventProcessor: OpaqueEventProcessor): EventProcessor => {