unique destinationPush

elbwalker · Dec 18, 2024 · d44314b · d44314b
1 parent cb699a7
commit d44314b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 59 deletions.
diff --git a/packages/sources/node/src/__tests__/destination.test.ts b/packages/sources/node/src/__tests__/destination.test.ts
@@ -433,20 +433,4 @@ describe('Destination', () => {
       // timing: 0, // @TODO should be set to default type
     });
   });
-
-  test('loop prevention', async () => {
-    mockDestination.type = 'foo';
-    const { elb } = getSource({
-      destinations: { mockDestination },
-    });
-
-    await elb({ event: 'e a' });
-    await elb({ event: 'e a', source: { type: 'another one' } });
-    expect(mockPush).toHaveBeenCalledTimes(2);
-
-    jest.clearAllMocks();
-    await elb({ event: 'e a', source: { type: 'foo' } });
-
-    expect(mockPush).toHaveBeenCalledTimes(0);
-  });
 });
diff --git a/packages/sources/node/src/lib/destination.ts b/packages/sources/node/src/lib/destination.ts
@@ -103,10 +103,6 @@ export async function destinationPush(
     }
   }
 
-  // Prevent recursive loops between sources and destinations
-  if (isDefined(destination.type) && destination.type === event.source.type)
-    return false;
-
   const options = { data, instance };
 
   if (eventMapping?.batch && destination.pushBatch) {
@@ -120,7 +116,7 @@ export async function destinationPush(
 
     eventMapping.batchFn =
       eventMapping.batchFn ||
-      debounce(async (destination, instance) => {
+      debounce((destination, instance) => {
         useHooks(
           destination.pushBatch!,
           'DestinationPushBatch',

diff --git a/packages/sources/walkerjs/src/lib/destination.ts b/packages/sources/walkerjs/src/lib/destination.ts
@@ -4,7 +4,6 @@ import {
   debounce,
   getMappingEvent,
   getId,
-  tryCatch,
   useHooks,
   getMappingValue,
   isDefined,
@@ -133,42 +132,40 @@ export function destinationPush(
 
   const options = { data, instance };
 
-  return !!tryCatch(() => {
-    if (eventMapping?.batch && destination.pushBatch) {
-      const batched = eventMapping.batched || {
-        key: mappingKey || '',
-        events: [],
-        data: [],
-      };
-      batched.events.push(event);
-      if (isDefined(data)) batched.data.push(data);
-
-      eventMapping.batchFn =
-        eventMapping.batchFn ||
-        debounce((destination, instance) => {
-          useHooks(
-            destination.pushBatch!,
-            'DestinationPushBatch',
-            instance.hooks,
-          )(batched, destination.config, options);
-
-          // Reset the batched queues
-          batched.events = [];
-          batched.data = [];
-        }, eventMapping.batch);
-
-      eventMapping.batched = batched;
-      eventMapping.batchFn(destination, instance);
-    } else {
-      // It's time to go to the destination's side now
-      useHooks(destination.push, 'DestinationPush', instance.hooks)(
-        event,
-        destination.config,
-        eventMapping,
-        options,
-      );
-    }
+  if (eventMapping?.batch && destination.pushBatch) {
+    const batched = eventMapping.batched || {
+      key: mappingKey || '',
+      events: [],
+      data: [],
+    };
+    batched.events.push(event);
+    if (isDefined(data)) batched.data.push(data);
+
+    eventMapping.batchFn =
+      eventMapping.batchFn ||
+      debounce((destination, instance) => {
+        useHooks(
+          destination.pushBatch!,
+          'DestinationPushBatch',
+          instance.hooks,
+        )(batched, destination.config, options);
+
+        // Reset the batched queues
+        batched.events = [];
+        batched.data = [];
+      }, eventMapping.batch);
+
+    eventMapping.batched = batched;
+    eventMapping.batchFn(destination, instance);
+  } else {
+    // It's time to go to the destination's side now
+    useHooks(destination.push, 'DestinationPush', instance.hooks)(
+      event,
+      destination.config,
+      eventMapping,
+      options,
+    );
+  }
 
-    return true;
-  })();
+  return true;
 }