@openfin/core 31.75.1 → 32.75.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/core",
-    "version": "31.75.1",
+    "version": "32.75.2",
     "license": "SEE LICENSE IN LICENSE.MD",
     "main": "./src/mock.js",
     "types": "./src/mock.d.ts",

package/src/OpenFin.d.ts

@@ -48,17 +48,18 @@ export type ClientIdentity = Identity & {
  */
 export type ClientInfo = Omit<ClientIdentity, 'isLocalEndpointId'> & {
     /**
-     * Indicates if the client belongs to a Window or View
+     * Indicates if the client belongs to a Window, View or IFrame
      */
     entityType: EntityType;
     /**
-     * URL of the View or Window at the time of connection to the Channel Provider.
+     * URL of the Window, View or IFrame at the time of connection to the Channel Provider.
      */
     connectionUrl: string;
 };
 export type ClientIdentityMultiRuntime = ClientIdentity & {
     runtimeUuid: string;
 };
+export type ClientConnectionPayload = ClientIdentity & ClientInfo;
 export type EntityInfo = {
     uuid: string;
     name: string;
@@ -1433,6 +1434,7 @@ export type GetWindowContextPayload = {
 };
 export type ApplicationPermissions = {
     setFileDownloadLocation: boolean;
+    getFileDownloadLocation: boolean;
 };
 export type LaunchExternalProcessRule = {
     behavior: 'allow' | 'block';

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

@@ -300,10 +300,22 @@ export declare class Application extends EmitterBase<OpenFin.ApplicationEvent> {
      */
     getProcessInfo(): Promise<OpenFin.AppProcessInfo>;
     /**
-     * Sets file auto download location.
+     * Sets file auto download location. It's only allowed in the same application.
+     * Note: This method is restricted by default and must be enabled via
+     * <a href="https://developers.openfin.co/docs/api-security">API security settings</a>.
      * @param { string } downloadLocation file auto download location
      * @return {Promise.<void>}
+     * @throws if setting file auto download location on different applications.
      * @tutorial Application.setFileDownloadLocation
      */
     setFileDownloadLocation(downloadLocation: string): Promise<void>;
+    /**
+     * Gets file auto download location. It's only allowed in the same application. If file auto download location is not set, it will return the default location.
+     * Note: This method is restricted by default and must be enabled via
+     * <a href="https://developers.openfin.co/docs/api-security">API security settings</a>.
+     * @return {Promise.<string>}
+     * @throws if getting file auto download location on different applications.
+     * @tutorial Application.getFileDownloadLocation
+     */
+    getFileDownloadLocation(): Promise<string>;
 }

package/src/api/application/Instance.js

@@ -146,11 +146,8 @@ class Application extends base_1.EmitterBase {
             await this.wire.sendAction('destroy-application', { force, ...this.identity });
         }
         catch (error) {
-            const acceptableErrors = [
-                'Remote connection has closed',
-                'Could not locate the requested application'
-            ];
-            if (!acceptableErrors.some(msg => error.message.includes(msg))) {
+            const acceptableErrors = ['Remote connection has closed', 'Could not locate the requested application'];
+            if (!acceptableErrors.some((msg) => error.message.includes(msg))) {
                 throw error;
             }
         }
@@ -427,13 +424,30 @@ class Application extends base_1.EmitterBase {
         return data;
     }
     /**
-     * Sets file auto download location.
+     * Sets file auto download location. It's only allowed in the same application.
+     * Note: This method is restricted by default and must be enabled via
+     * <a href="https://developers.openfin.co/docs/api-security">API security settings</a>.
      * @param { string } downloadLocation file auto download location
      * @return {Promise.<void>}
+     * @throws if setting file auto download location on different applications.
      * @tutorial Application.setFileDownloadLocation
      */
     async setFileDownloadLocation(downloadLocation) {
-        await this.wire.sendAction('set-file-download-location', { downloadLocation, ...this.identity });
+        const { name } = this.wire.me;
+        const entityIdentity = { uuid: this.identity.uuid, name };
+        await this.wire.sendAction('set-file-download-location', { ...entityIdentity, downloadLocation });
+    }
+    /**
+     * Gets file auto download location. It's only allowed in the same application. If file auto download location is not set, it will return the default location.
+     * Note: This method is restricted by default and must be enabled via
+     * <a href="https://developers.openfin.co/docs/api-security">API security settings</a>.
+     * @return {Promise.<string>}
+     * @throws if getting file auto download location on different applications.
+     * @tutorial Application.getFileDownloadLocation
+     */
+    async getFileDownloadLocation() {
+        const { payload: { data } } = await this.wire.sendAction('get-file-download-location', this.identity);
+        return data;
     }
 }
 exports.Application = Application;

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

@@ -11,6 +11,9 @@ export type CrashedEvent = NamedEvent & {
         exitCode: number;
     };
 };
+export type FileDownloadLocationChangedEvent = NamedEvent & {
+    type: 'file-download-location-changed';
+};
 export type RunRequestedEvent = IdentityEvent & {
     type: 'run-requested';
     userAppConfigArgs: Record<string, any>;
@@ -70,7 +73,7 @@ export type StartedEvent = IdentityEvent & {
 /**
  * An Application event that does propagate to (republish on) parent topics.
  */
-export type WillPropagateApplicationEvent = ClosedEvent | ApplicationConnectedEvent | CrashedEvent | InitializedEvent | ManifestChangedEvent | NotRespondingEvent | RespondingEvent | RunRequestedEvent | StartedEvent | TrayIconClickedEvent;
+export type WillPropagateApplicationEvent = ClosedEvent | ApplicationConnectedEvent | CrashedEvent | InitializedEvent | ManifestChangedEvent | NotRespondingEvent | RespondingEvent | RunRequestedEvent | StartedEvent | TrayIconClickedEvent | FileDownloadLocationChangedEvent;
 export type ApplicationEvent = {
     topic: 'application';
 } & (PropagatedViewEvent | PropagatedWindowEvent | ApplicationWindowEvent | WillPropagateApplicationEvent);

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

@@ -67,10 +67,6 @@ export type FoundInPageEvent = NamedEvent & {
 } & {
     result: OpenFin.FindInPageResult;
 };
-/**
- * A WebContents event that does not propagate to (republish on) parent topics.
- */
-export type NonPropagatedWebContentsEvent = FoundInPageEvent | CertificateErrorEvent;
 export type BlurredEvent = NamedEvent & {
     type: 'blurred';
 };
@@ -89,9 +85,62 @@ export type ChildContentOpenedInBrowserEvent = NamedEvent & {
 export type ChildViewCreatedEvent = NamedEvent & {
     type: 'child-view-created';
 };
+export type FileDownloadEvent = NamedEvent & {
+    state: 'started' | 'progressing' | 'cancelled' | 'interrupted' | 'completed';
+    /**
+     * The url from which the file is being downloaded.
+     */
+    url: string;
+    mimeType: string;
+    /**
+     * Name used to save the file locally.
+     */
+    fileName: string;
+    /**
+     * Original name of the file.
+     */
+    originalFileName: string;
+    totalBytes: number;
+    /**
+     * The number of seconds since the UNIX epoch when the download was started.
+     */
+    startTime: number;
+    /**
+     * The value of the Content-Disposition field from the response header.
+     */
+    contentDisposition: string;
+    /**
+     * The value of the Last-Modified header.
+     */
+    lastModifiedTime: Date;
+    /**
+     * The value of the ETag header.
+     */
+    eTag: string;
+    /**
+     * The number of bytes of the item that have already been downloaded.
+     */
+    downloadedBytes: number;
+};
+export type FileDownloadStartedEvent = FileDownloadEvent & {
+    type: 'file-download-started';
+    state: 'started';
+};
+export type FileDownloadProgressEvent = FileDownloadEvent & {
+    type: 'file-download-progress';
+    state: 'progressing' | 'interrupted';
+};
+export type FileDownloadCompletedEvent = FileDownloadEvent & {
+    type: 'file-download-completed';
+    state: 'completed' | 'interrupted' | 'cancelled';
+};
 /**
  * A WebContents event that does propagate to (republish on) parent topics.
  */
-export type WillPropagateWebContentsEvent = BlurredEvent | CertificateSelectionShownEvent | CrashedEvent | DidChangeThemeColorEvent | FocusedEvent | NavigationRejectedEvent | UrlChangedEvent | DidFailLoadEvent | DidFinishLoadEvent | FaviconUpdatedEvent | PageTitleUpdatedEvent | ResourceLoadFailedEvent | ResourceResponseReceivedEvent | ChildContentBlockedEvent | ChildContentOpenedInBrowserEvent | ChildViewCreatedEvent;
+export type WillPropagateWebContentsEvent = BlurredEvent | CertificateSelectionShownEvent | CrashedEvent | DidChangeThemeColorEvent | FocusedEvent | NavigationRejectedEvent | UrlChangedEvent | DidFailLoadEvent | DidFinishLoadEvent | FaviconUpdatedEvent | PageTitleUpdatedEvent | ResourceLoadFailedEvent | ResourceResponseReceivedEvent | ChildContentBlockedEvent | ChildContentOpenedInBrowserEvent | ChildViewCreatedEvent | FileDownloadStartedEvent | FileDownloadProgressEvent | FileDownloadCompletedEvent;
+/**
+ * A WebContents event that does not propagate to (republish on) parent topics.
+ */
+export type NonPropagatedWebContentsEvent = FoundInPageEvent | CertificateErrorEvent;
 export type WebContentsEvent = NonPropagatedWebContentsEvent | WillPropagateWebContentsEvent;
 export {};

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

@@ -4,9 +4,9 @@ import { Transport } from '../../../transport/transport';
 import { AnyStrategy } from './protocols/strategy-types';
 type ProviderIdentity = OpenFin.ProviderIdentity;
 type DisconnectionListener = (providerIdentity: ProviderIdentity) => any;
-interface RoutingInfo extends ProviderIdentity {
+export type RoutingInfo = ProviderIdentity & {
     endpointId: string;
-}
+};
 export default class ChannelClient extends ChannelBase {
     #private;
     private disconnectListener;

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

@@ -1,9 +1,9 @@
 import type * as OpenFin from '../../../OpenFin';
-import ChannelClient from './client';
-import { ChannelProvider } from './provider';
+import { Message, Transport } from '../../../transport/transport';
 import { EmitterBase } from '../../base';
-import { Transport, Message } from '../../../transport/transport';
 import { ChannelEvent } from '../../events/channel';
+import ChannelClient from './client';
+import { ChannelProvider } from './provider';
 type ProviderIdentity = OpenFin.ProviderIdentity;
 type Identity = OpenFin.Identity;
 export interface ChannelMessage extends Message<any> {
@@ -15,10 +15,10 @@ export interface ChannelMessage extends Message<any> {
 export declare class Channel extends EmitterBase<ChannelEvent> {
     #private;
     constructor(wire: Transport);
-    private channelExists;
     getAllChannels(): Promise<ProviderIdentity[]>;
     onChannelConnect(listener: (...args: any[]) => void): Promise<void>;
     onChannelDisconnect(listener: (...args: any[]) => void): Promise<void>;
+    private safeConnect;
     connect(channelName: string, options?: OpenFin.ChannelConnectOptions): Promise<ChannelClient>;
     create(channelName: string, options?: OpenFin.ChannelCreateOptions): Promise<ChannelProvider>;
 }

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

@@ -14,12 +14,25 @@ var _Channel_connectionManager, _Channel_internalEmitter, _Channel_readyToConnec
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Channel = void 0;
 /* eslint-disable no-console */
-const client_1 = require("./client");
-const provider_1 = require("./provider");
-const base_1 = require("../../base");
-const connection_manager_1 = require("./connection-manager");
 const events_1 = require("events");
 const lazy_1 = require("../../../util/lazy");
+const base_1 = require("../../base");
+const client_1 = require("./client");
+const connection_manager_1 = require("./connection-manager");
+const provider_1 = require("./provider");
+function retryDelay(count) {
+    const interval = 500; // base delay
+    const steps = 10; // How many retries to do before incrementing the delay
+    const base = 2; // How much to multiply the previous delay by
+    const max = 30000; // max delay
+    const step = Math.floor(count / steps);
+    const delay = Math.min(max, interval * base ** step);
+    return new Promise(resolve => {
+        setTimeout(() => {
+            resolve(false);
+        }, delay);
+    });
+}
 class Channel extends base_1.EmitterBase {
     constructor(wire) {
         super(wire, 'channel');
@@ -38,10 +51,6 @@ class Channel extends base_1.EmitterBase {
         }));
         __classPrivateFieldSet(this, _Channel_connectionManager, new connection_manager_1.ConnectionManager(wire), "f");
     }
-    async channelExists(channelName) {
-        const channels = await this.getAllChannels();
-        return channels.some((providerIdentity) => providerIdentity.channelName === channelName);
-    }
     async getAllChannels() {
         return this.wire.sendAction('get-all-channels').then(({ payload }) => payload.data);
     }
@@ -51,6 +60,57 @@ class Channel extends base_1.EmitterBase {
     async onChannelDisconnect(listener) {
         await this.on('disconnected', listener);
     }
+    async safeConnect(channelName, shouldWait, connectPayload) {
+        const retryInfo = { count: 0 };
+        /* eslint-disable no-await-in-loop, no-constant-condition */
+        do {
+            // setup a listener and a connected promise to await in case we connect before the channel is ready
+            let connectedListener = () => undefined;
+            const connectedPromise = new Promise((resolve) => {
+                connectedListener = (payload) => {
+                    if (channelName === payload.channelName) {
+                        resolve(true);
+                    }
+                };
+                __classPrivateFieldGet(this, _Channel_internalEmitter, "f").on('connected', connectedListener);
+            });
+            try {
+                if (retryInfo.count > 0) {
+                    // Wait before retrying
+                    // Delay returns false connectedPromise returns true so we can know if a retry is due to connected event
+                    retryInfo.gotConnectedEvent = await Promise.race([retryDelay(retryInfo.count), connectedPromise]);
+                    const result = await this.wire.sendAction('connect-to-channel', { ...connectPayload, retryInfo });
+                    // log only if there was a retry
+                    console.log(`Successfully connected to channelName: ${channelName}`);
+                    return result.payload.data;
+                }
+                // Send retryInfo to the core for debug log inclusion
+                const sentMessagePromise = this.wire.sendAction('connect-to-channel', connectPayload);
+                // Save messageId from the first connection attempt
+                retryInfo.originalMessageId = sentMessagePromise.messageId;
+                const result = await sentMessagePromise;
+                return result.payload.data;
+            }
+            catch (error) {
+                if (!error.message.includes('internal-nack')) {
+                    // Not an internal nack, break the loop
+                    throw error;
+                }
+                if (shouldWait && retryInfo.count === 0) {
+                    // start waiting on the next iteration, warn the user
+                    console.warn(`No channel found for channelName: ${channelName}. Waiting for connection...`);
+                }
+            }
+            finally {
+                retryInfo.count += 1;
+                // in case of other errors, remove our listener
+                __classPrivateFieldGet(this, _Channel_internalEmitter, "f").removeListener('connected', connectedListener);
+            }
+        } while (shouldWait); // If we're waiting we retry the above loop
+        // Should wait was false, no channel was found.
+        throw new Error(`No channel found for channelName: ${channelName}.`);
+        /* eslint-enable no-await-in-loop, no-constant-condition */
+    }
     async connect(channelName, options = {}) {
         // Make sure we don't connect before listeners are set up
         // This also errors if we're not in OpenFin, ensuring we don't run unnecessary code
@@ -59,58 +119,35 @@ class Channel extends base_1.EmitterBase {
             throw new Error('Please provide a channelName string to connect to a channel.');
         }
         const opts = { wait: true, ...this.wire.environment.getDefaultChannelOptions().connect, ...options };
-        const shouldWait = opts.wait;
-        if (shouldWait) {
-            const channelExists = await this.channelExists(channelName);
-            if (!channelExists) {
-                console.warn(`Channel not found for channelName: ${channelName}, waiting for channel connection.`);
-                await new Promise((resolve) => {
-                    const connectedListener = (payload) => {
-                        if (channelName === payload.channelName) {
-                            __classPrivateFieldGet(this, _Channel_internalEmitter, "f").removeListener('connected', connectedListener);
-                            resolve();
-                        }
-                    };
-                    __classPrivateFieldGet(this, _Channel_internalEmitter, "f").on('connected', connectedListener);
-                });
-            }
-        }
-        try {
-            const { offer, rtc: rtcPacket } = await __classPrivateFieldGet(this, _Channel_connectionManager, "f").createClientOffer(opts);
-            const connectionUrl = (await this.fin.me.getInfo()).url;
-            const { payload: { data: routingInfo } } = await this.wire.sendAction('connect-to-channel', {
-                channelName,
-                ...opts,
-                offer,
-                connectionUrl
-            });
-            const strategy = await __classPrivateFieldGet(this, _Channel_connectionManager, "f").createClientStrategy(rtcPacket, routingInfo);
-            const channel = new client_1.default(routingInfo, this.wire, strategy);
-            // It is the client's responsibility to handle endpoint disconnection to the provider.
-            // If the endpoint dies, the client will force a disconnection through the core.
-            // The provider does not care about endpoint disconnection.
-            strategy.onEndpointDisconnect(routingInfo.channelId, async () => {
-                try {
-                    await channel.sendDisconnectAction();
-                }
-                catch (error) {
-                    console.warn(`Something went wrong during disconnect for client with uuid: ${routingInfo.uuid} / name: ${routingInfo.name} / endpointId: ${routingInfo.endpointId}.`);
-                }
-                finally {
-                    client_1.default.handleProviderDisconnect(routingInfo);
-                }
-            });
-            return channel;
+        const { offer, rtc: rtcPacket } = await __classPrivateFieldGet(this, _Channel_connectionManager, "f").createClientOffer(opts);
+        let connectionUrl;
+        if (this.fin.me.isFrame || this.fin.me.isView || this.fin.me.isWindow) {
+            connectionUrl = (await this.fin.me.getInfo()).url;
         }
-        catch (error) {
-            const internalNackMessage = 'internal-nack';
-            if (error.message.includes(internalNackMessage)) {
-                throw new Error(`No channel found for channelName: ${channelName}.`);
+        const connectPayload = {
+            channelName,
+            ...opts,
+            offer,
+            connectionUrl
+        };
+        const routingInfo = await this.safeConnect(channelName, opts.wait, connectPayload);
+        const strategy = await __classPrivateFieldGet(this, _Channel_connectionManager, "f").createClientStrategy(rtcPacket, routingInfo);
+        const channel = new client_1.default(routingInfo, this.wire, strategy);
+        // It is the client's responsibility to handle endpoint disconnection to the provider.
+        // If the endpoint dies, the client will force a disconnection through the core.
+        // The provider does not care about endpoint disconnection.
+        strategy.onEndpointDisconnect(routingInfo.channelId, async () => {
+            try {
+                await channel.sendDisconnectAction();
             }
-            else {
-                throw new Error(error);
+            catch (error) {
+                console.warn(`Something went wrong during disconnect for client with uuid: ${routingInfo.uuid} / name: ${routingInfo.name} / endpointId: ${routingInfo.endpointId}.`);
             }
-        }
+            finally {
+                client_1.default.handleProviderDisconnect(routingInfo);
+            }
+        });
+        return channel;
     }
     async create(channelName, options) {
         if (!channelName) {

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

@@ -6,19 +6,18 @@ type ProviderIdentity = OpenFin.ProviderIdentity;
 type ClientIdentity = OpenFin.ClientIdentity;
 export type ConnectionListener = (identity: ClientIdentity, connectionMessage?: any) => Promise<any> | any;
 export type DisconnectionListener = (identity: ClientIdentity) => any;
-type ClientConnectionPayload = OpenFin.ClientIdentity & OpenFin.ClientInfo;
 export declare class ChannelProvider extends ChannelBase {
     #private;
     private static removalMap;
     private connectListener;
     private disconnectListener;
-    get connections(): ClientConnectionPayload[];
+    get connections(): OpenFin.ClientConnectionPayload[];
     static handleClientDisconnection(channel: ChannelProvider, payload: any): void;
     static setProviderRemoval(provider: ChannelProvider, remove: Function): void;
     constructor(providerIdentity: ProviderIdentity, wire: Transport, strategy: AnyStrategy);
     dispatch(to: OpenFin.ClientIdentity | OpenFin.Identity, action: string, payload?: any): Promise<any>;
     protected processAction: (action: string, payload: any, senderIdentity: OpenFin.ClientIdentity | OpenFin.ClientIdentityMultiRuntime) => Promise<any>;
-    processConnection(senderId: ClientConnectionPayload, payload: any): Promise<any>;
+    processConnection(senderId: OpenFin.ClientConnectionPayload, payload: any): Promise<any>;
     publish(action: string, payload: any): Promise<any>[];
     onConnection(listener: ConnectionListener): void;
     onDisconnection(listener: DisconnectionListener): void;

package/src/api/me.d.ts

@@ -33,7 +33,7 @@ export declare function getBaseMe<T extends EntityType = EntityType>(entityType:
 export interface WithInterop {
     interop: InteropClient;
 }
-export type Me<MeType extends EntityType> = OpenFin.EntityInfo & (MeType extends 'view' ? EntityTypeHelpers<'view'> & OpenFin.View & WithInterop : MeType extends 'window' ? EntityTypeHelpers<'window'> & OpenFin.Window & WithInterop : MeType extends 'iframe' ? EntityTypeHelpers<'iframe'> & OpenFin.Frame & WithInterop : EntityTypeHelpers<MeType> & WithInterop) & {
+export type Me<MeType extends EntityType> = OpenFin.EntityInfo & (MeType extends 'view' ? EntityTypeHelpers<'view'> & OpenFin.View & WithInterop : MeType extends 'window' ? EntityTypeHelpers<'window'> & OpenFin.Window & WithInterop : MeType extends 'iframe' ? EntityTypeHelpers<'iframe'> & OpenFin.Frame & WithInterop : MeType extends 'external connection' ? EntityTypeHelpers<'external connection'> & OpenFin.ExternalApplication & WithInterop : EntityTypeHelpers<MeType> & WithInterop) & {
     isOpenFin: boolean;
 };
 export declare function getMe<MeType extends EntityType>(wire: Transport<MeType>): Me<MeType>;

package/src/api/me.js

@@ -4,6 +4,7 @@ exports.getMe = exports.getBaseMe = exports.environmentUnsupportedMessage = void
 const view_1 = require("./view");
 const frame_1 = require("./frame");
 const window_1 = require("./window");
+const external_application_1 = require("./external-application");
 exports.environmentUnsupportedMessage = 'You are not running in OpenFin.';
 function getBaseMe(entityType, uuid, name) {
     const entityTypeHelpers = {
@@ -117,7 +118,7 @@ function getMe(wire) {
                 isOpenFin: true
             });
         case 'external connection':
-            return Object.assign(new window_1._Window(wire, { uuid, name }), getBaseMe(entityType, uuid, name), {
+            return Object.assign(new external_application_1.ExternalApplication(wire, { uuid }), getBaseMe(entityType, uuid, name), {
                 interop: fallbackInterop,
                 isOpenFin: false
             });

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

@@ -1,6 +1,6 @@
 import type * as OpenFin from '../../OpenFin';
-import { Base } from '../base';
 import { Transport } from '../../transport/transport';
+import { Base } from '../base';
 import { LayoutModule } from './layout/index';
 type Channel = OpenFin.Fin['InterApplicationBus']['Channel'];
 /**
@@ -51,7 +51,6 @@ type Channel = OpenFin.Fin['InterApplicationBus']['Channel'];
 export default class PlatformModule extends Base {
     private _channel;
     Layout: LayoutModule;
-    private _initializer;
     constructor(wire: Transport, channel: Channel);
     /**
      * Initializes a Platform. Must be called from the Provider when using a custom provider.

package/src/api/platform/Factory.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable no-undef, no-underscore-dangle */
 const base_1 = require("../base");
-const index_1 = require("./layout/index");
 const Instance_1 = require("./Instance");
+const index_1 = require("./layout/index");
 /**
  * @PORTED
  * InitPlatformOptions interface
@@ -53,9 +52,6 @@ class PlatformModule extends base_1.Base {
     constructor(wire, channel) {
         super(wire);
         this._channel = channel;
-        this._initializer = (...args) => this.wire.environment
-            .getProviderInitializer()
-            .then((initConstructor) => initConstructor(this.wire.environment)(...args));
         /**
          * @namespace
          * @desc Layouts give app providers the ability to embed multiple views in a single window.  The Layout namespace
@@ -74,12 +70,7 @@ class PlatformModule extends base_1.Base {
      * @static
      */
     async init(options) {
-        const overrideCallback = options === null || options === void 0 ? void 0 : options.overrideCallback;
-        const interopBroker = await this.fin.Interop.init(this.fin.me.uuid, options === null || options === void 0 ? void 0 : options.interopOverride);
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-expect-error debugging purposes
-        window.interopBroker = interopBroker;
-        return this._initializer(overrideCallback, interopBroker);
+        return this.wire.environment.initPlatform(this.fin, options);
     }
     /**
      * Asynchronously returns a Platform object that represents an existing platform.

package/src/api/platform/layout/Factory.d.ts

@@ -1,6 +1,6 @@
 import type * as OpenFin from '../../../OpenFin';
-import { Layout } from './Instance';
 import { Base } from '../../base';
+import { Layout } from './Instance';
 type InitLayoutOptions = OpenFin.InitLayoutOptions;
 /**
  * @PORTED

package/src/api/platform/layout/Factory.js

@@ -10,19 +10,12 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _LayoutModule_layoutManager, _LayoutModule_layoutInitializationAttempted;
+var _LayoutModule_layoutInitializationAttempted;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LayoutModule = void 0;
 /* eslint-disable no-undef, import/prefer-default-export */
-const tab_drag_controller_1 = require("./controllers/tab-drag-controller");
-const Instance_1 = require("./Instance");
 const base_1 = require("../../base");
-const splitter_controller_1 = require("./controllers/splitter-controller");
-const view_overlay_1 = require("./utils/view-overlay");
-const api_exposer_1 = require("../../api-exposer");
-const layout_entities_controller_1 = require("./controllers/layout-entities-controller");
-const layout_constants_1 = require("./layout.constants");
-const layout_content_cache_1 = require("./controllers/layout-content-cache");
+const Instance_1 = require("./Instance");
 /**
  * @PORTED
  * InitLayoutOptions interface
@@ -90,7 +83,6 @@ const layout_content_cache_1 = require("./controllers/layout-content-cache");
 class LayoutModule extends base_1.Base {
     constructor() {
         super(...arguments);
-        _LayoutModule_layoutManager.set(this, void 0);
         _LayoutModule_layoutInitializationAttempted.set(this, false);
         /**
          * Initialize the window's Layout.  Must be called from a custom window that has a 'layout' option set upon creation of that window.
@@ -114,33 +106,7 @@ class LayoutModule extends base_1.Base {
                 throw new Error('Layout for this window already initialized, please use Layout.replace call to replace the layout.');
             }
             __classPrivateFieldSet(this, _LayoutModule_layoutInitializationAttempted, true, "f");
-            // We need to go through environment to make sure it is only imported/bundled in OpenFin.
-            const ManagerConstructor = await this.wire.environment.getManagerConstructor();
-            const viewOverlay = new view_overlay_1.ViewOverlay(this.wire);
-            const splitterController = new splitter_controller_1.SplitterController(viewOverlay);
-            const tabDragController = new tab_drag_controller_1.TabDragController(viewOverlay);
-            const contentItemCache = new layout_content_cache_1.LayoutContentCache();
-            __classPrivateFieldSet(this, _LayoutModule_layoutManager, new ManagerConstructor(splitterController, tabDragController, contentItemCache), "f");
-            // @ts-expect-error - layout warning here for backwards compatibility, can remove layout check in .52
-            let { layout, containerId } = options;
-            if (layout) {
-                console.warn(`We recommend using a layout in window options.
-                This layout has not been sanitized and unexpected behavior can occur.`);
-            }
-            layout = layout || (await this.fin.Window.getCurrentSync().getOptions()).layout;
-            containerId = containerId || 'layout-container';
-            const container = document.getElementById(containerId);
-            // Should we error here if there is no container? Getting a typescript complaint on createLayout
-            // override here
-            // pull createChannelConnection out of LayoutManager and setup channel connections here using layoutmanager instance methods?
-            await __classPrivateFieldGet(this, _LayoutModule_layoutManager, "f").initManager();
-            await __classPrivateFieldGet(this, _LayoutModule_layoutManager, "f").createLayout(layout, container);
-            const { client, ofWindow } = ManagerConstructor.getClientAndWindow(__classPrivateFieldGet(this, _LayoutModule_layoutManager, "f"));
-            // expose LayoutEntitiesController instance for API consumption
-            const channelStrategy = new api_exposer_1.ChannelsExposer(client);
-            await new api_exposer_1.ApiExposer(channelStrategy).exposeInstance(new layout_entities_controller_1.LayoutEntitiesController(__classPrivateFieldGet(this, _LayoutModule_layoutManager, "f"), contentItemCache), { id: layout_constants_1.LAYOUT_CONTROLLER_ID });
-            // Adding this to the returned instance undocumented/typed for Browser.
-            return Object.assign(this.getCurrentSync(), { layoutManager: __classPrivateFieldGet(this, _LayoutModule_layoutManager, "f") });
+            return this.wire.environment.initLayout(this.fin, this.wire, options);
         };
     }
     /**
@@ -205,4 +171,4 @@ class LayoutModule extends base_1.Base {
     }
 }
 exports.LayoutModule = LayoutModule;
-_LayoutModule_layoutManager = new WeakMap(), _LayoutModule_layoutInitializationAttempted = new WeakMap();
+_LayoutModule_layoutInitializationAttempted = new WeakMap();

package/src/api/view/Instance.js

@@ -11,7 +11,6 @@ const transport_errors_1 = require("../../transport/transport-errors");
 const lazy_1 = require("../../util/lazy");
 const layout_entities_1 = require("../platform/layout/entities/layout-entities");
 const layout_constants_1 = require("../platform/layout/layout.constants");
-const bounds_observer_1 = require("../platform/layout/utils/bounds-observer");
 const main_1 = require("../webcontents/main");
 const window_1 = require("../window");
 /**
@@ -510,7 +509,7 @@ class View extends main_1.WebContents {
                 throw new Error('Element not found.');
             }
             const onChange = async (bounds) => this.setBounds(bounds);
-            return (0, bounds_observer_1.observeBounds)(element, onChange);
+            return this.wire.environment.observeBounds(element, onChange);
         };
     }
     /**

package/src/environment/browser.d.ts

@@ -1,10 +1,12 @@
 import type * as OpenFin from '../OpenFin';
+import { Transport } from '../transport/transport';
 import { NewConnectConfig } from '../transport/wire';
 import { ChildContentOptions, Environment } from './environment';
 type EntityType = OpenFin.EntityType;
 export declare class BrowserEnvironment implements Environment {
-    getManagerConstructor(): Promise<any>;
-    getProviderInitializer(): Promise<any>;
+    observeBounds(element: Element, onChange: (bounds: DOMRect) => void | Promise<void>): () => void;
+    initLayout(_fin: OpenFin.Fin<OpenFin.EntityType>, wire: Transport, options: OpenFin.InitLayoutOptions): Promise<OpenFin.Layout>;
+    initPlatform(...args: any[]): Promise<any>;
     writeToken(path: string, token: string): Promise<string>;
     retrievePort(config: NewConnectConfig): Promise<number>;
     getNextMessageId(): string;