@polkadot/extension-base 0.44.6 → 0.44.7

package/cjs/background/handlers/Tabs.js

@@ -1,34 +1,23 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _defaults = require("@polkadot/extension-base/defaults");
-
 var _utils = require("@polkadot/extension-base/utils");
-
 var _phishing = require("@polkadot/phishing");
-
 var _uiKeyring = _interopRequireDefault(require("@polkadot/ui-keyring"));
-
 var _accounts = require("@polkadot/ui-keyring/observable/accounts");
-
 var _util = require("@polkadot/util");
-
 var _RequestBytesSign = _interopRequireDefault(require("../RequestBytesSign"));
-
 var _RequestExtrinsicSign = _interopRequireDefault(require("../RequestExtrinsicSign"));
-
 var _helpers = require("./helpers");
-
 var _subscriptions = require("./subscriptions");
-
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 function transformAccounts(accounts) {
   let anyType = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return Object.values(accounts).filter(_ref => {
@@ -64,26 +53,23 @@ function transformAccounts(accounts) {
     };
   });
 }
-
 class Tabs {
   #accountSubs = {};
   #state;
-
   constructor(state) {
     this.#state = state;
   }
-
   filterForAuthorizedAccounts(accounts, url) {
     const auth = this.#state.authUrls[this.#state.stripUrl(url)];
-    return accounts.filter(allAcc => auth.authorizedAccounts // we have a list, use it
-    ? auth.authorizedAccounts.includes(allAcc.address) // if no authorizedAccounts and isAllowed return all - these are old converted urls
+    return accounts.filter(allAcc => auth.authorizedAccounts
+    // we have a list, use it
+    ? auth.authorizedAccounts.includes(allAcc.address)
+    // if no authorizedAccounts and isAllowed return all - these are old converted urls
     : auth.isAllowed);
   }
-
   authorize(url, request) {
     return this.#state.authorizeUrl(url, request);
   }
-
   accountsListAuthorized(url, _ref4) {
     let {
       anyType
@@ -91,7 +77,6 @@ class Tabs {
     const transformedAccounts = transformAccounts(_accounts.accounts.subject.getValue(), anyType);
     return this.filterForAuthorizedAccounts(transformedAccounts, url);
   }
-
   accountsSubscribeAuthorized(url, id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     this.#accountSubs[id] = {
@@ -108,30 +93,24 @@ class Tabs {
     });
     return id;
   }
-
   accountsUnsubscribe(url, _ref5) {
     let {
       id
     } = _ref5;
     const sub = this.#accountSubs[id];
-
     if (!sub || sub.url !== url) {
       return false;
     }
-
     delete this.#accountSubs[id];
     (0, _subscriptions.unsubscribe)(id);
     sub.subscription.unsubscribe();
     return true;
   }
-
   getSigningPair(address) {
     const pair = _uiKeyring.default.getPair(address);
-
     (0, _util.assert)(pair, 'Unable to find keypair');
     return pair;
   }
-
   bytesSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
@@ -140,7 +119,6 @@ class Tabs {
       ...pair.meta
     });
   }
-
   extrinsicSign(url, request) {
     const address = request.address;
     const pair = this.getSigningPair(address);
@@ -149,12 +127,11 @@ class Tabs {
       ...pair.meta
     });
   }
-
   metadataProvide(url, request) {
     return this.#state.injectMetadata(url, request);
-  } // eslint-disable-next-line @typescript-eslint/no-unused-vars
-
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   metadataList(url) {
     return this.#state.knownMetadata.map(_ref6 => {
       let {
@@ -167,50 +144,40 @@ class Tabs {
       };
     });
   }
-
   rpcListProviders() {
     return this.#state.rpcListProviders();
   }
-
   rpcSend(request, port) {
     return this.#state.rpcSend(request, port);
   }
-
   rpcStartProvider(key, port) {
     return this.#state.rpcStartProvider(key, port);
   }
-
   async rpcSubscribe(request, id, port) {
     const innerCb = (0, _subscriptions.createSubscription)(id, port);
-
     const cb = (_error, data) => innerCb(data);
-
     const subscriptionId = await this.#state.rpcSubscribe(request, cb, port);
     port.onDisconnect.addListener(() => {
       (0, _subscriptions.unsubscribe)(id);
-      (0, _helpers.withErrorLog)(() => this.rpcUnsubscribe({ ...request,
+      (0, _helpers.withErrorLog)(() => this.rpcUnsubscribe({
+        ...request,
         subscriptionId
       }, port));
     });
     return true;
   }
-
   rpcSubscribeConnected(request, id, port) {
     const innerCb = (0, _subscriptions.createSubscription)(id, port);
-
     const cb = (_error, data) => innerCb(data);
-
     this.#state.rpcSubscribeConnected(request, cb, port);
     port.onDisconnect.addListener(() => {
       (0, _subscriptions.unsubscribe)(id);
     });
     return Promise.resolve(true);
   }
-
   async rpcUnsubscribe(request, port) {
     return this.#state.rpcUnsubscribe(request, port);
   }
-
   redirectPhishingLanding(phishingWebsite) {
     const nonFragment = phishingWebsite.split('#')[0];
     const encodedWebsite = encodeURIComponent(nonFragment);
@@ -228,75 +195,55 @@ class Tabs {
       })));
     });
   }
-
   async redirectIfPhishing(url) {
     const isInDenyList = await (0, _phishing.checkIfDenied)(url);
-
     if (isInDenyList) {
       this.redirectPhishingLanding(url);
       return true;
     }
-
     return false;
   }
-
   async handle(id, type, request, url, port) {
     if (type === 'pub(phishing.redirectIfDenied)') {
       return this.redirectIfPhishing(url);
     }
-
     if (type !== 'pub(authorize.tab)') {
       this.#state.ensureUrlAuthorized(url);
     }
-
     switch (type) {
       case 'pub(authorize.tab)':
         return this.authorize(url, request);
-
       case 'pub(accounts.list)':
         return this.accountsListAuthorized(url, request);
-
       case 'pub(accounts.subscribe)':
-        return this.accountsSubscribeAuthorized(url, id, port);
-
+        return port && this.accountsSubscribeAuthorized(url, id, port);
       case 'pub(accounts.unsubscribe)':
         return this.accountsUnsubscribe(url, request);
-
       case 'pub(bytes.sign)':
         return this.bytesSign(url, request);
-
       case 'pub(extrinsic.sign)':
         return this.extrinsicSign(url, request);
-
       case 'pub(metadata.list)':
         return this.metadataList(url);
-
       case 'pub(metadata.provide)':
         return this.metadataProvide(url, request);
-
+      case 'pub(ping)':
+        return Promise.resolve(true);
       case 'pub(rpc.listProviders)':
         return this.rpcListProviders();
-
       case 'pub(rpc.send)':
-        return this.rpcSend(request, port);
-
+        return port && this.rpcSend(request, port);
       case 'pub(rpc.startProvider)':
-        return this.rpcStartProvider(request, port);
-
+        return port && this.rpcStartProvider(request, port);
       case 'pub(rpc.subscribe)':
-        return this.rpcSubscribe(request, id, port);
-
+        return port && this.rpcSubscribe(request, id, port);
       case 'pub(rpc.subscribeConnected)':
-        return this.rpcSubscribeConnected(request, id, port);
-
+        return port && this.rpcSubscribeConnected(request, id, port);
       case 'pub(rpc.unsubscribe)':
-        return this.rpcUnsubscribe(request, port);
-
+        return port && this.rpcUnsubscribe(request, port);
       default:
         throw new Error(`Unable to handle message of type ${type}`);
     }
   }
-
 }
-
 exports.default = Tabs;

package/cjs/background/handlers/helpers.js

@@ -4,13 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withErrorLog = withErrorLog;
-
 // Copyright 2019-2022 @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);
     }

package/cjs/background/handlers/index.js

@@ -1,28 +1,21 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = handler;
-
 var _util = require("@polkadot/util");
-
 var _defaults = require("../../defaults");
-
 var _Extension = _interopRequireDefault(require("./Extension"));
-
 var _State = _interopRequireDefault(require("./State"));
-
 var _Tabs = _interopRequireDefault(require("./Tabs"));
-
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 const state = new _State.default();
 const extension = new _Extension.default(state);
 const tabs = new _Tabs.default(state);
-
 function handler(_ref, port) {
   let {
     id,
@@ -30,8 +23,8 @@ function handler(_ref, port) {
     request
   } = _ref;
   let extensionPortName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : _defaults.PORT_EXTENSION;
-  const isExtension = port.name === extensionPortName;
-  const sender = port.sender;
+  const isExtension = !port || (port == null ? void 0 : port.name) === extensionPortName;
+  const sender = port == null ? void 0 : port.sender;
   const from = isExtension ? 'extension' : sender.tab && sender.tab.url || sender.url || '<unknown>';
   const source = `${from}: ${id}: ${message}`;
   console.log(` [in] ${source}`); // :: ${JSON.stringify(request)}`);
@@ -39,17 +32,18 @@ function handler(_ref, port) {
   const promise = isExtension ? extension.handle(id, message, request, port) : tabs.handle(id, message, request, from, port);
   promise.then(response => {
     console.log(`[out] ${source}`); // :: ${JSON.stringify(response)}`);
+
     // between the start and the end of the promise, the user may have closed
     // the tab, in which case port will be undefined
-
     (0, _util.assert)(port, 'Port has been disconnected');
     port.postMessage({
       id,
       response
     });
   }).catch(error => {
-    console.log(`[err] ${source}:: ${error.message}`); // only send message back to port if it's still connected
+    console.log(`[err] ${source}:: ${error.message}`);
 
+    // only send message back to port if it's still connected
     if (port) {
       port.postMessage({
         error: error.message,

package/cjs/background/handlers/subscriptions.js

@@ -7,8 +7,10 @@ exports.createSubscription = createSubscription;
 exports.unsubscribe = unsubscribe;
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const subscriptions = {}; // return a subscription callback, that will send the data to the caller via the port
 
+const subscriptions = {};
+
+// return a subscription callback, that will send the data to the caller via the port
 function createSubscription(id, port) {
   subscriptions[id] = port;
   return subscription => {
@@ -19,9 +21,9 @@ function createSubscription(id, port) {
       });
     }
   };
-} // clear a previous subscriber
-
+}
 
+// clear a previous subscriber
 function unsubscribe(id) {
   if (subscriptions[id]) {
     console.log(`Unsubscribing from ${id}`);

package/cjs/bundle.js

@@ -9,5 +9,4 @@ Object.defineProperty(exports, "packageInfo", {
     return _packageInfo.packageInfo;
   }
 });
-
 var _packageInfo = require("./packageInfo");

package/cjs/defaults.js

@@ -6,21 +6,29 @@ Object.defineProperty(exports, "__esModule", {
 exports.PORT_EXTENSION = exports.PORT_CONTENT = exports.PHISHING_PAGE_REDIRECT = exports.PASSWORD_EXPIRY_MS = exports.PASSWORD_EXPIRY_MIN = exports.MESSAGE_ORIGIN_PAGE = exports.MESSAGE_ORIGIN_CONTENT = exports.EXTENSION_PREFIX = exports.ALLOWED_PATH = void 0;
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json'];
-exports.ALLOWED_PATH = ALLOWED_PATH;
-const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
-exports.PHISHING_PAGE_REDIRECT = PHISHING_PAGE_REDIRECT;
+
+// this _must_ be changed for each extension
 const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
 exports.EXTENSION_PREFIX = EXTENSION_PREFIX;
-const PORT_CONTENT = `${EXTENSION_PREFIX}content`;
+if (!EXTENSION_PREFIX && !process.env.PORT_PREFIX) {
+  throw new Error('CRITICAL: The extension does not define an own EXTENSION_PREFIX environment variable as part of the build, this is required to ensure that messages are not shared between extensions. Failure to do so will yield messages sent to multiple extensions.');
+}
+const PORT_PREFIX = `${EXTENSION_PREFIX || 'unknown'}-${process.env.PORT_PREFIX || 'unknown'}`;
+const PORT_CONTENT = `${PORT_PREFIX}-content`;
 exports.PORT_CONTENT = PORT_CONTENT;
-const PORT_EXTENSION = `${EXTENSION_PREFIX}extension`;
+const PORT_EXTENSION = `${PORT_PREFIX}-extension`;
 exports.PORT_EXTENSION = PORT_EXTENSION;
-const MESSAGE_ORIGIN_PAGE = `${EXTENSION_PREFIX}page`;
+const MESSAGE_ORIGIN_PAGE = `${PORT_PREFIX}-page`;
 exports.MESSAGE_ORIGIN_PAGE = MESSAGE_ORIGIN_PAGE;
-const MESSAGE_ORIGIN_CONTENT = `${EXTENSION_PREFIX}content`;
+const MESSAGE_ORIGIN_CONTENT = `${PORT_PREFIX}-content`;
 exports.MESSAGE_ORIGIN_CONTENT = MESSAGE_ORIGIN_CONTENT;
+const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json'];
+exports.ALLOWED_PATH = ALLOWED_PATH;
+const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
+exports.PHISHING_PAGE_REDIRECT = PHISHING_PAGE_REDIRECT;
 const PASSWORD_EXPIRY_MIN = 15;
 exports.PASSWORD_EXPIRY_MIN = PASSWORD_EXPIRY_MIN;
 const PASSWORD_EXPIRY_MS = PASSWORD_EXPIRY_MIN * 60 * 1000;
+
+// console.log(`Extension is sending and receiving messages on ${PORT_PREFIX}-*`);
 exports.PASSWORD_EXPIRY_MS = PASSWORD_EXPIRY_MS;

package/cjs/detectOther.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _packageInfo = require("@polkadot/extension-chains/cjs/packageInfo");
-
 var _packageInfo2 = require("@polkadot/extension-dapp/cjs/packageInfo");
-
 var _packageInfo3 = require("@polkadot/extension-inject/cjs/packageInfo");
-
 // Copyright 2017-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 var _default = [_packageInfo.packageInfo, _packageInfo2.packageInfo, _packageInfo3.packageInfo];

package/cjs/detectPackage.js

@@ -1,14 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 var _util = require("@polkadot/util");
-
 var _detectOther = _interopRequireDefault(require("./detectOther"));
-
 var _packageInfo = require("./packageInfo");
-
 // Copyright 2017-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 (0, _util.detectPackage)(_packageInfo.packageInfo, null, _detectOther.default);

package/cjs/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _bundle = require("./bundle");
-
 Object.keys(_bundle).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _bundle[key]) return;

package/cjs/packageInfo.js

@@ -6,11 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 exports.packageInfo = void 0;
 // Copyright 2017-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // Do not edit, auto-generated by @polkadot/dev
+
 const packageInfo = {
   name: '@polkadot/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.44.6'
+  version: '0.44.7'
 };
 exports.packageInfo = packageInfo;

package/cjs/page/Accounts.js

@@ -6,20 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // External to class, this.# is not private enough (yet)
 let sendRequest;
-
 class Accounts {
   constructor(_sendRequest) {
     sendRequest = _sendRequest;
   }
-
   get(anyType) {
     return sendRequest('pub(accounts.list)', {
       anyType
     });
   }
-
   subscribe(cb) {
     let id = null;
     sendRequest('pub(accounts.subscribe)', null, cb).then(subId => {
@@ -31,7 +29,5 @@ class Accounts {
       }).catch(console.error);
     };
   }
-
 }
-
 exports.default = Accounts;

package/cjs/page/Injected.js

@@ -1,30 +1,28 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _Accounts = _interopRequireDefault(require("./Accounts"));
-
 var _Metadata = _interopRequireDefault(require("./Metadata"));
-
 var _PostMessageProvider = _interopRequireDefault(require("./PostMessageProvider"));
-
 var _Signer = _interopRequireDefault(require("./Signer"));
-
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 class _default {
   constructor(sendRequest) {
     this.accounts = new _Accounts.default(sendRequest);
     this.metadata = new _Metadata.default(sendRequest);
     this.provider = new _PostMessageProvider.default(sendRequest);
     this.signer = new _Signer.default(sendRequest);
+    setInterval(() => {
+      sendRequest('pub(ping)', null).catch(() => {
+        console.error('Extension unavailable, ping failed');
+      });
+    }, 5000 + Math.floor(Math.random() * 5000));
   }
-
 }
-
 exports.default = _default;

package/cjs/page/Metadata.js

@@ -6,22 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 // Copyright 2019-2022 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+
 // External to class, this.# is not private enough (yet)
 let sendRequest;
-
 class Metadata {
   constructor(_sendRequest) {
     sendRequest = _sendRequest;
   }
-
   get() {
     return sendRequest('pub(metadata.list)');
   }
-
   provide(definition) {
     return sendRequest('pub(metadata.provide)', definition);
   }
-
 }
-
 exports.default = Metadata;