@sundaeswap/wallet-lite 0.0.87 → 0.0.88-dev.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundaeswap/wallet-lite",
-  "version": "0.0.87",
+  "version": "0.0.88-dev.0",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -22,7 +22,7 @@
     "LICENSE.md"
   ],
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.0.0"
   },
   "scripts": {
     "clean": "rm -rf ./dist",
@@ -32,7 +32,8 @@
     "build": "bun clean && bun types && bun build:esm && bun build:cjs && bun set-cjs",
     "watch": "bun clean && bun run build && bun build:esm --watch",
     "set-cjs": "echo '{ \"type\": \"commonjs\" }' > ./dist/cjs/package.json",
-    "version": "standard-version"
+    "version": "standard-version",
+    "version:canary": "standard-version --prerelease dev"
   },
   "dependencies": {
     "@babel/cli": "^7.24.7",

package/src/classes/WalletObserver.class.ts

@@ -215,6 +215,7 @@ export class WalletObserver<
    */
   syncApi = async (
     activeWallet?: string,
+    abortSignal?: AbortSignal,
   ): Promise<Cip30WalletApi | undefined> => {
     if (!activeWallet && !this.activeWallet) {
       throw new Error(
@@ -227,6 +228,10 @@ export class WalletObserver<
     let attempts = 0;
     let shouldContinue = true;
 
+    abortSignal?.addEventListener("abort", () => {
+      shouldContinue = false;
+    });
+
     while (shouldContinue) {
       if (attempts === 10) {
         throw new Error(
@@ -237,11 +242,6 @@ export class WalletObserver<
       try {
         const cardano = window?.cardano || window?.parent?.cardano;
         const api = await cardano?.[selectedWallet]?.enable();
-
-        if (!api) {
-          throw Error;
-        }
-
         this.api = api;
         this.network = await api.getNetworkId();
         shouldContinue = false;
@@ -250,6 +250,7 @@ export class WalletObserver<
           [
             "user canceled connection",
             "User declined to sign the data.",
+            "Attempt to connect timed out after 10 seconds",
           ].includes((e as Error)?.message) ||
           (e as ApiError)?.code === APIErrorCode.Refused
         ) {
@@ -284,67 +285,76 @@ export class WalletObserver<
    */
   connectWallet = async (
     extension: string,
+    abortSignal?: AbortSignal,
   ): Promise<IWalletObserverSync<AssetMetadata> | Error> => {
     const start = performance.now();
     this.dispatch(EWalletObserverEvents.CONNECT_WALLET_START);
 
-    let attempts = 0;
-    let extensionObject = window.cardano?.[extension];
+    try {
+      let attempts = 0;
+      let extensionObject = window.cardano?.[extension];
 
-    // Disconnect any CIP45 connections.
-    if (!extension?.includes("p2p")) {
-      this.peerConnectInstance?.shutdownServer();
-    }
+      // Disconnect any CIP45 connections.
+      if (!extension?.includes("p2p")) {
+        this.peerConnectInstance?.shutdownServer();
+      }
+
+      while (typeof extensionObject === "undefined") {
+        if (attempts === 40) {
+          break;
+        }
 
-    while (typeof extensionObject === "undefined") {
-      if (attempts === 40) {
-        break;
+        await new Promise((res) =>
+          setTimeout(res, (this._options.connectTimeout as number) / 40),
+        );
+        extensionObject = window.cardano?.[extension];
+        attempts++;
       }
 
-      await new Promise((res) =>
-        setTimeout(res, (this._options.connectTimeout as number) / 40),
-      );
-      extensionObject = window.cardano?.[extension];
-      attempts++;
-    }
+      if (!extensionObject) {
+        throw new Error("Wallet extension not found in the global context.");
+      }
 
-    if (!extensionObject) {
-      this.dispatch(EWalletObserverEvents.CONNECT_WALLET_END);
-      throw new Error("Wallet extension not found in the global context.");
-    }
+      this.activeWallet = extension;
+      const api = await this.syncApi(extension, abortSignal);
+      if (!api) {
+        throw new Error("API could not be found.");
+      }
 
-    this.activeWallet = extension;
-    await this.syncApi(extension);
-    const data = await this.sync();
+      const data = await this.sync();
 
-    if (this._options.persistence) {
-      if (data.usedAddresses instanceof Error) {
-        data.usedAddresses.cause =
-          "Could not get a list of used addresses from the wallet when trying to save the connection.";
-        throw data.usedAddresses;
+      if (this._options.persistence) {
+        if (data.usedAddresses instanceof Error) {
+          data.usedAddresses.cause =
+            "Could not get a list of used addresses from the wallet when trying to save the connection.";
+          throw data.usedAddresses;
+        }
+
+        const seed: IWalletObserverSeed = {
+          activeWallet: extension,
+          mainAddress: data.usedAddresses[0],
+        };
+
+        window.localStorage.setItem(
+          WalletObserver.PERSISTENCE_CACHE_KEY,
+          JSON.stringify(seed),
+        );
       }
 
-      const seed: IWalletObserverSeed = {
+      this.dispatch(EWalletObserverEvents.CONNECT_WALLET_END, {
+        ...data,
         activeWallet: extension,
-        mainAddress: data.usedAddresses[0],
-      };
-
-      window.localStorage.setItem(
-        WalletObserver.PERSISTENCE_CACHE_KEY,
-        JSON.stringify(seed),
-      );
-    }
+      });
+      const end = performance.now();
+      if (this._options.debug) {
+        console.log(`connectWallet: ${end - start}ms`);
+      }
 
-    this.dispatch(EWalletObserverEvents.CONNECT_WALLET_END, {
-      ...data,
-      activeWallet: extension,
-    });
-    const end = performance.now();
-    if (this._options.debug) {
-      console.log(`connectWallet: ${end - start}ms`);
+      return data;
+    } catch (e) {
+      this.dispatch(EWalletObserverEvents.CONNECT_WALLET_END);
+      throw e;
     }
-
-    return data;
   };
 
   getCip45Instance = async () => {

package/src/classes/__tests__/WalletObserver.test.ts

@@ -11,6 +11,7 @@ import {
   EWalletObserverEvents,
   TMetadataResolverFunc,
   TWalletObserverOptions,
+  WalletBalanceMap,
 } from "../../index.js";
 import * as getLibModules from "../../utils/getLibs.js";
 import { WalletObserver } from "../WalletObserver.class.js";
@@ -140,7 +141,7 @@ describe("WalletObserver", async () => {
       ).toBeNull();
       expect(observer.activeWallet).toEqual("eternl");
       expect(observer.api).toBeDefined();
-      expect(spiedOnSyncApi).toHaveBeenNthCalledWith(1, "eternl");
+      expect(spiedOnSyncApi).toHaveBeenNthCalledWith(1, "eternl", undefined);
 
       const syncResults = await observer.sync();
       expect(spiedDispatch).toHaveBeenNthCalledWith(
@@ -173,7 +174,12 @@ describe("WalletObserver", async () => {
         }),
       );
 
-      expect(syncResults.balanceMap.size).toEqual(assetIds.length);
+      expect(syncResults.balanceMap).toBeInstanceOf(
+        WalletBalanceMap<IAssetAmountMetadata>,
+      );
+      expect(
+        (syncResults.balanceMap as WalletBalanceMap<IAssetAmountMetadata>).size,
+      ).toEqual(assetIds.length);
       expect(syncResults.network).toBe(network);
       expect(syncResults.unusedAddresses).toEqual(unusedAddresses);
       expect(syncResults.usedAddresses).toEqual(usedAddresses);
@@ -192,11 +198,16 @@ describe("WalletObserver", async () => {
 
       expect(observer.activeWallet).toEqual("eternl");
       expect(observer.api).toBeDefined();
-      expect(spiedOnSyncApi).toHaveBeenNthCalledWith(1, "eternl");
+      expect(spiedOnSyncApi).toHaveBeenNthCalledWith(1, "eternl", undefined);
 
       const syncResults = await observer.sync();
 
-      expect(syncResults.balanceMap.size).toEqual(assetIds.length);
+      expect(syncResults.balanceMap).toBeInstanceOf(
+        WalletBalanceMap<IAssetAmountMetadata>,
+      );
+      expect(
+        (syncResults.balanceMap as WalletBalanceMap<IAssetAmountMetadata>).size,
+      ).toEqual(assetIds.length);
       expect(syncResults.network).toBe(network);
       expect(syncResults.unusedAddresses).toEqual(unusedAddresses);
       expect(syncResults.usedAddresses).toEqual(usedAddresses);

package/src/react-components/WalletObserverProvider/hooks/useWalletObserverState.ts

@@ -19,6 +19,7 @@ export const useWalletObserverState = <
 >(
   observer: WalletObserver<AssetMetadata>,
 ) => {
+  const [abortController] = useState(new AbortController());
   const [activeWallet, setActiveWallet] = useState<string>();
   const [adaBalance, setAdaBalance] = useState<AssetAmount<AssetMetadata>>(
     new AssetAmount<AssetMetadata>(0n),
@@ -59,7 +60,12 @@ export const useWalletObserverState = <
     setFeeAddress(undefined);
     setIsCip45(false);
     setWillAutoConnect(false);
-  }, [observer]);
+    abortController?.abort();
+  }, [observer, abortController]);
+
+  const cancelConnectWallet = useCallback(() => {
+    return abortController.abort();
+  }, [abortController]);
 
   const connectWallet = useCallback(
     async (wallet: string) => {
@@ -67,12 +73,12 @@ export const useWalletObserverState = <
         setSwitching(() => true);
       }
 
-      const data = await observer.connectWallet(wallet);
+      const data = await observer.connectWallet(wallet, abortController.signal);
       await syncWallet(data instanceof Error ? undefined : data);
       setSwitching(() => false);
       return observer.api;
     },
-    [observer, setSwitching],
+    [observer, setSwitching, abortController],
   );
 
   const syncWallet = useCallback(
@@ -201,6 +207,7 @@ export const useWalletObserverState = <
     balance,
     collateral,
     connectWallet,
+    cancelConnectWallet,
     disconnect,
     errorSyncing,
     feeAddress,

package/src/react-components/hooks/useWalletObserver.ts

@@ -29,6 +29,7 @@ export const useWalletObserver = <
       balance: state.balance,
       collateral: state.collateral,
       connectWallet: state.connectWallet,
+      cancelConnectWallet: state.cancelConnectWallet,
       disconnect: state.disconnect,
       errorSyncing: state.errorSyncing,
       feeAddress: state.feeAddress,
@@ -51,6 +52,7 @@ export const useWalletObserver = <
       state.balance.size,
       state.collateral,
       state.connectWallet,
+      state.cancelConnectWallet,
       state.disconnect,
       state.errorSyncing,
       state.feeAddress,