@injectivelabs/wallet-trezor 1.17.2-alpha.1 → 1.17.2-alpha.10

package/dist/cjs/index.cjs

@@ -13,10 +13,14 @@ const TrezorDerivationPathType = {
 
 //#endregion
 //#region src/strategy/lib.ts
+let cachedTrezorConnect = null;
 async function loadTrezorConnect() {
-	var _default;
-	const module$1 = await import("@trezor/connect-web");
-	return (module$1 === null || module$1 === void 0 || (_default = module$1.default) === null || _default === void 0 ? void 0 : _default.default) || module$1.default;
+	if (!cachedTrezorConnect) {
+		var _default;
+		const module$1 = await import("@trezor/connect-web");
+		cachedTrezorConnect = (module$1 === null || module$1 === void 0 || (_default = module$1.default) === null || _default === void 0 ? void 0 : _default.default) || module$1.default;
+	}
+	return cachedTrezorConnect;
 }
 
 //#endregion
@@ -182,24 +186,54 @@ const TREZOR_CONNECT_MANIFEST = {
 	appUrl: "https://injectivelabs.org",
 	appName: "Injective Labs"
 };
-var BaseTrezorTransport = class {
+var BaseTrezorTransport = class BaseTrezorTransport {
 	constructor() {
 		_defineProperty(this, "accountManager", null);
 	}
 	async connect() {
+		if (BaseTrezorTransport.initPromise) return BaseTrezorTransport.initPromise;
+		if (BaseTrezorTransport.isInitialized) return Promise.resolve();
+		BaseTrezorTransport.initPromise = this.initializeTrezorConnect();
+		try {
+			await BaseTrezorTransport.initPromise;
+			BaseTrezorTransport.isInitialized = true;
+		} finally {
+			BaseTrezorTransport.initPromise = null;
+		}
+	}
+	async initializeTrezorConnect() {
 		const TrezorConnect = await loadTrezorConnect();
-		if (!(await TrezorConnect.getSettings()).success) await TrezorConnect.init({
-			lazyLoad: true,
-			coreMode: "popup",
-			manifest: TREZOR_CONNECT_MANIFEST
-		});
-		return Promise.resolve();
+		try {
+			await TrezorConnect.init({
+				manifest: TREZOR_CONNECT_MANIFEST,
+				coreMode: "popup",
+				interactionTimeout: 600
+			});
+		} catch (error) {
+			BaseTrezorTransport.isInitialized = false;
+			throw error;
+		}
 	}
 	async getAccountManager() {
 		if (!this.accountManager) this.accountManager = new AccountManager();
 		return this.accountManager;
 	}
+	/**
+	* Resets the initialization state. Call this if you need to reinitialize
+	* TrezorConnect (e.g., after a connection error or when switching contexts).
+	*/
+	static async reset() {
+		if (BaseTrezorTransport.isInitialized) {
+			var _TrezorConnect$dispos;
+			const TrezorConnect = await loadTrezorConnect();
+			await ((_TrezorConnect$dispos = TrezorConnect.dispose) === null || _TrezorConnect$dispos === void 0 ? void 0 : _TrezorConnect$dispos.call(TrezorConnect));
+			BaseTrezorTransport.isInitialized = false;
+			BaseTrezorTransport.initPromise = null;
+		}
+	}
 };
+_defineProperty(BaseTrezorTransport, "isInitialized", false);
+_defineProperty(BaseTrezorTransport, "initPromise", null);
 
 //#endregion
 //#region src/strategy/Eip1193Provider.ts
@@ -427,7 +461,9 @@ var TrezorBase = class extends __injectivelabs_wallet_base.BaseConcreteStrategy
 			await this.trezor.connect();
 			return (await (await this.trezor.getAccountManager()).getWallets(baseDerivationPath, derivationPathType)).map((k) => k.address);
 		} catch (e) {
-			throw new __injectivelabs_exceptions.TrezorException(new Error(e.message), {
+			const errorMessage = e.message || "Unknown error";
+			const message = errorMessage.includes("Initialize") || errorMessage.includes("Handshake") || errorMessage.includes("Init_") ? `Trezor connection failed: ${errorMessage}. Please ensure your Trezor device is connected, unlocked, and that pop-ups are allowed for this site.` : errorMessage;
+			throw new __injectivelabs_exceptions.TrezorException(new Error(message), {
 				code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 				type: __injectivelabs_exceptions.ErrorType.WalletError,
 				contextModule: __injectivelabs_wallet_base.WalletAction.GetAccounts
@@ -444,7 +480,9 @@ var TrezorBase = class extends __injectivelabs_wallet_base.BaseConcreteStrategy
 				baseDerivationPath: derivationPathType
 			}));
 		} catch (e) {
-			throw new __injectivelabs_exceptions.TrezorException(new Error(e.message), {
+			const errorMessage = e.message || "Unknown error";
+			const message = errorMessage.includes("Initialize") || errorMessage.includes("Handshake") || errorMessage.includes("Init_") ? `Trezor connection failed: ${errorMessage}. Please ensure your Trezor device is connected, unlocked, and that pop-ups are allowed for this site.` : errorMessage;
+			throw new __injectivelabs_exceptions.TrezorException(new Error(message), {
 				code: __injectivelabs_exceptions.UnspecifiedErrorCode,
 				type: __injectivelabs_exceptions.ErrorType.WalletError,
 				contextModule: __injectivelabs_wallet_base.WalletAction.GetAccounts

package/dist/esm/index.js

@@ -13,10 +13,14 @@ const TrezorDerivationPathType = {
 
 //#endregion
 //#region src/strategy/lib.ts
+let cachedTrezorConnect = null;
 async function loadTrezorConnect() {
-	var _default;
-	const module = await import("@trezor/connect-web");
-	return (module === null || module === void 0 || (_default = module.default) === null || _default === void 0 ? void 0 : _default.default) || module.default;
+	if (!cachedTrezorConnect) {
+		var _default;
+		const module = await import("@trezor/connect-web");
+		cachedTrezorConnect = (module === null || module === void 0 || (_default = module.default) === null || _default === void 0 ? void 0 : _default.default) || module.default;
+	}
+	return cachedTrezorConnect;
 }
 
 //#endregion
@@ -182,24 +186,54 @@ const TREZOR_CONNECT_MANIFEST = {
 	appUrl: "https://injectivelabs.org",
 	appName: "Injective Labs"
 };
-var BaseTrezorTransport = class {
+var BaseTrezorTransport = class BaseTrezorTransport {
 	constructor() {
 		_defineProperty(this, "accountManager", null);
 	}
 	async connect() {
+		if (BaseTrezorTransport.initPromise) return BaseTrezorTransport.initPromise;
+		if (BaseTrezorTransport.isInitialized) return Promise.resolve();
+		BaseTrezorTransport.initPromise = this.initializeTrezorConnect();
+		try {
+			await BaseTrezorTransport.initPromise;
+			BaseTrezorTransport.isInitialized = true;
+		} finally {
+			BaseTrezorTransport.initPromise = null;
+		}
+	}
+	async initializeTrezorConnect() {
 		const TrezorConnect = await loadTrezorConnect();
-		if (!(await TrezorConnect.getSettings()).success) await TrezorConnect.init({
-			lazyLoad: true,
-			coreMode: "popup",
-			manifest: TREZOR_CONNECT_MANIFEST
-		});
-		return Promise.resolve();
+		try {
+			await TrezorConnect.init({
+				manifest: TREZOR_CONNECT_MANIFEST,
+				coreMode: "popup",
+				interactionTimeout: 600
+			});
+		} catch (error) {
+			BaseTrezorTransport.isInitialized = false;
+			throw error;
+		}
 	}
 	async getAccountManager() {
 		if (!this.accountManager) this.accountManager = new AccountManager();
 		return this.accountManager;
 	}
+	/**
+	* Resets the initialization state. Call this if you need to reinitialize
+	* TrezorConnect (e.g., after a connection error or when switching contexts).
+	*/
+	static async reset() {
+		if (BaseTrezorTransport.isInitialized) {
+			var _TrezorConnect$dispos;
+			const TrezorConnect = await loadTrezorConnect();
+			await ((_TrezorConnect$dispos = TrezorConnect.dispose) === null || _TrezorConnect$dispos === void 0 ? void 0 : _TrezorConnect$dispos.call(TrezorConnect));
+			BaseTrezorTransport.isInitialized = false;
+			BaseTrezorTransport.initPromise = null;
+		}
+	}
 };
+_defineProperty(BaseTrezorTransport, "isInitialized", false);
+_defineProperty(BaseTrezorTransport, "initPromise", null);
 
 //#endregion
 //#region src/strategy/Eip1193Provider.ts
@@ -427,7 +461,9 @@ var TrezorBase = class extends BaseConcreteStrategy {
 			await this.trezor.connect();
 			return (await (await this.trezor.getAccountManager()).getWallets(baseDerivationPath, derivationPathType)).map((k) => k.address);
 		} catch (e) {
-			throw new TrezorException(new Error(e.message), {
+			const errorMessage = e.message || "Unknown error";
+			const message = errorMessage.includes("Initialize") || errorMessage.includes("Handshake") || errorMessage.includes("Init_") ? `Trezor connection failed: ${errorMessage}. Please ensure your Trezor device is connected, unlocked, and that pop-ups are allowed for this site.` : errorMessage;
+			throw new TrezorException(new Error(message), {
 				code: UnspecifiedErrorCode,
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.GetAccounts
@@ -444,7 +480,9 @@ var TrezorBase = class extends BaseConcreteStrategy {
 				baseDerivationPath: derivationPathType
 			}));
 		} catch (e) {
-			throw new TrezorException(new Error(e.message), {
+			const errorMessage = e.message || "Unknown error";
+			const message = errorMessage.includes("Initialize") || errorMessage.includes("Handshake") || errorMessage.includes("Init_") ? `Trezor connection failed: ${errorMessage}. Please ensure your Trezor device is connected, unlocked, and that pop-ups are allowed for this site.` : errorMessage;
+			throw new TrezorException(new Error(message), {
 				code: UnspecifiedErrorCode,
 				type: ErrorType.WalletError,
 				contextModule: WalletAction.GetAccounts

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@injectivelabs/wallet-trezor",
-  "version": "1.17.2-alpha.1",
+  "version": "1.17.2-alpha.10",
   "description": "Trezor wallet strategy for use with @injectivelabs/wallet-core.",
   "license": "Apache-2.0",
   "author": {
     "name": "InjectiveLabs",
     "email": "admin@injectivelabs.org"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/InjectiveLabs/injective-ts"
+  },
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -41,10 +45,10 @@
     "@trezor/connect": "^9.6.4",
     "@trezor/connect-web": "^9.6.4",
     "viem": "^2.41.2",
-    "@injectivelabs/sdk-ts": "1.17.2-alpha.1",
-    "@injectivelabs/wallet-base": "1.17.2-alpha.1",
-    "@injectivelabs/ts-types": "1.17.2-alpha.1",
-    "@injectivelabs/exceptions": "1.17.2-alpha.1"
+    "@injectivelabs/exceptions": "1.17.2-alpha.10",
+    "@injectivelabs/sdk-ts": "1.17.2-alpha.10",
+    "@injectivelabs/ts-types": "1.17.2-alpha.10",
+    "@injectivelabs/wallet-base": "1.17.2-alpha.10"
   },
   "publishConfig": {
     "access": "public"