@onekeyfe/cross-inpage-provider-core 2.0.0-alpha.2 → 2.0.0-alpha.3

package/dist/JsBridgeBase.js

@@ -8,8 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-import isPlainObject from 'lodash/isPlainObject';
-import isString from 'lodash/isString';
+import { isPlainObject, isString } from 'lodash-es';
 import { CrossEventEmitter } from './CrossEventEmitter';
 import { appDebugLogger, consoleErrorInDev } from './loggers';
 import { web3Errors } from '@onekeyfe/cross-inpage-provider-errors';

package/dist/ProviderBase.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 /* eslint-disable @typescript-eslint/no-unsafe-assignment,@typescript-eslint/ban-ts-comment */
-import isFunction from 'lodash/isFunction';
+import { isFunction } from 'lodash-es';
 import { CrossEventEmitter } from './CrossEventEmitter';
 import siteMetadata from './siteMetadata';
 import { fakeLogger, fakeDebugLogger, consoleErrorInDev } from './loggers';

package/dist/cjs/JsBridgeBase.js

@@ -14,8 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isLegacyExtMessage = exports.JsBridgeBase = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
-const isString_1 = __importDefault(require("lodash/isString"));
+const lodash_es_1 = require("lodash-es");
 const CrossEventEmitter_1 = require("./CrossEventEmitter");
 const loggers_1 = require("./loggers");
 const cross_inpage_provider_errors_1 = require("@onekeyfe/cross-inpage-provider-errors");
@@ -261,10 +260,10 @@ class JsBridgeBase extends CrossEventEmitter_1.CrossEventEmitter {
         let payload = {
             data: null,
         };
-        if ((0, isPlainObject_1.default)(payloadReceived)) {
+        if ((0, lodash_es_1.isPlainObject)(payloadReceived)) {
             payload = payloadReceived;
         }
-        if ((0, isString_1.default)(payloadReceived)) {
+        if ((0, lodash_es_1.isString)(payloadReceived)) {
             try {
                 payload = JSON.parse(payloadReceived);
             }

package/dist/cjs/ProviderBase.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProviderBase = void 0;
 /* eslint-disable @typescript-eslint/no-unsafe-assignment,@typescript-eslint/ban-ts-comment */
-const isFunction_1 = __importDefault(require("lodash/isFunction"));
+const lodash_es_1 = require("lodash-es");
 const CrossEventEmitter_1 = require("./CrossEventEmitter");
 const siteMetadata_1 = __importDefault(require("./siteMetadata"));
 const loggers_1 = require("./loggers");
@@ -124,7 +124,7 @@ class ProviderBase extends CrossEventEmitter_1.CrossEventEmitter {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             let hasCallback = false;
-            if (callback && (0, isFunction_1.default)(callback)) {
+            if (callback && (0, lodash_es_1.isFunction)(callback)) {
                 hasCallback = true;
             }
             try {

package/dist/cjs/debug/browser.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * This is the web browser implementation of `debug()`.
  */
 const consts_1 = require("../consts");
-const lodash_1 = require("lodash");
+const lodash_es_1 = require("lodash-es");
 const ms_1 = __importDefault(require("ms"));
 const storageKey = consts_1.DEBUG_LOGGER_STORAGE_KEY;
 const exportsBrowser = {};
@@ -223,7 +223,7 @@ function save(namespaces) {
                 yield exportsBrowser.storage.setItem(storageKey, namespaces);
             }
             else {
-                if ((0, lodash_1.isNil)(namespaces)) {
+                if ((0, lodash_es_1.isNil)(namespaces)) {
                     yield exportsBrowser.storage.removeItem(storageKey);
                 }
                 else {

package/dist/cjs/index.js

@@ -29,6 +29,7 @@ exports.versionInfo = exports.siteMetadata = exports.injectedFactory = exports.c
 __exportStar(require("./JsBridgeBase"), exports);
 __exportStar(require("./ProviderBase"), exports);
 __exportStar(require("./loggers"), exports);
+__exportStar(require("./loggerConsole"), exports);
 __exportStar(require("./injectJsBridge"), exports);
 __exportStar(require("./injectedProviderReceiveHandler"), exports);
 __exportStar(require("./JsBridgeSimple"), exports);

package/dist/cjs/injectJsBridge.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectJsBridge = void 0;
-const consts_1 = require("./consts");
+const loggerConsole_1 = require("./loggerConsole");
 // function fixGlobalShim() {
 //   // FIX errors in ReactNative
 //   //    ReferenceError: Can't find variable: global
@@ -11,17 +11,15 @@ const consts_1 = require("./consts");
 //   window.global = window.global || window || window.globalThis;
 // }
 function injectJsBridge(bridgeCreator) {
-    // remove fixGlobalShim, 
-    // because fixGlobalShim make some website not work properly 
+    // remove fixGlobalShim,
+    // because fixGlobalShim make some website not work properly
     //  make cloudfare dead loop and make zhihu.com search functionally down
     // fixGlobalShim();
     var _a;
     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 (typeof localStorage !== 'undefined' && localStorage.getItem(consts_1.DEBUG_LOGGER_STORAGE_KEY)) {
-            console.log('===== jsBridge injected success! >>>>> ', performance.now());
-        }
+        loggerConsole_1.commonLogger.debug('JsBridge injected success!', performance.now());
     }
     return window.$onekey.jsBridge;
 }

package/dist/cjs/loggerConsole.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setStoredLogConfig = exports.commonLogger = exports.LogLevel = exports.Logger = void 0;
+const consts_1 = require("./consts");
+var LogLevel;
+(function (LogLevel) {
+    LogLevel[LogLevel["DEBUG"] = 0] = "DEBUG";
+    LogLevel[LogLevel["LOG"] = 1] = "LOG";
+    LogLevel[LogLevel["WARN"] = 2] = "WARN";
+    LogLevel[LogLevel["ERROR"] = 3] = "ERROR";
+})(LogLevel || (LogLevel = {}));
+exports.LogLevel = LogLevel;
+function getStoredLogConfig() {
+    if (typeof localStorage === 'undefined') {
+        return undefined;
+    }
+    const config = localStorage.getItem(consts_1.DEBUG_LOGGER_STORAGE_KEY);
+    if (config !== null) {
+        try {
+            const level = parseInt(config, 10);
+            if (level in LogLevel) {
+                return level;
+            }
+        }
+        catch (_a) {
+            return undefined;
+        }
+    }
+    return undefined;
+}
+function setStoredLogConfig(config) {
+    if (typeof localStorage !== 'undefined') {
+        localStorage.setItem(consts_1.DEBUG_LOGGER_STORAGE_KEY, config.toString());
+    }
+}
+exports.setStoredLogConfig = setStoredLogConfig;
+class Logger {
+    constructor(module = null) {
+        this.module = module;
+        const config = getStoredLogConfig();
+        this.level = config !== null && config !== void 0 ? config : LogLevel.DEBUG;
+        if (process.env.NODE_ENV === 'production') {
+            this.level = config !== null && config !== void 0 ? config : LogLevel.ERROR;
+        }
+    }
+    shouldLog(level) {
+        return level >= this.level;
+    }
+    formatMessage(...args) {
+        return this.module ? [`[${this.module}]:`, ...args] : args;
+    }
+    debug(...args) {
+        if (this.shouldLog(LogLevel.DEBUG)) {
+            console.debug(...this.formatMessage(...args));
+        }
+    }
+    log(...args) {
+        if (this.shouldLog(LogLevel.LOG)) {
+            console.log(...this.formatMessage(...args));
+        }
+    }
+    warn(...args) {
+        if (this.shouldLog(LogLevel.WARN)) {
+            console.warn(...this.formatMessage(...args));
+        }
+    }
+    error(...args) {
+        if (this.shouldLog(LogLevel.ERROR)) {
+            console.error(...this.formatMessage(...args));
+        }
+    }
+}
+exports.Logger = Logger;
+const commonLogger = new Logger();
+exports.commonLogger = commonLogger;

package/dist/cjs/versionInfo.js

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

package/dist/cjs/walletProperty.js

@@ -5,6 +5,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineWindowProperty = exports.checkEnableDefineProperty = exports.checkWalletSwitchEnable = exports.ISpecialPropertyProviderNamesReflection = void 0;
 const consts_1 = require("./consts");
+const loggerConsole_1 = require("./loggerConsole");
 /**
  * An enumeration mapping specific blockchain provider names to their corresponding blockchain identifiers.
  *
@@ -40,7 +41,7 @@ function checkWalletSwitchEnable() {
         return true;
     }
     catch (e) {
-        console.error(e);
+        loggerConsole_1.commonLogger.warn(e);
     }
     return true;
 }
@@ -54,7 +55,7 @@ function checkEnableDefineProperty(property) {
         return !!(walletInfoLocal === null || walletInfoLocal === void 0 ? void 0 : walletInfoLocal.platformEnv.isExtension);
     }
     catch (e) {
-        console.error(e);
+        loggerConsole_1.commonLogger.warn(e);
     }
     return false;
 }
@@ -92,12 +93,12 @@ function defineWindowProperty(property, provider, options) {
         }
     }
     catch (ex) {
-        console.error(ex);
+        loggerConsole_1.commonLogger.error(ex);
         try {
             window[property] = provider;
         }
         catch (error) {
-            console.error(error);
+            loggerConsole_1.commonLogger.warn(error);
         }
     }
 }

package/dist/debug/browser.js

@@ -13,7 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
  * This is the web browser implementation of `debug()`.
  */
 import { DEBUG_LOGGER_STORAGE_KEY } from '../consts';
-import { isNil } from 'lodash';
+import { isNil } from 'lodash-es';
 import humanize from 'ms';
 const storageKey = DEBUG_LOGGER_STORAGE_KEY;
 const exportsBrowser = {};

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export * from './JsBridgeBase';
 export * from './ProviderBase';
 export * from './loggers';
+export * from './loggerConsole';
 export * from './injectJsBridge';
 export * from './injectedProviderReceiveHandler';
 export * from './JsBridgeSimple';

package/dist/index.js

@@ -1,6 +1,7 @@
 export * from './JsBridgeBase';
 export * from './ProviderBase';
 export * from './loggers';
+export * from './loggerConsole';
 export * from './injectJsBridge';
 export * from './injectedProviderReceiveHandler';
 export * from './JsBridgeSimple';

package/dist/injectJsBridge.js

@@ -1,4 +1,4 @@
-import { DEBUG_LOGGER_STORAGE_KEY } from './consts';
+import { commonLogger } from './loggerConsole';
 // function fixGlobalShim() {
 //   // FIX errors in ReactNative
 //   //    ReferenceError: Can't find variable: global
@@ -8,17 +8,15 @@ import { DEBUG_LOGGER_STORAGE_KEY } from './consts';
 //   window.global = window.global || window || window.globalThis;
 // }
 function injectJsBridge(bridgeCreator) {
-    // remove fixGlobalShim, 
-    // because fixGlobalShim make some website not work properly 
+    // remove fixGlobalShim,
+    // because fixGlobalShim make some website not work properly
     //  make cloudfare dead loop and make zhihu.com search functionally down
     // fixGlobalShim();
     var _a;
     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 (typeof localStorage !== 'undefined' && localStorage.getItem(DEBUG_LOGGER_STORAGE_KEY)) {
-            console.log('===== jsBridge injected success! >>>>> ', performance.now());
-        }
+        commonLogger.debug('JsBridge injected success!', performance.now());
     }
     return window.$onekey.jsBridge;
 }

package/dist/loggerConsole.d.ts

@@ -0,0 +1,20 @@
+declare enum LogLevel {
+    DEBUG = 0,
+    LOG = 1,
+    WARN = 2,
+    ERROR = 3
+}
+declare function setStoredLogConfig(config: LogLevel): void;
+declare class Logger {
+    private module?;
+    private level;
+    constructor(module?: string | null);
+    private shouldLog;
+    private formatMessage;
+    debug(...args: unknown[]): void;
+    log(...args: unknown[]): void;
+    warn(...args: unknown[]): void;
+    error(...args: unknown[]): void;
+}
+declare const commonLogger: Logger;
+export { Logger, LogLevel, commonLogger, setStoredLogConfig };

package/dist/loggerConsole.js

@@ -0,0 +1,69 @@
+import { DEBUG_LOGGER_STORAGE_KEY } from './consts';
+var LogLevel;
+(function (LogLevel) {
+    LogLevel[LogLevel["DEBUG"] = 0] = "DEBUG";
+    LogLevel[LogLevel["LOG"] = 1] = "LOG";
+    LogLevel[LogLevel["WARN"] = 2] = "WARN";
+    LogLevel[LogLevel["ERROR"] = 3] = "ERROR";
+})(LogLevel || (LogLevel = {}));
+function getStoredLogConfig() {
+    if (typeof localStorage === 'undefined') {
+        return undefined;
+    }
+    const config = localStorage.getItem(DEBUG_LOGGER_STORAGE_KEY);
+    if (config !== null) {
+        try {
+            const level = parseInt(config, 10);
+            if (level in LogLevel) {
+                return level;
+            }
+        }
+        catch (_a) {
+            return undefined;
+        }
+    }
+    return undefined;
+}
+function setStoredLogConfig(config) {
+    if (typeof localStorage !== 'undefined') {
+        localStorage.setItem(DEBUG_LOGGER_STORAGE_KEY, config.toString());
+    }
+}
+class Logger {
+    constructor(module = null) {
+        this.module = module;
+        const config = getStoredLogConfig();
+        this.level = config !== null && config !== void 0 ? config : LogLevel.DEBUG;
+        if (process.env.NODE_ENV === 'production') {
+            this.level = config !== null && config !== void 0 ? config : LogLevel.ERROR;
+        }
+    }
+    shouldLog(level) {
+        return level >= this.level;
+    }
+    formatMessage(...args) {
+        return this.module ? [`[${this.module}]:`, ...args] : args;
+    }
+    debug(...args) {
+        if (this.shouldLog(LogLevel.DEBUG)) {
+            console.debug(...this.formatMessage(...args));
+        }
+    }
+    log(...args) {
+        if (this.shouldLog(LogLevel.LOG)) {
+            console.log(...this.formatMessage(...args));
+        }
+    }
+    warn(...args) {
+        if (this.shouldLog(LogLevel.WARN)) {
+            console.warn(...this.formatMessage(...args));
+        }
+    }
+    error(...args) {
+        if (this.shouldLog(LogLevel.ERROR)) {
+            console.error(...this.formatMessage(...args));
+        }
+    }
+}
+const commonLogger = new Logger();
+export { Logger, LogLevel, commonLogger, setStoredLogConfig };

package/dist/versionInfo.js

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

package/dist/walletProperty.js

@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { WALLET_INFO_LOACAL_KEY_V5 } from './consts';
+import { commonLogger } from './loggerConsole';
 /**
  * An enumeration mapping specific blockchain provider names to their corresponding blockchain identifiers.
  *
@@ -37,7 +38,7 @@ export function checkWalletSwitchEnable() {
         return true;
     }
     catch (e) {
-        console.error(e);
+        commonLogger.warn(e);
     }
     return true;
 }
@@ -50,7 +51,7 @@ export function checkEnableDefineProperty(property) {
         return !!(walletInfoLocal === null || walletInfoLocal === void 0 ? void 0 : walletInfoLocal.platformEnv.isExtension);
     }
     catch (e) {
-        console.error(e);
+        commonLogger.warn(e);
     }
     return false;
 }
@@ -87,12 +88,12 @@ export function defineWindowProperty(property, provider, options) {
         }
     }
     catch (ex) {
-        console.error(ex);
+        commonLogger.error(ex);
         try {
             window[property] = provider;
         }
         catch (error) {
-            console.error(error);
+            commonLogger.warn(error);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/cross-inpage-provider-core",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "keywords": [
     "cross-inpage-provider"
   ],
@@ -29,12 +29,15 @@
     "build-version-info": "node ./scripts/buildVersionInfo.js"
   },
   "dependencies": {
-    "@onekeyfe/cross-inpage-provider-errors": "2.0.0-alpha.2",
-    "@onekeyfe/cross-inpage-provider-events": "2.0.0-alpha.2",
-    "@onekeyfe/cross-inpage-provider-types": "2.0.0-alpha.2",
+    "@onekeyfe/cross-inpage-provider-errors": "2.0.0-alpha.3",
+    "@onekeyfe/cross-inpage-provider-events": "2.0.0-alpha.3",
+    "@onekeyfe/cross-inpage-provider-types": "2.0.0-alpha.3",
     "events": "^3.3.0",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "ms": "^2.1.3"
   },
-  "gitHead": "0792eb8ecafd6dfdf58d48cc7c6bc3f89a25cd21"
+  "devDependencies": {
+    "@types/lodash-es": "^4.17.12"
+  },
+  "gitHead": "6cdb4879da71641e4c90e3f6bdc0a07d3edc0e63"
 }