@polkadot/extension-base 0.46.1 → 0.46.2

package/background/handlers/Tabs.js

@@ -1,5 +1,3 @@
-var _Tabs_accountSubs, _Tabs_state;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import { checkIfDenied } from '@polkadot/phishing';
 import keyring from '@polkadot/ui-keyring';
 import { accounts as accountsObservable } from '@polkadot/ui-keyring/observable/accounts';
@@ -25,12 +23,11 @@ function transformAccounts(accounts, anyType = false) {
 }
 export default class Tabs {
     constructor(state) {
-        _Tabs_accountSubs.set(this, {});
-        _Tabs_state.set(this, void 0);
-        __classPrivateFieldSet(this, _Tabs_state, state, "f");
+        this.__internal__accountSubs = {};
+        this.__internal__state = state;
     }
     filterForAuthorizedAccounts(accounts, url) {
-        const auth = __classPrivateFieldGet(this, _Tabs_state, "f").authUrls[__classPrivateFieldGet(this, _Tabs_state, "f").stripUrl(url)];
+        const auth = this.__internal__state.authUrls[this.__internal__state.stripUrl(url)];
         return accounts.filter((allAcc) => auth.authorizedAccounts
             // we have a list, use it
             ? auth.authorizedAccounts.includes(allAcc.address)
@@ -38,7 +35,7 @@ export default class Tabs {
             : auth.isAllowed);
     }
     authorize(url, request) {
-        return __classPrivateFieldGet(this, _Tabs_state, "f").authorizeUrl(url, request);
+        return this.__internal__state.authorizeUrl(url, request);
     }
     accountsListAuthorized(url, { anyType }) {
         const transformedAccounts = transformAccounts(accountsObservable.subject.getValue(), anyType);
@@ -46,7 +43,7 @@ export default class Tabs {
     }
     accountsSubscribeAuthorized(url, id, port) {
         const cb = createSubscription(id, port);
-        __classPrivateFieldGet(this, _Tabs_accountSubs, "f")[id] = {
+        this.__internal__accountSubs[id] = {
             subscription: accountsObservable.subject.subscribe((accounts) => {
                 const transformedAccounts = transformAccounts(accounts);
                 cb(this.filterForAuthorizedAccounts(transformedAccounts, url));
@@ -59,11 +56,11 @@ export default class Tabs {
         return id;
     }
     accountsUnsubscribe(url, { id }) {
-        const sub = __classPrivateFieldGet(this, _Tabs_accountSubs, "f")[id];
+        const sub = this.__internal__accountSubs[id];
         if (!sub || sub.url !== url) {
             return false;
         }
-        delete __classPrivateFieldGet(this, _Tabs_accountSubs, "f")[id];
+        delete this.__internal__accountSubs[id];
         unsubscribe(id);
         sub.subscription.unsubscribe();
         return true;
@@ -76,35 +73,35 @@ export default class Tabs {
     bytesSign(url, request) {
         const address = request.address;
         const pair = this.getSigningPair(address);
-        return __classPrivateFieldGet(this, _Tabs_state, "f").sign(url, new RequestBytesSign(request), { address, ...pair.meta });
+        return this.__internal__state.sign(url, new RequestBytesSign(request), { address, ...pair.meta });
     }
     extrinsicSign(url, request) {
         const address = request.address;
         const pair = this.getSigningPair(address);
-        return __classPrivateFieldGet(this, _Tabs_state, "f").sign(url, new RequestExtrinsicSign(request), { address, ...pair.meta });
+        return this.__internal__state.sign(url, new RequestExtrinsicSign(request), { address, ...pair.meta });
     }
     metadataProvide(url, request) {
-        return __classPrivateFieldGet(this, _Tabs_state, "f").injectMetadata(url, request);
+        return this.__internal__state.injectMetadata(url, request);
     }
     metadataList(_url) {
-        return __classPrivateFieldGet(this, _Tabs_state, "f").knownMetadata.map(({ genesisHash, specVersion }) => ({
+        return this.__internal__state.knownMetadata.map(({ genesisHash, specVersion }) => ({
             genesisHash,
             specVersion
         }));
     }
     rpcListProviders() {
-        return __classPrivateFieldGet(this, _Tabs_state, "f").rpcListProviders();
+        return this.__internal__state.rpcListProviders();
     }
     rpcSend(request, port) {
-        return __classPrivateFieldGet(this, _Tabs_state, "f").rpcSend(request, port);
+        return this.__internal__state.rpcSend(request, port);
     }
     rpcStartProvider(key, port) {
-        return __classPrivateFieldGet(this, _Tabs_state, "f").rpcStartProvider(key, port);
+        return this.__internal__state.rpcStartProvider(key, port);
     }
     async rpcSubscribe(request, id, port) {
         const innerCb = createSubscription(id, port);
         const cb = (_error, data) => innerCb(data);
-        const subscriptionId = await __classPrivateFieldGet(this, _Tabs_state, "f").rpcSubscribe(request, cb, port);
+        const subscriptionId = await this.__internal__state.rpcSubscribe(request, cb, port);
         port.onDisconnect.addListener(() => {
             unsubscribe(id);
             withErrorLog(() => this.rpcUnsubscribe({ ...request, subscriptionId }, port));
@@ -114,14 +111,14 @@ export default class Tabs {
     rpcSubscribeConnected(request, id, port) {
         const innerCb = createSubscription(id, port);
         const cb = (_error, data) => innerCb(data);
-        __classPrivateFieldGet(this, _Tabs_state, "f").rpcSubscribeConnected(request, cb, port);
+        this.__internal__state.rpcSubscribeConnected(request, cb, port);
         port.onDisconnect.addListener(() => {
             unsubscribe(id);
         });
         return Promise.resolve(true);
     }
     async rpcUnsubscribe(request, port) {
-        return __classPrivateFieldGet(this, _Tabs_state, "f").rpcUnsubscribe(request, port);
+        return this.__internal__state.rpcUnsubscribe(request, port);
     }
     redirectPhishingLanding(phishingWebsite) {
         const nonFragment = phishingWebsite.split('#')[0];
@@ -147,7 +144,7 @@ export default class Tabs {
             return this.redirectIfPhishing(url);
         }
         if (type !== 'pub(authorize.tab)') {
-            __classPrivateFieldGet(this, _Tabs_state, "f").ensureUrlAuthorized(url);
+            this.__internal__state.ensureUrlAuthorized(url);
         }
         switch (type) {
             case 'pub(authorize.tab)':
@@ -185,4 +182,3 @@ export default class Tabs {
         }
     }
 }
-_Tabs_accountSubs = new WeakMap(), _Tabs_state = new WeakMap();

package/cjs/background/handlers/Extension.js

@@ -1,5 +1,4 @@
 "use strict";
-var _Extension_cachedUnlocks, _Extension_state;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const defaults_1 = require("@polkadot/extension-base/defaults");
@@ -24,15 +23,13 @@ function isJsonPayload(value) {
 }
 class Extension {
     constructor(state) {
-        _Extension_cachedUnlocks.set(this, void 0);
-        _Extension_state.set(this, void 0);
-        tslib_1.__classPrivateFieldSet(this, _Extension_cachedUnlocks, {}, "f");
-        tslib_1.__classPrivateFieldSet(this, _Extension_state, state, "f");
+        this.__internal__cachedUnlocks = {};
+        this.__internal__state = state;
     }
     transformAccounts(accounts) {
         return Object.values(accounts).map(({ json: { address, meta }, type }) => ({
             address,
-            isDefaultAuthSelected: tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").defaultAuthAccountSelection.includes(address),
+            isDefaultAuthSelected: this.__internal__state.defaultAuthAccountSelection.includes(address),
             ...meta,
             type
         }));
@@ -81,25 +78,25 @@ class Extension {
     accountsForget({ address }) {
         const authorizedAccountsDiff = [];
         // cycle through authUrls and prepare the array of diff
-        Object.entries(tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").authUrls).forEach(([url, urlInfo]) => {
+        Object.entries(this.__internal__state.authUrls).forEach(([url, urlInfo]) => {
             if (!urlInfo.authorizedAccounts.includes(address)) {
                 return;
             }
             authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter((previousAddress) => previousAddress !== address)]);
         });
-        tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").updateAuthorizedAccounts(authorizedAccountsDiff);
+        this.__internal__state.updateAuthorizedAccounts(authorizedAccountsDiff);
         // cycle through default account selection for auth and remove any occurence of the account
-        const newDefaultAuthAccounts = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
-        tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").updateDefaultAuthAccounts(newDefaultAuthAccounts);
+        const newDefaultAuthAccounts = this.__internal__state.defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
+        this.__internal__state.updateDefaultAuthAccounts(newDefaultAuthAccounts);
         ui_keyring_1.default.forgetAccount(address);
         return true;
     }
     refreshAccountPasswordCache(pair) {
         const { address } = pair;
-        const savedExpiry = tslib_1.__classPrivateFieldGet(this, _Extension_cachedUnlocks, "f")[address] || 0;
+        const savedExpiry = this.__internal__cachedUnlocks[address] || 0;
         const remainingTime = savedExpiry - Date.now();
         if (remainingTime < 0) {
-            tslib_1.__classPrivateFieldGet(this, _Extension_cachedUnlocks, "f")[address] = 0;
+            this.__internal__cachedUnlocks[address] = 0;
             pair.lock();
             return 0;
         }
@@ -136,22 +133,22 @@ class Extension {
         return true;
     }
     authorizeApprove({ authorizedAccounts, id }) {
-        const queued = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").getAuthRequest(id);
+        const queued = this.__internal__state.getAuthRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { resolve } = queued;
         resolve({ authorizedAccounts, result: true });
         return true;
     }
     authorizeUpdate({ authorizedAccounts, url }) {
-        return tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").updateAuthorizedAccounts([[url, authorizedAccounts]]);
+        return this.__internal__state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
     }
     getAuthList() {
-        return { list: tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").authUrls };
+        return { list: this.__internal__state.authUrls };
     }
     // FIXME This looks very much like what we have in accounts
     authorizeSubscribe(id, port) {
         const cb = (0, subscriptions_js_1.createSubscription)(id, port);
-        const subscription = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").authSubject.subscribe((requests) => cb(requests));
+        const subscription = this.__internal__state.authSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             (0, subscriptions_js_1.unsubscribe)(id);
             subscription.unsubscribe();
@@ -159,21 +156,21 @@ class Extension {
         return true;
     }
     metadataApprove({ id }) {
-        const queued = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").getMetaRequest(id);
+        const queued = this.__internal__state.getMetaRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { request, resolve } = queued;
-        tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").saveMetadata(request);
+        this.__internal__state.saveMetadata(request);
         resolve(true);
         return true;
     }
     metadataGet(genesisHash) {
-        return tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").knownMetadata.find((result) => result.genesisHash === genesisHash) || null;
+        return this.__internal__state.knownMetadata.find((result) => result.genesisHash === genesisHash) || null;
     }
     metadataList() {
-        return tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").knownMetadata;
+        return this.__internal__state.knownMetadata;
     }
     metadataReject({ id }) {
-        const queued = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").getMetaRequest(id);
+        const queued = this.__internal__state.getMetaRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { reject } = queued;
         reject(new Error('Rejected'));
@@ -181,7 +178,7 @@ class Extension {
     }
     metadataSubscribe(id, port) {
         const cb = (0, subscriptions_js_1.createSubscription)(id, port);
-        const subscription = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").metaSubject.subscribe((requests) => cb(requests));
+        const subscription = this.__internal__state.metaSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             (0, subscriptions_js_1.unsubscribe)(id);
             subscription.unsubscribe();
@@ -242,7 +239,7 @@ class Extension {
         };
     }
     signingApprovePassword({ id, password, savePass }) {
-        const queued = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").getSignRequest(id);
+        const queued = this.__internal__state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { reject, request, resolve } = queued;
         const pair = ui_keyring_1.default.getPair(queued.account.address);
@@ -263,7 +260,7 @@ class Extension {
         const { payload } = request;
         if (isJsonPayload(payload)) {
             // Get the metadata for the genesisHash
-            const metadata = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").knownMetadata.find(({ genesisHash }) => genesisHash === payload.genesisHash);
+            const metadata = this.__internal__state.knownMetadata.find(({ genesisHash }) => genesisHash === payload.genesisHash);
             if (metadata) {
                 // we have metadata, expand it and extract the info/registry
                 const expanded = (0, extension_chains_1.metadataExpand)(metadata, false);
@@ -285,7 +282,7 @@ class Extension {
             // unlike queued.account.address the following
             // address is encoded with the default prefix
             // which what is used for password caching mapping
-            tslib_1.__classPrivateFieldGet(this, _Extension_cachedUnlocks, "f")[pair.address] = Date.now() + defaults_1.PASSWORD_EXPIRY_MS;
+            this.__internal__cachedUnlocks[pair.address] = Date.now() + defaults_1.PASSWORD_EXPIRY_MS;
         }
         else {
             pair.lock();
@@ -297,21 +294,21 @@ class Extension {
         return true;
     }
     signingApproveSignature({ id, signature }) {
-        const queued = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").getSignRequest(id);
+        const queued = this.__internal__state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { resolve } = queued;
         resolve({ id, signature });
         return true;
     }
     signingCancel({ id }) {
-        const queued = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").getSignRequest(id);
+        const queued = this.__internal__state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { reject } = queued;
         reject(new Error('Cancelled'));
         return true;
     }
     signingIsLocked({ id }) {
-        const queued = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").getSignRequest(id);
+        const queued = this.__internal__state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const address = queued.request.payload.address;
         const pair = ui_keyring_1.default.getPair(address);
@@ -325,7 +322,7 @@ class Extension {
     // FIXME This looks very much like what we have in authorization
     signingSubscribe(id, port) {
         const cb = (0, subscriptions_js_1.createSubscription)(id, port);
-        const subscription = tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").signSubject.subscribe((requests) => cb(requests));
+        const subscription = this.__internal__state.signSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             (0, subscriptions_js_1.unsubscribe)(id);
             subscription.unsubscribe();
@@ -374,16 +371,16 @@ class Extension {
         return true;
     }
     removeAuthorization(url) {
-        return { list: tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").removeAuthorization(url) };
+        return { list: this.__internal__state.removeAuthorization(url) };
     }
     deleteAuthRequest(requestId) {
-        return tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").deleteAuthRequest(requestId);
+        return this.__internal__state.deleteAuthRequest(requestId);
     }
     updateCurrentTabs({ urls }) {
-        tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").udateCurrentTabsUrl(urls);
+        this.__internal__state.udateCurrentTabsUrl(urls);
     }
     getConnectedTabsUrl() {
-        return tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").getConnectedTabsUrl();
+        return this.__internal__state.getConnectedTabsUrl();
     }
     // Weird thought, the eslint override is not needed in Tabs
     // eslint-disable-next-line @typescript-eslint/require-await
@@ -456,7 +453,7 @@ class Extension {
             case 'pri(seed.validate)':
                 return this.seedValidate(request);
             case 'pri(settings.notification)':
-                return tslib_1.__classPrivateFieldGet(this, _Extension_state, "f").setNotification(request);
+                return this.__internal__state.setNotification(request);
             case 'pri(signing.approve.password)':
                 return this.signingApprovePassword(request);
             case 'pri(signing.approve.signature)':
@@ -475,4 +472,3 @@ class Extension {
     }
 }
 exports.default = Extension;
-_Extension_cachedUnlocks = new WeakMap(), _Extension_state = new WeakMap();