@openfin/node-adapter 36.78.14 → 36.78.17

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

@@ -4946,7 +4946,7 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
     private getOrCreateEmitter;
     listeners: (type: string | symbol) => Function[];
     listenerCount: (type: string | symbol) => number;
-    protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
+    protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions | undefined, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
     protected deregisterEventListener: (eventType: EmitterEventType, options?: OpenFin.SubscriptionOptions) => Promise<void | EventEmitter>;
     /**
      * Adds a listener to the end of the listeners array for the specified event.
@@ -6465,7 +6465,7 @@ declare type Hotkey = {
  * @remarks For reference on keyboard event properties see [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent).
  * @interface
  */
-declare type HotkeyEvent = BaseEvent_4 & {
+declare type HotkeyEvent = InputEvent_2 & BaseEvent_4 & {
     type: 'hotkey';
 };
 
@@ -9652,7 +9652,7 @@ declare type MutableWindowOptions = {
     showTaskbarIcon: boolean;
     interop: InteropConfig;
     /* Excluded from this release type: _internalWorkspaceData */
-    workspacePlatform: unknown;
+    /* Excluded from this release type: workspacePlatform */
 };
 
 declare type NackHandler = (payloadOrMessage: RuntimeErrorPayload | string) => void;
@@ -18150,7 +18150,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      * })
      * ```
      *
-     * Overriding the built in context menu (ote that this can be done per element or document wide):
+     * Overriding the built in context menu (note: that this can be done per element or document wide):
      * ```js
      * document.addEventListener('contextmenu', e => {
      *     e.preventDefault();

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

@@ -4946,7 +4946,7 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
     private getOrCreateEmitter;
     listeners: (type: string | symbol) => Function[];
     listenerCount: (type: string | symbol) => number;
-    protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
+    protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions | undefined, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
     protected deregisterEventListener: (eventType: EmitterEventType, options?: OpenFin.SubscriptionOptions) => Promise<void | EventEmitter>;
     /**
      * Adds a listener to the end of the listeners array for the specified event.
@@ -6465,7 +6465,7 @@ declare type Hotkey = {
  * @remarks For reference on keyboard event properties see [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent).
  * @interface
  */
-declare type HotkeyEvent = BaseEvent_4 & {
+declare type HotkeyEvent = InputEvent_2 & BaseEvent_4 & {
     type: 'hotkey';
 };
 
@@ -9652,7 +9652,7 @@ declare type MutableWindowOptions = {
     showTaskbarIcon: boolean;
     interop: InteropConfig;
     /* Excluded from this release type: _internalWorkspaceData */
-    workspacePlatform: unknown;
+    /* Excluded from this release type: workspacePlatform */
 };
 
 declare type NackHandler = (payloadOrMessage: RuntimeErrorPayload | string) => void;
@@ -18150,7 +18150,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      * })
      * ```
      *
-     * Overriding the built in context menu (ote that this can be done per element or document wide):
+     * Overriding the built in context menu (note: that this can be done per element or document wide):
      * ```js
      * document.addEventListener('contextmenu', e => {
      *     e.preventDefault();

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

@@ -4946,7 +4946,7 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
     private getOrCreateEmitter;
     listeners: (type: string | symbol) => Function[];
     listenerCount: (type: string | symbol) => number;
-    protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
+    protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions | undefined, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
     protected deregisterEventListener: (eventType: EmitterEventType, options?: OpenFin.SubscriptionOptions) => Promise<void | EventEmitter>;
     /**
      * Adds a listener to the end of the listeners array for the specified event.
@@ -6465,7 +6465,7 @@ declare type Hotkey = {
  * @remarks For reference on keyboard event properties see [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent).
  * @interface
  */
-declare type HotkeyEvent = BaseEvent_4 & {
+declare type HotkeyEvent = InputEvent_2 & BaseEvent_4 & {
     type: 'hotkey';
 };
 
@@ -9652,7 +9652,7 @@ declare type MutableWindowOptions = {
     showTaskbarIcon: boolean;
     interop: InteropConfig;
     /* Excluded from this release type: _internalWorkspaceData */
-    workspacePlatform: unknown;
+    /* Excluded from this release type: workspacePlatform */
 };
 
 declare type NackHandler = (payloadOrMessage: RuntimeErrorPayload | string) => void;
@@ -18150,7 +18150,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      * })
      * ```
      *
-     * Overriding the built in context menu (ote that this can be done per element or document wide):
+     * Overriding the built in context menu (note: that this can be done per element or document wide):
      * ```js
      * document.addEventListener('contextmenu', e => {
      *     e.preventDefault();

package/out/node-adapter.d.ts

@@ -4994,7 +4994,7 @@ declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventType exten
     private getOrCreateEmitter;
     listeners: (type: string | symbol) => Function[];
     listenerCount: (type: string | symbol) => number;
-    protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
+    protected registerEventListener: (eventType: EmitterEventType, options: OpenFin.SubscriptionOptions | undefined, applySubscription: (emitter: EventEmitter) => void, undoSubscription: (emitter: EventEmitter) => void) => Promise<void>;
     protected deregisterEventListener: (eventType: EmitterEventType, options?: OpenFin.SubscriptionOptions) => Promise<void | EventEmitter>;
     /**
      * Adds a listener to the end of the listeners array for the specified event.
@@ -6562,7 +6562,7 @@ declare type Hotkey = {
  * @remarks For reference on keyboard event properties see [KeyboardEvent](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent).
  * @interface
  */
-declare type HotkeyEvent = BaseEvent_4 & {
+declare type HotkeyEvent = InputEvent_2 & BaseEvent_4 & {
     type: 'hotkey';
 };
 
@@ -9959,7 +9959,11 @@ declare type MutableWindowOptions = {
      * Used by Workspace to store custom data. Overwriting or modifying this field may impact the functionality of Workspace
      */
     _internalWorkspaceData: any;
-    workspacePlatform: unknown;
+    /**
+     * @internal
+     * Used by workspace to stork platform specific options. Overwriting or modifying this field may impact the functionality of Workspace
+     */
+    workspacePlatform: WorkspacePlatformOptions;
 };
 
 declare type NackHandler = (payloadOrMessage: RuntimeErrorPayload | string) => void;
@@ -18602,7 +18606,7 @@ declare class _Window extends WebContents<OpenFin.WindowEvent> {
      * })
      * ```
      *
-     * Overriding the built in context menu (ote that this can be done per element or document wide):
+     * Overriding the built in context menu (note: that this can be done per element or document wide):
      * ```js
      * document.addEventListener('contextmenu', e => {
      *     e.preventDefault();

package/out/node-adapter.js

@@ -5254,7 +5254,7 @@ function requireInstance () {
 	     * })
 	     * ```
 	     *
-	     * Overriding the built in context menu (ote that this can be done per element or document wide):
+	     * Overriding the built in context menu (note: that this can be done per element or document wide):
 	     * ```js
 	     * document.addEventListener('contextmenu', e => {
 	     *     e.preventDefault();
@@ -15472,16 +15472,29 @@ var http = {};
 	    return options;
 	};
 	exports.getRequestOptions = getRequestOptions;
+	function protocolFromUrl(url) {
+	    const parsed = (0, node_url_1.parse)(url);
+	    if (!parsed.protocol) {
+	        throw new Error(`Invalid protocol for url ${url}`);
+	    }
+	    return parsed.protocol.slice(0, -1) === 'http' ? 'http' : 'https';
+	}
 	const fetch = async (url) => {
 	    var _a;
-	    const requestUrl = getProxyVar() ? getProxyVar() : url;
-	    const proto = (0, node_url_1.parse)(requestUrl).protocol.slice(0, -1) === 'http' ? 'http' : 'https';
-	    const fetcher = await (_a = proto, Promise.resolve().then(() => require(_a)));
+	    const requestUrl = getProxyVar() ?? url;
+	    const proto = protocolFromUrl(requestUrl);
+	    const fetcher = (await (_a = proto, Promise.resolve().then(() => require(_a))));
 	    return new Promise((resolve, reject) => {
 	        const options = (0, exports.getRequestOptions)(url);
 	        const request = fetcher.get(options, (response) => {
+	            if (!response) {
+	                reject(new Error(`Failed to load url: ${url}, no response`));
+	                return;
+	            }
+	            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 	            if (response.statusCode < 200 || response.statusCode > 299) {
 	                reject(new Error(`Failed to load url: ${url}, status code:${response.statusCode}`));
+	                return;
 	            }
 	            const body = [];
 	            response.on('data', (chunk) => {
@@ -15497,8 +15510,8 @@ var http = {};
 	exports.fetch = fetch;
 	const downloadFile = async (url, writeLocation) => {
 	    var _a;
-	    const requestUrl = getProxyVar() ? getProxyVar() : url;
-	    const proto = (0, node_url_1.parse)(requestUrl).protocol.slice(0, -1) === 'http' ? 'http' : 'https';
+	    const requestUrl = getProxyVar() ?? url;
+	    const proto = protocolFromUrl(requestUrl);
 	    const fetcher = await (_a = proto, Promise.resolve().then(() => require(_a)));
 	    return new Promise((resolve, reject) => {
 	        try {
@@ -15650,6 +15663,7 @@ function launchRVM(config, manifestLocation, namedPipeName, rvm) {
     return (0, child_process_1.spawn)(rvm, rvmArgs, { stdio: ['pipe', 'ignore', 'pipe'], detached: true });
 }
 async function checkRvmPath() {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     let rvmPath = path.resolve(process.env.LOCALAPPDATA, 'OpenFin', 'OpenFinRVM.exe');
     if (!(await (0, util_1.exists)(rvmPath))) {
         rvmPath = path.join(__dirname, '..', 'resources', 'win', 'OpenFinRVM.exe');
@@ -15744,7 +15758,7 @@ function requireNixLaunch () {
 	    const url = getUrl(version, osConfig.urlPath);
 	    const tmp = 'tmp';
 	    await (0, util_1.rmDir)(folder, false);
-	    await mkdir(path.join(folder, tmp)).catch((e) => {
+	    await mkdir(path.join(folder, tmp)).catch(() => {
 	        // empty block
 	    });
 	    const file = path.join(folder, tmp, 'tmp');
@@ -15760,6 +15774,7 @@ function requireNixLaunch () {
 	    }
 	    const versionPath = ['OpenFin', 'Runtime', version];
 	    const { HOME } = process.env;
+	    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 	    return (0, util_1.resolveDir)(HOME, versionPath);
 	}
 	nixLaunch.getRuntimePath = getRuntimePath;
@@ -15777,7 +15792,7 @@ function requireNixLaunch () {
 	                downloads[version] = download(version, rtFolder, osConfig);
 	            }
 	            await downloads[version];
-	            downloads[version] = undefined;
+	            delete downloads[version];
 	        }
 	        catch (err) {
 	            console.error(`Failed to download, attempting to empty ${rtFolder}`);
@@ -16061,7 +16076,7 @@ function requirePortDiscovery () {
 	                    openfin.on('error', (err) => {
 	                        throw err;
 	                    });
-	                    if (this.savedConfig.runtime.verboseLogging) {
+	                    if (this.savedConfig.runtime.verboseLogging && openfin.stdout && openfin.stderr) {
 	                        openfin.stdout.pipe(process.stdout);
 	                        openfin.stderr.pipe(process.stderr);
 	                    }
@@ -16073,17 +16088,13 @@ function requirePortDiscovery () {
 	                })(),
 	                mPromise
 	            ]);
-	            if (matchRuntimeInstance(this.savedConfig, msg)) {
-	                this.cleanup();
-	                return msg.port;
-	            }
-	            console.warn('Port Discovery did not match runtime instance');
+	            this.cleanup();
+	            return msg.port;
 	        }
 	        catch (reason) {
 	            this.cleanup();
 	            throw reason;
 	        }
-	        return undefined;
 	    }
 	    createDiscoveryNamedPipe() {
 	        return new Promise((resolve, reject) => {

package/package.json

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