cleanup

Author: raju-opti

lib/core/event_builder/build_event_v1.ts

@@ -17,7 +17,7 @@ import {
   EventTags,
   ConversionEvent,
   ImpressionEvent,
-} from '../../event_processor';
+} from '../../event_processor/events';
 
 import { Event } from '../../shared_types';
 

lib/core/event_builder/index.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { LoggerFacade } from '../../modules/logging';
-import { EventV1 as CommonEventParams } from '../../event_processor';
+import { EventV1 as CommonEventParams } from '../../event_processor/v1/buildEventV1';
 
 import fns from '../../utils/fns';
 import { CONTROL_ATTRIBUTES, RESERVED_EVENT_KEYWORDS } from '../../utils/enums';

lib/event_processor/batch_event_processor.spec.ts

@@ -726,7 +726,7 @@ describe('QueueingEventProcessor', async () => {
       expect(mockDispatch).toHaveBeenCalledTimes(1);
       expect(mockDispatch.mock.calls[0][0]).toEqual(formatEvents(failedEvents));
 
-      let eventsInStore = [...cache.getAll().values()].sort((a, b) => a.id < b.id ? -1 : 1).map(e => e.event);
+      const eventsInStore = [...cache.getAll().values()].sort((a, b) => a.id < b.id ? -1 : 1).map(e => e.event);
       expect(eventsInStore).toEqual(expect.arrayContaining([
         expect.objectContaining(eventA),
         expect.objectContaining(eventB),
@@ -782,7 +782,7 @@ describe('QueueingEventProcessor', async () => {
       mockResult2.resolve({});
       await exhaustMicrotasks();
 
-      let eventsInStore = [...cache.getAll().values()].sort((a, b) => a.id < b.id ? -1 : 1).map(e => e.event);
+      const eventsInStore = [...cache.getAll().values()].sort((a, b) => a.id < b.id ? -1 : 1).map(e => e.event);
       expect(eventsInStore).toEqual(expect.arrayContaining([
         expect.objectContaining(eventA),
         expect.objectContaining(eventB),
@@ -876,7 +876,7 @@ describe('QueueingEventProcessor', async () => {
       expect(mockDispatch).toHaveBeenCalledTimes(1);
       expect(mockDispatch.mock.calls[0][0]).toEqual(formatEvents(failedEvents));
 
-      let eventsInStore = [...cache.getAll().values()].sort((a, b) => a.id < b.id ? -1 : 1).map(e => e.event);
+      const eventsInStore = [...cache.getAll().values()].sort((a, b) => a.id < b.id ? -1 : 1).map(e => e.event);
       expect(eventsInStore).toEqual(expect.arrayContaining([
         expect.objectContaining(eventA),
         expect.objectContaining(eventB),
@@ -934,7 +934,7 @@ describe('QueueingEventProcessor', async () => {
       mockResult2.resolve({});
       await exhaustMicrotasks();
 
-      let eventsInStore = [...cache.getAll().values()].sort((a, b) => a.id < b.id ? -1 : 1).map(e => e.event);
+      const eventsInStore = [...cache.getAll().values()].sort((a, b) => a.id < b.id ? -1 : 1).map(e => e.event);
       expect(eventsInStore).toEqual(expect.arrayContaining([
         expect.objectContaining(eventA),
         expect.objectContaining(eventB),

lib/event_processor/default_dispatcher.browser.ts

@@ -15,7 +15,7 @@
  */
 
 import { BrowserRequestHandler } from "../utils/http_request_handler/browser_request_handler";
-import { EventDispatcher } from '../event_processor';
+import { EventDispatcher } from '../event_processor/eventDispatcher';
 import { DefaultEventDispatcher } from './default_dispatcher';
 
 const eventDispatcher: EventDispatcher = new DefaultEventDispatcher(new BrowserRequestHandler());

lib/event_processor/default_dispatcher.node.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EventDispatcher } from '../event_processor';
+import { EventDispatcher } from '../event_processor/eventDispatcher';
 import { NodeRequestHandler } from '../utils/http_request_handler/node_request_handler';
 import { DefaultEventDispatcher } from './default_dispatcher';
 

lib/event_processor/default_dispatcher.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import { RequestHandler } from '../utils/http_request_handler/http';
-import { EventDispatcher, EventDispatcherResponse, EventV1Request } from '../event_processor';
+import { EventDispatcher, EventDispatcherResponse, EventV1Request } from '../event_processor/eventDispatcher';
 
 export class DefaultEventDispatcher implements EventDispatcher {
   private requestHandler: RequestHandler;

lib/event_processor/eventProcessor.ts

@@ -15,7 +15,6 @@
  */
 import { ConversionEvent, ImpressionEvent } from './events'
 import { EventV1Request } from './eventDispatcher'
-import { EventQueue, DefaultEventQueue, SingleEventQueue, EventQueueSink } from './eventQueue'
 import { getLogger } from '../modules/logging'
 import { NOTIFICATION_TYPES } from '../utils/enums'
 import { NotificationSender } from '../core/notification_center'
@@ -33,56 +32,3 @@ export interface EventProcessor extends Service {
   process(event: ProcessableEvent): Promise<unknown>;
   onDispatch(handler: Consumer<EventV1Request>): Fn;
 }
-
-export function validateAndGetFlushInterval(flushInterval: number): number {
-  if (flushInterval <= 0) {
-    logger.warn(
-      `Invalid flushInterval ${flushInterval}, defaulting to ${DEFAULT_FLUSH_INTERVAL}`,
-    )
-    flushInterval = DEFAULT_FLUSH_INTERVAL
-  }
-  return flushInterval
-}
-
-export function validateAndGetBatchSize(batchSize: number): number {
-  batchSize = Math.floor(batchSize)
-  if (batchSize < 1) {
-    logger.warn(
-      `Invalid batchSize ${batchSize}, defaulting to ${DEFAULT_BATCH_SIZE}`,
-    )
-    batchSize = DEFAULT_BATCH_SIZE
-  }
-  batchSize = Math.max(1, batchSize)
-  return batchSize
-}
-
-export function getQueue(
-  batchSize: number, 
-  flushInterval: number, 
-  batchComparator: (eventA: ProcessableEvent, eventB: ProcessableEvent) => boolean,
-  sink: EventQueueSink<ProcessableEvent>,
-  closingSink?: EventQueueSink<ProcessableEvent>
-): EventQueue<ProcessableEvent> {
-  let queue: EventQueue<ProcessableEvent>
-  if (batchSize > 1) {
-    queue = new DefaultEventQueue<ProcessableEvent>({
-      flushInterval,
-      maxQueueSize: batchSize,
-      sink,
-      closingSink,
-      batchComparator,
-    })
-  } else {
-    queue = new SingleEventQueue({ sink })
-  }
-  return queue
-}
-
-export function sendEventNotification(notificationSender: NotificationSender | undefined, event: EventV1Request): void {
-  if (notificationSender) {
-    notificationSender.sendNotifications(
-      NOTIFICATION_TYPES.LOG_EVENT,
-      event,
-    )
-  }
-}