@onekeyfe/cross-inpage-provider-core 1.1.36 → 1.1.38

package/dist/JsBridgeBase.d.ts

@@ -50,17 +50,19 @@ declare abstract class JsBridgeBase extends CrossEventEmitter {
         remoteId?: number | string | null;
         scope?: IInjectedProviderNamesStrings;
     }): Promise<IJsonRpcResponse<unknown>> | undefined;
-    response({ id, data, remoteId, scope, }: {
+    response({ id, data, remoteId, scope, peerOrigin, }: {
         id: number;
         data: unknown;
         scope?: IInjectedProviderNamesStrings;
         remoteId?: number | string | null;
+        peerOrigin?: string;
     }): void;
-    responseError({ id, error, scope, remoteId, }: {
+    responseError({ id, error, scope, remoteId, peerOrigin, }: {
         id: number;
         error: unknown;
         scope?: IInjectedProviderNamesStrings;
         remoteId?: number | string | null;
+        peerOrigin?: string;
     }): void;
     abstract sendPayload(payload: IJsBridgeMessagePayload | string): void;
 }

package/dist/JsBridgeBase.js

@@ -60,6 +60,7 @@ class JsBridgeBase extends CrossEventEmitter {
                             scope: message.scope,
                             remoteId: message.remoteId,
                             data: returnValue,
+                            peerOrigin: message.origin,
                         });
                     }
                 }
@@ -71,6 +72,7 @@ class JsBridgeBase extends CrossEventEmitter {
                         scope: message.scope,
                         remoteId: message.remoteId,
                         error,
+                        peerOrigin: message.origin,
                     });
                 }
                 this.emit(BRIDGE_EVENTS.error, error);
@@ -137,7 +139,7 @@ class JsBridgeBase extends CrossEventEmitter {
         payload === null || payload === void 0 ? true : delete payload.reject;
         return payload;
     }
-    send({ type, data, error, id, remoteId, sync = false, scope }) {
+    send({ type, data, error, id, remoteId, sync = false, scope, peerOrigin, }) {
         const executor = (resolve, reject) => {
             var _a, _b, _c;
             // TODO check resolve when calling without await
@@ -154,6 +156,7 @@ class JsBridgeBase extends CrossEventEmitter {
                     error,
                     type,
                     origin: ((_a = globalWindow === null || globalWindow === void 0 ? void 0 : globalWindow.location) === null || _a === void 0 ? void 0 : _a.origin) || '',
+                    peerOrigin,
                     remoteId,
                     scope,
                 }, { resolve, reject });
@@ -228,8 +231,8 @@ class JsBridgeBase extends CrossEventEmitter {
             return;
         }
         const now = Date.now();
-        // eslint-disable-next-line @typescript-eslint/no-for-in-array
-        for (const id in this.callbacks) {
+        const callbacksLength = this.callbacks.length;
+        for (let id = 0; id < callbacksLength; id++) {
             const callbackInfo = this.callbacks[id];
             if (callbackInfo && callbackInfo.created) {
                 if (now - callbackInfo.created > this.callbacksExpireTimeout) {
@@ -340,7 +343,7 @@ class JsBridgeBase extends CrossEventEmitter {
         });
     }
     // send response DATA to remote
-    response({ id, data, remoteId, scope, }) {
+    response({ id, data, remoteId, scope, peerOrigin, }) {
         void this.send({
             type: IJsBridgeMessageTypes.RESPONSE,
             data,
@@ -348,10 +351,11 @@ class JsBridgeBase extends CrossEventEmitter {
             remoteId,
             scope,
             sync: true,
+            peerOrigin,
         });
     }
     // send response ERROR to remote
-    responseError({ id, error, scope, remoteId, }) {
+    responseError({ id, error, scope, remoteId, peerOrigin, }) {
         void this.send({
             type: IJsBridgeMessageTypes.RESPONSE,
             error,
@@ -359,6 +363,7 @@ class JsBridgeBase extends CrossEventEmitter {
             remoteId,
             scope,
             sync: true,
+            peerOrigin,
         });
     }
 }

package/dist/cjs/JsBridgeBase.js

@@ -67,6 +67,7 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
                             scope: message.scope,
                             remoteId: message.remoteId,
                             data: returnValue,
+                            peerOrigin: message.origin,
                         });
                     }
                 }
@@ -78,6 +79,7 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
                         scope: message.scope,
                         remoteId: message.remoteId,
                         error,
+                        peerOrigin: message.origin,
                     });
                 }
                 this.emit(BRIDGE_EVENTS.error, error);
@@ -144,7 +146,7 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
         payload === null || payload === void 0 ? true : delete payload.reject;
         return payload;
     }
-    send({ type, data, error, id, remoteId, sync = false, scope }) {
+    send({ type, data, error, id, remoteId, sync = false, scope, peerOrigin, }) {
         const executor = (resolve, reject) => {
             var _a, _b, _c;
             // TODO check resolve when calling without await
@@ -161,6 +163,7 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
                     error,
                     type,
                     origin: ((_a = globalWindow === null || globalWindow === void 0 ? void 0 : globalWindow.location) === null || _a === void 0 ? void 0 : _a.origin) || '',
+                    peerOrigin,
                     remoteId,
                     scope,
                 }, { resolve, reject });
@@ -235,8 +238,8 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
             return;
         }
         const now = Date.now();
-        // eslint-disable-next-line @typescript-eslint/no-for-in-array
-        for (const id in this.callbacks) {
+        const callbacksLength = this.callbacks.length;
+        for (let id = 0; id < callbacksLength; id++) {
             const callbackInfo = this.callbacks[id];
             if (callbackInfo && callbackInfo.created) {
                 if (now - callbackInfo.created > this.callbacksExpireTimeout) {
@@ -347,7 +350,7 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
         });
     }
     // send response DATA to remote
-    response({ id, data, remoteId, scope, }) {
+    response({ id, data, remoteId, scope, peerOrigin, }) {
         void this.send({
             type: cross_inpage_provider_types_1.IJsBridgeMessageTypes.RESPONSE,
             data,
@@ -355,10 +358,11 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
             remoteId,
             scope,
             sync: true,
+            peerOrigin,
         });
     }
     // send response ERROR to remote
-    responseError({ id, error, scope, remoteId, }) {
+    responseError({ id, error, scope, remoteId, peerOrigin, }) {
         void this.send({
             type: cross_inpage_provider_types_1.IJsBridgeMessageTypes.RESPONSE,
             error,
@@ -366,6 +370,7 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
             remoteId,
             scope,
             sync: true,
+            peerOrigin,
         });
     }
 }

package/dist/cjs/injectedProviderReceiveHandler.js

@@ -11,9 +11,8 @@ function injectedProviderReceiveHandler(payload, bridge) {
         (0, loggers_1.consoleErrorInDev)('providerName (scope) is required in injectedProviderReceiveHandler.');
         return;
     }
-    const providers = []
-        .concat(providerHub[providerName])
-        .filter(Boolean);
+    let providers = [];
+    providers = providers.concat(providerHub[providerName]).filter(Boolean);
     if (!providers || !providers.length) {
         (0, loggers_1.consoleErrorInDev)(`[${providerName}] provider is NOT injected to document or bridge.`, payloadData);
         return;
@@ -22,7 +21,15 @@ function injectedProviderReceiveHandler(payload, bridge) {
     providers.forEach((provider) => {
         if (provider && provider.emit) {
             provider.emit('message_low_level', payloadData);
+            provider.emit('message_payload_raw', payload);
         }
     });
+    // $private custom provider receive handler
+    if (providerName === '$private') {
+        const privateProvider = providers[0];
+        if (privateProvider && privateProvider.webembedReceiveHandler) {
+            return privateProvider.webembedReceiveHandler(payload, bridge);
+        }
+    }
 }
 exports.injectedProviderReceiveHandler = injectedProviderReceiveHandler;

package/dist/cjs/versionInfo.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const version = '1.1.36';
+const version = '1.1.38';
 const versionBuild = '2020-0101-1';
 exports.default = {
     version,

package/dist/injectedProviderReceiveHandler.d.ts

@@ -1,4 +1,4 @@
 import { IJsBridgeMessagePayload } from '@onekeyfe/cross-inpage-provider-types';
 import { JsBridgeBase } from './JsBridgeBase';
-declare function injectedProviderReceiveHandler(payload: IJsBridgeMessagePayload, bridge?: JsBridgeBase): void;
+declare function injectedProviderReceiveHandler(payload: IJsBridgeMessagePayload, bridge?: JsBridgeBase): unknown;
 export { injectedProviderReceiveHandler };

package/dist/injectedProviderReceiveHandler.js

@@ -8,9 +8,8 @@ function injectedProviderReceiveHandler(payload, bridge) {
         consoleErrorInDev('providerName (scope) is required in injectedProviderReceiveHandler.');
         return;
     }
-    const providers = []
-        .concat(providerHub[providerName])
-        .filter(Boolean);
+    let providers = [];
+    providers = providers.concat(providerHub[providerName]).filter(Boolean);
     if (!providers || !providers.length) {
         consoleErrorInDev(`[${providerName}] provider is NOT injected to document or bridge.`, payloadData);
         return;
@@ -19,7 +18,15 @@ function injectedProviderReceiveHandler(payload, bridge) {
     providers.forEach((provider) => {
         if (provider && provider.emit) {
             provider.emit('message_low_level', payloadData);
+            provider.emit('message_payload_raw', payload);
         }
     });
+    // $private custom provider receive handler
+    if (providerName === '$private') {
+        const privateProvider = providers[0];
+        if (privateProvider && privateProvider.webembedReceiveHandler) {
+            return privateProvider.webembedReceiveHandler(payload, bridge);
+        }
+    }
 }
 export { injectedProviderReceiveHandler };

package/dist/versionInfo.js

@@ -1,4 +1,4 @@
-const version = '1.1.36';
+const version = '1.1.38';
 const versionBuild = '2020-0101-1';
 export default {
     version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-core",
-  "version": "1.1.36",
+  "version": "1.1.38",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,12 +29,12 @@
     "build-version-info": "node ./scripts/buildVersionInfo.js"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-errors": "1.1.36",
-    "@onekeyfe/cross-inpage-provider-events": "1.1.36",
-    "@onekeyfe/cross-inpage-provider-types": "1.1.36",
+    "@onekeyfe/cross-inpage-provider-errors": "1.1.38",
+    "@onekeyfe/cross-inpage-provider-events": "1.1.38",
+    "@onekeyfe/cross-inpage-provider-types": "1.1.38",
     "events": "^3.3.0",
     "lodash": "^4.17.21",
     "ms": "^2.1.3"
   },
-  "gitHead": "946a3e8dd1728c16f36623759e2f737adc7cc45f"
+  "gitHead": "260c2345f2591463b20c0f0c855961fe509d01de"
 }