@formo/analytics 1.14.2 → 1.15.0

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

@@ -1,6 +1,7 @@
 import { ChainID, Address, EIP1193Provider, Options, Config, SignatureStatus, TransactionStatus } from "./types";
 interface IFormoAnalytics {
     page(): void;
+    reset(): void;
     connect(params: {
         chainId: ChainID;
         address: Address;
@@ -41,6 +42,8 @@ export declare class FormoAnalytics implements IFormoAnalytics {
     private _providerListeners;
     private session;
     private eventQueue;
+    private anonymousId;
+    private userId;
     config: Config;
     currentChainId?: ChainID;
     currentConnectedAddress?: Address;
@@ -51,6 +54,11 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      * @returns {Promise<void>}
      */
     page(): Promise<void>;
+    /**
+     * Reset the current user session.
+     * @returns {void}
+     */
+    reset(): void;
     /**
      * Emits a wallet connect event.
      * @param {ChainID} params.chainId
@@ -155,6 +163,8 @@ export declare class FormoAnalytics implements IFormoAnalytics {
     private getProviders;
     private identifyAll;
     get provider(): EIP1193Provider | undefined;
+    private getAnonymousId;
+    private getUserId;
     private getAddress;
     private getAccounts;
     private getCurrentChainId;

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":"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"}

package/dist/cjs/src/FormoAnalytics.js

@@ -46,41 +46,45 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormoAnalytics = void 0;
 var mipd_1 = require("mipd");
 var constants_1 = require("./constants");
 var types_1 = require("./types");
 var lib_1 = require("./lib");
+var utils_1 = require("./utils");
 var constants_2 = require("./constants");
-var queue_1 = require("./lib/queue");
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(writeKey, options) {
         if (options === void 0) { options = {}; }
+        var _this = this;
         this.writeKey = writeKey;
         this.options = options;
         this._providerListeners = {};
+        this.anonymousId = null;
+        this.userId = null;
         this.config = {
             writeKey: writeKey,
             trackLocalhost: options.trackLocalhost || false,
         };
         this.session = new FormoAnalyticsSession();
-        this.eventQueue = new queue_1.EventQueue(this.config.writeKey, {
+        // Initialize logger with configuration from options
+        var loggerConfig = options.logger || {
+            enabled: false,
+        };
+        lib_1.logger.setEnabled(loggerConfig.enabled);
+        if (loggerConfig.levels) {
+            lib_1.logger.setEnabledLevels(loggerConfig.levels);
+        }
+        this.eventQueue = new lib_1.EventQueue(this.config.writeKey, {
             url: constants_1.EVENTS_API_URL,
             flushAt: options.flushAt,
             retryCount: options.retryCount,
             maxQueueSize: options.maxQueueSize,
             flushInterval: options.flushInterval,
         });
+        this.anonymousId = this.getAnonymousId();
+        this.getUserId(null).then(function (userId) { return (_this.userId = userId); });
         // TODO: replace with eip6963
         var provider = options.provider || (window === null || window === void 0 ? void 0 : window.ethereum);
         if (provider) {
@@ -126,6 +130,16 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Reset the current user session.
+     * @returns {void}
+     */
+    FormoAnalytics.prototype.reset = function () {
+        this.anonymousId = this.getAnonymousId();
+        this.userId = null;
+        lib_1.local.remove(constants_1.LOCAL_ANONYMOUS_ID_KEY);
+        lib_1.session.remove(constants_1.SESSION_USER_ID_KEY);
+    };
     /**
      * Emits a wallet connect event.
      * @param {ChainID} params.chainId
@@ -140,10 +154,10 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         if (!chainId) {
-                            throw new Error("FormoAnalytics::connect: chain ID cannot be empty");
+                            lib_1.logger.warn("Connect: Chain ID cannot be empty");
                         }
                         if (!address) {
-                            throw new Error("FormoAnalytics::connect: address cannot be empty");
+                            lib_1.logger.warn("Connect: Address cannot be empty");
                         }
                         this.currentChainId = chainId;
                         this.currentConnectedAddress = address;
@@ -273,7 +287,7 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         if (this.session.isIdentified())
-                            return [2 /*return*/, console.warn("FormoAnalytics::identify: Wallet already identified in this session")];
+                            return [2 /*return*/, lib_1.logger.warn("Identify: Wallet already identified in this session")];
                         this.session.identify();
                         return [4 /*yield*/, this.trackEvent(constants_1.Event.IDENTIFY, {
                                 address: address,
@@ -309,26 +323,31 @@ var FormoAnalytics = /** @class */ (function () {
       SDK tracking and event listener functions
     */
     FormoAnalytics.prototype.trackProvider = function (provider) {
-        if (provider === this._provider) {
-            console.warn("FormoAnalytics::trackProvider: Provider already tracked.");
-            return;
-        }
-        this.currentChainId = undefined;
-        this.currentConnectedAddress = undefined;
-        if (this._provider) {
-            var actions = Object.keys(this._providerListeners);
-            for (var _i = 0, actions_1 = actions; _i < actions_1.length; _i++) {
-                var action = actions_1[_i];
-                this._provider.removeListener(action, this._providerListeners[action]);
-                delete this._providerListeners[action];
+        try {
+            if (provider === this._provider) {
+                lib_1.logger.warn("TrackProvider: Provider already tracked.");
+                return;
             }
+            this.currentChainId = undefined;
+            this.currentConnectedAddress = undefined;
+            if (this._provider) {
+                var actions = Object.keys(this._providerListeners);
+                for (var _i = 0, actions_1 = actions; _i < actions_1.length; _i++) {
+                    var action = actions_1[_i];
+                    this._provider.removeListener(action, this._providerListeners[action]);
+                    delete this._providerListeners[action];
+                }
+            }
+            this._provider = provider;
+            // Register listeners for web3 provider events
+            this.registerAddressChangedListener();
+            this.registerChainChangedListener();
+            this.registerSignatureListener();
+            this.registerTransactionListener();
+        }
+        catch (error) {
+            lib_1.logger.error("Error tracking provider:", error);
         }
-        this._provider = provider;
-        // Register listeners for web3 provider events
-        this.registerAddressChangedListener();
-        this.registerChainChangedListener();
-        this.registerSignatureListener();
-        this.registerTransactionListener();
     };
     FormoAnalytics.prototype.registerAddressChangedListener = function () {
         var _this = this;
@@ -363,12 +382,12 @@ var FormoAnalytics = /** @class */ (function () {
         var _this = this;
         var _a;
         if (!this.provider) {
-            console.error("_trackSigning: provider not found");
+            lib_1.logger.error("Provider not found for signature tracking");
             return;
         }
         if (((_a = Object.getOwnPropertyDescriptor(this.provider, "request")) === null || _a === void 0 ? void 0 : _a.writable) ===
             false) {
-            console.warn("_trackSigning: provider.request is not writable");
+            lib_1.logger.warn("Provider.request is not writable");
             return;
         }
         var request = this.provider.request.bind(this.provider);
@@ -411,12 +430,12 @@ var FormoAnalytics = /** @class */ (function () {
         var _this = this;
         var _a;
         if (!this.provider) {
-            console.error("_trackTransactions: provider not found");
+            lib_1.logger.error("Provider not found for transaction tracking");
             return;
         }
         if (((_a = Object.getOwnPropertyDescriptor(this.provider, "request")) === null || _a === void 0 ? void 0 : _a.writable) ===
             false) {
-            console.warn("_trackTransactions: provider.request is not writable");
+            lib_1.logger.warn("Provider.request is not writable");
             return;
         }
         var request = this.provider.request.bind(this.provider);
@@ -444,8 +463,8 @@ var FormoAnalytics = /** @class */ (function () {
                         return [2 /*return*/];
                     case 4:
                         error_2 = _c.sent();
-                        console.log("transaction listener catch");
-                        console.log(error_2);
+                        lib_1.logger.info("Transaction listener catch");
+                        lib_1.logger.error("Transaction error:", error_2);
                         rpcError = error_2;
                         if (rpcError && (rpcError === null || rpcError === void 0 ? void 0 : rpcError.code) === 4001) {
                             // Emit transaction rejected event
@@ -477,13 +496,10 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (address === this.currentConnectedAddress) {
+                        if (address === this.currentConnectedAddress)
                             // We have already reported this address
                             return [2 /*return*/];
-                        }
-                        else {
-                            this.currentConnectedAddress = address;
-                        }
+                        this.currentConnectedAddress = address;
                         _a = this;
                         return [4 /*yield*/, this.getCurrentChainId()];
                     case 1:
@@ -506,6 +522,7 @@ var FormoAnalytics = /** @class */ (function () {
                         };
                         this.currentChainId = undefined;
                         this.currentConnectedAddress = undefined;
+                        lib_1.session.remove(constants_1.SESSION_USER_ID_KEY);
                         return [4 /*yield*/, this.trackEvent(constants_1.Event.DISCONNECT, payload)];
                     case 1:
                         _a.sent();
@@ -528,26 +545,30 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.onChainChanged = function (chainIdHex) {
         return __awaiter(this, void 0, void 0, function () {
-            var address;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var address, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         this.currentChainId = parseInt(chainIdHex);
-                        if (!!this.currentConnectedAddress) return [3 /*break*/, 2];
+                        if (!!this.currentConnectedAddress) return [3 /*break*/, 3];
                         if (!this.provider) {
-                            console.log("FormoAnalytics::onChainChanged: provider not found. CHAIN_CHANGED not reported");
+                            lib_1.logger.info("OnChainChanged: Provider not found. CHAIN_CHANGED not reported");
                             return [2 /*return*/, Promise.resolve()];
                         }
                         return [4 /*yield*/, this.getAddress()];
                     case 1:
-                        address = _a.sent();
+                        address = _b.sent();
                         if (!address) {
-                            console.log("FormoAnalytics::onChainChanged: Unable to fetch or store connected address");
+                            lib_1.logger.info("OnChainChanged: Unable to fetch or store connected address");
                             return [2 /*return*/, Promise.resolve()];
                         }
                         this.currentConnectedAddress = address;
-                        _a.label = 2;
+                        _a = this;
+                        return [4 /*yield*/, this.getUserId(address)];
                     case 2:
+                        _a.userId = _b.sent();
+                        _b.label = 3;
+                    case 3:
                         // Proceed only if the address exists
                         if (this.currentConnectedAddress) {
                             return [2 /*return*/, this.chain({
@@ -556,7 +577,7 @@ var FormoAnalytics = /** @class */ (function () {
                                 })];
                         }
                         else {
-                            console.log("FormoAnalytics::onChainChanged: currentConnectedAddress is null despite fetch attempt");
+                            lib_1.logger.info("OnChainChanged: Current connected address is null despite fetch attempt");
                         }
                         return [2 /*return*/];
                 }
@@ -566,8 +587,8 @@ var FormoAnalytics = /** @class */ (function () {
     FormoAnalytics.prototype.trackFirstPageHit = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                if (lib_1.session.get(constants_1.CURRENT_URL_KEY) === null) {
-                    lib_1.session.set(constants_1.CURRENT_URL_KEY, window.location.href);
+                if (lib_1.session.get(constants_1.SESSION_CURRENT_URL_KEY) === null) {
+                    lib_1.session.set(constants_1.SESSION_CURRENT_URL_KEY, window.location.href);
                 }
                 return [2 /*return*/, this.trackPageHit()];
             });
@@ -608,9 +629,9 @@ var FormoAnalytics = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var currentUrl;
             return __generator(this, function (_a) {
-                currentUrl = lib_1.session.get(constants_1.CURRENT_URL_KEY);
+                currentUrl = lib_1.session.get(constants_1.SESSION_CURRENT_URL_KEY);
                 if (currentUrl !== window.location.href) {
-                    lib_1.session.set(constants_1.CURRENT_URL_KEY, window.location.href);
+                    lib_1.session.set(constants_1.SESSION_CURRENT_URL_KEY, window.location.href);
                     this.trackPageHit();
                 }
                 return [2 /*return*/];
@@ -621,8 +642,8 @@ var FormoAnalytics = /** @class */ (function () {
         var _this = this;
         var pathname = window.location.pathname;
         var hash = window.location.hash;
-        if (!this.config.trackLocalhost && (0, lib_1.isLocalhost)()) {
-            return console.warn("FormoAnalytics::trackPageHit: Ignoring event because website is running locally");
+        if (!this.config.trackLocalhost && (0, utils_1.isLocalhost)()) {
+            return lib_1.logger.warn("Track page hit: Ignoring event because website is running locally");
         }
         setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
@@ -636,33 +657,45 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.trackEvent = function (action, payload) {
         return __awaiter(this, void 0, void 0, function () {
-            var address, requestData;
+            var address, user_id, requestData, error_3;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.getAddress()];
+                    case 0:
+                        _b.trys.push([0, 5, , 6]);
+                        return [4 /*yield*/, this.getAddress()];
                     case 1:
                         address = _b.sent();
+                        return [4 /*yield*/, this.getUserId(address)];
+                    case 2:
+                        user_id = _b.sent();
                         _a = {
+                            anonymous_id: this.anonymousId,
+                            user_id: user_id,
                             address: address,
                             timestamp: new Date().toISOString(),
                             action: action,
                             version: "1"
                         };
-                        return [4 /*yield*/, this.buildEventPayload((0, lib_1.toSnakeCase)(payload))];
-                    case 2:
+                        return [4 /*yield*/, this.buildEventPayload((0, utils_1.toSnakeCase)(payload))];
+                    case 3:
                         requestData = (_a.payload = _b.sent(),
                             _a);
                         return [4 /*yield*/, this.eventQueue.enqueue(requestData, function (err, _, data) {
                                 if (err) {
-                                    console.error(err);
+                                    lib_1.logger.error("Error sending events:", err);
                                 }
                                 else
-                                    console.log("Events sent successfully: ".concat(data.length, " events"));
+                                    lib_1.logger.info("Events sent successfully: ".concat(data.length, " events"));
                             })];
-                    case 3:
+                    case 4:
                         _b.sent();
-                        return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 5:
+                        error_3 = _b.sent();
+                        lib_1.logger.error("Error tracking event:", error_3);
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -675,12 +708,12 @@ var FormoAnalytics = /** @class */ (function () {
             var store, providers;
             return __generator(this, function (_a) {
                 store = (0, mipd_1.createStore)();
-                providers = __spreadArray([], store.getProviders(), true);
+                providers = store.getProviders();
                 // TODO: consider using store.subscribe to detect changes to providers list
-                // store.subscribe(providers => (state.providers = providers))
+                store.subscribe(function (providerDetails) { return (providers = providerDetails); });
                 // Fallback to injected provider if no providers are found
                 if (providers.length === 0) {
-                    return [2 /*return*/, [window === null || window === void 0 ? void 0 : window.ethereum]];
+                    return [2 /*return*/, (window === null || window === void 0 ? void 0 : window.ethereum) ? [window.ethereum] : []];
                 }
                 return [2 /*return*/, providers];
             });
@@ -688,55 +721,57 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.identifyAll = function (providers) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, providers_1, _a, provider, info, accounts, _b, accounts_1, address, err_1;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _i, providers_1, eip6963ProviderDetail, accounts, _a, accounts_1, address, err_1;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        _c.trys.push([0, 11, , 12]);
+                        _b.trys.push([0, 11, , 12]);
                         _i = 0, providers_1 = providers;
-                        _c.label = 1;
+                        _b.label = 1;
                     case 1:
                         if (!(_i < providers_1.length)) return [3 /*break*/, 10];
-                        _a = providers_1[_i], provider = _a.provider, info = _a.info;
-                        return [4 /*yield*/, this.getAccounts(provider)];
+                        eip6963ProviderDetail = providers_1[_i];
+                        if (!eip6963ProviderDetail)
+                            return [3 /*break*/, 9];
+                        return [4 /*yield*/, this.getAccounts(eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.provider)];
                     case 2:
-                        accounts = _c.sent();
+                        accounts = _b.sent();
                         if (!(accounts && accounts.length > 0)) return [3 /*break*/, 7];
-                        _b = 0, accounts_1 = accounts;
-                        _c.label = 3;
+                        _a = 0, accounts_1 = accounts;
+                        _b.label = 3;
                     case 3:
-                        if (!(_b < accounts_1.length)) return [3 /*break*/, 6];
-                        address = accounts_1[_b];
+                        if (!(_a < accounts_1.length)) return [3 /*break*/, 6];
+                        address = accounts_1[_a];
                         return [4 /*yield*/, this.identify({
                                 address: address,
-                                providerName: info.name,
-                                rdns: info.rdns,
+                                providerName: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.name,
+                                rdns: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.rdns,
                             })];
                     case 4:
-                        _c.sent();
-                        _c.label = 5;
+                        _b.sent();
+                        _b.label = 5;
                     case 5:
-                        _b++;
+                        _a++;
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7: 
                     // Identify without accounts
                     return [4 /*yield*/, this.identify({
                             address: null,
-                            providerName: info.name,
-                            rdns: info.rdns,
+                            providerName: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.name,
+                            rdns: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.rdns,
                         })];
                     case 8:
                         // Identify without accounts
-                        _c.sent();
-                        _c.label = 9;
+                        _b.sent();
+                        _b.label = 9;
                     case 9:
                         _i++;
                         return [3 /*break*/, 1];
                     case 10: return [3 /*break*/, 12];
                     case 11:
-                        err_1 = _c.sent();
-                        console.log("identifying all => err", err_1);
+                        err_1 = _b.sent();
+                        lib_1.logger.error("Error identifying all:", err_1);
                         return [3 /*break*/, 12];
                     case 12: return [2 /*return*/];
                 }
@@ -750,6 +785,47 @@ var FormoAnalytics = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    FormoAnalytics.prototype.getAnonymousId = function () {
+        var storedAnonymousId = lib_1.local.get(constants_1.LOCAL_ANONYMOUS_ID_KEY);
+        if (storedAnonymousId && typeof storedAnonymousId === "string")
+            return storedAnonymousId;
+        var newAnonymousId = (0, utils_1.generateNativeUUID)();
+        lib_1.local.set(constants_1.LOCAL_ANONYMOUS_ID_KEY, newAnonymousId);
+        return newAnonymousId;
+    };
+    FormoAnalytics.prototype.getUserId = function (address) {
+        return __awaiter(this, void 0, void 0, function () {
+            var storedUserId, res, data, userId, newUserId;
+            var _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        storedUserId = lib_1.session.get(constants_1.SESSION_USER_ID_KEY);
+                        if (storedUserId && typeof storedUserId === "string")
+                            return [2 /*return*/, storedUserId];
+                        if (!address) return [3 /*break*/, 3];
+                        return [4 /*yield*/, (0, lib_1.fetch)("".concat(constants_1.USER_API_URL, "?address=").concat(address), {
+                                headers: (0, constants_1.EVENTS_API_REQUEST_HEADER)(this.writeKey),
+                                method: "GET",
+                            })];
+                    case 1:
+                        res = _c.sent();
+                        return [4 /*yield*/, res.json()];
+                    case 2:
+                        data = _c.sent();
+                        userId = (_b = (_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.user_id;
+                        if (userId) {
+                            lib_1.session.set(constants_1.SESSION_USER_ID_KEY, userId);
+                            return [2 /*return*/, userId];
+                        }
+                        newUserId = (0, utils_1.generateNativeUUID)();
+                        lib_1.session.set(constants_1.SESSION_USER_ID_KEY, newUserId);
+                        return [2 /*return*/, newUserId];
+                    case 3: return [2 /*return*/, null];
+                }
+            });
+        });
+    };
     FormoAnalytics.prototype.getAddress = function () {
         return __awaiter(this, void 0, void 0, function () {
             var accounts, err_2;
@@ -759,7 +835,7 @@ var FormoAnalytics = /** @class */ (function () {
                         if (this.currentConnectedAddress)
                             return [2 /*return*/, this.currentConnectedAddress];
                         if (!(this === null || this === void 0 ? void 0 : this.provider)) {
-                            console.log("FormoAnalytics::getAddress: the provider is not set");
+                            lib_1.logger.info("The provider is not set");
                             return [2 /*return*/, null];
                         }
                         _a.label = 1;
@@ -769,12 +845,15 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         accounts = _a.sent();
                         if (accounts && accounts.length > 0) {
-                            return [2 /*return*/, (0, lib_1.isAddress)(accounts[0]) ? accounts[0] : null];
+                            // TODO: fetch userId if account is valid, generate userId if no userId matches address from tinybird
+                            if ((0, utils_1.isAddress)(accounts[0])) {
+                                return [2 /*return*/, accounts[0]];
+                            }
                         }
                         return [3 /*break*/, 4];
                     case 3:
                         err_2 = _a.sent();
-                        console.log("Failed to fetch accounts from provider:", err_2);
+                        lib_1.logger.error("Failed to fetch accounts from provider:", err_2);
                         return [2 /*return*/, null];
                     case 4: return [2 /*return*/, null];
                 }
@@ -798,11 +877,11 @@ var FormoAnalytics = /** @class */ (function () {
                         res = _a.sent();
                         if (!res || res.length === 0)
                             return [2 /*return*/, null];
-                        return [2 /*return*/, res.filter(lib_1.isAddress)];
+                        return [2 /*return*/, res.filter(utils_1.isAddress)];
                     case 3:
                         err_3 = _a.sent();
                         if (err_3.code !== 4001) {
-                            console.log("FormoAnalytics::getAccounts: eth_accounts threw an error", err_3);
+                            lib_1.logger.error("FormoAnalytics::getAccounts: eth_accounts threw an error", err_3);
                         }
                         return [2 /*return*/, null];
                     case 4: return [2 /*return*/];
@@ -818,7 +897,7 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_b.label) {
                     case 0:
                         if (!this.provider) {
-                            console.error("FormoAnalytics::getCurrentChainId: provider not set");
+                            lib_1.logger.error("Provider not set for chain ID");
                         }
                         _b.label = 1;
                     case 1:
@@ -829,13 +908,13 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         chainIdHex = _b.sent();
                         if (!chainIdHex) {
-                            console.log("FormoAnalytics::fetchChainId: chain id not found");
+                            lib_1.logger.info("Chain id not found");
                             return [2 /*return*/, 0];
                         }
                         return [2 /*return*/, parseInt(chainIdHex, 16)];
                     case 3:
                         err_4 = _b.sent();
-                        console.log("FormoAnalytics::fetchChainId: eth_chainId threw an error", err_4);
+                        lib_1.logger.error("eth_chainId threw an error:", err_4);
                         return [2 /*return*/, 0];
                     case 4: return [2 /*return*/];
                 }
@@ -850,7 +929,7 @@ var FormoAnalytics = /** @class */ (function () {
             return timezone;
         }
         catch (error) {
-            console.error("Error resolving timezone:", error);
+            lib_1.logger.error("Error resolving timezone:", error);
             return "";
         }
     };
@@ -861,7 +940,7 @@ var FormoAnalytics = /** @class */ (function () {
                 : navigator.language) || "en");
         }
         catch (error) {
-            console.error("Error resolving language:", error);
+            lib_1.logger.error("Error resolving language:", error);
             return "en";
         }
     };