@formo/analytics 1.11.6-alpha.4 → 1.11.6-alpha.6

package/package.json

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

package/src/FormoAnalytics.ts

@@ -133,60 +133,61 @@ export class FormoAnalytics implements IFormoAnalytics {
     this.setSessionCookie();
     const address = await this.getCurrentWallet();
 
+    console.log('Wallet address before sending event:', address); // Add this log
+
     const requestData = {
-      address: address,
-      session_id: this.getSessionId(),
-      timestamp: new Date().toISOString(),
-      action,
-      version: '1',
-      payload,
+        address: address,
+        session_id: this.getSessionId(),
+        timestamp: new Date().toISOString(),
+        action,
+        version: '1',
+        payload,
     };
 
     const sendRequest = async (): Promise<void> => {
-      try {
-        const response = await axios.post(
-          EVENTS_API_URL,
-          JSON.stringify(requestData),
-          {
-            headers: {
-              'Content-Type': 'application/json',
-              Authorization: `Bearer ${this.apiKey}`,
-            },
-          }
-        );
-
-        if (response.status >= 200 && response.status < 300) {
-          console.log('address:', address);
-          console.log('Event sent successfully:', action);
-        } else {
-          throw new Error(`Failed with status: ${response.status}`);
+        try {
+            const response = await axios.post(
+                EVENTS_API_URL,
+                JSON.stringify(requestData),
+                {
+                    headers: {
+                        'Content-Type': 'application/json',
+                        Authorization: `Bearer ${this.apiKey}`,
+                    },
+                }
+            );
+
+            if (response.status >= 200 && response.status < 300) {
+                console.log('address:', address);
+                console.log('Event sent successfully:', action);
+            } else {
+                throw new Error(`Failed with status: ${response.status}`);
+            }
+        } catch (error) {
+            attempt++;
+
+            if (attempt <= maxRetries) {
+                const retryDelay = Math.pow(2, attempt) * 1000;
+                console.error(
+                    `Attempt ${attempt}: Retrying event "${action}" in ${
+                        retryDelay / 1000
+                    } seconds...`
+                );
+                setTimeout(sendRequest, retryDelay);
+            } else {
+                H.consumeError(
+                    error as Error,
+                    `Request data: ${JSON.stringify(requestData)}`
+                );
+                console.error(
+                    `Event "${action}" failed after ${maxRetries} attempts. Error: ${error}`
+                );
+            }
         }
-      } catch (error) {
-        attempt++;
-
-        if (attempt <= maxRetries) {
-          const retryDelay = Math.pow(2, attempt) * 1000;
-          console.error(
-            `Attempt ${attempt}: Retrying event "${action}" in ${
-              retryDelay / 1000
-            } seconds...`
-          );
-          setTimeout(sendRequest, retryDelay);
-        } else {
-          H.consumeError(
-            error as Error,
-            `Request data: ${JSON.stringify(requestData)}`
-          );
-          console.error(
-            `Event "${action}" failed after ${maxRetries} attempts. Error: ${error}`
-          );
-        }
-      }
     };
 
-    this.getCurrentWallet();
     await sendRequest();
-  }
+}
 
   // Function to track page hits
   private trackPageHit() {
@@ -227,41 +228,56 @@ export class FormoAnalytics implements IFormoAnalytics {
 
   private trackProvider(provider: EIP1193Provider) {
     if (provider === this._provider) {
-      return;
+        console.log('Provider already tracked.');
+        return;
     }
 
     this.currentChainId = undefined;
     this.currentConnectedAddress = undefined;
 
     if (this._provider) {
-      const eventNames = Object.keys(this._registeredProviderListeners);
-      for (const eventName of eventNames) {
-        this._provider.removeListener(
-          eventName,
-          this._registeredProviderListeners[eventName]
-        );
-        delete this._registeredProviderListeners[eventName];
-      }
+        const eventNames = Object.keys(this._registeredProviderListeners);
+        for (const eventName of eventNames) {
+            this._provider.removeListener(
+                eventName,
+                this._registeredProviderListeners[eventName]
+            );
+            delete this._registeredProviderListeners[eventName];
+        }
     }
 
+    console.log('Tracking new provider:', provider);
     this._provider = provider;
 
     this.getCurrentWallet();
     this.registerAddressChangedListener();
     this.registerChainChangedListener();
-  }
+}
 
   private async getCurrentWallet() {
     if (!this.provider) {
       console.warn('FormoAnalytics::getCurrentWallet: the provider is not set');
       return;
     }
+
     const sessionData = sessionStorage.getItem(this.walletAddressSessionKey);
+
     if (!sessionData) {
+      console.warn('Session data missing. Attempting to fetch address from provider.');
+      try {
+          const accounts = await this.provider.request<string[]>({
+              method: 'eth_accounts',
+          });
+          if (accounts && accounts.length > 0) {
+              const address = accounts[0];
+              this.storeWalletAddress(address);
+              return address;
+          }
+      } catch (err) {
+          console.error('Failed to fetch accounts from provider:', err);
+      }
       return null;
-    }
-
-    console.warn(sessionData);
+  }
 
     const parsedData = JSON.parse(sessionData);
     const sessionExpiry = 30 * 60 * 1000; // 30 minutes
@@ -314,6 +330,7 @@ export class FormoAnalytics implements IFormoAnalytics {
   }
 
   private async onAddressChanged(addresses: string[]) {
+    console.log('onAddressChanged');
     if (addresses.length > 0) {
       const newAccount = addresses[0];
       if (newAccount !== this.currentConnectedAddress) {
@@ -325,6 +342,7 @@ export class FormoAnalytics implements IFormoAnalytics {
   }
 
   private async onAddressConnected(address: string) {
+    console.log('onAddressConnected');
     if (address === this.currentConnectedAddress) {
       // We have already reported this address
       return;
@@ -332,6 +350,8 @@ export class FormoAnalytics implements IFormoAnalytics {
       this.currentConnectedAddress = address;
     }
 
+    console.log('this.currentConnectedAddress: ', this.currentConnectedAddress);
+
     this.currentChainId = await this.getCurrentChainId();
 
     this.connect({ chainId: this.currentChainId, address });