@kheopskit/core 0.0.21 → 0.0.22

package/dist/index.mjs

@@ -1,3 +1,22 @@
+// src/api/config.ts
+var DEFAULT_CONFIG = {
+  autoReconnect: true,
+  platforms: ["polkadot"],
+  debug: false
+};
+var resolveConfig = (config) => {
+  return Object.assign({}, DEFAULT_CONFIG, config);
+};
+
+// src/api/kheopskit.ts
+import {
+  combineLatest as combineLatest8,
+  map as map9,
+  Observable as Observable8,
+  shareReplay as shareReplay8,
+  throttleTime
+} from "rxjs";
+
 // src/utils/logObservable.ts
 import { tap } from "rxjs";
 var logObservable = (label, opts) => tap((value) => {
@@ -8,14 +27,8 @@ var logObservable = (label, opts) => tap((value) => {
   else console.debug(text);
 });
 
-// src/api/kheopskit.ts
-import {
-  Observable as Observable8,
-  combineLatest as combineLatest8,
-  map as map9,
-  shareReplay as shareReplay8,
-  throttleTime
-} from "rxjs";
+// src/api/accounts.ts
+import { combineLatest as combineLatest3, map as map4, Observable as Observable3, of as of3, shareReplay as shareReplay3 } from "rxjs";
 
 // src/utils/sortAccounts.ts
 var sortAccounts = (a1, a2) => {
@@ -41,8 +54,22 @@ var sortAccounts = (a1, a2) => {
   return 0;
 };
 
-// src/api/accounts.ts
-import { Observable as Observable3, combineLatest as combineLatest3, map as map4, of as of3, shareReplay as shareReplay3 } from "rxjs";
+// src/api/ethereum/accounts.ts
+import {
+  combineLatest,
+  distinctUntilChanged,
+  map as map2,
+  Observable,
+  of,
+  ReplaySubject,
+  shareReplay,
+  switchMap
+} from "rxjs";
+import {
+  createWalletClient,
+  custom,
+  getAddress
+} from "viem";
 
 // src/utils/createStore.ts
 import { BehaviorSubject, filter, fromEvent, map } from "rxjs";
@@ -101,6 +128,9 @@ var isValidAddress = (address) => {
   return address.startsWith("0x") ? isEthereumAddress(address) : isSs58Address(address);
 };
 
+// src/utils/isWalletPlatform.ts
+var isWalletPlatform = (platform) => typeof platform === "string" && ["polkadot", "ethereum"].includes(platform);
+
 // src/utils/WalletAccountId.ts
 var getWalletAccountId = (walletId, address) => {
   if (!walletId) throw new Error("Missing walletId");
@@ -108,9 +138,6 @@ var getWalletAccountId = (walletId, address) => {
   return `${walletId}::${address}`;
 };
 
-// src/utils/isWalletPlatform.ts
-var isWalletPlatform = (platform) => typeof platform === "string" && ["polkadot", "ethereum"].includes(platform);
-
 // src/utils/getCachedObservable.ts
 var CACHE = /* @__PURE__ */ new Map();
 var getCachedObservable$ = (key, create) => {
@@ -119,21 +146,6 @@ var getCachedObservable$ = (key, create) => {
 };
 
 // src/api/ethereum/accounts.ts
-import {
-  Observable,
-  ReplaySubject,
-  combineLatest,
-  distinctUntilChanged,
-  map as map2,
-  of,
-  shareReplay,
-  switchMap
-} from "rxjs";
-import {
-  createWalletClient,
-  custom,
-  getAddress
-} from "viem";
 var getInjectedWalletAccounts$ = (wallet) => {
   if (!wallet.isConnected) return of([]);
   return getCachedObservable$(
@@ -207,7 +219,7 @@ var getAppKitAccounts$ = (wallet) => {
           (caipNetworkId) => custom(
             wrapWalletConnectProvider(
               provider,
-              // biome-ignore lint/style/noNonNullAssertion: <explanation>
+              // biome-ignore lint/style/noNonNullAssertion: legacy
               provider.session.topic,
               caipNetworkId
             )
@@ -268,10 +280,10 @@ import {
   getPolkadotSignerFromPjs
 } from "polkadot-api/pjs-signer";
 import {
-  Observable as Observable2,
   combineLatest as combineLatest2,
   distinctUntilChanged as distinctUntilChanged2,
   map as map3,
+  Observable as Observable2,
   of as of2,
   shareReplay as shareReplay2,
   switchMap as switchMap2
@@ -408,15 +420,19 @@ var getAccounts$ = (config, wallets) => {
   }).pipe(shareReplay3({ refCount: true, bufferSize: 1 }));
 };
 
-// src/api/config.ts
-var DEFAULT_CONFIG = {
-  autoReconnect: true,
-  platforms: ["polkadot"],
-  debug: false
-};
-var resolveConfig = (config) => {
-  return Object.assign({}, DEFAULT_CONFIG, config);
-};
+// src/api/wallets.ts
+import {
+  combineLatest as combineLatest7,
+  distinct,
+  filter as filter2,
+  map as map8,
+  mergeMap,
+  Observable as Observable7,
+  of as of5,
+  shareReplay as shareReplay7,
+  startWith,
+  take
+} from "rxjs";
 
 // src/utils/sortWallets.ts
 var sortWallets = (w1, w2) => {
@@ -428,19 +444,19 @@ var sortWallets = (w1, w2) => {
   return w1.name.localeCompare(w2.name);
 };
 
-// src/api/wallets.ts
+// src/api/ethereum/wallets.ts
+import { createStore as createStore2 } from "mipd";
 import {
-  Observable as Observable7,
-  combineLatest as combineLatest7,
-  distinct,
-  filter as filter2,
-  map as map8,
-  mergeMap as mergeMap2,
-  of as of6,
-  shareReplay as shareReplay7,
-  take
+  BehaviorSubject as BehaviorSubject3,
+  combineLatest as combineLatest5,
+  map as map6,
+  Observable as Observable5,
+  shareReplay as shareReplay5
 } from "rxjs";
 
+// src/api/store.ts
+import { uniq } from "lodash";
+
 // src/utils/WalletId.ts
 var getWalletId = (platform, identifier) => {
   if (!isWalletPlatform(platform)) throw new Error("Invalid platform");
@@ -456,7 +472,6 @@ var parseWalletId = (walletId) => {
 };
 
 // src/api/store.ts
-import { uniq } from "lodash";
 var LOCAL_STORAGE_KEY = "kheopskit";
 var DEFAULT_SETTINGS = {};
 var storage = createStore(LOCAL_STORAGE_KEY, DEFAULT_SETTINGS);
@@ -481,24 +496,14 @@ var store = {
   removeEnabledWalletId
 };
 
-// src/api/ethereum/wallets.ts
-import { createStore as createStore2 } from "mipd";
-import {
-  BehaviorSubject as BehaviorSubject3,
-  Observable as Observable5,
-  combineLatest as combineLatest5,
-  map as map6,
-  shareReplay as shareReplay5
-} from "rxjs";
-
 // src/api/appKit.ts
 import { createAppKit } from "@reown/appkit/core";
 import {
   BehaviorSubject as BehaviorSubject2,
-  Observable as Observable4,
   combineLatest as combineLatest4,
   distinctUntilChanged as distinctUntilChanged3,
   map as map5,
+  Observable as Observable4,
   of as of4,
   shareReplay as shareReplay4
 } from "rxjs";
@@ -666,6 +671,21 @@ var getEthereumWallets$ = (config) => {
   }).pipe(shareReplay5({ refCount: true, bufferSize: 1 }));
 };
 
+// src/api/polkadot/wallets.ts
+import { isEqual } from "lodash";
+import {
+  connectInjectedExtension,
+  getInjectedExtensions
+} from "polkadot-api/pjs-signer";
+import {
+  BehaviorSubject as BehaviorSubject4,
+  combineLatest as combineLatest6,
+  distinctUntilChanged as distinctUntilChanged4,
+  map as map7,
+  Observable as Observable6,
+  shareReplay as shareReplay6
+} from "rxjs";
+
 // src/utils/polkadotExtensions.ts
 var POLKADOT_EXTENSIONS = {
   talisman: {
@@ -687,23 +707,29 @@ var POLKADOT_EXTENSIONS = {
 };
 
 // src/api/polkadot/wallets.ts
-import { isEqual } from "lodash";
-import {
-  connectInjectedExtension,
-  getInjectedExtensions
-} from "polkadot-api/pjs-signer";
-import {
-  BehaviorSubject as BehaviorSubject4,
-  Observable as Observable6,
-  combineLatest as combineLatest6,
-  distinctUntilChanged as distinctUntilChanged4,
-  map as map7,
-  mergeMap,
-  of as of5,
-  shareReplay as shareReplay6,
-  timer
-} from "rxjs";
 var getInjectedWalletsIds = () => getInjectedExtensions().map((name) => getWalletId("polkadot", name));
+var createWalletIdsPoller$ = () => {
+  return new Observable6((subscriber) => {
+    subscriber.next(getInjectedWalletsIds());
+    const intervals = [100, 200, 300, 500];
+    let index = 0;
+    const poll = () => {
+      subscriber.next(getInjectedWalletsIds());
+      if (index < intervals.length) {
+        const delay = intervals[index++];
+        setTimeout(poll, delay);
+      }
+    };
+    if (intervals.length > 0) {
+      setTimeout(poll, intervals[index++] ?? 100);
+    }
+    return () => {
+    };
+  }).pipe(
+    distinctUntilChanged4(isEqual),
+    shareReplay6({ refCount: true, bufferSize: 1 })
+  );
+};
 var polkadotInjectedWallets$ = new Observable6((subscriber) => {
   const enabledExtensions$ = new BehaviorSubject4(/* @__PURE__ */ new Map());
   const connect = async (walletId) => {
@@ -724,11 +750,7 @@ var polkadotInjectedWallets$ = new Observable6((subscriber) => {
     enabledExtensions$.next(newMap);
     store.removeEnabledWalletId(walletId);
   };
-  const walletIds$ = of5(0, 200, 500, 1e3).pipe(
-    mergeMap((time) => timer(time)),
-    map7(() => getInjectedWalletsIds()),
-    distinctUntilChanged4(isEqual)
-  );
+  const walletIds$ = createWalletIdsPoller$();
   const subscription = combineLatest6([walletIds$, enabledExtensions$]).pipe(
     map7(([walletIds, enabledExtensions]) => {
       return walletIds.map((id) => {
@@ -795,23 +817,28 @@ var getWallets$ = (config) => {
       }
     );
     const wallets$ = observables.length ? combineLatest7(observables).pipe(
-      map8((wallets) => wallets.flat().sort(sortWallets))
-    ) : of6([]);
+      map8((wallets) => wallets.flat().sort(sortWallets)),
+      // Emit empty array immediately so UI doesn't wait
+      startWith([])
+    ) : of5([]);
+    const reconnectingWallets = /* @__PURE__ */ new Set();
     const subAutoReconnect = combineLatest7([wallets$, autoReconnectWalletIds$]).pipe(
       filter2(([, walletIds]) => config.autoReconnect && !!walletIds?.length),
-      mergeMap2(
+      mergeMap(
         ([wallets, walletIds]) => wallets.filter((wallet) => walletIds?.includes(wallet.id))
       ),
       distinct((w) => w.id)
     ).subscribe(async (wallet) => {
-      if (wallet.isConnected) {
-        console.warn("Wallet %s already connected", wallet.id);
+      if (wallet.isConnected || reconnectingWallets.has(wallet.id)) {
         return;
       }
+      reconnectingWallets.add(wallet.id);
       try {
         await wallet.connect();
       } catch (err) {
         console.error("Failed to reconnect wallet %s", wallet.id, { err });
+      } finally {
+        reconnectingWallets.delete(wallet.id);
       }
     });
     const subWallets = wallets$.subscribe(subscriber);
@@ -836,7 +863,8 @@ var getKheopskit$ = (config) => {
       subscription.unsubscribe();
     };
   }).pipe(
-    throttleTime(50, void 0, { leading: true, trailing: true }),
+    throttleTime(16, void 0, { leading: true, trailing: true }),
+    // ~1 frame at 60fps
     logObservable("kheopskit$", { enabled: kc.debug, printValue: true }),
     shareReplay8({ bufferSize: 1, refCount: true })
   );