@polkadot/extension-base 0.59.1 → 0.60.1

package/background/handlers/Tabs.js

@@ -23,13 +23,13 @@ function transformAccounts(accounts, anyType = false) {
     }));
 }
 export default class Tabs {
-    __internal__accountSubs = {};
-    __internal__state;
+    #accountSubs = {};
+    #state;
     constructor(state) {
-        this.__internal__state = state;
+        this.#state = state;
     }
     filterForAuthorizedAccounts(accounts, url) {
-        const auth = this.__internal__state.authUrls[this.__internal__state.stripUrl(url)];
+        const auth = this.#state.authUrls[this.#state.stripUrl(url)];
         if (!auth) {
             return [];
         }
@@ -40,7 +40,7 @@ export default class Tabs {
             : auth.isAllowed);
     }
     authorize(url, request) {
-        return this.__internal__state.authorizeUrl(url, request);
+        return this.#state.authorizeUrl(url, request);
     }
     accountsListAuthorized(url, { anyType }) {
         const transformedAccounts = transformAccounts(accountsObservable.subject.getValue(), anyType);
@@ -48,13 +48,13 @@ export default class Tabs {
     }
     accountsSubscribeAuthorized(url, id, port) {
         const cb = createSubscription(id, port);
-        const strippedUrl = this.__internal__state.stripUrl(url);
-        const authUrlObservable = this.__internal__state.authUrlSubjects[strippedUrl]?.asObservable();
+        const strippedUrl = this.#state.stripUrl(url);
+        const authUrlObservable = this.#state.authUrlSubjects[strippedUrl]?.asObservable();
         if (!authUrlObservable) {
             console.error(`No authUrlSubject found for ${strippedUrl}`);
             return id;
         }
-        this.__internal__accountSubs[id] = {
+        this.#accountSubs[id] = {
             subscription: combineLatest([accountsObservable.subject, authUrlObservable]).subscribe(([accounts, _authUrlInfo]) => {
                 const transformedAccounts = transformAccounts(accounts);
                 cb(this.filterForAuthorizedAccounts(transformedAccounts, url));
@@ -67,11 +67,11 @@ export default class Tabs {
         return id;
     }
     accountsUnsubscribe(url, { id }) {
-        const sub = this.__internal__accountSubs[id];
+        const sub = this.#accountSubs[id];
         if (!sub || sub.url !== url) {
             return false;
         }
-        delete this.__internal__accountSubs[id];
+        delete this.#accountSubs[id];
         unsubscribe(id);
         sub.subscription.unsubscribe();
         return true;
@@ -84,35 +84,35 @@ export default class Tabs {
     bytesSign(url, request) {
         const address = request.address;
         const pair = this.getSigningPair(address);
-        return this.__internal__state.sign(url, new RequestBytesSign(request), { address, ...pair.meta });
+        return this.#state.sign(url, new RequestBytesSign(request), { address, ...pair.meta });
     }
     extrinsicSign(url, request) {
         const address = request.address;
         const pair = this.getSigningPair(address);
-        return this.__internal__state.sign(url, new RequestExtrinsicSign(request), { address, ...pair.meta });
+        return this.#state.sign(url, new RequestExtrinsicSign(request), { address, ...pair.meta });
     }
     metadataProvide(url, request) {
-        return this.__internal__state.injectMetadata(url, request);
+        return this.#state.injectMetadata(url, request);
     }
     metadataList(_url) {
-        return this.__internal__state.knownMetadata.map(({ genesisHash, specVersion }) => ({
+        return this.#state.knownMetadata.map(({ genesisHash, specVersion }) => ({
             genesisHash,
             specVersion
         }));
     }
     rpcListProviders() {
-        return this.__internal__state.rpcListProviders();
+        return this.#state.rpcListProviders();
     }
     rpcSend(request, port) {
-        return this.__internal__state.rpcSend(request, port);
+        return this.#state.rpcSend(request, port);
     }
     rpcStartProvider(key, port) {
-        return this.__internal__state.rpcStartProvider(key, port);
+        return this.#state.rpcStartProvider(key, port);
     }
     async rpcSubscribe(request, id, port) {
         const innerCb = createSubscription(id, port);
         const cb = (_error, data) => innerCb(data);
-        const subscriptionId = await this.__internal__state.rpcSubscribe(request, cb, port);
+        const subscriptionId = await this.#state.rpcSubscribe(request, cb, port);
         port.onDisconnect.addListener(() => {
             unsubscribe(id);
             withErrorLog(() => this.rpcUnsubscribe({ ...request, subscriptionId }, port));
@@ -122,14 +122,14 @@ export default class Tabs {
     rpcSubscribeConnected(request, id, port) {
         const innerCb = createSubscription(id, port);
         const cb = (_error, data) => innerCb(data);
-        this.__internal__state.rpcSubscribeConnected(request, cb, port);
+        this.#state.rpcSubscribeConnected(request, cb, port);
         port.onDisconnect.addListener(() => {
             unsubscribe(id);
         });
         return Promise.resolve(true);
     }
     async rpcUnsubscribe(request, port) {
-        return this.__internal__state.rpcUnsubscribe(request, port);
+        return this.#state.rpcUnsubscribe(request, port);
     }
     redirectPhishingLanding(phishingWebsite) {
         const nonFragment = phishingWebsite.split('#')[0];
@@ -155,7 +155,7 @@ export default class Tabs {
             return this.redirectIfPhishing(url);
         }
         if (type !== 'pub(authorize.tab)') {
-            this.__internal__state.ensureUrlAuthorized(url);
+            this.#state.ensureUrlAuthorized(url);
         }
         switch (type) {
             case 'pub(authorize.tab)':

package/cjs/background/handlers/Extension.js

@@ -21,16 +21,16 @@ function isJsonPayload(value) {
     return value.genesisHash !== undefined;
 }
 class Extension {
-    __internal__cachedUnlocks;
-    __internal__state;
+    #cachedUnlocks;
+    #state;
     constructor(state) {
-        this.__internal__cachedUnlocks = {};
-        this.__internal__state = state;
+        this.#cachedUnlocks = {};
+        this.#state = state;
     }
     transformAccounts(accounts) {
         return Object.values(accounts).map(({ json: { address, meta }, type }) => ({
             address,
-            isDefaultAuthSelected: this.__internal__state.defaultAuthAccountSelection.includes(address),
+            isDefaultAuthSelected: this.#state.defaultAuthAccountSelection.includes(address),
             ...meta,
             type
         }));
@@ -79,26 +79,26 @@ class Extension {
     async accountsForget({ address }) {
         const authorizedAccountsDiff = [];
         // cycle through authUrls and prepare the array of diff
-        Object.entries(this.__internal__state.authUrls).forEach(([url, urlInfo]) => {
+        Object.entries(this.#state.authUrls).forEach(([url, urlInfo]) => {
             // Note that urlInfo.authorizedAccounts may be undefined if this website entry
             // was created before the "account authorization per website" functionality was introduced
             if (urlInfo.authorizedAccounts?.includes(address)) {
                 authorizedAccountsDiff.push([url, urlInfo.authorizedAccounts.filter((previousAddress) => previousAddress !== address)]);
             }
         });
-        await this.__internal__state.updateAuthorizedAccounts(authorizedAccountsDiff);
+        await this.#state.updateAuthorizedAccounts(authorizedAccountsDiff);
         // cycle through default account selection for auth and remove any occurrence of the account
-        const newDefaultAuthAccounts = this.__internal__state.defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
-        await this.__internal__state.updateDefaultAuthAccounts(newDefaultAuthAccounts);
+        const newDefaultAuthAccounts = this.#state.defaultAuthAccountSelection.filter((defaultSelectionAddress) => defaultSelectionAddress !== address);
+        await this.#state.updateDefaultAuthAccounts(newDefaultAuthAccounts);
         ui_keyring_1.keyring.forgetAccount(address);
         return true;
     }
     refreshAccountPasswordCache(pair) {
         const { address } = pair;
-        const savedExpiry = this.__internal__cachedUnlocks[address] || 0;
+        const savedExpiry = this.#cachedUnlocks[address] || 0;
         const remainingTime = savedExpiry - Date.now();
         if (remainingTime < 0) {
-            this.__internal__cachedUnlocks[address] = 0;
+            this.#cachedUnlocks[address] = 0;
             pair.lock();
             return 0;
         }
@@ -135,22 +135,22 @@ class Extension {
         return true;
     }
     authorizeApprove({ authorizedAccounts, id }) {
-        const queued = this.__internal__state.getAuthRequest(id);
+        const queued = this.#state.getAuthRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { resolve } = queued;
         resolve({ authorizedAccounts, result: true });
         return true;
     }
     async authorizeUpdate({ authorizedAccounts, url }) {
-        return await this.__internal__state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
+        return await this.#state.updateAuthorizedAccounts([[url, authorizedAccounts]]);
     }
     getAuthList() {
-        return { list: this.__internal__state.authUrls };
+        return { list: this.#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 = this.__internal__state.authSubject.subscribe((requests) => cb(requests));
+        const subscription = this.#state.authSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             (0, subscriptions_js_1.unsubscribe)(id);
             subscription.unsubscribe();
@@ -158,21 +158,21 @@ class Extension {
         return true;
     }
     async metadataApprove({ id }) {
-        const queued = this.__internal__state.getMetaRequest(id);
+        const queued = this.#state.getMetaRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { request, resolve } = queued;
-        await this.__internal__state.saveMetadata(request);
+        await this.#state.saveMetadata(request);
         resolve(true);
         return true;
     }
     metadataGet(genesisHash) {
-        return this.__internal__state.knownMetadata.find((result) => result.genesisHash === genesisHash) || null;
+        return this.#state.knownMetadata.find((result) => result.genesisHash === genesisHash) || null;
     }
     metadataList() {
-        return this.__internal__state.knownMetadata;
+        return this.#state.knownMetadata;
     }
     metadataReject({ id }) {
-        const queued = this.__internal__state.getMetaRequest(id);
+        const queued = this.#state.getMetaRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { reject } = queued;
         reject(new Error('Rejected'));
@@ -180,7 +180,7 @@ class Extension {
     }
     metadataSubscribe(id, port) {
         const cb = (0, subscriptions_js_1.createSubscription)(id, port);
-        const subscription = this.__internal__state.metaSubject.subscribe((requests) => cb(requests));
+        const subscription = this.#state.metaSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             (0, subscriptions_js_1.unsubscribe)(id);
             subscription.unsubscribe();
@@ -241,7 +241,7 @@ class Extension {
         };
     }
     signingApprovePassword({ id, password, savePass }) {
-        const queued = this.__internal__state.getSignRequest(id);
+        const queued = this.#state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { reject, request, resolve } = queued;
         const pair = ui_keyring_1.keyring.getPair(queued.account.address);
@@ -262,7 +262,7 @@ class Extension {
         const { payload } = request;
         if (isJsonPayload(payload)) {
             // Get the metadata for the genesisHash
-            const metadata = this.__internal__state.knownMetadata.find(({ genesisHash }) => genesisHash === payload.genesisHash);
+            const metadata = this.#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);
@@ -284,7 +284,7 @@ class Extension {
             // unlike queued.account.address the following
             // address is encoded with the default prefix
             // which what is used for password caching mapping
-            this.__internal__cachedUnlocks[pair.address] = Date.now() + defaults_1.PASSWORD_EXPIRY_MS;
+            this.#cachedUnlocks[pair.address] = Date.now() + defaults_1.PASSWORD_EXPIRY_MS;
         }
         else {
             pair.lock();
@@ -296,21 +296,21 @@ class Extension {
         return true;
     }
     signingApproveSignature({ id, signature, signedTransaction }) {
-        const queued = this.__internal__state.getSignRequest(id);
+        const queued = this.#state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { resolve } = queued;
         resolve({ id, signature, signedTransaction });
         return true;
     }
     signingCancel({ id }) {
-        const queued = this.__internal__state.getSignRequest(id);
+        const queued = this.#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 = this.__internal__state.getSignRequest(id);
+        const queued = this.#state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const address = queued.request.payload.address;
         const pair = ui_keyring_1.keyring.getPair(address);
@@ -324,7 +324,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 = this.__internal__state.signSubject.subscribe((requests) => cb(requests));
+        const subscription = this.#state.signSubject.subscribe((requests) => cb(requests));
         port.onDisconnect.addListener(() => {
             (0, subscriptions_js_1.unsubscribe)(id);
             subscription.unsubscribe();
@@ -373,13 +373,13 @@ class Extension {
         return true;
     }
     async removeAuthorization(url) {
-        const remAuth = await this.__internal__state.removeAuthorization(url);
+        const remAuth = await this.#state.removeAuthorization(url);
         return { list: remAuth };
     }
     // Reject the authorization request and add the URL to the authorized list with no keys.
     // The site will not prompt for re-authorization on future visits.
     rejectAuthRequest(id) {
-        const queued = this.__internal__state.getAuthRequest(id);
+        const queued = this.#state.getAuthRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { reject } = queued;
         reject(new Error('Rejected'));
@@ -387,16 +387,16 @@ class Extension {
     // Cancel the authorization request and do not add the URL to the authorized list.
     // The site will prompt for authorization on future visits.
     cancelAuthRequest(id) {
-        const queued = this.__internal__state.getAuthRequest(id);
+        const queued = this.#state.getAuthRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { reject } = queued;
         reject(new Error('Cancelled'));
     }
     updateCurrentTabs({ urls }) {
-        this.__internal__state.updateCurrentTabsUrl(urls);
+        this.#state.updateCurrentTabsUrl(urls);
     }
     getConnectedTabsUrl() {
-        return this.__internal__state.getConnectedTabsUrl();
+        return this.#state.getConnectedTabsUrl();
     }
     // Weird thought, the eslint override is not needed in Tabs
     // eslint-disable-next-line @typescript-eslint/require-await
@@ -471,7 +471,7 @@ class Extension {
             case 'pri(seed.validate)':
                 return this.seedValidate(request);
             case 'pri(settings.notification)':
-                return this.__internal__state.setNotification(request);
+                return this.#state.setNotification(request);
             case 'pri(signing.approve.password)':
                 return this.signingApprovePassword(request);
             case 'pri(signing.approve.signature)':