@openfin/core 30.73.17 → 30.73.19

package/src/OpenFin.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/api/application/Factory.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { Base } from '../base';
 /**
  * @typedef {object} ApplicationOptions

package/src/api/application/Instance.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { EmitterBase } from '../base';
 import Transport from '../../transport/transport';
 /**

package/src/api/base.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
+import * as OpenFin from '../OpenFin';
 import Transport from '../transport/transport';
 import Fin from './fin';
 import { BaseEventMap } from './events/base';

package/src/api/clipboard/index.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { Base } from '../base';
 /**
  * WriteRequestType interface

package/src/api/events/application.d.ts

@@ -1,5 +1,6 @@
-import { WindowEvent, BaseEventMap, ApplicationEvent } from './base';
-import { WindowAlertRequestedEvent, WindowAuthRequestedEvent, WindowEndLoadEvent, PropagatedWindowEvents, WindowPerformanceReport } from './window';
+import * as OpenFin from '../../OpenFin';
+import { ApplicationEvent, BaseEventMap, WindowEvent } from './base';
+import { PropagatedWindowEvents, WindowAlertRequestedEvent, WindowAuthRequestedEvent, WindowEndLoadEvent, WindowPerformanceReport } from './window';
 import { PropagatedViewEvents } from './view';
 export interface CrashedEvent {
     reason: 'normal-termination' | 'abnormal-termination' | 'killed' | 'crashed' | 'still-running' | 'launch-failed' | 'out-of-memory' | 'integrity-failure';

package/src/api/events/channel.d.ts

@@ -1,4 +1,4 @@
-import { BaseEventMap, ApplicationEvent } from './base';
+import { ApplicationEvent, BaseEventMap } from './base';
 export interface ChannelEvent<Type> extends ApplicationEvent<'channel', Type> {
     channelName: string;
     channelId: string;

package/src/api/events/externalApplication.d.ts

@@ -1,4 +1,4 @@
-import { RuntimeEvent, BaseEventMap } from './base';
+import { BaseEventMap, RuntimeEvent } from './base';
 export interface ExternalApplicationEvents extends BaseEventMap {
     connected: RuntimeEvent<'externalapplication', 'connected'>;
     disconnected: RuntimeEvent<'externalapplication', 'disconnected'>;

package/src/api/events/globalHotkey.d.ts

@@ -1,4 +1,5 @@
-import { RuntimeEvent, BaseEventMap } from './base';
+import * as OpenFin from '../../OpenFin';
+import { BaseEventMap, RuntimeEvent } from './base';
 import Identity = OpenFin.Identity;
 export interface GlobalHotkeyEvent<Type> extends RuntimeEvent<'global-hotkey', Type> {
     identity: Identity;

package/src/api/events/system.d.ts

@@ -1,4 +1,5 @@
-import { BaseEvent, ApplicationEvent, BaseEventMap } from './base';
+import * as OpenFin from '../../OpenFin';
+import { ApplicationEvent, BaseEvent, BaseEventMap } from './base';
 import { PropagatedWindowEvents } from './window';
 import { PropagatedApplicationEvents } from './application';
 import { PropagatedViewEvents } from './view';

package/src/api/events/view.d.ts

@@ -1,5 +1,6 @@
-import { WebContentsEventMapping, WindowResourceLoadFailedEvent, WindowResourceResponseReceivedEvent, CertificateSelectionShownEvent } from './webcontents';
-import { WindowEvent, BaseEventMap } from './base';
+import * as OpenFin from '../../OpenFin';
+import { CertificateSelectionShownEvent, WebContentsEventMapping, WindowResourceLoadFailedEvent, WindowResourceResponseReceivedEvent } from './webcontents';
+import { BaseEventMap, WindowEvent } from './base';
 import { WindowNavigationRejectedEvent } from './window';
 import { CrashedEvent } from './application';
 export interface ViewEventMapping<Topic = string, Type = string> extends WebContentsEventMapping {

package/src/api/events/webcontents.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { BaseEventMap, WindowEvent } from './base';
 import { CrashedEvent } from './application';
 import { WindowNavigationRejectedEvent } from './window';

package/src/api/events/window.d.ts

@@ -1,7 +1,8 @@
+import * as OpenFin from '../../OpenFin';
 import { CrashedEvent } from './application';
-import { WindowEvent, BaseEventMap } from './base';
-import { WebContentsEventMapping, WindowResourceLoadFailedEvent, WindowResourceResponseReceivedEvent, CertificateSelectionShownEvent } from './webcontents';
-import { PropagatedViewEventMapping, InputEvent } from './view';
+import { BaseEventMap, WindowEvent } from './base';
+import { CertificateSelectionShownEvent, WebContentsEventMapping, WindowResourceLoadFailedEvent, WindowResourceResponseReceivedEvent } from './webcontents';
+import { InputEvent, PropagatedViewEventMapping } from './view';
 export interface WindowAlertRequestedEvent<Topic, Type> extends WindowEvent<Topic, Type> {
     message: string;
     url: string;

package/src/api/external-application/Factory.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { Base } from '../base';
 /**
  * @lends ExternalApplication

package/src/api/external-application/Instance.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { EmitterBase } from '../base';
 import Transport from '../../transport/transport';
 /**

package/src/api/fin.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
+import * as OpenFin from '../OpenFin';
 import Transport from '../transport/transport';
 import System from './system/index';
 import _WindowModule from './window/index';

package/src/api/frame/Factory.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { Base } from '../base';
 /**
  * @lends Frame

package/src/api/frame/Instance.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { EmitterBase } from '../base';
 import Transport from '../../transport/transport';
 import FrameEvents = OpenFin.FrameEvents;

package/src/api/global-hotkey/index.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { EmitterBase } from '../base';
 import Transport from '../../transport/transport';
 import GlobalHotkeyEvents = OpenFin.GlobalHotkeyEvents;

package/src/api/interappbus/channel/channel.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../OpenFin';
 import Transport from '../../../transport/transport';
 import ProviderIdentity = OpenFin.ProviderIdentity;
 import ChannelMiddleware = OpenFin.ChannelMiddleware;

package/src/api/interappbus/channel/client.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../OpenFin';
 import { ChannelBase } from './channel';
 import Transport from '../../../transport/transport';
 import { AnyStrategy } from './protocols/strategy-types';

package/src/api/interappbus/channel/connection-manager.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../OpenFin';
 import { ChannelMessage } from '.';
 import Transport from '../../../transport/transport';
 import { Base } from '../../base';

package/src/api/interappbus/channel/connection-manager.js

@@ -44,7 +44,7 @@ class ConnectionManager extends base_1.Base {
         wire.registerMessageHandler(this.onmessage.bind(this));
     }
     static getProtocolOptionsFromStrings(protocols) {
-        return protocols.map(protocol => {
+        return protocols.map((protocol) => {
             switch (protocol) {
                 case 'rtc':
                     return strategy_2.RTCInfo;
@@ -85,7 +85,11 @@ class ConnectionManager extends base_1.Base {
         }
         const channel = new provider_1.ChannelProvider(providerIdentity, this.wire, strategy);
         const key = providerIdentity.channelId;
-        this.providerMap.set(key, { provider: channel, strategy, supportedProtocols: ConnectionManager.getProtocolOptionsFromStrings(protocols) });
+        this.providerMap.set(key, {
+            provider: channel,
+            strategy,
+            supportedProtocols: ConnectionManager.getProtocolOptionsFromStrings(protocols)
+        });
         provider_1.ChannelProvider.setProviderRemoval(channel, this.removeChannelFromProviderMap.bind(this));
         return channel;
     }

package/src/api/interappbus/channel/index.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../OpenFin';
 import ChannelClient from './client';
 import { ChannelProvider } from './provider';
 import { EmitterBase } from '../../base';

package/src/api/interappbus/channel/index.js

@@ -57,11 +57,12 @@ class Channel extends base_1.EmitterBase {
             let connectionUrl;
             const entityType = this.wire.environment.getCurrentEntityType();
             if (entityType === 'iframe') {
-                const frame = fin.Frame.getCurrentSync();
-                connectionUrl = (await frame.getInfo()).url;
+                // @ts-expect-error
+                // TODO: type this correctly (frame types are broken)
+                const frame = (await this.fin.me.getInfo()).url;
             }
             else if (entityType === 'window' || entityType === 'view') {
-                connectionUrl = (await fin.me.getInfo()).url;
+                connectionUrl = (await this.fin.me.getInfo()).url;
             }
             const res = await this.wire.sendAction('connect-to-channel', {
                 channelName,

package/src/api/interappbus/channel/protocols/classic/strategy.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../../../OpenFin';
 import Transport from '../../../../../transport/transport';
 import { MessageReceiver } from './message-receiver';
 import { ChannelStrategy, EndpointPayload } from '../strategy';

package/src/api/interappbus/channel/protocols/protocol-manager.d.ts

@@ -1,4 +1,4 @@
-import { MessagingProtocols, ExternalClientOffer, ProtocolOffer, LocalSupportedProtocol } from '.';
+import { ExternalClientOffer, LocalSupportedProtocol, MessagingProtocols, ProtocolOffer } from '.';
 export declare class ProtocolManager {
     private ProtocolsInPreferenceOrder;
     DefaultClientProtocols: ['classic'];

package/src/api/interappbus/channel/protocols/rtc/endpoint.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../../../OpenFin';
 import ProviderIdentity = OpenFin.ProviderIdentity;
 export interface RTCEndpointChannels {
     request: RTCDataChannel;

package/src/api/interappbus/channel/protocols/rtc/endpoint.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable @typescript-eslint/no-unused-vars */
 var __classPrivateFieldGet = (this && this.__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");
@@ -14,6 +13,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
 var _RTCEndpoint_processAction, _RTCEndpoint_disconnectListener;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RTCEndpoint = void 0;
+/* eslint-disable @typescript-eslint/no-unused-vars */
 const errors_1 = require("../../../../../util/errors");
 /*
 This handles sending RTC messages between RTC connections over the request and response data channels.

package/src/api/interappbus/channel/protocols/rtc/ice-manager.js

@@ -1,5 +1,4 @@
 "use strict";
-/* eslint-disable class-methods-use-this */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RTCICEManager = void 0;
 const base_1 = require("../../../../base");

package/src/api/interappbus/channel/protocols/rtc/strategy.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../../../OpenFin';
 import { ChannelStrategy } from '../strategy';
 import { RTCPacket } from './endpoint';
 import { LocalSupportedProtocol } from '..';

package/src/api/interappbus/channel/protocols/strategy.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../../OpenFin';
 import ProviderIdentity = OpenFin.ProviderIdentity;
 export interface ChannelStrategy<T extends unknown> {
     onEndpointDisconnect(endpointId: string, listener: () => void): void;

package/src/api/interappbus/channel/provider.d.ts

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../OpenFin';
 import { ChannelBase } from './channel';
 import Transport from '../../../transport/transport';
 import { AnyStrategy } from './protocols/strategy-types';

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

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import { Base } from '../base';
 import { InteropBroker } from './InteropBroker';
 import { InteropClient } from './InteropClient';

package/src/api/interop/Factory.js

@@ -38,7 +38,7 @@ class InteropModule extends base_1.Base {
             }
             return provider;
         };
-        return override(InteropBroker_1.InteropBroker, this.wire, getProvider, options.initialOptions.interopBrokerConfiguration || {});
+        return override(InteropBroker_1.InteropBroker, this.wire, getProvider, options.initialOptions.interopBrokerConfiguration);
     }
     /**
      * Connects a client to an Interop broker. This is called under-the-hood for Views in a Platform.

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

@@ -1,3 +1,5 @@
+import { FDC3, FDC3v2 } from '../../../fdc3';
+import * as OpenFin from '../../OpenFin';
 import { Base } from '../base';
 import type Transport from '../../transport/transport';
 import Identity = OpenFin.Identity;
@@ -46,6 +48,32 @@ import Identity = OpenFin.Identity;
  * }
  * ```
  *
+ * By default the Interop Broker logs all actions to the console. You can disable this by using the logging option in `interopBrokerConfiguration`:
+ * ```js
+ * {
+ *      "runtime": {
+ *          "arguments": "--v=1 --inspect",
+ *          "version": "alpha-v19"
+ *      },
+ *      "platform": {
+ *          "uuid": "platform_customization_local",
+ *          "applicationIcon": "https://openfin.github.io/golden-prototype/favicon.ico",
+ *          "autoShow": false,
+ *          "providerUrl": "http://localhost:5555/provider.html",
+ *		    "interopBrokerConfiguration": {
+ *       		"logging": {
+ *   				"beforeAction": {
+ *   					"enabled": false
+ *   				},
+ *   				"afterAction": {
+ *   					"enabled": false
+ *   				}
+ *   			}
+ *		    }
+ *      }
+ * }
+ * ```
+ *
  * ---
  * **2. Overriding**
  *
@@ -131,6 +159,7 @@ export declare class InteropBroker extends Base {
     private lastContextMap;
     private sessionContextGroupMap;
     private channel;
+    private logging;
     constructor(wire: Transport, getProvider: () => Promise<OpenFin.ChannelProvider>, options?: any);
     /**
      * SetContextOptions interface
@@ -377,7 +406,9 @@ export declare class InteropBroker extends Base {
      * @param clientIdentity
      * @returns { Promise<ImplementationMetadata(2)> }
      */
-    fdc3HandleGetInfo(clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
+    fdc3HandleGetInfo(payload: {
+        fdc3Version: string;
+    }, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
     /**
      * Returns an array of info for each Interop Client connected to the Interop Broker.
      *
@@ -416,7 +447,7 @@ export declare class InteropBroker extends Base {
     private static hasEndpointId;
     static isContextTypeCompatible(contextType: string, registeredContextType: string | undefined): boolean;
     private setContextGroupMap;
-    private static setCurrentContextGroupInClientOptions;
+    private setCurrentContextGroupInClientOptions;
     private setupChannelProvider;
     private wireChannel;
     /**

package/src/api/interop/InteropBroker.js

@@ -93,6 +93,32 @@ let contextGroups = [
  * }
  * ```
  *
+ * By default the Interop Broker logs all actions to the console. You can disable this by using the logging option in `interopBrokerConfiguration`:
+ * ```js
+ * {
+ *      "runtime": {
+ *          "arguments": "--v=1 --inspect",
+ *          "version": "alpha-v19"
+ *      },
+ *      "platform": {
+ *          "uuid": "platform_customization_local",
+ *          "applicationIcon": "https://openfin.github.io/golden-prototype/favicon.ico",
+ *          "autoShow": false,
+ *          "providerUrl": "http://localhost:5555/provider.html",
+ *		    "interopBrokerConfiguration": {
+ *       		"logging": {
+ *   				"beforeAction": {
+ *   					"enabled": false
+ *   				},
+ *   				"afterAction": {
+ *   					"enabled": false
+ *   				}
+ *   			}
+ *		    }
+ *      }
+ * }
+ * ```
+ *
  * ---
  * **2. Overriding**
  *
@@ -176,9 +202,12 @@ class InteropBroker extends base_1.Base {
         this.getProvider = getProvider;
         this.interopClients = new Map();
         this.contextGroupsById = new Map();
-        if (options.contextGroups) {
+        if (options === null || options === void 0 ? void 0 : options.contextGroups) {
             contextGroups = options.contextGroups;
         }
+        if (options === null || options === void 0 ? void 0 : options.logging) {
+            this.logging = options.logging;
+        }
         this.intentClientMap = new Map();
         this.lastContextMap = new Map();
         this.sessionContextGroupMap = new Map();
@@ -371,7 +400,7 @@ class InteropBroker extends base_1.Base {
         const oldContextGroupId = clientSubscriptionState.contextGroupId;
         if (oldContextGroupId !== contextGroupId) {
             clientSubscriptionState.contextGroupId = contextGroupId;
-            await InteropBroker.setCurrentContextGroupInClientOptions(clientIdentity, contextGroupId);
+            await this.setCurrentContextGroupInClientOptions(clientIdentity, contextGroupId);
             const contextGroupMap = this.contextGroupsById.get(contextGroupId);
             for (const [, handlerInfo] of clientSubscriptionState.contextHandlers) {
                 const { contextType, handlerId } = handlerInfo;
@@ -450,7 +479,7 @@ class InteropBroker extends base_1.Base {
         if (clientState) {
             clientState.contextGroupId = undefined;
         }
-        await InteropBroker.setCurrentContextGroupInClientOptions(clientIdentity, null);
+        await this.setCurrentContextGroupInClientOptions(clientIdentity, null);
     }
     // Used by platform windows to know what client groups the provider has declared. Also used internally to access context groups. Overrideable so that the platform developer can modify it.
     /**
@@ -695,10 +724,21 @@ class InteropBroker extends base_1.Base {
      * @returns { Promise<ImplementationMetadata(2)> }
      */
     // eslint-disable-next-line class-methods-use-this
-    async fdc3HandleGetInfo(clientIdentity) {
-        const warning = (0, utils_1.generateOverrideWarning)('fdc3.getInfo', 'InteropBroker.fdc3GetInfo', clientIdentity);
-        console.warn(warning);
-        throw new Error(utils_1.BROKER_ERRORS.fdc3GetInfo);
+    async fdc3HandleGetInfo(payload, clientIdentity) {
+        const { fdc3Version } = payload;
+        return {
+            fdc3Version,
+            provider: 'OpenFin',
+            providerVersion: await this.fin.System.getVersion(),
+            optionalFeatures: {
+                OriginatingAppMetadata: false,
+                UserChannelMembershipAPIs: true
+            },
+            appMetadata: {
+                appId: '',
+                instanceId: ''
+            }
+        };
     }
     /**
      * Returns an array of info for each Interop Client connected to the Interop Broker.
@@ -920,14 +960,14 @@ class InteropBroker extends base_1.Base {
             this.contextGroupsById.set(contextGroupInfo.id, new Map());
         }
     }
-    static async setCurrentContextGroupInClientOptions(clientIdentity, contextGroupId) {
-        const entityInfo = await fin.System.getEntityInfo(clientIdentity.uuid, clientIdentity.name);
+    async setCurrentContextGroupInClientOptions(clientIdentity, contextGroupId) {
+        const entityInfo = await this.fin.System.getEntityInfo(clientIdentity.uuid, clientIdentity.name);
         let entity;
         if (entityInfo.entityType === 'view') {
-            entity = await fin.View.wrap(clientIdentity);
+            entity = await this.fin.View.wrap(clientIdentity);
         }
         else if (entityInfo.entityType === 'window') {
-            entity = await fin.Window.wrap(clientIdentity);
+            entity = await this.fin.Window.wrap(clientIdentity);
         }
         if (entity) {
             await entity.updateOptions({
@@ -973,7 +1013,7 @@ class InteropBroker extends base_1.Base {
         channel.onDisconnection((clientIdentity) => {
             this.interopClients.delete(clientIdentity.endpointId);
             const targetInfo = this.intentClientMap.get(clientIdentity.name);
-            if (targetInfo && clientIdentity.uuid === fin.me.identity.uuid) {
+            if (targetInfo && clientIdentity.uuid === this.fin.me.uuid) {
                 targetInfo.forEach((handler) => {
                     handler.isReady = false;
                 });
@@ -986,12 +1026,20 @@ class InteropBroker extends base_1.Base {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         channel.beforeAction(async (action, payload, clientIdentity) => {
+            var _a, _b;
             if (!(await this.isActionAuthorized(action, payload, clientIdentity))) {
                 throw new Error(`Action (${action}) not authorized for ${clientIdentity.uuid}, ${clientIdentity.name}`);
             }
-            console.log(action, payload, clientIdentity);
+            if ((_b = (_a = this.logging) === null || _a === void 0 ? void 0 : _a.beforeAction) === null || _b === void 0 ? void 0 : _b.enabled) {
+                console.log(action, payload, clientIdentity);
+            }
+        });
+        channel.afterAction((action, payload, clientIdentity) => {
+            var _a, _b;
+            if ((_b = (_a = this.logging) === null || _a === void 0 ? void 0 : _a.afterAction) === null || _b === void 0 ? void 0 : _b.enabled) {
+                console.log(action, payload, clientIdentity);
+            }
         });
-        channel.afterAction(console.log);
         // Client functions
         channel.register('setContext', this.setContext.bind(this));
         channel.register('fireIntent', this.handleFiredIntent.bind(this));
@@ -1016,7 +1064,7 @@ class InteropBroker extends base_1.Base {
         channel.register('fdc3FindInstances', this.fdc3HandleFindInstances.bind(this));
         channel.register('fdc3GetAppMetadata', this.fdc3HandleGetAppMetadata.bind(this));
         channel.register('fdc3v2GetInfo', async (payload, clientIdentity) => {
-            return this.fdc3HandleGetInfo.bind(this)(clientIdentity);
+            return this.fdc3HandleGetInfo.bind(this)(payload, clientIdentity);
         });
     }
     /**

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

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import Transport from '../../transport/transport';
 import { Base } from '../base';
 /**

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

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import type { ChannelProvider } from '../interappbus/channel/provider';
 export default class SessionContextGroupBroker {
     id: string;

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

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../OpenFin';
 import Transport from '../../transport/transport';
 import { Base } from '../base';
 export default class SessionContextGroupClient extends Base {

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

@@ -1,3 +1,5 @@
+import { FDC3v2 } from '../../../../fdc3';
+import * as OpenFin from '../../../OpenFin';
 declare type HandlerId = string;
 export declare class PrivateChannelClient {
     id: string;

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

@@ -1,3 +1,4 @@
+import * as OpenFin from '../../../OpenFin';
 import { ChannelProvider } from '../../interappbus/channel/provider';
 declare type HandlerId = string;
 export declare class PrivateChannelProvider {

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

@@ -1,3 +1,5 @@
+import { FDC3 } from '../../../../fdc3';
+import * as OpenFin from '../../../OpenFin';
 import { Base } from '../../base';
 /**
  * @typedef { object } Listener

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

@@ -351,7 +351,7 @@ class Fdc3Module extends base_1.Base {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
         try {
-            return await InteropClient_1.InteropClient.ferryFdc3Call(fin.me.interop, 'fdc3Open', { app, context });
+            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;

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

@@ -1,3 +1,5 @@
+import { FDC3, FDC3v2 } from '../../../../fdc3';
+import * as OpenFin from '../../../OpenFin';
 import { Base } from '../../base';
 import Transport from '../../../transport/transport';
 /**
@@ -290,6 +292,7 @@ export default class Fdc3Module2 extends Base implements FDC3v2.DesktopAgent {
     leaveCurrentChannel(): Promise<void>;
     /**
      * Retrieves information about the FDC3 implementation, including the supported version of the FDC3 specification, the name of the provider of the implementation, its own version number, details of whether optional API features are implemented and the metadata of the calling application according to the desktop agent.
+     * fdc3HandleGetInfo must be overridden in the InteropBroker so that the ImplementationMetadata will have the appMetadata info.
      * @returns { Promise<ImplementationMetadata(2)> }
      * @tutorial fdc3v2.getInfo
      */

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

@@ -188,7 +188,7 @@ class Fdc3Module2 extends base_1.Base {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
         try {
-            return await InteropClient_1.InteropClient.ferryFdc3Call(fin.me.interop, 'fdc3FindInstances', app);
+            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;
@@ -206,7 +206,7 @@ class Fdc3Module2 extends base_1.Base {
             // we do not want to expose this error, just continue if this analytics-only call fails
         });
         try {
-            return await InteropClient_1.InteropClient.ferryFdc3Call(fin.me.interop, 'fdc3GetAppMetadata', app);
+            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;
@@ -285,7 +285,7 @@ class Fdc3Module2 extends base_1.Base {
         });
         const payload = resultType ? { context, metadata: { resultType } } : context;
         try {
-            return await InteropClient_1.InteropClient.ferryFdc3Call(fin.me.interop, 'fdc3v2FindIntentsByContext', payload);
+            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;
@@ -362,7 +362,7 @@ class Fdc3Module2 extends base_1.Base {
             const intentResolutionResultId = (intentMetadata === null || intentMetadata === void 0 ? void 0 : intentMetadata.intentResolutionResultId) || (metadata === null || metadata === void 0 ? void 0 : metadata.intentResolutionResultId);
             if (intentResolutionResultId) {
                 // Send whatever the result is.
-                fin.InterApplicationBus.publish(intentResolutionResultId, intentResult);
+                this.fin.InterApplicationBus.publish(intentResolutionResultId, intentResult);
             }
             if (intentResult instanceof Error) {
                 throw new Error(intentResult.message);
@@ -455,19 +455,12 @@ class Fdc3Module2 extends base_1.Base {
     }
     /**
      * Retrieves information about the FDC3 implementation, including the supported version of the FDC3 specification, the name of the provider of the implementation, its own version number, details of whether optional API features are implemented and the metadata of the calling application according to the desktop agent.
+     * fdc3HandleGetInfo must be overridden in the InteropBroker so that the ImplementationMetadata will have the appMetadata info.
      * @returns { Promise<ImplementationMetadata(2)> }
      * @tutorial fdc3v2.getInfo
      */
     async getInfo() {
-        try {
-            const result = await InteropClient_1.InteropClient.ferryFdc3Call(fin.me.interop, 'fdc3v2GetInfo', {});
-            const partialInfo = this.fdc3Module.getInfo();
-            return { ...partialInfo, ...result };
-        }
-        catch (error) {
-            const errorToThrow = error.message === utils_1.BROKER_ERRORS.fdc3GetInfo ? 'ResolverUnavailable' : error;
-            throw new Error(errorToThrow);
-        }
+        return InteropClient_1.InteropClient.ferryFdc3Call(this.fin.me.interop, 'fdc3v2GetInfo', { fdc3Version: '2.0' });
     }
 }
 exports.default = Fdc3Module2;

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

@@ -1,3 +1,5 @@
+import { FDC3, FDC3v2 } from '../../../../fdc3';
+import * as OpenFin from '../../../OpenFin';
 import { PrivateChannelClient } from './PrivateChannelClient';
 interface UnsupportedChannelApis {
     addContextListener(): Error;