Skip to content

Commit b1d3b50

Browse files
authored
Merge pull request #1861 from InteropIO/metadata-updates-2026-04-22
Docs and metadata updates
2 parents 333f128 + 17acdfe commit b1d3b50

24 files changed

Lines changed: 2782 additions & 2750 deletions

File tree

Contributing_Guide.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ export class DefaultAppSupport implements AppSupport {
8888
instanceId: app.instanceId,
8989
},
9090
context,
91+
metadata: metadata ?? {},
9192
},
92-
metadata,
9393
meta: this.messaging.createMeta(),
9494
};
9595

@@ -128,7 +128,6 @@ export class DefaultAppSupport implements AppSupport {
128128
provider: 'unknown',
129129
appMetadata: { appId: 'unknown', instanceId: 'unknown' },
130130
optionalFeatures: {
131-
OriginatingAppMetadata: false,
132131
UserChannelMembershipAPIs: false,
133132
DesktopAgentBridging: false,
134133
},

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import { ContextHandler, DisplayMetadata, Listener, Channel, EventHandler } from '@finos/fdc3-standard';
1+
import {
2+
ContextHandler,
3+
DisplayMetadata,
4+
Listener,
5+
Channel,
6+
EventHandler,
7+
AppProvidableContextMetadata,
8+
} from '@finos/fdc3-standard';
29
import { Context } from '@finos/fdc3-context';
310
import { Messaging } from '../Messaging';
411
import { DefaultContextListener } from '../listeners/DefaultContextListener';
@@ -39,12 +46,13 @@ export class DefaultChannel implements Channel {
3946
this.addContextListener = this.addContextListener.bind(this);
4047
}
4148

42-
async broadcast(context: Context): Promise<void> {
49+
async broadcast(context: Context, metadata?: AppProvidableContextMetadata): Promise<void> {
4350
const request: BroadcastRequest = {
4451
meta: this.messaging.createMeta(),
4552
payload: {
4653
channelId: this.id,
4754
context,
55+
metadata: metadata ?? {},
4856
},
4957
type: 'broadcastRequest',
5058
};

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export class DefaultIntentSupport implements IntentSupport {
135135
async raiseIntent(
136136
intent: string,
137137
context: Context,
138-
app: AppIdentifier,
138+
app?: AppIdentifier | null,
139139
metadata?: AppProvidableContextMetadata
140140
): Promise<IntentResolution> {
141141
const meta = this.messaging.createMeta();
@@ -144,7 +144,7 @@ export class DefaultIntentSupport implements IntentSupport {
144144
payload: {
145145
intent,
146146
context,
147-
app,
147+
app: app || undefined,
148148
metadata: {
149149
traceId: metadata?.traceId ?? v4(),
150150
},
@@ -195,9 +195,9 @@ export class DefaultIntentSupport implements IntentSupport {
195195
payload: {
196196
context,
197197
app,
198-
},
199-
metadata: {
200-
traceId: metadata?.traceId ?? v4(),
198+
metadata: {
199+
traceId: metadata?.traceId ?? v4(),
200+
},
201201
},
202202
meta,
203203
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ export class DefaultContextListener
5858

5959
action(m: BroadcastEvent): void {
6060
const metadata: DesktopAgentProvidableContextMetadata = {
61-
source: m.payload.originatingApp,
62-
timestamp: m.meta.timestamp,
63-
traceId: m.metadata?.traceId,
61+
source: m.payload.metadata?.source,
62+
timestamp: m.payload.metadata?.timestamp ?? m.meta.timestamp,
63+
traceId: m.payload.metadata?.traceId,
6464
};
6565
this.handler(m.payload.context, metadata);
6666
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ export class DefaultIntentListener extends AbstractListener<IntentHandler, AddIn
3434

3535
action(m: IntentEvent): void {
3636
const done = this.handler(m.payload.context, {
37-
source: m.payload.originatingApp as AppIdentifier,
38-
timestamp: m.meta.timestamp,
39-
traceId: m.metadata?.traceId ?? v4(),
37+
source: m.payload.metadata?.source as AppIdentifier,
38+
timestamp: m.payload.metadata?.timestamp ?? m.meta.timestamp,
39+
traceId: m.payload.metadata?.traceId ?? v4(),
4040
});
4141

4242
this.handleIntentResult(done, m);
@@ -54,7 +54,6 @@ export class DefaultIntentListener extends AbstractListener<IntentHandler, AddIn
5454
intentEventUuid: m.meta.eventUuid,
5555
raiseIntentRequestUuid: m.payload.raiseIntentRequestUuid,
5656
},
57-
metadata: m.metadata,
5857
};
5958

6059
return out;

packages/fdc3-agent-proxy/test/step-definitions/channels.steps.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ Given(
5151
payload: {
5252
channelId: handleResolve(channel, this),
5353
context: contextMap[context],
54+
metadata: {
55+
timestamp: new Date(),
56+
source: this.messaging!.getAppIdentifier(),
57+
traceId: this.messaging!.createUUID(),
58+
signature: '',
59+
},
5460
},
5561
type: 'broadcastEvent',
5662
} as BroadcastEvent;

packages/fdc3-agent-proxy/test/step-definitions/intents.steps.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,14 @@ Given(
147147
timestamp: new Date(),
148148
},
149149
payload: {
150-
originatingApp: {
151-
appId: 'some-app-id',
152-
desktopAgent: 'some-desktop-agent',
153-
},
154150
context: handleResolve(context, this),
155151
intent,
156152
raiseIntentRequestUuid: 'request-id',
153+
metadata: {
154+
timestamp: new Date(),
155+
source: this.messaging!.getAppIdentifier(),
156+
traceId: this.messaging!.createUUID(),
157+
},
157158
},
158159
};
159160

packages/fdc3-agent-proxy/test/support/responses/GetInfo.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export class GetInfo implements AutomaticResponse {
2929
fdc3Version: '2.0',
3030
optionalFeatures: {
3131
DesktopAgentBridging: false,
32-
OriginatingAppMetadata: true,
3332
UserChannelMembershipAPIs: true,
3433
},
3534
provider: 'cucumber-provider',

packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@ Given('A Dummy Desktop Agent in {string}', async function (this: CustomWorld, fi
205205
fdc3Version: '2.0',
206206
optionalFeatures: {
207207
DesktopAgentBridging: false,
208-
OriginatingAppMetadata: false,
209208
UserChannelMembershipAPIs: false,
210209
},
211210
appMetadata: {

0 commit comments

Comments
 (0)