@openfin/core 29.72.13 → 29.72.14

package/src/environment/openfin-env.js

@@ -17,8 +17,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* global window, location */
 /* eslint-disable class-methods-use-this */
 const transport_errors_1 = require("../transport/transport-errors");
-class OpenFinEnvironment {
+const browser_1 = require("./browser");
+// Inherits the following BrowserEnvironment methods: getRtcPeer, getRandomId, getUrl, getWsConstructor.
+class OpenFinEnvironment extends browser_1.BrowserEnvironment {
     constructor() {
+        super();
         _ready.set(this, void 0);
         this.writeToken = (path, token) => {
             throw new transport_errors_1.NotImplementedError('Not Implemented');
@@ -45,10 +48,6 @@ class OpenFinEnvironment {
             }
             return opts;
         };
-        this.getRandomId = () => {
-            const intArray = new Uint32Array(1);
-            return window.crypto.getRandomValues(intArray)[0].toString(32);
-        };
         this.getWebWindow = (identity) => {
             return fin.__internal_.getWebWindow(identity.name);
         };
@@ -61,9 +60,6 @@ class OpenFinEnvironment {
         this.raiseEvent = (eventName, eventArgs) => {
             this.raiseEventAsync(eventName, eventArgs);
         };
-        this.getUrl = () => {
-            return location.href;
-        };
         this.raiseEventAsync = fin.__internal_.raiseEventAsync;
         delete fin.__internal_.raiseEventAsync;
         this.childViews = fin.__internal_.childViews;
@@ -79,9 +75,6 @@ class OpenFinEnvironment {
             ...((_b = (_a = fin.__internal_.initialOptions.experimental) === null || _a === void 0 ? void 0 : _a.defaultChannelOptions) !== null && _b !== void 0 ? _b : {})
         };
     }
-    getRtcPeer() {
-        return new RTCPeerConnection();
-    }
     async getManagerConstructor() {
         const ManagerConstructor = (await Promise.resolve().then(() => require(
         /* webpackChunkName: 'layout' */

package/src/fdc3.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fdc3FromFin = void 0;
+const fdc3_1 = require("./api/interop/fdc3/fdc3");
+async function fdc3FromFin(fin, version) {
+    // @ts-expect-error
+    return fdc3_1.getFdc3(fin.wire, version);
+}
+exports.fdc3FromFin = fdc3FromFin;

package/src/mock.js

@@ -79,6 +79,9 @@ class MockEnvironment {
     whenReady() {
         throw new Error(me_1.environmentUnsupportedMessage);
     }
+    getWsConstructor() {
+        throw new Error('Method not implemented.');
+    }
 }
 exports.fin = ((typeof window !== 'undefined' && ((_a = window) === null || _a === void 0 ? void 0 : _a.fin)) ||
     (() => {

package/src/transport/transport.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { Wire, WireConstructor, ExistingConnectConfig, InternalConnectConfig } from './wire';
+import { Wire, WireConstructor, ExistingConnectConfig, InternalConnectConfig, RemoteConfig } from './wire';
 import { Environment } from '../environment/environment';
 import { RuntimeEvent } from '../api/events/base';
 import EventAggregator from '../api/events/eventAggregator';
@@ -25,8 +25,10 @@ declare class Transport<MeType extends EntityType = EntityType> extends EventEmi
     connectSync: () => void;
     getPort: () => string;
     shutdown(): Promise<void>;
-    connect(config: InternalConnectConfig): Promise<string | void>;
-    connectByPort(config: ExistingConnectConfig): Promise<string>;
+    connect(config: InternalConnectConfig | RemoteConfig): Promise<string | void>;
+    private connectRemote;
+    connectByPort(config: ExistingConnectConfig): Promise<void>;
+    private authorize;
     sendAction<T extends keyof ProtocolMap = string>(action: T, payload?: ProtocolMap[T]['request'], uncorrelated?: boolean): Promise<Message<{
         data: ProtocolMap[T]['response'];
     } & ProtocolMap[T]['specialResponse']>>;

package/src/transport/transport.js

@@ -59,6 +59,9 @@ class Transport extends events_1.EventEmitter {
         return wire.shutdown();
     }
     async connect(config) {
+        if (wire_1.isRemoteConfig(config)) {
+            return this.connectRemote(config);
+        }
         if (wire_1.isExistingConnectConfig(config)) {
             return this.connectByPort(config);
         }
@@ -68,11 +71,15 @@ class Transport extends events_1.EventEmitter {
         }
         return undefined;
     }
+    async connectRemote(config) {
+        await __classPrivateFieldGet(this, _wire).connect(config.address, this.environment.getWsConstructor());
+        return this.authorize(config);
+    }
     async connectByPort(config) {
         const { address, uuid } = config;
         const reqAuthPayload = { ...config, type: 'file-token' };
         const wire = __classPrivateFieldGet(this, _wire);
-        await wire.connect(address);
+        await wire.connect(address, this.environment.getWsConstructor());
         const requestExtAuthRet = await this.sendAction('request-external-authorization', {
             uuid,
             type: 'file-token'
@@ -80,8 +87,10 @@ class Transport extends events_1.EventEmitter {
         if (requestExtAuthRet.action !== 'external-authorization-response') {
             throw new transport_errors_1.UnexpectedActionError(requestExtAuthRet.action);
         }
-        const { token } = requestExtAuthRet.payload;
         await this.environment.writeToken(requestExtAuthRet.payload.file, requestExtAuthRet.payload.token);
+        return this.authorize(reqAuthPayload);
+    }
+    async authorize(reqAuthPayload) {
         const requestAuthRet = await this.sendAction('request-authorization', reqAuthPayload, true);
         if (requestAuthRet.action !== 'authorization-response') {
             throw new transport_errors_1.UnexpectedActionError(requestAuthRet.action);
@@ -89,9 +98,6 @@ class Transport extends events_1.EventEmitter {
         else if (requestAuthRet.payload.success !== true) {
             throw new transport_errors_1.RuntimeError(requestAuthRet.payload);
         }
-        else {
-            return token;
-        }
     }
     sendAction(action, payload = {}, uncorrelated = false
     // specialResponse type is only used for 'requestAuthorization'

package/src/transport/wire.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import EventEmitter = NodeJS.EventEmitter;
 export declare type Wire = EventEmitter & {
-    connect(address: string): Promise<any>;
+    connect(address: string, WsConstructor: typeof WebSocket): Promise<any>;
     connectSync(): any;
     send(data: any): Promise<any>;
     shutdown(): Promise<void>;
@@ -64,8 +64,12 @@ export declare type NewConnectConfig = ConfigWithUuid & ConfigWithRuntime;
 export declare type PortDiscoveryConfig = (ExternalConfig & ConfigWithRuntime) | NewConnectConfig;
 export declare type ConnectConfig = ExistingConnectConfig | NewConnectConfig | ExternalConfig;
 export declare type InternalConnectConfig = ExistingConnectConfig | NewConnectConfig;
+export interface RemoteConfig extends ExistingConnectConfig {
+    token: string;
+}
 export declare function isExternalConfig(config: ConnectConfig): config is ExternalConfig;
 export declare function isExistingConnectConfig(config: any): config is ExistingConnectConfig;
+export declare function isRemoteConfig(config: any): config is RemoteConfig;
 export declare function isNewConnectConfig(config: any): config is NewConnectConfig;
 export declare function isPortDiscoveryConfig(config: any): config is PortDiscoveryConfig;
 export declare function isInternalConnectConfig(config: any): config is InternalConnectConfig;

package/src/transport/wire.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isInternalConnectConfig = exports.isPortDiscoveryConfig = exports.isNewConnectConfig = exports.isExistingConnectConfig = exports.isExternalConfig = void 0;
+exports.isInternalConnectConfig = exports.isPortDiscoveryConfig = exports.isNewConnectConfig = exports.isRemoteConfig = exports.isExistingConnectConfig = exports.isExternalConfig = void 0;
 function isExternalConfig(config) {
     if (typeof config.manifestUrl === 'string') {
         return true;
@@ -12,6 +12,10 @@ function isExistingConnectConfig(config) {
     return hasUuid(config) && typeof config.address === 'string';
 }
 exports.isExistingConnectConfig = isExistingConnectConfig;
+function isRemoteConfig(config) {
+    return isExistingConnectConfig(config) && typeof config.token === 'string';
+}
+exports.isRemoteConfig = isRemoteConfig;
 function hasUuid(config) {
     return typeof config.uuid === 'string';
 }