@formo/analytics 1.13.4-alpha.2 → 1.13.4-alpha.3

package/package.json

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

package/src/FormoAnalytics.ts

@@ -61,6 +61,8 @@ interface IFormoAnalytics {
 export class FormoAnalytics implements IFormoAnalytics {
   private _provider?: EIP1193Provider;
   private _providerListeners: Record<string, (...args: unknown[]) => void> = {};
+  private identifySent?: boolean;
+  readonly identifySentKey = "identifySent";
 
   config: Config;
   currentChainId?: ChainID;
@@ -74,6 +76,15 @@ export class FormoAnalytics implements IFormoAnalytics {
       apiKey: apiKey,
     };
 
+    try {
+      const isWalletIdentified = JSON.parse(
+        sessionStorage.getItem(this.identifySentKey) || "false"
+      );
+      this.identifySent = isWalletIdentified;
+    } catch {
+      this.identifySent = false;
+    }
+
     // TODO: replace with eip6963
     const provider = options.provider || window?.ethereum;
     if (provider) {
@@ -263,7 +274,7 @@ export class FormoAnalytics implements IFormoAnalytics {
   }
 
   /**
-   * Emits a identify event with current wallet address.
+   * Emits an identify event with current wallet address.
    * @param {Address} params.address
    * @returns {Promise<void>}
    */
@@ -276,7 +287,9 @@ export class FormoAnalytics implements IFormoAnalytics {
     providerName?: string;
     rdns?: string;
   }): Promise<void> {
-    if (address) {
+    if (address && this.identifySent === false) {
+      this.identifySent = true;
+      sessionStorage.setItem(this.identifySentKey, "true");
       await this.trackEvent(Event.IDENTIFY, {
         address,
         providerName,
@@ -641,9 +654,11 @@ export class FormoAnalytics implements IFormoAnalytics {
   }
 
   private async identifyAll(providers: EIP6963ProviderDetail[]): Promise<void> {
+    console.log("identifying all => providers", providers);
     for (const { provider, info } of providers) {
       try {
         const accounts = await this.getAccounts(provider);
+        console.log("identifying all => accounts", accounts);
         if (accounts && accounts.length > 0) {
           for (const address of accounts) {
             await this.identify({
@@ -653,7 +668,9 @@ export class FormoAnalytics implements IFormoAnalytics {
             });
           }
         }
-      } catch (err) {}
+      } catch (err) {
+        console.log("identifying all => err", err);
+      }
     }
   }
 
@@ -763,6 +780,7 @@ export class FormoAnalytics implements IFormoAnalytics {
     // common browser properties
     return {
       "user-agent": window.navigator.userAgent,
+      origin: url.origin,
       locale: language,
       location,
       referrer: document.referrer,

package/src/FormoAnalyticsProvider.tsx

@@ -55,7 +55,7 @@ const InitializedAnalytics = ({
       if (initializedStartedRef.current) return;
       initializedStartedRef.current = true;
 
-      await initializeFormoAnalytics(apiKey, options);
+      await initializeFormoAnalytics(apiKey!, options);
     };
 
     initialize();

package/src/types/base.ts

@@ -1,17 +1,17 @@
-import { EIP1193Provider } from "./provider";
+import { EIP1193Provider, EIP6369Provider } from "./provider";
 
 // Decimal chain ID
-export type ChainID = number
+export type ChainID = number;
 
 // Address (EVM, Solana, etc.)
-export type Address = string
+export type Address = string;
 
 export interface Options {
-  provider?: EIP1193Provider;
+  provider?: EIP6369Provider;
 }
 
 export interface FormoAnalyticsProviderProps {
-  apiKey: string;
+  apiKey?: string;
   options?: Options;
   disabled?: boolean;
   children: React.ReactNode;
@@ -19,4 +19,4 @@ export interface FormoAnalyticsProviderProps {
 
 export interface Config {
   apiKey: string;
-}
+}

package/src/types/provider.ts

@@ -1,17 +1,29 @@
-import EventEmitter from 'events'
+import EventEmitter from "events";
 
 export interface RequestArguments {
-  method: string
-  params?: unknown[] | Record<string, unknown>
+  method: string;
+  params?: unknown[] | Record<string, unknown>;
 }
 
 export interface EIP1193Provider extends EventEmitter {
-  request<T>(args: RequestArguments): Promise<T | null | undefined>
-  on(eventName: string | symbol, listener: (...args: unknown[]) => void): this
-  removeListener(eventName: string | symbol, listener: (...args: unknown[]) => void): this
+  request<T>(args: RequestArguments): Promise<T | null | undefined>;
+  on(eventName: string | symbol, listener: (...args: unknown[]) => void): this;
+  removeListener(
+    eventName: string | symbol,
+    listener: (...args: unknown[]) => void
+  ): this;
+}
+
+export interface EIP6369Provider extends EventEmitter {
+  request<T>(args: RequestArguments): Promise<T | null | undefined>;
+  on(eventName: string | symbol, listener: (...args: unknown[]) => void): this;
+  removeListener(
+    eventName: string | symbol,
+    listener: (...args: unknown[]) => void
+  ): this;
 }
 
 export interface RPCError extends Error {
   code: number;
   data?: unknown;
-}
+}