@openfin/fdc3-api 41.103.3 → 41.103.10

package/out/fdc3-api.js

@@ -412,7 +412,6 @@ fdc3Channels2_0.createV2Channel = createV2Channel;
 	    // Generate an ID to make a session context group with. We will pass that ID to the Broker.
 	    // The broker will then setContext on that session context group later with our Intent Result,
 	    const guid = (0, utils_1.generateId)(); // TODO make this undefined in web
-	    let isPromiseSettled = false;
 	    // Adding the intentResolutionResultId to the intentObj. Because fireIntent only accepts a single arg, we have to slap it in here.
 	    const metadata = app ? { target: app, intentResolutionResultId: guid } : { intentResolutionResultId: guid };
 	    const intentObj = intent ? { name: intent, context, metadata } : { ...context, metadata };
@@ -428,21 +427,11 @@ fdc3Channels2_0.createV2Channel = createV2Channel;
 	            reject(new Error('getResult is not supported in this environment'));
 	        });
 	    });
-	    getResultPromise
-	        .then(() => {
-	        isPromiseSettled = true;
-	    })
-	        .catch(() => {
-	        isPromiseSettled = true;
-	    });
 	    // Set up the getResult call.
 	    const getResult = async () => {
-	        // All this mumbo jumbo is needed to make sure that getResult resolves correctly and conforms to the FDC3 spec.
-	        if (!isPromiseSettled) {
-	            return undefined;
-	        }
 	        let intentResult = await getResultPromise;
-	        if (isPromiseSettled && !intentResult) {
+	        // void / no payload, or web path where subscribe resolves undefined (see getResultPromise above)
+	        if (intentResult == null) {
 	            return undefined;
 	        }
 	        if (typeof intentResult !== 'object') {
@@ -495,35 +484,6 @@ var InteropClient$1 = {};
 
 var base = {};
 
-var promises = {};
-
-Object.defineProperty(promises, "__esModule", { value: true });
-promises.promiseMapSerial = promises.serial = promises.promiseMap = promises.promisify = void 0;
-function promisify(func) {
-    return (...args) => new Promise((resolve, reject) => {
-        func(...args, (err, val) => (err ? reject(err) : resolve(val)));
-    });
-}
-promises.promisify = promisify;
-async function promiseMap(arr, asyncF) {
-    return Promise.all(arr.map(asyncF));
-}
-promises.promiseMap = promiseMap;
-async function serial(arr) {
-    const ret = [];
-    for (const func of arr) {
-        // eslint-disable-next-line no-await-in-loop
-        const next = await func();
-        ret.push(next);
-    }
-    return ret;
-}
-promises.serial = serial;
-async function promiseMapSerial(arr, func) {
-    return serial(arr.map((value, index, array) => () => func(value, index, array)));
-}
-promises.promiseMapSerial = promiseMapSerial;
-
 var __classPrivateFieldSet$3 = (commonjsGlobal && commonjsGlobal.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -538,7 +498,6 @@ var __classPrivateFieldGet$3 = (commonjsGlobal && commonjsGlobal.__classPrivateF
 var _EmitterBase_emitterAccessor, _EmitterBase_deregisterOnceListeners;
 Object.defineProperty(base, "__esModule", { value: true });
 base.Reply = base.EmitterBase = base.Base = void 0;
-const promises_1 = promises;
 class Base {
     /**
      * @internal
@@ -616,27 +575,8 @@ class EmitterBase extends Base {
             return this.hasEmitter() ? this.getOrCreateEmitter().emit(eventType, payload, ...args) : false;
         };
         this.hasEmitter = () => this.wire.eventAggregator.has(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
-        /**
-         * Cleans up after removal of a listener, e.g. deleting any lingering deregistration handlers for a
-         * `once` subscription.
-         *
-         * @remarks Implementing this as a `removeListener` handler ensures that direct removal of a listener
-         * on the base emitter will not leak additional core handlers.  We could do this in the forwarding method,
-         * which would involve less "magic," but would be more-vulnerable to accidental re-introduction of a leak.
-         */
-        this.cleanUpRemovedListener = (eventType, listener) => {
-            const deregister = __classPrivateFieldGet$3(this, _EmitterBase_deregisterOnceListeners, "f").get(listener);
-            if (deregister) {
-                const emitter = this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
-                emitter.removeListener(eventType, deregister);
-            }
-        };
         this.getOrCreateEmitter = () => {
-            const emitter = this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
-            if (!emitter.listeners('removeListener').includes(this.cleanUpRemovedListener)) {
-                emitter.on('removeListener', this.cleanUpRemovedListener);
-            }
-            return emitter;
+            return this.wire.eventAggregator.getOrCreate(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
         };
         this.listeners = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(type) : [];
         this.listenerCount = (type) => this.hasEmitter() ? this.getOrCreateEmitter().listenerCount(type) : 0;
@@ -676,7 +616,6 @@ class EmitterBase extends Base {
         };
         __classPrivateFieldSet$3(this, _EmitterBase_emitterAccessor, [topic, ...additionalAccessors], "f");
         __classPrivateFieldSet$3(this, _EmitterBase_deregisterOnceListeners, new WeakMap(), "f");
-        this.listeners = (event) => this.hasEmitter() ? this.getOrCreateEmitter().listeners(event) : [];
     }
     /**
      * Adds a listener to the end of the listeners array for the specified event.
@@ -754,6 +693,10 @@ class EmitterBase extends Base {
         const emitter = await this.deregisterEventListener(eventType, options);
         if (emitter) {
             emitter.removeListener(eventType, listener);
+            const deregister = __classPrivateFieldGet$3(this, _EmitterBase_deregisterOnceListeners, "f").get(listener);
+            if (deregister) {
+                emitter.removeListener(eventType, deregister);
+            }
             this.deleteEmitterIfNothingRegistered(emitter);
         }
         return this;
@@ -789,12 +732,13 @@ class EmitterBase extends Base {
         }
         else if (this.hasEmitter()) {
             const events = this.getOrCreateEmitter().eventNames();
-            await (0, promises_1.promiseMap)(events, removeByEvent);
+            await Promise.all(events.map(removeByEvent));
         }
         return this;
     }
     deleteEmitterIfNothingRegistered(emitter) {
-        if (emitter.eventNames().every((type) => type === 'removeListener')) {
+        // TODO: maybe emitterMap should clean up itself..
+        if (emitter.eventNames().length === 0) {
             this.wire.eventAggregator.delete(__classPrivateFieldGet$3(this, _EmitterBase_emitterAccessor, "f"));
         }
     }
@@ -1535,9 +1479,7 @@ class FDC3ModuleBase {
      * @static
      */
     async broadcast(context) {
-        this.wire.sendAction('fdc3-broadcast').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-broadcast');
         return this.client.setContext(context);
     }
     /**
@@ -1548,9 +1490,7 @@ class FDC3ModuleBase {
      * @tutorial fdc3.open
      */
     async _open(app, context) {
-        this.wire.sendAction('fdc3-open').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-open');
         try {
             return await InteropClient_1$1.InteropClient.ferryFdc3Call(this.client, 'fdc3Open', { app, context });
         }
@@ -1574,9 +1514,7 @@ class FDC3ModuleBase {
      * @tutorial fdc3.getOrCreateChannel
      */
     async getOrCreateChannel(channelId, fdc3Factory) {
-        this.wire.sendAction('fdc3-get-or-create-channel').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-or-create-channel');
         const hasChannelIdBeenUsed = await InteropClient_1$1.InteropClient.ferryFdc3Call(this.client, 'isIdUsedByPrivateChannel', {
             channelId
         });
@@ -1604,9 +1542,7 @@ class FDC3ModuleBase {
      * @static
      */
     async getSystemChannels() {
-        this.wire.sendAction('fdc3-get-system-channels').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-system-channels');
         return this._getChannels();
     }
     /**
@@ -1621,9 +1557,7 @@ class FDC3ModuleBase {
      * @static
      */
     async joinChannel(channelId) {
-        this.wire.sendAction('fdc3-join-channel').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-join-channel');
         try {
             return await this.client.joinContextGroup(channelId);
         }
@@ -1646,9 +1580,7 @@ class FDC3ModuleBase {
      * @tutorial fdc3.getCurrentChannel
      */
     async getCurrentChannel() {
-        this.wire.sendAction('fdc3-get-current-channel').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-current-channel');
         const currentContextGroupInfo = await this.getCurrentContextGroupInfo();
         if (!currentContextGroupInfo) {
             return null;
@@ -1663,9 +1595,7 @@ class FDC3ModuleBase {
      * @static
      */
     async leaveCurrentChannel() {
-        this.wire.sendAction('fdc3-leave-current-channel').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-leave-current-channel');
         return this.client.removeFromContextGroup();
     }
     // utils
@@ -1791,9 +1721,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      */
     // @ts-expect-error TODO [CORE-1524]
     addContextListener(contextType, handler) {
-        this.wire.sendAction('fdc3-add-context-listener').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-add-context-listener');
         let listener;
         if (typeof contextType === 'function') {
             console.warn('addContextListener(handler) has been deprecated. Please use addContextListener(null, handler)');
@@ -1816,9 +1744,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @static
      */
     addIntentListener(intent, handler) {
-        this.wire.sendAction('fdc3-add-intent-listener').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-add-intent-listener');
         const contextHandler = (raisedIntent) => {
             const { context, metadata: intentMetadata } = raisedIntent;
             const { metadata } = context;
@@ -1846,9 +1772,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @static
      */
     async raiseIntent(intent, context, app) {
-        this.wire.sendAction('fdc3-raise-intent').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-raise-intent');
         const intentObj = app
             ? { name: intent, context, metadata: { target: app } }
             : { name: intent, context };
@@ -1868,9 +1792,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.findIntent
      */
     async findIntent(intent, context) {
-        this.wire.sendAction('fdc3-find-intent').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-intent');
         try {
             return await this.client.getInfoForIntent({ name: intent, context });
         }
@@ -1886,9 +1808,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.findIntentsByContext
      */
     async findIntentsByContext(context) {
-        this.wire.sendAction('fdc3-find-intents-by-context').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-intents-by-context');
         try {
             return await this.client.getInfoForIntentsByContext(context);
         }
@@ -1905,9 +1825,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.raiseIntentForContext
      */
     async raiseIntentForContext(context, app) {
-        this.wire.sendAction('fdc3-raise-intent-for-context').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-raise-intent-for-context');
         try {
             return await this.client.fireIntentForContext({ ...context, metadata: { target: app } });
         }
@@ -1931,9 +1849,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.getInfo
      */
     getInfo() {
-        this.wire.sendAction('fdc3-get-info').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-info');
         const version = this.wire.environment.getAdapterVersionSync();
         return {
             providerVersion: version,
@@ -2013,9 +1929,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.findInstances
      */
     async findInstances(app) {
-        this.wire.sendAction('fdc3-find-instances').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-instances');
         try {
             return await InteropClient_1.InteropClient.ferryFdc3Call(this.client, 'fdc3FindInstances', app);
         }
@@ -2031,9 +1945,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.getAppMetadata
      */
     async getAppMetadata(app) {
-        this.wire.sendAction('fdc3-get-app-metadata').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-get-app-metadata');
         try {
             return await InteropClient_1.InteropClient.ferryFdc3Call(this.client, 'fdc3GetAppMetadata', app);
         }
@@ -2051,9 +1963,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      */
     // @ts-expect-error TODO [CORE-1524]
     async addContextListener(contextType, handler) {
-        this.wire.sendAction('fdc3-add-context-listener').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-add-context-listener');
         // The FDC3 ContextHandler only expects the context and optional ContextMetadata, so we wrap the handler
         // here so it only gets passed these parameters
         const getWrappedHandler = (handlerToWrap) => {
@@ -2082,9 +1992,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3.findIntent
      */
     async findIntent(intent, context, resultType) {
-        this.wire.sendAction('fdc3-find-intent').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-intent');
         try {
             return await this.client.getInfoForIntent({ name: intent, context, metadata: { resultType } });
         }
@@ -2101,9 +2009,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.findIntentsByContext
      */
     async findIntentsByContext(context, resultType) {
-        this.wire.sendAction('fdc3-find-intents-by-context').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-find-intents-by-context');
         const payload = resultType ? { context, metadata: { resultType } } : context;
         try {
             return await InteropClient_1.InteropClient.ferryFdc3Call(this.client, 'fdc3v2FindIntentsByContext', payload);
@@ -2122,9 +2028,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3v2.raiseIntent
      */
     async raiseIntent(intent, context, app) {
-        this.wire.sendAction('fdc3-raise-intent').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-raise-intent');
         try {
             if (typeof app === 'string') {
                 console.warn('Passing a string as the app parameter is deprecated, please use an AppIdentifier ({ appId: string; instanceId?: string }).');
@@ -2145,9 +2049,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      */
     async raiseIntentForContext(context, app) {
         // TODO: We have to do the same thing we do for raiseIntent here as well.
-        this.wire.sendAction('fdc3-raise-intent-for-context').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-raise-intent-for-context');
         try {
             if (typeof app === 'string') {
                 console.warn('Passing a string as the app parameter is deprecated, please use an AppIdentifier ({ appId: string; instanceId?: string }).');
@@ -2167,9 +2069,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3.addIntentListener
      */
     async addIntentListener(intent, handler) {
-        this.wire.sendAction('fdc3-add-intent-listener').catch((e) => {
-            // we do not want to expose this error, just continue if this analytics-only call fails
-        });
+        this.wire.recordAnalytic('fdc3-add-intent-listener');
         if (typeof intent !== 'string') {
             throw new Error('First argument must be an Intent name');
         }

package/package.json

@@ -1,26 +1,31 @@
 {
-    "name": "@openfin/fdc3-api",
-    "version": "41.103.3",
-    "description": "OpenFin fdc3 module utilities and types.",
-    "license": "SEE LICENSE IN LICENSE.md",
-    "private": false,
-    "main": "./out/fdc3-api.js",
-    "types": "./out/fdc3-api.d.ts",
-    "files": [
-        "out/*"
-    ],
-    "scripts": {
-        "prebuild": "rimraf ./out",
-        "build": "rollup -c --bundleConfigAsCjs",
-        "dev": "npm run build -- --environment MODE:development",
-        "watch": "npm run dev -- --watch",
-        "ci:prepublish": "of-npm prepublish",
-        "ci:postpublish": "of-npm postpublish",
-        "ci:publish": "npm publish",
-        "version:update": "of-npm version --allow-same-version '$RMAJOR.$RMINOR.$RPATCH'"
-    },
-    "author": "OpenFin",
-    "dependencies": {
-        "lodash": "^4.17.21"
-    }
+  "name": "@openfin/fdc3-api",
+  "version": "41.103.10",
+  "description": "OpenFin fdc3 module utilities and types.",
+  "license": "SEE LICENSE IN LICENSE.md",
+  "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "main": "./out/fdc3-api.js",
+  "types": "./out/fdc3-api.d.ts",
+  "files": [
+    "out/*"
+  ],
+  "author": "OpenFin",
+  "dependencies": {
+    "lodash": "^4.17.21",
+    "tslib": "2.8.1"
+  },
+  "scripts": {
+    "prebuild": "rimraf ./out",
+    "build": "rollup -c --bundleConfigAsCjs",
+    "dev": "pnpm run build -- --environment MODE:development",
+    "watch": "pnpm run dev -- --watch",
+    "ci:prepack": "of-npm prepack",
+    "ci:pack": "pnpm pack",
+    "ci:postpack": "of-npm postpack",
+    "version:update": "of-npm version --allow-same-version '$RMAJOR.$RMINOR.$RPATCH'",
+    "typecheck": "tsc --noEmit -p tsconfig.json"
+  }
 }