@openfin/node-adapter 46.100.65 → 46.100.67

package/out/node-adapter.js

@@ -12916,6 +12916,45 @@ class PrivateChannelProvider {
     }
 }
 
+/**
+ * The default FDC3 user channels advertised by the Interop Broker.
+ */
+const defaultColorChannels = {
+    'fdc3.channel.1': { name: 'Channel 1', color: 'red', glyph: '1' },
+    'fdc3.channel.2': { name: 'Channel 2', color: 'orange', glyph: '2' },
+    'fdc3.channel.3': { name: 'Channel 3', color: 'yellow', glyph: '3' },
+    'fdc3.channel.4': { name: 'Channel 4', color: 'green', glyph: '4' },
+    'fdc3.channel.5': { name: 'Channel 5', color: 'cyan', glyph: '5' },
+    'fdc3.channel.6': { name: 'Channel 6', color: 'blue', glyph: '6' },
+    'fdc3.channel.7': { name: 'Channel 7', color: 'magenta', glyph: '7' },
+    'fdc3.channel.8': { name: 'Channel 8', color: 'purple', glyph: '8' }
+};
+const legacyColorChannelIds = {
+    red: 'fdc3.channel.1',
+    orange: 'fdc3.channel.2',
+    yellow: 'fdc3.channel.3',
+    green: 'fdc3.channel.4',
+    teal: 'fdc3.channel.5',
+    blue: 'fdc3.channel.6',
+    pink: 'fdc3.channel.7',
+    // Legacy indigo (workspace) and purple (core) intentionally converge on the same FDC3 purple channel.
+    indigo: 'fdc3.channel.8',
+    purple: 'fdc3.channel.8'
+};
+/**
+ * Converts a legacy color-named channel ID to its canonical FDC3 user-channel ID.
+ * The removed legacy gray channel resolves to no channel.
+ */
+function normalizeColorChannelId(colorChannelId) {
+    if (colorChannelId === 'gray') {
+        return undefined;
+    }
+    if (Object.prototype.hasOwnProperty.call(legacyColorChannelIds, colorChannelId)) {
+        return legacyColorChannelIds[colorChannelId];
+    }
+    return colorChannelId;
+}
+
 var __classPrivateFieldSet$9 = (undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -12928,50 +12967,7 @@ var __classPrivateFieldGet$9 = (undefined && undefined.__classPrivateFieldGet) |
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _InteropBroker_fdc3Info, _InteropBroker_contextGroups, _InteropBroker_providerPromise;
-const defaultContextGroups = [
-    {
-        id: 'green',
-        displayMetadata: {
-            color: '#00CC88',
-            name: 'green'
-        }
-    },
-    {
-        id: 'purple',
-        displayMetadata: {
-            color: '#8C61FF',
-            name: 'purple'
-        }
-    },
-    {
-        id: 'orange',
-        displayMetadata: {
-            color: '#FF8C4C',
-            name: 'orange'
-        }
-    },
-    {
-        id: 'red',
-        displayMetadata: {
-            color: '#FF5E60',
-            name: 'red'
-        }
-    },
-    {
-        id: 'pink',
-        displayMetadata: {
-            color: '#FF8FB8',
-            name: 'pink'
-        }
-    },
-    {
-        id: 'yellow',
-        displayMetadata: {
-            color: '#E9FF8F',
-            name: 'yellow'
-        }
-    }
-];
+const defaultContextGroups = Object.entries(defaultColorChannels).map(([id, displayMetadata]) => ({ id, displayMetadata }));
 /**
  * {@link https://developers.openfin.co/of-docs/docs/enable-color-linking}
  *
@@ -13001,17 +12997,19 @@ const defaultContextGroups = [
  *          "interopBrokerConfiguration": {
  *              "contextGroups": [
  *                  {
- *                      "id": "green",
+ *                      "id": "fdc3.channel.4",
  *                      "displayMetadata": {
- *                          "color": "#00CC88",
- *                          "name": "green"
+ *                          "color": "green",
+ *                          "name": "Channel 4",
+ *                          "glyph": "4"
  *                      }
  *                  },
  *                  {
- *                      "id": "purple",
+ *                      "id": "fdc3.channel.8",
  *                      "displayMetadata": {
- *                          "color": "#8C61FF",
- *                          "name": "purple"
+ *                          "color": "purple",
+ *                          "name": "Channel 8",
+ *                          "glyph": "8"
  *                      }
  *                  },
  *              ]
@@ -13174,9 +13172,13 @@ class InteropBroker extends Base {
         this.wire.sendAction('interop-broker-set-context-for-group').catch((e) => {
             // don't expose, analytics-only call
         });
-        const contextGroupState = this.contextGroupsById.get(contextGroupId);
+        const normalizedContextGroupId = this.normalizeContextGroupId(contextGroupId);
+        if (normalizedContextGroupId === undefined) {
+            return;
+        }
+        const contextGroupState = this.contextGroupsById.get(normalizedContextGroupId);
         if (!contextGroupState) {
-            throw new Error(`Unable to set context for context group that isn't in the context group mapping: ${contextGroupId}.`);
+            throw new Error(`Unable to set context for context group that isn't in the context group mapping: ${normalizedContextGroupId}.`);
         }
         const contextIntegrityCheckResult = InteropBroker.checkContextIntegrity(context);
         if (contextIntegrityCheckResult.isValid === false) {
@@ -13184,8 +13186,8 @@ class InteropBroker extends Base {
         }
         const broadcastedContextType = context.type;
         contextGroupState.set(broadcastedContextType, context);
-        this.lastContextMap.set(contextGroupId, broadcastedContextType);
-        const clientsInSameContextGroup = Array.from(this.interopClients.values()).filter((connectedClient) => connectedClient.contextGroupId === contextGroupId);
+        this.lastContextMap.set(normalizedContextGroupId, broadcastedContextType);
+        const clientsInSameContextGroup = Array.from(this.interopClients.values()).filter((connectedClient) => connectedClient.contextGroupId === normalizedContextGroupId);
         clientsInSameContextGroup.forEach((client) => {
             for (const [, handlerInfo] of client.contextHandlers) {
                 if (InteropBroker.isContextTypeCompatible(broadcastedContextType, handlerInfo.contextType)) {
@@ -13231,10 +13233,20 @@ class InteropBroker extends Base {
      * @param joinContextGroupOptions - Id of the Context Group and identity of the entity to join to the group.
      * @param senderIdentity - Identity of the client sender.
      */
-    async joinContextGroup({ contextGroupId, target }, senderIdentity) {
+    async joinContextGroup({ contextGroupId: requestedContextGroupId, target }, senderIdentity) {
         this.wire.sendAction('interop-broker-join-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
+        const contextGroupId = this.normalizeContextGroupId(requestedContextGroupId);
+        if (contextGroupId === undefined) {
+            if (target) {
+                await this.removeFromContextGroup({ target }, senderIdentity);
+            }
+            else {
+                await this.removeClientFromContextGroup(senderIdentity);
+            }
+            return;
+        }
         if (this.sessionContextGroupMap.has(contextGroupId)) {
             throw new Error(BROKER_ERRORS.joinSessionContextGroupWithJoinContextGroup);
         }
@@ -13276,10 +13288,15 @@ class InteropBroker extends Base {
      * @param addClientToContextGroupOptions - Contains the contextGroupId
      * @param clientIdentity - Identity of the client sender.
      */
-    async addClientToContextGroup({ contextGroupId }, clientIdentity) {
+    async addClientToContextGroup({ contextGroupId: requestedContextGroupId }, clientIdentity) {
         this.wire.sendAction('interop-broker-add-client-to-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
+        const contextGroupId = this.normalizeContextGroupId(requestedContextGroupId);
+        if (contextGroupId === undefined) {
+            await this.removeClientFromContextGroup(clientIdentity);
+            return;
+        }
         const clientSubscriptionState = this.getClientState(clientIdentity);
         if (!clientSubscriptionState) {
             throw new Error(`Client with Identity: ${clientIdentity.uuid} ${clientIdentity.name} not in Client State Map`);
@@ -13378,6 +13395,9 @@ class InteropBroker extends Base {
             clientState.contextGroupId = undefined;
         }
         await this.setCurrentContextGroupInClientOptions(clientIdentity, null);
+        if (previousContextGroupId === undefined) {
+            return;
+        }
         // All settled will suppress uncaught exceptions. We don't want to await this because it could
         // result in the operation hanging.
         Promise.allSettled(this.channel.publish('client-changed-context-group', {
@@ -13415,7 +13435,11 @@ class InteropBroker extends Base {
         this.wire.sendAction('interop-broker-get-info-for-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
-        return this.getContextGroups().find((contextGroup) => contextGroup.id === contextGroupId);
+        const normalizedContextGroupId = this.normalizeContextGroupId(contextGroupId);
+        if (normalizedContextGroupId === undefined) {
+            return undefined;
+        }
+        return this.getContextGroups().find((contextGroup) => contextGroup.id === normalizedContextGroupId);
     }
     // Used by platform windows to get all clients for a context group.
     /**
@@ -13431,8 +13455,12 @@ class InteropBroker extends Base {
         this.wire.sendAction('interop-broker-get-all-clients-in-context-group').catch((e) => {
             // don't expose, analytics-only call
         });
+        const normalizedContextGroupId = this.normalizeContextGroupId(contextGroupId);
+        if (normalizedContextGroupId === undefined) {
+            return [];
+        }
         const clientsInContextGroup = Array.from(this.interopClients.values())
-            .filter((connectedClient) => connectedClient.contextGroupId === contextGroupId)
+            .filter((connectedClient) => connectedClient.contextGroupId === normalizedContextGroupId)
             .map((subscriptionState) => {
             return subscriptionState.clientIdentity;
         });
@@ -13879,8 +13907,9 @@ class InteropBroker extends Base {
     }
     // Used to restore interop broker state in snapshots.
     applySnapshot(snapshot, options) {
-        const contextGroupStates = snapshot?.interopSnapshotDetails?.contextGroupStates;
-        if (contextGroupStates) {
+        const incomingContextGroupStates = snapshot?.interopSnapshotDetails?.contextGroupStates;
+        if (incomingContextGroupStates) {
+            const contextGroupStates = this.normalizeContextGroupStates(incomingContextGroupStates);
             if (!options?.closeExistingWindows) {
                 this.updateExistingClients(contextGroupStates);
             }
@@ -14025,6 +14054,23 @@ class InteropBroker extends Base {
         });
         return newObject;
     }
+    normalizeContextGroupStates(incomingContextGroupStates) {
+        const normalizedContextGroupStates = {};
+        for (const [contextGroupId, contexts] of Object.entries(incomingContextGroupStates)) {
+            const normalizedContextGroupId = this.normalizeContextGroupId(contextGroupId);
+            if (normalizedContextGroupId !== undefined) {
+                normalizedContextGroupStates[normalizedContextGroupId] = {
+                    ...normalizedContextGroupStates[normalizedContextGroupId],
+                    ...contexts
+                };
+            }
+        }
+        return normalizedContextGroupStates;
+    }
+    normalizeContextGroupId(contextGroupId) {
+        const usesDefaultColorChannels = Object.keys(defaultColorChannels).every((defaultContextGroupId) => this.contextGroupsById.has(defaultContextGroupId));
+        return usesDefaultColorChannels ? normalizeColorChannelId(contextGroupId) : contextGroupId;
+    }
     // Util to check a client identity.
     static hasEndpointId(target) {
         return target.endpointId !== undefined;
@@ -14088,8 +14134,14 @@ class InteropBroker extends Base {
                 clientIdentity
             };
             // Only allow the client to join a contextGroup that actually exists.
-            if (payload?.currentContextGroup && this.contextGroupsById.has(payload.currentContextGroup)) {
-                clientSubscriptionState.contextGroupId = payload?.currentContextGroup;
+            const currentContextGroup = payload?.currentContextGroup
+                ? this.normalizeContextGroupId(payload.currentContextGroup)
+                : undefined;
+            if (currentContextGroup && this.contextGroupsById.has(currentContextGroup)) {
+                clientSubscriptionState.contextGroupId = currentContextGroup;
+                if (currentContextGroup !== payload.currentContextGroup) {
+                    await this.setCurrentContextGroupInClientOptions(clientIdentity, currentContextGroup);
+                }
             }
             this.interopClients.set(clientIdentity.endpointId, clientSubscriptionState);
         });
@@ -14659,7 +14711,7 @@ class InteropClient extends Base {
      *
      * getLastFocusedView()
      *     .then(lastFocusedViewIdentity => {
-     *         joinViewToContextGroup('red', lastFocusedViewIdentity)
+     *         joinViewToContextGroup('fdc3.channel.1', lastFocusedViewIdentity)
      *     })
      * ```
      */
@@ -14709,7 +14761,7 @@ class InteropClient extends Base {
      *
      * @example
      * ```js
-     * fin.me.interop.getAllClientsInContextGroup('red')
+     * fin.me.interop.getAllClientsInContextGroup('fdc3.channel.1')
      *     .then(clientsInContextGroup => {
      *         console.log(clientsInContextGroup)
      *     })
@@ -14733,7 +14785,7 @@ class InteropClient extends Base {
      *
      * @example
      * ```js
-     * fin.me.interop.getInfoForContextGroup('red')
+     * fin.me.interop.getInfoForContextGroup('fdc3.channel.1')
      *     .then(contextGroupInfo => {
      *         console.log(contextGroupInfo.displayMetadata.name)
      *         console.log(contextGroupInfo.displayMetadata.color)
@@ -14822,12 +14874,12 @@ class InteropClient extends Base {
      *
      * @example
      * ```js
-     * await fin.me.interop.joinContextGroup('yellow');
+     * await fin.me.interop.joinContextGroup('fdc3.channel.3');
      * await fin.me.interop.setContext({ type: 'instrument', id: { ticker: 'FOO' }});
      * const currentContext = await fin.me.interop.getCurrentContext();
      *
      * // with a specific context
-     * await fin.me.interop.joinContextGroup('yellow');
+     * await fin.me.interop.joinContextGroup('fdc3.channel.3');
      * await fin.me.interop.setContext({ type: 'country', id: { ISOALPHA3: 'US' }});
      * await fin.me.interop.setContext({ type: 'instrument', id: { ticker: 'FOO' }});
      * const currentContext = await fin.me.interop.getCurrentContext('country');
@@ -15493,15 +15545,18 @@ class FDC3ModuleBase {
     async joinChannel(channelId) {
         this.wire.recordAnalytic('fdc3-join-channel');
         try {
+            const contextGroup = await this.client.getInfoForContextGroup(channelId);
+            if (!contextGroup) {
+                console.error(`No User Channel was found with the ID "${channelId}". If this is an App Channel, use getOrCreateChannel instead.`);
+                throw new Error(ChannelError.NoChannelFound);
+            }
             return await this.client.joinContextGroup(channelId);
         }
         catch (error) {
-            if (error.message === BROKER_ERRORS.joinSessionContextGroupWithJoinContextGroup) {
-                console.error('The Channel you have tried to join is an App Channel. Custom Channels can only be defined by the Interop Broker through code or manifest configuration. Please use getOrCreateChannel.');
-            }
-            else {
-                console.error(error.message);
+            if (error.message === ChannelError.NoChannelFound) {
+                throw new Error(ChannelError.NoChannelFound);
             }
+            console.error(error.message);
             if (error.message.startsWith('Attempting to join a context group that does not exist')) {
                 throw new Error(ChannelError.NoChannelFound);
             }
@@ -16181,7 +16236,7 @@ class InteropModule extends Base {
      * @example
      * ```js
      * const interopConfig = {
-     *     currentContextGroup: 'green'
+     *     currentContextGroup: 'fdc3.channel.4'
      * }
      *
      * const interopBroker = await fin.Interop.init('openfin');
@@ -17495,7 +17550,7 @@ class NodeEnvironment extends BaseEnvironment {
         };
     }
     getAdapterVersionSync() {
-        return "46.100.65";
+        return "46.100.67";
     }
     observeBounds(element, onChange) {
         throw new Error('Method not implemented.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfin/node-adapter",
-  "version": "46.100.65",
+  "version": "46.100.67",
   "description": "See README.md",
   "main": "out/node-adapter.js",
   "types": "out/node-adapter.d.ts",
@@ -20,7 +20,7 @@
     "es-toolkit": "^1.39.3",
     "ws": "^7.5.11",
     "tslib": "2.8.1",
-    "@openfin/core": "46.100.65"
+    "@openfin/core": "46.100.67"
   },
   "scripts": {
     "prebuild": "rimraf ./out",