@polkadot/extension-base 0.41.3-5 → 0.42.1

package/background/handlers/Extension.cjs

@@ -13,8 +13,6 @@ var _classPrivateFieldLooseKey2 = _interopRequireDefault(require("@babel/runtime
 
 var _defaults = require("@polkadot/extension-base/defaults");
 
-var _chrome = _interopRequireDefault(require("@polkadot/extension-inject/chrome"));
-
 var _types = require("@polkadot/types");
 
 var _uiKeyring = _interopRequireDefault(require("@polkadot/ui-keyring"));
@@ -25,6 +23,8 @@ var _util = require("@polkadot/util");
 
 var _utilCrypto = require("@polkadot/util-crypto");
 
+var _helpers = require("./helpers.cjs");
+
 var _subscriptions = require("./subscriptions.cjs");
 
 // Copyright 2019-2021 @polkadot/extension authors & contributors
@@ -436,9 +436,12 @@ class Extension {
   seedCreate(_ref19) {
     let {
       length = SEED_DEFAULT_LENGTH,
+      seed: _seed,
       type
     } = _ref19;
-    const seed = (0, _utilCrypto.mnemonicGenerate)(length);
+
+    const seed = _seed || (0, _utilCrypto.mnemonicGenerate)(length);
+
     return {
       address: _uiKeyring.default.createFromUri(getSuri(seed, type), {}, type).address,
       seed
@@ -607,18 +610,16 @@ class Extension {
   }
 
   windowOpen(path) {
-    const url = `${_chrome.default.extension.getURL('index.html')}#${path}`;
+    const url = `${chrome.extension.getURL('index.html')}#${path}`;
 
     if (!_defaults.ALLOWED_PATH.includes(path)) {
       console.error('Not allowed to open the url:', url);
       return false;
     }
 
-    console.log('open', url); // eslint-disable-next-line no-void
-
-    void _chrome.default.tabs.create({
+    (0, _helpers.withErrorLog)(() => chrome.tabs.create({
       url
-    });
+    }));
     return true;
   }
 

package/background/handlers/Extension.js

@@ -3,12 +3,12 @@ import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateF
 // Copyright 2019-2021 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 import { ALLOWED_PATH, PASSWORD_EXPIRY_MS } from '@polkadot/extension-base/defaults';
-import chrome from '@polkadot/extension-inject/chrome';
 import { TypeRegistry } from '@polkadot/types';
 import keyring from '@polkadot/ui-keyring';
 import { accounts as accountsObservable } from '@polkadot/ui-keyring/observable/accounts';
 import { assert, isHex } from '@polkadot/util';
 import { keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';
+import { withErrorLog } from "./helpers.js";
 import { createSubscription, unsubscribe } from "./subscriptions.js";
 const SEED_DEFAULT_LENGTH = 12;
 const SEED_LENGTHS = [12, 15, 18, 21, 24];
@@ -362,9 +362,11 @@ export default class Extension {
 
   seedCreate({
     length = SEED_DEFAULT_LENGTH,
+    seed: _seed,
     type
   }) {
-    const seed = mnemonicGenerate(length);
+    const seed = _seed || mnemonicGenerate(length);
+
     return {
       address: keyring.createFromUri(getSuri(seed, type), {}, type).address,
       seed
@@ -527,11 +529,9 @@ export default class Extension {
       return false;
     }
 
-    console.log('open', url); // eslint-disable-next-line no-void
-
-    void chrome.tabs.create({
+    withErrorLog(() => chrome.tabs.create({
       url
-    });
+    }));
     return true;
   }
 

package/background/handlers/State.cjs

@@ -17,18 +17,17 @@ var _getId = require("@polkadot/extension-base/utils/getId");
 
 var _extensionChains = require("@polkadot/extension-chains");
 
-var _chrome = _interopRequireDefault(require("@polkadot/extension-inject/chrome"));
-
 var _uiSettings = _interopRequireDefault(require("@polkadot/ui-settings"));
 
 var _util = require("@polkadot/util");
 
 var _index = require("../../stores/index.cjs");
 
+var _helpers = require("./helpers.cjs");
+
 // Copyright 2019-2021 @polkadot/extension-bg authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const NOTIFICATION_URL = _chrome.default.extension.getURL('notification.html');
-
+const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
 const POPUP_WINDOW_OPTS = {
   focused: true,
   height: 621,
@@ -269,14 +268,13 @@ class State {
   }
 
   popupClose() {
-    (0, _classPrivateFieldLooseBase2.default)(this, _windows)[_windows].forEach(id => // eslint-disable-next-line no-void
-    void _chrome.default.windows.remove(id));
+    (0, _classPrivateFieldLooseBase2.default)(this, _windows)[_windows].forEach(id => (0, _helpers.withErrorLog)(() => chrome.windows.remove(id)));
 
     (0, _classPrivateFieldLooseBase2.default)(this, _windows)[_windows] = [];
   }
 
   popupOpen() {
-    (0, _classPrivateFieldLooseBase2.default)(this, _notification)[_notification] !== 'extension' && _chrome.default.windows.create((0, _classPrivateFieldLooseBase2.default)(this, _notification)[_notification] === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS, window => {
+    (0, _classPrivateFieldLooseBase2.default)(this, _notification)[_notification] !== 'extension' && chrome.windows.create((0, _classPrivateFieldLooseBase2.default)(this, _notification)[_notification] === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS, window => {
       if (window) {
         (0, _classPrivateFieldLooseBase2.default)(this, _windows)[_windows].push(window.id || 0);
       }
@@ -297,11 +295,10 @@ class State {
     const authCount = this.numAuthRequests;
     const metaCount = this.numMetaRequests;
     const signCount = this.numSignRequests;
-    const text = authCount ? 'Auth' : metaCount ? 'Meta' : signCount ? `${signCount}` : ''; // eslint-disable-next-line no-void
-
-    void _chrome.default.browserAction.setBadgeText({
+    const text = authCount ? 'Auth' : metaCount ? 'Meta' : signCount ? `${signCount}` : '';
+    (0, _helpers.withErrorLog)(() => chrome.browserAction.setBadgeText({
       text
-    });
+    }));
 
     if (shouldClose && text === '') {
       this.popupClose();
@@ -421,7 +418,7 @@ class State {
       const provider = (0, _classPrivateFieldLooseBase2.default)(this, _injectedProviders)[_injectedProviders].get(port);
 
       if (provider) {
-        provider.disconnect().catch(console.error);
+        (0, _helpers.withErrorLog)(() => provider.disconnect());
       }
 
       (0, _classPrivateFieldLooseBase2.default)(this, _injectedProviders)[_injectedProviders].delete(port);

package/background/handlers/State.js

@@ -5,10 +5,10 @@ import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateF
 import { BehaviorSubject } from 'rxjs';
 import { getId } from '@polkadot/extension-base/utils/getId';
 import { addMetadata, knownMetadata } from '@polkadot/extension-chains';
-import chrome from '@polkadot/extension-inject/chrome';
 import settings from '@polkadot/ui-settings';
 import { assert } from '@polkadot/util';
 import { MetadataStore } from "../../stores/index.js";
+import { withErrorLog } from "./helpers.js";
 const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
 const POPUP_WINDOW_OPTS = {
   focused: true,
@@ -239,8 +239,7 @@ export default class State {
   }
 
   popupClose() {
-    _classPrivateFieldLooseBase(this, _windows)[_windows].forEach(id => // eslint-disable-next-line no-void
-    void chrome.windows.remove(id));
+    _classPrivateFieldLooseBase(this, _windows)[_windows].forEach(id => withErrorLog(() => chrome.windows.remove(id)));
 
     _classPrivateFieldLooseBase(this, _windows)[_windows] = [];
   }
@@ -267,11 +266,10 @@ export default class State {
     const authCount = this.numAuthRequests;
     const metaCount = this.numMetaRequests;
     const signCount = this.numSignRequests;
-    const text = authCount ? 'Auth' : metaCount ? 'Meta' : signCount ? `${signCount}` : ''; // eslint-disable-next-line no-void
-
-    void chrome.browserAction.setBadgeText({
+    const text = authCount ? 'Auth' : metaCount ? 'Meta' : signCount ? `${signCount}` : '';
+    withErrorLog(() => chrome.browserAction.setBadgeText({
       text
-    });
+    }));
 
     if (shouldClose && text === '') {
       this.popupClose();
@@ -391,7 +389,7 @@ export default class State {
       const provider = _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].get(port);
 
       if (provider) {
-        provider.disconnect().catch(console.error);
+        withErrorLog(() => provider.disconnect());
       }
 
       _classPrivateFieldLooseBase(this, _injectedProviders)[_injectedProviders].delete(port);

package/background/handlers/Tabs.cjs

@@ -27,6 +27,8 @@ var _RequestBytesSign = _interopRequireDefault(require("../RequestBytesSign.cjs"
 
 var _RequestExtrinsicSign = _interopRequireDefault(require("../RequestExtrinsicSign.cjs"));
 
+var _helpers = require("./helpers.cjs");
+
 var _subscriptions = require("./subscriptions.cjs");
 
 // Copyright 2019-2021 @polkadot/extension authors & contributors
@@ -166,9 +168,9 @@ class Tabs {
     const subscriptionId = await (0, _classPrivateFieldLooseBase2.default)(this, _state)[_state].rpcSubscribe(request, cb, port);
     port.onDisconnect.addListener(() => {
       (0, _subscriptions.unsubscribe)(id);
-      this.rpcUnsubscribe({ ...request,
+      (0, _helpers.withErrorLog)(() => this.rpcUnsubscribe({ ...request,
         subscriptionId
-      }, port).catch(console.error);
+      }, port));
     });
     return true;
   }
@@ -202,10 +204,9 @@ class Tabs {
           id
         } = _ref6;
         return id;
-      }).filter(id => (0, _util.isNumber)(id)).forEach(id => // eslint-disable-next-line no-void
-      void chrome.tabs.update(id, {
+      }).filter(id => (0, _util.isNumber)(id)).forEach(id => (0, _helpers.withErrorLog)(() => chrome.tabs.update(id, {
         url
-      }));
+      })));
     });
   }
 

package/background/handlers/Tabs.js

@@ -10,6 +10,7 @@ import { accounts as accountsObservable } from '@polkadot/ui-keyring/observable/
 import { assert, isNumber } from '@polkadot/util';
 import RequestBytesSign from "../RequestBytesSign.js";
 import RequestExtrinsicSign from "../RequestExtrinsicSign.js";
+import { withErrorLog } from "./helpers.js";
 import { createSubscription, unsubscribe } from "./subscriptions.js";
 
 function transformAccounts(accounts, anyType = false) {
@@ -130,9 +131,9 @@ export default class Tabs {
     const subscriptionId = await _classPrivateFieldLooseBase(this, _state)[_state].rpcSubscribe(request, cb, port);
     port.onDisconnect.addListener(() => {
       unsubscribe(id);
-      this.rpcUnsubscribe({ ...request,
+      withErrorLog(() => this.rpcUnsubscribe({ ...request,
         subscriptionId
-      }, port).catch(console.error);
+      }, port));
     });
     return true;
   }
@@ -163,10 +164,9 @@ export default class Tabs {
     }, tabs => {
       tabs.map(({
         id
-      }) => id).filter(id => isNumber(id)).forEach(id => // eslint-disable-next-line no-void
-      void chrome.tabs.update(id, {
+      }) => id).filter(id => isNumber(id)).forEach(id => withErrorLog(() => chrome.tabs.update(id, {
         url
-      }));
+      })));
     });
   }
 

package/background/handlers/helpers.cjs

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.withErrorLog = withErrorLog;
+
+// Copyright 2019-2021 @polkadot/extension authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+function withErrorLog(fn) {
+  try {
+    const p = fn();
+
+    if (p && typeof p === 'object' && typeof p.catch === 'function') {
+      p.catch(console.error);
+    }
+  } catch (e) {
+    console.error(e);
+  }
+}

package/background/handlers/helpers.d.ts

@@ -0,0 +1 @@
+export declare function withErrorLog(fn: () => unknown): void;

package/background/handlers/helpers.js

@@ -0,0 +1,13 @@
+// Copyright 2019-2021 @polkadot/extension authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+export function withErrorLog(fn) {
+  try {
+    const p = fn();
+
+    if (p && typeof p === 'object' && typeof p.catch === 'function') {
+      p.catch(console.error);
+    }
+  } catch (e) {
+    console.error(e);
+  }
+}

package/background/types.d.ts

@@ -241,6 +241,7 @@ export interface ResponseSigningIsLocked {
 export declare type RequestSigningSubscribe = null;
 export interface RequestSeedCreate {
     length?: SeedLengths;
+    seed?: string;
     type?: KeypairType;
 }
 export interface RequestSeedValidate {

package/package.json

@@ -14,13 +14,13 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.41.3-5",
+  "version": "0.42.1",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
     "@polkadot/api": "^6.11.1",
-    "@polkadot/extension-dapp": "^0.41.3-5",
-    "@polkadot/extension-inject": "^0.41.3-5",
+    "@polkadot/extension-dapp": "^0.42.1",
+    "@polkadot/extension-inject": "^0.42.1",
     "@polkadot/keyring": "^8.1.2",
     "@polkadot/phishing": "^0.6.510",
     "@polkadot/ui-keyring": "^0.87.5"
@@ -44,6 +44,11 @@
       "default": "./background/handlers/Extension.test.js"
     },
     "./background/handlers/Extension.test.d.ts": "./background/handlers/Extension.test.d.ts",
+    "./background/handlers/helpers": {
+      "require": "./background/handlers/helpers.cjs",
+      "default": "./background/handlers/helpers.js"
+    },
+    "./background/handlers/helpers.d.ts": "./background/handlers/helpers.d.ts",
     "./background/handlers/index.d.ts": "./background/handlers/index.d.ts",
     "./background/handlers/State": {
       "require": "./background/handlers/State.cjs",

package/packageInfo.cjs

@@ -9,6 +9,6 @@ exports.packageInfo = void 0;
 // Auto-generated by @polkadot/dev, do not edit
 const packageInfo = {
   name: '@polkadot/extension-base',
-  version: '0.41.3-5'
+  version: '0.42.1'
 };
 exports.packageInfo = packageInfo;

package/packageInfo.js

@@ -3,5 +3,5 @@
 // Auto-generated by @polkadot/dev, do not edit
 export const packageInfo = {
   name: '@polkadot/extension-base',
-  version: '0.41.3-5'
+  version: '0.42.1'
 };

package/stores/Base.cjs

@@ -11,12 +11,10 @@ var _classPrivateFieldLooseBase2 = _interopRequireDefault(require("@babel/runtim
 
 var _classPrivateFieldLooseKey2 = _interopRequireDefault(require("@babel/runtime/helpers/classPrivateFieldLooseKey"));
 
-var _chrome = _interopRequireDefault(require("@polkadot/extension-inject/chrome"));
-
 // Copyright 2019-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 const lastError = type => {
-  const error = _chrome.default.runtime.lastError;
+  const error = chrome.runtime.lastError;
 
   if (error) {
     console.error(`BaseStore.${type}:: runtime.lastError:`, error);
@@ -35,7 +33,7 @@ class BaseStore {
   }
 
   all(update) {
-    _chrome.default.storage.local.get(null, result => {
+    chrome.storage.local.get(null, result => {
       lastError('all');
       Object.entries(result).filter(_ref => {
         let [key] = _ref;
@@ -49,8 +47,7 @@ class BaseStore {
 
   get(_key, update) {
     const key = `${(0, _classPrivateFieldLooseBase2.default)(this, _prefix)[_prefix]}${_key}`;
-
-    _chrome.default.storage.local.get([key], result => {
+    chrome.storage.local.get([key], result => {
       lastError('get');
       update(result[key]);
     });
@@ -58,8 +55,7 @@ class BaseStore {
 
   remove(_key, update) {
     const key = `${(0, _classPrivateFieldLooseBase2.default)(this, _prefix)[_prefix]}${_key}`;
-
-    _chrome.default.storage.local.remove(key, () => {
+    chrome.storage.local.remove(key, () => {
       lastError('remove');
       update && update();
     });
@@ -67,8 +63,7 @@ class BaseStore {
 
   set(_key, value, update) {
     const key = `${(0, _classPrivateFieldLooseBase2.default)(this, _prefix)[_prefix]}${_key}`;
-
-    _chrome.default.storage.local.set({
+    chrome.storage.local.set({
       [key]: value
     }, () => {
       lastError('set');

package/stores/Base.js

@@ -1,9 +1,8 @@
 import _classPrivateFieldLooseBase from "@babel/runtime/helpers/esm/classPrivateFieldLooseBase";
 import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateFieldLooseKey";
+
 // Copyright 2019-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-import chrome from '@polkadot/extension-inject/chrome';
-
 const lastError = type => {
   const error = chrome.runtime.lastError;