@monygroupcorp/micro-web3 1.2.2 → 1.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monygroupcorp/micro-web3",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "A lean, reusable Web3 toolkit with components for wallet connection, IPFS, and common Web3 UI patterns.",
   "main": "dist/micro-web3.cjs",
   "module": "dist/micro-web3.esm.js",

package/src/services/WalletService.js

@@ -56,44 +56,77 @@ class WalletService {
     }
     
     /**
-     * Initialize the wallet service
+     * Initialize the wallet service.
+     * Automatically reconnects to previously authorized wallets by default.
      * @param {Object} options - Initialization options
-     * @param {boolean} options.autoReconnect - If true, automatically reconnect to previously authorized wallets
+     * @param {boolean} [options.autoReconnect=true] - Set to false to disable auto-reconnect
      * @returns {Promise<boolean>} True if initialized successfully
      */
     async initialize(options = {}) {
+        const { autoReconnect = true } = options;
+
         try {
             console.log('Initializing WalletService...');
 
             // Check if window.ethereum exists
-            if (typeof window.ethereum !== 'undefined') {
-                // Log that we found a wallet provider
-                console.log('Found Ethereum provider');
-
-                // Let other components know a wallet was detected
-                this.eventBus.emit('wallet:detected');
-
-                // Check if the provider is in MetaMask compatibility mode
-                this.isMetaMask = window.ethereum.isMetaMask;
-
-                // Set up event listeners for wallet changes
-                this.setupEventListeners();
-            } else {
+            if (typeof window.ethereum === 'undefined') {
                 console.log('No Ethereum provider found');
                 this.eventBus.emit('wallet:notdetected');
+                this.isInitialized = true;
+                return true;
             }
 
-            // Mark as initialized
-            this.isInitialized = true;
+            console.log('Found Ethereum provider');
+            this.eventBus.emit('wallet:detected');
+            this.isMetaMask = window.ethereum.isMetaMask;
+
+            // Check for previously authorized accounts (standard Web3 UX pattern)
+            if (autoReconnect) {
+                const accounts = await window.ethereum.request({ method: 'eth_accounts' });
+
+                if (accounts?.length > 0) {
+                    console.log('[WalletService] Found authorized account:', accounts[0]);
+
+                    // Detect wallet type and update internal state
+                    const walletType = this._detectWalletType();
+                    this.selectedWallet = walletType;
+                    this.provider = window.ethereum;
+                    this.connectedAddress = accounts[0];
+                    this.connected = true;
 
-            // Auto-reconnect if requested
-            if (options.autoReconnect) {
-                await this.tryAutoConnect();
+                    // Create ethers provider and signer
+                    this.ethersProvider = new ethers.providers.Web3Provider(window.ethereum, 'any');
+                    this.signer = this.ethersProvider.getSigner();
+
+                    // Set up event listeners
+                    this.setupEventListeners();
+
+                    // Store for future sessions
+                    localStorage.setItem('ms2fun_lastWallet', walletType);
+
+                    console.log('[WalletService] Auto-connected to:', accounts[0]);
+
+                    // Emit connected event
+                    this.eventBus.emit('wallet:connected', {
+                        address: this.connectedAddress,
+                        walletType: this.selectedWallet,
+                        provider: this.provider,
+                        ethersProvider: this.ethersProvider,
+                        signer: this.signer
+                    });
+                }
             }
 
+            // Set up listeners even if not connected (for future connections)
+            if (!this.connected) {
+                this.setupEventListeners();
+            }
+
+            this.isInitialized = true;
             return true;
         } catch (error) {
             console.error('Error initializing WalletService:', error);
+            this.isInitialized = true; // Still mark as initialized
             throw error;
         }
     }
@@ -566,7 +599,58 @@ class WalletService {
             signer: this.signer
         };
     }
-    
+
+    /**
+     * Programmatically set the connected state.
+     * Useful for migrating from manual workarounds or external connection management.
+     *
+     * @param {Object} state - The connection state to set
+     * @param {string} state.address - The connected wallet address
+     * @param {Object} state.provider - The raw provider (window.ethereum or similar)
+     * @param {Object} [state.ethersProvider] - Optional ethers Web3Provider (created if not provided)
+     * @param {Object} [state.signer] - Optional ethers signer (created if not provided)
+     * @param {string} [state.walletType='metamask'] - The wallet type identifier
+     * @param {boolean} [emitEvent=true] - Whether to emit wallet:connected event
+     * @returns {void}
+     */
+    setConnectedState({ address, provider, ethersProvider, signer, walletType = 'metamask' }, emitEvent = true) {
+        if (!address) {
+            throw new Error('setConnectedState requires an address');
+        }
+        if (!provider) {
+            throw new Error('setConnectedState requires a provider');
+        }
+
+        // Update internal state
+        this.provider = provider;
+        this.connectedAddress = address;
+        this.connected = true;
+        this.selectedWallet = walletType;
+
+        // Create ethers provider/signer if not provided
+        this.ethersProvider = ethersProvider || new ethers.providers.Web3Provider(provider, 'any');
+        this.signer = signer || this.ethersProvider.getSigner();
+
+        // Set up event listeners for the provider
+        this.setupEventListeners();
+
+        // Store wallet type for future auto-reconnect
+        localStorage.setItem('ms2fun_lastWallet', walletType);
+
+        console.log('[WalletService] State set programmatically:', address);
+
+        // Emit event so UI components update
+        if (emitEvent) {
+            this.eventBus.emit('wallet:connected', {
+                address: this.connectedAddress,
+                walletType: this.selectedWallet,
+                provider: this.provider,
+                ethersProvider: this.ethersProvider,
+                signer: this.signer
+            });
+        }
+    }
+
     /**
      * Handle network changes
      * @private