@openfin/node-adapter 36.80.8 → 36.80.9

package/out/node-adapter-alpha.d.ts

@@ -17470,7 +17470,7 @@ declare type WillResizeEvent = WillMoveOrResizeEvent & {
  */
 declare class _Window extends WebContents<OpenFin.WindowEvent> {
     /* Excluded from this release type: __constructor */
-    /* Excluded from this release type: createWindow */
+    createWindow(options: OpenFin.WindowCreationOptions): Promise<OpenFin.Window>;
     /**
      * Retrieves an array of frame info objects representing the main frame and any
      * iframes that are currently on the page.

package/out/node-adapter-beta.d.ts

@@ -17470,7 +17470,7 @@ declare type WillResizeEvent = WillMoveOrResizeEvent & {
  */
 declare class _Window extends WebContents<OpenFin.WindowEvent> {
     /* Excluded from this release type: __constructor */
-    /* Excluded from this release type: createWindow */
+    createWindow(options: OpenFin.WindowCreationOptions): Promise<OpenFin.Window>;
     /**
      * Retrieves an array of frame info objects representing the main frame and any
      * iframes that are currently on the page.

package/out/node-adapter-public.d.ts

@@ -17470,7 +17470,7 @@ declare type WillResizeEvent = WillMoveOrResizeEvent & {
  */
 declare class _Window extends WebContents<OpenFin.WindowEvent> {
     /* Excluded from this release type: __constructor */
-    /* Excluded from this release type: createWindow */
+    createWindow(options: OpenFin.WindowCreationOptions): Promise<OpenFin.Window>;
     /**
      * Retrieves an array of frame info objects representing the main frame and any
      * iframes that are currently on the page.

package/out/node-adapter.d.ts

@@ -17934,10 +17934,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

package/out/node-adapter.js

@@ -4122,6 +4122,37 @@ function requireApplication () {
 	return application$1;
 }
 
+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;
 
 function requireInstance () {
@@ -4137,6 +4168,7 @@ function requireInstance () {
 	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.
@@ -4152,79 +4184,60 @@ function requireInstance () {
 	    constructor(wire, identity) {
 	        super(wire, identity, 'window');
 	    }
-	    /**
-	     * create a new window
-	     * @internal
-	     */
-	    createWindow(options) {
+	    async 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
 	        });
-	        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);
-	        });
+	        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);
 	    }
 	    /**
 	     * Retrieves an array of frame info objects representing the main frame and any

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/node-adapter",
-    "version": "36.80.8",
+    "version": "36.80.9",
     "description": "See README.md",
     "main": "out/node-adapter.js",
     "types": "out/node-adapter.d.ts",