@openfin/node-adapter 44.101.5 → 44.101.6

package/out/node-adapter.js

@@ -8117,9 +8117,8 @@ class ChannelProvider extends ChannelBase {
         return [...__classPrivateFieldGet$e(this, _ChannelProvider_connections, "f")];
     }
     static handleClientDisconnection(channel, payload) {
-        if (payload?.endpointId) {
-            const { uuid, name, endpointId, isLocalEndpointId } = payload;
-            __classPrivateFieldGet$e(channel, _ChannelProvider_removeEndpoint, "f").call(channel, { uuid, name, endpointId, isLocalEndpointId });
+        if (payload.endpointId) {
+            __classPrivateFieldGet$e(channel, _ChannelProvider_removeEndpoint, "f").call(channel, { endpointId: payload.endpointId });
         }
         else {
             // this is here to support older runtimes that did not have endpointId
@@ -8289,7 +8288,9 @@ class ChannelProvider extends ChannelBase {
      * ```
      */
     onDisconnection(listener) {
-        this.disconnectListener = listener;
+        this.disconnectListener = (identity) => {
+            listener(identity);
+        };
     }
     /**
      * Destroy the channel, raises `disconnected` events on all connected channel clients.
@@ -8306,7 +8307,6 @@ class ChannelProvider extends ChannelBase {
      */
     async destroy() {
         const protectedObj = __classPrivateFieldGet$e(this, _ChannelProvider_protectedObj, "f");
-        protectedObj.providerIdentity;
         __classPrivateFieldSet$d(this, _ChannelProvider_connections, [], "f");
         await protectedObj.close();
         __classPrivateFieldGet$e(this, _ChannelProvider_close, "f").call(this);
@@ -8603,6 +8603,13 @@ class ConnectionManager extends Base {
         _ConnectionManager_messageReceiver.set(this, void 0);
         _ConnectionManager_rtcConnectionManager.set(this, void 0);
         this.removeChannelFromProviderMap = (channelId) => {
+            const providerEntry = this.providerMap.get(channelId);
+            if (providerEntry) {
+                const { channelName } = providerEntry.providerIdentity;
+                if (this.providerChannelIdByName.get(channelName) === channelId) {
+                    this.providerChannelIdByName.delete(channelName);
+                }
+            }
             this.providerMap.delete(channelId);
         };
         this.onmessage = (msg) => {
@@ -8613,6 +8620,7 @@ class ConnectionManager extends Base {
             return false;
         };
         this.providerMap = new Map();
+        this.providerChannelIdByName = new Map();
         this.protocolManager = new ProtocolManager(this.wire.environment.type === 'node' ? ['classic'] : ['rtc', 'classic']);
         __classPrivateFieldSet$c(this, _ConnectionManager_messageReceiver, new MessageReceiver(wire), "f");
         __classPrivateFieldSet$c(this, _ConnectionManager_rtcConnectionManager, new RTCICEManager(wire), "f");
@@ -8649,10 +8657,12 @@ class ConnectionManager extends Base {
         const channel = new ChannelProvider(providerIdentity, () => ChannelProvider.wireClose(this.wire, providerIdentity.channelName), strategy);
         const key = providerIdentity.channelId;
         this.providerMap.set(key, {
+            providerIdentity,
             provider: channel,
             strategy,
             supportedProtocols: ConnectionManager.getProtocolOptionsFromStrings(protocols)
         });
+        this.providerChannelIdByName.set(providerIdentity.channelName, key);
         ChannelProvider.setProviderRemoval(channel, this.removeChannelFromProviderMap.bind(this));
         return channel;
     }
@@ -8727,6 +8737,16 @@ class ConnectionManager extends Base {
         strategy.addEndpoint(routingInfo.channelId, endpointPayload);
         return strategy;
     }
+    handleClientDisconnection(eventPayload) {
+        const channelId = eventPayload.channelId ?? this.providerChannelIdByName.get(eventPayload.channelName ?? '');
+        if (!channelId) {
+            return;
+        }
+        const providerEntry = this.providerMap.get(channelId);
+        if (providerEntry) {
+            ChannelProvider.handleClientDisconnection(providerEntry.provider, eventPayload);
+        }
+    }
     async processChannelConnection(msg) {
         const { clientIdentity, providerIdentity, ackToSender, payload, offer: clientOffer } = msg.payload;
         if (!clientIdentity.endpointId) {
@@ -8826,7 +8846,7 @@ var __classPrivateFieldGet$c = (undefined && undefined.__classPrivateFieldGet) |
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Channel_connectionManager, _Channel_internalEmitter, _Channel_readyToConnect;
+var _Channel_connectionManager, _Channel_internalEmitter, _Channel_readyForProvider, _Channel_readyToConnect;
 function retryDelay(count) {
     const interval = 500; // base delay
     const steps = 10; // How many retries to do before incrementing the delay
@@ -8862,9 +8882,19 @@ class Channel extends EmitterBase {
         super(wire, 'channel');
         _Channel_connectionManager.set(this, void 0);
         _Channel_internalEmitter.set(this, new events.EventEmitter());
+        // Provider-side disconnect routing setup. This must exist before first create()
+        // so provider onDisconnection callbacks are wired even if connect() is never called.
+        _Channel_readyForProvider.set(this, new AsyncRetryableLazy(async () => {
+            // TODO: fix typing (internal)
+            // @ts-expect-error
+            await this.on('client-disconnected', (eventPayload) => {
+                __classPrivateFieldGet$c(this, _Channel_connectionManager, "f").handleClientDisconnection(eventPayload);
+            });
+        }));
         // OpenFin API has not been injected at construction time, *must* wait for API to be ready.
         _Channel_readyToConnect.set(this, new AsyncRetryableLazy(async () => {
             await Promise.all([
+                __classPrivateFieldGet$c(this, _Channel_readyForProvider, "f").getValue(),
                 this.on('disconnected', (eventPayload) => {
                     ChannelClient.handleProviderDisconnect(eventPayload);
                 }),
@@ -9121,22 +9151,15 @@ class Channel extends EmitterBase {
      * ```
      */
     async create(channelName, options) {
+        await __classPrivateFieldGet$c(this, _Channel_readyForProvider, "f").getValue();
         if (!channelName) {
             throw new Error('Please provide a channelName to create a channel');
         }
         const { payload: { data: providerIdentity } } = await this.wire.sendAction('create-channel', { channelName });
-        const channel = __classPrivateFieldGet$c(this, _Channel_connectionManager, "f").createProvider(options, providerIdentity);
-        // TODO: fix typing (internal)
-        // @ts-expect-error
-        this.on('client-disconnected', (eventPayload) => {
-            if (eventPayload.channelName === channelName) {
-                ChannelProvider.handleClientDisconnection(channel, eventPayload);
-            }
-        });
-        return channel;
+        return __classPrivateFieldGet$c(this, _Channel_connectionManager, "f").createProvider(options, providerIdentity);
     }
 }
-_Channel_connectionManager = new WeakMap(), _Channel_internalEmitter = new WeakMap(), _Channel_readyToConnect = new WeakMap();
+_Channel_connectionManager = new WeakMap(), _Channel_internalEmitter = new WeakMap(), _Channel_readyForProvider = new WeakMap(), _Channel_readyToConnect = new WeakMap();
 
 /**
  * Entry point for the OpenFin `InterApplicationBus` API (`fin.InterApplicationBus`).
@@ -17158,7 +17181,7 @@ class NodeEnvironment extends BaseEnvironment {
         };
     }
     getAdapterVersionSync() {
-        return "44.101.5";
+        return "44.101.6";
     }
     observeBounds(element, onChange) {
         throw new Error('Method not implemented.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfin/node-adapter",
-  "version": "44.101.5",
+  "version": "44.101.6",
   "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.10",
     "tslib": "2.8.1",
-    "@openfin/core": "44.101.5"
+    "@openfin/core": "44.101.6"
   },
   "scripts": {
     "prebuild": "rimraf ./out",