@polkadot/extension-base 0.49.3 → 0.51.1

package/background/handlers/Extension.js

@@ -293,11 +293,11 @@ export default class Extension {
         });
         return true;
     }
-    signingApproveSignature({ id, signature }) {
+    signingApproveSignature({ id, signature, signedTransaction }) {
         const queued = this.__internal__state.getSignRequest(id);
         assert(queued, 'Unable to find request');
         const { resolve } = queued;
-        resolve({ id, signature });
+        resolve({ id, signature, signedTransaction });
         return true;
     }
     signingCancel({ id }) {
@@ -378,7 +378,7 @@ export default class Extension {
         return this.__internal__state.deleteAuthRequest(requestId);
     }
     updateCurrentTabs({ urls }) {
-        this.__internal__state.udateCurrentTabsUrl(urls);
+        this.__internal__state.updateCurrentTabsUrl(urls);
     }
     getConnectedTabsUrl() {
         return this.__internal__state.getConnectedTabsUrl();

package/background/handlers/State.d.ts

@@ -43,6 +43,7 @@ export default class State {
     readonly authSubject: BehaviorSubject<AuthorizeRequest[]>;
     readonly metaSubject: BehaviorSubject<MetadataRequest[]>;
     readonly signSubject: BehaviorSubject<SigningRequest[]>;
+    readonly authUrlSubjects: Record<string, BehaviorSubject<AuthUrlInfo>>;
     defaultAuthAccountSelection: string[];
     constructor(providers?: Providers);
     init(): Promise<void>;
@@ -54,11 +55,14 @@ export default class State {
     get allMetaRequests(): MetadataRequest[];
     get allSignRequests(): SigningRequest[];
     get authUrls(): AuthUrls;
-    private set authUrls(value);
     private popupClose;
     private popupOpen;
     private authComplete;
+    /**
+   * @deprecated This method is deprecated in favor of {@link updateCurrentTabs} and will be removed in a future release.
+   */
     udateCurrentTabsUrl(urls: string[]): void;
+    updateCurrentTabsUrl(urls: string[]): void;
     getConnectedTabsUrl(): string[];
     deleteAuthRequest(requestId: string): void;
     private saveCurrentAuthList;
@@ -72,7 +76,7 @@ export default class State {
     private updateIconAuth;
     private updateIconMeta;
     private updateIconSign;
-    updateAuthorizedAccounts(authorizedAccountDiff: AuthorizedAccountsDiff): Promise<void>;
+    updateAuthorizedAccounts(authorizedAccountsDiff: AuthorizedAccountsDiff): Promise<void>;
     authorizeUrl(url: string, request: RequestAuthorizeTab): Promise<AuthResponse>;
     ensureUrlAuthorized(url: string): boolean;
     injectMetadata(url: string, request: MetadataDef): Promise<boolean>;

package/background/handlers/State.js

@@ -78,6 +78,7 @@ export default class State {
     authSubject = new BehaviorSubject([]);
     metaSubject = new BehaviorSubject([]);
     signSubject = new BehaviorSubject([]);
+    authUrlSubjects = {};
     defaultAuthAccountSelection = [];
     constructor(providers = {}) {
         this.__internal__providers = providers;
@@ -89,6 +90,10 @@ export default class State {
         const authString = storageAuthUrls?.[AUTH_URLS_KEY] || '{}';
         const previousAuth = JSON.parse(authString);
         this.__internal__authUrls = previousAuth;
+        // Initialize authUrlSubjects for each URL
+        Object.entries(previousAuth).forEach(([url, authInfo]) => {
+            this.authUrlSubjects[url] = new BehaviorSubject(authInfo);
+        });
         // retrieve previously set default auth accounts
         const storageDefaultAuthAccounts = await chrome.storage.local.get(DEFAULT_AUTH_ACCOUNTS);
         const defaultAuthString = storageDefaultAuthAccounts?.[DEFAULT_AUTH_ACCOUNTS] || '[]';
@@ -125,9 +130,6 @@ export default class State {
     get authUrls() {
         return this.__internal__authUrls;
     }
-    set authUrls(urls) {
-        this.__internal__authUrls = urls;
-    }
     popupClose() {
         this.__internal__windows.forEach((id) => withErrorLog(() => chrome.windows.remove(id)));
         this.__internal__windows = [];
@@ -145,13 +147,21 @@ export default class State {
     authComplete = (id, resolve, reject) => {
         const complete = async (authorizedAccounts = []) => {
             const { idStr, request: { origin }, url } = this.__internal__authRequests[id];
-            this.__internal__authUrls[this.stripUrl(url)] = {
+            const strippedUrl = this.stripUrl(url);
+            const authInfo = {
                 authorizedAccounts,
                 count: 0,
                 id: idStr,
                 origin,
                 url
             };
+            this.__internal__authUrls[strippedUrl] = authInfo;
+            if (!this.authUrlSubjects[strippedUrl]) {
+                this.authUrlSubjects[strippedUrl] = new BehaviorSubject(authInfo);
+            }
+            else {
+                this.authUrlSubjects[strippedUrl].next(authInfo);
+            }
             await this.saveCurrentAuthList();
             await this.updateDefaultAuthAccounts(authorizedAccounts);
             delete this.__internal__authRequests[id];
@@ -170,7 +180,13 @@ export default class State {
             }
         };
     };
+    /**
+   * @deprecated This method is deprecated in favor of {@link updateCurrentTabs} and will be removed in a future release.
+   */
     udateCurrentTabsUrl(urls) {
+        this.updateCurrentTabsUrl(urls);
+    }
+    updateCurrentTabsUrl(urls) {
         const connectedTabs = urls.map((url) => {
             let strippedUrl = '';
             // the assert in stripUrl may throw for new tabs with "chrome://newtab/"
@@ -261,6 +277,10 @@ export default class State {
         assert(entry, `The source ${url} is not known`);
         delete this.__internal__authUrls[url];
         await this.saveCurrentAuthList();
+        if (this.authUrlSubjects[url]) {
+            entry.authorizedAccounts = [];
+            this.authUrlSubjects[url].next(entry);
+        }
         return this.__internal__authUrls;
     }
     updateIconAuth(shouldClose) {
@@ -275,9 +295,10 @@ export default class State {
         this.signSubject.next(this.allSignRequests);
         this.updateIcon(shouldClose);
     }
-    async updateAuthorizedAccounts(authorizedAccountDiff) {
-        authorizedAccountDiff.forEach(([url, authorizedAccountDiff]) => {
+    async updateAuthorizedAccounts(authorizedAccountsDiff) {
+        authorizedAccountsDiff.forEach(([url, authorizedAccountDiff]) => {
             this.__internal__authUrls[url].authorizedAccounts = authorizedAccountDiff;
+            this.authUrlSubjects[url].next(this.__internal__authUrls[url]);
         });
         await this.saveCurrentAuthList();
     }

package/background/handlers/Tabs.js

@@ -1,3 +1,4 @@
+import { combineLatest } from 'rxjs';
 import { checkIfDenied } from '@polkadot/phishing';
 import { keyring } from '@polkadot/ui-keyring';
 import { accounts as accountsObservable } from '@polkadot/ui-keyring/observable/accounts';
@@ -29,6 +30,9 @@ export default class Tabs {
     }
     filterForAuthorizedAccounts(accounts, url) {
         const auth = this.__internal__state.authUrls[this.__internal__state.stripUrl(url)];
+        if (!auth) {
+            return [];
+        }
         return accounts.filter((allAcc) => auth.authorizedAccounts
             // we have a list, use it
             ? auth.authorizedAccounts.includes(allAcc.address)
@@ -44,8 +48,14 @@ 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();
+        if (!authUrlObservable) {
+            console.error(`No authUrlSubject found for ${strippedUrl}`);
+            return id;
+        }
         this.__internal__accountSubs[id] = {
-            subscription: accountsObservable.subject.subscribe((accounts) => {
+            subscription: combineLatest([accountsObservable.subject, authUrlObservable]).subscribe(([accounts, _authUrlInfo]) => {
                 const transformedAccounts = transformAccounts(accounts);
                 cb(this.filterForAuthorizedAccounts(transformedAccounts, url));
             }),

package/background/types.d.ts

@@ -244,6 +244,7 @@ export interface RequestSigningApprovePassword {
 export interface RequestSigningApproveSignature {
     id: string;
     signature: HexString;
+    signedTransaction?: HexString;
 }
 export interface RequestSigningCancel {
     id: string;
@@ -284,6 +285,7 @@ export type TransportResponseMessage<TMessageType extends MessageTypes> = TMessa
 export interface ResponseSigning {
     id: string;
     signature: HexString;
+    signedTransaction?: HexString;
 }
 export interface ResponseDeriveValidate {
     address: string;

package/cjs/background/handlers/Extension.js

@@ -295,11 +295,11 @@ class Extension {
         });
         return true;
     }
-    signingApproveSignature({ id, signature }) {
+    signingApproveSignature({ id, signature, signedTransaction }) {
         const queued = this.__internal__state.getSignRequest(id);
         (0, util_1.assert)(queued, 'Unable to find request');
         const { resolve } = queued;
-        resolve({ id, signature });
+        resolve({ id, signature, signedTransaction });
         return true;
     }
     signingCancel({ id }) {
@@ -380,7 +380,7 @@ class Extension {
         return this.__internal__state.deleteAuthRequest(requestId);
     }
     updateCurrentTabs({ urls }) {
-        this.__internal__state.udateCurrentTabsUrl(urls);
+        this.__internal__state.updateCurrentTabsUrl(urls);
     }
     getConnectedTabsUrl() {
         return this.__internal__state.getConnectedTabsUrl();

package/cjs/background/handlers/State.js

@@ -81,6 +81,7 @@ class State {
     authSubject = new rxjs_1.BehaviorSubject([]);
     metaSubject = new rxjs_1.BehaviorSubject([]);
     signSubject = new rxjs_1.BehaviorSubject([]);
+    authUrlSubjects = {};
     defaultAuthAccountSelection = [];
     constructor(providers = {}) {
         this.__internal__providers = providers;
@@ -92,6 +93,10 @@ class State {
         const authString = storageAuthUrls?.[AUTH_URLS_KEY] || '{}';
         const previousAuth = JSON.parse(authString);
         this.__internal__authUrls = previousAuth;
+        // Initialize authUrlSubjects for each URL
+        Object.entries(previousAuth).forEach(([url, authInfo]) => {
+            this.authUrlSubjects[url] = new rxjs_1.BehaviorSubject(authInfo);
+        });
         // retrieve previously set default auth accounts
         const storageDefaultAuthAccounts = await chrome.storage.local.get(DEFAULT_AUTH_ACCOUNTS);
         const defaultAuthString = storageDefaultAuthAccounts?.[DEFAULT_AUTH_ACCOUNTS] || '[]';
@@ -128,9 +133,6 @@ class State {
     get authUrls() {
         return this.__internal__authUrls;
     }
-    set authUrls(urls) {
-        this.__internal__authUrls = urls;
-    }
     popupClose() {
         this.__internal__windows.forEach((id) => (0, helpers_js_1.withErrorLog)(() => chrome.windows.remove(id)));
         this.__internal__windows = [];
@@ -148,13 +150,21 @@ class State {
     authComplete = (id, resolve, reject) => {
         const complete = async (authorizedAccounts = []) => {
             const { idStr, request: { origin }, url } = this.__internal__authRequests[id];
-            this.__internal__authUrls[this.stripUrl(url)] = {
+            const strippedUrl = this.stripUrl(url);
+            const authInfo = {
                 authorizedAccounts,
                 count: 0,
                 id: idStr,
                 origin,
                 url
             };
+            this.__internal__authUrls[strippedUrl] = authInfo;
+            if (!this.authUrlSubjects[strippedUrl]) {
+                this.authUrlSubjects[strippedUrl] = new rxjs_1.BehaviorSubject(authInfo);
+            }
+            else {
+                this.authUrlSubjects[strippedUrl].next(authInfo);
+            }
             await this.saveCurrentAuthList();
             await this.updateDefaultAuthAccounts(authorizedAccounts);
             delete this.__internal__authRequests[id];
@@ -173,7 +183,13 @@ class State {
             }
         };
     };
+    /**
+   * @deprecated This method is deprecated in favor of {@link updateCurrentTabs} and will be removed in a future release.
+   */
     udateCurrentTabsUrl(urls) {
+        this.updateCurrentTabsUrl(urls);
+    }
+    updateCurrentTabsUrl(urls) {
         const connectedTabs = urls.map((url) => {
             let strippedUrl = '';
             // the assert in stripUrl may throw for new tabs with "chrome://newtab/"
@@ -264,6 +280,10 @@ class State {
         (0, util_1.assert)(entry, `The source ${url} is not known`);
         delete this.__internal__authUrls[url];
         await this.saveCurrentAuthList();
+        if (this.authUrlSubjects[url]) {
+            entry.authorizedAccounts = [];
+            this.authUrlSubjects[url].next(entry);
+        }
         return this.__internal__authUrls;
     }
     updateIconAuth(shouldClose) {
@@ -278,9 +298,10 @@ class State {
         this.signSubject.next(this.allSignRequests);
         this.updateIcon(shouldClose);
     }
-    async updateAuthorizedAccounts(authorizedAccountDiff) {
-        authorizedAccountDiff.forEach(([url, authorizedAccountDiff]) => {
+    async updateAuthorizedAccounts(authorizedAccountsDiff) {
+        authorizedAccountsDiff.forEach(([url, authorizedAccountDiff]) => {
             this.__internal__authUrls[url].authorizedAccounts = authorizedAccountDiff;
+            this.authUrlSubjects[url].next(this.__internal__authUrls[url]);
         });
         await this.saveCurrentAuthList();
     }

package/cjs/background/handlers/Tabs.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const rxjs_1 = require("rxjs");
 const phishing_1 = require("@polkadot/phishing");
 const ui_keyring_1 = require("@polkadot/ui-keyring");
 const accounts_1 = require("@polkadot/ui-keyring/observable/accounts");
@@ -32,6 +33,9 @@ class Tabs {
     }
     filterForAuthorizedAccounts(accounts, url) {
         const auth = this.__internal__state.authUrls[this.__internal__state.stripUrl(url)];
+        if (!auth) {
+            return [];
+        }
         return accounts.filter((allAcc) => auth.authorizedAccounts
             // we have a list, use it
             ? auth.authorizedAccounts.includes(allAcc.address)
@@ -47,8 +51,14 @@ class Tabs {
     }
     accountsSubscribeAuthorized(url, id, port) {
         const cb = (0, subscriptions_js_1.createSubscription)(id, port);
+        const strippedUrl = this.__internal__state.stripUrl(url);
+        const authUrlObservable = this.__internal__state.authUrlSubjects[strippedUrl]?.asObservable();
+        if (!authUrlObservable) {
+            console.error(`No authUrlSubject found for ${strippedUrl}`);
+            return id;
+        }
         this.__internal__accountSubs[id] = {
-            subscription: accounts_1.accounts.subject.subscribe((accounts) => {
+            subscription: (0, rxjs_1.combineLatest)([accounts_1.accounts.subject, authUrlObservable]).subscribe(([accounts, _authUrlInfo]) => {
                 const transformedAccounts = transformAccounts(accounts);
                 cb(this.filterForAuthorizedAccounts(transformedAccounts, url));
             }),

package/cjs/packageInfo.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageInfo = void 0;
-exports.packageInfo = { name: '@polkadot/extension-base', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '0.49.3' };
+exports.packageInfo = { name: '@polkadot/extension-base', path: typeof __dirname === 'string' ? __dirname : 'auto', type: 'cjs', version: '0.51.1' };

package/cjs/utils/portUtils.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensurePortConnection = exports.wakeUpServiceWorkerWrapper = exports.wakeUpServiceWorker = exports.setupPort = void 0;
+const chrome_1 = require("@polkadot/extension-inject/chrome");
+function setupPort(portName, onMessageHandler, onDisconnectHandler) {
+    const port = chrome_1.chrome.runtime.connect({ name: portName });
+    port.onMessage.addListener(onMessageHandler);
+    port.onDisconnect.addListener(() => {
+        console.log(`Disconnected from ${portName}`);
+        onDisconnectHandler();
+    });
+    return port;
+}
+exports.setupPort = setupPort;
+async function wakeUpServiceWorker() {
+    return new Promise((resolve, reject) => {
+        chrome_1.chrome.runtime.sendMessage({ type: 'wakeup' }, (response) => {
+            if (chrome_1.chrome.runtime.lastError) {
+                reject(new Error(chrome_1.chrome.runtime.lastError.message));
+            }
+            else {
+                resolve(response);
+            }
+        });
+    });
+}
+exports.wakeUpServiceWorker = wakeUpServiceWorker;
+exports.wakeUpServiceWorkerWrapper = { wakeUpServiceWorker };
+async function ensurePortConnection(portRef, portConfig) {
+    const maxAttempts = 5;
+    const delayMs = 1000;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+            const response = await exports.wakeUpServiceWorkerWrapper.wakeUpServiceWorker();
+            if (response?.status === 'awake') {
+                if (!portRef) {
+                    return setupPort(portConfig.portName, portConfig.onPortMessageHandler, portConfig.onPortDisconnectHandler);
+                }
+                return portRef;
+            }
+        }
+        catch (error) {
+            console.error(`Attempt ${attempt + 1} failed: ${error.message}`);
+            await new Promise((resolve) => setTimeout(resolve, delayMs));
+        }
+    }
+    throw new Error('Failed to wake up the service worker and setup the port after multiple attempts');
+}
+exports.ensurePortConnection = ensurePortConnection;

package/package.json

@@ -18,7 +18,7 @@
     "./cjs/packageDetect.js"
   ],
   "type": "module",
-  "version": "0.49.3",
+  "version": "0.51.1",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -214,20 +214,26 @@
       "module": "./utils/getId.js",
       "require": "./cjs/utils/getId.js",
       "default": "./utils/getId.js"
+    },
+    "./utils/portUtils": {
+      "types": "./utils/portUtils.d.ts",
+      "module": "./utils/portUtils.js",
+      "require": "./cjs/utils/portUtils.js",
+      "default": "./utils/portUtils.js"
     }
   },
   "dependencies": {
-    "@polkadot/api": "^12.2.1",
-    "@polkadot/extension-chains": "0.49.3",
-    "@polkadot/extension-dapp": "0.49.3",
-    "@polkadot/extension-inject": "0.49.3",
+    "@polkadot/api": "^12.3.1",
+    "@polkadot/extension-chains": "0.51.1",
+    "@polkadot/extension-dapp": "0.51.1",
+    "@polkadot/extension-inject": "0.51.1",
     "@polkadot/keyring": "^13.0.2",
     "@polkadot/networks": "^13.0.2",
-    "@polkadot/phishing": "^0.23.1",
-    "@polkadot/rpc-provider": "^12.2.1",
-    "@polkadot/types": "^12.2.1",
-    "@polkadot/ui-keyring": "^3.7.1",
-    "@polkadot/ui-settings": "^3.7.1",
+    "@polkadot/phishing": "^0.23.3",
+    "@polkadot/rpc-provider": "^12.3.1",
+    "@polkadot/types": "^12.3.1",
+    "@polkadot/ui-keyring": "^3.8.3",
+    "@polkadot/ui-settings": "^3.8.3",
     "@polkadot/util": "^13.0.2",
     "@polkadot/util-crypto": "^13.0.2",
     "eventemitter3": "^5.0.1",

package/packageInfo.js

@@ -1 +1 @@
-export const packageInfo = { name: '@polkadot/extension-base', path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto', type: 'esm', version: '0.49.3' };
+export const packageInfo = { name: '@polkadot/extension-base', path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto', type: 'esm', version: '0.51.1' };

package/utils/portUtils.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="chrome" />
+import type { Message } from '@polkadot/extension-base/types';
+export declare function setupPort(portName: string, onMessageHandler: (data: Message['data']) => void, onDisconnectHandler: () => void): chrome.runtime.Port;
+export declare function wakeUpServiceWorker(): Promise<{
+    status: string;
+}>;
+export declare const wakeUpServiceWorkerWrapper: {
+    wakeUpServiceWorker: typeof wakeUpServiceWorker;
+};
+export declare function ensurePortConnection(portRef: chrome.runtime.Port | undefined, portConfig: {
+    portName: string;
+    onPortMessageHandler: (data: Message['data']) => void;
+    onPortDisconnectHandler: () => void;
+}): Promise<chrome.runtime.Port>;

package/utils/portUtils.js

@@ -0,0 +1,43 @@
+import { chrome } from '@polkadot/extension-inject/chrome';
+export function setupPort(portName, onMessageHandler, onDisconnectHandler) {
+    const port = chrome.runtime.connect({ name: portName });
+    port.onMessage.addListener(onMessageHandler);
+    port.onDisconnect.addListener(() => {
+        console.log(`Disconnected from ${portName}`);
+        onDisconnectHandler();
+    });
+    return port;
+}
+export async function wakeUpServiceWorker() {
+    return new Promise((resolve, reject) => {
+        chrome.runtime.sendMessage({ type: 'wakeup' }, (response) => {
+            if (chrome.runtime.lastError) {
+                reject(new Error(chrome.runtime.lastError.message));
+            }
+            else {
+                resolve(response);
+            }
+        });
+    });
+}
+export const wakeUpServiceWorkerWrapper = { wakeUpServiceWorker };
+export async function ensurePortConnection(portRef, portConfig) {
+    const maxAttempts = 5;
+    const delayMs = 1000;
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        try {
+            const response = await wakeUpServiceWorkerWrapper.wakeUpServiceWorker();
+            if (response?.status === 'awake') {
+                if (!portRef) {
+                    return setupPort(portConfig.portName, portConfig.onPortMessageHandler, portConfig.onPortDisconnectHandler);
+                }
+                return portRef;
+            }
+        }
+        catch (error) {
+            console.error(`Attempt ${attempt + 1} failed: ${error.message}`);
+            await new Promise((resolve) => setTimeout(resolve, delayMs));
+        }
+    }
+    throw new Error('Failed to wake up the service worker and setup the port after multiple attempts');
+}