@formo/analytics 1.16.4 → 1.16.5

package/dist/esm/src/FormoAnalytics.js

@@ -46,11 +46,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { createStore } from "mipd";
-import { Event, EVENTS_API_URL, LOCAL_ANONYMOUS_ID_KEY, SESSION_CURRENT_URL_KEY, SESSION_USER_ID_KEY, SESSION_WALLET_DETECTED_KEY, } from "./constants";
-import { EventFactory, EventQueue, local, logger, Logger, session, } from "./lib";
+import { EVENTS_API_URL, EventType, LOCAL_ANONYMOUS_ID_KEY, SESSION_CURRENT_URL_KEY, SESSION_USER_ID_KEY, SESSION_WALLET_DETECTED_KEY, } from "./constants";
+import { EventManager, EventQueue, local, logger, Logger, session, } from "./lib";
 import { SignatureStatus, TransactionStatus, } from "./types";
-import { generateNativeUUID } from "./utils";
-import { isAddress, isArray, isLocalhost } from "./validators";
+import { isAddress, isLocalhost } from "./validators";
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(writeKey, options) {
         if (options === void 0) { options = {}; }
@@ -58,28 +57,25 @@ var FormoAnalytics = /** @class */ (function () {
         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.currentUserId =
+            session.get(SESSION_USER_ID_KEY) || undefined;
         // Initialize logger with configuration from options
         Logger.init({
             enabled: ((_a = options.logger) === null || _a === void 0 ? void 0 : _a.enabled) || false,
             enabledLevels: ((_b = options.logger) === null || _b === void 0 ? void 0 : _b.levels) || [],
         });
-        this.eventFactory = new EventFactory();
-        this.eventQueue = new EventQueue(this.config.writeKey, {
+        this.eventManager = new EventManager(new EventQueue(this.config.writeKey, {
             url: EVENTS_API_URL,
             flushAt: options.flushAt,
             retryCount: options.retryCount,
             maxQueueSize: options.maxQueueSize,
             flushInterval: options.flushInterval,
-        });
-        this.anonymousId = this.getAnonymousId();
-        this.userId = session.get(SESSION_USER_ID_KEY);
+        }));
         // TODO: replace with eip6963
         var provider = options.provider || (window === null || window === void 0 ? void 0 : window.ethereum);
         if (provider) {
@@ -98,7 +94,7 @@ var FormoAnalytics = /** @class */ (function () {
                         return [4 /*yield*/, analytics.getProviders()];
                     case 1:
                         providers = _a.sent();
-                        return [4 /*yield*/, analytics.detects(providers)];
+                        return [4 /*yield*/, analytics.detectWallets(providers)];
                     case 2:
                         _a.sent();
                         return [2 /*return*/, analytics];
@@ -111,13 +107,17 @@ var FormoAnalytics = /** @class */ (function () {
     */
     /**
      * Emits a page visit event with the current URL information, fire on page change.
+     * @param {string} category - The category of the page
+     * @param {string} name - The name of the page
+     * @param {Record<string, any>} properties - Additional properties to include
+     * @param {Record<string, any>} context - Additional context to include
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.page = function () {
+    FormoAnalytics.prototype.page = function (category, name, properties, context) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.trackPageHit()];
+                    case 0: return [4 /*yield*/, this.trackPageHit(category, name, properties, context)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -130,20 +130,22 @@ var FormoAnalytics = /** @class */ (function () {
      * @returns {void}
      */
     FormoAnalytics.prototype.reset = function () {
-        this.anonymousId = this.getAnonymousId();
-        this.userId = null;
+        this.currentUserId = undefined;
         local.remove(LOCAL_ANONYMOUS_ID_KEY);
         session.remove(SESSION_USER_ID_KEY);
     };
     /**
-     * Emits a wallet connect event.
+     * Emits a connect wallet event.
      * @param {ChainID} params.chainId
      * @param {Address} params.address
+     * @param {IFormoEventProperties} properties
+     * @param {IFormoEventContext} context
+     * @param {(...args: unknown[]) => void} callback
      * @throws {Error} If chainId or address is empty
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.connect = function (_a) {
-        return __awaiter(this, arguments, void 0, function (_b) {
+    FormoAnalytics.prototype.connect = function (_a, properties_1, context_1, callback_1) {
+        return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
             var chainId = _b.chainId, address = _b.address;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -155,11 +157,11 @@ var FormoAnalytics = /** @class */ (function () {
                             logger.warn("Connect: Address cannot be empty");
                         }
                         this.currentChainId = chainId;
-                        this.currentConnectedAddress = address;
-                        return [4 /*yield*/, this.trackEvent(Event.CONNECT, {
+                        this.currentAddress = address;
+                        return [4 /*yield*/, this.trackEvent(EventType.CONNECT, {
                                 chainId: chainId,
                                 address: address,
-                            })];
+                            }, properties, context, callback)];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];
@@ -171,17 +173,20 @@ var FormoAnalytics = /** @class */ (function () {
      * Emits a wallet disconnect event.
      * @param {ChainID} params.chainId
      * @param {Address} params.address
+     * @param {IFormoEventProperties} properties
+     * @param {IFormoEventContext} context
+     * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.disconnect = function (params) {
+    FormoAnalytics.prototype.disconnect = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
             var address, chainId;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        address = (params === null || params === void 0 ? void 0 : params.address) || this.currentConnectedAddress;
+                        address = (params === null || params === void 0 ? void 0 : params.address) || this.currentAddress;
                         chainId = (params === null || params === void 0 ? void 0 : params.chainId) || this.currentChainId;
-                        return [4 /*yield*/, this.handleDisconnect(chainId, address)];
+                        return [4 /*yield*/, this.handleDisconnect(chainId, address, properties, context, callback)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -193,12 +198,15 @@ var FormoAnalytics = /** @class */ (function () {
      * Emits a chain network change event.
      * @param {ChainID} params.chainId
      * @param {Address} params.address
+     * @param {IFormoEventProperties} properties
+     * @param {IFormoEventContext} context
+     * @param {(...args: unknown[]) => void} callback
      * @throws {Error} If chainId is empty, zero, or not a valid number
      * @throws {Error} If no address is provided and no previous address is recorded
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.chain = function (_a) {
-        return __awaiter(this, arguments, void 0, function (_b) {
+    FormoAnalytics.prototype.chain = function (_a, properties_1, context_1, callback_1) {
+        return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
             var chainId = _b.chainId, address = _b.address;
             return __generator(this, function (_c) {
                 switch (_c.label) {
@@ -209,14 +217,14 @@ var FormoAnalytics = /** @class */ (function () {
                         if (isNaN(Number(chainId))) {
                             throw new Error("FormoAnalytics::chain: chainId must be a valid decimal number");
                         }
-                        if (!address && !this.currentConnectedAddress) {
+                        if (!address && !this.currentAddress) {
                             throw new Error("FormoAnalytics::chain: address was empty and no previous address has been recorded");
                         }
                         this.currentChainId = chainId;
-                        return [4 /*yield*/, this.trackEvent(Event.CHAIN_CHANGED, {
+                        return [4 /*yield*/, this.trackEvent(EventType.CHAIN, {
                                 chainId: chainId,
-                                address: address || this.currentConnectedAddress,
-                            })];
+                                address: address || this.currentAddress,
+                            }, properties, context, callback)];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];
@@ -231,14 +239,17 @@ var FormoAnalytics = /** @class */ (function () {
      * @param {Address} params.address
      * @param {string} params.message
      * @param {string} params.signatureHash - only provided if status is confirmed
+     * @param {IFormoEventProperties} properties
+     * @param {IFormoEventContext} context
+     * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.signature = function (_a) {
-        return __awaiter(this, arguments, void 0, function (_b) {
+    FormoAnalytics.prototype.signature = function (_a, properties_1, context_1, callback_1) {
+        return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
             var status = _b.status, chainId = _b.chainId, address = _b.address, message = _b.message, signatureHash = _b.signatureHash;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.trackEvent(Event.SIGNATURE, __assign({ status: status, chainId: chainId, address: address, message: message }, (signatureHash && { signatureHash: signatureHash })))];
+                    case 0: return [4 /*yield*/, this.trackEvent(EventType.SIGNATURE, __assign({ status: status, chainId: chainId, address: address, message: message }, (signatureHash && { signatureHash: signatureHash })), properties, context, callback)];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];
@@ -255,14 +266,17 @@ var FormoAnalytics = /** @class */ (function () {
      * @param {string} params.to
      * @param {string} params.value
      * @param {string} params.transactionHash - only provided if status is broadcasted
+     * @param {IFormoEventProperties} properties
+     * @param {IFormoEventContext} context
+     * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.transaction = function (_a) {
-        return __awaiter(this, arguments, void 0, function (_b) {
+    FormoAnalytics.prototype.transaction = function (_a, properties_1, context_1, callback_1) {
+        return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
             var status = _b.status, chainId = _b.chainId, address = _b.address, data = _b.data, to = _b.to, value = _b.value, transactionHash = _b.transactionHash;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.trackEvent(Event.TRANSACTION, __assign({ status: status, chainId: chainId, address: address, data: data, to: to, value: value }, (transactionHash && { transactionHash: transactionHash })))];
+                    case 0: return [4 /*yield*/, this.trackEvent(EventType.TRANSACTION, __assign({ status: status, chainId: chainId, address: address, data: data, to: to, value: value }, (transactionHash && { transactionHash: transactionHash })), properties, context, callback)];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];
@@ -271,116 +285,63 @@ var FormoAnalytics = /** @class */ (function () {
         });
     };
     /**
-     * Emits an detect event with current wallet provider info.
+     * Emits an identify event with current wallet address and provider info.
      * @param {string} params.providerName
      * @param {string} params.rdns
      * @param {string} params.userId
      * @param {string} params.address
-     *
+     * @param {IFormoEventProperties} properties
+     * @param {IFormoEventContext} context
+     * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.identify = function (params) {
+    FormoAnalytics.prototype.identify = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var providers, _a, _i, providers_1, eip6963ProviderDetail, accounts, _b, accounts_1, address, err_1, _c, userId, address, providerName, rdns;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var userId, address, providerName, rdns;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        if (!(isArray(params) || !params)) return [3 /*break*/, 17];
-                        if (!isArray(params)) return [3 /*break*/, 1];
-                        _a = params;
-                        return [3 /*break*/, 3];
-                    case 1: return [4 /*yield*/, this.getProviders()];
-                    case 2:
-                        _a = _d.sent();
-                        _d.label = 3;
-                    case 3:
-                        providers = _a;
-                        _d.label = 4;
-                    case 4:
-                        _d.trys.push([4, 15, , 16]);
-                        _i = 0, providers_1 = providers;
-                        _d.label = 5;
-                    case 5:
-                        if (!(_i < providers_1.length)) return [3 /*break*/, 14];
-                        eip6963ProviderDetail = providers_1[_i];
-                        if (!eip6963ProviderDetail)
-                            return [3 /*break*/, 13];
-                        return [4 /*yield*/, this.getAccounts(eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.provider)];
-                    case 6:
-                        accounts = _d.sent();
-                        if (!(accounts && accounts.length > 0)) return [3 /*break*/, 11];
-                        _b = 0, accounts_1 = accounts;
-                        _d.label = 7;
-                    case 7:
-                        if (!(_b < accounts_1.length)) return [3 /*break*/, 10];
-                        address = accounts_1[_b];
-                        return [4 /*yield*/, this.identify({
-                                address: address,
-                                providerName: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.name,
-                                rdns: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.rdns,
-                            })];
-                    case 8:
-                        _d.sent();
-                        _d.label = 9;
-                    case 9:
-                        _b++;
-                        return [3 /*break*/, 7];
-                    case 10: return [3 /*break*/, 13];
-                    case 11: 
-                    // Identify without accounts
-                    return [4 /*yield*/, this.identify({
-                            address: null,
-                            providerName: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.name,
-                            rdns: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.rdns,
-                        })];
-                    case 12:
-                        // Identify without accounts
-                        _d.sent();
-                        _d.label = 13;
-                    case 13:
-                        _i++;
-                        return [3 /*break*/, 5];
-                    case 14: return [3 /*break*/, 16];
-                    case 15:
-                        err_1 = _d.sent();
-                        logger.error("Error identifying all:", err_1);
-                        return [3 /*break*/, 16];
-                    case 16: return [3 /*break*/, 19];
-                    case 17:
-                        _c = params, userId = _c.userId, address = _c.address, providerName = _c.providerName, rdns = _c.rdns;
-                        if (userId)
-                            this.userId = userId || null;
-                        return [4 /*yield*/, this.trackEvent(Event.IDENTIFY, {
+                        userId = params.userId, address = params.address, providerName = params.providerName, rdns = params.rdns;
+                        this.currentAddress = address;
+                        if (userId) {
+                            this.currentUserId = userId;
+                            session.set(SESSION_USER_ID_KEY, userId);
+                        }
+                        return [4 /*yield*/, this.trackEvent(EventType.IDENTIFY, {
                                 address: address,
                                 providerName: providerName,
+                                userId: userId,
                                 rdns: rdns,
-                            })];
-                    case 18:
-                        _d.sent();
-                        _d.label = 19;
-                    case 19: return [2 /*return*/];
+                            }, properties, context, callback)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
                 }
             });
         });
     };
     /**
-     * Emits an identify event with current wallet address.
-     * @param {Address} params.address
+     * Emits a detect wallet event with current wallet provider info.
+     * @param {string} params.providerName
+     * @param {string} params.rdns
+     * @param {IFormoEventProperties} properties
+     * @param {IFormoEventContext} context
+     * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.detect = function (_a) {
-        return __awaiter(this, arguments, void 0, function (_b) {
+    FormoAnalytics.prototype.detect = function (_a, properties_1, context_1, callback_1) {
+        return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
             var providerName = _b.providerName, rdns = _b.rdns;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         if (this.session.isWalletDetected(rdns))
-                            return [2 /*return*/, logger.warn("detect: Wallet ".concat(providerName, " already detected in this session"))];
-                        this.session.markWalletdetected(rdns);
-                        return [4 /*yield*/, this.trackEvent(Event.DETECT_WALLET, {
+                            return [2 /*return*/, logger.warn("Detect: Wallet ".concat(providerName, " already detected in this session"))];
+                        this.session.markWalletDetected(rdns);
+                        return [4 /*yield*/, this.trackEvent(EventType.DETECT, {
                                 providerName: providerName,
                                 rdns: rdns,
-                            })];
+                            }, properties, context, callback)];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];
@@ -389,16 +350,18 @@ var FormoAnalytics = /** @class */ (function () {
         });
     };
     /**
-     * Emits a custom event with custom data.
-     * @param {string} action
-     * @param {Record<string, any>} payload
+     * Emits a custom user event with custom properties.
+     * @param {string} event The name of the tracked event
+     * @param {IFormoEventProperties} properties
+     * @param {IFormoEventContext} context
+     * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.track = function (action, payload) {
+    FormoAnalytics.prototype.track = function (event, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.trackEvent(action, payload)];
+                    case 0: return [4 /*yield*/, this.trackEvent(EventType.TRACK, { event: event }, properties, context, callback)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -416,7 +379,7 @@ var FormoAnalytics = /** @class */ (function () {
                 return;
             }
             this.currentChainId = undefined;
-            this.currentConnectedAddress = undefined;
+            this.currentAddress = undefined;
             if (this._provider) {
                 var actions = Object.keys(this._providerListeners);
                 for (var _i = 0, actions_1 = actions; _i < actions_1.length; _i++) {
@@ -582,10 +545,10 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (address === this.currentConnectedAddress)
+                        if (address === this.currentAddress)
                             // We have already reported this address
                             return [2 /*return*/];
-                        this.currentConnectedAddress = address;
+                        this.currentAddress = address;
                         _a = this;
                         return [4 /*yield*/, this.getCurrentChainId()];
                     case 1:
@@ -596,20 +559,20 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.handleDisconnect = function (chainId, address) {
+    FormoAnalytics.prototype.handleDisconnect = function (chainId, address, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
             var payload;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         payload = {
-                            chain_id: chainId || this.currentChainId,
-                            address: address || this.currentConnectedAddress,
+                            chainId: chainId || this.currentChainId,
+                            address: address || this.currentAddress,
                         };
                         this.currentChainId = undefined;
-                        this.currentConnectedAddress = undefined;
+                        this.currentAddress = undefined;
                         session.remove(SESSION_USER_ID_KEY);
-                        return [4 /*yield*/, this.trackEvent(Event.DISCONNECT, payload)];
+                        return [4 /*yield*/, this.trackEvent(EventType.DISCONNECT, payload, properties, context, callback)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -621,7 +584,7 @@ var FormoAnalytics = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.handleDisconnect(this.currentChainId, this.currentConnectedAddress)];
+                    case 0: return [4 /*yield*/, this.handleDisconnect(this.currentChainId, this.currentAddress)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -636,7 +599,7 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.currentChainId = parseInt(chainIdHex);
-                        if (!!this.currentConnectedAddress) return [3 /*break*/, 2];
+                        if (!!this.currentAddress) return [3 /*break*/, 2];
                         if (!this.provider) {
                             logger.info("OnChainChanged: Provider not found. CHAIN_CHANGED not reported");
                             return [2 /*return*/, Promise.resolve()];
@@ -648,14 +611,14 @@ var FormoAnalytics = /** @class */ (function () {
                             logger.info("OnChainChanged: Unable to fetch or store connected address");
                             return [2 /*return*/, Promise.resolve()];
                         }
-                        this.currentConnectedAddress = address;
+                        this.currentAddress = address;
                         _a.label = 2;
                     case 2:
                         // Proceed only if the address exists
-                        if (this.currentConnectedAddress) {
+                        if (this.currentAddress) {
                             return [2 /*return*/, this.chain({
                                     chainId: this.currentChainId,
-                                    address: this.currentConnectedAddress,
+                                    address: this.currentAddress,
                                 })];
                         }
                         else {
@@ -720,46 +683,36 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.trackPageHit = function () {
-        var _this = this;
-        if (!this.config.trackLocalhost && isLocalhost()) {
-            return logger.warn("Track page hit: Ignoring event because website is running locally");
-        }
-        setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+    FormoAnalytics.prototype.trackPageHit = function (category, name, properties, context, callback) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
             return __generator(this, function (_a) {
-                this.trackEvent(Event.PAGE);
+                if (!this.config.trackLocalhost && isLocalhost()) {
+                    return [2 /*return*/, 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) {
+                        this.trackEvent(EventType.PAGE, {
+                            category: category,
+                            name: name,
+                        }, properties, context, callback);
+                        return [2 /*return*/];
+                    });
+                }); }, 300);
                 return [2 /*return*/];
             });
-        }); }, 300);
+        });
     };
-    FormoAnalytics.prototype.trackEvent = function (action, payload) {
+    FormoAnalytics.prototype.trackEvent = function (type, payload, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var address, user_id, requestData, error_3;
             return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 3, , 4]);
-                        return [4 /*yield*/, this.getAddress()];
-                    case 1:
-                        address = _a.sent();
-                        user_id = this.userId;
-                        requestData = this.eventFactory.create(this.anonymousId, user_id, address, __assign({ action: action }, payload));
-                        return [4 /*yield*/, this.eventQueue.enqueue(requestData, function (err, _, data) {
-                                if (err) {
-                                    logger.error("Error sending events:", err);
-                                }
-                                else
-                                    logger.info("Events sent successfully: ".concat(data.length, " events"));
-                            })];
-                    case 2:
-                        _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_3 = _a.sent();
-                        logger.error("Error tracking event:", error_3);
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                try {
+                    this.eventManager.addEvent(__assign(__assign({ type: type }, payload), { properties: properties, context: context, callback: callback }), this.currentAddress, this.currentUserId);
                 }
+                catch (error) {
+                    logger.error("Error tracking event:", error);
+                }
+                return [2 /*return*/];
             });
         });
     };
@@ -782,18 +735,18 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.detects = function (providers) {
+    FormoAnalytics.prototype.detectWallets = function (providers) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, providers_2, eip6963ProviderDetail, err_2;
+            var _i, providers_1, eip6963ProviderDetail, err_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 5, , 6]);
-                        _i = 0, providers_2 = providers;
+                        _i = 0, providers_1 = providers;
                         _a.label = 1;
                     case 1:
-                        if (!(_i < providers_2.length)) return [3 /*break*/, 4];
-                        eip6963ProviderDetail = providers_2[_i];
+                        if (!(_i < providers_1.length)) return [3 /*break*/, 4];
+                        eip6963ProviderDetail = providers_1[_i];
                         return [4 /*yield*/, this.detect({
                                 providerName: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.name,
                                 rdns: eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.info.rdns,
@@ -806,8 +759,8 @@ var FormoAnalytics = /** @class */ (function () {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 6];
                     case 5:
-                        err_2 = _a.sent();
-                        logger.error("Error detect all wallets:", err_2);
+                        err_1 = _a.sent();
+                        logger.error("Error detect all wallets:", err_1);
                         return [3 /*break*/, 6];
                     case 6: return [2 /*return*/];
                 }
@@ -821,22 +774,14 @@ var FormoAnalytics = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    FormoAnalytics.prototype.getAnonymousId = function () {
-        var storedAnonymousId = local.get(LOCAL_ANONYMOUS_ID_KEY);
-        if (storedAnonymousId && typeof storedAnonymousId === "string")
-            return storedAnonymousId;
-        var newAnonymousId = generateNativeUUID();
-        local.set(LOCAL_ANONYMOUS_ID_KEY, newAnonymousId);
-        return newAnonymousId;
-    };
     FormoAnalytics.prototype.getAddress = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var accounts, err_3;
+            var accounts, err_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this.currentConnectedAddress)
-                            return [2 /*return*/, this.currentConnectedAddress];
+                        if (this.currentAddress)
+                            return [2 /*return*/, this.currentAddress];
                         if (!(this === null || this === void 0 ? void 0 : this.provider)) {
                             logger.info("The provider is not set");
                             return [2 /*return*/, null];
@@ -854,8 +799,8 @@ var FormoAnalytics = /** @class */ (function () {
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        err_3 = _a.sent();
-                        logger.error("Failed to fetch accounts from provider:", err_3);
+                        err_2 = _a.sent();
+                        logger.error("Failed to fetch accounts from provider:", err_2);
                         return [2 /*return*/, null];
                     case 4: return [2 /*return*/, null];
                 }
@@ -864,7 +809,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.getAccounts = function (provider) {
         return __awaiter(this, void 0, void 0, function () {
-            var p, res, err_4;
+            var p, res, err_3;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -881,9 +826,9 @@ var FormoAnalytics = /** @class */ (function () {
                             return [2 /*return*/, null];
                         return [2 /*return*/, res.filter(function (e) { return isAddress(e); })];
                     case 3:
-                        err_4 = _a.sent();
-                        if (err_4.code !== 4001) {
-                            logger.error("FormoAnalytics::getAccounts: eth_accounts threw an error", err_4);
+                        err_3 = _a.sent();
+                        if (err_3.code !== 4001) {
+                            logger.error("FormoAnalytics::getAccounts: eth_accounts threw an error", err_3);
                         }
                         return [2 /*return*/, null];
                     case 4: return [2 /*return*/];
@@ -893,7 +838,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.getCurrentChainId = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var chainIdHex, err_5;
+            var chainIdHex, err_4;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -915,8 +860,8 @@ var FormoAnalytics = /** @class */ (function () {
                         }
                         return [2 /*return*/, parseInt(chainIdHex, 16)];
                     case 3:
-                        err_5 = _b.sent();
-                        logger.error("eth_chainId threw an error:", err_5);
+                        err_4 = _b.sent();
+                        logger.error("eth_chainId threw an error:", err_4);
                         return [2 /*return*/, 0];
                     case 4: return [2 /*return*/];
                 }
@@ -971,7 +916,7 @@ var FormoAnalyticsSession = /** @class */ (function () {
         var rdnses = session.get(SESSION_WALLET_DETECTED_KEY) || [];
         return rdnses.includes(rdns);
     };
-    FormoAnalyticsSession.prototype.markWalletdetected = function (rdns) {
+    FormoAnalyticsSession.prototype.markWalletDetected = function (rdns) {
         var rdnses = session.get(SESSION_WALLET_DETECTED_KEY) || [];
         rdnses.push(rdns);
         session.set(SESSION_WALLET_DETECTED_KEY, rdnses);