@dubsdotapp/expo 0.2.22 → 0.2.24

package/dist/index.mjs

@@ -456,7 +456,8 @@ var DubsClient = class {
 var STORAGE_KEYS = {
   MWA_AUTH_TOKEN: "dubs_mwa_auth_token",
   JWT_TOKEN: "dubs_jwt_token",
-  PHANTOM_SESSION: "dubs_phantom_session"
+  PHANTOM_SESSION: "dubs_phantom_session",
+  PHANTOM_CONNECT_IN_FLIGHT: "dubs_phantom_connect_in_flight"
 };
 function createSecureStoreStorage() {
   let SecureStore = null;
@@ -494,7 +495,7 @@ import { Connection as Connection2 } from "@solana/web3.js";
 
 // src/managed-wallet.tsx
 import { createContext, useContext, useState, useEffect, useRef, useCallback } from "react";
-import { Platform as Platform2 } from "react-native";
+import { Platform } from "react-native";
 
 // src/wallet/mwa-adapter.ts
 import { PublicKey } from "@solana/web3.js";
@@ -633,6 +634,7 @@ var DeeplinkHandler = class {
   constructor(redirectBase) {
     this.pending = /* @__PURE__ */ new Map();
     this.subscription = null;
+    this._coldStartUrl = null;
     this.redirectBase = redirectBase.replace(/\/+$/, "");
     console.log(TAG, "Created with redirectBase:", this.redirectBase);
   }
@@ -742,9 +744,16 @@ var DeeplinkHandler = class {
       this.pending.delete(id);
       req.resolve({ params });
     } else {
-      console.log(TAG, "No pending requests to resolve \u2014 redirect may have arrived late");
+      console.log(TAG, "No pending requests to resolve \u2014 stashing as cold-start URL");
+      this._coldStartUrl = url;
     }
   }
+  /** Return and clear the stashed cold-start URL (if any). */
+  getColdStartUrl() {
+    const url = this._coldStartUrl;
+    this._coldStartUrl = null;
+    return url;
+  }
   /** Extract the request ID from the dubs_rid query parameter. */
   extractRequestId(url) {
     try {
@@ -836,6 +845,18 @@ var PhantomDeeplinkAdapter = class {
       redirect_link: redirectLink,
       app_url: appUrl
     });
+    if (this.config.storage) {
+      console.log(TAG2, "Saving in-flight connect state to storage");
+      await this.config.storage.setItem(
+        STORAGE_KEYS.PHANTOM_CONNECT_IN_FLIGHT,
+        JSON.stringify({
+          dappPublicKey: dappPubBase58,
+          dappSecretKey: bs582.encode(this._dappKeyPair.secretKey),
+          requestId,
+          createdAt: Date.now()
+        })
+      );
+    }
     const url = `https://phantom.app/ul/v1/connect?${params.toString()}`;
     console.log(TAG2, "Opening Phantom connect deeplink...");
     const response = await this.handler.send(url, requestId, this.timeout);
@@ -863,6 +884,8 @@ var PhantomDeeplinkAdapter = class {
     this._connected = true;
     console.log(TAG2, "Connected! Wallet:", this._publicKey.toBase58());
     this.config.onSessionChange?.(this.getSession());
+    this.config.storage?.deleteItem(STORAGE_KEYS.PHANTOM_CONNECT_IN_FLIGHT).catch(() => {
+    });
   }
   disconnect() {
     console.log(TAG2, "disconnect() \u2014 clearing state, was connected:", this._connected, "wallet:", this._publicKey?.toBase58());
@@ -875,6 +898,73 @@ var PhantomDeeplinkAdapter = class {
     this.config.onSessionChange?.(null);
     console.log(TAG2, "Disconnected");
   }
+  /**
+   * Return and clear the stashed cold-start URL from the deeplink handler.
+   * Used by ManagedWalletProvider to detect an in-flight connect on cold start.
+   */
+  consumeColdStartUrl() {
+    return this.handler.getColdStartUrl();
+  }
+  /**
+   * Complete a connect flow that was interrupted by the OS killing the app (Android).
+   * Loads the saved in-flight keypair from storage, decrypts the Phantom response
+   * from the cold-start URL, and restores the session.
+   */
+  async completeConnectFromColdStart(url) {
+    if (!this.config.storage) {
+      throw new Error("Cannot recover cold-start connect: no storage configured");
+    }
+    console.log(TAG2, "completeConnectFromColdStart() \u2014 attempting recovery");
+    const raw = await this.config.storage.getItem(STORAGE_KEYS.PHANTOM_CONNECT_IN_FLIGHT);
+    if (!raw) {
+      throw new Error("No in-flight connect state found in storage");
+    }
+    const inFlight = JSON.parse(raw);
+    const age = Date.now() - inFlight.createdAt;
+    if (age > 12e4) {
+      console.log(TAG2, `In-flight state expired (${Math.round(age / 1e3)}s old), clearing`);
+      await this.config.storage.deleteItem(STORAGE_KEYS.PHANTOM_CONNECT_IN_FLIGHT).catch(() => {
+      });
+      throw new Error("In-flight connect state expired");
+    }
+    console.log(TAG2, `In-flight state age: ${Math.round(age / 1e3)}s, requestId: ${inFlight.requestId}`);
+    this._dappKeyPair = {
+      publicKey: bs582.decode(inFlight.dappPublicKey),
+      secretKey: bs582.decode(inFlight.dappSecretKey)
+    };
+    const parsed = new URL(url);
+    const params = {};
+    parsed.searchParams.forEach((value, key) => {
+      params[key] = value;
+    });
+    if (params.errorCode) {
+      const errorMessage = params.errorMessage ? decodeURIComponent(params.errorMessage) : `Phantom error code: ${params.errorCode}`;
+      await this.config.storage.deleteItem(STORAGE_KEYS.PHANTOM_CONNECT_IN_FLIGHT).catch(() => {
+      });
+      throw new Error(errorMessage);
+    }
+    const phantomPubBase58 = params.phantom_encryption_public_key;
+    if (!phantomPubBase58) {
+      await this.config.storage.deleteItem(STORAGE_KEYS.PHANTOM_CONNECT_IN_FLIGHT).catch(() => {
+      });
+      throw new Error("Phantom did not return an encryption public key");
+    }
+    console.log(TAG2, "Cold-start: Phantom public key:", phantomPubBase58);
+    this._phantomPublicKey = bs582.decode(phantomPubBase58);
+    this._sharedSecret = deriveSharedSecret(
+      this._dappKeyPair.secretKey,
+      this._phantomPublicKey
+    );
+    const data = decryptPayload(params.data, params.nonce, this._sharedSecret);
+    console.log(TAG2, "Cold-start: Decrypted connect data \u2014 public_key:", data.public_key);
+    this._sessionToken = data.session;
+    this._publicKey = new PublicKey2(data.public_key);
+    this._connected = true;
+    console.log(TAG2, "Cold-start recovery complete! Wallet:", this._publicKey.toBase58());
+    this.config.onSessionChange?.(this.getSession());
+    await this.config.storage.deleteItem(STORAGE_KEYS.PHANTOM_CONNECT_IN_FLIGHT).catch(() => {
+    });
+  }
   async signTransaction(transaction) {
     this.assertConnected();
     console.log(TAG2, "signTransaction() \u2014 serializing transaction");
@@ -963,53 +1053,6 @@ var PhantomDeeplinkAdapter = class {
   }
 };
 
-// src/utils/device.ts
-import { Platform } from "react-native";
-function isSolanaSeeker() {
-  try {
-    const Device = __require("expo-device");
-    return Device.brand?.toLowerCase() === "solanamobile";
-  } catch {
-    return false;
-  }
-}
-async function getDeviceInfo() {
-  try {
-    const Device = __require("expo-device");
-    return {
-      platform: Platform.OS,
-      modelName: Device.modelName,
-      brand: Device.brand,
-      manufacturer: Device.manufacturer,
-      osName: Device.osName,
-      osVersion: Device.osVersion,
-      deviceType: Device.deviceType,
-      deviceName: Device.deviceName,
-      totalMemory: Device.totalMemory,
-      modelId: Device.modelId,
-      designName: Device.designName,
-      productName: Device.productName,
-      isDevice: Device.isDevice
-    };
-  } catch {
-    return {
-      platform: Platform.OS,
-      modelName: null,
-      brand: null,
-      manufacturer: null,
-      osName: null,
-      osVersion: null,
-      deviceType: null,
-      deviceName: null,
-      totalMemory: null,
-      modelId: null,
-      designName: null,
-      productName: null,
-      isDevice: null
-    };
-  }
-}
-
 // src/ui/ConnectWalletScreen.tsx
 import {
   View,
@@ -1197,6 +1240,7 @@ function getOrCreatePhantomAdapter(config) {
       redirectUri: config.redirectUri,
       appUrl: config.appUrl,
       cluster: config.cluster,
+      storage: config.storage,
       onSessionChange: (session) => {
         if (session) {
           console.log(TAG3, "Phantom session changed \u2014 saving to storage, wallet:", session.walletPublicKey);
@@ -1234,9 +1278,8 @@ function ManagedWalletProvider({
   const [connecting, setConnecting] = useState(false);
   const [isReady, setIsReady] = useState(false);
   const [error, setError] = useState(null);
-  const seeker = Platform2.OS === "android" && isSolanaSeeker();
-  const usePhantom = !seeker && !!redirectUri;
-  console.log(TAG3, `Platform: ${Platform2.OS}, seeker: ${seeker}, redirectUri: ${redirectUri ? "provided" : "not set"}, usePhantom: ${usePhantom}`);
+  const usePhantom = Platform.OS === "ios" && !!redirectUri;
+  console.log(TAG3, `Platform: ${Platform.OS}, redirectUri: ${redirectUri ? "provided" : "not set"}, usePhantom: ${usePhantom}`);
   const adapterRef = useRef(null);
   const transactRef = useRef(null);
   if (!adapterRef.current) {
@@ -1286,6 +1329,21 @@ function ManagedWalletProvider({
           }
           return;
         }
+        const coldStartUrl = phantom.consumeColdStartUrl();
+        if (coldStartUrl) {
+          try {
+            console.log(TAG3, "Cold-start URL detected, attempting recovery");
+            await phantom.completeConnectFromColdStart(coldStartUrl);
+            if (!cancelled) {
+              console.log(TAG3, "Cold-start recovery succeeded");
+              setConnected(true);
+              setIsReady(true);
+            }
+            return;
+          } catch (err) {
+            console.log(TAG3, "Cold-start recovery failed:", err instanceof Error ? err.message : err);
+          }
+        }
         try {
           const savedSession = await storage.getItem(STORAGE_KEYS.PHANTOM_SESSION);
           if (savedSession && !cancelled) {
@@ -1377,6 +1435,8 @@ function ManagedWalletProvider({
     });
     await storage.deleteItem(STORAGE_KEYS.JWT_TOKEN).catch(() => {
     });
+    await storage.deleteItem(STORAGE_KEYS.PHANTOM_CONNECT_IN_FLIGHT).catch(() => {
+    });
     setConnected(false);
     console.log(TAG3, "disconnect() \u2014 done");
   }, [adapter, storage, usePhantom]);
@@ -1792,6 +1852,53 @@ import bs583 from "bs58";
 import { createContext as createContext2 } from "react";
 var AuthContext = createContext2(null);
 
+// src/utils/device.ts
+import { Platform as Platform2 } from "react-native";
+function isSolanaSeeker() {
+  try {
+    const Device = __require("expo-device");
+    return Device.brand?.toLowerCase() === "solanamobile";
+  } catch {
+    return false;
+  }
+}
+async function getDeviceInfo() {
+  try {
+    const Device = __require("expo-device");
+    return {
+      platform: Platform2.OS,
+      modelName: Device.modelName,
+      brand: Device.brand,
+      manufacturer: Device.manufacturer,
+      osName: Device.osName,
+      osVersion: Device.osVersion,
+      deviceType: Device.deviceType,
+      deviceName: Device.deviceName,
+      totalMemory: Device.totalMemory,
+      modelId: Device.modelId,
+      designName: Device.designName,
+      productName: Device.productName,
+      isDevice: Device.isDevice
+    };
+  } catch {
+    return {
+      platform: Platform2.OS,
+      modelName: null,
+      brand: null,
+      manufacturer: null,
+      osName: null,
+      osVersion: null,
+      deviceType: null,
+      deviceName: null,
+      totalMemory: null,
+      modelId: null,
+      designName: null,
+      productName: null,
+      isDevice: null
+    };
+  }
+}
+
 // src/hooks/useAuth.ts
 function useAuth() {
   const sharedAuth = useContext2(AuthContext);