@formo/analytics 1.12.0-alpha.1 → 1.12.0-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formo/analytics",
-  "version": "1.12.0-alpha.1",
+  "version": "1.12.0-alpha.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/getformo/sdk.git"

package/src/FormoAnalytics.ts

@@ -25,21 +25,21 @@ interface IFormoAnalytics {
    */
   page(): void;
 
-  /**
-   * Tracks a specific event with a name and associated data.
-   */
-  track(eventName: string, eventData: Record<string, any>): void;
-
   /**
    * Connects to a wallet with the specified chain ID and address.
    */
-  connect(params: { chainId: ChainID; address: string }): Promise<void>;
+  connect(params: { account: string; chainId: ChainID }): Promise<void>;
 
   /**
    * Disconnects the current wallet and clears the session information.
    */
   disconnect(attributes?: { account?: string; chainId?: ChainID }): void;
 
+  /**
+   * Tracks a specific event with a name and associated data.
+   */
+  track(eventName: string, eventData: Record<string, any>): void;
+
   /**
    * Switches the blockchain chain context and optionally logs additional attributes.
    */
@@ -47,12 +47,12 @@ interface IFormoAnalytics {
 }
 export class FormoAnalytics implements IFormoAnalytics {
   private _provider?: EIP1193Provider;
-  private _originalRequest?: EIP1193Provider['request'];
   private _registeredProviderListeners: Record<
     string,
     (...args: unknown[]) => void
   > = {};
 
+  private sessionKey = 'walletAddress';
   private config: any;
   private sessionIdKey: string = SESSION_STORAGE_ID_KEY;
   private timezoneToCountry: Record<string, string> = COUNTRY_LIST;
@@ -308,19 +308,9 @@ export class FormoAnalytics implements IFormoAnalytics {
         );
         delete this._registeredProviderListeners[eventName];
       }
-
-      // Restore original request
-      if (
-        this._originalRequest &&
-        Object.getOwnPropertyDescriptor(this._provider, 'request')?.writable !==
-          false
-      ) {
-        this._provider.request = this._originalRequest;
-      }
     }
 
     this._provider = provider;
-    this._originalRequest = provider?.request;
 
     this.getCurrentWallet();
     this.registerAccountsChangedListener();
@@ -340,11 +330,12 @@ export class FormoAnalytics implements IFormoAnalytics {
     }
 
     const disconnectAttributes = {
-      account: this.currentConnectedAccount,
+      address: this.currentConnectedAccount,
       chainId: this.currentChainId,
     };
     this.currentChainId = undefined;
     this.currentConnectedAccount = undefined;
+    this.clearWalletAddress();
 
     return this.trackEvent(Event.DISCONNECT, disconnectAttributes);
   }
@@ -362,12 +353,12 @@ export class FormoAnalytics implements IFormoAnalytics {
 
       try {
         const res: string[] | null | undefined = await this.provider.request({
-          method: 'eth_requestAccounts',
+          method: 'eth_accounts',
         });
         if (!res || res.length === 0) {
           console.error(
             'error',
-            'FormoAnalytics::onChainChanged: unable to get account. eth_requestAccounts returned empty'
+            'FormoAnalytics::onChainChanged: unable to get account. eth_accounts returned empty'
           );
           return;
         }
@@ -379,7 +370,7 @@ export class FormoAnalytics implements IFormoAnalytics {
           // 4001: The request is rejected by the user , see https://docs.metamask.io/wallet/reference/provider-api/#errors
           console.error(
             'error',
-            `FormoAnalytics::onChainChanged: unable to get account. eth_requestAccounts threw an error`,
+            `FormoAnalytics::onChainChanged: unable to get account. eth_accounts threw an error`,
             err
           );
           return;
@@ -444,7 +435,8 @@ export class FormoAnalytics implements IFormoAnalytics {
 
     this.currentChainId = await this.getCurrentChainId();
 
-    this.connect({ chainId: this.currentChainId, address: account });
+    this.connect({ account, chainId: this.currentChainId });
+    this.storeWalletAddress(account);
   }
 
   private async getCurrentWallet() {
@@ -452,20 +444,49 @@ export class FormoAnalytics implements IFormoAnalytics {
       console.warn('FormoAnalytics::getCurrentWallet: the provider is not set');
       return;
     }
-    try {
-      const accounts = await this.provider.request<string[]>({
-        method: 'eth_accounts',
-      });
-      if (accounts && accounts.length > 0 && accounts[0]) {
-        this.handleAccountConnected(accounts[0]);
-        return accounts && accounts.length > 0 && accounts[0];
-      }
+    const sessionData = sessionStorage.getItem(this.sessionKey);
 
+    if (!sessionData) {
+      return null;
+    }
+
+    const parsedData = JSON.parse(sessionData);
+    const sessionExpiry = 30 * 60 * 1000; // 30 minutes
+    const currentTime = Date.now();
+
+    if (currentTime - parsedData.timestamp > sessionExpiry) {
+      console.warn('Session expired. Ignoring wallet address.');
+      sessionStorage.removeItem(this.sessionKey); // Clear expired session data
       return '';
-    } catch (error) {
-      console.error('Failed to fetch connected address:', error);
-      return '';
     }
+
+    this.handleAccountConnected(parsedData.address);
+    return parsedData.address || '';
+  }
+
+  /**
+   * Stores the wallet address in session storage when connected.
+   * @param address - The wallet address to store.
+   */
+  private storeWalletAddress(address: string): void {
+    if (!address) {
+      console.error('No wallet address provided to store.');
+      return;
+    }
+
+    const sessionData = {
+      address,
+      timestamp: Date.now(),
+    };
+
+    sessionStorage.setItem(this.sessionKey, JSON.stringify(sessionData));
+  }
+
+  /**
+   * Clears the wallet address from session storage when disconnected.
+   */
+  private clearWalletAddress(): void {
+    sessionStorage.removeItem(this.sessionKey);
   }
 
   // Function to build the API URL
@@ -486,20 +507,20 @@ export class FormoAnalytics implements IFormoAnalytics {
     return 'Error: No token provided';
   }
 
-  connect({ chainId, address }: { chainId: ChainID; address: string }) {
+  connect({ account, chainId }: { account: string; chainId: ChainID }) {
     if (!chainId) {
       throw new Error('FormoAnalytics::connect: chainId cannot be empty');
     }
-    if (!address) {
+    if (!account) {
       throw new Error('FormoAnalytics::connect: account cannot be empty');
     }
 
     this.currentChainId = chainId.toString();
-    this.currentConnectedAccount = address;
+    this.currentConnectedAccount = account;
 
     return this.trackEvent(Event.CONNECT, {
       chainId,
-      address,
+      address: account,
     });
   }