@openfin/remote-adapter 37.80.39 → 37.81.20

package/out/remote-adapter.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;
@@ -3577,7 +3479,7 @@ declare type ConstViewOptions = {
     /**
      * Configurations for API injection.
      */
-    api: Api;
+    api: ApiSettings;
     /**
      * The name of the view.
      */
@@ -3997,7 +3899,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.
@@ -4021,7 +3939,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;
 }>;
 
@@ -4271,39 +4189,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.
      */
@@ -4332,7 +4250,7 @@ declare type ContextChangedEvent = BaseEvent_5 & {
 /**
  * @interface
  */
-declare type ContextForIntent<MetadataType = any> = Context_3 & {
+declare type ContextForIntent<MetadataType = any> = Context & {
     metadata?: MetadataType;
 };
 
@@ -4348,23 +4266,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.
@@ -4403,20 +4317,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
  */
@@ -4663,45 +4563,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
@@ -4846,52 +4707,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"`
      */
@@ -4906,6 +4727,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.
@@ -4918,6 +4758,10 @@ declare type DomainSettings = {
      * {@inheritDoc DomainSettingsRule}
      */
     rules: DomainSettingsRule[];
+    /**
+     * Default values for settings in {@link DomainSettingsRule}.
+     */
+    default?: PerDomainSettings;
 };
 
 /**
@@ -4930,22 +4774,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;
 };
 
 /**
@@ -4983,18 +4816,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[];
 };
@@ -5274,7 +5108,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;
 }
@@ -5342,7 +5176,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
@@ -5700,13 +5534,12 @@ declare type FaviconUpdatedEvent = PageFaviconUpdatedEvent;
 
 declare namespace FDC3 {
     export {
-        v1,
-        v2
+        Version,
+        v1_2,
+        v2_0
     }
 }
 
-declare type Fdc3Version = '1.2' | '2.0';
-
 /**
  * @interface
  */
@@ -5720,7 +5553,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.
@@ -5905,8 +5743,8 @@ declare type FindInPageResult = {
 /**
  * @interface
  */
-declare type FindIntentsByContextOptions<MetadataType = IntentMetadata_3> = {
-    context: Context_3;
+declare type FindIntentsByContextOptions<MetadataType = IntentMetadata> = {
+    context: Context;
     metadata?: MetadataType;
 };
 
@@ -6351,6 +6189,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
@@ -6679,15 +6531,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;
@@ -6749,17 +6592,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';
 } | {
@@ -6770,57 +6602,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;
 };
 
@@ -6949,16 +6739,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.
      */
@@ -6966,54 +6750,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.
  *
@@ -7271,7 +7026,6 @@ declare type InteropActionLoggingOption = {
  */
 declare class InteropBroker extends Base {
     #private;
-    private getProvider;
     private interopClients;
     private contextGroupsById;
     private intentClientMap;
@@ -7282,7 +7036,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;
     };
@@ -7587,23 +7342,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
@@ -7848,7 +7603,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.
      *
@@ -7908,9 +7663,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) {
@@ -8200,6 +7953,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
      *
@@ -9425,21 +9195,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;
 
@@ -9828,7 +9584,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.
@@ -10228,6 +9984,7 @@ declare namespace OpenFin {
     export {
         FinApi,
         Fin,
+        FDC3,
         Application,
         ApplicationModule,
         ExternalApplication,
@@ -10279,11 +10036,11 @@ declare namespace OpenFin {
         CustomProtocolOptions,
         InteropBrokerOptions,
         ContextGroupInfo,
-        DisplayMetadata_3 as DisplayMetadata,
+        DisplayMetadata,
         LegacyWinOptionsInAppOptions,
         Snapshot,
         ContextGroupStates,
-        Context_3 as Context,
+        Context,
         MonitorInfo,
         Point,
         PointTopLeft,
@@ -10310,6 +10067,7 @@ declare namespace OpenFin {
         ResizeRegion,
         Accelerator,
         Api,
+        ApiSettings,
         InjectionType,
         NavigationRules,
         ContentNavigation,
@@ -10416,6 +10174,7 @@ declare namespace OpenFin {
         AppVersionError,
         AppVersionRuntimeInfo,
         LaunchEmitter,
+        UserAppConfigArgs,
         RvmLaunchOptions,
         ShortCutConfig,
         TerminateExternalRequestType,
@@ -10461,14 +10220,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,
@@ -10688,6 +10452,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
@@ -10726,7 +10515,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.
@@ -12502,14 +12291,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.
  *
@@ -13278,7 +13059,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;
 };
 
@@ -13393,7 +13174,7 @@ declare type RvmLaunchOptions = {
      * True if no UI when launching
      */
     noUi?: boolean;
-    userAppConfigArgs?: object;
+    userAppConfigArgs?: UserAppConfigArgs;
     /**
      * Timeout in seconds until RVM launch request expires.
      */
@@ -13475,19 +13256,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;
     }>;
 };
@@ -15380,12 +15161,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}.
  */
@@ -15664,8 +15439,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.
@@ -15863,13 +15636,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;
@@ -15912,6 +15685,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
@@ -15940,45 +15718,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
     }
 }
 
@@ -15987,6 +15822,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;
 
 /**
@@ -17725,10 +17567,12 @@ declare namespace WebContentsEvents {
         FileDownloadStartedEvent,
         FileDownloadProgressEvent,
         FileDownloadCompletedEvent,
+        ContentBlockedEvent,
         Event_5 as Event,
         WebContentsEvent,
         WillPropagateWebContentsEvent,
-        NonPropagatedWebContentsEvent
+        NonPropagatedWebContentsEvent,
+        WillRedirectEvent
     }
 }
 
@@ -17806,14 +17650,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;
 };
 
 /**
@@ -17838,10 +17683,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
@@ -18965,7 +18806,6 @@ declare namespace WindowEvents {
         AlertRequestedEvent,
         AuthRequestedEvent,
         EndLoadEvent,
-        WillRedirectEvent,
         ReloadedEvent,
         OptionsChangedEvent,
         WindowOptionsChangedEvent_2 as WindowOptionsChangedEvent,
@@ -19221,7 +19061,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.
@@ -19282,6 +19122,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