@formo/analytics 1.17.8 → 1.18.0

package/dist/cjs/src/FormoAnalytics.js

@@ -53,6 +53,7 @@ var constants_1 = require("./constants");
 var lib_1 = require("./lib");
 var types_1 = require("./types");
 var validators_1 = require("./validators");
+var chain_1 = require("./utils/chain");
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(writeKey, options) {
         if (options === void 0) { options = {}; }
@@ -65,8 +66,8 @@ var FormoAnalytics = /** @class */ (function () {
         this.currentUserId = "";
         this.config = {
             writeKey: writeKey,
-            trackLocalhost: options.trackLocalhost || false,
         };
+        this.options = options;
         this.session = new FormoAnalyticsSession();
         this.currentUserId =
             (0, lib_1.cookie)().get(constants_1.SESSION_USER_ID_KEY) || undefined;
@@ -95,7 +96,7 @@ var FormoAnalytics = /** @class */ (function () {
         if (provider) {
             this.trackProvider(provider);
         }
-        this.trackFirstPageHit();
+        this.trackPageHit();
         this.trackPageHits();
     }
     FormoAnalytics.init = function (writeKey, options) {
@@ -129,13 +130,14 @@ var FormoAnalytics = /** @class */ (function () {
      * @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
+     * @param {(...args: unknown[]) => void} callback - Optional callback function
      * @returns {Promise<void>}
      */
-    FormoAnalytics.prototype.page = function (category, name, properties, context) {
+    FormoAnalytics.prototype.page = function (category, name, 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.trackPageHit(category, name, properties, context)];
+                    case 0: return [4 /*yield*/, this.trackPageHit(category, name, properties, context, callback)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -188,9 +190,9 @@ var FormoAnalytics = /** @class */ (function () {
         });
     };
     /**
-     * Emits a wallet disconnect event.
-     * @param {ChainID} params.chainId
-     * @param {Address} params.address
+     * Emits a disconnect wallet event.
+     * @param {ChainID} [params.chainId]
+     * @param {Address} [params.address]
      * @param {IFormoEventProperties} properties
      * @param {IFormoEventContext} context
      * @param {(...args: unknown[]) => void} callback
@@ -198,15 +200,21 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.disconnect = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var address, chainId;
+            var chainId, address;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        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, properties, context, callback)];
+                        address = (params === null || params === void 0 ? void 0 : params.address) || this.currentAddress;
+                        return [4 /*yield*/, this.trackEvent(constants_1.EventType.DISCONNECT, {
+                                chainId: chainId,
+                                address: address,
+                            }, properties, context, callback)];
                     case 1:
                         _a.sent();
+                        this.currentAddress = undefined;
+                        this.currentChainId = undefined;
+                        lib_1.logger.info("Wallet disconnected: Cleared currentAddress and currentChainId");
                         return [2 /*return*/];
                 }
             });
@@ -438,6 +446,7 @@ var FormoAnalytics = /** @class */ (function () {
       SDK tracking and event listener functions
     */
     FormoAnalytics.prototype.trackProvider = function (provider) {
+        lib_1.logger.info("trackProvider", provider);
         try {
             if (provider === this._provider) {
                 lib_1.logger.warn("TrackProvider: Provider already tracked.");
@@ -455,168 +464,54 @@ var FormoAnalytics = /** @class */ (function () {
             }
             this._provider = provider;
             // Register listeners for web3 provider events
-            this.registerAddressChangedListener();
+            this.registerAccountsChangedListener();
             this.registerChainChangedListener();
-            this.registerSignatureListener();
-            this.registerTransactionListener();
+            this.registerConnectListener();
+            this.registerRequestListeners();
         }
         catch (error) {
             lib_1.logger.error("Error tracking provider:", error);
         }
     };
-    FormoAnalytics.prototype.registerAddressChangedListener = function () {
+    FormoAnalytics.prototype.registerAccountsChangedListener = function () {
         var _this = this;
-        var _a, _b;
+        var _a;
+        lib_1.logger.info("registerAccountsChangedListener");
         var listener = function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return _this.onAddressChanged(args[0]);
+            return _this.onAccountsChanged(args[0]);
         };
         (_a = this._provider) === null || _a === void 0 ? void 0 : _a.on("accountsChanged", listener);
         this._providerListeners["accountsChanged"] = listener;
-        var onAddressDisconnected = this.onAddressDisconnected.bind(this);
-        (_b = this._provider) === null || _b === void 0 ? void 0 : _b.on("disconnect", onAddressDisconnected);
-        this._providerListeners["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._providerListeners["chainChanged"] = listener;
     };
-    FormoAnalytics.prototype.registerSignatureListener = function () {
-        var _this = this;
-        var _a;
-        if (!this.provider) {
-            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) {
-            lib_1.logger.warn("Provider.request is not writable");
-            return;
-        }
-        var request = this.provider.request.bind(this.provider);
-        this.provider.request = function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
-            var response, error_1, rpcError;
-            var method = _b.method, params = _b.params;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        if (!(Array.isArray(params) &&
-                            ["eth_signTypedData_v4", "personal_sign"].includes(method))) return [3 /*break*/, 4];
-                        // Emit signature request event
-                        this.signature(__assign({ status: types_1.SignatureStatus.REQUESTED }, this.buildSignatureEventPayload(method, params)));
-                        _c.label = 1;
-                    case 1:
-                        _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, request({ method: method, params: params })];
-                    case 2:
-                        response = (_c.sent());
-                        if (response) {
-                            // Emit signature confirmed event
-                            this.signature(__assign({ status: types_1.SignatureStatus.CONFIRMED }, this.buildSignatureEventPayload(method, params, response)));
-                        }
-                        return [2 /*return*/, response];
-                    case 3:
-                        error_1 = _c.sent();
-                        rpcError = error_1;
-                        if (rpcError && (rpcError === null || rpcError === void 0 ? void 0 : rpcError.code) === 4001) {
-                            // Emit signature rejected event
-                            this.signature(__assign({ status: types_1.SignatureStatus.REJECTED }, this.buildSignatureEventPayload(method, params)));
-                        }
-                        throw error_1;
-                    case 4: return [2 /*return*/, request({ method: method, params: params })];
-                }
-            });
-        }); };
-        return;
-    };
-    FormoAnalytics.prototype.registerTransactionListener = function () {
-        var _this = this;
-        var _a;
-        if (!this.provider) {
-            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) {
-            lib_1.logger.warn("Provider.request is not writable");
-            return;
-        }
-        var request = this.provider.request.bind(this.provider);
-        this.provider.request = function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
-            var payload, transactionHash, error_2, rpcError;
-            var method = _b.method, params = _b.params;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        if (!(Array.isArray(params) &&
-                            method === "eth_sendTransaction" &&
-                            params[0])) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.buildTransactionEventPayload(params)];
-                    case 1:
-                        payload = _c.sent();
-                        this.transaction(__assign({ status: types_1.TransactionStatus.STARTED }, payload));
-                        _c.label = 2;
-                    case 2:
-                        _c.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, request({ method: method, params: params })];
-                    case 3:
-                        transactionHash = (_c.sent());
-                        // Track transaction broadcast
-                        this.transaction(__assign(__assign({ status: types_1.TransactionStatus.BROADCASTED }, payload), { transactionHash: transactionHash }));
-                        return [2 /*return*/];
-                    case 4:
-                        error_2 = _c.sent();
-                        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
-                            this.transaction(__assign({ status: types_1.TransactionStatus.REJECTED }, payload));
-                        }
-                        throw error_2;
-                    case 5: return [2 /*return*/, request({ method: method, params: params })];
-                }
-            });
-        }); };
-        return;
-    };
-    FormoAnalytics.prototype.onAddressChanged = function (addresses) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                if (addresses.length > 0) {
-                    this.onAddressConnected(addresses[0]);
-                }
-                else {
-                    this.onAddressDisconnected();
-                }
-                return [2 /*return*/];
-            });
-        });
-    };
-    FormoAnalytics.prototype.onAddressConnected = function (address) {
+    FormoAnalytics.prototype.onAccountsChanged = function (accounts) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a;
+            var address, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (address === this.currentAddress)
+                        lib_1.logger.info("onAccountsChanged", accounts);
+                        if (!(accounts.length === 0)) return [3 /*break*/, 2];
+                        // Handle wallet disconnect
+                        return [4 /*yield*/, this.disconnect()];
+                    case 1:
+                        // Handle wallet disconnect
+                        _b.sent();
+                        return [2 /*return*/];
+                    case 2:
+                        address = accounts[0];
+                        if (address === this.currentAddress) {
                             // We have already reported this address
                             return [2 /*return*/];
+                        }
+                        // Handle wallet connect
                         this.currentAddress = address;
                         _a = this;
                         return [4 /*yield*/, this.getCurrentChainId()];
-                    case 1:
+                    case 3:
                         _a.currentChainId = _b.sent();
                         this.connect({ chainId: this.currentChainId, address: address });
                         return [2 /*return*/];
@@ -624,38 +519,19 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    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 = {
-                            chainId: chainId || this.currentChainId,
-                            address: address || this.currentAddress,
-                        };
-                        this.currentChainId = undefined;
-                        this.currentAddress = undefined;
-                        (0, lib_1.cookie)().remove(constants_1.SESSION_USER_ID_KEY);
-                        return [4 /*yield*/, this.trackEvent(constants_1.EventType.DISCONNECT, payload, properties, context, callback)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    FormoAnalytics.prototype.onAddressDisconnected = 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.currentAddress)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
+    FormoAnalytics.prototype.registerChainChangedListener = function () {
+        var _this = this;
+        var _a;
+        lib_1.logger.info("registerChainChangedListener");
+        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._providerListeners["chainChanged"] = listener;
     };
     FormoAnalytics.prototype.onChainChanged = function (chainIdHex) {
         return __awaiter(this, void 0, void 0, function () {
@@ -663,7 +539,8 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        this.currentChainId = parseInt(chainIdHex);
+                        lib_1.logger.info("onChainChanged", chainIdHex);
+                        this.currentChainId = (0, chain_1.parseChainId)(chainIdHex);
                         if (!!this.currentAddress) return [3 /*break*/, 2];
                         if (!this.provider) {
                             lib_1.logger.info("OnChainChanged: Provider not found. CHAIN_CHANGED not reported");
@@ -694,13 +571,217 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.trackFirstPageHit = function () {
+    FormoAnalytics.prototype.registerConnectListener = function () {
+        var _this = this;
+        var _a;
+        lib_1.logger.info("registerConnectListener");
+        var listener = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            var connection = args[0];
+            _this.onConnected(connection);
+        };
+        (_a = this._provider) === null || _a === void 0 ? void 0 : _a.on("connect", listener);
+        this._providerListeners["connect"] = listener;
+    };
+    FormoAnalytics.prototype.onConnected = function (connection) {
+        return __awaiter(this, void 0, void 0, function () {
+            var chainId, address, e_2;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        lib_1.logger.info("onConnected", connection);
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        if (!connection || typeof connection.chainId !== 'string')
+                            return [2 /*return*/];
+                        chainId = (0, chain_1.parseChainId)(connection.chainId);
+                        return [4 /*yield*/, this.getAddress()];
+                    case 2:
+                        address = _a.sent();
+                        if (chainId !== null && chainId !== undefined && address) {
+                            this.connect({ chainId: chainId, address: address });
+                        }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        e_2 = _a.sent();
+                        lib_1.logger.error("Error handling connect event", e_2);
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FormoAnalytics.prototype.registerRequestListeners = function () {
+        var _this = this;
+        var _a;
+        lib_1.logger.info("registerRequestListeners");
+        if (!this.provider) {
+            lib_1.logger.error("Provider not found for request (signature, transaction) tracking");
+            return;
+        }
+        if (((_a = Object.getOwnPropertyDescriptor(this.provider, "request")) === null || _a === void 0 ? void 0 : _a.writable) ===
+            false) {
+            lib_1.logger.warn("Provider.request is not writable");
+            return;
+        }
+        var request = this.provider.request.bind(this.provider);
+        this.provider.request = function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+            var response_1, error_1, transactionHash_1, error_2;
+            var _this = this;
+            var method = _b.method, params = _b.params;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (!(Array.isArray(params) &&
+                            ["eth_signTypedData_v4", "personal_sign"].includes(method))) return [3 /*break*/, 4];
+                        // Fire-and-forget tracking
+                        (function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                try {
+                                    this.signature(__assign({ status: types_1.SignatureStatus.REQUESTED }, this.buildSignatureEventPayload(method, params)));
+                                }
+                                catch (e) {
+                                    lib_1.logger.error("Formo: Failed to track signature request", e);
+                                }
+                                return [2 /*return*/];
+                            });
+                        }); })();
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, request({ method: method, params: params })];
+                    case 2:
+                        response_1 = (_c.sent());
+                        (function () { return __awaiter(_this, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                try {
+                                    if (response_1) {
+                                        this.signature(__assign({ status: types_1.SignatureStatus.CONFIRMED }, this.buildSignatureEventPayload(method, params, response_1)));
+                                    }
+                                }
+                                catch (e) {
+                                    lib_1.logger.error("Formo: Failed to track signature confirmation", e);
+                                }
+                                return [2 /*return*/];
+                            });
+                        }); })();
+                        return [2 /*return*/, response_1];
+                    case 3:
+                        error_1 = _c.sent();
+                        (function () { return __awaiter(_this, void 0, void 0, function () {
+                            var rpcError;
+                            return __generator(this, function (_a) {
+                                try {
+                                    rpcError = error_1;
+                                    if (rpcError && (rpcError === null || rpcError === void 0 ? void 0 : rpcError.code) === 4001) {
+                                        this.signature(__assign({ status: types_1.SignatureStatus.REJECTED }, this.buildSignatureEventPayload(method, params)));
+                                    }
+                                }
+                                catch (e) {
+                                    lib_1.logger.error("Formo: Failed to track signature rejection", e);
+                                }
+                                return [2 /*return*/];
+                            });
+                        }); })();
+                        throw error_1;
+                    case 4:
+                        if (!(Array.isArray(params) &&
+                            method === "eth_sendTransaction" &&
+                            params[0])) return [3 /*break*/, 8];
+                        (function () { return __awaiter(_this, void 0, void 0, function () {
+                            var payload, e_3;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, , 3]);
+                                        return [4 /*yield*/, this.buildTransactionEventPayload(params)];
+                                    case 1:
+                                        payload = _a.sent();
+                                        this.transaction(__assign({ status: types_1.TransactionStatus.STARTED }, payload));
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        e_3 = _a.sent();
+                                        lib_1.logger.error("Formo: Failed to track transaction start", e_3);
+                                        return [3 /*break*/, 3];
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); })();
+                        _c.label = 5;
+                    case 5:
+                        _c.trys.push([5, 7, , 8]);
+                        return [4 /*yield*/, request({
+                                method: method,
+                                params: params,
+                            })];
+                    case 6:
+                        transactionHash_1 = (_c.sent());
+                        (function () { return __awaiter(_this, void 0, void 0, function () {
+                            var payload, e_4;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 2, , 3]);
+                                        return [4 /*yield*/, this.buildTransactionEventPayload(params)];
+                                    case 1:
+                                        payload = _a.sent();
+                                        this.transaction(__assign(__assign({ status: types_1.TransactionStatus.BROADCASTED }, payload), { transactionHash: transactionHash_1 }));
+                                        // Start async polling for transaction receipt
+                                        this.pollTransactionReceipt(transactionHash_1, payload);
+                                        return [3 /*break*/, 3];
+                                    case 2:
+                                        e_4 = _a.sent();
+                                        lib_1.logger.error("Formo: Failed to track transaction broadcast", e_4);
+                                        return [3 /*break*/, 3];
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); })();
+                        return [2 /*return*/, transactionHash_1];
+                    case 7:
+                        error_2 = _c.sent();
+                        (function () { return __awaiter(_this, void 0, void 0, function () {
+                            var rpcError, payload, e_5;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        _a.trys.push([0, 3, , 4]);
+                                        rpcError = error_2;
+                                        if (!(rpcError && (rpcError === null || rpcError === void 0 ? void 0 : rpcError.code) === 4001)) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, this.buildTransactionEventPayload(params)];
+                                    case 1:
+                                        payload = _a.sent();
+                                        this.transaction(__assign({ status: types_1.TransactionStatus.REJECTED }, payload));
+                                        _a.label = 2;
+                                    case 2: return [3 /*break*/, 4];
+                                    case 3:
+                                        e_5 = _a.sent();
+                                        lib_1.logger.error("Formo: Failed to track transaction rejection", e_5);
+                                        return [3 /*break*/, 4];
+                                    case 4: return [2 /*return*/];
+                                }
+                            });
+                        }); })();
+                        throw error_2;
+                    case 8: return [2 /*return*/, request({ method: method, params: params })];
+                }
+            });
+        }); };
+    };
+    FormoAnalytics.prototype.onLocationChange = function () {
         return __awaiter(this, void 0, void 0, function () {
+            var currentUrl;
             return __generator(this, function (_a) {
-                if ((0, lib_1.cookie)().get(constants_1.SESSION_CURRENT_URL_KEY) === null) {
+                currentUrl = (0, lib_1.cookie)().get(constants_1.SESSION_CURRENT_URL_KEY);
+                if (currentUrl !== window.location.href) {
                     (0, lib_1.cookie)().set(constants_1.SESSION_CURRENT_URL_KEY, window.location.href);
+                    this.trackPageHit();
                 }
-                return [2 /*return*/, this.trackPageHit()];
+                return [2 /*return*/];
             });
         });
     };
@@ -735,25 +816,13 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.onLocationChange = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var currentUrl;
-            return __generator(this, function (_a) {
-                currentUrl = (0, lib_1.cookie)().get(constants_1.SESSION_CURRENT_URL_KEY);
-                if (currentUrl !== window.location.href) {
-                    (0, lib_1.cookie)().set(constants_1.SESSION_CURRENT_URL_KEY, window.location.href);
-                    this.trackPageHit();
-                }
-                return [2 /*return*/];
-            });
-        });
-    };
     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) {
-                if (!this.config.trackLocalhost && (0, validators_1.isLocalhost)()) {
-                    return [2 /*return*/, lib_1.logger.warn("Track page hit: Ignoring event because website is running locally")];
+                if (!this.shouldTrack()) {
+                    lib_1.logger.info("Track page hit: Skipping event due to tracking configuration");
+                    return [2 /*return*/];
                 }
                 setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
@@ -772,6 +841,10 @@ var FormoAnalytics = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 try {
+                    if (!this.shouldTrack()) {
+                        lib_1.logger.info("Skipping ".concat(type, " event due to tracking configuration"));
+                        return [2 /*return*/];
+                    }
                     this.eventManager.addEvent(__assign(__assign({ type: type }, payload), { properties: properties, context: context, callback: callback }), this.currentAddress, this.currentUserId);
                 }
                 catch (error) {
@@ -781,6 +854,46 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Determines if tracking should be enabled based on configuration
+     * @returns {boolean} True if tracking should be enabled
+     */
+    FormoAnalytics.prototype.shouldTrack = function () {
+        // Check if tracking is explicitly provided as a boolean
+        if (typeof this.options.tracking === 'boolean') {
+            return this.options.tracking;
+        }
+        // Handle object configuration with exclusion rules
+        if (this.options.tracking !== null &&
+            typeof this.options.tracking === 'object' &&
+            !Array.isArray(this.options.tracking)) {
+            var _a = this.options.tracking, _b = _a.excludeHosts, excludeHosts = _b === void 0 ? [] : _b, _c = _a.excludePaths, excludePaths = _c === void 0 ? [] : _c, _d = _a.excludeChains, excludeChains = _d === void 0 ? [] : _d;
+            // Check hostname exclusions - use exact matching
+            if (excludeHosts.length > 0 && typeof window !== 'undefined') {
+                var hostname = window.location.hostname;
+                if (excludeHosts.includes(hostname)) {
+                    return false;
+                }
+            }
+            // Check path exclusions - use exact matching
+            if (excludePaths.length > 0 && typeof window !== 'undefined') {
+                var pathname = window.location.pathname;
+                if (excludePaths.includes(pathname)) {
+                    return false;
+                }
+            }
+            // Check chainId exclusions
+            if (excludeChains.length > 0 &&
+                this.currentChainId &&
+                excludeChains.includes(this.currentChainId)) {
+                return false;
+            }
+            // If nothing is excluded, tracking is enabled
+            return true;
+        }
+        // Default behavior: track everywhere except localhost
+        return !(0, validators_1.isLocalhost)();
+    };
     /*
       Utility functions
     */
@@ -936,7 +1049,7 @@ var FormoAnalytics = /** @class */ (function () {
                             lib_1.logger.info("Chain id not found");
                             return [2 /*return*/, 0];
                         }
-                        return [2 /*return*/, parseInt(chainIdHex, 16)];
+                        return [2 /*return*/, (0, chain_1.parseChainId)(chainIdHex)];
                     case 3:
                         err_5 = _b.sent();
                         lib_1.logger.error("eth_chainId threw an error:", err_5);
@@ -984,6 +1097,62 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Polls for transaction receipt and emits tx.status = CONFIRMED or REVERTED.
+     */
+    FormoAnalytics.prototype.pollTransactionReceipt = function (transactionHash_2, payload_1) {
+        return __awaiter(this, arguments, void 0, function (transactionHash, payload, maxAttempts, intervalMs) {
+            var attempts, provider, poll;
+            var _this = this;
+            if (maxAttempts === void 0) { maxAttempts = 10; }
+            if (intervalMs === void 0) { intervalMs = 3000; }
+            return __generator(this, function (_a) {
+                attempts = 0;
+                provider = this.provider;
+                if (!provider)
+                    return [2 /*return*/];
+                poll = function () { return __awaiter(_this, void 0, void 0, function () {
+                    var receipt, e_6;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                _a.trys.push([0, 2, , 3]);
+                                return [4 /*yield*/, provider.request({
+                                        method: "eth_getTransactionReceipt",
+                                        params: [transactionHash],
+                                    })];
+                            case 1:
+                                receipt = (_a.sent());
+                                if (receipt) {
+                                    // status: 1 = success, 0 = reverted
+                                    if (receipt.status === "0x1" || receipt.status === 1) {
+                                        this.transaction(__assign(__assign({ status: types_1.TransactionStatus.CONFIRMED }, payload), { transactionHash: transactionHash }));
+                                        return [2 /*return*/];
+                                    }
+                                    else if (receipt.status === "0x0" || receipt.status === 0) {
+                                        this.transaction(__assign(__assign({ status: types_1.TransactionStatus.REVERTED }, payload), { transactionHash: transactionHash }));
+                                        return [2 /*return*/];
+                                    }
+                                }
+                                return [3 /*break*/, 3];
+                            case 2:
+                                e_6 = _a.sent();
+                                lib_1.logger.error("Error polling transaction receipt", e_6);
+                                return [3 /*break*/, 3];
+                            case 3:
+                                attempts++;
+                                if (attempts < maxAttempts) {
+                                    setTimeout(poll, intervalMs);
+                                }
+                                return [2 /*return*/];
+                        }
+                    });
+                }); };
+                poll();
+                return [2 /*return*/];
+            });
+        });
+    };
     return FormoAnalytics;
 }());
 exports.FormoAnalytics = FormoAnalytics;