@dubsdotapp/expo 0.2.22 → 0.2.24

package/dist/index.d.mts

@@ -430,6 +430,7 @@ declare const STORAGE_KEYS: {
     readonly MWA_AUTH_TOKEN: "dubs_mwa_auth_token";
     readonly JWT_TOKEN: "dubs_jwt_token";
     readonly PHANTOM_SESSION: "dubs_phantom_session";
+    readonly PHANTOM_CONNECT_IN_FLIGHT: "dubs_phantom_connect_in_flight";
 };
 /**
  * Creates a TokenStorage backed by expo-secure-store.
@@ -622,6 +623,8 @@ interface PhantomDeeplinkAdapterConfig {
     timeout?: number;
     /** Called when the Phantom session changes (save/clear for persistence) */
     onSessionChange?: (session: PhantomSession | null) => void;
+    /** Storage for persisting in-flight connect state (cold-start recovery on Android) */
+    storage?: TokenStorage;
 }
 /**
  * Phantom wallet adapter using deeplinks (works on iOS and Android).
@@ -649,6 +652,17 @@ declare class PhantomDeeplinkAdapter implements WalletAdapter {
     getSession(): PhantomSession | null;
     connect(): Promise<void>;
     disconnect(): void;
+    /**
+     * 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(): string | null;
+    /**
+     * 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.
+     */
+    completeConnectFromColdStart(url: string): Promise<void>;
     signTransaction(transaction: Transaction): Promise<Transaction>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
     /** Remove the Linking event listener. Call when the adapter is no longer needed. */

package/dist/index.d.ts

@@ -430,6 +430,7 @@ declare const STORAGE_KEYS: {
     readonly MWA_AUTH_TOKEN: "dubs_mwa_auth_token";
     readonly JWT_TOKEN: "dubs_jwt_token";
     readonly PHANTOM_SESSION: "dubs_phantom_session";
+    readonly PHANTOM_CONNECT_IN_FLIGHT: "dubs_phantom_connect_in_flight";
 };
 /**
  * Creates a TokenStorage backed by expo-secure-store.
@@ -622,6 +623,8 @@ interface PhantomDeeplinkAdapterConfig {
     timeout?: number;
     /** Called when the Phantom session changes (save/clear for persistence) */
     onSessionChange?: (session: PhantomSession | null) => void;
+    /** Storage for persisting in-flight connect state (cold-start recovery on Android) */
+    storage?: TokenStorage;
 }
 /**
  * Phantom wallet adapter using deeplinks (works on iOS and Android).
@@ -649,6 +652,17 @@ declare class PhantomDeeplinkAdapter implements WalletAdapter {
     getSession(): PhantomSession | null;
     connect(): Promise<void>;
     disconnect(): void;
+    /**
+     * 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(): string | null;
+    /**
+     * 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.
+     */
+    completeConnectFromColdStart(url: string): Promise<void>;
     signTransaction(transaction: Transaction): Promise<Transaction>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
     /** Remove the Linking event listener. Call when the adapter is no longer needed. */

package/dist/index.js

@@ -522,7 +522,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;
@@ -560,7 +561,7 @@ var import_web34 = require("@solana/web3.js");
 
 // src/managed-wallet.tsx
 var import_react = require("react");
-var import_react_native5 = require("react-native");
+var import_react_native4 = require("react-native");
 
 // src/wallet/mwa-adapter.ts
 var import_web3 = require("@solana/web3.js");
@@ -699,6 +700,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);
   }
@@ -808,9 +810,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 {
@@ -902,6 +911,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: import_bs582.default.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);
@@ -929,6 +950,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());
@@ -941,6 +964,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: import_bs582.default.decode(inFlight.dappPublicKey),
+      secretKey: import_bs582.default.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 = import_bs582.default.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 import_web32.PublicKey(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");
@@ -1029,58 +1119,11 @@ var PhantomDeeplinkAdapter = class {
   }
 };
 
-// src/utils/device.ts
-var import_react_native2 = require("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: import_react_native2.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: import_react_native2.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
-var import_react_native4 = require("react-native");
+var import_react_native3 = require("react-native");
 
 // src/ui/theme.ts
-var import_react_native3 = require("react-native");
+var import_react_native2 = require("react-native");
 var dark = {
   background: "#08080D",
   surface: "#111118",
@@ -1114,7 +1157,7 @@ var light = {
   errorBorder: "#FECACA"
 };
 function useDubsTheme() {
-  const scheme = (0, import_react_native3.useColorScheme)();
+  const scheme = (0, import_react_native2.useColorScheme)();
   return scheme === "light" ? light : dark;
 }
 function mergeTheme(base, overrides) {
@@ -1134,44 +1177,44 @@ function ConnectWalletScreen({
 }) {
   const t = useDubsTheme();
   const accent = accentColor || t.accent;
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.View, { style: [styles.container, { backgroundColor: t.background }], children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react_native4.View, { style: styles.content, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react_native4.View, { style: styles.brandingSection, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.View, { style: [styles.container, { backgroundColor: t.background }], children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react_native3.View, { style: styles.content, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react_native3.View, { style: styles.brandingSection, children: [
       appIcon ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        import_react_native4.Image,
+        import_react_native3.Image,
         {
           source: { uri: appIcon },
           style: styles.logoImage
         }
-      ) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.View, { style: [styles.logoCircle, { backgroundColor: accent }], children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.Text, { style: styles.logoText, children: appName.charAt(0).toUpperCase() }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.Text, { style: [styles.appName, { color: t.text }], children: appName }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.Text, { style: [styles.subtitle, { color: t.textMuted }], children: tagline || "Connect your Solana wallet to get started" })
+      ) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.View, { style: [styles.logoCircle, { backgroundColor: accent }], children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.Text, { style: styles.logoText, children: appName.charAt(0).toUpperCase() }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.Text, { style: [styles.appName, { color: t.text }], children: appName }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.Text, { style: [styles.subtitle, { color: t.textMuted }], children: tagline || "Connect your Solana wallet to get started" })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react_native4.View, { style: styles.actionSection, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_react_native3.View, { style: styles.actionSection, children: [
       error ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        import_react_native4.View,
+        import_react_native3.View,
         {
           style: [
             styles.errorBox,
             { backgroundColor: t.errorBg, borderColor: t.errorBorder }
           ],
-          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.Text, { style: [styles.errorText, { color: t.errorText }], children: error })
+          children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.Text, { style: [styles.errorText, { color: t.errorText }], children: error })
         }
       ) : null,
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-        import_react_native4.TouchableOpacity,
+        import_react_native3.TouchableOpacity,
         {
           style: [styles.connectButton, { backgroundColor: accent }],
           onPress: onConnect,
           disabled: connecting,
           activeOpacity: 0.8,
-          children: connecting ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.ActivityIndicator, { color: "#FFFFFF", size: "small" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.Text, { style: styles.connectButtonText, children: "Connect Wallet" })
+          children: connecting ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.ActivityIndicator, { color: "#FFFFFF", size: "small" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.Text, { style: styles.connectButtonText, children: "Connect Wallet" })
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native4.Text, { style: [styles.hint, { color: t.textDim }], children: "Phantom, Solflare, or any Solana wallet" })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_native3.Text, { style: [styles.hint, { color: t.textDim }], children: "Phantom, Solflare, or any Solana wallet" })
     ] })
   ] }) });
 }
-var styles = import_react_native4.StyleSheet.create({
+var styles = import_react_native3.StyleSheet.create({
   container: {
     flex: 1,
     justifyContent: "center"
@@ -1256,6 +1299,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);
@@ -1293,9 +1337,8 @@ function ManagedWalletProvider({
   const [connecting, setConnecting] = (0, import_react.useState)(false);
   const [isReady, setIsReady] = (0, import_react.useState)(false);
   const [error, setError] = (0, import_react.useState)(null);
-  const seeker = import_react_native5.Platform.OS === "android" && isSolanaSeeker();
-  const usePhantom = !seeker && !!redirectUri;
-  console.log(TAG3, `Platform: ${import_react_native5.Platform.OS}, seeker: ${seeker}, redirectUri: ${redirectUri ? "provided" : "not set"}, usePhantom: ${usePhantom}`);
+  const usePhantom = import_react_native4.Platform.OS === "ios" && !!redirectUri;
+  console.log(TAG3, `Platform: ${import_react_native4.Platform.OS}, redirectUri: ${redirectUri ? "provided" : "not set"}, usePhantom: ${usePhantom}`);
   const adapterRef = (0, import_react.useRef)(null);
   const transactRef = (0, import_react.useRef)(null);
   if (!adapterRef.current) {
@@ -1345,6 +1388,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) {
@@ -1436,6 +1494,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]);
@@ -1838,6 +1898,53 @@ var import_bs583 = __toESM(require("bs58"));
 var import_react10 = require("react");
 var AuthContext = (0, import_react10.createContext)(null);
 
+// src/utils/device.ts
+var import_react_native5 = require("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: import_react_native5.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: import_react_native5.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/hooks/useAuth.ts
 function useAuth() {
   const sharedAuth = (0, import_react11.useContext)(AuthContext);