@openfin/core 30.73.23 → 30.73.24

package/src/api/interop/InteropBroker.js

@@ -4,6 +4,7 @@ exports.InteropBroker = void 0;
 const base_1 = require("../base");
 const SessionContextGroupBroker_1 = require("./SessionContextGroupBroker");
 const utils_1 = require("./utils");
+const lodash_1 = require("lodash");
 let contextGroups = [
     {
         id: 'green',
@@ -49,7 +50,7 @@ let contextGroups = [
     }
 ];
 /**
- * {@link https://developers.openfin.co/of-docs/docs/enable-color-linking **THE INTEROP API IS EXPERIMENTAL. IF YOU WOULD LIKE TO USE IT, PLEASE USE OUR DEFAULT IMPLEMENTATION IN BROWSER**}
+ * {@link https://developers.openfin.co/of-docs/docs/enable-color-linking}
  *
  * The Interop Broker is responsible for keeping track of the Interop state of the Platform, and for directing messages to the proper locations.
  *
@@ -147,7 +148,7 @@ let contextGroups = [
  *         };
  *         return new Override();
  *     },
- *     interopOverride: async (InteropBroker, provider, options, ...args) => {
+ *     interopOverride: async (InteropBroker) => {
  *         class Override extends InteropBroker {
  *             async joinContextGroup(channelName = 'default', target) {
  *                 console.log('before super joinContextGroup')
@@ -156,37 +157,7 @@ let contextGroups = [
  *             }
  *         }
  *
- *         options.contextGroups = [
- *             {
- *                 id: 'green',
- *                 displayMetadata: {
- *                     color: '#00CC88',
- *                     name: 'green'
- *                 }
- *             },
- *             {
- *                 id: 'purple',
- *                 displayMetadata: {
- *                     color: '#8C61FF',
- *                     name: 'purple'
- *                 }
- *             },
- *             {
- *                 id: 'orange',
- *                 displayMetadata: {
- *                     color: '#FF8C4C',
- *                     name: 'orange'
- *                 }
- *             },
- *             {
- *                 id: 'red',
- *                 displayMetadata: {
- *                     color: '#FF5E60',
- *                     name: 'red'
- *                 }
- *             }
- *         ];
- *       return new Override(provider, options, ...args);
+ *       return new Override();
  *   }
  * });
  * ```
@@ -198,6 +169,7 @@ let contextGroups = [
  */
 class InteropBroker extends base_1.Base {
     constructor(wire, getProvider, options) {
+        // Tip from Pierre and Michael from the overrideCheck work: Don't use bound methods for overrideable InteropBroker functions.
         super(wire);
         this.getProvider = getProvider;
         this.interopClients = new Map();
@@ -214,46 +186,73 @@ class InteropBroker extends base_1.Base {
         this.setContextGroupMap();
         this.setupChannelProvider();
     }
+    static createClosedConstructor(...args) {
+        return class OverrideableBroker extends InteropBroker {
+            constructor(...unused) {
+                if (unused.length) {
+                    const [_ignore1, ignore2, opts] = unused;
+                    if (opts && typeof opts === 'object' && !(0, lodash_1.isEqual)(opts, args[2])) {
+                        // eslint-disable-next-line no-console
+                        console.warn('You have modified the parameters of the InteropOverride constructor. This behavior is deprecated and will be removed in a future version. You can modify these options in your manifest. Please consult our Interop docs for guidance on migrating to the new override scheme.');
+                        super(args[0], args[1], opts);
+                        return;
+                    }
+                    // eslint-disable-next-line no-console
+                    console.warn('You are attempting to pass arguments to the InteropOverride constructor. This is not necessary, and these passed arguments will be ignored. You are likely using an older InteropBroker override scheme. Please consult our Interop docs for guidance on migrating to the new override scheme.');
+                }
+                super(...args);
+            }
+        };
+    }
     /*
     Client API
     */
     /**
+     * @REMOVED
      * SetContextOptions interface
      * @typedef { object } SetContextOptions
      * @property { Context } {context} - New context to set.
      */
     /**
+     * @REMOVED
      * GetContextOptions interface
      * @typedef { object } GetContextOptions
      * @property { string } [contextType] - Context Type
      */
+    // TODO: extract inline type and do proper comments
     /**
+     * @REMOVED
      * JoinContextGroupOptions interface
      * @typedef { object } JoinContextGroupOptions
      * @property { string } contextGroupId - Id of the context group.
      * @property { Identity | ClientIdentity } [target] - Identity of the entity you wish to join to a context group.
      */
     /**
+     * @REMOVED
      * AddClientToContextGroupOptions interface
      * @typedef { object } AddClientToContextGroupOptions
      * @property { string } contextGroupId - Name of the context group.
      */
     /**
+     * @REMOVED
      * RemoveFromContextGroupOptions interface
      * @typedef { object } RemoveFromContextGroupOptions
      * @property { Identity | ClientIdentity } target - Identity of the entity you wish to join to a context group.
      */
     /**
+     * @REMOVED
      * GetInfoForContextGroupOptions interface
      * @typedef { object } GetInfoForContextGroupOptions
      * @property { string } contextGroupId - Name of the context group to get info for.
      */
     /**
+     * @REMOVED
      * GetAllClientsInContextGroupOptions interface
      * @typedef { object } GetAllClientsInContextGroupOptions
      * @property { string } contextGroupId - Name of the context group to get info for.
      */
     /**
+     * @PORTED
      * InfoForIntentOptions interface
      * @typedef { object } InfoForIntentOptions
      * @property { string } name Name of the intent to get info for.
@@ -264,7 +263,6 @@ class InteropBroker extends base_1.Base {
      * @param { SetContextOptions } setContextOptions - New context to set.
      * @param { ClientIdentity } clientIdentity - Identity of the client sender.
      * @return { void }
-     * @experimental
      */
     setContext({ context }, clientIdentity) {
         this.wire.sendAction('interop-broker-set-context').catch((e) => {
@@ -338,7 +336,6 @@ class InteropBroker extends base_1.Base {
      * @return { Promise<void> }
      * @param { JoinContextGroupOptions } joinContextGroupOptions - Id of the Context Group and identity of the entity to join to the group.
      * @param { ClientIdentity } senderIdentity - Identity of the client sender.
-     * @experimental
      */
     async joinContextGroup({ contextGroupId, target }, senderIdentity) {
         this.wire.sendAction('interop-broker-join-context-group').catch((e) => {
@@ -384,7 +381,6 @@ class InteropBroker extends base_1.Base {
      * @return { Promise<void> }
      * @param { AddClientToContextGroupOptions } addClientToContextGroupOptions - Contains the contextGroupId
      * @param { ClientIdentity } clientIdentity - Identity of the client sender.
-     * @experimental
      */
     async addClientToContextGroup({ contextGroupId }, clientIdentity) {
         this.wire.sendAction('interop-broker-add-client-to-context-group').catch((e) => {
@@ -428,7 +424,6 @@ class InteropBroker extends base_1.Base {
      * @return { Promise<void> }
      * @param { RemoveFromContextGroupOptions } removeFromContextGroupOptions - Contains the target identity to remove.
      * @param { ClientIdentity } senderIdentity - Identity of the client sender.
-     * @experimental
      */
     async removeFromContextGroup({ target }, senderIdentity) {
         this.wire.sendAction('interop-broker-remove-from-context-group').catch((e) => {
@@ -469,7 +464,6 @@ class InteropBroker extends base_1.Base {
      * Used by Platform Windows.
      * @return { Promise<void> }
      * @property { ClientIdentity } clientIdentity - Identity of the client sender.
-     * @experimental
      */
     async removeClientFromContextGroup(clientIdentity) {
         this.wire.sendAction('interop-broker-remove-client-from-context-group').catch((e) => {
@@ -486,7 +480,6 @@ class InteropBroker extends base_1.Base {
      * Returns the Interop-Broker-defined context groups available for an entity to join. Because this function is used in the rest of the Interop Broker to fetch the Context Groups, overriding this allows you to customize the Context Groups for the Interop Broker. However, we recommend customizing the context groups through configuration instead.
      * Used by Platform Windows.
      * @return { Promise<ContextGroupInfo[]>}
-     * @experimental
      */
     // eslint-disable-next-line class-methods-use-this
     getContextGroups() {
@@ -504,7 +497,6 @@ class InteropBroker extends base_1.Base {
      * Used by Platform Windows.
      * @param { GetInfoForContextGroupOptions } getInfoForContextGroupOptions - Contains contextGroupId, the context group you wish to get display info for.
      * @return { Promise<ContextGroupInfo>}
-     * @experimental
      */
     getInfoForContextGroup({ contextGroupId }) {
         this.wire.sendAction('interop-broker-get-info-for-context-group').catch((e) => {
@@ -518,7 +510,6 @@ class InteropBroker extends base_1.Base {
      * Used by Platform Windows.
      * @param { GetAllClientsInContextGroupOptions } getAllClientsInContextGroupOptions - Contains contextGroupId, the context group you wish to get clients for.
      * @return { Promise<ClientIdentity[]>}
-     * @experimental
      */
     getAllClientsInContextGroup({ contextGroupId }) {
         this.wire.sendAction('interop-broker-get-all-clients-in-context-group').catch((e) => {
@@ -538,7 +529,6 @@ class InteropBroker extends base_1.Base {
      * @param { ClientIdentity }  clientIdentity Identity of the Client making the request.
      * @return { Promise<unknown> }
      * @tutorial interop.handleFiredIntent
-     * @experimental
      */
     // eslint-disable-next-line class-methods-use-this
     async handleFiredIntent(intent, clientIdentity) {
@@ -552,7 +542,6 @@ class InteropBroker extends base_1.Base {
      * @param { Intent } intent The combination of an action and a context that is passed to an application for resolution.
      * @param { Identity } target - Identity of the target that will handle the intent.
      * @return { Promise<void> }
-     * @experimental
      */
     async setIntentTarget(intent, target) {
         this.wire.sendAction('interop-broker-set-intent-target').catch((e) => {
@@ -596,7 +585,6 @@ class InteropBroker extends base_1.Base {
      * @param { ClientIdentity }  clientIdentity Identity of the Client making the request.
      * @return { Promise<unknown> }
      * @tutorial interop.handleInfoForIntent
-     * @experimental
      */
     // eslint-disable-next-line class-methods-use-this
     async handleInfoForIntent(options, clientIdentity) {
@@ -611,7 +599,6 @@ class InteropBroker extends base_1.Base {
      * @param { ClientIdentity } clientIdentity Identity of the Client making the request.
      * @return { Promise<unknown> }
      * @tutorial interop.handleInfoForIntentsByContext
-     * @experimental
      */
     // eslint-disable-next-line class-methods-use-this
     async handleInfoForIntentsByContext(context, clientIdentity) {
@@ -626,7 +613,6 @@ class InteropBroker extends base_1.Base {
      * @param { ClientIdentity }  clientIdentity Identity of the Client making the request.
      * @return { Promise<unknown> }
      * @tutorial interop.handleFiredIntentForContext
-     * @experimental
      */
     // eslint-disable-next-line class-methods-use-this
     async handleFiredIntentForContext(contextForIntent, clientIdentity) {
@@ -746,7 +732,7 @@ class InteropBroker extends base_1.Base {
      * FDC3 2.0: Use the endpointId in the ClientInfo as the instanceId when generating
      * an AppIdentifier.
      * @return { Promise<Array<ClientInfo>> }
-     * @tutorial interop.getAllClientInfo()
+     * @tutorial interop.getAllClientInfo
      */
     async getAllClientInfo() {
         const provider = await this.getProvider();

package/src/api/interop/InteropClient.d.ts

@@ -2,12 +2,14 @@ import type * as OpenFin from '../../OpenFin';
 import Transport from '../../transport/transport';
 import { Base } from '../base';
 /**
+ * @PORTED
  * @typedef { object } Intent
  * @summary The combination of an action and a context that is passed to an application for resolution.
  * @property { string } name Name of the intent.
  * @property { Context } context Data associated with the intent
  */
 /**
+ * @REMOVED
  * @typedef { object } Subscription
  * @summary Object returned when subscribing a handler.
  * @property { function } unsubscribe Function to unsubscribe the handler.
@@ -21,6 +23,7 @@ import { Base } from '../base';
  * @summary Subscription function for registerIntentHandler
  */
 /**
+ * @PORTED
  * @typedef { object } ClientIdentity
  * @summary The Identity for a Channel Client. Includes endpointId to differentiate between different connections for an entity.
  * @property {string} uuid GUID of an application.
@@ -28,12 +31,14 @@ import { Base } from '../base';
  * @property {string} endpointId Unique differentiator for different Channel connections for an entity.
  */
 /**
+ * @PORTED
  * @typedef { object } ContextGroupInfo
  * @summary Information for a Context Group. Contains metadata for displaying the group properly.
  * @property {string} id Name of the context group
  * @property {DisplayMetadata} displayMetadata Metadata for the Context Group. Contains the group's human-readable name, color, and an image, as defined by the Interop Broker.
  */
 /**
+ * @PORTED
  * @typedef { object } DisplayMetadata
  * @summary The display data for a Context Group.
  * @property {string} name A user-readable name for this context group, e.g: `"Red"`
@@ -41,6 +46,7 @@ import { Base } from '../base';
  * @property {string} [glyph] A URL of an image that can be used to display this context group
  */
 /**
+ * @PORTED
  * @typedef { object } Context
  * @summary Data passed between entities and applications.
  * @property {object} [id] An object containing string key-value pairs for the bulk of the data for the context. Differs between context types.
@@ -48,6 +54,7 @@ import { Base } from '../base';
  * @property {string} type Conserved type for the context (e.g. `instrument` or `country`)
  */
 /**
+ * @REMOVED
  * @typedef { object } ContextForIntent
  * @summary Data passed between entities and applications, including an optional metadata.
  * @property {object} [id] An object containing string key-value pairs for the bulk of the data for the context. Differs between context types.
@@ -56,6 +63,7 @@ import { Base } from '../base';
  * @property {any} [metadata]
  */
 /**
+ * @REMOVED
  * @typedef { object } SessionContextGroup
  * @summary An instance of a SessionContextGroup
  * @property {string} id The SessionContextGroup's id.
@@ -83,7 +91,7 @@ import { Base } from '../base';
  * @return {Promise<void>}
  */
 /**
- * {@link https://developers.openfin.co/of-docs/docs/enable-color-linking **THE INTEROP API IS EXPERIMENTAL. IF YOU WOULD LIKE TO USE IT, PLEASE USE OUR DEFAULT IMPLEMENTATION IN BROWSER**}
+ * {@link https://developers.openfin.co/of-docs/docs/enable-color-linking}
  *
  * The Interop Client API is broken up into two groups:
  *
@@ -207,7 +215,6 @@ export declare class InteropClient extends Base {
      * @param { Intent } intent - The combination of an action and a context that is passed to an application for resolution.
      * @return { Promise<unknown>}
      * @tutorial interop.fireIntent
-     * @experimental
      */
     fireIntent<T = unknown>(intent: OpenFin.Intent): Promise<T>;
     /**
@@ -216,7 +223,6 @@ export declare class InteropClient extends Base {
      * @param { string } intentName - The name of an intent.
      * @return { Promise<Subscription> }
      * @tutorial interop.registerIntentHandler
-     * @experimental
      */
     registerIntentHandler(handler: OpenFin.IntentHandler, intentName: string, options?: any): Promise<{
         unsubscribe: () => Promise<void>;
@@ -227,7 +233,6 @@ export declare class InteropClient extends Base {
      * @param { string } [contextType]
      * @return { Promise<Context> }
      * @tutorial interop.getCurrentContext
-     * @experimental
      */
     getCurrentContext(contextType?: string): Promise<OpenFin.Context>;
     /**
@@ -235,7 +240,6 @@ export declare class InteropClient extends Base {
      * @param { InfoForIntentOptions } options
      * @return { Promise<unknown> }
      * @tutorial interop.getInfoForIntent
-     * @experimental
      */
     getInfoForIntent<T = unknown>(options: OpenFin.InfoForIntentOptions): Promise<T>;
     /**
@@ -243,7 +247,6 @@ export declare class InteropClient extends Base {
      * @param { Context } context
      * @return { Promise<unknown> }
      * @tutorial interop.getInfoForIntentsByContext
-     * @experimental
      */
     getInfoForIntentsByContext<T = unknown>(context: OpenFin.Context): Promise<T>;
     /**
@@ -252,7 +255,6 @@ export declare class InteropClient extends Base {
      * @param { ContextForIntent } context
      * @return { Promise<unknown> }
      * @tutorial interop.fireIntentForContext
-     * @experimental
      */
     fireIntentForContext<T = unknown>(context: OpenFin.ContextForIntent): Promise<T>;
     /**
@@ -262,7 +264,6 @@ export declare class InteropClient extends Base {
      * @param { string } sessionContextGroupId - Id of the context group.
      * @return { Promise<SessionContextGroup>}
      * @tutorial interop.joinSessionContextGroup
-     * @experimental
      */
     joinSessionContextGroup(sessionContextGroupId: string): Promise<OpenFin.SessionContextGroup>;
     /**

package/src/api/interop/InteropClient.js

@@ -17,12 +17,14 @@ const base_1 = require("../base");
 const SessionContextGroupClient_1 = require("./SessionContextGroupClient");
 const utils_1 = require("./utils");
 /**
+ * @PORTED
  * @typedef { object } Intent
  * @summary The combination of an action and a context that is passed to an application for resolution.
  * @property { string } name Name of the intent.
  * @property { Context } context Data associated with the intent
  */
 /**
+ * @REMOVED
  * @typedef { object } Subscription
  * @summary Object returned when subscribing a handler.
  * @property { function } unsubscribe Function to unsubscribe the handler.
@@ -36,6 +38,7 @@ const utils_1 = require("./utils");
  * @summary Subscription function for registerIntentHandler
  */
 /**
+ * @PORTED
  * @typedef { object } ClientIdentity
  * @summary The Identity for a Channel Client. Includes endpointId to differentiate between different connections for an entity.
  * @property {string} uuid GUID of an application.
@@ -43,12 +46,14 @@ const utils_1 = require("./utils");
  * @property {string} endpointId Unique differentiator for different Channel connections for an entity.
  */
 /**
+ * @PORTED
  * @typedef { object } ContextGroupInfo
  * @summary Information for a Context Group. Contains metadata for displaying the group properly.
  * @property {string} id Name of the context group
  * @property {DisplayMetadata} displayMetadata Metadata for the Context Group. Contains the group's human-readable name, color, and an image, as defined by the Interop Broker.
  */
 /**
+ * @PORTED
  * @typedef { object } DisplayMetadata
  * @summary The display data for a Context Group.
  * @property {string} name A user-readable name for this context group, e.g: `"Red"`
@@ -56,6 +61,7 @@ const utils_1 = require("./utils");
  * @property {string} [glyph] A URL of an image that can be used to display this context group
  */
 /**
+ * @PORTED
  * @typedef { object } Context
  * @summary Data passed between entities and applications.
  * @property {object} [id] An object containing string key-value pairs for the bulk of the data for the context. Differs between context types.
@@ -63,6 +69,7 @@ const utils_1 = require("./utils");
  * @property {string} type Conserved type for the context (e.g. `instrument` or `country`)
  */
 /**
+ * @REMOVED
  * @typedef { object } ContextForIntent
  * @summary Data passed between entities and applications, including an optional metadata.
  * @property {object} [id] An object containing string key-value pairs for the bulk of the data for the context. Differs between context types.
@@ -71,6 +78,7 @@ const utils_1 = require("./utils");
  * @property {any} [metadata]
  */
 /**
+ * @REMOVED
  * @typedef { object } SessionContextGroup
  * @summary An instance of a SessionContextGroup
  * @property {string} id The SessionContextGroup's id.
@@ -98,7 +106,7 @@ const utils_1 = require("./utils");
  * @return {Promise<void>}
  */
 /**
- * {@link https://developers.openfin.co/of-docs/docs/enable-color-linking **THE INTEROP API IS EXPERIMENTAL. IF YOU WOULD LIKE TO USE IT, PLEASE USE OUR DEFAULT IMPLEMENTATION IN BROWSER**}
+ * {@link https://developers.openfin.co/of-docs/docs/enable-color-linking}
  *
  * The Interop Client API is broken up into two groups:
  *
@@ -305,7 +313,6 @@ class InteropClient extends base_1.Base {
      * @param { Intent } intent - The combination of an action and a context that is passed to an application for resolution.
      * @return { Promise<unknown>}
      * @tutorial interop.fireIntent
-     * @experimental
      */
     async fireIntent(intent) {
         this.wire.sendAction('interop-client-fire-intent').catch((e) => {
@@ -320,7 +327,6 @@ class InteropClient extends base_1.Base {
      * @param { string } intentName - The name of an intent.
      * @return { Promise<Subscription> }
      * @tutorial interop.registerIntentHandler
-     * @experimental
      */
     async registerIntentHandler(handler, intentName, options) {
         this.wire.sendAction('interop-client-register-intent-handler').catch((e) => {
@@ -348,7 +354,6 @@ class InteropClient extends base_1.Base {
      * @param { string } [contextType]
      * @return { Promise<Context> }
      * @tutorial interop.getCurrentContext
-     * @experimental
      */
     async getCurrentContext(contextType) {
         this.wire.sendAction('interop-client-get-current-context').catch((e) => {
@@ -362,7 +367,6 @@ class InteropClient extends base_1.Base {
      * @param { InfoForIntentOptions } options
      * @return { Promise<unknown> }
      * @tutorial interop.getInfoForIntent
-     * @experimental
      */
     async getInfoForIntent(options) {
         this.wire.sendAction('interop-client-get-info-for-intent').catch((e) => {
@@ -376,7 +380,6 @@ class InteropClient extends base_1.Base {
      * @param { Context } context
      * @return { Promise<unknown> }
      * @tutorial interop.getInfoForIntentsByContext
-     * @experimental
      */
     async getInfoForIntentsByContext(context) {
         this.wire.sendAction('interop-client-get-info-for-intents-by-context').catch((e) => {
@@ -391,7 +394,6 @@ class InteropClient extends base_1.Base {
      * @param { ContextForIntent } context
      * @return { Promise<unknown> }
      * @tutorial interop.fireIntentForContext
-     * @experimental
      */
     async fireIntentForContext(context) {
         this.wire.sendAction('interop-client-fire-intent-for-context').catch((e) => {
@@ -407,7 +409,6 @@ class InteropClient extends base_1.Base {
      * @param { string } sessionContextGroupId - Id of the context group.
      * @return { Promise<SessionContextGroup>}
      * @tutorial interop.joinSessionContextGroup
-     * @experimental
      */
     async joinSessionContextGroup(sessionContextGroupId) {
         try {

package/src/api/interop/fdc3/fdc3-1.2.js

@@ -130,7 +130,7 @@ class Fdc3Module extends base_1.Base {
         this.wire.sendAction('fdc3-broadcast').catch((e) => {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
-        this.fin.me.interop.setContext(context);
+        return this.fin.me.interop.setContext(context);
     }
     /**
      * Returns the Interop-Broker-defined context groups available for an entity to join.
@@ -165,7 +165,7 @@ class Fdc3Module extends base_1.Base {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
         try {
-            await this.fin.me.interop.joinContextGroup(channelId);
+            return await this.fin.me.interop.joinContextGroup(channelId);
         }
         catch (error) {
             if (error.message === utils_2.BROKER_ERRORS.joinSessionContextGroupWithJoinContextGroup) {
@@ -187,7 +187,7 @@ class Fdc3Module extends base_1.Base {
         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.fin.me.interop.removeFromContextGroup();
+        return this.fin.me.interop.removeFromContextGroup();
     }
     /**
      * Adds a listener for incoming Intents.
@@ -232,7 +232,7 @@ class Fdc3Module extends base_1.Base {
             return await this.fin.me.interop.fireIntent(intentObj);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_2.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_2.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -266,7 +266,7 @@ class Fdc3Module extends base_1.Base {
             return await this.fin.me.interop.getInfoForIntent({ name: intent, context });
         }
         catch (error) {
-            const errorToThrow = error.message === utils_2.BROKER_ERRORS.getInfoForIntent ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_2.BROKER_ERRORS.getInfoForIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -284,7 +284,7 @@ class Fdc3Module extends base_1.Base {
             return await this.fin.me.interop.getInfoForIntentsByContext(context);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_2.BROKER_ERRORS.getInfoForIntentsByContext ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_2.BROKER_ERRORS.getInfoForIntentsByContext ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -303,7 +303,7 @@ class Fdc3Module extends base_1.Base {
             return await this.fin.me.interop.fireIntentForContext({ ...context, metadata: { target: app } });
         }
         catch (error) {
-            const errorToThrow = error.message === utils_2.BROKER_ERRORS.fireIntentForContext ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_2.BROKER_ERRORS.fireIntentForContext ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -354,7 +354,7 @@ class Fdc3Module extends base_1.Base {
             return await InteropClient_1.InteropClient.ferryFdc3Call(this.fin.me.interop, 'fdc3Open', { app, context });
         }
         catch (error) {
-            const errorToThrow = error.message === utils_2.BROKER_ERRORS.fdc3Open ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_2.BROKER_ERRORS.fdc3Open ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }

package/src/api/interop/fdc3/fdc3-2.0.d.ts

@@ -283,7 +283,7 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
      * Returns the Channel object for the current User channel membership
      * @returns { Promise<FDC3.Channel | null> }
      */
-    getCurrentChannel(): Promise<FDC3v1.Channel | null>;
+    getCurrentChannel(): Promise<FDC3v2.Channel | null>;
     /**
      * Removes the app from any User channel membership.
      * @returns { Promise<void> }

package/src/api/interop/fdc3/fdc3-2.0.js

@@ -191,7 +191,7 @@ class Fdc3Module2 extends base_1.Base {
             return await InteropClient_1.InteropClient.ferryFdc3Call(this.fin.me.interop, 'fdc3FindInstances', app);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fdc3FindInstances ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fdc3FindInstances ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -209,7 +209,7 @@ class Fdc3Module2 extends base_1.Base {
             return await InteropClient_1.InteropClient.ferryFdc3Call(this.fin.me.interop, 'fdc3GetAppMetadata', app);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fdc3GetAppMetadata ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fdc3GetAppMetadata ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -268,7 +268,7 @@ class Fdc3Module2 extends base_1.Base {
             return await this.fin.me.interop.getInfoForIntent({ name: intent, context, metadata: { resultType } });
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.getInfoForIntent ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_1.BROKER_ERRORS.getInfoForIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -288,7 +288,7 @@ class Fdc3Module2 extends base_1.Base {
             return await InteropClient_1.InteropClient.ferryFdc3Call(this.fin.me.interop, 'fdc3v2FindIntentsByContext', payload);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.getInfoForIntentsByContext ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_1.BROKER_ERRORS.getInfoForIntentsByContext ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -308,7 +308,7 @@ class Fdc3Module2 extends base_1.Base {
             return (0, utils_2.getIntentResolution)(this.fin.me.interop, context, app, intent);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -328,7 +328,7 @@ class Fdc3Module2 extends base_1.Base {
             return (0, utils_2.getIntentResolution)(this.fin.me.interop, context, app);
         }
         catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error;
+            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fireIntent ? 'ResolverUnavailable' : error.message;
             throw new Error(errorToThrow);
         }
     }
@@ -443,7 +443,15 @@ class Fdc3Module2 extends base_1.Base {
      * @returns { Promise<FDC3.Channel | null> }
      */
     async getCurrentChannel() {
-        return this.fdc3Module.getCurrentChannel();
+        const currentChannel = await this.fdc3Module.getCurrentChannel();
+        if (!currentChannel) {
+            return null;
+        }
+        return {
+            ...currentChannel,
+            type: 'user',
+            broadcast: this.broadcast.bind(this)
+        };
     }
     /**
      * Removes the app from any User channel membership.

package/src/api/interop/fdc3/fdc3.d.ts

@@ -1,13 +1,12 @@
 import Fdc3Module from './fdc3-1.2';
 import Fdc3Module2 from './fdc3-2.0';
 import type Transport from '../../../transport/transport';
+import { Fdc3Version } from './versions';
 declare global {
     interface Window {
         fdc3: Fdc3Module | Fdc3Module2;
     }
 }
-declare type Fdc3Versions = '1.2' | '2.0';
-export declare const versionMap: Record<Fdc3Versions, typeof Fdc3Module | typeof Fdc3Module2>;
+export declare const versionMap: Record<Fdc3Version, typeof Fdc3Module | typeof Fdc3Module2>;
 export declare function registerFdc3Shim(version: string, transport: Transport): void;
-export declare function getFdc3(transport: Transport, version?: Fdc3Versions): Fdc3Module | Fdc3Module2;
-export {};
+export declare function getFdc3(transport: Transport, version?: Fdc3Version): Fdc3Module | Fdc3Module2;

package/src/api/interop/fdc3/overrideCheck.d.ts

@@ -0,0 +1,4 @@
+import * as OpenFin from '../../../OpenFin';
+import { Fdc3Version } from './versions';
+export declare function getDefaultViewFdc3VersionFromAppInfo({ manifest, initialOptions }: Awaited<ReturnType<OpenFin.Application['getInfo']>>): Fdc3Version | undefined;
+export declare function overrideCheck(overriddenBroker: OpenFin.InteropBroker, fdc3InteropApi?: Fdc3Version): void;