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

package/package.json

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

package/src/FormoAnalytics.ts

@@ -12,7 +12,11 @@ interface IFormoAnalytics {
   /**
    * Initializes the FormoAnalytics instance with the provided API key and project ID.
    */
-  init(apiKey: string, options: Options): Promise<FormoAnalytics>;
+  init(
+    apiKey: string,
+    projectId: string,
+    options: Options
+  ): Promise<FormoAnalytics>;
 
   /**
    * Tracks page visit events.
@@ -59,6 +63,7 @@ export class FormoAnalytics implements IFormoAnalytics {
 
   private constructor(
     public readonly apiKey: string,
+    public readonly projectId: string,
     public options: Options = {}
   ) {
     this.config = {
@@ -72,11 +77,15 @@ export class FormoAnalytics implements IFormoAnalytics {
     }
   }
 
-  static async init(apiKey: string, options: Options): Promise<FormoAnalytics> {
+  static async init(
+    apiKey: string,
+    projectId: string,
+    options: Options
+  ): Promise<FormoAnalytics> {
     const config = {
       token: apiKey,
     };
-    const instance = new FormoAnalytics(apiKey, options);
+    const instance = new FormoAnalytics(apiKey, projectId, options);
     instance.config = config;
 
     return instance;
@@ -136,58 +145,58 @@ export class FormoAnalytics implements IFormoAnalytics {
     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}`);
-            }
-        } 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}`
-                );
-            }
+      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}`
+          );
+        }
+      }
     };
 
     await sendRequest();
-}
+  }
 
   // Function to track page hits
   private trackPageHit() {
@@ -228,22 +237,22 @@ export class FormoAnalytics implements IFormoAnalytics {
 
   private trackProvider(provider: EIP1193Provider) {
     if (provider === this._provider) {
-        console.log('Provider already tracked.');
-        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);
@@ -252,7 +261,7 @@ export class FormoAnalytics implements IFormoAnalytics {
     this.getCurrentWallet();
     this.registerAddressChangedListener();
     this.registerChainChangedListener();
-}
+  }
 
   private async getCurrentWallet() {
     if (!this.provider) {
@@ -263,21 +272,23 @@ export class FormoAnalytics implements IFormoAnalytics {
     const sessionData = sessionStorage.getItem(this.walletAddressSessionKey);
 
     if (!sessionData) {
-      console.warn('Session data missing. Attempting to fetch address from provider.');
+      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;
-          }
+        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);
+        console.error('Failed to fetch accounts from provider:', err);
       }
       return null;
-  }
+    }
 
     const parsedData = JSON.parse(sessionData);
     const sessionExpiry = 30 * 60 * 1000; // 30 minutes
@@ -446,8 +457,8 @@ export class FormoAnalytics implements IFormoAnalytics {
     sessionStorage.removeItem(this.walletAddressSessionKey);
   }
 
-  init(apiKey: string, options: Options): Promise<FormoAnalytics> {
-    const instance = new FormoAnalytics(apiKey, options);
+  init(apiKey: string, projectId: string, options: Options): Promise<FormoAnalytics> {
+    const instance = new FormoAnalytics(apiKey, projectId, options);
     return Promise.resolve(instance);
   }
 

package/src/FormoAnalyticsProvider.tsx

@@ -19,6 +19,7 @@ export const FormoAnalyticsContext = createContext<FormoAnalytics | undefined>(
 export const FormoAnalyticsProvider = ({
   apiKey,
   options,
+  projectId,
   disabled,
   children,
 }: FormoAnalyticsProviderProps) => {
@@ -61,7 +62,7 @@ export const FormoAnalyticsProvider = ({
 
       // Initialize FormoAnalytics
       try {
-        const sdkInstance = await FormoAnalytics.init(apiKey, options);
+        const sdkInstance = await FormoAnalytics.init(apiKey, projectId, options);
         setSdk(sdkInstance);
         console.log('FormoAnalytics SDK initialized successfully');
       } catch (error) {

package/src/types/base.ts

@@ -8,6 +8,7 @@ export interface Options {
 
 export interface FormoAnalyticsProviderProps {
   apiKey: string;
+  projectId: string;
   options: Options;
   disabled?: boolean;
   children: React.ReactNode;