@openfin/core 41.103.3 → 41.103.10

package/out/stub.js

@@ -332,35 +332,6 @@ var system = {};
 
 var base = {};
 
-var promises = {};
-
-Object.defineProperty(promises, "__esModule", { value: true });
-promises.promiseMapSerial = promises.serial = promises.promiseMap = promises.promisify = void 0;
-function promisify(func) {
-    return (...args) => new Promise((resolve, reject) => {
-        func(...args, (err, val) => (err ? reject(err) : resolve(val)));
-    });
-}
-promises.promisify = promisify;
-async function promiseMap(arr, asyncF) {
-    return Promise.all(arr.map(asyncF));
-}
-promises.promiseMap = promiseMap;
-async function serial(arr) {
-    const ret = [];
-    for (const func of arr) {
-        // eslint-disable-next-line no-await-in-loop
-        const next = await func();
-        ret.push(next);
-    }
-    return ret;
-}
-promises.serial = serial;
-async function promiseMapSerial(arr, func) {
-    return serial(arr.map((value, index, array) => () => func(value, index, array)));
-}
-promises.promiseMapSerial = promiseMapSerial;
-
 var __classPrivateFieldSet$h = (commonjsGlobal && commonjsGlobal.__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");
@@ -375,7 +346,6 @@ var __classPrivateFieldGet$i = (commonjsGlobal && commonjsGlobal.__classPrivateF
 var _EmitterBase_emitterAccessor, _EmitterBase_deregisterOnceListeners;
 Object.defineProperty(base, "__esModule", { value: true });
 base.Reply = base.EmitterBase = base.Base = void 0;
-const promises_1 = promises;
 class Base {
     /**
      * @internal
@@ -453,27 +423,8 @@ class EmitterBase extends Base {
             return this.hasEmitter() ? this.getOrCreateEmitter().emit(eventType, payload, ...args) : false;
         };
         this.hasEmitter = () => this.wire.eventAggregator.has(__classPrivateFieldGet$i(this, _EmitterBase_emitterAccessor, "f"));
-        /**
-         * Cleans up after removal of a listener, e.g. deleting any lingering deregistration handlers for a
-         * `once` subscription.
-         *
-         * @remarks Implementing this as a `removeListener` handler ensures that direct removal of a listener
-         * on the base emitter will not leak additional core handlers.  We could do this in the forwarding method,
-         * which would involve less "magic," but would be more-vulnerable to accidental re-introduction of a leak.
-         */
-        this.cleanUpRemovedListener = (eventType, listener) => {
-            const deregister = __classPrivateFieldGet$i(this, _EmitterBase_deregisterOnceListeners, "f").get(listener);
-            if (deregister) {
-                const emitter = this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$i(this, _EmitterBase_emitterAccessor, "f"));
-                emitter.removeListener(eventType, deregister);
-            }
-        };
         this.getOrCreateEmitter = () => {
-            const emitter = this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$i(this, _EmitterBase_emitterAccessor, "f"));
-            if (!emitter.listeners('removeListener').includes(this.cleanUpRemovedListener)) {
-                emitter.on('removeListener', this.cleanUpRemovedListener);
-            }
-            return emitter;
+            return this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$i(this, _EmitterBase_emitterAccessor, "f"));
         };
         this.listeners = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(type) : [];
         this.listenerCount = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listenerCount(type) : 0;
@@ -513,7 +464,6 @@ class EmitterBase extends Base {
         };
         __classPrivateFieldSet$h(this, _EmitterBase_emitterAccessor, [topic, ...additionalAccessors], "f");
         __classPrivateFieldSet$h(this, _EmitterBase_deregisterOnceListeners, new WeakMap(), "f");
-        this.listeners = (event) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(event) : [];
     }
     /**
      * Adds a listener to the end of the listeners array for the specified event.
@@ -591,6 +541,10 @@ class EmitterBase extends Base {
         const emitter = await this.deregisterEventListener(eventType, options);
         if (emitter) {
             emitter.removeListener(eventType, listener);
+            const deregister = __classPrivateFieldGet$i(this, _EmitterBase_deregisterOnceListeners, "f").get(listener);
+            if (deregister) {
+                emitter.removeListener(eventType, deregister);
+            }
             this.deleteEmitterIfNothingRegistered(emitter);
         }
         return this;
@@ -626,12 +580,13 @@ class EmitterBase extends Base {
         }
         else if (this.hasEmitter()) {
             const events = this.getOrCreateEmitter().eventNames();
-            await (0, promises_1.promiseMap)(events, removeByEvent);
+            await Promise.all(events.map(removeByEvent));
         }
         return this;
     }
     deleteEmitterIfNothingRegistered(emitter) {
-        if (emitter.eventNames().every((type) => type === 'removeListener')) {
+        // TODO: maybe emitterMap should clean up itself..
+        if (emitter.eventNames().length === 0) {
             this.wire.eventAggregator.delete(__classPrivateFieldGet$i(this, _EmitterBase_emitterAccessor, "f"));
         }
     }
@@ -940,9 +895,7 @@ function requireFactory$2 () {
 	     * @experimental
 	     */
 	    async wrap(identity) {
-	        this.wire.sendAction('view-wrap').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('view-wrap');
 	        const errorMsg = (0, validate_1.validateIdentity)(identity);
 	        if (errorMsg) {
 	            throw new Error(errorMsg);
@@ -964,9 +917,7 @@ function requireFactory$2 () {
 	     * @experimental
 	     */
 	    wrapSync(identity) {
-	        this.wire.sendAction('view-wrap-sync').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('view-wrap-sync');
 	        const errorMsg = (0, validate_1.validateIdentity)(identity);
 	        if (errorMsg) {
 	            throw new Error(errorMsg);
@@ -986,9 +937,7 @@ function requireFactory$2 () {
 	     * @experimental
 	     */
 	    getCurrent() {
-	        this.wire.sendAction('view-get-current').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('view-get-current');
 	        if (!this.wire.me.isView) {
 	            throw new Error('You are not in a View context');
 	        }
@@ -1007,9 +956,7 @@ function requireFactory$2 () {
 	     * @experimental
 	     */
 	    getCurrentSync() {
-	        this.wire.sendAction('view-get-current-sync').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('view-get-current-sync');
 	        if (!this.wire.me.isView) {
 	            throw new Error('You are not in a View context');
 	        }
@@ -2077,9 +2024,7 @@ class WebContents extends base_1$m.EmitterBase {
      * {@link OpenFin.WebContentsEvents event namespace}.
      */
     async showPopupWindow(options) {
-        this.wire.sendAction(`${this.entityType}-show-popup-window`, this.identity).catch(() => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic(`${this.entityType}-show-popup-window`);
         if (options?.onPopupReady) {
             const readyListener = async ({ popupName }) => {
                 try {
@@ -2505,9 +2450,7 @@ function requireInstance$2 () {
 	         * @experimental
 	         */
 	        this.getParentLayout = async () => {
-	            this.wire.sendAction('view-get-parent-layout', { ...this.identity }).catch(() => {
-	                // don't expose
-	            });
+	            this.wire.recordAnalytic('view-get-parent-layout');
 	            return this.fin.Platform.Layout.getLayoutByViewIdentity(this.identity);
 	        };
 	        /**
@@ -2620,9 +2563,7 @@ function requireInstance$2 () {
 	         * ```
 	         */
 	        this.getCurrentStack = async () => {
-	            this.wire.sendAction('view-get-current-stack').catch(() => {
-	                // don't expose
-	            });
+	            this.wire.recordAnalytic('view-get-current-stack');
 	            try {
 	                const layout = await this.getParentLayout();
 	                return layout.getStackByViewIdentity(this.identity);
@@ -2868,9 +2809,7 @@ function requireInstance$1 () {
 	     */
 	    close(force = false) {
 	        console.warn('Deprecation Warning: Application.close is deprecated Please use Application.quit');
-	        this.wire.sendAction('application-close', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('application-close');
 	        return this._close(force);
 	    }
 	    /**
@@ -3011,9 +2950,7 @@ function requireInstance$1 () {
 	     * ```
 	     */
 	    getWindow() {
-	        this.wire.sendAction('application-get-window', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('application-get-window');
 	        return Promise.resolve(this.window);
 	    }
 	    /**
@@ -3091,9 +3028,7 @@ function requireInstance$1 () {
 	     */
 	    run() {
 	        console.warn('Deprecation Warning: Application.run is deprecated Please use fin.Application.start');
-	        this.wire.sendAction('application-run', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('application-run');
 	        return this._run();
 	    }
 	    _run(opts = {}) {
@@ -3618,9 +3553,7 @@ function requireFactory$1 () {
 	     *
 	     */
 	    async wrap(identity) {
-	        this.wire.sendAction('wrap-application').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('wrap-application');
 	        const errorMsg = (0, validate_1.validateIdentity)(identity);
 	        if (errorMsg) {
 	            throw new Error(errorMsg);
@@ -3643,9 +3576,7 @@ function requireFactory$1 () {
 	     *
 	     */
 	    wrapSync(identity) {
-	        this.wire.sendAction('wrap-application-sync').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('wrap-application-sync');
 	        const errorMsg = (0, validate_1.validateIdentity)(identity);
 	        if (errorMsg) {
 	            throw new Error(errorMsg);
@@ -3686,9 +3617,7 @@ function requireFactory$1 () {
 	     */
 	    create(appOptions) {
 	        console.warn('Deprecation Warning: fin.Application.create is deprecated. Please use fin.Application.start');
-	        this.wire.sendAction('application-create').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('application-create');
 	        return this._create(appOptions);
 	    }
 	    /**
@@ -3710,9 +3639,7 @@ function requireFactory$1 () {
 	     *
 	     */
 	    async start(appOptions) {
-	        this.wire.sendAction('start-application').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('start-application');
 	        const app = await this._create(appOptions);
 	        await this.wire.sendAction('run-application', { uuid: appOptions.uuid });
 	        return app;
@@ -3775,9 +3702,7 @@ function requireFactory$1 () {
 	     * ```
 	     */
 	    getCurrent() {
-	        this.wire.sendAction('get-current-application').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('get-current-application');
 	        return this.wrap({ uuid: this.wire.me.uuid });
 	    }
 	    /**
@@ -3800,9 +3725,7 @@ function requireFactory$1 () {
 	     * ```
 	     */
 	    getCurrentSync() {
-	        this.wire.sendAction('get-current-application-sync').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('get-current-application-sync');
 	        return this.wrapSync({ uuid: this.wire.me.uuid });
 	    }
 	    /**
@@ -3820,9 +3743,7 @@ function requireFactory$1 () {
 	     * ```
 	     */
 	    async startFromManifest(manifestUrl, opts) {
-	        this.wire.sendAction('application-start-from-manifest').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('application-start-from-manifest');
 	        const app = await this._createFromManifest(manifestUrl);
 	        // @ts-expect-error using private method without warning.
 	        await app._run(opts); // eslint-disable-line no-underscore-dangle
@@ -3844,9 +3765,7 @@ function requireFactory$1 () {
 	     */
 	    createFromManifest(manifestUrl) {
 	        console.warn('Deprecation Warning: fin.Application.createFromManifest is deprecated. Please use fin.Application.startFromManifest');
-	        this.wire.sendAction('application-create-from-manifest').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('application-create-from-manifest');
 	        return this._createFromManifest(manifestUrl);
 	    }
 	    _createFromManifest(manifestUrl) {
@@ -3967,9 +3886,7 @@ function requireInstance () {
 	        super(wire, identity, 'window');
 	    }
 	    async createWindow(options) {
-	        this.wire.sendAction('window-create-window', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('window-create-window');
 	        const CONSTRUCTOR_CB_TOPIC = 'fire-constructor-callback';
 	        const responseSubscription = await (0, promisifySubscription_1.promisifySubscription)(this, CONSTRUCTOR_CB_TOPIC);
 	        // set defaults:
@@ -4443,9 +4360,7 @@ function requireInstance () {
 	     * @experimental
 	     */
 	    async getLayout(layoutIdentity) {
-	        this.wire.sendAction('window-get-layout', this.identity).catch((e) => {
-	            // don't expose
-	        });
+	        this.wire.recordAnalytic('window-get-layout');
 	        const opts = await this.getOptions();
 	        if (!opts.layout && !opts.layoutSnapshot) {
 	            throw new Error('Window does not have a Layout');
@@ -4494,9 +4409,7 @@ function requireInstance () {
 	     * ```
 	     */
 	    getParentApplication() {
-	        this.wire.sendAction('window-get-parent-application', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('window-get-parent-application');
 	        return Promise.resolve(new application_1.Application(this.wire, this.identity));
 	    }
 	    /**
@@ -4519,9 +4432,7 @@ function requireInstance () {
 	     * ```
 	     */
 	    getParentWindow() {
-	        this.wire.sendAction('window-get-parent-window', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('window-get-parent-window');
 	        return Promise.resolve(new application_1.Application(this.wire, this.identity)).then((app) => app.getWindow());
 	    }
 	    /**
@@ -4625,9 +4536,7 @@ function requireInstance () {
 	     * ```
 	     */
 	    getWebWindow() {
-	        this.wire.sendAction('window-get-web-window', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('window-get-web-window');
 	        return this.wire.environment.getWebWindow(this.identity);
 	    }
 	    /**
@@ -4641,9 +4550,7 @@ function requireInstance () {
 	     * ```
 	     */
 	    isMainWindow() {
-	        this.wire.sendAction('window-is-main-window', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('window-is-main-window');
 	        return this.me.uuid === this.me.name;
 	    }
 	    /**
@@ -5026,6 +4933,9 @@ function requireInstance () {
 	     * ```
 	     */
 	    updateOptions(options) {
+	        if ('frame' in options) {
+	            console.warn(`Deprecation Warning: Starting with version 45 it will not be possible to change the frame value after window has been created.`);
+	        }
 	        return this.wire.sendAction('update-window-options', { options, ...this.identity }).then(() => undefined);
 	    }
 	    /**
@@ -5162,9 +5072,7 @@ function requireInstance () {
 	     * ```
 	     */
 	    async dispatchPopupResult(data) {
-	        this.wire.sendAction('window-dispatch-popup-result', this.identity).catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('window-dispatch-popup-result');
 	        await this.wire.sendAction('dispatch-popup-result', { data, ...this.identity });
 	    }
 	    /**
@@ -5264,9 +5172,7 @@ function requireFactory () {
 	     * ```
 	     */
 	    async wrap(identity) {
-	        this.wire.sendAction('window-wrap').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('window-wrap');
 	        const errorMsg = (0, validate_1.validateIdentity)(identity);
 	        if (errorMsg) {
 	            throw new Error(errorMsg);
@@ -5296,9 +5202,7 @@ function requireFactory () {
 	     * ```
 	     */
 	    wrapSync(identity) {
-	        this.wire.sendAction('window-wrap-sync').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('window-wrap-sync');
 	        const errorMsg = (0, validate_1.validateIdentity)(identity);
 	        if (errorMsg) {
 	            throw new Error(errorMsg);
@@ -5327,9 +5231,7 @@ function requireFactory () {
 	     * ```
 	     */
 	    create(options) {
-	        this.wire.sendAction('create-window').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('create-window');
 	        const win = new Instance_1._Window(this.wire, { uuid: this.me.uuid, name: options.name });
 	        return win.createWindow(options);
 	    }
@@ -5345,9 +5247,7 @@ function requireFactory () {
 	     * ```
 	     */
 	    getCurrent() {
-	        this.wire.sendAction('get-current-window').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('get-current-window');
 	        if (!this.wire.me.isWindow) {
 	            throw new Error('You are not in a Window context');
 	        }
@@ -5366,9 +5266,7 @@ function requireFactory () {
 	     * ```
 	     */
 	    getCurrentSync() {
-	        this.wire.sendAction('get-current-window-sync').catch((e) => {
-	            // we do not want to expose this error, just continue if this analytics-only call fails
-	        });
+	        this.wire.recordAnalytic('get-current-window-sync');
 	        if (!this.wire.me.isWindow) {
 	            throw new Error('You are not in a Window context');
 	        }
@@ -5514,13 +5412,15 @@ class System extends base_1$l.EmitterBase {
      * * cookies: browser [cookies](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies)
      * * localStorage: browser data that can be used across sessions ([local storage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage))
      * * appcache: html5 [application cache](https://developer.mozilla.org/en-US/docs/Web/HTML/Using_the_application_cache)
+     * * windowState: clears data written for windows using `saveWindowState`; after clearing, previously saved bounds and state will not be restored until new state is written
      * @example
      * ```js
      * const clearCacheOptions = {
      *     appcache: true,
      *     cache: true,
      *     cookies: true,
-     *     localStorage: true
+     *     localStorage: true,
+     *     windowState: true
      * };
      * fin.System.clearCache(clearCacheOptions).then(() => console.log('Cache cleared')).catch(err => console.log(err));
      * ```
@@ -6922,9 +6822,7 @@ class System extends base_1$l.EmitterBase {
      * @experimental
      */
     async registerShutdownHandler(handler) {
-        this.wire.sendAction('system-register-shutdown-handler').catch((e) => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('system-register-shutdown-handler');
         const SystemShutdownEventName = 'system-shutdown';
         const SystemShutdownHandledEventName = 'system-shutdown-handled';
         const { uuid, name } = this.wire.me;
@@ -8540,9 +8438,8 @@ class ChannelProvider extends channel_1.ChannelBase {
         return [...__classPrivateFieldGet$d(this, _ChannelProvider_connections, "f")];
     }
     static handleClientDisconnection(channel, payload) {
-        if (payload?.endpointId) {
-            const { uuid, name, endpointId, isLocalEndpointId } = payload;
-            __classPrivateFieldGet$d(channel, _ChannelProvider_removeEndpoint, "f").call(channel, { uuid, name, endpointId, isLocalEndpointId });
+        if (payload.endpointId) {
+            __classPrivateFieldGet$d(channel, _ChannelProvider_removeEndpoint, "f").call(channel, { endpointId: payload.endpointId });
         }
         else {
             // this is here to support older runtimes that did not have endpointId
@@ -8712,7 +8609,9 @@ class ChannelProvider extends channel_1.ChannelBase {
      * ```
      */
     onDisconnection(listener) {
-        this.disconnectListener = listener;
+        this.disconnectListener = (identity) => {
+            listener(identity);
+        };
     }
     /**
      * Destroy the channel, raises `disconnected` events on all connected channel clients.
@@ -8729,7 +8628,6 @@ class ChannelProvider extends channel_1.ChannelBase {
      */
     async destroy() {
         const protectedObj = __classPrivateFieldGet$d(this, _ChannelProvider_protectedObj, "f");
-        protectedObj.providerIdentity;
         __classPrivateFieldSet$c(this, _ChannelProvider_connections, [], "f");
         await protectedObj.close();
         __classPrivateFieldGet$d(this, _ChannelProvider_close, "f").call(this);
@@ -9036,7 +8934,7 @@ const base_1$i = base;
 const strategy_1 = strategy$3;
 const strategy_2 = strategy$2;
 const ice_manager_1 = iceManager;
-const provider_1$1 = provider;
+const provider_1 = provider;
 const message_receiver_1 = messageReceiver;
 const protocol_manager_1 = protocolManager;
 const strategy_3 = __importDefault$6(strategy);
@@ -9058,6 +8956,13 @@ class ConnectionManager extends base_1$i.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) => {
@@ -9068,6 +8973,7 @@ class ConnectionManager extends base_1$i.Base {
             return false;
         };
         this.providerMap = new Map();
+        this.providerChannelIdByName = new Map();
         this.protocolManager = new protocol_manager_1.ProtocolManager(this.wire.environment.type === 'node' ? ['classic'] : ['rtc', 'classic']);
         __classPrivateFieldSet$b(this, _ConnectionManager_messageReceiver, new message_receiver_1.MessageReceiver(wire), "f");
         __classPrivateFieldSet$b(this, _ConnectionManager_rtcConnectionManager, new ice_manager_1.RTCICEManager(wire), "f");
@@ -9101,14 +9007,16 @@ class ConnectionManager extends base_1$i.Base {
             // Should be impossible.
             throw new Error('failed to combine strategies');
         }
-        const channel = new provider_1$1.ChannelProvider(providerIdentity, () => provider_1$1.ChannelProvider.wireClose(this.wire, providerIdentity.channelName), strategy);
+        const channel = new provider_1.ChannelProvider(providerIdentity, () => provider_1.ChannelProvider.wireClose(this.wire, providerIdentity.channelName), strategy);
         const key = providerIdentity.channelId;
         this.providerMap.set(key, {
+            providerIdentity,
             provider: channel,
             strategy,
             supportedProtocols: ConnectionManager.getProtocolOptionsFromStrings(protocols)
         });
-        provider_1$1.ChannelProvider.setProviderRemoval(channel, this.removeChannelFromProviderMap.bind(this));
+        this.providerChannelIdByName.set(providerIdentity.channelName, key);
+        provider_1.ChannelProvider.setProviderRemoval(channel, this.removeChannelFromProviderMap.bind(this));
         return channel;
     }
     async createClientOffer(options) {
@@ -9182,6 +9090,16 @@ class ConnectionManager extends base_1$i.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) {
+            provider_1.ChannelProvider.handleClientDisconnection(providerEntry.provider, eventPayload);
+        }
+    }
     async processChannelConnection(msg) {
         const { clientIdentity, providerIdentity, ackToSender, payload, offer: clientOffer } = msg.payload;
         if (!clientIdentity.endpointId) {
@@ -9201,7 +9119,7 @@ class ConnectionManager extends base_1$i.Base {
         }
         const { provider, strategy, supportedProtocols } = bus;
         try {
-            if (!(provider instanceof provider_1$1.ChannelProvider)) {
+            if (!(provider instanceof provider_1.ChannelProvider)) {
                 throw Error('Cannot connect to a channel client');
             }
             const offer = clientOffer ?? {
@@ -9282,7 +9200,7 @@ var __classPrivateFieldGet$b = (commonjsGlobal && commonjsGlobal.__classPrivateF
     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;
 Object.defineProperty(channel$1, "__esModule", { value: true });
 channel$1.Channel = void 0;
 /* eslint-disable no-console */
@@ -9291,7 +9209,6 @@ const lazy_1$2 = lazy;
 const base_1$h = base;
 const client_1 = client;
 const connection_manager_1 = connectionManager;
-const provider_1 = provider;
 function retryDelay(count) {
     const interval = 500; // base delay
     const steps = 10; // How many retries to do before incrementing the delay
@@ -9327,9 +9244,19 @@ class Channel extends base_1$h.EmitterBase {
         super(wire, 'channel');
         _Channel_connectionManager.set(this, void 0);
         _Channel_internalEmitter.set(this, new events_1$5.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 lazy_1$2.AsyncRetryableLazy(async () => {
+            // TODO: fix typing (internal)
+            // @ts-expect-error
+            await this.on('client-disconnected', (eventPayload) => {
+                __classPrivateFieldGet$b(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 lazy_1$2.AsyncRetryableLazy(async () => {
             await Promise.all([
+                __classPrivateFieldGet$b(this, _Channel_readyForProvider, "f").getValue(),
                 this.on('disconnected', (eventPayload) => {
                     client_1.ChannelClient.handleProviderDisconnect(eventPayload);
                 }),
@@ -9586,23 +9513,16 @@ class Channel extends base_1$h.EmitterBase {
      * ```
      */
     async create(channelName, options) {
+        await __classPrivateFieldGet$b(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$b(this, _Channel_connectionManager, "f").createProvider(options, providerIdentity);
-        // TODO: fix typing (internal)
-        // @ts-expect-error
-        this.on('client-disconnected', (eventPayload) => {
-            if (eventPayload.channelName === channelName) {
-                provider_1.ChannelProvider.handleClientDisconnection(channel, eventPayload);
-            }
-        });
-        return channel;
+        return __classPrivateFieldGet$b(this, _Channel_connectionManager, "f").createProvider(options, providerIdentity);
     }
 }
 channel$1.Channel = Channel;
-_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();
 
 Object.defineProperty(interappbus, "__esModule", { value: true });
 interappbus.InterAppPayload = interappbus.InterApplicationBus = void 0;
@@ -9628,6 +9548,16 @@ class InterApplicationBus extends base_1$g.Base {
      */
     constructor(wire) {
         super(wire);
+        /**
+         * Event types for the InterApplicationBus.
+         *
+         * @remarks The `subscriber-added` and `subscriber-removed` events are disabled by default.
+         * To re-enable them, launch the runtime with the `--emit-legacy-iab-events` flag.
+         * These events will be removed in a future version. Use {@link Channel} for connection
+         * lifecycle management instead.
+         *
+         * @deprecated Use {@link Channel} `onConnection` / `onDisconnection` instead.
+         */
         this.events = {
             subscriberAdded: 'subscriber-added',
             subscriberRemoved: 'subscriber-removed'
@@ -10114,9 +10044,7 @@ class ExternalApplicationModule extends base_1$d.Base {
      * ```
      */
     wrap(uuid) {
-        this.wire.sendAction('external-application-wrap').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('external-application-wrap');
         return Promise.resolve(new Instance_1$4.ExternalApplication(this.wire, { uuid }));
     }
     /**
@@ -10133,9 +10061,7 @@ class ExternalApplicationModule extends base_1$d.Base {
      * ```
      */
     wrapSync(uuid) {
-        this.wire.sendAction('external-application-wrap-sync').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('external-application-wrap-sync');
         return new Instance_1$4.ExternalApplication(this.wire, { uuid });
     }
 }
@@ -10270,9 +10196,7 @@ class _FrameModule extends base_1$b.Base {
      * ```
      */
     async wrap(identity) {
-        this.wire.sendAction('frame-wrap').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('frame-wrap');
         const errorMsg = (0, validate_1$2.validateIdentity)(identity);
         if (errorMsg) {
             throw new Error(errorMsg);
@@ -10294,9 +10218,7 @@ class _FrameModule extends base_1$b.Base {
      * ```
      */
     wrapSync(identity) {
-        this.wire.sendAction('frame-wrap-sync').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('frame-wrap-sync');
         const errorMsg = (0, validate_1$2.validateIdentity)(identity);
         if (errorMsg) {
             throw new Error(errorMsg);
@@ -10314,9 +10236,7 @@ class _FrameModule extends base_1$b.Base {
      * ```
      */
     getCurrent() {
-        this.wire.sendAction('frame-get-current').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('frame-get-current');
         return Promise.resolve(new Instance_1$3._Frame(this.wire, this.wire.environment.getCurrentEntityIdentity()));
     }
     /**
@@ -10330,9 +10250,7 @@ class _FrameModule extends base_1$b.Base {
      * ```
      */
     getCurrentSync() {
-        this.wire.sendAction('frame-get-current-sync').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('frame-get-current-sync');
         return new Instance_1$3._Frame(this.wire, this.wire.environment.getCurrentEntityIdentity());
     }
 }
@@ -12562,9 +12480,7 @@ class LayoutModule extends base_1$7.Base {
          * ```
          */
         this.init = async (options = {}) => {
-            this.wire.sendAction('layout-init').catch((e) => {
-                // don't expose
-            });
+            this.wire.recordAnalytic('layout-init');
             if (!this.wire.environment.layoutAllowedInContext(this.fin)) {
                 throw new Error('Layout.init can only be called from a Window context.');
             }
@@ -12642,9 +12558,7 @@ class LayoutModule extends base_1$7.Base {
      * ```
      */
     async wrap(identity) {
-        this.wire.sendAction('layout-wrap').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('layout-wrap');
         return new Instance_1$2.Layout(identity, this.wire);
     }
     /**
@@ -12667,9 +12581,7 @@ class LayoutModule extends base_1$7.Base {
      * ```
      */
     wrapSync(identity) {
-        this.wire.sendAction('layout-wrap-sync').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('layout-wrap-sync');
         return new Instance_1$2.Layout(identity, this.wire);
     }
     /**
@@ -12683,9 +12595,7 @@ class LayoutModule extends base_1$7.Base {
      * ```
      */
     async getCurrent() {
-        this.wire.sendAction('layout-get-current').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('layout-get-current');
         if (this.wire.environment.type === 'openfin' && !this.fin.me.isWindow) {
             throw new Error('You are not in a Window context.  Only Windows can have a Layout.');
         }
@@ -12706,9 +12616,7 @@ class LayoutModule extends base_1$7.Base {
      * ```
      */
     getCurrentSync() {
-        this.wire.sendAction('layout-get-current-sync').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('layout-get-current-sync');
         if (this.wire.environment.type === 'openfin' && !this.fin.me.isWindow) {
             throw new Error('You are not in a Window context.  Only Windows can have a Layout.');
         }
@@ -12726,9 +12634,7 @@ class LayoutModule extends base_1$7.Base {
      * ```
      */
     async getLayoutByViewIdentity(viewIdentity) {
-        this.wire.sendAction('layout-get-by-view-identity').catch(() => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('layout-get-by-view-identity');
         const winIdentity = await this.wire.environment.getViewWindowIdentity(this.fin, viewIdentity);
         let layoutWindowIdentity = winIdentity;
         // TODO: CORE-1857 - when we tearout active layout or drag a view out of a window, the above identity includes the whole window info.
@@ -12890,9 +12796,7 @@ class PlatformModule extends base_1$6.Base {
      * ```
      */
     async wrap(identity) {
-        this.wire.sendAction('platform-wrap').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('platform-wrap');
         return new Instance_1$1.Platform(this.wire, { uuid: identity.uuid });
     }
     /**
@@ -12907,9 +12811,7 @@ class PlatformModule extends base_1$6.Base {
      * ```
      */
     wrapSync(identity) {
-        this.wire.sendAction('platform-wrap-sync').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('platform-wrap-sync');
         return new Instance_1$1.Platform(this.wire, { uuid: identity.uuid });
     }
     /**
@@ -12923,9 +12825,7 @@ class PlatformModule extends base_1$6.Base {
      * ```
      */
     async getCurrent() {
-        this.wire.sendAction('platform-get-current').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('platform-get-current');
         return this.wrap({ uuid: this.wire.me.uuid });
     }
     /**
@@ -12939,9 +12839,7 @@ class PlatformModule extends base_1$6.Base {
      * ```
      */
     getCurrentSync() {
-        this.wire.sendAction('platform-get-current-sync').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('platform-get-current-sync');
         return this.wrapSync({ uuid: this.wire.me.uuid });
     }
     /**
@@ -12969,9 +12867,7 @@ class PlatformModule extends base_1$6.Base {
      * ```
      */
     start(platformOptions) {
-        this.wire.sendAction('platform-start').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('platform-start');
         // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
             try {
@@ -13013,9 +12909,7 @@ class PlatformModule extends base_1$6.Base {
      * ```
      */
     startFromManifest(manifestUrl, opts) {
-        this.wire.sendAction('platform-start-from-manifest').catch((e) => {
-            // don't expose
-        });
+        this.wire.recordAnalytic('platform-start-from-manifest');
         // eslint-disable-next-line no-async-promise-executor
         return new Promise(async (resolve, reject) => {
             try {
@@ -16057,7 +15951,6 @@ fdc3Channels2_0.createV2Channel = createV2Channel;
 	    // Generate an ID to make a session context group with. We will pass that ID to the Broker.
 	    // The broker will then setContext on that session context group later with our Intent Result,
 	    const guid = (0, utils_1.generateId)(); // TODO make this undefined in web
-	    let isPromiseSettled = false;
 	    // Adding the intentResolutionResultId to the intentObj. Because fireIntent only accepts a single arg, we have to slap it in here.
 	    const metadata = app ? { target: app, intentResolutionResultId: guid } : { intentResolutionResultId: guid };
 	    const intentObj = intent ? { name: intent, context, metadata } : { ...context, metadata };
@@ -16073,21 +15966,11 @@ fdc3Channels2_0.createV2Channel = createV2Channel;
 	            reject(new Error('getResult is not supported in this environment'));
 	        });
 	    });
-	    getResultPromise
-	        .then(() => {
-	        isPromiseSettled = true;
-	    })
-	        .catch(() => {
-	        isPromiseSettled = true;
-	    });
 	    // Set up the getResult call.
 	    const getResult = async () => {
-	        // All this mumbo jumbo is needed to make sure that getResult resolves correctly and conforms to the FDC3 spec.
-	        if (!isPromiseSettled) {
-	            return undefined;
-	        }
 	        let intentResult = await getResultPromise;
-	        if (isPromiseSettled && !intentResult) {
+	        // void / no payload, or web path where subscribe resolves undefined (see getResultPromise above)
+	        if (intentResult == null) {
 	            return undefined;
 	        }
 	        if (typeof intentResult !== 'object') {
@@ -16178,9 +16061,7 @@ class FDC3ModuleBase {
      * @static
      */
     async broadcast(context) {
-        this.wire.sendAction('fdc3-broadcast').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-broadcast');
         return this.client.setContext(context);
     }
     /**
@@ -16191,9 +16072,7 @@ class FDC3ModuleBase {
      * @tutorial fdc3.open
      */
     async _open(app, context) {
-        this.wire.sendAction('fdc3-open').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-open');
         try {
             return await InteropClient_1$2.InteropClient.ferryFdc3Call(this.client, 'fdc3Open', { app, context });
         }
@@ -16217,9 +16096,7 @@ class FDC3ModuleBase {
      * @tutorial fdc3.getOrCreateChannel
      */
     async getOrCreateChannel(channelId, fdc3Factory) {
-        this.wire.sendAction('fdc3-get-or-create-channel').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-or-create-channel');
         const hasChannelIdBeenUsed = await InteropClient_1$2.InteropClient.ferryFdc3Call(this.client, 'isIdUsedByPrivateChannel', {
             channelId
         });
@@ -16247,9 +16124,7 @@ class FDC3ModuleBase {
      * @static
      */
     async getSystemChannels() {
-        this.wire.sendAction('fdc3-get-system-channels').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-system-channels');
         return this._getChannels();
     }
     /**
@@ -16264,9 +16139,7 @@ class FDC3ModuleBase {
      * @static
      */
     async joinChannel(channelId) {
-        this.wire.sendAction('fdc3-join-channel').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-join-channel');
         try {
             return await this.client.joinContextGroup(channelId);
         }
@@ -16289,9 +16162,7 @@ class FDC3ModuleBase {
      * @tutorial fdc3.getCurrentChannel
      */
     async getCurrentChannel() {
-        this.wire.sendAction('fdc3-get-current-channel').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-current-channel');
         const currentContextGroupInfo = await this.getCurrentContextGroupInfo();
         if (!currentContextGroupInfo) {
             return null;
@@ -16306,9 +16177,7 @@ class FDC3ModuleBase {
      * @static
      */
     async leaveCurrentChannel() {
-        this.wire.sendAction('fdc3-leave-current-channel').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-leave-current-channel');
         return this.client.removeFromContextGroup();
     }
     // utils
@@ -16434,9 +16303,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      */
     // @ts-expect-error TODO [CORE-1524]
     addContextListener(contextType, handler) {
-        this.wire.sendAction('fdc3-add-context-listener').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-add-context-listener');
         let listener;
         if (typeof contextType === 'function') {
             console.warn('addContextListener(handler) has been deprecated. Please use addContextListener(null, handler)');
@@ -16459,9 +16326,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @static
      */
     addIntentListener(intent, handler) {
-        this.wire.sendAction('fdc3-add-intent-listener').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-add-intent-listener');
         const contextHandler = (raisedIntent) => {
             const { context, metadata: intentMetadata } = raisedIntent;
             const { metadata } = context;
@@ -16489,9 +16354,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @static
      */
     async raiseIntent(intent, context, app) {
-        this.wire.sendAction('fdc3-raise-intent').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-raise-intent');
         const intentObj = app
             ? { name: intent, context, metadata: { target: app } }
             : { name: intent, context };
@@ -16511,9 +16374,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.findIntent
      */
     async findIntent(intent, context) {
-        this.wire.sendAction('fdc3-find-intent').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-intent');
         try {
             return await this.client.getInfoForIntent({ name: intent, context });
         }
@@ -16529,9 +16390,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.findIntentsByContext
      */
     async findIntentsByContext(context) {
-        this.wire.sendAction('fdc3-find-intents-by-context').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-intents-by-context');
         try {
             return await this.client.getInfoForIntentsByContext(context);
         }
@@ -16548,9 +16407,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.raiseIntentForContext
      */
     async raiseIntentForContext(context, app) {
-        this.wire.sendAction('fdc3-raise-intent-for-context').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-raise-intent-for-context');
         try {
             return await this.client.fireIntentForContext({ ...context, metadata: { target: app } });
         }
@@ -16574,9 +16431,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.getInfo
      */
     getInfo() {
-        this.wire.sendAction('fdc3-get-info').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-info');
         const version = this.wire.environment.getAdapterVersionSync();
         return {
             providerVersion: version,
@@ -16654,9 +16509,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.findInstances
      */
     async findInstances(app) {
-        this.wire.sendAction('fdc3-find-instances').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-instances');
         try {
             return await InteropClient_1$1.InteropClient.ferryFdc3Call(this.client, 'fdc3FindInstances', app);
         }
@@ -16672,9 +16525,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.getAppMetadata
      */
     async getAppMetadata(app) {
-        this.wire.sendAction('fdc3-get-app-metadata').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-app-metadata');
         try {
             return await InteropClient_1$1.InteropClient.ferryFdc3Call(this.client, 'fdc3GetAppMetadata', app);
         }
@@ -16692,9 +16543,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      */
     // @ts-expect-error TODO [CORE-1524]
     async addContextListener(contextType, handler) {
-        this.wire.sendAction('fdc3-add-context-listener').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-add-context-listener');
         // The FDC3 ContextHandler only expects the context and optional ContextMetadata, so we wrap the handler
         // here so it only gets passed these parameters
         const getWrappedHandler = (handlerToWrap) => {
@@ -16723,9 +16572,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3.findIntent
      */
     async findIntent(intent, context, resultType) {
-        this.wire.sendAction('fdc3-find-intent').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-intent');
         try {
             return await this.client.getInfoForIntent({ name: intent, context, metadata: { resultType } });
         }
@@ -16742,9 +16589,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.findIntentsByContext
      */
     async findIntentsByContext(context, resultType) {
-        this.wire.sendAction('fdc3-find-intents-by-context').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-intents-by-context');
         const payload = resultType ? { context, metadata: { resultType } } : context;
         try {
             return await InteropClient_1$1.InteropClient.ferryFdc3Call(this.client, 'fdc3v2FindIntentsByContext', payload);
@@ -16763,9 +16608,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.raiseIntent
      */
     async raiseIntent(intent, context, app) {
-        this.wire.sendAction('fdc3-raise-intent').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-raise-intent');
         try {
             if (typeof app === 'string') {
                 console.warn('Passing a string as the app parameter is deprecated, please use an AppIdentifier ({ appId: string; instanceId?: string }).');
@@ -16786,9 +16629,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      */
     async raiseIntentForContext(context, app) {
         // TODO: We have to do the same thing we do for raiseIntent here as well.
-        this.wire.sendAction('fdc3-raise-intent-for-context').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-raise-intent-for-context');
         try {
             if (typeof app === 'string') {
                 console.warn('Passing a string as the app parameter is deprecated, please use an AppIdentifier ({ appId: string; instanceId?: string }).');
@@ -16808,9 +16649,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3.addIntentListener
      */
     async addIntentListener(intent, handler) {
-        this.wire.sendAction('fdc3-add-intent-listener').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-add-intent-listener');
         if (typeof intent !== 'string') {
             throw new Error('First argument must be an Intent name');
         }
@@ -16987,9 +16826,7 @@ class InteropModule extends base_1$2.Base {
      * ```
      */
     async init(name, override = defaultOverride) {
-        this.wire.sendAction('interop-init').catch(() => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('interop-init');
         // Allows for manifest-level configuration, without having to override. (e.g. specifying custom context groups)
         const options = await this.wire.environment.getInteropInfo(this.wire.getFin());
         const objectThatThrows = (0, inaccessibleObject_1.createUnusableObject)(BrokerParamAccessError);
@@ -17038,9 +16875,7 @@ class InteropModule extends base_1$2.Base {
      * ```
      */
     connectSync(name, interopConfig) {
-        this.wire.sendAction('interop-connect-sync').catch(() => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('interop-connect-sync');
         return new InteropClient_1.InteropClient(this.wire, this.wire.environment.whenReady().then(() => {
             return this.fin.InterApplicationBus.Channel.connect(`interop-broker-${name}`, {
                 payload: interopConfig
@@ -17209,9 +17044,7 @@ class SnapshotSource extends base_1$1.Base {
      * ```
      */
     async ready() {
-        this.wire.sendAction('snapshot-source-ready').catch((e) => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('snapshot-source-ready');
         // eslint-disable-next-line no-async-promise-executor
         try {
             // If getClient was already called before this, do we have a timing issue where the channel might have been created but we missed the event but this still fails?
@@ -17227,9 +17060,7 @@ class SnapshotSource extends base_1$1.Base {
      *
      */
     async getSnapshot() {
-        this.wire.sendAction('snapshot-source-get-snapshot').catch((e) => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('snapshot-source-get-snapshot');
         const client = await __classPrivateFieldGet$1(this, _SnapshotSource_getClient, "f").call(this);
         const response = (await client.dispatch('get-snapshot'));
         return (await response).snapshot;
@@ -17239,9 +17070,7 @@ class SnapshotSource extends base_1$1.Base {
      *
      */
     async applySnapshot(snapshot) {
-        this.wire.sendAction('snapshot-source-apply-snapshot').catch((e) => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('snapshot-source-apply-snapshot');
         const client = await __classPrivateFieldGet$1(this, _SnapshotSource_getClient, "f").call(this);
         return client.dispatch('apply-snapshot', { snapshot });
     }
@@ -17282,9 +17111,7 @@ class SnapshotSourceModule extends base_1.Base {
      *
      */
     async init(provider) {
-        this.wire.sendAction('snapshot-source-init').catch((e) => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('snapshot-source-init');
         if (typeof provider !== 'object' ||
             typeof provider.getSnapshot !== 'function' ||
             typeof provider.applySnapshot !== 'function') {
@@ -17308,9 +17135,7 @@ class SnapshotSourceModule extends base_1.Base {
      * ```
      */
     wrapSync(identity) {
-        this.wire.sendAction('snapshot-source-wrap-sync').catch((e) => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('snapshot-source-wrap-sync');
         return new Instance_1.SnapshotSource(this.wire, identity);
     }
     /**
@@ -17324,9 +17149,7 @@ class SnapshotSourceModule extends base_1.Base {
      * ```
      */
     async wrap(identity) {
-        this.wire.sendAction('snapshot-source-wrap').catch((e) => {
-            // don't expose, analytics-only call
-        });
+        this.wire.recordAnalytic('snapshot-source-wrap');
         return this.wrapSync(identity);
     }
 }
@@ -17544,7 +17367,7 @@ var __classPrivateFieldGet = (commonjsGlobal && commonjsGlobal.__classPrivateFie
 var __importDefault = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Transport_wire, _Transport_fin;
+var _Transport_instances, _Transport_wire, _Transport_analyticsEnabled, _Transport_analyticsBuffer, _Transport_analyticsFlushTimeout, _Transport_fin, _Transport_flushAnalytics;
 Object.defineProperty(transport, "__esModule", { value: true });
 var Transport_1 = transport.Transport = void 0;
 const events_1$1 = require$$0;
@@ -17556,11 +17379,15 @@ const errors_1 = errors;
 class Transport extends events_1$1.EventEmitter {
     constructor(factory, environment, config) {
         super();
+        _Transport_instances.add(this);
         this.wireListeners = new Map();
         this.topicRefMap = new Map();
         this.eventAggregator = new eventAggregator_1.default();
         this.messageHandlers = [this.eventAggregator.dispatchEvent];
         _Transport_wire.set(this, void 0);
+        _Transport_analyticsEnabled.set(this, true);
+        _Transport_analyticsBuffer.set(this, new Map());
+        _Transport_analyticsFlushTimeout.set(this, void 0);
         // Typing as unknown to avoid circular dependency, should not be used directly.
         _Transport_fin.set(this, void 0);
         this.connectSync = () => {
@@ -17574,6 +17401,7 @@ class Transport extends events_1$1.EventEmitter {
         };
         __classPrivateFieldSet(this, _Transport_wire, factory(this.onmessage.bind(this)), "f");
         this.environment = environment;
+        __classPrivateFieldSet(this, _Transport_analyticsEnabled, config.apiDiagnostics !== false, "f");
         this.sendRaw = __classPrivateFieldGet(this, _Transport_wire, "f").send.bind(__classPrivateFieldGet(this, _Transport_wire, "f"));
         this.registerMessageHandler(this.handleMessage.bind(this));
         __classPrivateFieldGet(this, _Transport_wire, "f").on('disconnected', () => {
@@ -17581,6 +17409,9 @@ class Transport extends events_1$1.EventEmitter {
                 handleNack({ reason: 'Remote connection has closed' });
             }
             this.wireListeners.clear();
+            clearTimeout(__classPrivateFieldGet(this, _Transport_analyticsFlushTimeout, "f"));
+            __classPrivateFieldSet(this, _Transport_analyticsFlushTimeout, undefined, "f");
+            __classPrivateFieldGet(this, _Transport_analyticsBuffer, "f").clear();
             this.emit('disconnected');
         });
         const { uuid, name } = config;
@@ -17599,6 +17430,18 @@ class Transport extends events_1$1.EventEmitter {
         }
         __classPrivateFieldSet(this, _Transport_fin, _fin, "f");
     }
+    recordAnalytic(action) {
+        if (!__classPrivateFieldGet(this, _Transport_analyticsEnabled, "f"))
+            return;
+        __classPrivateFieldGet(this, _Transport_analyticsBuffer, "f").set(action, (__classPrivateFieldGet(this, _Transport_analyticsBuffer, "f").get(action) ?? 0) + 1);
+        if (__classPrivateFieldGet(this, _Transport_analyticsFlushTimeout, "f") === undefined) {
+            const timeout = setTimeout(() => __classPrivateFieldGet(this, _Transport_instances, "m", _Transport_flushAnalytics).call(this), 30000);
+            if (typeof timeout === 'object' && timeout !== null) {
+                timeout.unref?.();
+            }
+            __classPrivateFieldSet(this, _Transport_analyticsFlushTimeout, timeout, "f");
+        }
+    }
     shutdown() {
         const wire = __classPrivateFieldGet(this, _Transport_wire, "f");
         return wire.shutdown();
@@ -17762,7 +17605,16 @@ class Transport extends events_1$1.EventEmitter {
     }
 }
 Transport_1 = transport.Transport = Transport;
-_Transport_wire = new WeakMap(), _Transport_fin = new WeakMap();
+_Transport_wire = new WeakMap(), _Transport_analyticsEnabled = new WeakMap(), _Transport_analyticsBuffer = new WeakMap(), _Transport_analyticsFlushTimeout = new WeakMap(), _Transport_fin = new WeakMap(), _Transport_instances = new WeakSet(), _Transport_flushAnalytics = function _Transport_flushAnalytics() {
+    __classPrivateFieldSet(this, _Transport_analyticsFlushTimeout, undefined, "f");
+    if (__classPrivateFieldGet(this, _Transport_analyticsBuffer, "f").size === 0)
+        return;
+    const counts = Object.fromEntries(__classPrivateFieldGet(this, _Transport_analyticsBuffer, "f"));
+    __classPrivateFieldGet(this, _Transport_analyticsBuffer, "f").clear();
+    this.sendAction('send-analytics-batch', { counts }).catch(() => {
+        // analytics flush failure is non-fatal, counts are already cleared
+    });
+};
 
 var stubEnvironment = {};