@pollar/core 0.9.0-rc.1 → 0.9.0-rc.2

package/dist/index.mjs

@@ -1171,7 +1171,7 @@ function defaultStorage(options = {}) {
 }
 
 // src/version.ts
-var POLLAR_CORE_VERSION = "0.9.0-rc.1" ;
+var POLLAR_CORE_VERSION = "0.9.0-rc.2" ;
 
 // src/visibility/noop.ts
 function createNoopVisibilityProvider() {
@@ -1343,7 +1343,10 @@ function openAlbedoPopup(url) {
 }
 function waitForAlbedoPopup() {
   return new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => reject(new Error("Albedo response timeout")), 2 * 60 * 1e3);
+    const timeout = setTimeout(() => {
+      window.removeEventListener("message", handler);
+      reject(new Error("Albedo response timeout"));
+    }, 2 * 60 * 1e3);
     function handler(event) {
       if (event.origin !== window.location.origin || event.data?.type !== "ALBEDO_RESULT") return;
       clearTimeout(timeout);
@@ -1353,24 +1356,6 @@ function waitForAlbedoPopup() {
     window.addEventListener("message", handler);
   });
 }
-function waitForAlbedoResult() {
-  return new Promise((resolve, reject) => {
-    const timeout = setTimeout(() => reject(new Error("Albedo response timeout")), 2 * 60 * 1e3);
-    const parseResult = () => {
-      const params = new URLSearchParams(window.location.search);
-      if (!params.has("pubkey") && !params.has("signed_envelope_xdr") && !params.has("signed_xdr")) return;
-      clearTimeout(timeout);
-      const result = {};
-      params.forEach((value, key) => {
-        result[key] = value;
-      });
-      window.history.replaceState({}, document.title, window.location.pathname);
-      resolve(result);
-    };
-    parseResult();
-    window.addEventListener("popstate", parseResult);
-  });
-}
 var AlbedoAdapter = class {
   /**
    * Network used for `connect` and `signAuthEntry` (which carry no per-call
@@ -1412,10 +1397,10 @@ var AlbedoAdapter = class {
     url.searchParams.set("xdr", xdr);
     url.searchParams.set("app_name", "Pollar");
     url.searchParams.set("network", albedoNetwork(options, this.network));
-    url.searchParams.set("callback", window.location.href);
+    url.searchParams.set("callback", `${window.location.origin}/albedo-callback`);
     url.searchParams.set("origin", window.location.origin);
-    window.location.href = url.toString();
-    const result = await waitForAlbedoResult();
+    openAlbedoPopup(url.toString());
+    const result = await waitForAlbedoPopup();
     if (!result.signed_envelope_xdr) throw new Error("Albedo signing rejected");
     return { signedTxXdr: result.signed_envelope_xdr };
   }
@@ -1425,10 +1410,10 @@ var AlbedoAdapter = class {
     url.searchParams.set("xdr", entryXdr);
     url.searchParams.set("app_name", "Pollar");
     url.searchParams.set("network", this.network);
-    url.searchParams.set("callback", window.location.href);
+    url.searchParams.set("callback", `${window.location.origin}/albedo-callback`);
     url.searchParams.set("origin", window.location.origin);
-    window.location.href = url.toString();
-    const result = await waitForAlbedoResult();
+    openAlbedoPopup(url.toString());
+    const result = await waitForAlbedoPopup();
     if (!result.signed_xdr) throw new Error("Albedo auth entry signing rejected");
     return { signedAuthEntry: result.signed_xdr };
   }
@@ -1511,8 +1496,8 @@ function isValidSession(value, logger = console) {
     return false;
   }
   const w = wallet;
-  if (w["type"] !== "custodial" && w["type"] !== "smart" && w["type"] !== "external") {
-    logger.debug("[PollarClient:session] Invalid session \u2014 wallet.type must be custodial|smart|external");
+  if (w["type"] !== "internal" && w["type"] !== "smart" && w["type"] !== "external") {
+    logger.debug("[PollarClient:session] Invalid session \u2014 wallet.type must be internal|smart|external");
     return false;
   }
   if (w["address"] !== null && !isBoundedString(w["address"], MAX_WALLET_PUBLIC_KEY)) {
@@ -1543,6 +1528,9 @@ async function readStorage(storage, apiKeyHash, logger = console) {
       if (w && w["address"] == null && typeof w["publicKey"] === "string") {
         w["address"] = w["publicKey"];
       }
+      if (w && w["type"] === "custodial") {
+        w["type"] = "internal";
+      }
     }
     if (!isValidSession(session, logger)) {
       await storage.remove(sessionStorageKey(apiKeyHash));
@@ -1643,16 +1631,12 @@ async function streamUntilFound(api, clientSessionId, check, retryDelayMs = 200,
     }
     const reader = data.getReader();
     const decoder = new TextDecoder();
-    let streamDone = false;
     let sawAnyChunk = false;
     try {
       while (true) {
         throwIfAborted(signal);
         const { done, value } = await reader.read();
-        if (done) {
-          streamDone = true;
-          break;
-        }
+        if (done) break;
         sawAnyChunk = true;
         const chunk = decoder.decode(value);
         for (const message of chunk.split("\n\n").filter(Boolean)) {
@@ -1680,8 +1664,7 @@ async function streamUntilFound(api, clientSessionId, check, retryDelayMs = 200,
     }
     if (sawAnyChunk) backoff = retryDelayMs;
     else backoff = Math.min(backoff * 2, MAX_BACKOFF_MS);
-    const delay = streamDone ? backoff : 0;
-    if (delay) await sleep(delay);
+    await sleep(backoff);
   }
 }
 async function pollUntilFound(baseUrl, clientSessionId, check, intervalMs = 500, signal, logger = console) {
@@ -1761,17 +1744,18 @@ async function authenticate(clientSessionId, deps, expectedWallet) {
     signal
   });
   if (data?.code === "SDK_LOGIN_SUCCESS" && isValidSession(data?.content, logger)) {
-    if (expectedWallet && data.content.data.providers.wallet?.address !== expectedWallet) {
+    const sessionWallet = data.content.data?.providers?.wallet?.address;
+    if (expectedWallet && sessionWallet !== expectedWallet) {
       setAuthState({
         step: "error",
         previousStep: "authenticating",
         message: "Wallet mismatch: session wallet does not match connected wallet",
         errorCode: AUTH_ERROR_CODES.WALLET_AUTH_FAILED
       });
-      clearSession();
+      await clearSession();
       return;
     }
-    storeSession(data.content);
+    await storeSession(data.content);
   } else {
     setAuthState({
       step: "error",
@@ -1779,7 +1763,7 @@ async function authenticate(clientSessionId, deps, expectedWallet) {
       message: "Failed to load session",
       errorCode: AUTH_ERROR_CODES.AUTH_FAILED
     });
-    clearSession();
+    await clearSession();
   }
 }
 
@@ -2095,7 +2079,7 @@ var PollarClient = class {
     this._visibilityProvider = config.visibilityProvider ?? defaultVisibilityProvider();
     this._maxIdleMs = config.maxIdleMs;
     this._openAuthUrl = config.openAuthUrl ?? defaultWebOAuthOpener;
-    this._oauthRedirectUri = config.oauthRedirectUri ?? (isBrowser ? window.location.origin : "");
+    this._oauthRedirectUri = config.oauthRedirectUri ?? (isBrowser ? window.location?.origin ?? "" : "");
     this._api = createApiClient(this.basePath);
     this._wireMiddlewares();
     this._networkState = { step: "connected", network: config.stellarNetwork ?? "testnet" };
@@ -3409,6 +3393,9 @@ var PollarClient = class {
       void this._resume();
     } else {
       this._log.info("[PollarClient] No session in storage");
+      if (this._authState.step !== "idle") {
+        await this._clearSession();
+      }
     }
   }
   /**
@@ -3455,8 +3442,11 @@ var PollarClient = class {
       user: session.user,
       // The wire response still carries the legacy `publicKey` alias (kept for
       // older SDKs); the persisted session standardizes on `address` only.
+      // The wire also still emits the legacy type `'custodial'` (unchanged for
+      // SDKs ≤0.8.x); we remap it to `'internal'` here so the SDK surface and
+      // persisted session speak one vocabulary while the wire stays compatible.
       wallet: {
-        type: w.type,
+        type: w.type === "custodial" ? "internal" : w.type,
         address: w.address ?? w.publicKey ?? null,
         ...w.existsOnStellar !== void 0 ? { existsOnStellar: w.existsOnStellar } : {},
         ...w.createdAt !== void 0 ? { createdAt: w.createdAt } : {},