Fix builds

Author: julianna-ciq

packages/fdc3-agent-proxy/src/apps/DefaultAppSupport.ts

@@ -88,8 +88,8 @@ export class DefaultAppSupport implements AppSupport {
           instanceId: app.instanceId,
         },
         context,
+        metadata: metadata ?? {},
       },
-      metadata,
       meta: this.messaging.createMeta(),
     };
 
@@ -128,7 +128,6 @@ export class DefaultAppSupport implements AppSupport {
         provider: 'unknown',
         appMetadata: { appId: 'unknown', instanceId: 'unknown' },
         optionalFeatures: {
-          OriginatingAppMetadata: false,
           UserChannelMembershipAPIs: false,
           DesktopAgentBridging: false,
         },

packages/fdc3-agent-proxy/src/channels/DefaultChannel.ts

@@ -1,4 +1,11 @@
-import { ContextHandler, DisplayMetadata, Listener, Channel, EventHandler } from '@finos/fdc3-standard';
+import {
+  ContextHandler,
+  DisplayMetadata,
+  Listener,
+  Channel,
+  EventHandler,
+  AppProvidableContextMetadata,
+} from '@finos/fdc3-standard';
 import { Context } from '@finos/fdc3-context';
 import { Messaging } from '../Messaging.js';
 import { DefaultContextListener } from '../listeners/DefaultContextListener.js';
@@ -39,12 +46,13 @@ export class DefaultChannel implements Channel {
     this.addContextListener = this.addContextListener.bind(this);
   }
 
-  async broadcast(context: Context): Promise<void> {
+  async broadcast(context: Context, metadata?: AppProvidableContextMetadata): Promise<void> {
     const request: BroadcastRequest = {
       meta: this.messaging.createMeta(),
       payload: {
         channelId: this.id,
         context,
+        metadata: metadata ?? {},
       },
       type: 'broadcastRequest',
     };

packages/fdc3-agent-proxy/src/intents/DefaultIntentSupport.ts

@@ -135,7 +135,7 @@ export class DefaultIntentSupport implements IntentSupport {
   async raiseIntent(
     intent: string,
     context: Context,
-    app: AppIdentifier,
+    app?: AppIdentifier | null,
     metadata?: AppProvidableContextMetadata
   ): Promise<IntentResolution> {
     const meta = this.messaging.createMeta();
@@ -144,7 +144,7 @@ export class DefaultIntentSupport implements IntentSupport {
       payload: {
         intent,
         context,
-        app,
+        app: app || undefined,
         metadata: {
           traceId: metadata?.traceId ?? v4(),
         },
@@ -195,9 +195,9 @@ export class DefaultIntentSupport implements IntentSupport {
       payload: {
         context,
         app,
-      },
-      metadata: {
-        traceId: metadata?.traceId ?? v4(),
+        metadata: {
+          traceId: metadata?.traceId ?? v4(),
+        },
       },
       meta,
     };

packages/fdc3-agent-proxy/src/listeners/DefaultContextListener.ts

@@ -46,9 +46,9 @@ export class DefaultContextListener
 
   action(m: BroadcastEvent): void {
     const metadata: DesktopAgentProvidableContextMetadata = {
-      source: m.payload.originatingApp,
-      timestamp: m.meta.timestamp,
-      traceId: m.metadata?.traceId,
+      source: m.payload.metadata?.source,
+      timestamp: m.payload.metadata?.timestamp ?? m.meta.timestamp,
+      traceId: m.payload.metadata?.traceId,
     };
     this.handler(m.payload.context, metadata);
   }

packages/fdc3-agent-proxy/src/listeners/DefaultIntentListener.ts

@@ -34,9 +34,9 @@ export class DefaultIntentListener extends AbstractListener<IntentHandler, AddIn
 
   action(m: IntentEvent): void {
     const done = this.handler(m.payload.context, {
-      source: m.payload.originatingApp as AppIdentifier,
-      timestamp: m.meta.timestamp,
-      traceId: m.metadata?.traceId ?? v4(),
+      source: m.payload.metadata?.source as AppIdentifier,
+      timestamp: m.payload.metadata?.timestamp ?? m.meta.timestamp,
+      traceId: m.payload.metadata?.traceId ?? v4(),
     });
 
     this.handleIntentResult(done, m);
@@ -54,7 +54,6 @@ export class DefaultIntentListener extends AbstractListener<IntentHandler, AddIn
         intentEventUuid: m.meta.eventUuid,
         raiseIntentRequestUuid: m.payload.raiseIntentRequestUuid,
       },
-      metadata: m.metadata,
     };
 
     return out;

toolbox/fdc3-for-web/fdc3-web-impl/src/handlers/IntentHandler.ts

@@ -53,9 +53,13 @@ async function forwardRequest(
     payload: {
       context: arg0.context,
       intent: arg0.intent,
-      originatingApp: {
-        appId: arg0.from.appId,
-        instanceId: arg0.from.instanceId,
+      metadata: {
+        source: {
+          appId: arg0.from.appId,
+          instanceId: arg0.from.instanceId,
+        },
+        timestamp: new Date(),
+        traceId: sc.createUUID(),
       },
       raiseIntentRequestUuid: arg0.requestUuid,
     },

toolbox/fdc3-for-web/fdc3-web-impl/src/handlers/OpenHandler.ts

@@ -169,9 +169,13 @@ export class OpenHandler implements MessageHandler {
             payload: {
               channelId: null,
               context: pendingOpen.context,
-              originatingApp: {
-                appId: pendingOpen.source.appId,
-                instanceId: pendingOpen.source.instanceId,
+              metadata: {
+                source: {
+                  appId: pendingOpen.source.appId,
+                  instanceId: pendingOpen.source.instanceId,
+                },
+                timestamp: new Date(),
+                traceId: sc.createUUID(),
               },
             },
           };
@@ -278,7 +282,6 @@ export class OpenHandler implements MessageHandler {
       fdc3Version: sc.fdc3Version(),
       optionalFeatures: {
         DesktopAgentBridging: false,
-        OriginatingAppMetadata: true,
         UserChannelMembershipAPIs: true,
       },
       appMetadata: appMetadata,