@phantom/browser-sdk 1.0.0-beta.13 → 1.0.0-beta.14

package/README.md

@@ -315,7 +315,7 @@ Connect to wallet and get addresses for configured AddressTypes.
 
 ```typescript
 const result = await sdk.connect();
-// Returns: { walletId?: string, addresses: WalletAddress[] }
+// Returns: { addresses: WalletAddress[] }
 // addresses only includes types from addressTypes config
 ```
 
@@ -344,15 +344,6 @@ Check if SDK is connected to a wallet.
 const connected = sdk.isConnected();
 ```
 
-#### getWalletId()
-
-Get the wallet ID (embedded wallets only).
-
-```typescript
-const walletId = sdk.getWalletId();
-// Returns string for embedded wallets, null for injected
-```
-
 ### Solana Chain Methods
 
 #### signMessage(message)

package/dist/index.d.ts

@@ -157,10 +157,6 @@ declare class BrowserSDK {
      * Get information about the current provider
      */
     getCurrentProviderInfo(): ProviderPreference | null;
-    /**
-     * Get the wallet ID (for embedded wallets)
-     */
-    getWalletId(): string | null;
     /**
      * Check if Phantom extension is installed
      */
@@ -178,7 +174,7 @@ declare class BrowserSDK {
     /**
      * Attempt auto-connection using existing session
      * Should be called after setting up event listeners
-     * Only works with embedded providers
+     * Tries embedded provider first, then injected provider as fallback
      */
     autoConnect(): Promise<void>;
     /**

package/dist/index.js

@@ -508,7 +508,6 @@ var InjectedProvider = class {
       const result = {
         addresses: this.addresses,
         status: "completed"
-        // walletId is not applicable for injected providers
       };
       this.emit("connect", {
         addresses: this.addresses,
@@ -947,7 +946,7 @@ var BrowserAuthProvider = class {
         redirect_uri: phantomOptions.redirectUrl || (typeof window !== "undefined" ? this.getValidatedCurrentUrl() : ""),
         session_id: phantomOptions.sessionId,
         clear_previous_session: true.toString(),
-        sdk_version: "1.0.0-beta.13"
+        sdk_version: "1.0.0-beta.14"
       });
       if (phantomOptions.provider) {
         debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Provider specified, will skip selection", {
@@ -1245,7 +1244,7 @@ var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvi
         // Full user agent for more detailed info
         [import_constants2.ANALYTICS_HEADERS.APP_ID]: config.appId,
         [import_constants2.ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
-        [import_constants2.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.13"
+        [import_constants2.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.14"
         // Replaced at build time
       }
     };
@@ -1264,7 +1263,6 @@ var ProviderManager = class {
     this.providers = /* @__PURE__ */ new Map();
     this.currentProvider = null;
     this.currentProviderKey = null;
-    this.walletId = null;
     // Event management for forwarding provider events
     this.eventListeners = /* @__PURE__ */ new Map();
     this.providerForwardingSetup = /* @__PURE__ */ new WeakSet();
@@ -1300,7 +1298,6 @@ var ProviderManager = class {
     }
     this.currentProvider = this.providers.get(key);
     this.currentProviderKey = key;
-    this.walletId = null;
     this.ensureProviderEventForwarding();
     return this.currentProvider;
   }
@@ -1337,14 +1334,11 @@ var ProviderManager = class {
     }
     debug.log(DebugCategory.PROVIDER_MANAGER, "Delegating to provider connect method");
     const result = await this.currentProvider.connect(authOptions);
-    this.walletId = result.walletId || null;
     debug.log(DebugCategory.PROVIDER_MANAGER, "Connection successful, saving preferences", {
-      walletId: this.walletId,
       addressCount: result.addresses?.length || 0
     });
     this.saveProviderPreference();
     debug.info(DebugCategory.PROVIDER_MANAGER, "Connect completed", {
-      walletId: this.walletId,
       addresses: result.addresses
     });
     return result;
@@ -1356,7 +1350,6 @@ var ProviderManager = class {
     if (!this.currentProvider)
       return;
     await this.currentProvider.disconnect();
-    this.walletId = null;
   }
   /**
    * Get addresses from current provider
@@ -1374,10 +1367,61 @@ var ProviderManager = class {
     return this.currentProvider?.isConnected() ?? false;
   }
   /**
-   * Get current wallet ID
+   * Attempt auto-connect with fallback strategy
+   * Tries embedded provider first if it exists, then injected provider
+   * Returns true if any provider successfully connected
    */
-  getWalletId() {
-    return this.walletId;
+  async autoConnect() {
+    debug.log(DebugCategory.PROVIDER_MANAGER, "Starting auto-connect with fallback strategy");
+    const embeddedWalletType = this.config.embeddedWalletType || "user-wallet";
+    const embeddedKey = this.getProviderKey("embedded", embeddedWalletType);
+    if (this.providers.has(embeddedKey)) {
+      debug.log(DebugCategory.PROVIDER_MANAGER, "Trying auto-connect with existing embedded provider");
+      const embeddedProvider = this.providers.get(embeddedKey);
+      try {
+        const previousProvider = this.currentProvider;
+        const previousKey = this.currentProviderKey;
+        this.currentProvider = embeddedProvider;
+        this.currentProviderKey = embeddedKey;
+        this.ensureProviderEventForwarding();
+        await embeddedProvider.autoConnect();
+        if (embeddedProvider.isConnected()) {
+          debug.info(DebugCategory.PROVIDER_MANAGER, "Embedded auto-connect successful");
+          this.saveProviderPreference();
+          return true;
+        } else {
+          debug.log(DebugCategory.PROVIDER_MANAGER, "Embedded provider did not connect, restoring previous provider");
+          this.currentProvider = previousProvider;
+          this.currentProviderKey = previousKey;
+        }
+      } catch (error) {
+        debug.log(DebugCategory.PROVIDER_MANAGER, "Embedded auto-connect failed", {
+          error: error.message
+        });
+      }
+    }
+    const injectedKey = this.getProviderKey("injected");
+    if (this.providers.has(injectedKey)) {
+      debug.log(DebugCategory.PROVIDER_MANAGER, "Trying auto-connect with existing injected provider");
+      const injectedProvider = this.providers.get(injectedKey);
+      try {
+        this.currentProvider = injectedProvider;
+        this.currentProviderKey = injectedKey;
+        this.ensureProviderEventForwarding();
+        await injectedProvider.autoConnect();
+        if (injectedProvider.isConnected()) {
+          debug.info(DebugCategory.PROVIDER_MANAGER, "Injected auto-connect successful");
+          this.saveProviderPreference();
+          return true;
+        }
+      } catch (error) {
+        debug.log(DebugCategory.PROVIDER_MANAGER, "Injected auto-connect failed", {
+          error: error.message
+        });
+      }
+    }
+    debug.log(DebugCategory.PROVIDER_MANAGER, "Auto-connect failed for all existing providers");
+    return false;
   }
   /**
    * Add event listener - stores callback and ensures current provider forwards events to ProviderManager
@@ -1460,11 +1504,17 @@ var ProviderManager = class {
   }
   /**
    * Set default provider based on initial config
+   * Creates both embedded and injected providers for autoConnect fallback
    */
   setDefaultProvider() {
     const defaultType = this.config.providerType || "embedded";
     const defaultEmbeddedType = this.config.embeddedWalletType || "user-wallet";
-    this.createProvider(defaultType, defaultEmbeddedType);
+    if (this.config.appId) {
+      debug.log(DebugCategory.PROVIDER_MANAGER, "Creating embedded provider");
+      this.createProvider("embedded", defaultEmbeddedType);
+    }
+    debug.log(DebugCategory.PROVIDER_MANAGER, "Creating injected provider");
+    this.createProvider("injected");
     this.switchProvider(defaultType, { embeddedWalletType: defaultEmbeddedType });
   }
   /**
@@ -1625,7 +1675,6 @@ var BrowserSDK = class {
       const result = await this.providerManager.connect(options);
       debug.info(DebugCategory.BROWSER_SDK, "Connection successful", {
         addressCount: result.addresses.length,
-        walletId: result.walletId,
         status: result.status
       });
       return result;
@@ -1682,12 +1731,6 @@ var BrowserSDK = class {
   getCurrentProviderInfo() {
     return this.providerManager.getCurrentProviderInfo();
   }
-  /**
-   * Get the wallet ID (for embedded wallets)
-   */
-  getWalletId() {
-    return this.providerManager.getWalletId();
-  }
   // ===== UTILITY METHODS =====
   /**
    * Check if Phantom extension is installed
@@ -1714,17 +1757,17 @@ var BrowserSDK = class {
   /**
    * Attempt auto-connection using existing session
    * Should be called after setting up event listeners
-   * Only works with embedded providers
+   * Tries embedded provider first, then injected provider as fallback
    */
   async autoConnect() {
-    debug.log(DebugCategory.BROWSER_SDK, "Attempting auto-connect");
-    const currentProvider = this.providerManager.getCurrentProvider();
-    if (currentProvider) {
-      await currentProvider.autoConnect();
-    } else {
-      debug.warn(DebugCategory.BROWSER_SDK, "Current provider does not support auto-connect", {
+    debug.log(DebugCategory.BROWSER_SDK, "Attempting auto-connect with fallback strategy");
+    const result = await this.providerManager.autoConnect();
+    if (result) {
+      debug.info(DebugCategory.BROWSER_SDK, "Auto-connect successful", {
         providerType: this.getCurrentProviderInfo()?.type
       });
+    } else {
+      debug.log(DebugCategory.BROWSER_SDK, "Auto-connect failed for all providers");
     }
   }
   /**

package/dist/index.mjs

@@ -472,7 +472,6 @@ var InjectedProvider = class {
       const result = {
         addresses: this.addresses,
         status: "completed"
-        // walletId is not applicable for injected providers
       };
       this.emit("connect", {
         addresses: this.addresses,
@@ -911,7 +910,7 @@ var BrowserAuthProvider = class {
         redirect_uri: phantomOptions.redirectUrl || (typeof window !== "undefined" ? this.getValidatedCurrentUrl() : ""),
         session_id: phantomOptions.sessionId,
         clear_previous_session: true.toString(),
-        sdk_version: "1.0.0-beta.13"
+        sdk_version: "1.0.0-beta.14"
       });
       if (phantomOptions.provider) {
         debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Provider specified, will skip selection", {
@@ -1209,7 +1208,7 @@ var EmbeddedProvider = class extends CoreEmbeddedProvider {
         // Full user agent for more detailed info
         [ANALYTICS_HEADERS.APP_ID]: config.appId,
         [ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
-        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.13"
+        [ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.14"
         // Replaced at build time
       }
     };
@@ -1228,7 +1227,6 @@ var ProviderManager = class {
     this.providers = /* @__PURE__ */ new Map();
     this.currentProvider = null;
     this.currentProviderKey = null;
-    this.walletId = null;
     // Event management for forwarding provider events
     this.eventListeners = /* @__PURE__ */ new Map();
     this.providerForwardingSetup = /* @__PURE__ */ new WeakSet();
@@ -1264,7 +1262,6 @@ var ProviderManager = class {
     }
     this.currentProvider = this.providers.get(key);
     this.currentProviderKey = key;
-    this.walletId = null;
     this.ensureProviderEventForwarding();
     return this.currentProvider;
   }
@@ -1301,14 +1298,11 @@ var ProviderManager = class {
     }
     debug.log(DebugCategory.PROVIDER_MANAGER, "Delegating to provider connect method");
     const result = await this.currentProvider.connect(authOptions);
-    this.walletId = result.walletId || null;
     debug.log(DebugCategory.PROVIDER_MANAGER, "Connection successful, saving preferences", {
-      walletId: this.walletId,
       addressCount: result.addresses?.length || 0
     });
     this.saveProviderPreference();
     debug.info(DebugCategory.PROVIDER_MANAGER, "Connect completed", {
-      walletId: this.walletId,
       addresses: result.addresses
     });
     return result;
@@ -1320,7 +1314,6 @@ var ProviderManager = class {
     if (!this.currentProvider)
       return;
     await this.currentProvider.disconnect();
-    this.walletId = null;
   }
   /**
    * Get addresses from current provider
@@ -1338,10 +1331,61 @@ var ProviderManager = class {
     return this.currentProvider?.isConnected() ?? false;
   }
   /**
-   * Get current wallet ID
+   * Attempt auto-connect with fallback strategy
+   * Tries embedded provider first if it exists, then injected provider
+   * Returns true if any provider successfully connected
    */
-  getWalletId() {
-    return this.walletId;
+  async autoConnect() {
+    debug.log(DebugCategory.PROVIDER_MANAGER, "Starting auto-connect with fallback strategy");
+    const embeddedWalletType = this.config.embeddedWalletType || "user-wallet";
+    const embeddedKey = this.getProviderKey("embedded", embeddedWalletType);
+    if (this.providers.has(embeddedKey)) {
+      debug.log(DebugCategory.PROVIDER_MANAGER, "Trying auto-connect with existing embedded provider");
+      const embeddedProvider = this.providers.get(embeddedKey);
+      try {
+        const previousProvider = this.currentProvider;
+        const previousKey = this.currentProviderKey;
+        this.currentProvider = embeddedProvider;
+        this.currentProviderKey = embeddedKey;
+        this.ensureProviderEventForwarding();
+        await embeddedProvider.autoConnect();
+        if (embeddedProvider.isConnected()) {
+          debug.info(DebugCategory.PROVIDER_MANAGER, "Embedded auto-connect successful");
+          this.saveProviderPreference();
+          return true;
+        } else {
+          debug.log(DebugCategory.PROVIDER_MANAGER, "Embedded provider did not connect, restoring previous provider");
+          this.currentProvider = previousProvider;
+          this.currentProviderKey = previousKey;
+        }
+      } catch (error) {
+        debug.log(DebugCategory.PROVIDER_MANAGER, "Embedded auto-connect failed", {
+          error: error.message
+        });
+      }
+    }
+    const injectedKey = this.getProviderKey("injected");
+    if (this.providers.has(injectedKey)) {
+      debug.log(DebugCategory.PROVIDER_MANAGER, "Trying auto-connect with existing injected provider");
+      const injectedProvider = this.providers.get(injectedKey);
+      try {
+        this.currentProvider = injectedProvider;
+        this.currentProviderKey = injectedKey;
+        this.ensureProviderEventForwarding();
+        await injectedProvider.autoConnect();
+        if (injectedProvider.isConnected()) {
+          debug.info(DebugCategory.PROVIDER_MANAGER, "Injected auto-connect successful");
+          this.saveProviderPreference();
+          return true;
+        }
+      } catch (error) {
+        debug.log(DebugCategory.PROVIDER_MANAGER, "Injected auto-connect failed", {
+          error: error.message
+        });
+      }
+    }
+    debug.log(DebugCategory.PROVIDER_MANAGER, "Auto-connect failed for all existing providers");
+    return false;
   }
   /**
    * Add event listener - stores callback and ensures current provider forwards events to ProviderManager
@@ -1424,11 +1468,17 @@ var ProviderManager = class {
   }
   /**
    * Set default provider based on initial config
+   * Creates both embedded and injected providers for autoConnect fallback
    */
   setDefaultProvider() {
     const defaultType = this.config.providerType || "embedded";
     const defaultEmbeddedType = this.config.embeddedWalletType || "user-wallet";
-    this.createProvider(defaultType, defaultEmbeddedType);
+    if (this.config.appId) {
+      debug.log(DebugCategory.PROVIDER_MANAGER, "Creating embedded provider");
+      this.createProvider("embedded", defaultEmbeddedType);
+    }
+    debug.log(DebugCategory.PROVIDER_MANAGER, "Creating injected provider");
+    this.createProvider("injected");
     this.switchProvider(defaultType, { embeddedWalletType: defaultEmbeddedType });
   }
   /**
@@ -1589,7 +1639,6 @@ var BrowserSDK = class {
       const result = await this.providerManager.connect(options);
       debug.info(DebugCategory.BROWSER_SDK, "Connection successful", {
         addressCount: result.addresses.length,
-        walletId: result.walletId,
         status: result.status
       });
       return result;
@@ -1646,12 +1695,6 @@ var BrowserSDK = class {
   getCurrentProviderInfo() {
     return this.providerManager.getCurrentProviderInfo();
   }
-  /**
-   * Get the wallet ID (for embedded wallets)
-   */
-  getWalletId() {
-    return this.providerManager.getWalletId();
-  }
   // ===== UTILITY METHODS =====
   /**
    * Check if Phantom extension is installed
@@ -1678,17 +1721,17 @@ var BrowserSDK = class {
   /**
    * Attempt auto-connection using existing session
    * Should be called after setting up event listeners
-   * Only works with embedded providers
+   * Tries embedded provider first, then injected provider as fallback
    */
   async autoConnect() {
-    debug.log(DebugCategory.BROWSER_SDK, "Attempting auto-connect");
-    const currentProvider = this.providerManager.getCurrentProvider();
-    if (currentProvider) {
-      await currentProvider.autoConnect();
-    } else {
-      debug.warn(DebugCategory.BROWSER_SDK, "Current provider does not support auto-connect", {
+    debug.log(DebugCategory.BROWSER_SDK, "Attempting auto-connect with fallback strategy");
+    const result = await this.providerManager.autoConnect();
+    if (result) {
+      debug.info(DebugCategory.BROWSER_SDK, "Auto-connect successful", {
         providerType: this.getCurrentProviderInfo()?.type
       });
+    } else {
+      debug.log(DebugCategory.BROWSER_SDK, "Auto-connect failed for all providers");
     }
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/browser-sdk",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.14",
   "description": "Browser SDK for Phantom Wallet",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -31,9 +31,9 @@
     "@phantom/base64url": "^1.0.0-beta.7",
     "@phantom/browser-injected-sdk": "^1.0.0-beta.5",
     "@phantom/chain-interfaces": "^1.0.0-beta.7",
-    "@phantom/client": "^1.0.0-beta.13",
+    "@phantom/client": "^1.0.0-beta.14",
     "@phantom/constants": "^1.0.0-beta.7",
-    "@phantom/embedded-provider-core": "^1.0.0-beta.13",
+    "@phantom/embedded-provider-core": "^1.0.0-beta.14",
     "@phantom/indexed-db-stamper": "^1.0.0-beta.1",
     "@phantom/parsers": "^1.0.0-beta.7",
     "@phantom/sdk-types": "^1.0.0-beta.7",