@onekeyfe/extension-bridge-hosted 1.1.24 → 1.1.26

package/dist/JsBridgeExtBackground.d.ts

@@ -5,10 +5,21 @@ declare class JsBridgeExtBackground extends JsBridgeBase {
     constructor(config: IJsBridgeConfig);
     sendAsString: boolean;
     ports: Record<number | string, chrome.runtime.Port>;
+    offscreenPort: chrome.runtime.Port | undefined;
+    offscreenPortId: number | undefined;
     private portIdIndex;
+    addPort({ portId, port }: {
+        portId: number;
+        port: chrome.runtime.Port;
+    }): void;
+    removePort({ portId, port }: {
+        portId: number;
+        port: chrome.runtime.Port;
+    }): void;
     sendPayload(payload0: IJsBridgeMessagePayload | string): void;
     _getOriginFromPort(port: chrome.runtime.Port): string;
     setupMessagePortOnConnect(): void;
+    requestToOffscreen(data: unknown): Promise<import("@onekeyfe/cross-inpage-provider-types").IJsonRpcResponse<unknown>> | undefined;
     requestToAllCS(scope: IInjectedProviderNamesStrings, data: unknown): void;
     requestToAllUi(data: unknown): void;
 }

package/dist/JsBridgeExtBackground.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import isFunction from 'lodash/isFunction';
 import entries from 'lodash/entries';
 import { JsBridgeBase, consts } from '@onekeyfe/cross-inpage-provider-core';
-const { EXT_PORT_CS_TO_BG, EXT_PORT_UI_TO_BG } = consts;
+const { EXT_PORT_OFFSCREEN_TO_BG, EXT_PORT_CS_TO_BG, EXT_PORT_UI_TO_BG } = consts;
 class JsBridgeExtBackground extends JsBridgeBase {
     constructor(config) {
         super(config);
@@ -19,6 +19,20 @@ class JsBridgeExtBackground extends JsBridgeBase {
         this.portIdIndex = 1;
         this.setupMessagePortOnConnect();
     }
+    addPort({ portId, port }) {
+        this.ports[portId] = port;
+        if (port.name === EXT_PORT_OFFSCREEN_TO_BG) {
+            this.offscreenPort = port;
+            this.offscreenPortId = portId;
+        }
+    }
+    removePort({ portId, port }) {
+        delete this.ports[portId];
+        if (port.name === EXT_PORT_OFFSCREEN_TO_BG) {
+            this.offscreenPort = undefined;
+            this.offscreenPortId = undefined;
+        }
+    }
     sendPayload(payload0) {
         const payload = payload0;
         if (!payload.remoteId) {
@@ -39,6 +53,7 @@ class JsBridgeExtBackground extends JsBridgeBase {
             throw error;
         }
     }
+    // TODO use utils
     _getOriginFromPort(port) {
         var _a, _b, _c, _d;
         // chrome
@@ -64,10 +79,15 @@ class JsBridgeExtBackground extends JsBridgeBase {
                         url: "https://app.uniswap.org/#/swap"
                    */
             // content-script may be multiple
-            if (port.name === EXT_PORT_CS_TO_BG || port.name === EXT_PORT_UI_TO_BG) {
+            if (port.name === EXT_PORT_CS_TO_BG ||
+                port.name === EXT_PORT_UI_TO_BG ||
+                port.name === EXT_PORT_OFFSCREEN_TO_BG) {
                 this.portIdIndex += 1;
                 const portId = this.portIdIndex;
-                this.ports[portId] = port;
+                this.addPort({
+                    portId,
+                    port,
+                });
                 const onMessage = (payload, port0) => {
                     const origin = this._getOriginFromPort(port0);
                     payload.remoteId = portId;
@@ -78,22 +98,32 @@ class JsBridgeExtBackground extends JsBridgeBase {
                     // - receive
                     jsBridge.receive(payload, {
                         origin,
-                        // only trust message from UI, but NOT from content-script(dapp)
-                        internal: port.name === EXT_PORT_UI_TO_BG,
+                        // TODO trust origin
+                        // only trust message from UI/Offscreen, but NOT from content-script(dapp)
+                        internal: port.name === EXT_PORT_UI_TO_BG || port.name === EXT_PORT_OFFSCREEN_TO_BG,
                     });
                 };
                 // #### content-script -> background
                 port.onMessage.addListener(onMessage);
                 // TODO onDisconnect remove ports cache
                 const onDisconnect = () => {
-                    delete this.ports[portId];
                     port.onMessage.removeListener(onMessage);
                     port.onDisconnect.removeListener(onDisconnect);
+                    this.removePort({
+                        portId,
+                        port,
+                    });
                 };
                 port.onDisconnect.addListener(onDisconnect);
             }
         });
     }
+    requestToOffscreen(data) {
+        if (!this.offscreenPort) {
+            throw new Error('offscreenPort not ready.');
+        }
+        return this.request({ data, remoteId: this.offscreenPortId });
+    }
     requestToAllCS(scope, data) {
         // TODO optimize rename: broadcastRequest
         // eslint-disable-next-line @typescript-eslint/no-misused-promises

package/dist/JsBridgeExtOffscreen.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="chrome" />
+import { IJsBridgeConfig, IJsBridgeMessagePayload } from '@onekeyfe/cross-inpage-provider-types';
+import { JsBridgeBase } from '@onekeyfe/cross-inpage-provider-core';
+export declare type IJsBridgeExtOffscreenConfig = IJsBridgeConfig & {
+    onPortConnect: (port0: chrome.runtime.Port) => void;
+};
+declare class JsBridgeExtOffscreen extends JsBridgeBase {
+    constructor(config: IJsBridgeExtOffscreenConfig);
+    sendAsString: boolean;
+    private portToBg;
+    sendPayload(payload: IJsBridgeMessagePayload | string): void;
+    setupMessagePortConnect(config: IJsBridgeExtOffscreenConfig): void;
+}
+export { JsBridgeExtOffscreen };

package/dist/JsBridgeExtOffscreen.js

@@ -0,0 +1,46 @@
+import messagePort from './extensionMessagePort';
+import { JsBridgeBase, consts } from '@onekeyfe/cross-inpage-provider-core';
+import utils from './utils';
+const { EXT_PORT_OFFSCREEN_TO_BG } = consts;
+class JsBridgeExtOffscreen extends JsBridgeBase {
+    constructor(config) {
+        super(config);
+        this.sendAsString = false;
+        this.portToBg = null;
+        this.setupMessagePortConnect(config);
+    }
+    sendPayload(payload) {
+        if (this.portToBg) {
+            this.portToBg.postMessage(payload);
+        }
+    }
+    setupMessagePortConnect(config) {
+        messagePort.connect({
+            name: EXT_PORT_OFFSCREEN_TO_BG,
+            // #### background -> offscreen
+            onMessage: (payload, port0) => {
+                let origin = utils.getOriginFromPort(port0) || '';
+                // in ext offscreen, port.sender?.origin is always empty,
+                //    so we trust remote (background) origin
+                origin = origin || payload.origin || '';
+                // eslint-disable-next-line @typescript-eslint/no-this-alias
+                const jsBridge = this;
+                jsBridge.receive(payload, {
+                    origin,
+                    // trust message from background
+                    internal: port0.name === EXT_PORT_OFFSCREEN_TO_BG,
+                });
+            },
+            onConnect: (port) => {
+                this.portToBg = port;
+                setTimeout(() => {
+                    config.onPortConnect(port);
+                }, 0);
+                return () => {
+                    this.portToBg = null;
+                };
+            },
+        });
+    }
+}
+export { JsBridgeExtOffscreen };

package/dist/JsBridgeExtUi.d.ts

@@ -10,7 +10,6 @@ declare class JsBridgeExtUi extends JsBridgeBase {
     sendAsString: boolean;
     private portToBg;
     sendPayload(payload: IJsBridgeMessagePayload | string): void;
-    _getOriginFromPort(port: chrome.runtime.Port): string;
     setupMessagePortConnect(config: IJsBridgeExtUiConfig): void;
 }
 export { JsBridgeExtUi };

package/dist/JsBridgeExtUi.js

@@ -1,5 +1,6 @@
 import messagePort from './extensionMessagePort';
 import { JsBridgeBase, consts } from '@onekeyfe/cross-inpage-provider-core';
+import utils from './utils';
 const { EXT_PORT_UI_TO_BG } = consts;
 class JsBridgeExtUi extends JsBridgeBase {
     constructor(config) {
@@ -14,23 +15,12 @@ class JsBridgeExtUi extends JsBridgeBase {
             this.portToBg.postMessage(payload);
         }
     }
-    _getOriginFromPort(port) {
-        var _a, _b, _c;
-        // chrome
-        let origin = ((_a = port === null || port === void 0 ? void 0 : port.sender) === null || _a === void 0 ? void 0 : _a.origin) || '';
-        // firefox
-        if (!origin && ((_b = port === null || port === void 0 ? void 0 : port.sender) === null || _b === void 0 ? void 0 : _b.url)) {
-            const uri = new URL((_c = port === null || port === void 0 ? void 0 : port.sender) === null || _c === void 0 ? void 0 : _c.url);
-            origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
-        }
-        return origin;
-    }
     setupMessagePortConnect(config) {
         messagePort.connect({
             name: EXT_PORT_UI_TO_BG,
             // #### background -> ui
             onMessage: (payload, port0) => {
-                let origin = this._getOriginFromPort(port0) || '';
+                let origin = utils.getOriginFromPort(port0) || '';
                 // in ext ui, port.sender?.origin is always empty,
                 //    so we trust remote (background) origin
                 origin = origin || payload.origin || '';

package/dist/bridgeSetup/index.d.ts

@@ -15,4 +15,7 @@ export declare const bridgeSetup: {
             receiveHandler: import("@onekeyfe/cross-inpage-provider-types").IJsBridgeReceiveHandler;
         }) => import("../JsBridgeExtBackground").JsBridgeExtBackground;
     };
+    offscreen: {
+        createOffscreenJsBridge: (config: import("..").IJsBridgeExtOffscreenConfig) => import("../JsBridgeExtOffscreen").JsBridgeExtOffscreen;
+    };
 };

package/dist/bridgeSetup/index.js

@@ -1,8 +1,10 @@
 import background from './background';
 import ui from './ui';
 import contentScript from './contentScript';
+import offscreen from './offscreen';
 export const bridgeSetup = {
     contentScript,
     ui,
     background,
+    offscreen,
 };

package/dist/bridgeSetup/offscreen.d.ts

@@ -0,0 +1,6 @@
+import { JsBridgeExtOffscreen, IJsBridgeExtOffscreenConfig } from '../JsBridgeExtOffscreen';
+declare function createOffscreenJsBridge(config: IJsBridgeExtOffscreenConfig): JsBridgeExtOffscreen;
+declare const _default: {
+    createOffscreenJsBridge: typeof createOffscreenJsBridge;
+};
+export default _default;

package/dist/bridgeSetup/offscreen.js

@@ -0,0 +1,8 @@
+import { JsBridgeExtOffscreen } from '../JsBridgeExtOffscreen';
+function createOffscreenJsBridge(config) {
+    const bridge = new JsBridgeExtOffscreen(config);
+    return bridge;
+}
+export default {
+    createOffscreenJsBridge,
+};

package/dist/cjs/JsBridgeExtBackground.js

@@ -16,7 +16,7 @@ exports.JsBridgeExtBackground = void 0;
 const isFunction_1 = __importDefault(require("lodash/isFunction"));
 const entries_1 = __importDefault(require("lodash/entries"));
 const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
-const { EXT_PORT_CS_TO_BG, EXT_PORT_UI_TO_BG } = cross_inpage_provider_core_1.consts;
+const { EXT_PORT_OFFSCREEN_TO_BG, EXT_PORT_CS_TO_BG, EXT_PORT_UI_TO_BG } = cross_inpage_provider_core_1.consts;
 class JsBridgeExtBackground extends cross_inpage_provider_core_1.JsBridgeBase {
     constructor(config) {
         super(config);
@@ -25,6 +25,20 @@ class JsBridgeExtBackground extends cross_inpage_provider_core_1.JsBridgeBase {
         this.portIdIndex = 1;
         this.setupMessagePortOnConnect();
     }
+    addPort({ portId, port }) {
+        this.ports[portId] = port;
+        if (port.name === EXT_PORT_OFFSCREEN_TO_BG) {
+            this.offscreenPort = port;
+            this.offscreenPortId = portId;
+        }
+    }
+    removePort({ portId, port }) {
+        delete this.ports[portId];
+        if (port.name === EXT_PORT_OFFSCREEN_TO_BG) {
+            this.offscreenPort = undefined;
+            this.offscreenPortId = undefined;
+        }
+    }
     sendPayload(payload0) {
         const payload = payload0;
         if (!payload.remoteId) {
@@ -45,6 +59,7 @@ class JsBridgeExtBackground extends cross_inpage_provider_core_1.JsBridgeBase {
             throw error;
         }
     }
+    // TODO use utils
     _getOriginFromPort(port) {
         var _a, _b, _c, _d;
         // chrome
@@ -70,10 +85,15 @@ class JsBridgeExtBackground extends cross_inpage_provider_core_1.JsBridgeBase {
                         url: "https://app.uniswap.org/#/swap"
                    */
             // content-script may be multiple
-            if (port.name === EXT_PORT_CS_TO_BG || port.name === EXT_PORT_UI_TO_BG) {
+            if (port.name === EXT_PORT_CS_TO_BG ||
+                port.name === EXT_PORT_UI_TO_BG ||
+                port.name === EXT_PORT_OFFSCREEN_TO_BG) {
                 this.portIdIndex += 1;
                 const portId = this.portIdIndex;
-                this.ports[portId] = port;
+                this.addPort({
+                    portId,
+                    port,
+                });
                 const onMessage = (payload, port0) => {
                     const origin = this._getOriginFromPort(port0);
                     payload.remoteId = portId;
@@ -84,22 +104,32 @@ class JsBridgeExtBackground extends cross_inpage_provider_core_1.JsBridgeBase {
                     // - receive
                     jsBridge.receive(payload, {
                         origin,
-                        // only trust message from UI, but NOT from content-script(dapp)
-                        internal: port.name === EXT_PORT_UI_TO_BG,
+                        // TODO trust origin
+                        // only trust message from UI/Offscreen, but NOT from content-script(dapp)
+                        internal: port.name === EXT_PORT_UI_TO_BG || port.name === EXT_PORT_OFFSCREEN_TO_BG,
                     });
                 };
                 // #### content-script -> background
                 port.onMessage.addListener(onMessage);
                 // TODO onDisconnect remove ports cache
                 const onDisconnect = () => {
-                    delete this.ports[portId];
                     port.onMessage.removeListener(onMessage);
                     port.onDisconnect.removeListener(onDisconnect);
+                    this.removePort({
+                        portId,
+                        port,
+                    });
                 };
                 port.onDisconnect.addListener(onDisconnect);
             }
         });
     }
+    requestToOffscreen(data) {
+        if (!this.offscreenPort) {
+            throw new Error('offscreenPort not ready.');
+        }
+        return this.request({ data, remoteId: this.offscreenPortId });
+    }
     requestToAllCS(scope, data) {
         // TODO optimize rename: broadcastRequest
         // eslint-disable-next-line @typescript-eslint/no-misused-promises

package/dist/cjs/JsBridgeExtOffscreen.js

@@ -0,0 +1,52 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsBridgeExtOffscreen = void 0;
+const extensionMessagePort_1 = __importDefault(require("./extensionMessagePort"));
+const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
+const utils_1 = __importDefault(require("./utils"));
+const { EXT_PORT_OFFSCREEN_TO_BG } = cross_inpage_provider_core_1.consts;
+class JsBridgeExtOffscreen extends cross_inpage_provider_core_1.JsBridgeBase {
+    constructor(config) {
+        super(config);
+        this.sendAsString = false;
+        this.portToBg = null;
+        this.setupMessagePortConnect(config);
+    }
+    sendPayload(payload) {
+        if (this.portToBg) {
+            this.portToBg.postMessage(payload);
+        }
+    }
+    setupMessagePortConnect(config) {
+        extensionMessagePort_1.default.connect({
+            name: EXT_PORT_OFFSCREEN_TO_BG,
+            // #### background -> offscreen
+            onMessage: (payload, port0) => {
+                let origin = utils_1.default.getOriginFromPort(port0) || '';
+                // in ext offscreen, port.sender?.origin is always empty,
+                //    so we trust remote (background) origin
+                origin = origin || payload.origin || '';
+                // eslint-disable-next-line @typescript-eslint/no-this-alias
+                const jsBridge = this;
+                jsBridge.receive(payload, {
+                    origin,
+                    // trust message from background
+                    internal: port0.name === EXT_PORT_OFFSCREEN_TO_BG,
+                });
+            },
+            onConnect: (port) => {
+                this.portToBg = port;
+                setTimeout(() => {
+                    config.onPortConnect(port);
+                }, 0);
+                return () => {
+                    this.portToBg = null;
+                };
+            },
+        });
+    }
+}
+exports.JsBridgeExtOffscreen = JsBridgeExtOffscreen;

package/dist/cjs/JsBridgeExtUi.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsBridgeExtUi = void 0;
 const extensionMessagePort_1 = __importDefault(require("./extensionMessagePort"));
 const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
+const utils_1 = __importDefault(require("./utils"));
 const { EXT_PORT_UI_TO_BG } = cross_inpage_provider_core_1.consts;
 class JsBridgeExtUi extends cross_inpage_provider_core_1.JsBridgeBase {
     constructor(config) {
@@ -20,23 +21,12 @@ class JsBridgeExtUi extends cross_inpage_provider_core_1.JsBridgeBase {
             this.portToBg.postMessage(payload);
         }
     }
-    _getOriginFromPort(port) {
-        var _a, _b, _c;
-        // chrome
-        let origin = ((_a = port === null || port === void 0 ? void 0 : port.sender) === null || _a === void 0 ? void 0 : _a.origin) || '';
-        // firefox
-        if (!origin && ((_b = port === null || port === void 0 ? void 0 : port.sender) === null || _b === void 0 ? void 0 : _b.url)) {
-            const uri = new URL((_c = port === null || port === void 0 ? void 0 : port.sender) === null || _c === void 0 ? void 0 : _c.url);
-            origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
-        }
-        return origin;
-    }
     setupMessagePortConnect(config) {
         extensionMessagePort_1.default.connect({
             name: EXT_PORT_UI_TO_BG,
             // #### background -> ui
             onMessage: (payload, port0) => {
-                let origin = this._getOriginFromPort(port0) || '';
+                let origin = utils_1.default.getOriginFromPort(port0) || '';
                 // in ext ui, port.sender?.origin is always empty,
                 //    so we trust remote (background) origin
                 origin = origin || payload.origin || '';

package/dist/cjs/bridgeSetup/index.js

@@ -7,8 +7,10 @@ exports.bridgeSetup = void 0;
 const background_1 = __importDefault(require("./background"));
 const ui_1 = __importDefault(require("./ui"));
 const contentScript_1 = __importDefault(require("./contentScript"));
+const offscreen_1 = __importDefault(require("./offscreen"));
 exports.bridgeSetup = {
     contentScript: contentScript_1.default,
     ui: ui_1.default,
     background: background_1.default,
+    offscreen: offscreen_1.default,
 };

package/dist/cjs/bridgeSetup/offscreen.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const JsBridgeExtOffscreen_1 = require("../JsBridgeExtOffscreen");
+function createOffscreenJsBridge(config) {
+    const bridge = new JsBridgeExtOffscreen_1.JsBridgeExtOffscreen(config);
+    return bridge;
+}
+exports.default = {
+    createOffscreenJsBridge,
+};

package/dist/cjs/index.js

@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extensionMessagePort = void 0;
 __exportStar(require("./bridgeSetup"), exports);
 __exportStar(require("./JsBridgeExtBackground"), exports);
+__exportStar(require("./JsBridgeExtOffscreen"), exports);
 __exportStar(require("./JsBridgeExtUi"), exports);
 __exportStar(require("./JsBridgeSimple"), exports);
 const extensionMessagePort_1 = __importDefault(require("./extensionMessagePort"));

package/dist/cjs/utils.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function getOriginFromPort(port) {
+    var _a, _b, _c;
+    // chrome
+    let origin = ((_a = port === null || port === void 0 ? void 0 : port.sender) === null || _a === void 0 ? void 0 : _a.origin) || '';
+    // firefox
+    if (!origin && ((_b = port === null || port === void 0 ? void 0 : port.sender) === null || _b === void 0 ? void 0 : _b.url)) {
+        try {
+            const uri = new URL((_c = port === null || port === void 0 ? void 0 : port.sender) === null || _c === void 0 ? void 0 : _c.url);
+            origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
+        }
+        catch (error) {
+            console.error(error);
+        }
+    }
+    return origin || '';
+}
+exports.default = {
+    getOriginFromPort,
+};

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export * from './bridgeSetup';
 export * from './JsBridgeExtBackground';
+export * from './JsBridgeExtOffscreen';
 export * from './JsBridgeExtUi';
 export * from './JsBridgeSimple';
 import extensionMessagePort from './extensionMessagePort';

package/dist/index.js

@@ -1,5 +1,6 @@
 export * from './bridgeSetup';
 export * from './JsBridgeExtBackground';
+export * from './JsBridgeExtOffscreen';
 export * from './JsBridgeExtUi';
 export * from './JsBridgeSimple';
 import extensionMessagePort from './extensionMessagePort';

package/dist/utils.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="chrome" />
+declare function getOriginFromPort(port: chrome.runtime.Port): string;
+declare const _default: {
+    getOriginFromPort: typeof getOriginFromPort;
+};
+export default _default;

package/dist/utils.js

@@ -0,0 +1,19 @@
+function getOriginFromPort(port) {
+    var _a, _b, _c;
+    // chrome
+    let origin = ((_a = port === null || port === void 0 ? void 0 : port.sender) === null || _a === void 0 ? void 0 : _a.origin) || '';
+    // firefox
+    if (!origin && ((_b = port === null || port === void 0 ? void 0 : port.sender) === null || _b === void 0 ? void 0 : _b.url)) {
+        try {
+            const uri = new URL((_c = port === null || port === void 0 ? void 0 : port.sender) === null || _c === void 0 ? void 0 : _c.url);
+            origin = (uri === null || uri === void 0 ? void 0 : uri.origin) || '';
+        }
+        catch (error) {
+            console.error(error);
+        }
+    }
+    return origin || '';
+}
+export default {
+    getOriginFromPort,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-hosted",
-  "version": "1.1.24",
+  "version": "1.1.26",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,8 +28,8 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "1.1.24",
-    "@onekeyfe/cross-inpage-provider-types": "1.1.24"
+    "@onekeyfe/cross-inpage-provider-core": "1.1.26",
+    "@onekeyfe/cross-inpage-provider-types": "1.1.26"
   },
-  "gitHead": "77715c206f3369f7a0c294d2706d471d7339212e"
+  "gitHead": "c5fecd176e00c399c4829f73b9da5e74e1f4e1b9"
 }