Merge pull request #7 from nkolba/get-context-on-join-channel

missing listenerIds at top of message structure when sending initial …
finos · Mar 31, 2022 · e9fc800 · e9fc800
2 parents 3fe1fef + a49c974
commit e9fc800
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/main/src/listeners/fdc3Listeners.ts b/packages/main/src/listeners/fdc3Listeners.ts
@@ -673,18 +673,23 @@ export const joinViewToChannel = (
         if (channelContext) {
           const ctx = channelContext.length > 0 ? channelContext[0] : null;
           let contextSent = false;
-          if (ctx && !restoreOnly) {
+
+          if (ctx && (restoreOnly === undefined || !restoreOnly)) {
             // send to individual listenerIds
+
             view.listeners.forEach((l) => {
               //if this is not an intent listener, and not set for a specific channel, and not set for a non-matching context type  - send the context to the listener
               if (!l.intent) {
                 if (
-                  (!l.channel || (l.channel && l.channel === channel)) &&
+                  (!l.channel ||
+                    l.channel === 'default' ||
+                    (l.channel && l.channel === channel)) &&
                   (!l.contextType ||
                     (l.contextType && l.contextType === ctx.type))
                 ) {
                   view.content.webContents.send(TOPICS.FDC3_CONTEXT, {
                     topic: 'context',
+                    listenerIds: [l.listenerId],
                     data: { context: ctx, listenerId: l.listenerId },
                     source: view.id,
                   });

diff --git a/packages/preload/src/view/contentConnection.ts b/packages/preload/src/view/contentConnection.ts
@@ -92,7 +92,10 @@ const wireTopic = (topic: string, config?: any): void => {
           listener: function (msg: FDC3Message) {
             if (msg) {
               document.dispatchEvent(
-                utils.fdc3Event(`return_${eventId}`,((msg && msg.data) ? msg.data : {})),
+                utils.fdc3Event(
+                  `return_${eventId}`,
+                  msg && msg.data ? msg.data : {},
+                ),
               );
             }
           },