@openfin/fdc3-api 44.100.109 → 44.101.2

package/out/fdc3-api.js

@@ -1,121 +1,53 @@
 'use strict';
 
-var require$$0 = require('lodash/isEqual');
+var esToolkit = require('es-toolkit');
 
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-var fdc31_2 = {};
-
-var utils$2 = {};
-
-(function (exports) {
-	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.checkContextIntegrity = exports.wrapIntentHandler = exports.BROKER_ERRORS = exports.generateOverrideWarning = exports.generateOverrideError = exports.wrapContextHandler = exports.wrapInTryCatch = exports.generateId = void 0;
-	const generateId = () => `${Math.random()}${Date.now()}`;
-	exports.generateId = generateId;
-	const wrapInTryCatch = (f, prefix) => (...args) => {
-	    try {
-	        return f(...args);
-	    }
-	    catch (e) {
-	        throw new Error((prefix || '') + e);
-	    }
-	};
-	exports.wrapInTryCatch = wrapInTryCatch;
-	const wrapContextHandler = (handler, handlerId) => {
-	    return async (context) => {
-	        try {
-	            await handler(context);
-	        }
-	        catch (error) {
-	            console.error(`Error thrown by handler ${handlerId} for context type ${context.type}: ${error}`);
-	            throw error;
-	        }
-	    };
-	};
-	exports.wrapContextHandler = wrapContextHandler;
-	const generateOverrideError = (clientApi, brokerApi) => {
-	    return `You have tried to to use ${clientApi} but ${brokerApi} has not been overridden in the Interop Broker. Please override this function. Refer to our documentation for more info.`;
-	};
-	exports.generateOverrideError = generateOverrideError;
-	const generateOverrideWarning = (fdc3ClientApi, brokerApi, identity, interopClientApi) => {
-	    const { uuid, name } = identity;
-	    const message = interopClientApi
-	        ? `Entity with identity: ${uuid}/${name} has called ${interopClientApi} or ${fdc3ClientApi} but ${brokerApi} has not been overridden.`
-	        : `Entity with identity: ${uuid}/${name} has called ${fdc3ClientApi} but ${brokerApi} has not been overridden.`;
-	    return message;
-	};
-	exports.generateOverrideWarning = generateOverrideWarning;
-	exports.BROKER_ERRORS = {
-	    fireIntent: (0, exports.generateOverrideError)('fireIntent', 'handleFiredIntent'),
-	    fireIntentForContext: (0, exports.generateOverrideError)('fireIntentForContext', 'handleFiredIntentForContext'),
-	    getInfoForIntent: (0, exports.generateOverrideError)('getInfoForIntent', 'handleInfoForIntent'),
-	    getInfoForIntentsByContext: (0, exports.generateOverrideError)('getInfoForIntentsByContext', 'handleInfoForIntentsByContext'),
-	    joinSessionContextGroupWithJoinContextGroup: 'The Context Group you have tried to join is a Session Context Group. Custom Context Groups can only be defined by the Interop Broker through code or manifest configuration. Please use joinSessionContextGroup.',
-	    fdc3Open: (0, exports.generateOverrideError)('fdc3.open', 'fdc3HandleOpen'),
-	    fdc3FindInstances: (0, exports.generateOverrideError)('fdc3.findInstances', 'fdc3HandleFindInstances'),
-	    fdc3GetAppMetadata: (0, exports.generateOverrideError)('fdc3.getAppMetadata', 'fdc3HandleGetAppMetadata'),
-	    fdc3GetInfo: (0, exports.generateOverrideError)('fdc3.getInfo', 'fdc3HandleGetInfo')
-	};
-	const wrapIntentHandler = (handler, handlerId) => {
-	    return async (intent) => {
-	        try {
-	            return handler(intent);
-	        }
-	        catch (error) {
-	            console.error(`Error thrown by handler ${handlerId}: ${error}`);
-	            throw error;
-	        }
-	    };
-	};
-	exports.wrapIntentHandler = wrapIntentHandler;
-	const checkContextIntegrity = (context) => {
-	    if (!context) {
-	        return { isValid: false, reason: 'No context supplied' };
-	    }
-	    if (typeof context !== 'object') {
-	        return { isValid: false, reason: 'Context must be an Object' };
-	    }
-	    if (!context.type) {
-	        return { isValid: false, reason: 'Context must have a type property' };
-	    }
-	    return { isValid: true };
-	};
-	exports.checkContextIntegrity = checkContextIntegrity; 
-} (utils$2));
-
-var fdc3Common = {};
-
-var utils$1 = {};
-
-var PrivateChannelClient$1 = {};
-
-var __createBinding = (commonjsGlobal && commonjsGlobal.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (commonjsGlobal && commonjsGlobal.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (commonjsGlobal && commonjsGlobal.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+const generateId = () => `${Math.random()}${Date.now()}`;
+const wrapInTryCatch = (f, prefix) => (...args) => {
+    try {
+        return f(...args);
+    }
+    catch (e) {
+        throw new Error((prefix || '') + e);
+    }
 };
-Object.defineProperty(PrivateChannelClient$1, "__esModule", { value: true });
-PrivateChannelClient$1.PrivateChannelClient = void 0;
-const utils = __importStar(utils$2);
+const wrapContextHandler = (handler, handlerId) => {
+    return async (context) => {
+        try {
+            await handler(context);
+        }
+        catch (error) {
+            console.error(`Error thrown by handler ${handlerId} for context type ${context.type}: ${error}`);
+            throw error;
+        }
+    };
+};
+const generateOverrideError = (clientApi, brokerApi) => {
+    return `You have tried to to use ${clientApi} but ${brokerApi} has not been overridden in the Interop Broker. Please override this function. Refer to our documentation for more info.`;
+};
+const BROKER_ERRORS = {
+    fireIntent: generateOverrideError('fireIntent', 'handleFiredIntent'),
+    fireIntentForContext: generateOverrideError('fireIntentForContext', 'handleFiredIntentForContext'),
+    getInfoForIntent: generateOverrideError('getInfoForIntent', 'handleInfoForIntent'),
+    getInfoForIntentsByContext: generateOverrideError('getInfoForIntentsByContext', 'handleInfoForIntentsByContext'),
+    joinSessionContextGroupWithJoinContextGroup: 'The Context Group you have tried to join is a Session Context Group. Custom Context Groups can only be defined by the Interop Broker through code or manifest configuration. Please use joinSessionContextGroup.',
+    fdc3Open: generateOverrideError('fdc3.open', 'fdc3HandleOpen'),
+    fdc3FindInstances: generateOverrideError('fdc3.findInstances', 'fdc3HandleFindInstances'),
+    fdc3GetAppMetadata: generateOverrideError('fdc3.getAppMetadata', 'fdc3HandleGetAppMetadata'),
+    fdc3GetInfo: generateOverrideError('fdc3.getInfo', 'fdc3HandleGetInfo')
+};
+const wrapIntentHandler = (handler, handlerId) => {
+    return async (intent) => {
+        try {
+            return handler(intent);
+        }
+        catch (error) {
+            console.error(`Error thrown by handler ${handlerId}: ${error}`);
+            throw error;
+        }
+    };
+};
+
 class PrivateChannelClient {
     constructor(client, id) {
         this.id = id;
@@ -134,12 +66,12 @@ class PrivateChannelClient {
         }
         let handlerId;
         if (contextType) {
-            handlerId = `contextHandler:invoke-${this.id}-${contextType}-${utils.generateId()}`;
+            handlerId = `contextHandler:invoke-${this.id}-${contextType}-${generateId()}`;
         }
         else {
-            handlerId = `contextHandler:invoke-${this.id}-${utils.generateId()}`;
+            handlerId = `contextHandler:invoke-${this.id}-${generateId()}`;
         }
-        this.client.register(handlerId, utils.wrapContextHandler(handler, handlerId));
+        this.client.register(handlerId, wrapContextHandler(handler, handlerId));
         const listener = { unsubscribe: await this.createContextUnsubscribeCb(handlerId) };
         this.listeners.set(handlerId, listener);
         await this.client.dispatch(`contextHandlerAdded`, { handlerId, contextType });
@@ -160,7 +92,7 @@ class PrivateChannelClient {
         };
     }
     onAddContextListener(handler) {
-        const handlerId = `onContextHandlerAdded:invoke-${this.id}-${utils.generateId()}`;
+        const handlerId = `onContextHandlerAdded:invoke-${this.id}-${generateId()}`;
         this.client.register(handlerId, handler);
         const listener = { unsubscribe: this.createNonStandardUnsubscribeCb(handlerId) };
         this.listeners.set(handlerId, listener);
@@ -168,7 +100,7 @@ class PrivateChannelClient {
         return listener;
     }
     onDisconnect(handler) {
-        const handlerId = `onDisconnect:invoke-${this.id}-${utils.generateId()}`;
+        const handlerId = `onDisconnect:invoke-${this.id}-${generateId()}`;
         this.client.register(handlerId, handler);
         const listener = { unsubscribe: this.createNonStandardUnsubscribeCb(handlerId) };
         this.listeners.set(handlerId, listener);
@@ -176,7 +108,7 @@ class PrivateChannelClient {
         return listener;
     }
     onUnsubscribe(handler) {
-        const handlerId = `onUnsubscribe:invoke-${this.id}-${utils.generateId()}`;
+        const handlerId = `onUnsubscribe:invoke-${this.id}-${generateId()}`;
         this.client.register(handlerId, handler);
         const listener = { unsubscribe: this.createNonStandardUnsubscribeCb(handlerId) };
         this.listeners.set(handlerId, listener);
@@ -201,18 +133,7 @@ class PrivateChannelClient {
         }
     }
 }
-PrivateChannelClient$1.PrivateChannelClient = PrivateChannelClient;
 
-var fdc3Channels2_0 = {};
-
-var fdc3Channels1_2 = {};
-
-var __importDefault$2 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(fdc3Channels1_2, "__esModule", { value: true });
-fdc3Channels1_2.createV1Channel = void 0;
-const isEqual_1$1 = __importDefault$2(require$$0);
 const createV1Channel = (sessionContextGroup) => {
     return {
         id: sessionContextGroup.id,
@@ -242,7 +163,7 @@ const createV1Channel = (sessionContextGroup) => {
                 const wrappedHandler = (context, contextMetadata) => {
                     if (first) {
                         first = false;
-                        if ((0, isEqual_1$1.default)(currentContext, context)) {
+                        if (esToolkit.isEqual(currentContext, context)) {
                             return;
                         }
                     }
@@ -258,246 +179,217 @@ const createV1Channel = (sessionContextGroup) => {
         }
     };
 };
-fdc3Channels1_2.createV1Channel = createV1Channel;
 
-Object.defineProperty(fdc3Channels2_0, "__esModule", { value: true });
-fdc3Channels2_0.createV2Channel = void 0;
-const fdc3_channels_1_2_1$1 = fdc3Channels1_2;
 const createV2Channel = (sessionContextGroup) => {
-    const channel = (0, fdc3_channels_1_2_1$1.createV1Channel)(sessionContextGroup);
+    const channel = createV1Channel(sessionContextGroup);
     return {
         ...channel,
         // @ts-expect-error Type incompatibility on signature.
         addContextListener: async (...args) => channel.addContextListener(...args)
     };
 };
-fdc3Channels2_0.createV2Channel = createV2Channel;
 
-(function (exports) {
-	var __importDefault = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
-	    return (mod && mod.__esModule) ? mod : { "default": mod };
-	};
-	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.getIntentResolution = exports.isChannel = exports.isContext = exports.connectPrivateChannel = exports.buildPrivateChannelObject = exports.ChannelError = exports.ResultError = exports.UnsupportedChannelApiError = exports.getUnsupportedChannelApis = void 0;
-	const utils_1 = utils$2;
-	const PrivateChannelClient_1 = PrivateChannelClient$1;
-	__importDefault(require$$0);
-	const fdc3_channels_2_0_1 = fdc3Channels2_0;
-	const getUnsupportedChannelApis = (channelType) => {
-	    return {
-	        addContextListener: () => {
-	            throw new UnsupportedChannelApiError('Channel.addContextListener', channelType);
-	        },
-	        broadcast: () => {
-	            throw new UnsupportedChannelApiError('Channel.broadcast', channelType);
-	        },
-	        getCurrentContext: () => {
-	            throw new UnsupportedChannelApiError('Channel.getCurrentContext', channelType);
-	        }
-	    };
-	};
-	exports.getUnsupportedChannelApis = getUnsupportedChannelApis;
-	class UnsupportedChannelApiError extends Error {
-	    constructor(apiName, channelType = 'System') {
-	        super(apiName);
-	        this.message = `Calling ${apiName} on an instance of a ${channelType} Channel returned by fdc3.get${channelType}Channels is not supported. If you would like to use a ${channelType} Channel, please use fdc3.joinChannel, fdc3.addContextListener, and fdc3.broadcast instead.`;
-	    }
-	}
-	exports.UnsupportedChannelApiError = UnsupportedChannelApiError;
-	var ResultError;
-	(function (ResultError) {
-	    /** Returned if the `IntentHandler` exited without returning a Promise or that
-	     *  Promise was not resolved with a Context or Channel object.
-	     */
-	    ResultError["NoResultReturned"] = "NoResultReturned";
-	    /** Returned if the `IntentHandler` function processing the raised intent
-	     *  throws an error or rejects the Promise it returned.
-	     */
-	    ResultError["IntentHandlerRejected"] = "IntentHandlerRejected";
-	})(ResultError = exports.ResultError || (exports.ResultError = {}));
-	(function (ChannelError) {
-	    /** Returned if the specified channel is not found when attempting to join a
-	     *  channel via the `joinUserChannel` function of the DesktopAgent (`fdc3`).
-	     */
-	    ChannelError["NoChannelFound"] = "NoChannelFound";
-	    /** SHOULD be returned when a request to join a user channel or to a retrieve
-	     *  a Channel object via the `joinUserChannel` or `getOrCreateChannel` methods
-	     *  of the DesktopAgent (`fdc3`) object is denied.
-	     */
-	    ChannelError["AccessDenied"] = "AccessDenied";
-	    /** SHOULD be returned when a channel cannot be created or retrieved via the
-	     *  `getOrCreateChannel` method of the DesktopAgent (`fdc3`).
-	     */
-	    ChannelError["CreationFailed"] = "CreationFailed";
-	})(exports.ChannelError || (exports.ChannelError = {}));
-	const buildPrivateChannelObject = (privateChannelClient) => {
-	    let clientDisconnected = false;
-	    const checkIfClientDisconnected = () => {
-	        if (clientDisconnected) {
-	            throw new Error('Private Channel Client has been disconnected from the Private Channel');
-	        }
-	    };
-	    return {
-	        id: privateChannelClient.id,
-	        type: 'private',
-	        broadcast: async (context) => {
-	            checkIfClientDisconnected();
-	            return privateChannelClient.broadcast(context);
-	        },
-	        getCurrentContext: async (contextType) => {
-	            checkIfClientDisconnected();
-	            return privateChannelClient.getCurrentContext(contextType);
-	        },
-	        // @ts-expect-error TODO [CORE-1524]
-	        addContextListener: async (contextType, handler) => {
-	            checkIfClientDisconnected();
-	            let handlerInUse = handler;
-	            let contextTypeInUse = contextType;
-	            if (typeof contextType === 'function') {
-	                console.warn('addContextListener(handler) has been deprecated. Please use addContextListener(null, handler)');
-	                handlerInUse = contextType;
-	                contextTypeInUse = null;
-	            }
-	            const listener = privateChannelClient.addContextListener(contextTypeInUse, handlerInUse);
-	            return listener;
-	        },
-	        onAddContextListener: (handler) => {
-	            checkIfClientDisconnected();
-	            return privateChannelClient.onAddContextListener(handler);
-	        },
-	        disconnect: async () => {
-	            checkIfClientDisconnected();
-	            clientDisconnected = true;
-	            return privateChannelClient.disconnect();
-	        },
-	        onDisconnect: (handler) => {
-	            checkIfClientDisconnected();
-	            return privateChannelClient.onDisconnect(handler);
-	        },
-	        onUnsubscribe: (handler) => {
-	            checkIfClientDisconnected();
-	            return privateChannelClient.onUnsubscribe(handler);
-	        }
-	    };
-	};
-	exports.buildPrivateChannelObject = buildPrivateChannelObject;
-	const connectPrivateChannel = async (channelId) => {
-	    try {
-	        const channelClient = await fin.InterApplicationBus.Channel.connect(channelId);
-	        const privateChannelClient = new PrivateChannelClient_1.PrivateChannelClient(channelClient, channelId);
-	        return (0, exports.buildPrivateChannelObject)(privateChannelClient);
-	    }
-	    catch (error) {
-	        throw new Error(`Private Channel with id: ${channelId} doesn't exist`);
-	    }
-	};
-	exports.connectPrivateChannel = connectPrivateChannel;
-	const isContext = (context) => {
-	    if (context && typeof context === 'object' && 'type' in context) {
-	        const { type } = context;
-	        return typeof type === 'string';
-	    }
-	    return false;
-	};
-	exports.isContext = isContext;
-	const isChannel = (channel) => {
-	    if (channel && typeof channel === 'object' && 'type' in channel && 'id' in channel) {
-	        const { type, id } = channel;
-	        return typeof type === 'string' && typeof id === 'string' && (type === 'app' || type === 'private');
-	    }
-	    return false;
-	};
-	exports.isChannel = isChannel;
-	const getIntentResolution = async (interopModule, context, app, intent) => {
-	    // 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
-	    // 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 };
-	    // Promise we'll use in getResult
-	    const getResultPromise = new Promise((resolve, reject) => {
-	        fin.InterApplicationBus.subscribe({ uuid: '*' }, guid, (intentResult) => {
-	            resolve(intentResult);
-	        }).catch(() => {
-	            // not supported in web, suppress the error
-	            if (interopModule.wire.environment.type === 'other') {
-	                resolve(undefined);
-	            }
-	            reject(new Error('getResult is not supported in this environment'));
-	        });
-	    });
-	    // Set up the getResult call.
-	    const getResult = async () => {
-	        let intentResult = await getResultPromise;
-	        // void / no payload, or web path where subscribe resolves undefined (see getResultPromise above)
-	        if (intentResult == null) {
-	            return undefined;
-	        }
-	        if (typeof intentResult !== 'object') {
-	            throw new Error(ResultError.NoResultReturned);
-	        }
-	        const { error } = intentResult;
-	        if (error) {
-	            throw new Error(ResultError.IntentHandlerRejected);
-	        }
-	        if ((0, exports.isChannel)(intentResult)) {
-	            const { id, type } = intentResult;
-	            switch (type) {
-	                case 'private': {
-	                    intentResult = await (0, exports.connectPrivateChannel)(id);
-	                    break;
-	                }
-	                case 'app': {
-	                    const sessionContextGroup = await interopModule.joinSessionContextGroup(id);
-	                    intentResult = (0, fdc3_channels_2_0_1.createV2Channel)(sessionContextGroup);
-	                    break;
-	                }
-	            }
-	        }
-	        else if (!(0, exports.isContext)(intentResult)) {
-	            throw new Error(ResultError.NoResultReturned);
-	        }
-	        return intentResult;
-	    };
-	    // Finally fire the intent.
-	    const intentResolutionInfoFromBroker = intent
-	        ? await interopModule.fireIntent(intentObj)
-	        : await interopModule.fireIntentForContext(intentObj);
-	    if (typeof intentResolutionInfoFromBroker !== 'object') {
-	        return {
-	            source: {
-	                appId: '',
-	                instanceId: ''
-	            },
-	            intent: '',
-	            version: '2.0',
-	            getResult
-	        };
-	    }
-	    return { ...intentResolutionInfoFromBroker, getResult };
-	};
-	exports.getIntentResolution = getIntentResolution; 
-} (utils$1));
-
-var InteropClient$1 = {};
-
-var base = {};
+const getUnsupportedChannelApis = (channelType) => {
+    return {
+        addContextListener: () => {
+            throw new UnsupportedChannelApiError('Channel.addContextListener', channelType);
+        },
+        broadcast: () => {
+            throw new UnsupportedChannelApiError('Channel.broadcast', channelType);
+        },
+        getCurrentContext: () => {
+            throw new UnsupportedChannelApiError('Channel.getCurrentContext', channelType);
+        }
+    };
+};
+class UnsupportedChannelApiError extends Error {
+    constructor(apiName, channelType = 'System') {
+        super(apiName);
+        this.message = `Calling ${apiName} on an instance of a ${channelType} Channel returned by fdc3.get${channelType}Channels is not supported. If you would like to use a ${channelType} Channel, please use fdc3.joinChannel, fdc3.addContextListener, and fdc3.broadcast instead.`;
+    }
+}
+var ResultError;
+(function (ResultError) {
+    /** Returned if the `IntentHandler` exited without returning a Promise or that
+     *  Promise was not resolved with a Context or Channel object.
+     */
+    ResultError["NoResultReturned"] = "NoResultReturned";
+    /** Returned if the `IntentHandler` function processing the raised intent
+     *  throws an error or rejects the Promise it returned.
+     */
+    ResultError["IntentHandlerRejected"] = "IntentHandlerRejected";
+})(ResultError || (ResultError = {}));
+var ChannelError;
+(function (ChannelError) {
+    /** Returned if the specified channel is not found when attempting to join a
+     *  channel via the `joinUserChannel` function of the DesktopAgent (`fdc3`).
+     */
+    ChannelError["NoChannelFound"] = "NoChannelFound";
+    /** SHOULD be returned when a request to join a user channel or to a retrieve
+     *  a Channel object via the `joinUserChannel` or `getOrCreateChannel` methods
+     *  of the DesktopAgent (`fdc3`) object is denied.
+     */
+    ChannelError["AccessDenied"] = "AccessDenied";
+    /** SHOULD be returned when a channel cannot be created or retrieved via the
+     *  `getOrCreateChannel` method of the DesktopAgent (`fdc3`).
+     */
+    ChannelError["CreationFailed"] = "CreationFailed";
+})(ChannelError || (ChannelError = {}));
+const buildPrivateChannelObject = (privateChannelClient) => {
+    let clientDisconnected = false;
+    const checkIfClientDisconnected = () => {
+        if (clientDisconnected) {
+            throw new Error('Private Channel Client has been disconnected from the Private Channel');
+        }
+    };
+    return {
+        id: privateChannelClient.id,
+        type: 'private',
+        broadcast: async (context) => {
+            checkIfClientDisconnected();
+            return privateChannelClient.broadcast(context);
+        },
+        getCurrentContext: async (contextType) => {
+            checkIfClientDisconnected();
+            return privateChannelClient.getCurrentContext(contextType);
+        },
+        // @ts-expect-error TODO [CORE-1524]
+        addContextListener: async (contextType, handler) => {
+            checkIfClientDisconnected();
+            let handlerInUse = handler;
+            let contextTypeInUse = contextType;
+            if (typeof contextType === 'function') {
+                console.warn('addContextListener(handler) has been deprecated. Please use addContextListener(null, handler)');
+                handlerInUse = contextType;
+                contextTypeInUse = null;
+            }
+            const listener = privateChannelClient.addContextListener(contextTypeInUse, handlerInUse);
+            return listener;
+        },
+        onAddContextListener: (handler) => {
+            checkIfClientDisconnected();
+            return privateChannelClient.onAddContextListener(handler);
+        },
+        disconnect: async () => {
+            checkIfClientDisconnected();
+            clientDisconnected = true;
+            return privateChannelClient.disconnect();
+        },
+        onDisconnect: (handler) => {
+            checkIfClientDisconnected();
+            return privateChannelClient.onDisconnect(handler);
+        },
+        onUnsubscribe: (handler) => {
+            checkIfClientDisconnected();
+            return privateChannelClient.onUnsubscribe(handler);
+        }
+    };
+};
+const connectPrivateChannel = async (channelId) => {
+    try {
+        const channelClient = await fin.InterApplicationBus.Channel.connect(channelId);
+        const privateChannelClient = new PrivateChannelClient(channelClient, channelId);
+        return buildPrivateChannelObject(privateChannelClient);
+    }
+    catch (error) {
+        throw new Error(`Private Channel with id: ${channelId} doesn't exist`);
+    }
+};
+const isContext = (context) => {
+    if (context && typeof context === 'object' && 'type' in context) {
+        const { type } = context;
+        return typeof type === 'string';
+    }
+    return false;
+};
+const isChannel = (channel) => {
+    if (channel && typeof channel === 'object' && 'type' in channel && 'id' in channel) {
+        const { type, id } = channel;
+        return typeof type === 'string' && typeof id === 'string' && (type === 'app' || type === 'private');
+    }
+    return false;
+};
+const getIntentResolution = async (interopModule, context, app, intent) => {
+    // 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 = generateId(); // TODO make this undefined in web
+    // 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 };
+    // Promise we'll use in getResult
+    const getResultPromise = new Promise((resolve, reject) => {
+        fin.InterApplicationBus.subscribe({ uuid: '*' }, guid, (intentResult) => {
+            resolve(intentResult);
+        }).catch(() => {
+            // not supported in web, suppress the error
+            if (interopModule.wire.environment.type === 'other') {
+                resolve(undefined);
+            }
+            reject(new Error('getResult is not supported in this environment'));
+        });
+    });
+    // Set up the getResult call.
+    const getResult = async () => {
+        let intentResult = await getResultPromise;
+        // void / no payload, or web path where subscribe resolves undefined (see getResultPromise above)
+        if (intentResult == null) {
+            return undefined;
+        }
+        if (typeof intentResult !== 'object') {
+            throw new Error(ResultError.NoResultReturned);
+        }
+        const { error } = intentResult;
+        if (error) {
+            throw new Error(ResultError.IntentHandlerRejected);
+        }
+        if (isChannel(intentResult)) {
+            const { id, type } = intentResult;
+            switch (type) {
+                case 'private': {
+                    intentResult = await connectPrivateChannel(id);
+                    break;
+                }
+                case 'app': {
+                    const sessionContextGroup = await interopModule.joinSessionContextGroup(id);
+                    intentResult = createV2Channel(sessionContextGroup);
+                    break;
+                }
+            }
+        }
+        else if (!isContext(intentResult)) {
+            throw new Error(ResultError.NoResultReturned);
+        }
+        return intentResult;
+    };
+    // Finally fire the intent.
+    const intentResolutionInfoFromBroker = intent
+        ? await interopModule.fireIntent(intentObj)
+        : await interopModule.fireIntentForContext(intentObj);
+    if (typeof intentResolutionInfoFromBroker !== 'object') {
+        return {
+            source: {
+                appId: '',
+                instanceId: ''
+            },
+            intent: '',
+            version: '2.0',
+            getResult
+        };
+    }
+    return { ...intentResolutionInfoFromBroker, getResult };
+};
 
-var __classPrivateFieldSet$4 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+(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");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet$4 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+(undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _EmitterBase_emitterAccessor, _EmitterBase_deregisterOnceListeners;
-Object.defineProperty(base, "__esModule", { value: true });
-base.Reply = base.EmitterBase = base.Base = void 0;
 class Base {
     /**
      * @internal
@@ -537,236 +429,20 @@ class Base {
         return this.wire.me;
     }
 }
-base.Base = Base;
-/**
- * An entity that emits OpenFin events.
- *
- * @remarks Event-binding methods are asynchronous as they must cross process boundaries
- * and setup the listener in the browser process.  When the `EventEmitter` receives an event from the browser process
- * and emits on the renderer, all of the functions attached to that specific event are called synchronously.  Any values
- * returned by the called listeners are ignored and will be discarded.  If the execution context of the window is destroyed
- * by page navigation or reload, any events that have been setup in that context will be destroyed.
- *
- * It is important to keep in mind that when an ordinary listener function is called, the standard `this` keyword is intentionally
- * set to reference the `EventEmitter` instance to which the listener is attached.  It is possible to use ES6 Arrow Functions as
- * listeners, however, when doing so, the `this` keyword will no longer reference the `EventEmitter` instance.
- *
- * Events re-propagate from smaller/more-local scopes to larger/more-global scopes.  For example, an event emitted on a specific
- * view will propagate to the window in which the view is embedded, and then to the application in which the window is running, and
- * finally to the OpenFin runtime itself at the "system" level.  Re-propagated events are prefixed with the name of the scope in which
- * they originated - for example, a "shown" event emitted on a view will be re-propagated at the window level as "view-shown", and
- * then to the application as "window-view-shown", and finally at the system level as "application-window-view-shown".
- *
- * All event propagations are visible at the System level, regardless of source, so transitive re-propagations (e.g. from view to window
- * to application) are visible in their entirety at the system level.  So, we can listen to the above event as "shown", "view-shown",
- * "window-view-shown", or "application-window-view-shown."
- */
-class EmitterBase extends Base {
-    constructor(wire, topic, ...additionalAccessors) {
-        super(wire);
-        this.topic = topic;
-        _EmitterBase_emitterAccessor.set(this, void 0);
-        _EmitterBase_deregisterOnceListeners.set(this, void 0);
-        this.eventNames = () => (this.hasEmitter() ? this.getOrCreateEmitter().eventNames() : []);
-        /**
-         * @internal
-         */
-        this.emit = (eventType, payload, ...args) => {
-            return this.hasEmitter() ? this.getOrCreateEmitter().emit(eventType, payload, ...args) : false;
-        };
-        this.hasEmitter = () => this.wire.eventAggregator.has(__classPrivateFieldGet$4(this, _EmitterBase_emitterAccessor, "f"));
-        this.getOrCreateEmitter = () => {
-            return this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$4(this, _EmitterBase_emitterAccessor, "f"));
-        };
-        this.listeners = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(type) : [];
-        this.listenerCount = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listenerCount(type) : 0;
-        this.registerEventListener = async (eventType, options = {}, applySubscription, undoSubscription) => {
-            const runtimeEvent = {
-                ...this.identity,
-                timestamp: options.timestamp || Date.now(),
-                topic: this.topic,
-                type: eventType
-            };
-            const emitter = this.getOrCreateEmitter();
-            // We apply the subscription and then undo if the async call fails to avoid
-            // indeterminacy in subscription application order, which can break things elsewhere
-            applySubscription(emitter);
-            try {
-                await this.wire.sendAction('subscribe-to-desktop-event', runtimeEvent);
-            }
-            catch (e) {
-                undoSubscription(emitter);
-                this.deleteEmitterIfNothingRegistered(emitter);
-                throw e;
-            }
-        };
-        this.deregisterEventListener = async (eventType, options = {}) => {
-            if (this.hasEmitter()) {
-                const runtimeEvent = {
-                    ...this.identity,
-                    timestamp: options.timestamp || Date.now(),
-                    topic: this.topic,
-                    type: eventType
-                };
-                await this.wire.sendAction('unsubscribe-to-desktop-event', runtimeEvent).catch(() => null);
-                return this.getOrCreateEmitter();
-            }
-            // This will only be reached if unsubscribe from event that does not exist but do not want to error here
-            return Promise.resolve();
-        };
-        __classPrivateFieldSet$4(this, _EmitterBase_emitterAccessor, [topic, ...additionalAccessors], "f");
-        __classPrivateFieldSet$4(this, _EmitterBase_deregisterOnceListeners, new WeakMap(), "f");
-    }
-    /**
-     * Adds a listener to the end of the listeners array for the specified event.
-     *
-     * @remarks Event payloads are documented in the {@link OpenFin.Events} namespace.
-     */
-    async on(eventType, listener, options) {
-        await this.registerEventListener(eventType, options, (emitter) => {
-            emitter.on(eventType, listener);
-        }, (emitter) => {
-            emitter.removeListener(eventType, listener);
-        });
-        return this;
-    }
-    /**
-     * Adds a listener to the end of the listeners array for the specified event.
-     */
-    async addListener(eventType, listener, options) {
-        return this.on(eventType, listener, options);
-    }
-    /**
-     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired, after which it is removed.
-     *
-     * @remarks Event payloads are documented in the {@link OpenFin.Events} namespace.
-     */
-    async once(eventType, listener, options) {
-        const deregister = () => this.deregisterEventListener(eventType);
-        __classPrivateFieldGet$4(this, _EmitterBase_deregisterOnceListeners, "f").set(listener, deregister);
-        await this.registerEventListener(eventType, options, (emitter) => {
-            emitter.once(eventType, deregister);
-            emitter.once(eventType, listener);
-        }, (emitter) => {
-            emitter.removeListener(eventType, deregister);
-            emitter.removeListener(eventType, listener);
-        });
-        return this;
-    }
-    /**
-     * Adds a listener to the beginning of the listeners array for the specified event.
-     *
-     * @remarks Event payloads are documented in the {@link OpenFin.Events} namespace.
-     */
-    async prependListener(eventType, listener, options) {
-        await this.registerEventListener(eventType, options, (emitter) => {
-            emitter.prependListener(eventType, listener);
-        }, (emitter) => {
-            emitter.removeListener(eventType, listener);
-        });
-        return this;
-    }
-    /**
-     * Adds a one time listener for the event. The listener is invoked only the first time the event is fired,
-     * after which it is removed. The listener is added to the beginning of the listeners array.
-     *
-     * @remarks Event payloads are documented in the {@link OpenFin.Events} namespace.
-     */
-    async prependOnceListener(eventType, listener, options) {
-        const deregister = () => this.deregisterEventListener(eventType);
-        __classPrivateFieldGet$4(this, _EmitterBase_deregisterOnceListeners, "f").set(listener, deregister);
-        await this.registerEventListener(eventType, options, (emitter) => {
-            emitter.prependOnceListener(eventType, listener);
-            emitter.once(eventType, deregister);
-        }, (emitter) => {
-            emitter.removeListener(eventType, listener);
-            emitter.removeListener(eventType, deregister);
-        });
-        return this;
-    }
-    /**
-     * Remove a listener from the listener array for the specified event.
-     *
-     * @remarks Caution: Calling this method changes the array indices in the listener array behind the listener.
-     */
-    async removeListener(eventType, listener, options) {
-        const emitter = await this.deregisterEventListener(eventType, options);
-        if (emitter) {
-            emitter.removeListener(eventType, listener);
-            const deregister = __classPrivateFieldGet$4(this, _EmitterBase_deregisterOnceListeners, "f").get(listener);
-            if (deregister) {
-                emitter.removeListener(eventType, deregister);
-            }
-            this.deleteEmitterIfNothingRegistered(emitter);
-        }
-        return this;
-    }
-    async deregisterAllListeners(eventType) {
-        const runtimeEvent = { ...this.identity, type: eventType, topic: this.topic };
-        if (this.hasEmitter()) {
-            const emitter = this.getOrCreateEmitter();
-            const refCount = emitter.listenerCount(runtimeEvent.type);
-            const unsubscribePromises = [];
-            for (let i = 0; i < refCount; i++) {
-                unsubscribePromises.push(this.wire.sendAction('unsubscribe-to-desktop-event', runtimeEvent).catch(() => null));
-            }
-            await Promise.all(unsubscribePromises);
-            return emitter;
-        }
-        return undefined;
-    }
-    /**
-     * Removes all listeners, or those of the specified event.
-     *
-     */
-    async removeAllListeners(eventType) {
-        const removeByEvent = async (event) => {
-            const emitter = await this.deregisterAllListeners(event);
-            if (emitter) {
-                emitter.removeAllListeners(event);
-                this.deleteEmitterIfNothingRegistered(emitter);
-            }
-        };
-        if (eventType) {
-            await removeByEvent(eventType);
-        }
-        else if (this.hasEmitter()) {
-            const events = this.getOrCreateEmitter().eventNames();
-            await Promise.all(events.map(removeByEvent));
-        }
-        return this;
-    }
-    deleteEmitterIfNothingRegistered(emitter) {
-        // TODO: maybe emitterMap should clean up itself..
-        if (emitter.eventNames().length === 0) {
-            this.wire.eventAggregator.delete(__classPrivateFieldGet$4(this, _EmitterBase_emitterAccessor, "f"));
-        }
-    }
-}
-base.EmitterBase = EmitterBase;
-_EmitterBase_emitterAccessor = new WeakMap(), _EmitterBase_deregisterOnceListeners = new WeakMap();
-class Reply {
-}
-base.Reply = Reply;
 
-var SessionContextGroupClient$1 = {};
-
-var __classPrivateFieldSet$3 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+var __classPrivateFieldSet$3 = (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");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet$3 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+var __classPrivateFieldGet$3 = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _SessionContextGroupClient_clientPromise;
-Object.defineProperty(SessionContextGroupClient$1, "__esModule", { value: true });
-const base_1$1 = base;
-const utils_1$4 = utils$2;
-class SessionContextGroupClient extends base_1$1.Base {
+class SessionContextGroupClient extends Base {
     constructor(wire, client, id) {
         super(wire);
         _SessionContextGroupClient_clientPromise.set(this, void 0);
@@ -809,12 +485,12 @@ class SessionContextGroupClient extends base_1$1.Base {
         const client = await __classPrivateFieldGet$3(this, _SessionContextGroupClient_clientPromise, "f");
         let handlerId;
         if (contextType) {
-            handlerId = `sessionContextHandler:invoke-${this.id}-${contextType}-${(0, utils_1$4.generateId)()}`;
+            handlerId = `sessionContextHandler:invoke-${this.id}-${contextType}-${generateId()}`;
         }
         else {
             handlerId = `sessionContextHandler:invoke-${this.id}`;
         }
-        client.register(handlerId, (0, utils_1$4.wrapContextHandler)(contextHandler, handlerId));
+        client.register(handlerId, wrapContextHandler(contextHandler, handlerId));
         await client.dispatch(`sessionContextGroup:handlerAdded-${this.id}`, { handlerId, contextType });
         return { unsubscribe: await this.createUnsubscribeCb(handlerId) };
     }
@@ -828,31 +504,26 @@ class SessionContextGroupClient extends base_1$1.Base {
     getUserInstance() {
         return {
             id: this.id,
-            setContext: (0, utils_1$4.wrapInTryCatch)(this.setContext.bind(this), 'Failed to set context: '),
-            getCurrentContext: (0, utils_1$4.wrapInTryCatch)(this.getCurrentContext.bind(this), 'Failed to get context: '),
-            addContextHandler: (0, utils_1$4.wrapInTryCatch)(this.addContextHandler.bind(this), 'Failed to add context handler: ')
+            setContext: wrapInTryCatch(this.setContext.bind(this), 'Failed to set context: '),
+            getCurrentContext: wrapInTryCatch(this.getCurrentContext.bind(this), 'Failed to get context: '),
+            addContextHandler: wrapInTryCatch(this.addContextHandler.bind(this), 'Failed to add context handler: ')
         };
     }
 }
-SessionContextGroupClient$1.default = SessionContextGroupClient;
 _SessionContextGroupClient_clientPromise = new WeakMap();
 
-var channelEvents = {};
-
-var __classPrivateFieldSet$2 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+var __classPrivateFieldSet$2 = (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");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet$2 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+var __classPrivateFieldGet$2 = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _a, _ChannelEvents_channelClient, _ChannelEvents_isChannelReady, _ChannelEvents_actionsByClient, _ChannelEvents_getActions, _ChannelEvents_createRegistration, _ChannelEvents_getRegistration, _ChannelEvents_getOrCreateRegistration;
-Object.defineProperty(channelEvents, "__esModule", { value: true });
-channelEvents.ChannelEvents = void 0;
 /**
  * Channel events creates a event like syntax out of a channel action, allowing multiple events to be triggered
  * from a single action (normally only one callback can be created per action).
@@ -960,7 +631,6 @@ class ChannelEvents {
         });
     }
 }
-channelEvents.ChannelEvents = ChannelEvents;
 _a = ChannelEvents, _ChannelEvents_channelClient = new WeakMap(), _ChannelEvents_isChannelReady = new WeakMap(), _ChannelEvents_getActions = new WeakMap(), _ChannelEvents_createRegistration = new WeakMap(), _ChannelEvents_getRegistration = new WeakMap(), _ChannelEvents_getOrCreateRegistration = new WeakMap();
 /**
  * Static map of actions by channel client. This ensures we can reuse the same event and keep track of all its callbacks.
@@ -970,27 +640,18 @@ _a = ChannelEvents, _ChannelEvents_channelClient = new WeakMap(), _ChannelEvents
  */
 _ChannelEvents_actionsByClient = { value: new WeakMap() };
 
-var __classPrivateFieldSet$1 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+var __classPrivateFieldSet$1 = (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");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet$1 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+var __classPrivateFieldGet$1 = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 __importDefault$1 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _InteropClient_clientPromise, _InteropClient_sessionContextGroups, _InteropClient_fdc3Factory, _InteropClient_channelEvents;
-Object.defineProperty(InteropClient$1, "__esModule", { value: true });
-InteropClient$1.InteropClient = void 0;
-const base_1 = base;
-const SessionContextGroupClient_1 = __importDefault$1(SessionContextGroupClient$1);
-const utils_1$3 = utils$2;
-const channel_events_1 = channelEvents;
 /**
  * The Interop Client API is broken up into two groups:
  *
@@ -1040,7 +701,7 @@ const channel_events_1 = channelEvents;
  *  * {@link InteropClient#getAllClientsInContextGroup getAllClientsInContextGroup(contextGroupId)}
  *
  */
-class InteropClient extends base_1.Base {
+class InteropClient extends Base {
     /**
      * @internal
      */
@@ -1084,7 +745,7 @@ class InteropClient extends base_1.Base {
         __classPrivateFieldSet$1(this, _InteropClient_sessionContextGroups, new Map(), "f");
         __classPrivateFieldSet$1(this, _InteropClient_clientPromise, clientPromise, "f");
         __classPrivateFieldSet$1(this, _InteropClient_fdc3Factory, fdc3Factory, "f");
-        __classPrivateFieldSet$1(this, _InteropClient_channelEvents, new channel_events_1.ChannelEvents(clientPromise), "f");
+        __classPrivateFieldSet$1(this, _InteropClient_channelEvents, new ChannelEvents(clientPromise), "f");
     }
     /**
      * Sets a context for the context group of the current entity.
@@ -1179,12 +840,12 @@ class InteropClient extends base_1.Base {
         const client = await __classPrivateFieldGet$1(this, _InteropClient_clientPromise, "f");
         let handlerId;
         if (contextType) {
-            handlerId = `invokeContextHandler-${contextType}-${(0, utils_1$3.generateId)()}`;
+            handlerId = `invokeContextHandler-${contextType}-${generateId()}`;
         }
         else {
             handlerId = 'invokeContextHandler';
         }
-        const wrappedHandler = (0, utils_1$3.wrapContextHandler)(handler, handlerId);
+        const wrappedHandler = wrapContextHandler(handler, handlerId);
         client.register(handlerId, wrappedHandler);
         await client.dispatch('contextHandlerRegistered', { handlerId, contextType });
         return {
@@ -1381,7 +1042,7 @@ class InteropClient extends base_1.Base {
         });
         const client = await __classPrivateFieldGet$1(this, _InteropClient_clientPromise, "f");
         const handlerId = `intent-handler-${intentName}`;
-        const wrappedHandler = (0, utils_1$3.wrapIntentHandler)(handler, handlerId);
+        const wrappedHandler = wrapIntentHandler(handler, handlerId);
         try {
             await client.register(handlerId, wrappedHandler);
             await client.dispatch('intentHandlerRegistered', { handlerId, ...options });
@@ -1548,7 +1209,7 @@ class InteropClient extends base_1.Base {
             if (hasConflict) {
                 console.warn(`A (non-session) context group with the name "${sessionContextGroupId}" already exists. If you are trying to join a Context Group, call joinContextGroup instead.`);
             }
-            const newSessionContextGroup = new SessionContextGroupClient_1.default(this.wire, __classPrivateFieldGet$1(this, _InteropClient_clientPromise, "f"), sessionContextGroupId);
+            const newSessionContextGroup = new SessionContextGroupClient(this.wire, __classPrivateFieldGet$1(this, _InteropClient_clientPromise, "f"), sessionContextGroupId);
             __classPrivateFieldGet$1(this, _InteropClient_sessionContextGroups, "f").set(sessionContextGroupId, newSessionContextGroup);
             return newSessionContextGroup.getUserInstance();
         }
@@ -1598,30 +1259,20 @@ class InteropClient extends base_1.Base {
         return client.dispatch(action, payload || null);
     }
 }
-InteropClient$1.InteropClient = InteropClient;
 _InteropClient_clientPromise = new WeakMap(), _InteropClient_sessionContextGroups = new WeakMap(), _InteropClient_fdc3Factory = new WeakMap(), _InteropClient_channelEvents = new WeakMap();
 
-var __classPrivateFieldGet = (commonjsGlobal && commonjsGlobal.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+var __classPrivateFieldGet = (undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 __classPrivateFieldSet = (commonjsGlobal && commonjsGlobal.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+var __classPrivateFieldSet = (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");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __importDefault = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _FDC3ModuleBase_producer;
-Object.defineProperty(fdc3Common, "__esModule", { value: true });
-fdc3Common.FDC3ModuleBase = void 0;
-const utils_1$2 = utils$1;
-const utils_2$1 = utils$2;
-const InteropClient_1$1 = InteropClient$1;
-const isEqual_1 = __importDefault(require$$0);
 class FDC3ModuleBase {
     get client() {
         return __classPrivateFieldGet(this, _FDC3ModuleBase_producer, "f").call(this);
@@ -1643,9 +1294,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);
     }
     /**
@@ -1656,14 +1305,12 @@ 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$1.InteropClient.ferryFdc3Call(this.client, 'fdc3Open', { app, context });
+            return await InteropClient.ferryFdc3Call(this.client, 'fdc3Open', { app, context });
         }
         catch (error) {
-            const errorToThrow = error.message === utils_2$1.BROKER_ERRORS.fdc3Open ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.fdc3Open ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -1672,7 +1319,7 @@ class FDC3ModuleBase {
         // fdc3 implementation of getSystemChannels returns an array of channels, have to decorate over
         // this so people know that these APIs are not supported
         return channels.map((channel) => {
-            return { ...channel, type: 'system', ...(0, utils_1$2.getUnsupportedChannelApis)() };
+            return { ...channel, type: 'system', ...getUnsupportedChannelApis() };
         });
     }
     /**
@@ -1682,19 +1329,17 @@ 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
-        });
-        const hasChannelIdBeenUsed = await InteropClient_1$1.InteropClient.ferryFdc3Call(this.client, 'isIdUsedByPrivateChannel', {
+        this.wire.recordAnalytic('fdc3-get-or-create-channel');
+        const hasChannelIdBeenUsed = await InteropClient.ferryFdc3Call(this.client, 'isIdUsedByPrivateChannel', {
             channelId
         });
         if (hasChannelIdBeenUsed) {
-            throw new Error(utils_1$2.ChannelError.AccessDenied);
+            throw new Error(ChannelError.AccessDenied);
         }
         const systemChannels = await this._getChannels();
         const userChannel = systemChannels.find((channel) => channel.id === channelId);
         if (userChannel) {
-            return { ...userChannel, type: 'system', ...(0, utils_1$2.getUnsupportedChannelApis)() };
+            return { ...userChannel, type: 'system', ...getUnsupportedChannelApis() };
         }
         try {
             const sessionContextGroup = await this.client.joinSessionContextGroup(channelId);
@@ -1702,7 +1347,7 @@ class FDC3ModuleBase {
         }
         catch (error) {
             console.error(error.message);
-            throw new Error(utils_1$2.ChannelError.CreationFailed);
+            throw new Error(ChannelError.CreationFailed);
         }
     }
     /**
@@ -1712,9 +1357,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();
     }
     /**
@@ -1729,23 +1372,21 @@ 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);
         }
         catch (error) {
-            if (error.message === utils_2$1.BROKER_ERRORS.joinSessionContextGroupWithJoinContextGroup) {
+            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.startsWith('Attempting to join a context group that does not exist')) {
-                throw new Error(utils_1$2.ChannelError.NoChannelFound);
+                throw new Error(ChannelError.NoChannelFound);
             }
-            throw new Error(utils_1$2.ChannelError.AccessDenied);
+            throw new Error(ChannelError.AccessDenied);
         }
     }
     /**
@@ -1754,9 +1395,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;
@@ -1771,9 +1410,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
@@ -1816,7 +1453,7 @@ class FDC3ModuleBase {
                     const wrappedHandler = (context, contextMetadata) => {
                         if (first) {
                             first = false;
-                            if ((0, isEqual_1.default)(currentContext, context)) {
+                            if (esToolkit.isEqual(currentContext, context)) {
                                 return;
                             }
                         }
@@ -1841,14 +1478,8 @@ class FDC3ModuleBase {
         };
     }
 }
-fdc3Common.FDC3ModuleBase = FDC3ModuleBase;
 _FDC3ModuleBase_producer = new WeakMap();
 
-Object.defineProperty(fdc31_2, "__esModule", { value: true });
-exports.Fdc3Module = fdc31_2.Fdc3Module = void 0;
-const utils_1$1 = utils$2;
-const fdc3_common_1$1 = fdc3Common;
-const fdc3_channels_1_2_1 = fdc3Channels1_2;
 /**
  * @version 1.2
  * The FDC3 Client Library provides a set APIs to be used for FDC3 compliance,
@@ -1884,7 +1515,7 @@ const fdc3_channels_1_2_1 = fdc3Channels1_2;
  * }
  * ```
  */
-class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
+class Fdc3Module extends FDC3ModuleBase {
     async open(app, context) {
         // eslint-disable-next-line no-underscore-dangle
         await super._open(app, context);
@@ -1899,9 +1530,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)');
@@ -1924,9 +1553,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;
@@ -1954,9 +1581,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 };
@@ -1964,7 +1589,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
             return await this.client.fireIntent(intentObj);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1$1.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -1976,14 +1601,12 @@ 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 });
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1$1.BROKER_ERRORS.getInfoForIntent ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.getInfoForIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -1994,14 +1617,12 @@ 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);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1$1.BROKER_ERRORS.getInfoForIntentsByContext ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.getInfoForIntentsByContext ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -2013,14 +1634,12 @@ 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 } });
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1$1.BROKER_ERRORS.fireIntentForContext ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.fireIntentForContext ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -2031,7 +1650,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.getOrCreateChannel
      */
     async getOrCreateChannel(channelId) {
-        return super.getOrCreateChannel(channelId, fdc3_channels_1_2_1.createV1Channel);
+        return super.getOrCreateChannel(channelId, createV1Channel);
     }
     /**
      * Returns metadata relating to the FDC3 object and its provider, including the supported version of the FDC3 specification and the name of the provider of the implementation.
@@ -2039,9 +1658,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,
@@ -2050,20 +1667,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
         };
     }
 }
-exports.Fdc3Module = fdc31_2.Fdc3Module = Fdc3Module;
-
-var fdc3 = {};
 
-var fdc32_0 = {};
-
-Object.defineProperty(fdc32_0, "__esModule", { value: true });
-exports.Fdc3Module2 = fdc32_0.Fdc3Module2 = void 0;
-const fdc3_common_1 = fdc3Common;
-const utils_1 = utils$2;
-const InteropClient_1 = InteropClient$1;
-const utils_2 = utils$1;
-const PrivateChannelClient_1 = PrivateChannelClient$1;
-const fdc3_channels_2_0_1 = fdc3Channels2_0;
 /**
  * @version 2.0
  * The FDC3 Client Library provides a set APIs to be used for FDC3 compliance,
@@ -2099,7 +1703,7 @@ const fdc3_channels_2_0_1 = fdc3Channels2_0;
  * }
  * ```
  */
-class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
+class Fdc3Module2 extends FDC3ModuleBase {
     /**
      * Launches an app, specified via an AppIdentifier object.
      * @param app
@@ -2121,14 +1725,12 @@ 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.InteropClient.ferryFdc3Call(this.client, 'fdc3FindInstances', app);
+            return await InteropClient.ferryFdc3Call(this.client, 'fdc3FindInstances', app);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fdc3FindInstances ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.fdc3FindInstances ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -2139,14 +1741,12 @@ 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.InteropClient.ferryFdc3Call(this.client, 'fdc3GetAppMetadata', app);
+            return await InteropClient.ferryFdc3Call(this.client, 'fdc3GetAppMetadata', app);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fdc3GetAppMetadata ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.fdc3GetAppMetadata ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -2159,9 +1759,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) => {
@@ -2190,14 +1788,12 @@ 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 } });
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.getInfoForIntent ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.getInfoForIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -2209,15 +1805,13 @@ 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.InteropClient.ferryFdc3Call(this.client, 'fdc3v2FindIntentsByContext', payload);
+            return await InteropClient.ferryFdc3Call(this.client, 'fdc3v2FindIntentsByContext', payload);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.getInfoForIntentsByContext ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.getInfoForIntentsByContext ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -2230,17 +1824,15 @@ 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 }).');
             }
-            return (0, utils_2.getIntentResolution)(this.client, context, app, intent);
+            return getIntentResolution(this.client, context, app, intent);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -2253,17 +1845,15 @@ 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 }).');
             }
-            return (0, utils_2.getIntentResolution)(this.client, context, app);
+            return getIntentResolution(this.client, context, app);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
+            const errorToThrow = error.message === BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -2275,9 +1865,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');
         }
@@ -2315,7 +1903,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3.getOrCreateChannel
      */
     async getOrCreateChannel(channelId) {
-        return super.getOrCreateChannel(channelId, fdc3_channels_2_0_1.createV2Channel);
+        return super.getOrCreateChannel(channelId, createV2Channel);
     }
     /**
      * Returns a Channel with an auto-generated identity that is intended for private communication between applications. Primarily used to create channels that will be returned to other applications via an IntentResolution for a raised intent.
@@ -2323,11 +1911,11 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.createPrivateChannel
      */
     async createPrivateChannel() {
-        const channelId = (0, utils_1.generateId)();
-        await InteropClient_1.InteropClient.ferryFdc3Call(this.client, 'createPrivateChannelProvider', { channelId });
+        const channelId = generateId();
+        await InteropClient.ferryFdc3Call(this.client, 'createPrivateChannelProvider', { channelId });
         const channelClient = await this.fin.InterApplicationBus.Channel.connect(channelId);
-        const newPrivateChannelClient = new PrivateChannelClient_1.PrivateChannelClient(channelClient, channelId);
-        return (0, utils_2.buildPrivateChannelObject)(newPrivateChannelClient);
+        const newPrivateChannelClient = new PrivateChannelClient(channelClient, channelId);
+        return buildPrivateChannelObject(newPrivateChannelClient);
     }
     /**
      * Retrieves a list of the User Channels available for the app to join.
@@ -2340,7 +1928,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
         // this so people know that these APIs are not supported
         return channels.map((channel) => {
             // @ts-expect-error TODO [CORE-1524]
-            return { ...channel, type: 'user', ...(0, utils_2.getUnsupportedChannelApis)('User') };
+            return { ...channel, type: 'user', ...getUnsupportedChannelApis('User') };
         });
     }
     /**
@@ -2396,40 +1984,34 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.getInfo
      */
     async getInfo() {
-        return InteropClient_1.InteropClient.ferryFdc3Call(this.client, 'fdc3v2GetInfo', { fdc3Version: '2.0' });
+        return InteropClient.ferryFdc3Call(this.client, 'fdc3v2GetInfo', { fdc3Version: '2.0' });
     }
 }
-exports.Fdc3Module2 = fdc32_0.Fdc3Module2 = Fdc3Module2;
 
-(function (exports) {
-	Object.defineProperty(exports, "__esModule", { value: true });
-	exports.getFdc3 = exports.versionMap = void 0;
-	/* eslint-disable no-console */
-	/* eslint-disable no-param-reassign */
-	/* eslint-disable @typescript-eslint/no-non-null-assertion */
-	const fdc3_1_2_1 = fdc31_2;
-	const fdc3_2_0_1 = fdc32_0;
-	exports.versionMap = {
-	    '1.2': fdc3_1_2_1.Fdc3Module,
-	    '2.0': fdc3_2_0_1.Fdc3Module2
-	};
-	const latestVersion = '2.0';
-	function getFdc3(transport, version = latestVersion) {
-	    if (!(version in exports.versionMap)) {
-	        console.warn(`FDC3 API version: ${version} is not supported. Defaulting to latest version: ${latestVersion}.`);
-	        version = latestVersion;
-	    }
-	    const Fdc3Api = exports.versionMap[version];
-	    const fdc3 = new Fdc3Api(() => transport.getFin().me.interop, transport);
-	    window.dispatchEvent(new CustomEvent('fdc3Ready'));
-	    return fdc3;
-	}
-	exports.getFdc3 = getFdc3; 
-} (fdc3));
+/* eslint-disable no-console */
+/* eslint-disable no-param-reassign */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+const versionMap = {
+    '1.2': Fdc3Module,
+    '2.0': Fdc3Module2
+};
+const latestVersion = '2.0';
+function getFdc3(transport, version = latestVersion) {
+    if (!(version in versionMap)) {
+        console.warn(`FDC3 API version: ${version} is not supported. Defaulting to latest version: ${latestVersion}.`);
+        version = latestVersion;
+    }
+    const Fdc3Api = versionMap[version];
+    const fdc3 = new Fdc3Api(() => transport.getFin().me.interop, transport);
+    window.dispatchEvent(new CustomEvent('fdc3Ready'));
+    return fdc3;
+}
 
 async function fdc3FromFin(fin, { fdc3Version } = { fdc3Version: '2.0' }) {
     // @ts-expect-error
-    return fdc3.getFdc3(fin.wire, fdc3Version);
+    return getFdc3(fin.wire, fdc3Version);
 }
 
+exports.Fdc3Module = Fdc3Module;
+exports.Fdc3Module2 = Fdc3Module2;
 exports.fdc3FromFin = fdc3FromFin;