@formo/analytics 1.11.8 → 1.11.9-alpha.1

package/dist/cjs/src/FormoAnalytics.d.ts

@@ -3,11 +3,7 @@ interface IFormoAnalytics {
     /**
      * Initializes the FormoAnalytics instance with the provided API key and project ID.
      */
-    init(apiKey: string, options: Options): Promise<FormoAnalytics>;
-    /**
-     * Identifies the user with the provided user data.
-     */
-    identify(userData: Record<string, any>): void;
+    init(apiKey: string, options?: Options): Promise<FormoAnalytics>;
     /**
      * Tracks page visit events.
      */
@@ -16,27 +12,27 @@ interface IFormoAnalytics {
      * Connects to a wallet with the specified chain ID and address.
      */
     connect(params: {
-        account: string;
         chainId: ChainID;
+        address: string;
     }): Promise<void>;
     /**
      * Disconnects the current wallet and clears the session information.
      */
-    disconnect(attributes?: {
-        account?: string;
+    disconnect(params?: {
         chainId?: ChainID;
+        address?: string;
     }): void;
     /**
-     * Tracks a specific event with a name and associated data.
+     * Switches the blockchain chain context and optionally logs additional params.
      */
-    track(eventName: string, eventData: Record<string, any>): void;
-    /**
-     * Switches the blockchain chain context and optionally logs additional attributes.
-     */
-    chain(attributes: {
+    chain(params: {
         chainId: ChainID;
-        account?: string;
+        address?: string;
     }): void;
+    /**
+     * Tracks a specific event with a name and associated data.
+     */
+    track(eventName: string, eventData: Record<string, any>): void;
 }
 export declare class FormoAnalytics implements IFormoAnalytics {
     readonly apiKey: string;
@@ -48,28 +44,26 @@ export declare class FormoAnalytics implements IFormoAnalytics {
     private sessionIdKey;
     private timezoneToCountry;
     currentChainId?: string | null;
-    currentConnectedAccount?: string;
+    currentConnectedAddress?: string;
     private constructor();
-    static init(apiKey: string, options: Options): Promise<FormoAnalytics>;
+    static init(apiKey: string, options?: Options): Promise<FormoAnalytics>;
     get provider(): EIP1193Provider | undefined;
-    private identifyUser;
     private getSessionId;
     private getOrigin;
     private setSessionCookie;
     private generateSessionId;
     private getCookieValue;
     private trackEvent;
-    private maskSensitiveData;
     private trackPageHit;
     private trackProvider;
+    private getCurrentWallet;
+    private getCurrentChainId;
+    private registerAddressChangedListener;
     private registerChainChangedListener;
-    private handleAccountDisconnected;
+    private onAddressChanged;
+    private onAddressConnected;
+    private onAddressDisconnected;
     private onChainChanged;
-    private onAccountsChanged;
-    private registerAccountsChangedListener;
-    private getCurrentChainId;
-    private handleAccountConnected;
-    private getCurrentWallet;
     /**
      * Stores the wallet address in session storage when connected.
      * @param address - The wallet address to store.
@@ -79,20 +73,19 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      * Clears the wallet address from session storage when disconnected.
      */
     private clearWalletAddress;
-    connect({ account, chainId }: {
-        account: string;
+    init(apiKey: string, options: Options): Promise<FormoAnalytics>;
+    connect({ chainId, address }: {
         chainId: ChainID;
+        address: string;
     }): Promise<void>;
-    disconnect(attributes?: {
-        account?: string;
+    disconnect(params?: {
         chainId?: ChainID;
+        address?: string;
     }): Promise<void> | undefined;
-    chain({ chainId, account }: {
+    chain({ chainId, address }: {
         chainId: ChainID;
-        account?: string;
+        address?: string;
     }): Promise<void>;
-    init(apiKey: string, options: Options): Promise<FormoAnalytics>;
-    identify(userData: any): void;
     page(): void;
     track(eventName: string, eventData: any): void;
 }

package/dist/cjs/src/FormoAnalytics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FormoAnalytics.d.ts","sourceRoot":"","sources":["../../../src/FormoAnalytics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FormoAnalytics.d.ts","sourceRoot":"","sources":["../../../src/FormoAnalytics.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAE5D,UAAU,eAAe;IACvB;;OAEG;IACH,IAAI,CACF,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,cAAc,CAAC,CAAC;IAE3B;;OAEG;IACH,IAAI,IAAI,IAAI,CAAC;IAEb;;OAEG;IACH,OAAO,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtE;;OAEG;IACH,UAAU,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAEnE;;OAEG;IACH,KAAK,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAE5D;;OAEG;IACH,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;CAChE;AAID,qBAAa,cAAe,YAAW,eAAe;aAgBlC,MAAM,EAAE,MAAM;IACvB,OAAO,EAAE,OAAO;IAhBzB,OAAO,CAAC,SAAS,CAAC,CAAkB;IACpC,OAAO,CAAC,4BAA4B,CAG7B;IAEP,OAAO,CAAC,uBAAuB,CAAmB;IAClD,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,iBAAiB,CAAwC;IAEjE,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC,OAAO;WAeM,IAAI,CACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,cAAc,CAAC;IAU1B,IAAI,QAAQ,IAAI,eAAe,GAAG,SAAS,CAE1C;IAED,OAAO,CAAC,YAAY;IAWpB,OAAO,CAAC,SAAS;IAKjB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,cAAc;YAUR,UAAU;IA6DxB,OAAO,CAAC,YAAY;IAoCpB,OAAO,CAAC,aAAa;YA4BP,gBAAgB;YAyChB,iBAAiB;IAiB/B,OAAO,CAAC,8BAA8B;IAYtC,OAAO,CAAC,4BAA4B;YAOtB,gBAAgB;YAWhB,kBAAkB;IAchC,OAAO,CAAC,qBAAqB;YAgBf,cAAc;IA4C5B;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAiB1B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAI1B,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;IAK/D,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;IAiBnE,UAAU,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAkB3D,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAuBlE,IAAI;IAIJ,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG;CAGxC"}

package/dist/cjs/src/FormoAnalytics.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -53,7 +42,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormoAnalytics = void 0;
 var axios_1 = __importDefault(require("axios"));
 var constants_1 = require("./constants");
-var utils_1 = require("./utils");
 var highlight_run_1 = require("highlight.run");
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(apiKey, options) {
@@ -93,9 +81,6 @@ var FormoAnalytics = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    FormoAnalytics.prototype.identifyUser = function (userData) {
-        this.trackEvent(constants_1.Event.IDENTIFY, userData);
-    };
     FormoAnalytics.prototype.getSessionId = function () {
         var existingSessionId = this.getCookieValue(this.sessionIdKey);
         if (existingSessionId) {
@@ -146,7 +131,7 @@ var FormoAnalytics = /** @class */ (function () {
                             timestamp: new Date().toISOString(),
                             action: action,
                             version: '1',
-                            payload: (0, utils_1.isNotEmpty)(payload) ? this.maskSensitiveData(payload) : payload,
+                            payload: payload,
                         };
                         sendRequest = function () { return __awaiter(_this, void 0, void 0, function () {
                             var response, error_1, retryDelay;
@@ -157,7 +142,7 @@ var FormoAnalytics = /** @class */ (function () {
                                         return [4 /*yield*/, axios_1.default.post(constants_1.EVENTS_API_URL, JSON.stringify(requestData), {
                                                 headers: {
                                                     'Content-Type': 'application/json',
-                                                    Authorization: "Bearer ".concat(this.apiKey)
+                                                    Authorization: "Bearer ".concat(this.apiKey),
                                                 },
                                             })];
                                     case 1:
@@ -194,62 +179,6 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    // Function to mask sensitive data in the payload
-    FormoAnalytics.prototype.maskSensitiveData = function (data) {
-        // Check if data is null or undefined
-        if (data === null || data === undefined) {
-            console.warn('Data is null or undefined, returning null');
-            return null;
-        }
-        // Check if data is a string; if so, parse it to an object
-        if (typeof data === 'string') {
-            var parsedData = void 0;
-            try {
-                parsedData = JSON.parse(data);
-            }
-            catch (error) {
-                console.error('Failed to parse JSON:', error);
-                return null; // Return null if parsing fails
-            }
-            var sensitiveFields = [
-                'username',
-                'user',
-                'user_id',
-                'password',
-                'email',
-                'phone',
-            ];
-            // Create a new object to store masked data
-            var maskedData_1 = __assign({}, parsedData);
-            // Mask sensitive fields
-            sensitiveFields.forEach(function (field) {
-                if (field in maskedData_1) {
-                    maskedData_1[field] = '********'; // Replace value with masked string
-                }
-            });
-            return maskedData_1; // Return the new object with masked fields
-        }
-        else if (typeof data === 'object') {
-            // If data is already an object, handle masking directly
-            var sensitiveFields = [
-                'username',
-                'user',
-                'user_id',
-                'password',
-                'email',
-                'phone',
-            ];
-            var maskedData_2 = __assign({}, data);
-            // Mask sensitive fields
-            sensitiveFields.forEach(function (field) {
-                if (field in maskedData_2) {
-                    maskedData_2[field] = '********'; // Replace value with masked string
-                }
-            });
-            return maskedData_2; // Return the new object with masked fields
-        }
-        return data;
-    };
     // Function to track page hits
     FormoAnalytics.prototype.trackPageHit = function () {
         var _this = this;
@@ -273,6 +202,7 @@ var FormoAnalytics = /** @class */ (function () {
             var params = new URLSearchParams(url.search);
             _this.trackEvent(constants_1.Event.PAGE, {
                 'user-agent': window.navigator.userAgent,
+                address: _this.currentConnectedAddress,
                 locale: language,
                 location: location,
                 referrer: document.referrer,
@@ -287,10 +217,11 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.trackProvider = function (provider) {
         if (provider === this._provider) {
+            console.log('Provider already tracked.');
             return;
         }
         this.currentChainId = undefined;
-        this.currentConnectedAccount = undefined;
+        this.currentConnectedAddress = undefined;
         if (this._provider) {
             var eventNames = Object.keys(this._registeredProviderListeners);
             for (var _i = 0, eventNames_1 = eventNames; _i < eventNames_1.length; _i++) {
@@ -299,49 +230,25 @@ var FormoAnalytics = /** @class */ (function () {
                 delete this._registeredProviderListeners[eventName];
             }
         }
+        console.log('Tracking new provider:', provider);
         this._provider = provider;
         this.getCurrentWallet();
-        this.registerAccountsChangedListener();
+        this.registerAddressChangedListener();
         this.registerChainChangedListener();
     };
-    FormoAnalytics.prototype.registerChainChangedListener = function () {
-        var _this = this;
-        var _a;
-        var listener = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            return _this.onChainChanged(args[0]);
-        };
-        (_a = this.provider) === null || _a === void 0 ? void 0 : _a.on('chainChanged', listener);
-        this._registeredProviderListeners['chainChanged'] = listener;
-    };
-    FormoAnalytics.prototype.handleAccountDisconnected = function () {
-        if (!this.currentConnectedAccount) {
-            return;
-        }
-        var disconnectAttributes = {
-            address: this.currentConnectedAccount,
-            chainId: this.currentChainId,
-        };
-        this.currentChainId = undefined;
-        this.currentConnectedAccount = undefined;
-        this.clearWalletAddress();
-        return this.trackEvent(constants_1.Event.DISCONNECT, disconnectAttributes);
-    };
-    FormoAnalytics.prototype.onChainChanged = function (chainIdHex) {
+    FormoAnalytics.prototype.getCurrentWallet = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var res, err_1;
+            var sessionData, accounts, address, err_1, parsedData, sessionExpiry, currentTime;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.currentChainId = parseInt(chainIdHex).toString();
-                        if (!!this.currentConnectedAccount) return [3 /*break*/, 4];
                         if (!this.provider) {
-                            console.error('error', 'FormoAnalytics::onChainChanged: provider not found. CHAIN_CHANGED not reported');
+                            console.warn('FormoAnalytics::getCurrentWallet: the provider is not set');
                             return [2 /*return*/];
                         }
+                        sessionData = sessionStorage.getItem(this.walletAddressSessionKey);
+                        if (!!sessionData) return [3 /*break*/, 5];
+                        console.warn('Session data missing. Attempting to fetch address from provider.');
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
@@ -349,63 +256,33 @@ var FormoAnalytics = /** @class */ (function () {
                                 method: 'eth_accounts',
                             })];
                     case 2:
-                        res = _a.sent();
-                        if (!res || res.length === 0) {
-                            console.error('error', 'FormoAnalytics::onChainChanged: unable to get account. eth_accounts returned empty');
-                            return [2 /*return*/];
+                        accounts = _a.sent();
+                        if (accounts && accounts.length > 0) {
+                            address = accounts[0];
+                            this.storeWalletAddress(address);
+                            return [2 /*return*/, address];
                         }
-                        this.currentConnectedAccount = res[0];
                         return [3 /*break*/, 4];
                     case 3:
                         err_1 = _a.sent();
-                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                        if (err_1.code !== 4001) {
-                            // 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_accounts threw an error", err_1);
-                            return [2 /*return*/];
-                        }
+                        console.error('Failed to fetch accounts from provider:', err_1);
                         return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/, this.chain({
-                            chainId: this.currentChainId,
-                            account: this.currentConnectedAccount,
-                        })];
-                }
-            });
-        });
-    };
-    FormoAnalytics.prototype.onAccountsChanged = function (accounts) {
-        return __awaiter(this, void 0, void 0, function () {
-            var newAccount;
-            return __generator(this, function (_a) {
-                if (accounts.length > 0) {
-                    newAccount = accounts[0];
-                    if (newAccount !== this.currentConnectedAccount) {
-                        this.handleAccountConnected(newAccount);
-                    }
-                }
-                else {
-                    this.handleAccountDisconnected();
+                    case 4: return [2 /*return*/, null];
+                    case 5:
+                        parsedData = JSON.parse(sessionData);
+                        sessionExpiry = 30 * 60 * 1000;
+                        currentTime = Date.now();
+                        if (currentTime - parsedData.timestamp > sessionExpiry) {
+                            console.warn('Session expired. Ignoring wallet address.');
+                            sessionStorage.removeItem(this.walletAddressSessionKey); // Clear expired session data
+                            return [2 /*return*/, ''];
+                        }
+                        this.onAddressConnected(parsedData.address);
+                        return [2 /*return*/, parsedData.address || ''];
                 }
-                return [2 /*return*/];
             });
         });
     };
-    FormoAnalytics.prototype.registerAccountsChangedListener = function () {
-        var _this = this;
-        var _a, _b;
-        var listener = function () {
-            var args = [];
-            for (var _i = 0; _i < arguments.length; _i++) {
-                args[_i] = arguments[_i];
-            }
-            return _this.onAccountsChanged(args[0]);
-        };
-        (_a = this._provider) === null || _a === void 0 ? void 0 : _a.on('accountsChanged', listener);
-        this._registeredProviderListeners['accountsChanged'] = listener;
-        var handleAccountDisconnected = this.handleAccountDisconnected.bind(this);
-        (_b = this._provider) === null || _b === void 0 ? void 0 : _b.on('disconnect', handleAccountDisconnected);
-        this._registeredProviderListeners['disconnect'] = handleAccountDisconnected;
-    };
     FormoAnalytics.prototype.getCurrentChainId = function () {
         return __awaiter(this, void 0, void 0, function () {
             var chainIdHex;
@@ -430,52 +307,129 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.handleAccountConnected = function (account) {
+    FormoAnalytics.prototype.registerAddressChangedListener = function () {
+        var _this = this;
+        var _a, _b;
+        var listener = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return _this.onAddressChanged(args[0]);
+        };
+        (_a = this._provider) === null || _a === void 0 ? void 0 : _a.on('accountsChanged', listener);
+        this._registeredProviderListeners['accountsChanged'] = listener;
+        var onAddressDisconnected = this.onAddressDisconnected.bind(this);
+        (_b = this._provider) === null || _b === void 0 ? void 0 : _b.on('disconnect', onAddressDisconnected);
+        this._registeredProviderListeners['disconnect'] = onAddressDisconnected;
+    };
+    FormoAnalytics.prototype.registerChainChangedListener = function () {
+        var _this = this;
+        var _a;
+        var listener = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return _this.onChainChanged(args[0]);
+        };
+        (_a = this.provider) === null || _a === void 0 ? void 0 : _a.on('chainChanged', listener);
+        this._registeredProviderListeners['chainChanged'] = listener;
+    };
+    FormoAnalytics.prototype.onAddressChanged = function (addresses) {
+        return __awaiter(this, void 0, void 0, function () {
+            var newAccount;
+            return __generator(this, function (_a) {
+                if (addresses.length > 0) {
+                    newAccount = addresses[0];
+                    if (newAccount !== this.currentConnectedAddress) {
+                        this.onAddressConnected(newAccount);
+                    }
+                }
+                else {
+                    this.onAddressDisconnected();
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    FormoAnalytics.prototype.onAddressConnected = function (address) {
         return __awaiter(this, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (account === this.currentConnectedAccount) {
-                            // We have already reported this account
+                        if (address === this.currentConnectedAddress) {
+                            // We have already reported this address
                             return [2 /*return*/];
                         }
                         else {
-                            this.currentConnectedAccount = account;
+                            this.currentConnectedAddress = address;
                         }
                         _a = this;
                         return [4 /*yield*/, this.getCurrentChainId()];
                     case 1:
                         _a.currentChainId = _b.sent();
-                        this.connect({ account: account, chainId: this.currentChainId });
-                        this.storeWalletAddress(account);
+                        this.connect({ chainId: this.currentChainId, address: address });
+                        this.storeWalletAddress(address);
                         return [2 /*return*/];
                 }
             });
         });
     };
-    FormoAnalytics.prototype.getCurrentWallet = function () {
+    FormoAnalytics.prototype.onAddressDisconnected = function () {
+        if (!this.currentConnectedAddress) {
+            return;
+        }
+        var payload = {
+            chain_id: this.currentChainId,
+            address: this.currentConnectedAddress,
+        };
+        this.currentChainId = undefined;
+        this.currentConnectedAddress = undefined;
+        this.clearWalletAddress();
+        return this.trackEvent(constants_1.Event.DISCONNECT, payload);
+    };
+    FormoAnalytics.prototype.onChainChanged = function (chainIdHex) {
         return __awaiter(this, void 0, void 0, function () {
-            var sessionData, parsedData, sessionExpiry, currentTime;
+            var res, err_2;
             return __generator(this, function (_a) {
-                if (!this.provider) {
-                    console.warn('FormoAnalytics::getCurrentWallet: the provider is not set');
-                    return [2 /*return*/];
-                }
-                sessionData = sessionStorage.getItem(this.walletAddressSessionKey);
-                if (!sessionData) {
-                    return [2 /*return*/, null];
-                }
-                parsedData = JSON.parse(sessionData);
-                sessionExpiry = 30 * 60 * 1000;
-                currentTime = Date.now();
-                if (currentTime - parsedData.timestamp > sessionExpiry) {
-                    console.warn('Session expired. Ignoring wallet address.');
-                    sessionStorage.removeItem(this.walletAddressSessionKey); // Clear expired session data
-                    return [2 /*return*/, ''];
+                switch (_a.label) {
+                    case 0:
+                        this.currentChainId = parseInt(chainIdHex).toString();
+                        if (!!this.currentConnectedAddress) return [3 /*break*/, 4];
+                        if (!this.provider) {
+                            console.error('error', 'FormoAnalytics::onChainChanged: provider not found. CHAIN_CHANGED not reported');
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.provider.request({
+                                method: 'eth_accounts',
+                            })];
+                    case 2:
+                        res = _a.sent();
+                        if (!res || res.length === 0) {
+                            console.error('error', 'FormoAnalytics::onChainChanged: unable to get account. eth_accounts returned empty');
+                            return [2 /*return*/];
+                        }
+                        this.currentConnectedAddress = res[0];
+                        return [3 /*break*/, 4];
+                    case 3:
+                        err_2 = _a.sent();
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        if (err_2.code !== 4001) {
+                            // 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_accounts threw an error", err_2);
+                            return [2 /*return*/];
+                        }
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/, this.chain({
+                            chainId: this.currentChainId,
+                            address: this.currentConnectedAddress,
+                        })];
                 }
-                this.handleAccountConnected(parsedData.address);
-                return [2 /*return*/, parsedData.address || ''];
             });
         });
     };
@@ -500,58 +454,57 @@ var FormoAnalytics = /** @class */ (function () {
     FormoAnalytics.prototype.clearWalletAddress = function () {
         sessionStorage.removeItem(this.walletAddressSessionKey);
     };
+    FormoAnalytics.prototype.init = function (apiKey, options) {
+        var instance = new FormoAnalytics(apiKey, options);
+        return Promise.resolve(instance);
+    };
     FormoAnalytics.prototype.connect = function (_a) {
-        var account = _a.account, chainId = _a.chainId;
+        var chainId = _a.chainId, address = _a.address;
         if (!chainId) {
-            throw new Error('FormoAnalytics::connect: chainId cannot be empty');
+            throw new Error('FormoAnalytics::connect: chain ID cannot be empty');
         }
-        if (!account) {
-            throw new Error('FormoAnalytics::connect: account cannot be empty');
+        if (!address) {
+            throw new Error('FormoAnalytics::connect: address cannot be empty');
         }
         this.currentChainId = chainId.toString();
-        this.currentConnectedAccount = account;
+        this.currentConnectedAddress = address;
         return this.trackEvent(constants_1.Event.CONNECT, {
-            chainId: chainId,
-            address: account,
+            chain_id: chainId,
+            address: address,
         });
     };
-    FormoAnalytics.prototype.disconnect = function (attributes) {
-        var account = (attributes === null || attributes === void 0 ? void 0 : attributes.account) || this.currentConnectedAccount;
-        if (!account) {
+    FormoAnalytics.prototype.disconnect = function (params) {
+        var address = (params === null || params === void 0 ? void 0 : params.address) || this.currentConnectedAddress;
+        if (!address) {
             // We have most likely already reported this disconnection with the automatic
             // `disconnect` detection
             return;
         }
-        var chainId = (attributes === null || attributes === void 0 ? void 0 : attributes.chainId) || this.currentChainId;
-        var eventAttributes = __assign({ account: account }, (chainId && { chainId: chainId }));
+        var payload = {
+            chain_id: (params === null || params === void 0 ? void 0 : params.chainId) || this.currentChainId,
+            address: address,
+        };
         this.currentChainId = undefined;
-        this.currentConnectedAccount = undefined;
-        return this.trackEvent(constants_1.Event.DISCONNECT, eventAttributes);
+        this.currentConnectedAddress = undefined;
+        return this.trackEvent(constants_1.Event.DISCONNECT, payload);
     };
     FormoAnalytics.prototype.chain = function (_a) {
-        var chainId = _a.chainId, account = _a.account;
+        var chainId = _a.chainId, address = _a.address;
         if (!chainId || Number(chainId) === 0) {
             throw new Error('FormoAnalytics::chain: chainId cannot be empty or 0');
         }
-        if (!account && !this.currentConnectedAccount) {
-            throw new Error('FormoAnalytics::chain: account was empty and no previous account has been recorded. You can either pass an account or call connect() first');
+        if (!address && !this.currentConnectedAddress) {
+            throw new Error('FormoAnalytics::chain: address was empty and no previous address has been recorded. You can either pass an address or call connect() first');
         }
         if (isNaN(Number(chainId))) {
             throw new Error('FormoAnalytics::chain: chainId must be a valid hex or decimal number');
         }
         this.currentChainId = chainId.toString();
         return this.trackEvent(constants_1.Event.CHAIN_CHANGED, {
-            chainId: chainId,
-            account: account || this.currentConnectedAccount,
+            chain_id: chainId,
+            address: address || this.currentConnectedAddress,
         });
     };
-    FormoAnalytics.prototype.init = function (apiKey, options) {
-        var instance = new FormoAnalytics(apiKey, options);
-        return Promise.resolve(instance);
-    };
-    FormoAnalytics.prototype.identify = function (userData) {
-        this.identifyUser(userData);
-    };
     FormoAnalytics.prototype.page = function () {
         this.trackPageHit();
     };