@onekeyfe/cross-inpage-provider-core 0.0.6 → 0.0.7-alpha.3

package/README.md

@@ -1 +1 @@
-# @onekeyfe/cross-inpage-provider-core
+# cross-inpage-provider

package/dist/JsBridgeBase.d.ts

@@ -2,7 +2,7 @@ import EventEmitter from 'eventemitter3';
 import { IInjectedProviderNamesStrings, IJsBridgeConfig, IJsBridgeMessagePayload, IJsonRpcResponse, IDebugLogger } from '@onekeyfe/cross-inpage-provider-types';
 declare function isLegacyExtMessage(payload: unknown): boolean;
 declare abstract class JsBridgeBase extends EventEmitter {
-    protected constructor(config?: IJsBridgeConfig);
+    constructor(config?: IJsBridgeConfig);
     protected isExtUi: boolean;
     protected isInjected: boolean;
     protected sendAsString: boolean;

package/dist/JsBridgeBase.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import EventEmitter from 'eventemitter3';
 import isPlainObject from 'lodash/isPlainObject';
 import isString from 'lodash/isString';
-import { appDebugLogger } from './loggers';
+import { appDebugLogger, consoleErrorInDev } from './loggers';
 import { IJsBridgeMessageTypes, } from '@onekeyfe/cross-inpage-provider-types';
 import { web3Errors } from '@onekeyfe/cross-inpage-provider-errors';
 import versionInfo from './versionInfo';
@@ -80,7 +80,12 @@ class JsBridgeBase extends EventEmitter {
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             this.on(BRIDGE_EVENTS.message, this.globalOnMessage);
         }
-        this.on(BRIDGE_EVENTS.error, (error) => console.error('JsBridge ERROR: ', error));
+        this.on(BRIDGE_EVENTS.error, (error) => {
+            var _a;
+            consoleErrorInDev('JsBridge ERROR: ', error, {
+                code: (_a = error) === null || _a === void 0 ? void 0 : _a.code,
+            });
+        });
         this.rejectExpiredCallbacks();
     }
     attachProviderInstance(provider) {
@@ -242,7 +247,7 @@ class JsBridgeBase extends EventEmitter {
             return;
         }
         if (!payload.origin && !this.isInjected) {
-            console.error((_a = this === null || this === void 0 ? void 0 : this.constructor) === null || _a === void 0 ? void 0 : _a.name, '[payload.origin] is missing.', this);
+            consoleErrorInDev((_a = this === null || this === void 0 ? void 0 : this.constructor) === null || _a === void 0 ? void 0 : _a.name, '[payload.origin] is missing.', this);
             throw new Error('JsBridge ERROR: receive message [payload.origin] is required.');
         }
         if (!payload.internal && !payload.scope) {
@@ -299,7 +304,7 @@ class JsBridgeBase extends EventEmitter {
     request(info) {
         const { data, remoteId, scope } = info;
         if (data === undefined) {
-            console.warn('JsBridge ERROR: params data field is missing. Call method like `bridge.request({ data: {...} });`');
+            console.warn('JsBridge ERROR: data required. Call like `bridge.request({ data: {...} });`');
         }
         return this.send({
             type: IJsBridgeMessageTypes.REQUEST,

package/dist/JsBridgeSimple.d.ts

@@ -0,0 +1,10 @@
+import { IJsBridgeMessagePayload } from '@onekeyfe/cross-inpage-provider-types';
+import { JsBridgeBase } from './JsBridgeBase';
+declare class JsBridgeSimple extends JsBridgeBase {
+    sendAsString: boolean;
+    isInjected: boolean;
+    private remote;
+    sendPayload(payload: IJsBridgeMessagePayload | string): void;
+    setRemote(remote: JsBridgeBase): void;
+}
+export { JsBridgeSimple };

package/dist/JsBridgeSimple.js

@@ -0,0 +1,19 @@
+import { JsBridgeBase } from './JsBridgeBase';
+class JsBridgeSimple extends JsBridgeBase {
+    constructor() {
+        super(...arguments);
+        this.sendAsString = true;
+        this.isInjected = true;
+        this.remote = null;
+    }
+    sendPayload(payload) {
+        if (!this.remote) {
+            throw new Error('JsBridgeSimple ERROR: remote not set.');
+        }
+        this.remote.receive(payload);
+    }
+    setRemote(remote) {
+        this.remote = remote;
+    }
+}
+export { JsBridgeSimple };

package/dist/ProviderBase.d.ts

@@ -21,7 +21,7 @@ export declare type ConnectWalletInfo = {
     providerState: unknown;
 };
 declare abstract class ProviderBase extends EventEmitter {
-    protected constructor(config: IInpageProviderConfig);
+    constructor(config: IInpageProviderConfig);
     configDebugLogger(config: DebugLoggerConfig): void;
     getConnectWalletInfo({ timeout }?: {
         timeout?: number | undefined;

package/dist/ProviderBase.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import EventEmitter from 'eventemitter3';
 import isFunction from 'lodash/isFunction';
 import siteMetadata from './siteMetadata';
-import { fakeLogger, fakeDebugLogger } from './loggers';
+import { fakeLogger, fakeDebugLogger, consoleErrorInDev } from './loggers';
 import versionInfo from './versionInfo';
 const METHODS = {
     wallet_getConnectWalletInfo: 'wallet_getConnectWalletInfo',
@@ -30,6 +30,7 @@ class ProviderBase extends EventEmitter {
         this.config = config;
         this.bridge = config.bridge;
         this.logger = config.logger || fakeLogger;
+        // TODO init this.debugLogger first, and enable debug config after extension connect
         this.debugLogger = ((_a = this.bridge) === null || _a === void 0 ? void 0 : _a.debugLogger) || fakeDebugLogger;
         (_c = (_b = this.bridge) === null || _b === void 0 ? void 0 : _b.debugLogger) === null || _c === void 0 ? void 0 : _c._attachExternalLogger(this.logger);
         setTimeout(() => {
@@ -58,7 +59,7 @@ class ProviderBase extends EventEmitter {
             window.$onekey.$debugLogger = debugLogger;
         }
         catch (error) {
-            console.error('configDebugLogger ERROR:', error);
+            consoleErrorInDev('configDebugLogger ERROR:', error);
         }
     }
     getConnectWalletInfo({ timeout = 3000 } = {}) {
@@ -93,7 +94,8 @@ class ProviderBase extends EventEmitter {
                     }
                 }
                 catch (err) {
-                    console.error('getConnectWalletInfo: ERROR', err);
+                    // TODO wallet not installed, timeout ERROR
+                    consoleErrorInDev('getConnectWalletInfo: ERROR', err);
                     resolve(null);
                 }
                 finally {

package/dist/cjs/JsBridgeBase.js

@@ -87,7 +87,12 @@ class JsBridgeBase extends eventemitter3_1.default {
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             this.on(BRIDGE_EVENTS.message, this.globalOnMessage);
         }
-        this.on(BRIDGE_EVENTS.error, (error) => console.error('JsBridge ERROR: ', error));
+        this.on(BRIDGE_EVENTS.error, (error) => {
+            var _a;
+            (0, loggers_1.consoleErrorInDev)('JsBridge ERROR: ', error, {
+                code: (_a = error) === null || _a === void 0 ? void 0 : _a.code,
+            });
+        });
         this.rejectExpiredCallbacks();
     }
     attachProviderInstance(provider) {
@@ -249,7 +254,7 @@ class JsBridgeBase extends eventemitter3_1.default {
             return;
         }
         if (!payload.origin && !this.isInjected) {
-            console.error((_a = this === null || this === void 0 ? void 0 : this.constructor) === null || _a === void 0 ? void 0 : _a.name, '[payload.origin] is missing.', this);
+            (0, loggers_1.consoleErrorInDev)((_a = this === null || this === void 0 ? void 0 : this.constructor) === null || _a === void 0 ? void 0 : _a.name, '[payload.origin] is missing.', this);
             throw new Error('JsBridge ERROR: receive message [payload.origin] is required.');
         }
         if (!payload.internal && !payload.scope) {
@@ -306,7 +311,7 @@ class JsBridgeBase extends eventemitter3_1.default {
     request(info) {
         const { data, remoteId, scope } = info;
         if (data === undefined) {
-            console.warn('JsBridge ERROR: params data field is missing. Call method like `bridge.request({ data: {...} });`');
+            console.warn('JsBridge ERROR: data required. Call like `bridge.request({ data: {...} });`');
         }
         return this.send({
             type: cross_inpage_provider_types_1.IJsBridgeMessageTypes.REQUEST,

package/dist/cjs/JsBridgeSimple.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JsBridgeSimple = void 0;
+const JsBridgeBase_1 = require("./JsBridgeBase");
+class JsBridgeSimple extends JsBridgeBase_1.JsBridgeBase {
+    constructor() {
+        super(...arguments);
+        this.sendAsString = true;
+        this.isInjected = true;
+        this.remote = null;
+    }
+    sendPayload(payload) {
+        if (!this.remote) {
+            throw new Error('JsBridgeSimple ERROR: remote not set.');
+        }
+        this.remote.receive(payload);
+    }
+    setRemote(remote) {
+        this.remote = remote;
+    }
+}
+exports.JsBridgeSimple = JsBridgeSimple;

package/dist/cjs/ProviderBase.js

@@ -36,6 +36,7 @@ class ProviderBase extends eventemitter3_1.default {
         this.config = config;
         this.bridge = config.bridge;
         this.logger = config.logger || loggers_1.fakeLogger;
+        // TODO init this.debugLogger first, and enable debug config after extension connect
         this.debugLogger = ((_a = this.bridge) === null || _a === void 0 ? void 0 : _a.debugLogger) || loggers_1.fakeDebugLogger;
         (_c = (_b = this.bridge) === null || _b === void 0 ? void 0 : _b.debugLogger) === null || _c === void 0 ? void 0 : _c._attachExternalLogger(this.logger);
         setTimeout(() => {
@@ -64,7 +65,7 @@ class ProviderBase extends eventemitter3_1.default {
             window.$onekey.$debugLogger = debugLogger;
         }
         catch (error) {
-            console.error('configDebugLogger ERROR:', error);
+            (0, loggers_1.consoleErrorInDev)('configDebugLogger ERROR:', error);
         }
     }
     getConnectWalletInfo({ timeout = 3000 } = {}) {
@@ -99,7 +100,8 @@ class ProviderBase extends eventemitter3_1.default {
                     }
                 }
                 catch (err) {
-                    console.error('getConnectWalletInfo: ERROR', err);
+                    // TODO wallet not installed, timeout ERROR
+                    (0, loggers_1.consoleErrorInDev)('getConnectWalletInfo: ERROR', err);
                     resolve(null);
                 }
                 finally {

package/dist/cjs/index.js

@@ -31,6 +31,7 @@ __exportStar(require("./ProviderBase"), exports);
 __exportStar(require("./loggers"), exports);
 __exportStar(require("./injectJsBridge"), exports);
 __exportStar(require("./injectedProviderReceiveHandler"), exports);
+__exportStar(require("./JsBridgeSimple"), exports);
 const consts = __importStar(require("./consts"));
 exports.consts = consts;
 const injectedFactory_1 = __importDefault(require("./injectedFactory"));

package/dist/cjs/injectJsBridge.js

@@ -16,7 +16,7 @@ function injectJsBridge(bridgeCreator) {
     if (!((_a = window === null || window === void 0 ? void 0 : window.$onekey) === null || _a === void 0 ? void 0 : _a.jsBridge)) {
         window.$onekey = window.$onekey || {};
         window.$onekey.jsBridge = bridgeCreator();
-        if (localStorage.getItem(consts_1.DEBUG_LOGGER_STORAGE_KEY)) {
+        if (typeof localStorage !== 'undefined' && localStorage.getItem(consts_1.DEBUG_LOGGER_STORAGE_KEY)) {
             console.log('===== jsBridge injected success! >>>>> ', performance.now());
         }
     }

package/dist/cjs/injectedProviderReceiveHandler.js

@@ -1,20 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectedProviderReceiveHandler = void 0;
+const loggers_1 = require("./loggers");
 function injectedProviderReceiveHandler(payload, bridge) {
     // ethereum, solana, conflux
     const providerHub = (bridge === null || bridge === void 0 ? void 0 : bridge.providersHub) || window.$onekey;
     const providerName = payload.scope;
     const payloadData = payload.data;
     if (!providerName) {
-        console.error('providerName (scope) is required in injectedProviderReceiveHandler.');
+        (0, loggers_1.consoleErrorInDev)('providerName (scope) is required in injectedProviderReceiveHandler.');
         return;
     }
     const providers = []
         .concat(providerHub[providerName])
         .filter(Boolean);
     if (!providers || !providers.length) {
-        console.error(`[${providerName}] provider is NOT injected to document.`);
+        (0, loggers_1.consoleErrorInDev)(`[${providerName}] provider is NOT injected to document or bridge.`);
         return;
     }
     // emit events to injected provider

package/dist/cjs/loggers.js

@@ -3,11 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fakeLogger = exports.appDebugLogger = exports.fakeDebugLogger = void 0;
+exports.consoleErrorInDev = exports.fakeLogger = exports.appDebugLogger = exports.fakeDebugLogger = void 0;
 // @ts-ignore
 const debug_1 = __importDefault(require("./debug"));
+const consts_1 = require("./consts");
 // enable debugLogger:
 //    localStorage.setItem('$$ONEKEY_DEBUG_LOGGER', '*');
+function consoleErrorInDev(...args) {
+    const loggerConfig = typeof localStorage !== 'undefined' && localStorage.getItem(consts_1.DEBUG_LOGGER_STORAGE_KEY);
+    if (process.env.NODE_ENV !== 'production' || loggerConfig) {
+        console.error(...args);
+    }
+}
+exports.consoleErrorInDev = consoleErrorInDev;
 const fakeLogger = {
     // @ts-ignore
     _isFakeLogger: true,
@@ -38,6 +46,9 @@ class FakeDebugLogger {
         this.providerBase = this._createExternalLog('providerBase >>');
         this.extInjected = this._createExternalLog('extInjected >>');
         this.extContentScripts = this._createExternalLog('extContentScripts >>');
+        this.webview = this._createExternalLog('webview >>');
+        this.desktopInjected = this._createExternalLog('desktopInjected >>');
+        this.ethereum = this._createExternalLog('ethereum >>');
     }
     _attachExternalLogger(logger) {
         if (logger) {

package/dist/cjs/versionInfo.js

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

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export * from './ProviderBase';
 export * from './loggers';
 export * from './injectJsBridge';
 export * from './injectedProviderReceiveHandler';
+export * from './JsBridgeSimple';
 import * as consts from './consts';
 export { consts };
 import injectedFactory from './injectedFactory';

package/dist/index.js

@@ -3,6 +3,7 @@ export * from './ProviderBase';
 export * from './loggers';
 export * from './injectJsBridge';
 export * from './injectedProviderReceiveHandler';
+export * from './JsBridgeSimple';
 import * as consts from './consts';
 export { consts };
 import injectedFactory from './injectedFactory';

package/dist/injectJsBridge.js

@@ -13,7 +13,7 @@ function injectJsBridge(bridgeCreator) {
     if (!((_a = window === null || window === void 0 ? void 0 : window.$onekey) === null || _a === void 0 ? void 0 : _a.jsBridge)) {
         window.$onekey = window.$onekey || {};
         window.$onekey.jsBridge = bridgeCreator();
-        if (localStorage.getItem(DEBUG_LOGGER_STORAGE_KEY)) {
+        if (typeof localStorage !== 'undefined' && localStorage.getItem(DEBUG_LOGGER_STORAGE_KEY)) {
             console.log('===== jsBridge injected success! >>>>> ', performance.now());
         }
     }

package/dist/injectedProviderReceiveHandler.js

@@ -1,17 +1,18 @@
+import { consoleErrorInDev } from './loggers';
 function injectedProviderReceiveHandler(payload, bridge) {
     // ethereum, solana, conflux
     const providerHub = (bridge === null || bridge === void 0 ? void 0 : bridge.providersHub) || window.$onekey;
     const providerName = payload.scope;
     const payloadData = payload.data;
     if (!providerName) {
-        console.error('providerName (scope) is required in injectedProviderReceiveHandler.');
+        consoleErrorInDev('providerName (scope) is required in injectedProviderReceiveHandler.');
         return;
     }
     const providers = []
         .concat(providerHub[providerName])
         .filter(Boolean);
     if (!providers || !providers.length) {
-        console.error(`[${providerName}] provider is NOT injected to document.`);
+        consoleErrorInDev(`[${providerName}] provider is NOT injected to document or bridge.`);
         return;
     }
     // emit events to injected provider

package/dist/loggers.d.ts

@@ -1,5 +1,6 @@
 import { IDebugLogger, ConsoleLike } from '@onekeyfe/cross-inpage-provider-types';
+declare function consoleErrorInDev(...args: unknown[]): void;
 declare const fakeLogger: ConsoleLike;
 declare const fakeDebugLogger: IDebugLogger;
 declare const appDebugLogger: IDebugLogger;
-export { fakeDebugLogger, appDebugLogger, fakeLogger };
+export { fakeDebugLogger, appDebugLogger, fakeLogger, consoleErrorInDev };

package/dist/loggers.js

@@ -1,7 +1,14 @@
 // @ts-ignore
 import createDebugAsync from './debug';
+import { DEBUG_LOGGER_STORAGE_KEY } from './consts';
 // enable debugLogger:
 //    localStorage.setItem('$$ONEKEY_DEBUG_LOGGER', '*');
+function consoleErrorInDev(...args) {
+    const loggerConfig = typeof localStorage !== 'undefined' && localStorage.getItem(DEBUG_LOGGER_STORAGE_KEY);
+    if (process.env.NODE_ENV !== 'production' || loggerConfig) {
+        console.error(...args);
+    }
+}
 const fakeLogger = {
     // @ts-ignore
     _isFakeLogger: true,
@@ -31,6 +38,9 @@ class FakeDebugLogger {
         this.providerBase = this._createExternalLog('providerBase >>');
         this.extInjected = this._createExternalLog('extInjected >>');
         this.extContentScripts = this._createExternalLog('extContentScripts >>');
+        this.webview = this._createExternalLog('webview >>');
+        this.desktopInjected = this._createExternalLog('desktopInjected >>');
+        this.ethereum = this._createExternalLog('ethereum >>');
     }
     _attachExternalLogger(logger) {
         if (logger) {
@@ -73,4 +83,4 @@ class AppDebugLogger extends FakeDebugLogger {
 // TODO merge FakeDebugLogger and AppDebugLogger to single class
 const fakeDebugLogger = new FakeDebugLogger();
 const appDebugLogger = new AppDebugLogger();
-export { fakeDebugLogger, appDebugLogger, fakeLogger };
+export { fakeDebugLogger, appDebugLogger, fakeLogger, consoleErrorInDev };

package/dist/versionInfo.js

@@ -1,4 +1,4 @@
-const version = '0.0.6';
+const version = '0.0.7-alpha.3';
 const versionBuild = '2020-0101-1';
 export default {
     version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-core",
-  "version": "0.0.6",
+  "version": "0.0.7-alpha.3",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,11 +29,11 @@
     "build-version-info": "node ./scripts/buildVersionInfo.js"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-errors": "^0.0.6",
-    "@onekeyfe/cross-inpage-provider-types": "^0.0.6",
+    "@onekeyfe/cross-inpage-provider-errors": "^0.0.7-alpha.3",
+    "@onekeyfe/cross-inpage-provider-types": "^0.0.7-alpha.3",
     "eventemitter3": "^4.0.7",
     "lodash": "^4.17.21",
     "ms": "^2.1.3"
   },
-  "gitHead": "023c271b566dcd4c65c12e875a043fe8141abb4c"
+  "gitHead": "ff317617a1d5d8d1bc7f6957dcd6e27117192c64"
 }