@polkadot/extension-base 0.41.2-3 → 0.41.3-2

package/README.md

@@ -5,4 +5,6 @@ Functions, classes and other utilities used in `@polkadot/extension`. These incl
 - message passing,
 - scripts injected inside pages.
 
-They are primarily meant to be used in `@polkadot/extension`, and can be broken without any notice to cater for `@polkadot/extension`'s needs. They are exported here if you wish to use part of them in the development of your own extension.
+They are primarily meant to be used in `@polkadot/extension`, and can be broken without any notice to cater for `@polkadot/extension`'s needs.
+
+They are exported here if you wish to use part of them in the development of your own extension. Don't forget to add `process.env.EXTENSION_PREFIX` to separate ports and stores from the current extension's ones.

package/background/handlers/State.cjs

@@ -13,6 +13,8 @@ var _classPrivateFieldLooseKey2 = _interopRequireDefault(require("@babel/runtime
 
 var _rxjs = require("rxjs");
 
+var _getId = require("@polkadot/extension-base/utils/getId");
+
 var _extensionChains = require("@polkadot/extension-chains");
 
 var _chrome = _interopRequireDefault(require("@polkadot/extension-inject/chrome"));
@@ -25,8 +27,6 @@ var _index = require("../../stores/index.cjs");
 
 // Copyright 2019-2021 @polkadot/extension-bg authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-let idCounter = 0;
-
 const NOTIFICATION_URL = _chrome.default.extension.getURL('notification.html');
 
 const POPUP_WINDOW_OPTS = {
@@ -54,10 +54,6 @@ exports.NotificationOptions = NotificationOptions;
 
 const AUTH_URLS_KEY = 'authUrls';
 
-function getId() {
-  return `${Date.now()}.${++idCounter}`;
-}
-
 var _authUrls = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("authUrls");
 
 var _authRequests = /*#__PURE__*/(0, _classPrivateFieldLooseKey2.default)("authRequests");
@@ -349,7 +345,7 @@ class State {
     }
 
     return new Promise((resolve, reject) => {
-      const id = getId();
+      const id = (0, _getId.getId)();
       (0, _classPrivateFieldLooseBase2.default)(this, _authRequests)[_authRequests][id] = { ...this.authComplete(id, resolve, reject),
         id,
         idStr,
@@ -371,7 +367,7 @@ class State {
 
   injectMetadata(url, request) {
     return new Promise((resolve, reject) => {
-      const id = getId();
+      const id = (0, _getId.getId)();
       (0, _classPrivateFieldLooseBase2.default)(this, _metaRequests)[_metaRequests][id] = { ...this.metaComplete(id, resolve, reject),
         id,
         request,
@@ -475,7 +471,7 @@ class State {
   }
 
   sign(url, request, account) {
-    const id = getId();
+    const id = (0, _getId.getId)();
     return new Promise((resolve, reject) => {
       (0, _classPrivateFieldLooseBase2.default)(this, _signRequests)[_signRequests][id] = { ...this.signComplete(id, resolve, reject),
         account,

package/background/handlers/State.js

@@ -3,12 +3,12 @@ import _classPrivateFieldLooseKey from "@babel/runtime/helpers/esm/classPrivateF
 // Copyright 2019-2021 @polkadot/extension-bg authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 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";
-let idCounter = 0;
 const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
 const POPUP_WINDOW_OPTS = {
   focused: true,
@@ -34,10 +34,6 @@ export let NotificationOptions;
 
 const AUTH_URLS_KEY = 'authUrls';
 
-function getId() {
-  return `${Date.now()}.${++idCounter}`;
-}
-
 var _authUrls = /*#__PURE__*/_classPrivateFieldLooseKey("authUrls");
 
 var _authRequests = /*#__PURE__*/_classPrivateFieldLooseKey("authRequests");

package/background/types.d.ts

@@ -117,7 +117,7 @@ export declare type MessageTypesWithNullRequest = NullKeys<RequestTypes>;
 export interface TransportRequestMessage<TMessageType extends MessageTypes> {
     id: string;
     message: TMessageType;
-    origin: 'page' | 'extension';
+    origin: string;
     request: RequestTypes[TMessageType];
 }
 export interface RequestAuthorizeTab {

package/defaults.cjs

@@ -3,17 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PORT_EXTENSION = exports.PORT_CONTENT = exports.PHISHING_PAGE_REDIRECT = exports.PASSWORD_EXPIRY_MS = exports.PASSWORD_EXPIRY_MIN = exports.ALLOWED_PATH = void 0;
+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-2021 @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 PORT_CONTENT = 'content';
-exports.PORT_CONTENT = PORT_CONTENT;
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
 exports.PHISHING_PAGE_REDIRECT = PHISHING_PAGE_REDIRECT;
-const PORT_EXTENSION = 'extension';
+const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
+exports.EXTENSION_PREFIX = EXTENSION_PREFIX;
+const PORT_CONTENT = `${EXTENSION_PREFIX}content`;
+exports.PORT_CONTENT = PORT_CONTENT;
+const PORT_EXTENSION = `${EXTENSION_PREFIX}extension`;
 exports.PORT_EXTENSION = PORT_EXTENSION;
+const MESSAGE_ORIGIN_PAGE = `${EXTENSION_PREFIX}page`;
+exports.MESSAGE_ORIGIN_PAGE = MESSAGE_ORIGIN_PAGE;
+const MESSAGE_ORIGIN_CONTENT = `${EXTENSION_PREFIX}content`;
+exports.MESSAGE_ORIGIN_CONTENT = MESSAGE_ORIGIN_CONTENT;
 const PASSWORD_EXPIRY_MIN = 15;
 exports.PASSWORD_EXPIRY_MIN = PASSWORD_EXPIRY_MIN;
 const PASSWORD_EXPIRY_MS = PASSWORD_EXPIRY_MIN * 60 * 1000;

package/defaults.d.ts

@@ -1,7 +1,10 @@
 declare const ALLOWED_PATH: readonly ["/", "/account/import-ledger", "/account/restore-json"];
-declare const PORT_CONTENT = "content";
 declare const PHISHING_PAGE_REDIRECT = "/phishing-page-detected";
-declare const PORT_EXTENSION = "extension";
+declare const EXTENSION_PREFIX: string;
+declare const PORT_CONTENT: string;
+declare const PORT_EXTENSION: string;
+declare const MESSAGE_ORIGIN_PAGE: string;
+declare const MESSAGE_ORIGIN_CONTENT: string;
 declare const PASSWORD_EXPIRY_MIN = 15;
 declare const PASSWORD_EXPIRY_MS: number;
-export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, PORT_CONTENT, PORT_EXTENSION };
+export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, EXTENSION_PREFIX, PORT_CONTENT, PORT_EXTENSION, MESSAGE_ORIGIN_PAGE, MESSAGE_ORIGIN_CONTENT };

package/defaults.js

@@ -1,9 +1,12 @@
 // Copyright 2019-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 const ALLOWED_PATH = ['/', '/account/import-ledger', '/account/restore-json'];
-const PORT_CONTENT = 'content';
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
-const PORT_EXTENSION = 'extension';
+const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
+const PORT_CONTENT = `${EXTENSION_PREFIX}content`;
+const PORT_EXTENSION = `${EXTENSION_PREFIX}extension`;
+const MESSAGE_ORIGIN_PAGE = `${EXTENSION_PREFIX}page`;
+const MESSAGE_ORIGIN_CONTENT = `${EXTENSION_PREFIX}content`;
 const PASSWORD_EXPIRY_MIN = 15;
 const PASSWORD_EXPIRY_MS = PASSWORD_EXPIRY_MIN * 60 * 1000;
-export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, PORT_CONTENT, PORT_EXTENSION };
+export { ALLOWED_PATH, PASSWORD_EXPIRY_MIN, PASSWORD_EXPIRY_MS, PHISHING_PAGE_REDIRECT, EXTENSION_PREFIX, PORT_CONTENT, PORT_EXTENSION, MESSAGE_ORIGIN_PAGE, MESSAGE_ORIGIN_CONTENT };

package/package.json

@@ -14,16 +14,16 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "0.41.2-3",
+  "version": "0.41.3-2",
   "main": "index.js",
   "dependencies": {
     "@babel/runtime": "^7.16.3",
-    "@polkadot/api": "^6.9.3-5",
-    "@polkadot/extension-dapp": "^0.41.2-3",
-    "@polkadot/extension-inject": "^0.41.2-3",
-    "@polkadot/keyring": "^8.0.2",
-    "@polkadot/phishing": "^0.6.476",
-    "@polkadot/ui-keyring": "^0.87.1"
+    "@polkadot/api": "^6.10.2",
+    "@polkadot/extension-dapp": "^0.41.3-2",
+    "@polkadot/extension-inject": "^0.41.3-2",
+    "@polkadot/keyring": "^8.0.4",
+    "@polkadot/phishing": "^0.6.481",
+    "@polkadot/ui-keyring": "^0.87.2"
   },
   "exports": {
     ".": {
@@ -157,6 +157,11 @@
       "default": "./utils/canDerive.js"
     },
     "./utils/canDerive.d.ts": "./utils/canDerive.d.ts",
+    "./utils/getId": {
+      "require": "./utils/getId.cjs",
+      "default": "./utils/getId.js"
+    },
+    "./utils/getId.d.ts": "./utils/getId.d.ts",
     "./utils/index.d.ts": "./utils/index.d.ts"
   }
 }

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.2-3'
+  version: '0.41.3-2'
 };
 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.2-3'
+  version: '0.41.3-2'
 };

package/page/index.cjs

@@ -10,17 +10,20 @@ exports.handleResponse = handleResponse;
 exports.redirectIfPhishing = redirectIfPhishing;
 exports.sendMessage = sendMessage;
 
+var _defaults = require("../defaults.cjs");
+
+var _getId = require("../utils/getId.cjs");
+
 var _Injected = _interopRequireDefault(require("./Injected.cjs"));
 
 // Copyright 2019-2021 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
-const handlers = {};
-let idCounter = 0; // a generic message sender that creates an event, returning a promise that will
+const handlers = {}; // a generic message sender that creates an event, returning a promise that will
 // resolve once the event is resolved (by the response listener just below this)
 
 function sendMessage(message, request, subscriber) {
   return new Promise((resolve, reject) => {
-    const id = `${Date.now()}.${++idCounter}`;
+    const id = (0, _getId.getId)();
     handlers[id] = {
       reject,
       resolve,
@@ -29,7 +32,7 @@ function sendMessage(message, request, subscriber) {
     const transportRequestMessage = {
       id,
       message,
-      origin: 'page',
+      origin: _defaults.MESSAGE_ORIGIN_PAGE,
       request: request || null
     };
     window.postMessage(transportRequestMessage, '*');

package/page/index.js

@@ -1,5 +1,7 @@
 // Copyright 2019-2021 @polkadot/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+import { MESSAGE_ORIGIN_PAGE } from "../defaults.js";
+import { getId } from "../utils/getId.js";
 import Injected from "./Injected.js"; // when sending a message from the injector to the extension, we
 //  - create an event - this we send to the loader
 //  - the loader takes this event and uses port.postMessage to background
@@ -7,13 +9,12 @@ import Injected from "./Injected.js"; // when sending a message from the injecto
 //  - this injector, listens on the events, maps it to the original
 //  - resolves/rejects the promise with the result (or sub data)
 
-const handlers = {};
-let idCounter = 0; // a generic message sender that creates an event, returning a promise that will
+const handlers = {}; // a generic message sender that creates an event, returning a promise that will
 // resolve once the event is resolved (by the response listener just below this)
 
 export function sendMessage(message, request, subscriber) {
   return new Promise((resolve, reject) => {
-    const id = `${Date.now()}.${++idCounter}`;
+    const id = getId();
     handlers[id] = {
       reject,
       resolve,
@@ -22,7 +23,7 @@ export function sendMessage(message, request, subscriber) {
     const transportRequestMessage = {
       id,
       message,
-      origin: 'page',
+      origin: MESSAGE_ORIGIN_PAGE,
       request: request || null
     };
     window.postMessage(transportRequestMessage, '*');

package/stores/Accounts.cjs

@@ -7,13 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _defaults = require("../defaults.cjs");
+
 var _Base = _interopRequireDefault(require("./Base.cjs"));
 
 // Copyright 2019-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 class AccountsStore extends _Base.default {
   constructor() {
-    super(null);
+    super(`${_defaults.EXTENSION_PREFIX}accounts`);
   }
 
   set(key, value, update) {

package/stores/Accounts.js

@@ -1,9 +1,10 @@
 // Copyright 2019-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+import { EXTENSION_PREFIX } from "../defaults.js";
 import BaseStore from "./Base.js";
 export default class AccountsStore extends BaseStore {
   constructor() {
-    super(null);
+    super(`${EXTENSION_PREFIX}accounts`);
   }
 
   set(key, value, update) {

package/stores/Metadata.cjs

@@ -7,13 +7,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _defaults = require("../defaults.cjs");
+
 var _Base = _interopRequireDefault(require("./Base.cjs"));
 
 // Copyright 2019-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 class MetadataStore extends _Base.default {
   constructor() {
-    super('metadata');
+    super(`${_defaults.EXTENSION_PREFIX}metadata`);
   }
 
 }

package/stores/Metadata.js

@@ -1,9 +1,10 @@
 // Copyright 2019-2021 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
+import { EXTENSION_PREFIX } from "../defaults.js";
 import BaseStore from "./Base.js";
 export default class MetadataStore extends BaseStore {
   constructor() {
-    super('metadata');
+    super(`${EXTENSION_PREFIX}metadata`);
   }
 
 }

package/utils/getId.cjs

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getId = getId;
+
+var _defaults = require("../defaults.cjs");
+
+// Copyright 2019-2021 @polkadot/extension authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+let counter = 0;
+
+function getId() {
+  return `${_defaults.EXTENSION_PREFIX}.${Date.now()}.${++counter}`;
+}

package/utils/getId.d.ts

@@ -0,0 +1 @@
+export declare function getId(): string;

package/utils/getId.js

@@ -0,0 +1,7 @@
+// Copyright 2019-2021 @polkadot/extension authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+import { EXTENSION_PREFIX } from "../defaults.js";
+let counter = 0;
+export function getId() {
+  return `${EXTENSION_PREFIX}.${Date.now()}.${++counter}`;
+}