@openfin/core 41.102.7 → 41.103.2

package/out/mock-alpha.d.ts

@@ -4572,7 +4572,22 @@ declare type DomainSettings = {
 };
 
 /**
- * Map of preload scripts that can enable new scripts or disable options defined preloadScripts.
+ * Enables or disables specific preload scripts by URL.
+ *
+ * Uses the script's full URL as the key and an object
+ * with an `enabled` boolean property as the value.
+ * @example
+ * ```js
+ * {
+ "match": ["<all_urls>"],
+ "options": {
+ "preloadScripts": {
+ "http://localhost:53000/block-preload.js":  { "enabled": false }
+ "http://localhost:53000/allow-preload.js":  { "enabled": true }
+ }
+ }
+ }
+ * ```
  */
 declare type DomainSettingsPreloadScripts = Record<string, {
     enabled: boolean;
@@ -6616,6 +6631,7 @@ declare class InteropBroker extends Base {
     private sessionContextGroupMap;
     private channel;
     private logging;
+    private privateChannelProviderMap;
     /* Excluded from this release type: __constructor */
     private getProvider;
     static createClosedConstructor(...args: ConstructorParameters<typeof InteropBroker>): {

package/out/mock-beta.d.ts

@@ -4572,7 +4572,22 @@ declare type DomainSettings = {
 };
 
 /**
- * Map of preload scripts that can enable new scripts or disable options defined preloadScripts.
+ * Enables or disables specific preload scripts by URL.
+ *
+ * Uses the script's full URL as the key and an object
+ * with an `enabled` boolean property as the value.
+ * @example
+ * ```js
+ * {
+ "match": ["<all_urls>"],
+ "options": {
+ "preloadScripts": {
+ "http://localhost:53000/block-preload.js":  { "enabled": false }
+ "http://localhost:53000/allow-preload.js":  { "enabled": true }
+ }
+ }
+ }
+ * ```
  */
 declare type DomainSettingsPreloadScripts = Record<string, {
     enabled: boolean;
@@ -6616,6 +6631,7 @@ declare class InteropBroker extends Base {
     private sessionContextGroupMap;
     private channel;
     private logging;
+    private privateChannelProviderMap;
     /* Excluded from this release type: __constructor */
     private getProvider;
     static createClosedConstructor(...args: ConstructorParameters<typeof InteropBroker>): {

package/out/mock-public.d.ts

@@ -4572,7 +4572,22 @@ declare type DomainSettings = {
 };
 
 /**
- * Map of preload scripts that can enable new scripts or disable options defined preloadScripts.
+ * Enables or disables specific preload scripts by URL.
+ *
+ * Uses the script's full URL as the key and an object
+ * with an `enabled` boolean property as the value.
+ * @example
+ * ```js
+ * {
+ "match": ["<all_urls>"],
+ "options": {
+ "preloadScripts": {
+ "http://localhost:53000/block-preload.js":  { "enabled": false }
+ "http://localhost:53000/allow-preload.js":  { "enabled": true }
+ }
+ }
+ }
+ * ```
  */
 declare type DomainSettingsPreloadScripts = Record<string, {
     enabled: boolean;
@@ -6616,6 +6631,7 @@ declare class InteropBroker extends Base {
     private sessionContextGroupMap;
     private channel;
     private logging;
+    private privateChannelProviderMap;
     /* Excluded from this release type: __constructor */
     private getProvider;
     static createClosedConstructor(...args: ConstructorParameters<typeof InteropBroker>): {

package/out/stub.d.ts

@@ -4631,7 +4631,22 @@ declare type DomainSettings = {
 };
 
 /**
- * Map of preload scripts that can enable new scripts or disable options defined preloadScripts.
+ * Enables or disables specific preload scripts by URL.
+ *
+ * Uses the script's full URL as the key and an object
+ * with an `enabled` boolean property as the value.
+ * @example
+ * ```js
+ * {
+ "match": ["<all_urls>"],
+ "options": {
+ "preloadScripts": {
+ "http://localhost:53000/block-preload.js":  { "enabled": false }
+ "http://localhost:53000/allow-preload.js":  { "enabled": true }
+ }
+ }
+ }
+ * ```
  */
 declare type DomainSettingsPreloadScripts = Record<string, {
     enabled: boolean;
@@ -6722,6 +6737,7 @@ declare class InteropBroker extends Base {
     private sessionContextGroupMap;
     private channel;
     private logging;
+    private privateChannelProviderMap;
     /**
      * @internal
      */

package/out/stub.js

@@ -9025,7 +9025,7 @@ var __classPrivateFieldGet$c = (commonjsGlobal && commonjsGlobal.__classPrivateF
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var __importDefault$5 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
+var __importDefault$6 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 var _ConnectionManager_messageReceiver, _ConnectionManager_rtcConnectionManager;
@@ -9039,7 +9039,7 @@ const ice_manager_1 = iceManager;
 const provider_1$1 = provider;
 const message_receiver_1 = messageReceiver;
 const protocol_manager_1 = protocolManager;
-const strategy_3 = __importDefault$5(strategy);
+const strategy_3 = __importDefault$6(strategy);
 class ConnectionManager extends base_1$i.Base {
     static getProtocolOptionsFromStrings(protocols) {
         return protocols.map((protocol) => {
@@ -13454,7 +13454,7 @@ Object.defineProperty(PrivateChannelProvider$1, "__esModule", { value: true });
 PrivateChannelProvider$1.PrivateChannelProvider = void 0;
 const utils_1$8 = utils$3;
 class PrivateChannelProvider {
-    constructor(provider, id) {
+    constructor(provider, id, removePrivateChannelProvider) {
         this.provider = provider;
         this.id = id;
         this.clients = new Map();
@@ -13462,6 +13462,7 @@ class PrivateChannelProvider {
         this.contextByContextType = new Map();
         this.lastContext = undefined;
         this.provider.onConnection((clientIdentity) => this.registerNewClient(clientIdentity));
+        this.removePrivateChannelProvider = removePrivateChannelProvider;
         this.provider.onDisconnection(async (clientIdentity) => {
             const { endpointId } = clientIdentity;
             if (this.clients.has(endpointId)) {
@@ -13469,6 +13470,7 @@ class PrivateChannelProvider {
             }
             if ((await this.provider.getAllClientInfo()).length === 0) {
                 this.provider.destroy();
+                this.removePrivateChannelProvider(this.id);
             }
         });
     }
@@ -13720,8 +13722,8 @@ class PrivateChannelProvider {
             });
         });
     }
-    static init(channelProvider, id) {
-        return new PrivateChannelProvider(channelProvider, id);
+    static init(channelProvider, id, removePrivateChannelProvider) {
+        return new PrivateChannelProvider(channelProvider, id, removePrivateChannelProvider);
     }
 }
 PrivateChannelProvider$1.PrivateChannelProvider = PrivateChannelProvider;
@@ -13737,16 +13739,16 @@ var __classPrivateFieldGet$5 = (commonjsGlobal && commonjsGlobal.__classPrivateF
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var __importDefault$4 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
+var __importDefault$5 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 var _InteropBroker_fdc3Info, _InteropBroker_contextGroups, _InteropBroker_providerPromise;
 Object.defineProperty(InteropBroker$1, "__esModule", { value: true });
 InteropBroker$1.InteropBroker = void 0;
 const base_1$5 = base;
-const SessionContextGroupBroker_1 = __importDefault$4(SessionContextGroupBroker$1);
+const SessionContextGroupBroker_1 = __importDefault$5(SessionContextGroupBroker$1);
 const utils_1$7 = utils$3;
-const isEqual_1$1 = __importDefault$4(require$$3);
+const isEqual_1$2 = __importDefault$5(require$$3);
 const PrivateChannelProvider_1 = PrivateChannelProvider$1;
 const lazy_1 = lazy;
 const defaultContextGroups = [
@@ -13935,6 +13937,7 @@ class InteropBroker extends base_1$5.Base {
         this.intentClientMap = new Map();
         this.lastContextMap = new Map();
         this.sessionContextGroupMap = new Map();
+        this.privateChannelProviderMap = new Map();
         __classPrivateFieldSet$5(this, _InteropBroker_providerPromise, new lazy_1.Lazy(createProvider), "f");
         this.setContextGroupMap();
         this.setupChannelProvider();
@@ -13944,7 +13947,7 @@ class InteropBroker extends base_1$5.Base {
             constructor(...unused) {
                 if (unused.length) {
                     const [_ignore1, ignore2, opts] = unused;
-                    if (opts && typeof opts === 'object' && !(0, isEqual_1$1.default)(opts, args[2])) {
+                    if (opts && typeof opts === 'object' && !(0, isEqual_1$2.default)(opts, args[2])) {
                         // eslint-disable-next-line no-console
                         console.warn('You have modified the parameters of the InteropOverride constructor. This behavior is deprecated and will be removed in a future version. You can modify these options in your manifest. Please consult our Interop docs for guidance on migrating to the new override scheme.');
                         super(args[0], args[1], opts);
@@ -14955,7 +14958,15 @@ class InteropBroker extends base_1$5.Base {
         channel.register('createPrivateChannelProvider', async (payload) => {
             const { channelId } = payload;
             const channelProvider = await this.fin.InterApplicationBus.Channel.create(channelId);
-            PrivateChannelProvider_1.PrivateChannelProvider.init(channelProvider, channelId);
+            const removePrivateChannelProvider = (channelId) => {
+                this.privateChannelProviderMap.delete(channelId);
+            };
+            const privateChannelProvider = PrivateChannelProvider_1.PrivateChannelProvider.init(channelProvider, channelId, removePrivateChannelProvider);
+            this.privateChannelProviderMap.set(channelId, privateChannelProvider);
+        });
+        channel.register('isIdUsedByPrivateChannel', async (payload) => {
+            const { channelId } = payload;
+            return this.privateChannelProviderMap.has(channelId);
         });
     }
     /**
@@ -15088,14 +15099,14 @@ var __classPrivateFieldGet$3 = (commonjsGlobal && commonjsGlobal.__classPrivateF
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var __importDefault$3 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
+var __importDefault$4 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 var _InteropClient_clientPromise, _InteropClient_sessionContextGroups, _InteropClient_fdc3Factory;
 Object.defineProperty(InteropClient$1, "__esModule", { value: true });
 InteropClient$1.InteropClient = void 0;
 const base_1$3 = base;
-const SessionContextGroupClient_1 = __importDefault$3(SessionContextGroupClient$1);
+const SessionContextGroupClient_1 = __importDefault$4(SessionContextGroupClient$1);
 const utils_1$5 = utils$3;
 /**
  * The Interop Client API is broken up into two groups:
@@ -15837,15 +15848,86 @@ class PrivateChannelClient {
 }
 PrivateChannelClient$1.PrivateChannelClient = PrivateChannelClient;
 
+var fdc3Channels2_0 = {};
+
+var fdc3Channels1_2 = {};
+
+var __importDefault$3 = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(fdc3Channels1_2, "__esModule", { value: true });
+fdc3Channels1_2.createV1Channel = void 0;
+const isEqual_1$1 = __importDefault$3(require$$3);
+const createV1Channel = (sessionContextGroup) => {
+    return {
+        id: sessionContextGroup.id,
+        type: 'app',
+        broadcast: sessionContextGroup.setContext,
+        getCurrentContext: async (contextType) => {
+            const context = await sessionContextGroup.getCurrentContext(contextType);
+            return context === undefined ? null : context;
+        },
+        // @ts-expect-error TODO [CORE-1524]
+        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 sessionContextGroup.getCurrentContext(realType);
+                const wrappedHandler = (context, contextMetadata) => {
+                    if (first) {
+                        first = false;
+                        if ((0, isEqual_1$1.default)(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())
+            };
+        }
+    };
+};
+fdc3Channels1_2.createV1Channel = createV1Channel;
+
+Object.defineProperty(fdc3Channels2_0, "__esModule", { value: true });
+fdc3Channels2_0.createV2Channel = void 0;
+const fdc3_channels_1_2_1$1 = fdc3Channels1_2;
+const createV2Channel = (sessionContextGroup) => {
+    const channel = (0, fdc3_channels_1_2_1$1.createV1Channel)(sessionContextGroup);
+    return {
+        ...channel,
+        // @ts-expect-error Type incompatibility on signature.
+        addContextListener: async (...args) => channel.addContextListener(...args)
+    };
+};
+fdc3Channels2_0.createV2Channel = createV2Channel;
+
 (function (exports) {
 	var __importDefault = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
 	    return (mod && mod.__esModule) ? mod : { "default": mod };
 	};
 	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;
+	exports.getIntentResolution = exports.isChannel = exports.isContext = exports.connectPrivateChannel = exports.buildPrivateChannelObject = exports.ChannelError = exports.ResultError = exports.UnsupportedChannelApiError = exports.getUnsupportedChannelApis = void 0;
 	const utils_1 = utils$3;
 	const PrivateChannelClient_1 = PrivateChannelClient$1;
-	const isEqual_1 = __importDefault(require$$3);
+	__importDefault(require$$3);
+	const fdc3_channels_2_0_1 = fdc3Channels2_0;
 	const getUnsupportedChannelApis = (channelType) => {
 	    return {
 	        addContextListener: () => {
@@ -15944,52 +16026,6 @@ PrivateChannelClient$1.PrivateChannelClient = PrivateChannelClient;
 	    };
 	};
 	exports.buildPrivateChannelObject = buildPrivateChannelObject;
-	const buildAppChannelObject = (sessionContextGroup) => {
-	    return {
-	        id: sessionContextGroup.id,
-	        type: 'app',
-	        broadcast: sessionContextGroup.setContext,
-	        getCurrentContext: async (contextType) => {
-	            const context = await sessionContextGroup.getCurrentContext(contextType);
-	            return context === undefined ? null : context;
-	        },
-	        // @ts-expect-error TODO [CORE-1524]
-	        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 sessionContextGroup.getCurrentContext(realType);
-	                const wrappedHandler = (context, contextMetadata) => {
-	                    if (first) {
-	                        first = false;
-	                        if ((0, isEqual_1.default)(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())
-	            };
-	        }
-	    };
-	};
-	exports.buildAppChannelObject = buildAppChannelObject;
 	const connectPrivateChannel = async (channelId) => {
 	    try {
 	        const channelClient = await fin.InterApplicationBus.Channel.connect(channelId);
@@ -16021,6 +16057,10 @@ PrivateChannelClient$1.PrivateChannelClient = PrivateChannelClient;
 	    // 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 };
 	    // Promise we'll use in getResult
 	    const getResultPromise = new Promise((resolve, reject) => {
 	        fin.InterApplicationBus.subscribe({ uuid: '*' }, guid, (intentResult) => {
@@ -16033,13 +16073,24 @@ PrivateChannelClient$1.PrivateChannelClient = PrivateChannelClient;
 	            reject(new Error('getResult is not supported in this environment'));
 	        });
 	    });
-	    // 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 };
+	    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 (!intentResult || typeof intentResult !== 'object') {
+	        if (isPromiseSettled && !intentResult) {
+	            return undefined;
+	        }
+	        if (typeof intentResult !== 'object') {
 	            throw new Error(ResultError.NoResultReturned);
 	        }
 	        const { error } = intentResult;
@@ -16055,7 +16106,7 @@ PrivateChannelClient$1.PrivateChannelClient = PrivateChannelClient;
 	                }
 	                case 'app': {
 	                    const sessionContextGroup = await interopModule.joinSessionContextGroup(id);
-	                    intentResult = (0, exports.buildAppChannelObject)(sessionContextGroup);
+	                    intentResult = (0, fdc3_channels_2_0_1.createV2Channel)(sessionContextGroup);
 	                    break;
 	                }
 	            }
@@ -16165,10 +16216,16 @@ class FDC3ModuleBase {
      *
      * @tutorial fdc3.getOrCreateChannel
      */
-    async getOrCreateChannel(channelId) {
+    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
         });
+        const hasChannelIdBeenUsed = await InteropClient_1$2.InteropClient.ferryFdc3Call(this.client, 'isIdUsedByPrivateChannel', {
+            channelId
+        });
+        if (hasChannelIdBeenUsed) {
+            throw new Error(utils_1$4.ChannelError.AccessDenied);
+        }
         const systemChannels = await this._getChannels();
         const userChannel = systemChannels.find((channel) => channel.id === channelId);
         if (userChannel) {
@@ -16176,7 +16233,7 @@ class FDC3ModuleBase {
         }
         try {
             const sessionContextGroup = await this.client.joinSessionContextGroup(channelId);
-            return (0, utils_1$4.buildAppChannelObject)(sessionContextGroup);
+            return fdc3Factory(sessionContextGroup);
         }
         catch (error) {
             console.error(error.message);
@@ -16326,6 +16383,7 @@ Object.defineProperty(fdc31_2, "__esModule", { value: true });
 fdc31_2.Fdc3Module = void 0;
 const utils_1$3 = utils$3;
 const fdc3_common_1$1 = fdc3Common;
+const fdc3_channels_1_2_1 = fdc3Channels1_2;
 /**
  * @version 1.2
  * The FDC3 Client Library provides a set APIs to be used for FDC3 compliance,
@@ -16508,7 +16566,7 @@ class Fdc3Module extends fdc3_common_1$1.FDC3ModuleBase {
      * @tutorial fdc3.getOrCreateChannel
      */
     async getOrCreateChannel(channelId) {
-        return super.getOrCreateChannel(channelId);
+        return super.getOrCreateChannel(channelId, fdc3_channels_1_2_1.createV1Channel);
     }
     /**
      * Returns metadata relating to the FDC3 object and its provider, including the supported version of the FDC3 specification and the name of the provider of the implementation.
@@ -16538,6 +16596,7 @@ const utils_1$2 = utils$3;
 const InteropClient_1$1 = InteropClient$1;
 const utils_2 = utils$2;
 const PrivateChannelClient_1 = PrivateChannelClient$1;
+const fdc3_channels_2_0_1 = fdc3Channels2_0;
 /**
  * @version 2.0
  * The FDC3 Client Library provides a set APIs to be used for FDC3 compliance,
@@ -16789,7 +16848,7 @@ class Fdc3Module2 extends fdc3_common_1.FDC3ModuleBase {
      * @tutorial fdc3.getOrCreateChannel
      */
     async getOrCreateChannel(channelId) {
-        return super.getOrCreateChannel(channelId);
+        return super.getOrCreateChannel(channelId, fdc3_channels_2_0_1.createV2Channel);
     }
     /**
      * Returns a Channel with an auto-generated identity that is intended for private communication between applications. Primarily used to create channels that will be returned to other applications via an IntentResolution for a raised intent.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@openfin/core",
-    "version": "41.102.7",
+    "version": "41.103.2",
     "description": "The core renderer entry point of OpenFin",
     "license": "SEE LICENSE IN LICENSE.md",
     "main": "out/stub.js",