Add senderAppId param to broadcaster

vtex-apps · Feb 11, 2022 · 381e0ef · 381e0ef
1 parent da1916d
commit 381e0ef
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/node/index.ts b/node/index.ts
@@ -30,13 +30,15 @@ declare global {
 
   interface State extends RecorderState {
     payload: unknown[]
-    appId: string
+    senderAppId: string
+    clientAppId: string
   }
 
   interface BroadcasterEventContext extends EventContext<Clients> {
     body: {
       eventId: string
       payload: unknown[]
+      senderAppId: string
       clientAppId: string
     }
   }

diff --git a/node/middlewares/broadcaster/broadcast.ts b/node/middlewares/broadcaster/broadcast.ts
@@ -6,12 +6,13 @@ export async function broadcast(
 ) {
   const {
     clients: { events },
-    body: { payload, clientAppId },
+    body: { payload, senderAppId, clientAppId },
   } = ctx
 
   payload.forEach((row) => {
     events.sendEvent(clientAppId, eventKey, {
       data: row,
+      senderAppId,
     })
   })
 

diff --git a/node/middlewares/broadcaster/splitPayload.ts b/node/middlewares/broadcaster/splitPayload.ts
@@ -13,7 +13,7 @@ export async function splitPayload(
 ) {
   const {
     clients: { events },
-    body: { payload, clientAppId },
+    body: { payload, senderAppId, clientAppId },
   } = ctx
 
   if (payload.length > ARRAY_SIZE_TARGET) {
@@ -27,6 +27,7 @@ export async function splitPayload(
       events.sendEvent(thisAppId, eventKey, {
         eventId,
         payload: chunk,
+        senderAppId,
         clientAppId,
       })
     }

diff --git a/node/middlewares/notify/parseFile.ts b/node/middlewares/notify/parseFile.ts
@@ -6,16 +6,18 @@ import {
   MAXIMUM_FILE_SIZE,
   MAXIMUM_FILE_SIZE_STRING,
 } from '../../utils/constants'
-import { asyncBusboyWrapper } from '../../utils/parsing'
+import { asyncBusboyWrapper, senderAppIdFromHeaders } from '../../utils/parsing'
 
 export async function parseFile(ctx: Context, next: () => Promise<unknown>) {
   const {
     req,
     vtex: { logger },
   } = ctx
 
+  const senderAppId = senderAppIdFromHeaders(req.headers)
+
   const {
-    fields: { appId },
+    fields: { appId: clientAppId },
     files: [file],
   } = await asyncBusboyWrapper<NotifyInputParameters>(req)
 
@@ -55,7 +57,8 @@ export async function parseFile(ctx: Context, next: () => Promise<unknown>) {
     const payload = utils.sheet_to_json(sheet)
 
     ctx.state.payload = payload
-    ctx.state.appId = appId ?? ''
+    ctx.state.senderAppId = senderAppId
+    ctx.state.clientAppId = clientAppId ?? ''
   } catch (error) {
     logger.error(error.message)
 

diff --git a/node/middlewares/notify/startEventChain.ts b/node/middlewares/notify/startEventChain.ts
@@ -7,7 +7,7 @@ import {
 
 export async function startEventChain(ctx: Context) {
   const {
-    state: { payload, appId: clientAppId },
+    state: { payload, senderAppId, clientAppId },
     clients: { events },
   } = ctx
 
@@ -16,6 +16,7 @@ export async function startEventChain(ctx: Context) {
   events.sendEvent(thisAppId, eventKey, {
     eventId,
     payload,
+    senderAppId,
     clientAppId,
   })
 

diff --git a/node/utils/parsing.ts b/node/utils/parsing.ts
@@ -7,3 +7,9 @@ export async function asyncBusboyWrapper<T>(req: IncomingMessage): Promise<T> {
 
   return (result as unknown) as T
 }
+
+export function senderAppIdFromHeaders(headers: IncomingMessage['headers']) {
+  const appIdWithVersion = headers['x-vtex-caller'] as string
+
+  return appIdWithVersion.split('@')[0]
+}