fix: build issues

DevCycleHQ · Oct 2, 2023 · 16d5c3b · 16d5c3b
1 parent a3a55d6
commit 16d5c3b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/sdk/edge-worker-server/src/client.ts b/sdk/edge-worker-server/src/client.ts
@@ -24,6 +24,7 @@ import {
 } from '@devcycle/server-request'
 import { generateBucketedConfig } from '@devcycle/bucketing'
 import { generateAggEvent, publishDevCycleEvents } from './eventsPublisher'
+import isArray from 'lodash/isArray'
 
 const castIncomingUser = (user: DevCycleUser) => {
     if (!(user instanceof DevCycleUser)) {
@@ -141,7 +142,7 @@ export class DevCycleEdgeClient {
 
         const dvcVariable = new DVCVariable(options)
 
-        const aggEvents = generateAggEvent(
+        const aggEvent = generateAggEvent(
             populatedUser.user_id,
             dvcVariable.isDefaulted
                 ? EventTypes.aggVariableDefaulted
@@ -154,7 +155,7 @@ export class DevCycleEdgeClient {
             this.logger,
             this.sdkKey,
             populatedUser,
-            aggEvents,
+            [aggEvent],
             bucketedConfig.featureVariationMap,
         )
 
@@ -199,6 +200,10 @@ export class DevCycleEdgeClient {
         return bucketedConfig?.features || {}
     }
 
+    private static checkDevCycleEvent(event: DevCycleEvent): void {
+        checkParamDefined('type', event.type)
+    }
+
     async track(
         user: DevCycleUser,
         event: DevCycleEvent | DevCycleEvent[],
@@ -212,7 +217,11 @@ export class DevCycleEdgeClient {
             return
         }
 
-        checkParamDefined('type', event.type)
+        if (isArray(event)) {
+            event.forEach(DevCycleEdgeClient.checkDevCycleEvent)
+        } else {
+            DevCycleEdgeClient.checkDevCycleEvent(event)
+        }
         const populatedUser = DVCPopulatedUserFromDevCycleUser(
             incomingUser,
             this.options,
@@ -226,7 +235,7 @@ export class DevCycleEdgeClient {
             this.logger,
             this.sdkKey,
             populatedUser,
-            typeof event === 'object' ? [event] : event,
+            isArray(event) ? event : [event],
             bucketedConfig.featureVariationMap,
         )
     }

diff --git a/sdk/edge-worker-server/src/eventsPublisher.ts b/sdk/edge-worker-server/src/eventsPublisher.ts
@@ -4,20 +4,27 @@ import {
     DVCRequestEvent,
     publishEvents,
 } from '@devcycle/server-request'
-import { BucketedUserConfig, DVCLogger, SDKEventBatchRequestBody } from '@devcycle/types'
+import {
+    BucketedUserConfig,
+    DVCLogger,
+    SDKEventBatchRequestBody,
+} from '@devcycle/types'
 
 export function generateAggEvent(
     user_id: string,
     type: string,
     variableKey: string,
     variableVariationMap: BucketedUserConfig['variableVariationMap'],
-): DVCRequestEvent[] {
-    return new DVCRequestEvent({
-        type,
-        target: variableKey,
-        value: 1,
-        metaData: variableVariationMap[variableKey]
-    }, user_id)
+): DVCRequestEvent {
+    return new DVCRequestEvent(
+        {
+            type,
+            target: variableKey,
+            value: 1,
+            metaData: variableVariationMap[variableKey],
+        },
+        user_id,
+    )
 }
 
 export async function publishDevCycleEvents(
@@ -45,9 +52,11 @@ export async function publishDevCycleEvents(
                 }, body: ${await res.text()}`,
             )
         } else {
-            this.logger.debug(
-                `DevCycle Flushed ${requestEvents.length} Events`,
-            )
+            this.logger.debug(`DevCycle Flushed ${requestEvents.length} Events`)
         }
+    } catch (ex) {
+        this.logger.error(
+            `DevCycle Error Flushing Events response message: ${ex.message}`,
+        )
     }
 }