@openfin/core 31.74.2 → 31.74.3

package/package.json

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

package/src/api/application/Instance.js

@@ -141,11 +141,29 @@ class Application extends base_1.EmitterBase {
      * @tutorial Application.quit
      */
     async quit(force = false) {
-        await this._close(force);
-        await this.wire.sendAction('destroy-application', { force, ...this.identity });
-    }
-    _close(force = false) {
-        return this.wire.sendAction('close-application', { force, ...this.identity }).then(() => undefined);
+        try {
+            await this._close(force);
+            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))) {
+                throw error;
+            }
+        }
+    }
+    async _close(force = false) {
+        try {
+            await this.wire.sendAction('close-application', { force, ...this.identity });
+        }
+        catch (error) {
+            if (!error.message.includes('Remote connection has closed')) {
+                throw error;
+            }
+        }
     }
     close(force = false) {
         console.warn('Deprecation Warning: Application.close is deprecated Please use Application.quit');

package/src/api/base.d.ts

@@ -33,6 +33,9 @@ export declare class EmitterBase<EmitterEvent extends BaseEvent, EmitterEventTyp
     on<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;
     addListener: <EventType extends EmitterEventType>(eventType: EventType, listener: OpenFin.BaseEvents.EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions) => Promise<this>;
     once<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;
+    next<EventType extends EmitterEventType>(eventType: EventType, options?: OpenFin.SubscriptionOptions): Promise<Extract<EmitterEvent, {
+        type: EventType;
+    }>>;
     prependListener<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;
     prependOnceListener<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;
     removeListener<EventType extends EmitterEventType>(eventType: EventType, listener: EventHandler<EmitterEvent, EventType>, options?: OpenFin.SubscriptionOptions): Promise<this>;

package/src/api/base.js

@@ -107,6 +107,13 @@ class EmitterBase extends Base {
         });
         return this;
     }
+    async next(eventType, options) {
+        return new Promise((resolve, reject) => {
+            this.once(eventType, (event) => {
+                resolve(event);
+            }, options).catch(reject);
+        });
+    }
     async prependListener(eventType, listener, options) {
         await this.registerEventListener(eventType, options, (emitter) => {
             emitter.prependListener(eventType, listener);

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

@@ -1,6 +1,6 @@
 import type * as OpenFin from '../../OpenFin';
 import { PropagatedApplicationEvent } from './application';
-import { BaseEvent } from './base';
+import { BaseEvent, IdentityEvent } from './base';
 import { PropagatedViewEvent } from './view';
 import { PropagatedWindowEvent } from './window';
 import { AppVersionCompleteEvent, AppVersionErrorEvent, AppVersionProgressEvent, AppVersionRuntimeStatusEvent } from '../../OpenFin';
@@ -38,7 +38,7 @@ export type EventWithId<Event extends AppVersionEvent> = Event extends infer E e
     appVersionId: string;
 } : never;
 export type AppVersionEventWithId = EventWithId<AppVersionEvent>;
-export type ApplicationCreatedEvent = BaseEvent & {
+export type ApplicationCreatedEvent = IdentityEvent & {
     type: 'application-created';
 };
 export type DesktopIconClickedEvent = BaseEvent & {

package/src/api/interop/fdc3/PrivateChannelProvider.js

@@ -84,16 +84,9 @@ class PrivateChannelProvider {
         if (contextType) {
             const currentHandlersList = senderClientState.handlerIdsByContextTypes.get(contextType) || [];
             senderClientState.handlerIdsByContextTypes.set(contextType, [...currentHandlersList, handlerId]);
-            const currContext = this.contextByContextType.get(contextType);
-            if (currContext) {
-                this.provider.dispatch(senderClientIdentity, handlerId, currContext);
-            }
         }
         else {
             senderClientState.globalHandler = handlerId;
-            if (this.lastContext) {
-                this.provider.dispatch(senderClientIdentity, handlerId, this.lastContext);
-            }
         }
         Array.from(this.clients.values()).forEach((currClientState) => {
             if (currClientState.clientIdentity.endpointId !== senderClientIdentity.endpointId &&
@@ -271,7 +264,7 @@ class PrivateChannelProvider {
         const allClientInfo = await this.provider.getAllClientInfo();
         return Array.from(this.clients.values()).filter((clientState) => {
             const { uuid, name } = clientState.clientIdentity;
-            return allClientInfo.some(clientInfo => {
+            return allClientInfo.some((clientInfo) => {
                 return name === clientInfo.name && uuid === clientInfo.uuid;
             });
         });

package/src/api/interop/fdc3/fdc3-1.2.js

@@ -4,6 +4,7 @@ const base_1 = require("../../base");
 const utils_1 = require("./utils");
 const utils_2 = require("../utils");
 const InteropClient_1 = require("../InteropClient");
+const lodash_1 = require("lodash");
 /**
  * @typedef { object } Listener
  * @summary Listener object returned by addContextListener and addIntentListener
@@ -393,7 +394,39 @@ class Fdc3Module extends base_1.Base {
         return {
             ...currentContextGroupInfo,
             type: 'system',
-            addContextListener: this.addContextListener.bind(this),
+            addContextListener: (contextType, handler) => {
+                let realHandler;
+                let realType;
+                if (typeof contextType === 'function') {
+                    console.warn('addContextListener(handler) has been deprecated. Please use addContextListener(null, handler)');
+                    realHandler = contextType;
+                }
+                else {
+                    realHandler = handler;
+                    if (typeof contextType === 'string') {
+                        realType = contextType;
+                    }
+                }
+                const listener = (async () => {
+                    let first = true;
+                    const currentContext = await this.fin.me.interop.getCurrentContext(realType);
+                    const wrappedHandler = (context, contextMetadata) => {
+                        if (first) {
+                            first = false;
+                            if ((0, lodash_1.isEqual)(currentContext, context)) {
+                                return;
+                            }
+                        }
+                        // eslint-disable-next-line consistent-return
+                        return realHandler(context, contextMetadata);
+                    };
+                    return this.fin.me.interop.addContextHandler(wrappedHandler, realType);
+                })();
+                return {
+                    ...listener,
+                    unsubscribe: () => listener.then((l) => l.unsubscribe())
+                };
+            },
             broadcast: this.broadcast.bind(this),
             getCurrentContext: async (contextType) => {
                 const context = await this.fin.me.interop.getCurrentContext(contextType);

package/src/api/interop/fdc3/utils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIntentResolution = exports.isChannel = exports.isContext = exports.connectPrivateChannel = exports.buildAppChannelObject = exports.buildPrivateChannelObject = exports.ChannelError = exports.ResultError = exports.UnsupportedChannelApiError = exports.getUnsupportedChannelApis = void 0;
 const utils_1 = require("../utils");
 const PrivateChannelClient_1 = require("./PrivateChannelClient");
+const lodash_1 = require("lodash");
 const getUnsupportedChannelApis = (channelType) => {
     return {
         addContextListener: () => {
@@ -111,14 +112,33 @@ const buildAppChannelObject = (sessionContextGroup) => {
             return context === undefined ? null : context;
         },
         addContextListener: (contextType, handler) => {
-            let listener;
+            let realHandler;
+            let realType;
             if (typeof contextType === 'function') {
                 console.warn('addContextListener(handler) has been deprecated. Please use addContextListener(null, handler)');
-                listener = sessionContextGroup.addContextHandler(contextType);
+                realHandler = contextType;
             }
             else {
-                listener = sessionContextGroup.addContextHandler(handler, contextType === null ? undefined : contextType);
+                realHandler = handler;
+                if (typeof contextType === 'string') {
+                    realType = contextType;
+                }
             }
+            const listener = (async () => {
+                let first = true;
+                const currentContext = await sessionContextGroup.getCurrentContext(realType);
+                const wrappedHandler = (context, contextMetadata) => {
+                    if (first) {
+                        first = false;
+                        if ((0, lodash_1.isEqual)(currentContext, context)) {
+                            return;
+                        }
+                    }
+                    // eslint-disable-next-line consistent-return
+                    return realHandler(context, contextMetadata);
+                };
+                return sessionContextGroup.addContextHandler(wrappedHandler, realType);
+            })();
             return {
                 ...listener,
                 unsubscribe: () => listener.then((l) => l.unsubscribe())
@@ -149,7 +169,7 @@ exports.isContext = isContext;
 const isChannel = (channel) => {
     if (channel && typeof channel === 'object' && 'type' in channel && 'id' in channel) {
         const { type, id } = channel;
-        return (typeof type === 'string' && typeof id === 'string' && (type === 'app' || type === 'private'));
+        return typeof type === 'string' && typeof id === 'string' && (type === 'app' || type === 'private');
     }
     return false;
 };