@onekeyfe/extension-bridge-hosted 1.1.58-alpha.2 → 1.1.58

package/dist/JsBridgeExtBackground.d.ts

@@ -18,7 +18,7 @@ declare class JsBridgeExtBackground extends JsBridgeBase {
     sendPayload(payload0: IJsBridgeMessagePayload | string): void;
     setupMessagePortOnConnect(): void;
     requestToOffscreen(data: unknown): Promise<import("@onekeyfe/cross-inpage-provider-types").IJsonRpcResponse<unknown>> | undefined;
-    requestToAllCS(scope: IInjectedProviderNamesStrings, data: unknown, targetOrigin?: string): void;
+    requestToAllCS(scope: IInjectedProviderNamesStrings, data: unknown): void;
     requestToAllUi(data: unknown): void;
 }
 export { JsBridgeExtBackground };

package/dist/JsBridgeExtBackground.js

@@ -117,7 +117,7 @@ class JsBridgeExtBackground extends JsBridgeBase {
         }
         return this.request({ data, remoteId: this.offscreenPortId });
     }
-    requestToAllCS(scope, data, targetOrigin) {
+    requestToAllCS(scope, data) {
         // TODO optimize rename: broadcastRequest
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
         entries(this.ports).forEach(([portId, port]) => __awaiter(this, void 0, void 0, function* () {
@@ -127,15 +127,13 @@ class JsBridgeExtBackground extends JsBridgeBase {
                     // eslint-disable-next-line no-param-reassign
                     data = yield data({ origin });
                 }
-                // Send a notification to the port of the specified origin
-                if (!targetOrigin || targetOrigin === origin) {
-                    // TODO check ports disconnected
-                    this.requestSync({
-                        data,
-                        scope,
-                        remoteId: portId,
-                    });
-                }
+                console.log(`notify to content-script port: ${portId}`, data);
+                // TODO check ports disconnected
+                this.requestSync({
+                    data,
+                    scope,
+                    remoteId: portId,
+                });
             }
             void 0;
         }));

package/dist/JsBridgeExtOffscreen.js

@@ -19,7 +19,7 @@ class JsBridgeExtOffscreen extends JsBridgeBase {
             name: EXT_PORT_OFFSCREEN_TO_BG,
             // #### background -> offscreen
             onMessage: (payload, port0) => {
-                let origin = utils.getOriginFromPort(port0) || '';
+                let origin = utils.getOriginFromPort(port0, { skipError: true }) || '';
                 // in ext offscreen, port.sender?.origin is always empty,
                 //    so we trust remote (background) origin
                 origin = origin || payload.origin || '';

package/dist/bridgeSetup/contentScript.js

@@ -1,5 +1,6 @@
 import { consts, isLegacyExtMessage, appDebugLogger, injectedFactory, } from '@onekeyfe/cross-inpage-provider-core';
 import messagePort from '../extensionMessagePort';
+import { commonLogger } from '@onekeyfe/cross-inpage-provider-core';
 const { EXT_PORT_CS_TO_BG, JS_BRIDGE_MESSAGE_DIRECTION, JS_BRIDGE_MESSAGE_EXT_CHANNEL } = consts;
 // TODO one-time only
 function inject({ file, code, remove = true, }) {
@@ -54,7 +55,7 @@ function setupMessagePort(options = {}) {
             };
             window.addEventListener('message', onWindowPostMessage, false);
             return () => {
-                console.error('ONEKEY: lost connection to hosted bridge. You should reload page to establish a new connection.');
+                commonLogger.error('ONEKEY: lost connection to hosted bridge. You should reload page to establish a new connection.');
                 window.dispatchEvent(new Event('onekey_bridge_disconnect'));
                 window.removeEventListener('message', onWindowPostMessage, false);
             };

package/dist/cjs/JsBridgeExtBackground.js

@@ -142,7 +142,7 @@ class JsBridgeExtBackground extends cross_inpage_provider_core_1.JsBridgeBase {
         }
         return this.request({ data, remoteId: this.offscreenPortId });
     }
-    requestToAllCS(scope, data, targetOrigin) {
+    requestToAllCS(scope, data) {
         // TODO optimize rename: broadcastRequest
         // eslint-disable-next-line @typescript-eslint/no-misused-promises
         (0, entries_1.default)(this.ports).forEach(([portId, port]) => __awaiter(this, void 0, void 0, function* () {
@@ -152,15 +152,13 @@ class JsBridgeExtBackground extends cross_inpage_provider_core_1.JsBridgeBase {
                     // eslint-disable-next-line no-param-reassign
                     data = yield data({ origin });
                 }
-                // Send a notification to the port of the specified origin
-                if (!targetOrigin || targetOrigin === origin) {
-                    // TODO check ports disconnected
-                    this.requestSync({
-                        data,
-                        scope,
-                        remoteId: portId,
-                    });
-                }
+                console.log(`notify to content-script port: ${portId}`, data);
+                // TODO check ports disconnected
+                this.requestSync({
+                    data,
+                    scope,
+                    remoteId: portId,
+                });
             }
             void 0;
         }));

package/dist/cjs/JsBridgeExtOffscreen.js

@@ -25,7 +25,7 @@ class JsBridgeExtOffscreen extends cross_inpage_provider_core_1.JsBridgeBase {
             name: EXT_PORT_OFFSCREEN_TO_BG,
             // #### background -> offscreen
             onMessage: (payload, port0) => {
-                let origin = utils_1.default.getOriginFromPort(port0) || '';
+                let origin = utils_1.default.getOriginFromPort(port0, { skipError: true }) || '';
                 // in ext offscreen, port.sender?.origin is always empty,
                 //    so we trust remote (background) origin
                 origin = origin || payload.origin || '';

package/dist/cjs/bridgeSetup/contentScript.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
 const extensionMessagePort_1 = __importDefault(require("../extensionMessagePort"));
+const cross_inpage_provider_core_2 = require("@onekeyfe/cross-inpage-provider-core");
 const { EXT_PORT_CS_TO_BG, JS_BRIDGE_MESSAGE_DIRECTION, JS_BRIDGE_MESSAGE_EXT_CHANNEL } = cross_inpage_provider_core_1.consts;
 // TODO one-time only
 function inject({ file, code, remove = true, }) {
@@ -59,7 +60,7 @@ function setupMessagePort(options = {}) {
             };
             window.addEventListener('message', onWindowPostMessage, false);
             return () => {
-                console.error('ONEKEY: lost connection to hosted bridge. You should reload page to establish a new connection.');
+                cross_inpage_provider_core_2.commonLogger.error('ONEKEY: lost connection to hosted bridge. You should reload page to establish a new connection.');
                 window.dispatchEvent(new Event('onekey_bridge_disconnect'));
                 window.removeEventListener('message', onWindowPostMessage, false);
             };

package/dist/cjs/utils.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const cross_inpage_provider_core_1 = require("@onekeyfe/cross-inpage-provider-core");
 function getOriginFromPort(port, { skipError } = {}) {
     var _a, _b, _c;
     // chrome
@@ -15,7 +16,7 @@ function getOriginFromPort(port, { skipError } = {}) {
         }
     }
     if (!origin && !skipError) {
-        console.error('ERROR: origin not found from port sender', port);
+        cross_inpage_provider_core_1.commonLogger.error('ERROR: origin not found from port sender', port);
     }
     return origin || '';
 }

package/dist/utils.js

@@ -1,3 +1,4 @@
+import { commonLogger } from '@onekeyfe/cross-inpage-provider-core';
 function getOriginFromPort(port, { skipError } = {}) {
     var _a, _b, _c;
     // chrome
@@ -13,7 +14,7 @@ function getOriginFromPort(port, { skipError } = {}) {
         }
     }
     if (!origin && !skipError) {
-        console.error('ERROR: origin not found from port sender', port);
+        commonLogger.error('ERROR: origin not found from port sender', port);
     }
     return origin || '';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/extension-bridge-hosted",
-  "version": "1.1.58-alpha.2",
+  "version": "1.1.58",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -28,12 +28,12 @@
     "start": "tsc --watch"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-core": "1.1.58-alpha.2",
-    "@onekeyfe/cross-inpage-provider-types": "1.1.58-alpha.2",
+    "@onekeyfe/cross-inpage-provider-core": "1.1.58",
+    "@onekeyfe/cross-inpage-provider-types": "1.1.58",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@types/uuid": "^8.3.4"
   },
-  "gitHead": "5e2426bfdaeec2bbb77248dc4518ce7cd4ad5dcf"
+  "gitHead": "975b254f7617940021ff9848163c1e1c84947d6c"
 }