@openfin/fdc3-api 37.80.39 → 37.81.20

package/out/fdc3-api.d.ts

@@ -76,14 +76,42 @@ declare type AnchorType = 'top-left' | 'top-right' | 'bottom-left' | 'bottom-rig
 
 declare type AnyStrategy = ChannelStrategy<any>;
 
+/**
+ * @deprecated Renamed to {@link ApiSettings}.
+ */
+declare type Api = ApiSettings;
+
+declare type ApiCall<Request, Response> = {
+    request: Request;
+    response: Response;
+};
+
+declare type ApiClient<T extends Record<any, any>> = {
+    [key in keyof PickOfType<T, Function>]: (...args: Parameters<T[key]>) => ReturnType<T[key]> extends Promise<any> ? ReturnType<T[key]> : Promise<ReturnType<T[key]>>;
+};
+
+/**
+ * @deprecated Renamed to {@link DomainApiSettings}.
+ */
+declare type ApiInjection = DomainApiSettings;
+
+/**
+ * Generated when a new Platform's API becomes responsive.
+ * @interface
+ */
+declare type ApiReadyEvent = BaseEvent & {
+    topic: 'application';
+    type: 'platform-api-ready';
+};
+
 /**
  * Configurations for API injection.
  *
  * @interface
  */
-declare type Api = {
+declare type ApiSettings = {
     /**
-     * Configure injection of OpenFin API into iframes based on domain
+     * Configure conditional injection of OpenFin API into iframes
      */
     iframe?: {
         /**
@@ -114,41 +142,6 @@ declare type Api = {
     fin?: InjectionType;
 };
 
-declare type ApiCall<Request, Response> = {
-    request: Request;
-    response: Response;
-};
-
-declare type ApiClient<T extends Record<any, any>> = {
-    [key in keyof PickOfType<T, Function>]: (...args: Parameters<T[key]>) => ReturnType<T[key]> extends Promise<any> ? ReturnType<T[key]> : Promise<ReturnType<T[key]>>;
-};
-
-/**
- * @interface
- *
- * Rules for domain-conditional `fin` API injection.
- */
-declare type ApiInjection = {
-    /**
-     * Injection setting for the `fin` API for contexts on a matched domain.
-     *
-     * * 'none': The `fin` API will be not available.
-     * * 'global': The entire `fin` API will be available.
-     *
-     * @defaultValue 'global'
-     */
-    fin: InjectionType;
-};
-
-/**
- * Generated when a new Platform's API becomes responsive.
- * @interface
- */
-declare type ApiReadyEvent = BaseEvent & {
-    topic: 'application';
-    type: 'platform-api-ready';
-};
-
 /**
  * @interface
  */
@@ -187,31 +180,6 @@ declare type AppAssetRequest = {
     alias: string;
 };
 
-declare interface AppIdentifier {
-    /** The unique application identifier located within a specific application directory instance. An example of an appId might be 'app@sub.root' */
-    readonly appId: string;
-    /** An optional instance identifier, indicating that this object represents a specific instance of the application described. */
-    readonly instanceId?: string;
-}
-
-/**
- * An interface that relates an intent to apps
- */
-declare interface AppIntent {
-    readonly intent: IntentMetadata;
-    readonly apps: Array<AppMetadata>;
-}
-
-/**
- * An interface that relates an intent to apps
- */
-declare interface AppIntent_2 {
-    /** Details of the intent whose relationship to resolving applications is being described. */
-    readonly intent: IntentMetadata_2;
-    /** Details of applications that can resolve the intent. */
-    readonly apps: Array<AppMetadata_2>;
-}
-
 /**
  * An object representing an application. Allows the developer to create,
  * execute, show/close an application as well as listen to {@link OpenFin.ApplicationEvents application events}.
@@ -972,7 +940,7 @@ declare type ApplicationIdentity_2 = {
  * @interface
  */
 declare type ApplicationInfo = {
-    initialOptions: ApplicationCreationOptions | PlatformOptions;
+    initialOptions: WithUserAppConfigArgs & (ApplicationCreationOptions | PlatformOptions);
     launchMode: string;
     manifest: Manifest & {
         [key: string]: any;
@@ -1428,60 +1396,6 @@ declare type ApplySnapshotPayload = {
     options?: ApplySnapshotOptions;
 };
 
-/**
- * App definition as provided by the application directory
- */
-declare interface AppMetadata {
-    /** The unique app name that can be used with the open and raiseIntent calls. */
-    readonly name: string;
-    /** The unique application identifier located within a specific application directory instance. An example of an appId might be 'app@sub.root' */
-    readonly appId?: string;
-    /** The Version of the application. */
-    readonly version?: string;
-    /** A more user-friendly application title that can be used to render UI elements  */
-    readonly title?: string;
-    /**  A tooltip for the application that can be used to render UI elements */
-    readonly tooltip?: string;
-    /** A longer, multi-paragraph description for the application that could include markup */
-    readonly description?: string;
-    /** A list of icon URLs for the application that can be used to render UI elements */
-    readonly icons?: Array<string>;
-    /** A list of image URLs for the application that can be used to render UI elements */
-    readonly images?: Array<string>;
-}
-
-/**
- * Extends an `AppIdentifier`, describing an application or instance of an application, with additional descriptive metadata that is usually provided by an FDC3 App Directory that the desktop agent connects to.
- *
- * The additional information from an app directory can aid in rendering UI elements, such as a launcher menu or resolver UI. This includes a title, description, tooltip and icon and screenshot URLs.
- *
- * Note that as `AppMetadata` instances are also `AppIdentifiers` they may be passed to the `app` argument of `fdc3.open`, `fdc3.raiseIntent` etc.
- */
-declare interface AppMetadata_2 extends AppIdentifier {
-    /**
-     The 'friendly' app name.
-     This field was used with the `open` and `raiseIntent` calls in FDC3 <2.0, which now require an `AppIdentifier` wth `appId` set.
-     Note that for display purposes the `title` field should be used, if set, in preference to this field.
-     */
-    readonly name?: string;
-    /** The Version of the application. */
-    readonly version?: string;
-    /** An optional set of, implementation specific, metadata fields that can be used to disambiguate instances, such as a window title or screen position. Must only be set if `instanceId` is set. */
-    readonly instanceMetadata?: Record<string, any>;
-    /** A more user-friendly application title that can be used to render UI elements  */
-    readonly title?: string;
-    /**  A tooltip for the application that can be used to render UI elements */
-    readonly tooltip?: string;
-    /** A longer, multi-paragraph description for the application that could include markup */
-    readonly description?: string;
-    /** A list of icon URLs for the application that can be used to render UI elements */
-    readonly icons?: Array<Icon>;
-    /** Images representing the app in common usage scenarios that can be used to render UI elements  */
-    readonly screenshots?: Array<Image_2>;
-    /** The type of output returned for any intent specified during resolution. May express a particular context type (e.g. "fdc3.instrument"), channel (e.g. "channel") or a channel that will receive a specified type (e.g. "channel<fdc3.instrument>"). */
-    readonly resultType?: string | null;
-}
-
 /**
  * @interface
  */
@@ -2408,25 +2322,7 @@ declare class Channel extends EmitterBase<ChannelEvent> {
 
 declare type Channel_2 = OpenFin.Fin['InterApplicationBus']['Channel'];
 
-declare interface Channel_3 {
-    id: string;
-    type: string;
-    displayMetadata?: DisplayMetadata;
-    broadcast(context: Context): void;
-    getCurrentContext(contextType?: string): Promise<Context | null>;
-    addContextListener(contextType: string | null, handler: ContextHandler): Listener & Promise<Listener>;
-}
-
-declare interface Channel_4 {
-    readonly id: string;
-    readonly type: 'user' | 'app' | 'private';
-    readonly displayMetadata?: DisplayMetadata_2;
-    broadcast(context: Context_2): Promise<void>;
-    getCurrentContext(contextType?: string): Promise<Context_2 | null>;
-    addContextListener(contextType: string | null, handler: ContextHandler_2): Listener_2 & Promise<Listener_2>;
-}
-
-declare type Channel_5 = OpenFin.Fin['InterApplicationBus']['Channel'];
+declare type Channel_3 = OpenFin.Fin['InterApplicationBus']['Channel'];
 
 declare type ChannelAction = OpenFin.ChannelAction;
 
@@ -2743,7 +2639,7 @@ declare class ChannelClient extends ChannelBase {
     /**
      * @internal
      */
-    constructor(routingInfo: OpenFin.RoutingInfo, wire: Transport, strategy: AnyStrategy);
+    constructor(routingInfo: OpenFin.RoutingInfo, close: () => Promise<void>, strategy: AnyStrategy);
     protected processAction: (action: string, payload: any, senderIdentity: OpenFin.ProviderIdentity | OpenFin.ClientIdentity) => Promise<any>;
     /**
      * a read-only provider identity
@@ -2809,6 +2705,11 @@ declare class ChannelClient extends ChannelBase {
      */
     disconnect(): Promise<void>;
     sendDisconnectAction(): Promise<void>;
+    /**
+     * @internal
+     * Writing this as a static to keep code together, but in environments with a wire, this will be DI'd into the protectedObject class as close.
+     */
+    static wireClose(wire: Transport, providerIdentity: OpenFin.ProviderIdentity, endpointId: string): Promise<void>;
 }
 
 declare type ChannelClient_2 = OpenFin.ChannelClient;
@@ -2896,7 +2797,7 @@ declare class ChannelProvider extends ChannelBase {
     /**
      * @internal
      */
-    constructor(providerIdentity: ProviderIdentity_3, wire: Transport, strategy: AnyStrategy);
+    constructor(providerIdentity: ProviderIdentity_3, close: () => Promise<void>, strategy: AnyStrategy);
     /**
      * Dispatch an action to a specified client. Returns a promise for the result of executing that action on the client side.
      *
@@ -3052,6 +2953,7 @@ declare class ChannelProvider extends ChannelBase {
     private getEndpointIdForOpenFinId;
     private static clientIdentityIncludesEndpointId;
     private static clientIsMultiRuntime;
+    static wireClose(wire: Transport, channelName: string): Promise<void>;
 }
 
 declare type ChannelProviderDisconnectionListener = (identity: ProviderIdentity_4) => any;
@@ -3553,7 +3455,7 @@ declare type ConstViewOptions = {
     /**
      * Configurations for API injection.
      */
-    api: Api;
+    api: ApiSettings;
     /**
      * The name of the view.
      */
@@ -3973,7 +3875,23 @@ declare interface Container extends EventEmitter_2 {
     close(): boolean;
 }
 
-declare type ContentCreationBehaviorNames = 'window' | 'view' | 'block' | 'browser';
+/**
+ * Generated when content navigation or redirection is blocked by {@link OpenFin.DomainSettings}.
+ */
+declare type ContentBlockedEvent = NamedEvent & {
+    type: 'content-blocked';
+    /**
+     * The domain whose content was blocked.
+     */
+    url: string;
+};
+
+declare type ContentCreationBehavior = 'window' | 'view' | 'block' | 'browser';
+
+/**
+ * @deprecated Renamed to {@link ContentCreationBehavior}.
+ */
+declare type ContentCreationBehaviorNames = ContentCreationBehavior;
 
 /**
  * Configures how new content (e,g, from `window.open` or a link) is opened.
@@ -3997,7 +3915,7 @@ declare type ContentCreationOptions = {
  * @typeParam Behavior The way content governed by this rule will be created.  If provided, this type will narrow to
  * the specified `behavior` key.
  */
-declare type ContentCreationRule<Behavior extends ContentCreationBehaviorNames = ContentCreationBehaviorNames> = Extract<WindowContentCreationRule | ViewContentCreationRule | BrowserContentCreationRule | BlockedContentCreationRule, {
+declare type ContentCreationRule<Behavior extends ContentCreationBehavior = ContentCreationBehavior> = Extract<WindowContentCreationRule | ViewContentCreationRule | BrowserContentCreationRule | BlockedContentCreationRule, {
     behavior: Behavior;
 }>;
 
@@ -4247,39 +4165,39 @@ declare interface ContentItem extends EventEmitter_2 {
  * In the lack of an allowlist, navigation to URLs that match a denied pattern would be prohibited.
  * See [here](https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns) for more details.
  *
+ * @remarks Superseded by {@link DomainSettingsRule.content}.  If {@link DomainSettings.default} includes a
+ * `content` setting, this setting will be **ignored**.
+ *
  * @interface
  */
 declare type ContentNavigation = NavigationRules;
 
+/**
+ * Whether a content url is allowed or blocked for navigation or redirection.
+ *
+ * * 'allow': The content url is allowed.
+ * * 'block': The content url is blocked.
+ */
+declare type ContentPermission = 'allow' | 'block';
+
 /**
  * Restrict redirects to URLs that match an allowed pattern.
  * In the lack of an allowlist, redirects to URLs that match a denied pattern would be prohibited.
  * See [here](https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns) for more details.
  *
+ * @remarks Superseded by {@link DomainSettingsRule.content}.  If {@link DomainSettings.default} includes a
+ * `content` setting, this setting will be **ignored**.
+ *
  * @interface
  */
 declare type ContentRedirect = NavigationRules;
 
-declare interface Context {
-    id?: { [key: string]: string };
-    name?: string;
-    type: string;
-}
-
-declare interface Context_2 {
-    id?: { [key: string]: string };
-    name?: string;
-    type: string;
-    contextMetadata?: ContextMetadata;
-    metadata?: any;
-}
-
 /**
  * Data passed between entities and applications.
  *
  * @interface
  */
-declare type Context_3 = {
+declare type Context = {
     /**
      * An object containing string key-value pairs for the bulk of the data for the context. Differs between context types.
      */
@@ -4308,7 +4226,7 @@ declare type ContextChangedEvent = BaseEvent_5 & {
 /**
  * @interface
  */
-declare type ContextForIntent<MetadataType = any> = Context_3 & {
+declare type ContextForIntent<MetadataType = any> = Context & {
     metadata?: MetadataType;
 };
 
@@ -4324,23 +4242,19 @@ declare type ContextGroupInfo = {
     /**
      * Metadata for the Context Group. Contains the group's human-readable name, color, and an image, as defined by the Interop Broker.
      */
-    displayMetadata?: DisplayMetadata_3;
+    displayMetadata?: DisplayMetadata;
 };
 
 declare type ContextGroupStates = {
     [key: string]: {
-        [key: string]: Context_3;
+        [key: string]: Context;
     };
 };
 
-declare type ContextHandler = (context: Context) => void;
-
-declare type ContextHandler_2 = (context: Context_2, metadata?: ContextMetadata) => void;
-
 /**
  * Subscription function for addContextHandler.
  */
-declare type ContextHandler_3 = (context: Context_3) => void;
+declare type ContextHandler = (context: Context) => void;
 
 /**
  * Configure the context menu when right-clicking on a window.
@@ -4379,20 +4293,6 @@ declare type ContextMenuSettings = {
     reload?: boolean;
 };
 
-/**
- * Metadata relating to a context or intent and context received through the
- * `addContextListener` and `addIntentListener` functions.
- *
- * @experimental Introduced in FDC3 2.0 and may be refined by further changes outside the normal FDC3 versioning policy.
- */
-declare interface ContextMetadata {
-    /** Identifier for the app instance that sent the context and/or intent.
-     *
-     *  @experimental
-     */
-    readonly source: AppIdentifier;
-}
-
 /**
  * @interface
  */
@@ -4639,45 +4539,6 @@ declare type DefaultDomainSettings = DomainSettings;
  */
 declare type DefaultDomainSettingsRule = DomainSettingsRule;
 
-declare interface DesktopAgent {
-    open(app: TargetApp, context?: Context): Promise<void>;
-    findIntent(intent: string, context?: Context): Promise<AppIntent>;
-    findIntentsByContext(context: Context): Promise<Array<AppIntent>>;
-    broadcast(context: Context): void;
-    raiseIntent(intent: string, context: Context, app?: TargetApp): Promise<IntentResolution>;
-    raiseIntentForContext(context: Context, app?: TargetApp): Promise<IntentResolution>;
-    addIntentListener(intent: string, handler: ContextHandler): Listener;
-    joinChannel(channelId: string): Promise<void>;
-    leaveCurrentChannel(): Promise<void>;
-    getInfo(): ImplementationMetadata;
-    addContextListener(contextType: string | null, handler: ContextHandler): Listener & Promise<Listener>;
-    getOrCreateChannel(channelId: string): Promise<Channel_3>;
-    getSystemChannels(): Promise<SystemChannel[]>;
-    getCurrentChannel(): Promise<Channel_3 | null>;
-}
-
-declare interface DesktopAgent_2 {
-    open(app: AppIdentifier | TargetApp, context?: Context_2): Promise<AppIdentifier>;
-    findIntent(intent: string, context?: Context_2, resultType?: string): Promise<AppIntent_2>;
-    findIntentsByContext(context: Context_2, resultType?: string): Promise<Array<AppIntent_2>>;
-    findInstances(app: AppIdentifier): Promise<Array<AppIdentifier>>;
-    broadcast(context: Context_2): Promise<void>;
-    raiseIntent(intent: string, context: Context_2, app?: AppIdentifier | TargetApp): Promise<IntentResolution_2>;
-    raiseIntentForContext(context: Context_2, app?: AppIdentifier | TargetApp): Promise<IntentResolution_2>;
-    addIntentListener(intent: string, handler: IntentHandler): Promise<Listener_2>;
-    addContextListener(contextType: string | null, handler: ContextHandler_2): Promise<Listener_2>;
-    getUserChannels(): Promise<Array<SystemChannel>>;
-    joinUserChannel(channelId: string): Promise<void>;
-    getOrCreateChannel(channelId: string): Promise<Channel_4>;
-    createPrivateChannel(): Promise<PrivateChannel>;
-    getCurrentChannel(): Promise<Channel_3 | null>;
-    leaveCurrentChannel(): Promise<void>;
-    getInfo(): Promise<ImplementationMetadata_2>;
-    getAppMetadata(app: AppIdentifier): Promise<AppMetadata_2>;
-    getSystemChannels(): Promise<Array<SystemChannel>>;
-    joinChannel(channelId: string): Promise<void>;
-}
-
 /**
  * Generated when the desktop icon is clicked while it's already running.
  * @interface
@@ -4822,52 +4683,12 @@ declare type DisconnectedEvent_3 = BaseFrameEvent & {
     type: 'disconnected';
 };
 
-/**
- * A system channel will be global enough to have a presence across many apps. This gives us some hints
- * to render them in a standard way. It is assumed it may have other properties too, but if it has these,
- * this is their meaning.
- */
-declare interface DisplayMetadata {
-    /**
-     * A user-readable name for this channel, e.g: `"Red"`
-     */
-    readonly name?: string;
-    /**
-     * The color that should be associated within this channel when displaying this channel in a UI, e.g: `0xFF0000`.
-     */
-    readonly color?: string;
-    /**
-     * A URL of an image that can be used to display this channel
-     */
-    readonly glyph?: string;
-}
-
-/**
- * A system channel will be global enough to have a presence across many apps. This gives us some hints
- * to render them in a standard way. It is assumed it may have other properties too, but if it has these,
- * this is their meaning.
- */
-declare interface DisplayMetadata_2 {
-    /**
-     * A user-readable name for this channel, e.g: `"Red"`
-     */
-    readonly name?: string;
-    /**
-     * The color that should be associated within this channel when displaying this channel in a UI, e.g: `0xFF0000`.
-     */
-    readonly color?: string;
-    /**
-     * A URL of an image that can be used to display this channel
-     */
-    readonly glyph?: string;
-}
-
 /**
  * The display data for a context group.
  *
  * @interface
  */
-declare type DisplayMetadata_3 = {
+declare type DisplayMetadata = {
     /**
      * A user-readable name for this context group, e.g: `"Red"`
      */
@@ -4882,6 +4703,25 @@ declare type DisplayMetadata_3 = {
     readonly glyph?: string;
 };
 
+/**
+ * @interface
+ *
+ * Rules for domain-conditional `fin` API injection.
+ *
+ * @remarks Subset of {@link DomainSettings}.
+ */
+declare type DomainApiSettings = {
+    /**
+     * Injection setting for the `fin` API for contexts on a matched domain.
+     *
+     * * 'none': The `fin` API will be not available.
+     * * 'global': The entire `fin` API will be available.
+     *
+     * @defaultValue 'global'
+     */
+    fin: InjectionType;
+};
+
 /**
  * @interface
  * Defines application settings that vary by the domain of the current context.
@@ -4894,6 +4734,10 @@ declare type DomainSettings = {
      * {@inheritDoc DomainSettingsRule}
      */
     rules: DomainSettingsRule[];
+    /**
+     * Default values for settings in {@link DomainSettingsRule}.
+     */
+    default?: PerDomainSettings;
 };
 
 /**
@@ -4906,22 +4750,11 @@ declare type DomainSettingsRule = {
      * Array of [match patterns](https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns) specifying
      * the domain(s) for which the rule applies.
      */
-    match: string[];
+    match?: string[];
     /**
      * Settings applied when a webcontents has been navigated to a matched domain.
      */
-    options: {
-        /**
-         * {@inheritDoc FileDownloadSettings}
-         *
-         * @remarks See: https://developers.openfin.co/of-docs/docs/file-download#manifest-properties-for-file-downloads
-         */
-        downloadSettings?: FileDownloadSettings;
-        /**
-         * {@inheritDoc ApiInjection}
-         */
-        api?: ApiInjection;
-    };
+    options: PerDomainSettings;
 };
 
 /**
@@ -4959,18 +4792,19 @@ declare type DownloadPreloadOption = {
 /**
  * @interface
  *
- * A rule governing domain-conditional download behavior.
+ * A rule that governs download behavior, discriminated by the URL of the download.
  */
 declare type DownloadRule = {
     /**
-     * {@inheritDoc FileDownloadBehaviorNames}
+     * {@inheritDoc FileDownloadBehavior}
      */
-    behavior: FileDownloadBehaviorNames;
+    behavior: FileDownloadBehavior;
     /**
      * Array of [match patterns](https://developer.chrome.com/docs/extensions/develop/concepts/match-patterns) specifying
-     * the domain(s) for which the rule applies.
+     * URL(s) of the resource(s) being downloaded.
      *
-     * @remarks The match is evaluated against the URL of the *download*.
+     * @remarks The match is evaluated against the URL of the *file*, which is not necessarily the same as that
+     * of the page in which a file download link is embedded.
      */
     match: string[];
 };
@@ -5250,7 +5084,7 @@ declare interface Environment {
     getWsConstructor(): typeof WebSocket;
     whenReady(): Promise<void>;
     getInteropInfo(fin: OpenFin.Fin<OpenFin.EntityType>): Promise<InternalInteropBrokerOptions & {
-        fdc3Version?: Fdc3Version;
+        fdc3Version?: Version;
     }>;
     readonly type: EnvironmentType;
 }
@@ -5318,7 +5152,7 @@ declare type Event_4 = (WebContentsEvents.Event<'view'> & {
  */
 declare type Event_5<Topic extends string> = {
     topic: Topic;
-} & (BlurredEvent | CertificateSelectionShownEvent | CrashedEvent_2 | DidChangeThemeColorEvent | FocusedEvent | NavigationRejectedEvent | UrlChangedEvent | DidFailLoadEvent | DidFinishLoadEvent | PageFaviconUpdatedEvent | PageTitleUpdatedEvent | ResourceLoadFailedEvent | ResourceResponseReceivedEvent | ChildContentBlockedEvent | ChildContentOpenedInBrowserEvent | ChildViewCreatedEvent | ChildWindowCreatedEvent | FileDownloadStartedEvent | FileDownloadProgressEvent | FileDownloadCompletedEvent | FoundInPageEvent | CertificateErrorEvent);
+} & (BlurredEvent | CertificateSelectionShownEvent | CrashedEvent_2 | DidChangeThemeColorEvent | FocusedEvent | NavigationRejectedEvent | UrlChangedEvent | DidFailLoadEvent | DidFinishLoadEvent | PageFaviconUpdatedEvent | PageTitleUpdatedEvent | ResourceLoadFailedEvent | ResourceResponseReceivedEvent | ChildContentBlockedEvent | ChildContentOpenedInBrowserEvent | ChildViewCreatedEvent | ChildWindowCreatedEvent | FileDownloadStartedEvent | FileDownloadProgressEvent | FileDownloadCompletedEvent | FoundInPageEvent | CertificateErrorEvent | ContentBlockedEvent | WillRedirectEvent);
 
 /**
  *  [Union](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types) containing every possible event that can be emitted by a {@link Window}.  Events are
@@ -5676,8 +5510,9 @@ declare type FaviconUpdatedEvent = PageFaviconUpdatedEvent;
 
 declare namespace FDC3 {
     export {
-        v1,
-        v2
+        Version,
+        v1_2,
+        v2_0
     }
 }
 
@@ -5720,7 +5555,8 @@ export declare function fdc3FromFin(fin: OpenFin.Fin<OpenFin.EntityType>, { fdc3
  * }
  * ```
  */
-export declare class Fdc3Module extends Base implements v1.DesktopAgent {
+export declare class Fdc3Module extends FDC3ModuleBase<v1_2.Channel> implements v1_2.DesktopAgent {
+    open(app: v1_2.TargetApp, context?: v1_2.Context): Promise<void>;
     /**
      * Add a context handler for incoming context. If an entity is part of a context group, and then sets its context handler, it will receive all of its declared contexts. If you wish to listen for all incoming contexts, pass `null` for the contextType argument.
      * @param contextType - The type of context you wish to handle.
@@ -5729,42 +5565,7 @@ export declare class Fdc3Module extends Base implements v1.DesktopAgent {
      * @tutorial fdc3.addContextListener
      * @static
      */
-    addContextListener(contextType: string | null, handler: v1.ContextHandler): v1.Listener & Promise<v1.Listener>;
-    /**
-     * Broadcasts a context for the channel of the current entity.
-     * @param context - New context to set.
-     *
-     * @tutorial fdc3.broadcast
-     * @static
-     */
-    broadcast(context: v1.Context): Promise<void>;
-    /**
-     * Returns the Interop-Broker-defined context groups available for an entity to join.
-     *
-     * @tutorial fdc3.getSystemChannels
-     * @static
-     */
-    getSystemChannels(): Promise<v1.SystemChannel[]>;
-    /**
-     * Join all Interop Clients at the given identity to context group `contextGroupId`.
-     * If no target is specified, it adds the sender to the context group.
-     * Because multiple Channel connections/Interop Clients can potentially exist at a `uuid`/`name` combo, we currently join all Channel connections/Interop Clients at the given identity to the context group.
-     * If an `endpointId` is provided (which is unlikely, unless the call is coming from an external adapter), then we only join that single connection to the context group.
-     * For all intents and purposes, there will only be 1 connection present in Platform and Browser implementations, so this point is more-or-less moot.
-     * @param channelId - Id of the context group.
-     *
-     * @tutorial fdc3.joinChannel
-     * @static
-     */
-    joinChannel(channelId: string): Promise<void>;
-    /**
-     * Removes the specified target from a context group.
-     * If no target is specified, it removes the sender from their context group.
-     *
-     * @tutorial fdc3.leaveCurrentChannel
-     * @static
-     */
-    leaveCurrentChannel(): Promise<void>;
+    addContextListener(contextType: string | null, handler: v1_2.ContextHandler): v1_2.Listener & Promise<v1_2.Listener>;
     /**
      * Adds a listener for incoming Intents.
      * @param intent - Name of the Intent
@@ -5773,7 +5574,7 @@ export declare class Fdc3Module extends Base implements v1.DesktopAgent {
      * @tutorial fdc3.addIntentListener
      * @static
      */
-    addIntentListener(intent: string, handler: v1.ContextHandler): v1.Listener & Promise<v1.Listener>;
+    addIntentListener(intent: string, handler: v1_2.ContextHandler): v1_2.Listener & Promise<v1_2.Listener>;
     /**
      * Raises a specific intent.
      * @param intent Name of the Intent.
@@ -5783,13 +5584,7 @@ export declare class Fdc3Module extends Base implements v1.DesktopAgent {
      * @tutorial fdc3.raiseIntent
      * @static
      */
-    raiseIntent(intent: string, context: v1.Context, app?: v1.TargetApp): Promise<v1.IntentResolution>;
-    /**
-     * Returns the Channel that the entity is subscribed to. Returns null if not joined to a channel.
-     *
-     * @tutorial fdc3.getCurrentChannel
-     */
-    getCurrentChannel(): Promise<v1.Channel | null>;
+    raiseIntent(intent: string, context: v1_2.Context, app?: v1_2.TargetApp): Promise<v1_2.IntentResolution>;
     /**
      * Find out more information about a particular intent by passing its name, and optionally its context.
      * @param intent Name of the Intent
@@ -5797,14 +5592,14 @@ export declare class Fdc3Module extends Base implements v1.DesktopAgent {
      *
      * @tutorial fdc3.findIntent
      */
-    findIntent(intent: string, context?: v1.Context): Promise<v1.AppIntent>;
+    findIntent(intent: string, context?: v1_2.Context): Promise<v1_2.AppIntent>;
     /**
      * Find all the available intents for a particular context.
      * @param context
      *
      * @tutorial fdc3.findIntentsByContext
      */
-    findIntentsByContext(context: v1.Context): Promise<Array<v1.AppIntent>>;
+    findIntentsByContext(context: v1_2.Context): Promise<Array<v1_2.AppIntent>>;
     /**
      * Finds and raises an intent against a target app based purely on context data.
      * @param context
@@ -5812,30 +5607,20 @@ export declare class Fdc3Module extends Base implements v1.DesktopAgent {
      *
      * @tutorial fdc3.raiseIntentForContext
      */
-    raiseIntentForContext(context: v1.Context, app?: v1.TargetApp): Promise<v1.IntentResolution>;
+    raiseIntentForContext(context: v1_2.Context, app?: v1_2.TargetApp): Promise<v1_2.IntentResolution>;
     /**
      * Returns a Channel object for the specified channel, creating it as an App Channel if it does not exist.
      * @param channelId
      *
      * @tutorial fdc3.getOrCreateChannel
      */
-    getOrCreateChannel(channelId: string): Promise<v1.Channel>;
+    getOrCreateChannel(channelId: string): Promise<v1_2.Channel>;
     /**
      * 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.
      *
      * @tutorial fdc3.getInfo
      */
-    getInfo(): v1.ImplementationMetadata;
-    /**
-     * Launches an app with target information, which can either be a string or an AppMetadata object.
-     * @param app
-     * @param context
-     *
-     * @tutorial fdc3.open
-     */
-    open(app: v1.TargetApp, context?: v1.Context): Promise<void>;
-    private getCurrentContextGroupInfo;
-    private buildChannelObject;
+    getInfo(): v1_2.ImplementationMetadata;
 }
 
 /**
@@ -5873,9 +5658,7 @@ export declare class Fdc3Module extends Base implements v1.DesktopAgent {
  * }
  * ```
  */
-export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
-    private fdc3Module;
-    constructor(wire: Transport);
+export declare class Fdc3Module2 extends FDC3ModuleBase<v2_0.Channel> implements v2_0.DesktopAgent {
     /**
      * Launches an app, specified via an AppIdentifier object.
      * @param app
@@ -5883,28 +5666,28 @@ export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
      *
      * @tutorial fdc3.open
      */
-    open(app: v2.AppIdentifier | v1.TargetApp, context?: v2.Context): Promise<v2.AppIdentifier>;
+    open(app: v2_0.AppIdentifier | string, context?: v2_0.Context): Promise<v2_0.AppIdentifier>;
     /**
      * Find all the available instances for a particular application.
      * @param app
      *
      * @tutorial fdc3v2.findInstances
      */
-    findInstances(app: v2.AppIdentifier): Promise<Array<v2.AppIdentifier>>;
+    findInstances(app: v2_0.AppIdentifier): Promise<Array<v2_0.AppIdentifier>>;
     /**
      * Retrieves the AppMetadata for an AppIdentifier, which provides additional metadata (such as icons, a title and description) from the App Directory record for the application, that may be used for display purposes.
      * @param app
      *
      * @tutorial fdc3v2.getAppMetadata
      */
-    getAppMetadata(app: v2.AppIdentifier): Promise<v2.AppMetadata>;
+    getAppMetadata(app: v2_0.AppIdentifier): Promise<v2_0.AppMetadata>;
     /**
      * Broadcasts a context for the channel of the current entity.
      * @param context - New context to set.
      *
      * @tutorial fdc3.broadcast
      */
-    broadcast(context: v2.Context): Promise<void>;
+    broadcast(context: v2_0.Context): Promise<void>;
     /**
      * Add a context handler for incoming context. If an entity is part of a context group, and then sets its context handler, it will receive all of its declared contexts. If you wish to listen for all incoming contexts, pass `null` for the contextType argument.
      * @param contextType
@@ -5912,7 +5695,7 @@ export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
      *
      * @tutorial fdc3.addContextListener
      */
-    addContextListener(contextType: string | null, handler: v2.ContextHandler): Promise<v2.Listener>;
+    addContextListener(contextType: string | null, handler: v2_0.ContextHandler): Promise<v2_0.Listener>;
     /**
      * Find out more information about a particular intent by passing its name, and optionally its context and resultType.
      * @param intent Name of the Intent
@@ -5921,7 +5704,7 @@ export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
      *
      * @tutorial fdc3.findIntent
      */
-    findIntent(intent: string, context?: v2.Context, resultType?: string): Promise<v2.AppIntent>;
+    findIntent(intent: string, context?: v2_0.Context, resultType?: string): Promise<v2_0.AppIntent>;
     /**
      * Find all the available intents for a particular context.
      * @param context
@@ -5929,7 +5712,7 @@ export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
      *
      * @tutorial fdc3v2.findIntentsByContext
      */
-    findIntentsByContext(context: v2.Context, resultType?: string): Promise<Array<v2.AppIntent>>;
+    findIntentsByContext(context: v2_0.Context, resultType?: string): Promise<Array<v2_0.AppIntent>>;
     /**
      * Raises a specific intent for resolution against apps registered with the desktop agent.
      * @param intent Name of the Intent
@@ -5938,7 +5721,7 @@ export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
      *
      * @tutorial fdc3v2.raiseIntent
      */
-    raiseIntent(intent: string, context: v2.Context, app?: v2.AppIdentifier | v1.TargetApp): Promise<v2.IntentResolution>;
+    raiseIntent(intent: string, context: v2_0.Context, app?: v2_0.AppIdentifier | string): Promise<v2_0.IntentResolution>;
     /**
      * Finds and raises an intent against apps registered with the desktop agent based purely on the type of the context data.
      * @param context Context associated with the Intent
@@ -5946,7 +5729,7 @@ export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
      *
      * @tutorial fdc3v2.raiseIntentForContext
      */
-    raiseIntentForContext(context: v2.Context, app?: v2.AppIdentifier | v1.TargetApp): Promise<v2.IntentResolution>;
+    raiseIntentForContext(context: v2_0.Context, app?: v2_0.AppIdentifier | string): Promise<v2_0.IntentResolution>;
     /**
      * Adds a listener for incoming intents.
      * @param intent  Name of the Intent
@@ -5954,33 +5737,33 @@ export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
      *
      * @tutorial fdc3.addIntentListener
      */
-    addIntentListener(intent: string, handler: v2.IntentHandler): Promise<v1.Listener>;
+    addIntentListener(intent: string, handler: v2_0.IntentHandler): Promise<v2_0.Listener>;
     /**
      * Returns a Channel object for the specified channel, creating it as an App Channel if it does not exist.
      * @param channelId
      *
      * @tutorial fdc3.getOrCreateChannel
      */
-    getOrCreateChannel(channelId: string): Promise<v2.Channel>;
+    getOrCreateChannel(channelId: string): Promise<v2_0.Channel>;
     /**
      * 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.
      *
      * @tutorial fdc3v2.createPrivateChannel
      */
-    createPrivateChannel(): Promise<v2.PrivateChannel>;
+    createPrivateChannel(): Promise<v2_0.PrivateChannel>;
     /**
      * Retrieves a list of the User Channels available for the app to join.
      *
      * @tutorial fdc3v2.getUserChannels
      */
-    getUserChannels(): Promise<Array<v1.SystemChannel>>;
+    getUserChannels(): Promise<Array<v2_0.Channel>>;
     /**
      * Retrieves a list of the User Channels available for the app to join.
      *
      * @deprecated Please use {@link fdc3.getUserChannels fdc3.getUserChannels} instead
      * @tutorial fdc3.getSystemChannels
      */
-    getSystemChannels(): Promise<Array<v1.SystemChannel>>;
+    getSystemChannels(): Promise<Array<v2_0.Channel>>;
     /**
      * Join an app to a specified User channel.
      * @param channelId Channel name
@@ -6001,23 +5784,83 @@ export declare class Fdc3Module2 extends Base implements v2.DesktopAgent {
      *
      * @tutorial fdc3.getCurrentChannel
      */
-    getCurrentChannel(): Promise<v2.Channel | null>;
-    /**
-     * Removes the app from any User channel membership.
-     *
-     * @tutorial fdc3.leaveCurrentChannel
-     */
-    leaveCurrentChannel(): Promise<void>;
+    getCurrentChannel(): Promise<v2_0.Channel | null>;
     /**
      * 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.
      *
      * @tutorial fdc3v2.getInfo
      */
-    getInfo(): Promise<v2.ImplementationMetadata>;
+    getInfo(): Promise<v2_0.ImplementationMetadata>;
 }
 
-export declare type Fdc3Version = '1.2' | '2.0';
+declare class FDC3ModuleBase<ChannelType extends v1_2.Channel | v2_0.Channel> {
+    #private;
+    protected wire: Transport;
+    protected get client(): InteropClient;
+    protected get fin(): OpenFin.Fin;
+    constructor(producer: () => InteropClient, wire: Transport);
+    /**
+     * Broadcasts a context for the channel of the current entity.
+     * @param context - New context to set.
+     *
+     * @tutorial fdc3.broadcast
+     * @static
+     */
+    broadcast(context: v1_2.Context): Promise<void>;
+    /**
+     * Launches an app with target information, which can either be a string or an AppMetadata object.
+     * @param app
+     * @param context
+     *
+     * @tutorial fdc3.open
+     */
+    protected _open(app: v1_2.TargetApp, context?: v1_2.Context): Promise<v2_0.AppIdentifier>;
+    /**
+     * Returns a Channel object for the specified channel, creating it as an App Channel if it does not exist.
+     * @param channelId
+     *
+     * @tutorial fdc3.getOrCreateChannel
+     */
+    getOrCreateChannel(channelId: string): Promise<ChannelType>;
+    /**
+     * Returns the Interop-Broker-defined context groups available for an entity to join.
+     *
+     * @tutorial fdc3.getSystemChannels
+     * @static
+     */
+    getSystemChannels(): Promise<ChannelType[]>;
+    /**
+     * Join all Interop Clients at the given identity to context group `contextGroupId`.
+     * If no target is specified, it adds the sender to the context group.
+     * Because multiple Channel connections/Interop Clients can potentially exist at a `uuid`/`name` combo, we currently join all Channel connections/Interop Clients at the given identity to the context group.
+     * If an `endpointId` is provided (which is unlikely, unless the call is coming from an external adapter), then we only join that single connection to the context group.
+     * For all intents and purposes, there will only be 1 connection present in Platform and Browser implementations, so this point is more-or-less moot.
+     * @param channelId - Id of the context group.
+     *
+     * @tutorial fdc3.joinChannel
+     * @static
+     */
+    joinChannel(channelId: string): Promise<void>;
+    /**
+     * Returns the Channel that the entity is subscribed to. Returns null if not joined to a channel.
+     *
+     * @tutorial fdc3.getCurrentChannel
+     */
+    getCurrentChannel(): Promise<ChannelType | null>;
+    /**
+     * Removes the specified target from a context group.
+     * If no target is specified, it removes the sender from their context group.
+     *
+     * @tutorial fdc3.leaveCurrentChannel
+     * @static
+     */
+    leaveCurrentChannel(): Promise<void>;
+    private getCurrentContextGroupInfo;
+    private buildChannelObject;
+}
+
+export declare type Fdc3Version = OpenFin.FDC3.Version;
 
 /**
  * @interface
@@ -6032,7 +5875,12 @@ declare type FetchManifestPayload = {
 /**
  * Whether file downloads raise a user prompt.
  */
-declare type FileDownloadBehaviorNames = 'prompt' | 'no-prompt';
+declare type FileDownloadBehavior = 'prompt' | 'no-prompt';
+
+/**
+ * @deprecated Renamed to {@link FileDownloadBehavior}.
+ */
+declare type FileDownloadBehaviorNames = FileDownloadBehavior;
 
 /**
  * Generated when a file download has completed.
@@ -6217,8 +6065,8 @@ declare type FindInPageResult = {
 /**
  * @interface
  */
-declare type FindIntentsByContextOptions<MetadataType = IntentMetadata_3> = {
-    context: Context_3;
+declare type FindIntentsByContextOptions<MetadataType = IntentMetadata> = {
+    context: Context;
     metadata?: MetadataType;
 };
 
@@ -6663,6 +6511,20 @@ declare class GoldenLayout_2 implements EventEmitter_2 {
 
     dropTargetIndicator: any;
 
+    _isFullPage: boolean;
+
+    _onUnload: any;
+
+    tabDropPlaceholder: any;
+
+    transitionIndicator: any;
+
+    _dragSources: any;
+
+    _resizeFunction: any;
+
+    _unloadFunction: any;
+
     /**
      * @param config A GoldenLayout configuration object
      * @param container The DOM element the layout will be initialised in. Default: document.body
@@ -6991,15 +6853,6 @@ declare type HotkeyEvent_2 = InputEvent_2 & BaseEvent_5 & {
     type: 'hotkey';
 };
 
-declare interface Icon {
-    /** The icon url */
-    readonly src: string;
-    /** The icon dimension, formatted as `<height>x<width>`. */
-    readonly size?: string;
-    /** Icon media type. If not present the Desktop Agent may use the src file extension. */
-    readonly type?: string;
-}
-
 declare type Identity = OpenFin.Identity;
 
 declare type Identity_2 = OpenFin.Identity;
@@ -7061,17 +6914,6 @@ declare type IdleStateChangedEvent = BaseEvent_9 & {
     isIdle: boolean;
 };
 
-declare interface Image_2 {
-    /** The image url. */
-    readonly src: string;
-    /** The image dimension, formatted as `<height>x<width>`. */
-    readonly size?: string;
-    /** Image media type. If not present the Desktop Agent may use the src file extension. */
-    readonly type?: string;
-    /** Caption for the image. */
-    readonly label?: string;
-}
-
 declare type ImageFormatOptions = {
     format: 'dataURL' | 'png' | 'bmp';
 } | {
@@ -7082,57 +6924,15 @@ declare type ImageFormatOptions = {
     quality?: number;
 };
 
-/**
- * Metadata relating to the FDC3 Desktop Agent implementation and its provider.
- */
-declare interface ImplementationMetadata {
-    /** The version number of the FDC3 specification that the implementation provides.
-     *  The string must be a numeric semver version, e.g. 1.2 or 1.2.1.
-     */
-    readonly fdc3Version: string;
-    /** The name of the provider of the FDC3 Desktop Agent Implementation (e.g. Finsemble, Glue42, OpenFin etc.). */
-    readonly provider: string;
-    /** The version of the provider of the FDC3 Desktop Agent Implementation (e.g. 5.3.0). */
-    readonly providerVersion?: string;
-}
-
-/**
- * Metadata relating to the FDC3 Desktop Agent implementation and its provider.
- */
-declare interface ImplementationMetadata_2 {
-    /** The version number of the FDC3 specification that the implementation provides.
-     *  The string must be a numeric semver version, e.g. 1.2 or 1.2.1.
-     */
-    readonly fdc3Version: string;
-    /** The name of the provider of the Desktop Agent implementation (e.g. Finsemble, Glue42, OpenFin etc.). */
-    readonly provider: string;
-    /** The version of the provider of the Desktop Agent implementation (e.g. 5.3.0). */
-    readonly providerVersion?: string;
-    /** Metadata indicating whether the Desktop Agent implements optional features of
-     *  the Desktop Agent API.
-     */
-    readonly optionalFeatures: {
-        /** Used to indicate whether the exposure of 'originating app metadata' for
-         *  context and intent messages is supported by the Desktop Agent. */
-        readonly OriginatingAppMetadata: boolean;
-        /** Used to indicate whether the optional `fdc3.joinUserChannel`,
-         *  `fdc3.getCurrentChannel` and `fdc3.leaveCurrentChannel` are implemented by
-         *  the Desktop Agent. */
-        readonly UserChannelMembershipAPIs: boolean;
-    };
-    /** The calling application instance's own metadata, according to the Desktop Agent (MUST include at least the `appId` and `instanceId`). */
-    readonly appMetadata: AppMetadata_2;
-}
-
 /**
  * @interface
  */
-declare type InfoForIntentOptions<MetadataType = IntentMetadata_3> = {
+declare type InfoForIntentOptions<MetadataType = IntentMetadata> = {
     /**
      * Name of the intent to get info for.
      */
     name: string;
-    context?: Context_3;
+    context?: Context;
     metadata?: MetadataType;
 };
 
@@ -7240,16 +7040,10 @@ declare type InstalledApps_2 = {
     [key: string]: InstallationInfo;
 };
 
-declare interface Intent {
-    name: string;
-    context: Context_2;
-    metadata: IntentMetadata_2;
-}
-
 /**
  * Combination of an action and a context that is passed to an application for resolution.
  */
-declare type Intent_2<MetadataType = IntentMetadata_3> = {
+declare type Intent<MetadataType = IntentMetadata> = {
     /**
      * Name of the intent.
      */
@@ -7257,54 +7051,25 @@ declare type Intent_2<MetadataType = IntentMetadata_3> = {
     /**
      * Data associated with the intent.
      */
-    context: Context_3;
+    context: Context;
     metadata?: MetadataType;
 };
 
-declare type IntentHandler = (context: Context_2, metadata?: ContextMetadata) => Promise<IntentResult> | void;
-
 /**
  * Subscription function for registerIntentHandler.
  */
-declare type IntentHandler_2 = (intent: Intent_2) => void;
+declare type IntentHandler = (intent: Intent) => void;
 
 /**
- * Intent descriptor
+ * The type used to describe an intent within the platform.
+ * @interface
  */
-declare interface IntentMetadata {
-    /** The unique name of the intent that can be invoked by the raiseIntent call */
-    readonly name: string;
-    /** A friendly display name for the intent that should be used to render UI elements */
-    readonly displayName: string;
-}
-
-declare type IntentMetadata_2<TargetType = any> = {
+declare type IntentMetadata<TargetType = any> = {
     target?: TargetType;
     resultType?: string;
     intentResolutionResultId?: string;
 };
 
-/**
- * The type used to describe an intent within the platform.
- * @interface
- */
-declare type IntentMetadata_3<TargetType = any> = FDC3.v2.IntentMetadata<TargetType>;
-
-declare interface IntentResolution {
-    source: TargetApp;
-    data?: object;
-    version: string;
-}
-
-declare interface IntentResolution_2 {
-    source: AppIdentifier;
-    intent: string;
-    version?: string;
-    getResult(): Promise<IntentResult>;
-}
-
-declare type IntentResult = Context_2 | Channel_4 | PrivateChannel;
-
 /**
  * A messaging bus that allows for pub/sub messaging between different applications.
  *
@@ -7562,7 +7327,6 @@ declare type InteropActionLoggingOption = {
  */
 declare class InteropBroker extends Base {
     #private;
-    private getProvider;
     private interopClients;
     private contextGroupsById;
     private intentClientMap;
@@ -7573,7 +7337,8 @@ declare class InteropBroker extends Base {
     /**
      * @internal
      */
-    constructor(wire: Transport, getProvider: () => Promise<OpenFin.ChannelProvider>, options: InternalInteropBrokerOptions);
+    constructor(wire: Transport, createProvider: () => Promise<OpenFin.ChannelProvider>, options: InternalInteropBrokerOptions);
+    private getProvider;
     static createClosedConstructor(...args: ConstructorParameters<typeof InteropBroker>): {
         new (): InteropBroker;
     };
@@ -7878,23 +7643,23 @@ declare class InteropBroker extends Base {
      * @param clientIdentity Identity of the Client making the request.
      */
     fdc3HandleOpen({ app, context }: {
-        app: FDC3.v1.TargetApp | FDC3.v2.AppIdentifier;
+        app: FDC3.v1_2.TargetApp | FDC3.v2_0.AppIdentifier;
         context: OpenFin.Context;
-    }, clientIdentity: OpenFin.ClientIdentity): Promise<void | FDC3.v2.AppIdentifier>;
+    }, clientIdentity: OpenFin.ClientIdentity): Promise<void | FDC3.v2_0.AppIdentifier>;
     /**
      * Responsible for resolving the fdc3.findInstances call.
      * Must be overridden
      * @param app AppIdentifier that was passed to fdc3.findInstances
      * @param clientIdentity Identity of the Client making the request.
      */
-    fdc3HandleFindInstances(app: FDC3.v2.AppIdentifier, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
+    fdc3HandleFindInstances(app: FDC3.v2_0.AppIdentifier, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
     /**
      * Responsible for resolving the fdc3.getAppMetadata call.
      * Must be overridden
      * @param app AppIdentifier that was passed to fdc3.getAppMetadata
      * @param clientIdentity Identity of the Client making the request.
      */
-    fdc3HandleGetAppMetadata(app: FDC3.v2.AppIdentifier, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
+    fdc3HandleGetAppMetadata(app: FDC3.v2_0.AppIdentifier, clientIdentity: OpenFin.ClientIdentity): Promise<unknown>;
     /**
      * This function is called by the Interop Broker whenever a Context handler would fire.
      * For FDC3 2.0 you would need to override this function and add the contextMetadata as
@@ -8139,7 +7904,7 @@ declare class InteropClient extends Base {
     /**
      * @internal
      */
-    constructor(wire: Transport, name: string, interopConfig?: OpenFin.InteropConfig);
+    constructor(wire: Transport, clientPromise: Promise<OpenFin.ChannelClient>);
     /**
      * Sets a context for the context group of the current entity.
      *
@@ -8199,9 +7964,7 @@ declare class InteropClient extends Base {
      * ```
      *
      *
-     * We are also testing the ability to add a context handler for specific contexts. If you would like to use
-     * this, please make sure you add your context handlers at the top level of your application, on a page that
-     * does not navigate/reload/re-render, to avoid memory leaks.  This feature is experimental:
+     * Passing in a context type as the second parameter will cause the handler to only be invoked with that context type.
      *
      * ```js
      * function handleInstrumentContext(contextInfo) {
@@ -8491,6 +8254,23 @@ declare class InteropClient extends Base {
      * ```
      */
     onDisconnection(listener: OpenFin.InteropClientOnDisconnectionListener): Promise<void>;
+    /**
+     * Returns a representation of this Interop Client as an FDC3 DesktopAgent matching the given version.
+     * Note that this does not set a global FDC3 object, it only returns an instance of the FDC3 DesktopAgent.
+     * This also does not raise the FDC3Ready event.
+     */
+    getFDC3Sync(version: '2.0'): OpenFin.FDC3.v2_0.DesktopAgent;
+    getFDC3Sync(version: '1.2'): OpenFin.FDC3.v1_2.DesktopAgent;
+    getFDC3Sync(version: OpenFin.FDC3.Version): OpenFin.FDC3.v1_2.DesktopAgent | OpenFin.FDC3.v2_0.DesktopAgent;
+    /**
+     *
+     * Returns a representation of this Interop Client as an FDC3 DesktopAgent matching the given version.
+     * Note that this does not set a global FDC3 object, it only returns an instance of the FDC3 DesktopAgent.
+     * This also does not raise the FDC3Ready event.
+     */
+    getFDC3(version: '2.0'): Promise<OpenFin.FDC3.v2_0.DesktopAgent>;
+    getFDC3(version: '1.2'): Promise<OpenFin.FDC3.v1_2.DesktopAgent>;
+    getFDC3(version: OpenFin.FDC3.Version): Promise<OpenFin.FDC3.v1_2.DesktopAgent | OpenFin.FDC3.v2_0.DesktopAgent>;
     /**
      * @internal
      *
@@ -9716,21 +9496,7 @@ declare type LayoutSnapshot = {
  */
 declare type LegacyWinOptionsInAppOptions = Pick<WindowCreationOptions, 'accelerator' | 'alwaysOnTop' | 'api' | 'aspectRatio' | 'autoplayPolicy' | 'autoShow' | 'backgroundColor' | 'contentNavigation' | 'contextMenu' | 'cornerRounding' | 'customData' | 'customRequestHeaders' | 'defaultCentered' | 'defaultHeight' | 'defaultLeft' | 'defaultTop' | 'defaultWidth' | 'frame' | 'hideOnClose' | 'icon' | 'maxHeight' | 'maximizable' | 'maxWidth' | 'minHeight' | 'minimizable' | 'minWidth' | 'opacity' | 'preloadScripts' | 'resizable' | 'resizeRegion' | 'saveWindowState' | 'ignoreSavedWindowState' | 'shadow' | 'showTaskbarIcon' | 'smallWindow' | 'state' | 'taskbarIconGroup' | 'waitForPageLoad' | '_internalWorkspaceData'>;
 
-declare interface Listener {
-    /**
-     * Unsubscribe the listener object.
-     */
-    unsubscribe(): void;
-}
-
-declare interface Listener_2 {
-    /**
-     * Unsubscribe the listener object.
-     */
-    unsubscribe(): void;
-}
-
-declare type Listener_3<T extends {
+declare type Listener<T extends {
     type: string;
 }> = (payload: T) => void;
 
@@ -10119,7 +9885,7 @@ declare type MutableViewOptions = {
     /**
      * Configurations for API injection.
      */
-    api: Api;
+    api: ApiSettings;
     /**
      * Restrict navigation to URLs that match an allowed pattern.
      * In the lack of an allowlist, navigation to URLs that match a denylisted pattern would be prohibited.
@@ -10519,6 +10285,7 @@ declare namespace OpenFin {
     export {
         FinApi,
         Fin,
+        FDC3,
         Application,
         ApplicationModule,
         ExternalApplication,
@@ -10570,11 +10337,11 @@ declare namespace OpenFin {
         CustomProtocolOptions,
         InteropBrokerOptions,
         ContextGroupInfo,
-        DisplayMetadata_3 as DisplayMetadata,
+        DisplayMetadata,
         LegacyWinOptionsInAppOptions,
         Snapshot,
         ContextGroupStates,
-        Context_3 as Context,
+        Context,
         MonitorInfo,
         Point,
         PointTopLeft,
@@ -10601,6 +10368,7 @@ declare namespace OpenFin {
         ResizeRegion,
         Accelerator,
         Api,
+        ApiSettings,
         InjectionType,
         NavigationRules,
         ContentNavigation,
@@ -10707,6 +10475,7 @@ declare namespace OpenFin {
         AppVersionError,
         AppVersionRuntimeInfo,
         LaunchEmitter,
+        UserAppConfigArgs,
         RvmLaunchOptions,
         ShortCutConfig,
         TerminateExternalRequestType,
@@ -10752,14 +10521,19 @@ declare namespace OpenFin {
         DefaultDomainSettingsRule,
         DomainSettings,
         ApiInjection,
+        DomainApiSettings,
+        ContentPermission,
+        PerDomainSettings,
         DomainSettingsRule,
+        FileDownloadBehavior,
         FileDownloadBehaviorNames,
         FileDownloadSettings,
         DownloadRule,
-        ContextHandler_3 as ContextHandler,
-        Intent_2 as Intent,
-        IntentMetadata_3 as IntentMetadata,
-        IntentHandler_2 as IntentHandler,
+        ContextHandler,
+        Intent,
+        IntentMetadata,
+        IntentHandler,
+        ContentCreationBehavior,
         ContentCreationBehaviorNames,
         MatchPattern,
         BaseContentCreationRule,
@@ -10979,6 +10753,31 @@ declare type Payload_9<Type extends EventType_8> = Extract<Event_11, {
     type: Type;
 }>;
 
+/**
+ * @interface
+ *
+ * Conditional settings for a domain or set of domains.
+ */
+declare type PerDomainSettings = {
+    /**
+     * {@inheritDoc FileDownloadSettings}
+     *
+     * @remarks See: https://developers.openfin.co/of-docs/docs/file-download#manifest-properties-for-file-downloads
+     */
+    downloadSettings?: FileDownloadSettings;
+    /**
+     * {@inheritDoc ApiInjection}
+     */
+    api?: DomainApiSettings;
+    /**
+     * Whether DOM content can be loaded (by navigation or redirect).
+     *
+     * @remarks If this is included in {@link DomainSettings.default}, then {@link ContentNavigation} and
+     * {@link ContentRedirect} will be **ignored**.
+     */
+    content?: ContentPermission;
+};
+
 /**
  * Generated when window finishes loading. Provides performance and navigation data.
  * @interface
@@ -11017,7 +10816,7 @@ declare class Platform extends EmitterBase<OpenFin.PlatformEvent> {
     /**
      * @internal
      */
-    constructor(identity: OpenFin.ApplicationIdentity, channel: Channel_5);
+    constructor(identity: OpenFin.ApplicationIdentity, channel: Channel_3);
     getClient: (identity?: OpenFin.ApplicationIdentity) => Promise<ChannelClient_2>;
     /**
      * Creates a new view and attaches it to a specified target window.
@@ -12793,14 +12592,6 @@ declare type PrintOptions = {
     dpi?: Dpi;
 };
 
-declare type PrivateChannel = Omit<Channel_4, 'addContextListener'> & {
-    addContextListener(contextType: string | null, handler: ContextHandler_2): Promise<Listener_2>;
-    onAddContextListener(handler: (contextType?: string) => void): Listener_2;
-    onUnsubscribe(handler: (contextType?: string) => void): Listener_2;
-    onDisconnect(handler: () => void): Listener_2;
-    disconnect(): void;
-};
-
 /**
  * Strategy to assign views to process affinity by domain.
  *
@@ -13569,7 +13360,7 @@ declare type RunRequestedEvent = OpenFin.ApplicationEvents.RunRequestedEvent;
 declare type RunRequestedEvent_2 = BaseEvents.IdentityEvent & {
     topic: 'application';
     type: 'run-requested';
-    userAppConfigArgs: Record<string, any>;
+    userAppConfigArgs: OpenFin.UserAppConfigArgs;
     manifest: OpenFin.Manifest;
 };
 
@@ -13684,7 +13475,7 @@ declare type RvmLaunchOptions = {
      * True if no UI when launching
      */
     noUi?: boolean;
-    userAppConfigArgs?: object;
+    userAppConfigArgs?: UserAppConfigArgs;
     /**
      * Timeout in seconds until RVM launch request expires.
      */
@@ -13766,19 +13557,19 @@ declare type SessionContextGroup = {
      * A SessionContextGroup instance method for setting a context in the SessionContextGroup.
      * @param context The Context to be set.
      */
-    setContext: (context: Context_3) => Promise<void>;
+    setContext: (context: Context) => Promise<void>;
     /**
      * A SessionContextGroup instance method for getting the current context of a certain type.
      * @param type The Context Type to get. If not specified the last contextType set would get used.
      */
-    getCurrentContext: (type?: string) => Promise<Context_3>;
+    getCurrentContext: (type?: string) => Promise<Context>;
     /**
      * A SessionContextGroup instance method for adding a handler for context change.
      * @param handler The callback to be invoked. Is invoked when (a) the context changes or (b) immediately after getting created if the context is already set.
      * @param contextType The context type this handler should listen to. If not specified, a global handler for all context types will get created. Only one global handler is allowed per SessionContextGroup.
      *
      */
-    addContextHandler: (handler: ContextHandler_3, contextType?: string) => Promise<{
+    addContextHandler: (handler: ContextHandler, contextType?: string) => Promise<{
         unsubscribe: () => void;
     }>;
 };
@@ -15671,12 +15462,6 @@ declare class System extends EmitterBase<OpenFin.SystemEvent> {
     setDomainSettings(domainSettings: OpenFin.DefaultDomainSettings): Promise<void>;
 }
 
-declare type SystemChannel = Omit<Channel_3, 'addContextListener' | 'broadcast' | 'getCurrentContext'> & {
-    addContextListener(): Error;
-    broadcast(): Error;
-    getCurrentContext(): Error;
-};
-
 /**
  * @deprecated Renamed to {@link Event}.
  */
@@ -15955,8 +15740,6 @@ declare class TabStack extends LayoutNode {
     setActiveView: (view: OpenFin.Identity) => Promise<void>;
 }
 
-declare type TargetApp = string | AppMetadata;
-
 /**
  * Generated when a View changes its window target.
  * @remarks This event will fire during creation of a View.
@@ -16154,13 +15937,13 @@ declare type tween = 'linear' | 'ease-in' | 'ease-out' | 'ease-in-out' | 'ease-i
 declare interface TypedEventEmitter<Event extends {
     type: string;
 }, EmitterEventType = Event['type']> {
-    on<EventType extends EmitterEventType>(event: EventType, listener: Listener_3<Extract<Event, {
+    on<EventType extends EmitterEventType>(event: EventType, listener: Listener<Extract<Event, {
         type: EventType;
     }>>): this;
-    addListener<EventType extends EmitterEventType>(event: EventType, listener: Listener_3<Extract<Event, {
+    addListener<EventType extends EmitterEventType>(event: EventType, listener: Listener<Extract<Event, {
         type: EventType;
     }>>): this;
-    removeListener<EventType extends EmitterEventType>(event: EventType, listener: Listener_3<Extract<Event, {
+    removeListener<EventType extends EmitterEventType>(event: EventType, listener: Listener<Extract<Event, {
         type: EventType;
     }>>): this;
     removeAllListeners<EventType extends EmitterEventType>(event?: EmitterEventType): this;
@@ -16203,6 +15986,11 @@ declare type UrlChangedEvent = BaseUrlEvent & ({
     httpStatusText: string;
 });
 
+/**
+ * @interface
+ */
+declare type UserAppConfigArgs = Record<string, string | string[]>;
+
 /**
  * A general user bounds change event without event type.
  * @interface
@@ -16231,45 +16019,102 @@ declare type UserMovementEnabledEvent = BaseEvent_5 & {
     type: 'user-movement-enabled';
 };
 
-declare namespace v1 {
-    export {
-        Listener,
-        AppMetadata,
-        IntentMetadata,
+declare namespace v1_2 {
+        {
         AppIntent,
+        AppMetadata,
         DisplayMetadata,
+        OpenError,
+        ResolveError,
+        ChannelError,
         ImplementationMetadata,
-        ContextHandler,
-        TargetApp,
+        IntentMetadata,
+        Listener,
+        ContextTypes,
+        ContextType,
         Context,
+        ContactList,
+        Contact,
+        ContactID,
+        InstrumentList,
+        Instrument,
+        InstrumentID,
+        Country,
+        CountryID,
+        Organization,
+        OrganizationID,
+        Portfolio,
+        Position,
+        Convert,
+        Intents,
+        Channel,
+        DesktopAgent,
         IntentResolution,
-        Channel_3 as Channel,
-        SystemChannel,
-        DesktopAgent
+        TargetApp,
+        ContextHandler
     }
 }
 
-declare namespace v2 {
-    export {
-        IntentMetadata_2 as IntentMetadata,
+declare namespace v2_0 {
+        {
         AppIdentifier,
-        Listener_2 as Listener,
         AppIntent_2 as AppIntent,
-        ImplementationMetadata_2 as ImplementationMetadata,
+        AppMetadata_2 as AppMetadata,
         ContextMetadata,
+        DisplayMetadata_2 as DisplayMetadata,
+        OpenError_2 as OpenError,
+        ResolveError_2 as ResolveError,
+        ResultError,
+        ChannelError_2 as ChannelError,
         Icon,
         Image_2 as Image,
-        AppMetadata_2 as AppMetadata,
-        DisplayMetadata_2 as DisplayMetadata,
-        ContextHandler_2 as ContextHandler,
-        IntentHandler,
-        IntentResult,
+        ImplementationMetadata_2 as ImplementationMetadata,
+        IntentMetadata_2 as IntentMetadata,
+        Listener_2 as Listener,
+        ContextTypes_2 as ContextTypes,
+        ContextType_2 as ContextType,
+        Chart,
+        InstrumentElement,
+        PurpleID,
+        PurpleMarket,
+        TimeRangeObject,
+        Style,
+        ChatInitSettings,
+        ContactListObject,
+        ContactElement,
+        FluffyID,
+        Contact_2 as Contact,
+        TentacledID,
+        ContactList_2 as ContactList,
         Context_2 as Context,
-        Intent,
+        Country_2 as Country,
+        CountryID_2 as CountryID,
+        Currency,
+        CurrencyID,
+        Email,
+        RecipientsObject,
+        RecipientsID,
+        Instrument_2 as Instrument,
+        StickyID,
+        FluffyMarket,
+        InstrumentList_2 as InstrumentList,
+        Nothing,
+        Organization_2 as Organization,
+        OrganizationID_2 as OrganizationID,
+        Portfolio_2 as Portfolio,
+        PositionElement,
+        Position_2 as Position,
+        TimeRange,
+        Valuation,
+        Convert_2 as Convert,
+        Intents_2 as Intents,
+        Channel_2 as Channel,
+        DesktopAgent_2 as DesktopAgent,
         IntentResolution_2 as IntentResolution,
-        Channel_4 as Channel,
         PrivateChannel,
-        DesktopAgent_2 as DesktopAgent
+        ContextHandler_2 as ContextHandler,
+        IntentResult,
+        IntentHandler
     }
 }
 
@@ -16278,6 +16123,13 @@ declare type VerboseWebPermission = {
     enabled: boolean;
 };
 
+declare type Version = (typeof versions)[keyof typeof versions];
+
+declare const versions: {
+    readonly v1_2: "1.2";
+    readonly v2_0: "2.0";
+};
+
 declare type View = OpenFin.View;
 
 /**
@@ -18016,10 +17868,12 @@ declare namespace WebContentsEvents {
         FileDownloadStartedEvent,
         FileDownloadProgressEvent,
         FileDownloadCompletedEvent,
+        ContentBlockedEvent,
         Event_5 as Event,
         WebContentsEvent,
         WillPropagateWebContentsEvent,
-        NonPropagatedWebContentsEvent
+        NonPropagatedWebContentsEvent,
+        WillRedirectEvent
     }
 }
 
@@ -18097,14 +17951,15 @@ declare type WillPropagateWebContentsEvent = Event_5<string>;
 declare type WillPropagateWindowEvent = WindowSourcedEvent;
 
 /**
- * Generated when window is being redirected as per contentRedirect allowlist/denylist rules.
+ * Generated whenever a redirection occurs.
  * @interface
  */
-declare type WillRedirectEvent = BaseEvent_5 & {
+declare type WillRedirectEvent = NamedEvent & {
     type: 'will-redirect';
     blocked: boolean;
     isInPlace: boolean;
     url: string;
+    isMainFrame: boolean;
 };
 
 /**
@@ -18129,10 +17984,6 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      * @internal
      */
     constructor(wire: Transport, identity: OpenFin.Identity);
-    /**
-     * create a new window
-     * @internal
-     */
     createWindow(options: OpenFin.WindowCreationOptions): Promise<OpenFin.Window>;
     /**
      * Retrieves an array of frame info objects representing the main frame and any
@@ -19256,7 +19107,6 @@ declare namespace WindowEvents {
         AlertRequestedEvent,
         AuthRequestedEvent,
         EndLoadEvent,
-        WillRedirectEvent,
         ReloadedEvent,
         OptionsChangedEvent,
         WindowOptionsChangedEvent_2 as WindowOptionsChangedEvent,
@@ -19512,7 +19362,7 @@ declare type WindowShowRequestedEvent = ShowRequestedEvent;
  * A union of all events that emit natively on the `Window` topic, i.e. excluding those that propagate
  * from {@link OpenFin.ViewEvents}.
  */
-declare type WindowSourcedEvent = WebContentsEvents.Event<'window'> | WindowViewEvent | AuthRequestedEvent | BeginUserBoundsChangingEvent | BoundsChangedEvent | BoundsChangingEvent | ContextChangedEvent | CloseRequestedEvent | ClosedEvent_2 | ClosingEvent | DisabledMovementBoundsChangedEvent | DisabledMovementBoundsChangingEvent | EmbeddedEvent | EndUserBoundsChangingEvent | ExternalProcessExitedEvent | ExternalProcessStartedEvent | HiddenEvent_2 | HotkeyEvent_2 | InitializedEvent_2 | LayoutInitializedEvent | LayoutReadyEvent | MaximizedEvent | MinimizedEvent | OptionsChangedEvent | PerformanceReportEvent | PreloadScriptsStateChangedEvent | PreloadScriptsStateChangingEvent | ReloadedEvent | RestoredEvent | ShowRequestedEvent | ShownEvent_2 | UserMovementDisabledEvent | UserMovementEnabledEvent | WillMoveEvent | WillRedirectEvent | WillResizeEvent | ShowAllDownloadsEvent | DownloadShelfVisibilityChangedEvent;
+declare type WindowSourcedEvent = WebContentsEvents.Event<'window'> | WindowViewEvent | AuthRequestedEvent | BeginUserBoundsChangingEvent | BoundsChangedEvent | BoundsChangingEvent | ContextChangedEvent | CloseRequestedEvent | ClosedEvent_2 | ClosingEvent | DisabledMovementBoundsChangedEvent | DisabledMovementBoundsChangingEvent | EmbeddedEvent | EndUserBoundsChangingEvent | ExternalProcessExitedEvent | ExternalProcessStartedEvent | HiddenEvent_2 | HotkeyEvent_2 | InitializedEvent_2 | LayoutInitializedEvent | LayoutReadyEvent | MaximizedEvent | MinimizedEvent | OptionsChangedEvent | PerformanceReportEvent | PreloadScriptsStateChangedEvent | PreloadScriptsStateChangingEvent | ReloadedEvent | RestoredEvent | ShowRequestedEvent | ShownEvent_2 | UserMovementDisabledEvent | UserMovementEnabledEvent | WillMoveEvent | WillResizeEvent | ShowAllDownloadsEvent | DownloadShelfVisibilityChangedEvent;
 
 /**
  * Generated when a child window starts loading.
@@ -19573,6 +19423,32 @@ declare type WithPositioningOptions<T extends {} = {}> = T & {
     positioningOptions?: OpenFin.PositioningOptions;
 };
 
+declare type WithUserAppConfigArgs = {
+    /**
+     * Represents the key-value pairs for the parameters passed into any fin:// or fins:// link
+     * that launches this application.
+     *
+     * @remarks
+     * In the link, user defined parameters are separated by the `$$` delimeter, for example:
+     * `fins://path.to/app/manifest.json?$$use-last-configuration=true`
+     *
+     * Results in the following object:
+     * ```json
+     * {
+     *    "use-last-configuration": true"
+     * }
+     * ```
+     *
+     * These args can be accessed via the {@link ApplicationInfo.initialOptions} object:
+     * ```typescript
+     * const appInfo = await fin.Application.getCurrentSync().getInfo();
+     * const { userAppConfigArgs } = appInfo.initialOptions;
+     * console.log(userAppConfigArgs['use-last-configuration']); // 'true'
+     * ```
+     */
+    userAppConfigArgs?: UserAppConfigArgs;
+};
+
 /**
  * @internal
  * @interface