@openfin/remote-adapter 36.80.26 → 37.80.4

package/out/remote-adapter.js

@@ -1920,7 +1920,27 @@ function requireInteropBroker () {
 	        const clientState = this.getClientState(clientIdentity);
 	        if (clientState && clientState.contextGroupId) {
 	            const { contextGroupId } = clientState;
-	            this.setContextForGroup({ context }, contextGroupId);
+	            if (!this.contextGroupsById.has(contextGroupId)) {
+	                // Theoretically not possible.
+	                throw new Error(`Client has a context group that isn't in the context group mapping: ${contextGroupId}.`);
+	            }
+	            const contextIntegrityCheckResult = InteropBroker.checkContextIntegrity(context);
+	            if (contextIntegrityCheckResult.isValid === false) {
+	                throw new Error(`Failed to set Context - bad Context. Reason: ${contextIntegrityCheckResult.reason}. Context: ${JSON.stringify(context)}`);
+	            }
+	            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+	            const contextGroupState = this.contextGroupsById.get(contextGroupId);
+	            const broadcastedContextType = context.type;
+	            contextGroupState.set(broadcastedContextType, context);
+	            this.lastContextMap.set(contextGroupId, broadcastedContextType);
+	            const clientsInSameContextGroup = Array.from(this.interopClients.values()).filter((connectedClient) => connectedClient.contextGroupId === contextGroupId);
+	            clientsInSameContextGroup.forEach((client) => {
+	                for (const [, handlerInfo] of client.contextHandlers) {
+	                    if (InteropBroker.isContextTypeCompatible(broadcastedContextType, handlerInfo.contextType)) {
+	                        this.invokeContextHandler(client.clientIdentity, handlerInfo.handlerId, context);
+	                    }
+	                }
+	            });
 	        }
 	        else if (clientState) {
 	            // Client has not joined any context group behavior.
@@ -1931,36 +1951,6 @@ function requireInteropBroker () {
 	            throw new Error(`Client with Identity: ${clientIdentity.uuid} ${clientIdentity.name} not in Client State Map`);
 	        }
 	    }
-	    /**
-	     * Sets a context for the context group.
-	     * @param setContextOptions - New context to set.
-	     * @param contextGroupId - Context group id.
-	     *
-	     */
-	    setContextForGroup({ context }, contextGroupId) {
-	        this.wire.sendAction('interop-broker-set-context-for-group').catch((e) => {
-	            // don't expose, analytics-only call
-	        });
-	        const contextGroupState = this.contextGroupsById.get(contextGroupId);
-	        if (!contextGroupState) {
-	            throw new Error(`Unable to set context for context group that isn't in the context group mapping: ${contextGroupId}.`);
-	        }
-	        const contextIntegrityCheckResult = InteropBroker.checkContextIntegrity(context);
-	        if (contextIntegrityCheckResult.isValid === false) {
-	            throw new Error(`Failed to set Context - bad Context. Reason: ${contextIntegrityCheckResult.reason}. Context: ${JSON.stringify(context)}`);
-	        }
-	        const broadcastedContextType = context.type;
-	        contextGroupState.set(broadcastedContextType, context);
-	        this.lastContextMap.set(contextGroupId, broadcastedContextType);
-	        const clientsInSameContextGroup = Array.from(this.interopClients.values()).filter((connectedClient) => connectedClient.contextGroupId === contextGroupId);
-	        clientsInSameContextGroup.forEach((client) => {
-	            for (const [, handlerInfo] of client.contextHandlers) {
-	                if (InteropBroker.isContextTypeCompatible(broadcastedContextType, handlerInfo.contextType)) {
-	                    this.invokeContextHandler(client.clientIdentity, handlerInfo.handlerId, context);
-	                }
-	            }
-	        });
-	    }
 	    /**
 	     * Get current context for a client subscribed to a Context Group.
 	     *
@@ -6414,37 +6404,6 @@ function requireApplication () {
 	return application;
 }
 
-var promisifySubscription$1 = {};
-
-Object.defineProperty(promisifySubscription$1, "__esModule", { value: true });
-promisifySubscription$1.promisifySubscription = void 0;
-const promisifySubscription = async (emitter, eventName, predicate = () => true, timeout) => {
-    let resolve;
-    let reject;
-    let timer;
-    const valuePromise = new Promise((y, n) => {
-        resolve = y;
-        reject = n;
-    });
-    const listener = (e) => {
-        if (predicate(e)) {
-            clearTimeout(timer);
-            resolve(e);
-        }
-    };
-    await emitter.on(eventName, listener);
-    if (timeout) {
-        timer = setTimeout(() => reject(new Error('event timed out')), timeout);
-    }
-    valuePromise.finally(() => {
-        emitter.removeListener(eventName, listener).catch(() => null);
-    });
-    return {
-        getValue: () => valuePromise
-    };
-};
-promisifySubscription$1.promisifySubscription = promisifySubscription;
-
 var hasRequiredInstance$1;
 
 function requireInstance$1 () {
@@ -6460,7 +6419,6 @@ function requireInstance$1 () {
 	const main_1 = main;
 	const view_1 = requireView();
 	const warnings_1 = warnings;
-	const promisifySubscription_1 = promisifySubscription$1;
 	/**
 	 * A basic window that wraps a native HTML window. Provides more fine-grained
 	 * control over the window state such as the ability to minimize, maximize, restore, etc.
@@ -6476,60 +6434,79 @@ function requireInstance$1 () {
 	    constructor(wire, identity) {
 	        super(wire, identity, 'window');
 	    }
-	    async createWindow(options) {
+	    /**
+	     * create a new window
+	     * @internal
+	     */
+	    createWindow(options) {
 	        this.wire.sendAction('window-create-window', this.identity).catch((e) => {
 	            // we do not want to expose this error, just continue if this analytics-only call fails
 	        });
-	        const CONSTRUCTOR_CB_TOPIC = 'fire-constructor-callback';
-	        const responseSubscription = await (0, promisifySubscription_1.promisifySubscription)(this, CONSTRUCTOR_CB_TOPIC);
-	        // set defaults:
-	        if (options.waitForPageLoad === undefined) {
-	            options.waitForPageLoad = false;
-	        }
-	        if (options.autoShow === undefined) {
-	            options.autoShow = true;
-	        }
-	        (0, warnings_1.handleDeprecatedWarnings)(options);
-	        const windowCreation = this.wire.environment.createChildContent({ entityType: 'window', options });
-	        const [response] = await Promise.all([responseSubscription.getValue(), windowCreation]);
-	        let cbPayload;
-	        const { success } = response;
-	        const responseData = response.data;
-	        const { message } = responseData;
-	        if (success) {
-	            cbPayload = {
-	                httpResponseCode: responseData.httpResponseCode,
-	                apiInjected: responseData.apiInjected
-	            };
-	        }
-	        else {
-	            cbPayload = {
-	                message: responseData.message,
-	                networkErrorCode: responseData.networkErrorCode,
-	                stack: responseData.stack
-	            };
-	        }
-	        const pageResolve = {
-	            message,
-	            cbPayload,
-	            success
-	        };
-	        try {
-	            // this is to enforce a 5.0 contract that the child's main function
-	            // will not fire before the parent's success callback on creation.
-	            // if the child window is not accessible (CORS) this contract does
-	            // not hold.
-	            const webWindow = this.getWebWindow();
-	            webWindow.fin.__internal_.openerSuccessCBCalled();
-	        }
-	        catch (e) {
-	            // common for main windows, we do not want to expose this error. here just to have a debug target.
-	            // console.error(e);
-	        }
-	        if (pageResolve.success) {
-	            return this;
-	        }
-	        return Promise.reject(pageResolve);
+	        return new Promise((resolve, reject) => {
+	            const CONSTRUCTOR_CB_TOPIC = 'fire-constructor-callback';
+	            // need to call pageResponse, otherwise when a child window is created, page is not loaded
+	            const pageResponse = new Promise((resolve) => {
+	                // TODO: fix typing (internal)
+	                // @ts-expect-error
+	                this.on(CONSTRUCTOR_CB_TOPIC, function fireConstructor(response) {
+	                    let cbPayload;
+	                    const { success } = response;
+	                    const responseData = response.data;
+	                    const { message } = responseData;
+	                    if (success) {
+	                        cbPayload = {
+	                            httpResponseCode: responseData.httpResponseCode,
+	                            apiInjected: responseData.apiInjected
+	                        };
+	                    }
+	                    else {
+	                        cbPayload = {
+	                            message: responseData.message,
+	                            networkErrorCode: responseData.networkErrorCode,
+	                            stack: responseData.stack
+	                        };
+	                    }
+	                    this.removeListener(CONSTRUCTOR_CB_TOPIC, fireConstructor);
+	                    resolve({
+	                        message,
+	                        cbPayload,
+	                        success
+	                    });
+	                });
+	            });
+	            // set defaults:
+	            if (options.waitForPageLoad === undefined) {
+	                options.waitForPageLoad = false;
+	            }
+	            if (options.autoShow === undefined) {
+	                options.autoShow = true;
+	            }
+	            (0, warnings_1.handleDeprecatedWarnings)(options);
+	            const windowCreation = this.wire.environment.createChildContent({ entityType: 'window', options });
+	            Promise.all([pageResponse, windowCreation])
+	                .then((resolvedArr) => {
+	                const pageResolve = resolvedArr[0];
+	                if (pageResolve.success) {
+	                    resolve(this);
+	                }
+	                else {
+	                    reject(pageResolve);
+	                }
+	                try {
+	                    // this is to enforce a 5.0 contract that the child's main function
+	                    // will not fire before the parent's success callback on creation.
+	                    // if the child window is not accessible (CORS) this contract does
+	                    // not hold.
+	                    const webWindow = this.getWebWindow();
+	                    webWindow.fin.__internal_.openerSuccessCBCalled();
+	                }
+	                catch (e) {
+	                    // common for main windows, we do not want to expose this error. here just to have a debug target.
+	                    // console.error(e);
+	                }
+	            })
+	                .catch(reject);
+	        });
 	    }
 	    /**
 	     * Retrieves an array of frame info objects representing the main frame and any
@@ -6926,7 +6903,7 @@ function requireInstance$1 () {
 	            // don't expose
 	        });
 	        const opts = await this.getOptions();
-	        if (!opts.layout && !opts.layoutSnapshot) {
+	        if (!opts.layout || !opts.layoutSnapshot) {
 	            throw new Error('Window does not have a Layout');
 	        }
 	        return this.fin.Platform.Layout.wrap(layoutIdentity ?? this.identity);
@@ -8230,14 +8207,9 @@ function requireInstance () {
 	                // don't expose
 	            });
 	            const layoutWindow = await this.getCurrentWindow();
-	            let layoutWindowIdentity = layoutWindow.identity;
-	            // TODO: CORE-1857 - when we tearout active layout or drag a view out of a window, the above identity includes the whole window info.
-	            if (layoutWindowIdentity.identity) {
-	                layoutWindowIdentity = layoutWindowIdentity.identity;
-	            }
 	            try {
 	                const providerChannelClient = await __classPrivateFieldGet(this, _View_providerChannelClient, "f").getValue();
-	                const client = await layout_entities_1.LayoutNode.newLayoutEntitiesClient(providerChannelClient, layout_constants_1.LAYOUT_CONTROLLER_ID, layoutWindowIdentity);
+	                const client = await layout_entities_1.LayoutNode.newLayoutEntitiesClient(providerChannelClient, layout_constants_1.LAYOUT_CONTROLLER_ID, layoutWindow.identity);
 	                const layoutIdentity = await client.getLayoutIdentityForViewOrThrow(this.identity);
 	                return this.fin.Platform.Layout.wrap(layoutIdentity);
 	            }
@@ -8250,7 +8222,7 @@ function requireInstance () {
 	                    throw e;
 	                }
 	                // fallback logic for missing endpoint
-	                return this.fin.Platform.Layout.wrap(layoutWindowIdentity);
+	                return this.fin.Platform.Layout.wrap(layoutWindow.identity);
 	            }
 	        };
 	        /**
@@ -8558,8 +8530,6 @@ class _Frame extends base_1$h.EmitterBase {
      * Returns a frame info object representing the window that the referenced iframe is
      * currently embedded in.
      *
-     * @remarks If the frame is embedded in a view, this will return an invalid stub with empty fields.
-     *
      * @example
      * ```js
      * async function getParentWindow() {
@@ -14501,12 +14471,12 @@ class Platform extends base_1$5.EmitterBase {
      * @experimental
      */
     async launchContentManifest(manifestUrl) {
-        this.wire.sendAction('platform-launch-content-manifest', this.identity).catch(() => {
+        this.wire.sendAction('platform-launch-content-manifest', this.identity).catch((e) => {
             // don't expose
         });
         const client = await this.getClient();
         const manifest = await this.fetchManifest(manifestUrl);
-        client.dispatch('launch-into-platform', { manifest, manifestUrl });
+        client.dispatch('launch-into-platform', { manifest });
         return this;
     }
     /**
@@ -15149,7 +15119,7 @@ class LayoutModule extends base_1$3.Base {
             return this.wrapSync(this.fin.me.identity);
         };
         _LayoutModule_getLayoutManagerSpy.set(this, (layoutIdentity, layoutManager) => {
-            const msg = '[Layout] You are using a deprecated property `layoutManager` - it will throw if you access it starting in v37.';
+            const msg = '[Layout] You are using a deprecated property `layoutManager` - it will be removed in v39.';
             const managerProxy = new Proxy(layoutManager, {
                 get(target, key) {
                     console.warn(`[Layout-mgr-proxy] accessing ${key.toString()}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/remote-adapter",
-    "version": "36.80.26",
+    "version": "37.80.4",
     "description": "Establish intermachine runtime connections using webRTC.",
     "license": "SEE LICENSE IN LICENSE.md",
     "private": false,
@@ -20,7 +20,7 @@
         "@rollup/plugin-commonjs": "25.0.2",
         "@rollup/plugin-node-resolve": "15.1.0",
         "@rollup/plugin-typescript": "11.1.1",
-        "@types/node": "^20.14.2",
+        "@types/node": "^20.9.0",
         "rollup": "3.24.1",
         "typescript": "4.9.5"
     },