@formo/analytics 1.13.0-alpha.1 → 1.13.3-alpha.0

package/dist/esm/src/FormoAnalytics.js

@@ -45,36 +45,81 @@ 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));
+};
 import axios from "axios";
-import { COUNTRY_LIST, EVENTS_API_URL, Event, } from "./constants";
+import { createStore } from 'mipd';
+import { COUNTRY_LIST, CURRENT_URL_KEY, EVENTS_API_URL, Event, } from "./constants";
 import { H } from "highlight.run";
+import { SignatureStatus, TransactionStatus, } from "./types";
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(apiKey, options) {
         if (options === void 0) { options = {}; }
-        var _a;
         this.apiKey = apiKey;
         this.options = options;
         this._providerListeners = {};
         this.config = {
             apiKey: apiKey,
         };
-        var provider = (window === null || window === void 0 ? void 0 : window.ethereum) || ((_a = window.web3) === null || _a === void 0 ? void 0 : _a.currentProvider) || (options === null || options === void 0 ? void 0 : options.provider);
+        // TODO: replace with eip6963
+        var provider = options.provider || (window === null || window === void 0 ? void 0 : window.ethereum);
         if (provider) {
             this.trackProvider(provider);
         }
+        this.trackFirstPageVisit();
+        this.trackPagesChange();
     }
     FormoAnalytics.init = function (apiKey, options) {
         return __awaiter(this, void 0, void 0, function () {
+            var analytics, providers;
             return __generator(this, function (_a) {
-                // May be needed for delayed loading
-                // https://github.com/segmentio/analytics-next/tree/master/packages/browser#lazy--delayed-loading
-                return [2 /*return*/, new FormoAnalytics(apiKey, options)];
+                switch (_a.label) {
+                    case 0:
+                        analytics = new FormoAnalytics(apiKey, options);
+                        return [4 /*yield*/, analytics.getProviders()];
+                    case 1:
+                        providers = _a.sent();
+                        return [4 /*yield*/, analytics.identifyAll(providers)];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, analytics];
+                }
             });
         });
     };
     /*
       Public SDK functions
     */
+    /**
+     * Emits a page visit event with the current URL information, fire on page change.
+     * @returns {Promise<void>}
+     */
+    FormoAnalytics.prototype.page = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.trackPageHit()];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Emits a wallet connect event.
+     * @param {ChainID} params.chainId
+     * @param {Address} params.address
+     * @throws {Error} If chainId or address is empty
+     * @returns {Promise<void>}
+     */
     FormoAnalytics.prototype.connect = function (_a) {
         return __awaiter(this, arguments, void 0, function (_b) {
             var chainId = _b.chainId, address = _b.address;
@@ -100,6 +145,12 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Emits a wallet disconnect event.
+     * @param {ChainID} params.chainId
+     * @param {Address} params.address
+     * @returns {Promise<void>}
+     */
     FormoAnalytics.prototype.disconnect = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var address, chainId;
@@ -116,6 +167,14 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Emits a chain network change event.
+     * @param {ChainID} params.chainId
+     * @param {Address} params.address
+     * @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) {
             var chainId = _b.chainId, address = _b.address;
@@ -125,12 +184,12 @@ var FormoAnalytics = /** @class */ (function () {
                         if (!chainId || Number(chainId) === 0) {
                             throw new Error("FormoAnalytics::chain: chainId cannot be empty or 0");
                         }
-                        if (!address && !this.currentConnectedAddress) {
-                            throw new Error("FormoAnalytics::chain: address was empty and no previous address has been recorded. You can either pass an address or call connect() first");
-                        }
                         if (isNaN(Number(chainId))) {
                             throw new Error("FormoAnalytics::chain: chainId must be a valid decimal number");
                         }
+                        if (!address && !this.currentConnectedAddress) {
+                            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, {
                                 chain_id: chainId,
@@ -143,24 +202,88 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    // TODO: allow custom url as input
-    FormoAnalytics.prototype.page = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.trackPageHit()];
+    /**
+     * Emits a signature event.
+     * @param {SignatureStatus} params.status - requested, confirmed, rejected
+     * @param {ChainID} params.chainId
+     * @param {Address} params.address
+     * @param {string} params.message
+     * @param {string} params.signatureHash - only provided if status is confirmed
+     * @returns {Promise<void>}
+     */
+    FormoAnalytics.prototype.signature = function (_a) {
+        return __awaiter(this, arguments, void 0, function (_b) {
+            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 1:
-                        _a.sent();
+                        _c.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Emits a transaction event.
+     * @param {TransactionStatus} params.status - started, broadcasted, rejected
+     * @param {ChainID} params.chainId
+     * @param {Address} params.address
+     * @param {string} params.data
+     * @param {string} params.to
+     * @param {string} params.value
+     * @param {string} params.transactionHash - only provided if status is broadcasted
+     * @returns {Promise<void>}
+     */
+    FormoAnalytics.prototype.transaction = function (_a) {
+        return __awaiter(this, arguments, void 0, function (_b) {
+            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 1:
+                        _c.sent();
                         return [2 /*return*/];
                 }
             });
         });
     };
-    FormoAnalytics.prototype.track = function (eventName, eventData) {
+    /**
+     * Emits a identify event with current wallet address.
+     * @param {Address} params.address
+     * @returns {Promise<void>}
+     */
+    FormoAnalytics.prototype.identify = function (_a) {
+        return __awaiter(this, arguments, void 0, function (_b) {
+            var address = _b.address, providerName = _b.providerName, rdns = _b.rdns;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (!address) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.trackEvent(Event.IDENTIFY, {
+                                address: address,
+                                name: providerName,
+                                rdns: rdns,
+                            })];
+                    case 1:
+                        _c.sent();
+                        _c.label = 2;
+                    case 2: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Emits a custom event with custom data.
+     * @param {string} action
+     * @param {Record<string, any>} payload
+     * @returns {Promise<void>}
+     */
+    FormoAnalytics.prototype.track = function (action, payload) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.trackEvent(eventName, eventData)];
+                    case 0: return [4 /*yield*/, this.trackEvent(action, payload)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -179,20 +302,19 @@ var FormoAnalytics = /** @class */ (function () {
         this.currentChainId = undefined;
         this.currentConnectedAddress = undefined;
         if (this._provider) {
-            var eventNames = Object.keys(this._providerListeners);
-            for (var _i = 0, eventNames_1 = eventNames; _i < eventNames_1.length; _i++) {
-                var eventName = eventNames_1[_i];
-                this._provider.removeListener(eventName, this._providerListeners[eventName]);
-                delete this._providerListeners[eventName];
+            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];
             }
         }
-        console.log("Tracking new provider:", provider);
         this._provider = provider;
-        this.getAddress();
+        // Register listeners for web3 provider events
         this.registerAddressChangedListener();
         this.registerChainChangedListener();
-        // TODO: track signing and transactions
-        // https://linear.app/getformo/issue/P-607/sdk-support-signature-and-transaction-events
+        this.registerSignatureListener();
+        this.registerTransactionListener();
     };
     FormoAnalytics.prototype.registerAddressChangedListener = function () {
         var _this = this;
@@ -223,6 +345,105 @@ var FormoAnalytics = /** @class */ (function () {
         (_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) {
+            console.error("_trackSigning: provider not found");
+            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");
+            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: 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: 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: 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) {
+            console.error("_trackTransactions: provider not found");
+            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");
+            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: 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: TransactionStatus.BROADCASTED }, payload), { transactionHash: transactionHash }));
+                        return [2 /*return*/];
+                    case 4:
+                        error_2 = _c.sent();
+                        console.log("transaction listener catch");
+                        console.log(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: 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) {
@@ -310,7 +531,7 @@ var FormoAnalytics = /** @class */ (function () {
                             console.log("FormoAnalytics::onChainChanged: Unable to fetch or store connected address");
                             return [2 /*return*/, Promise.resolve()];
                         }
-                        this.currentConnectedAddress = address[0];
+                        this.currentConnectedAddress = address;
                         _a.label = 2;
                     case 2:
                         // Proceed only if the address exists
@@ -328,28 +549,83 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    // TOFIX: support multiple page hit events
+    FormoAnalytics.prototype.trackFirstPageVisit = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (sessionStorage.getItem(CURRENT_URL_KEY) === null) {
+                    sessionStorage.setItem(CURRENT_URL_KEY, window.location.href);
+                }
+                return [2 /*return*/, this.trackPageHit()];
+            });
+        });
+    };
+    FormoAnalytics.prototype.trackPagesChange = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var oldPushState, oldReplaceState;
+            var _this = this;
+            return __generator(this, function (_a) {
+                oldPushState = history.pushState;
+                history.pushState = function pushState() {
+                    var args = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args[_i] = arguments[_i];
+                    }
+                    var ret = oldPushState.apply(this, args);
+                    window.dispatchEvent(new window.Event("locationchange"));
+                    return ret;
+                };
+                oldReplaceState = history.replaceState;
+                history.replaceState = function replaceState() {
+                    var args = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args[_i] = arguments[_i];
+                    }
+                    var ret = oldReplaceState.apply(this, args);
+                    window.dispatchEvent(new window.Event("locationchange"));
+                    return ret;
+                };
+                window.addEventListener("popstate", function () { return _this.onLocationChange(); });
+                window.addEventListener("locationchange", function () { return _this.onLocationChange(); });
+                return [2 /*return*/];
+            });
+        });
+    };
+    FormoAnalytics.prototype.onLocationChange = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var currentUrl;
+            return __generator(this, function (_a) {
+                currentUrl = sessionStorage.getItem(CURRENT_URL_KEY);
+                if (currentUrl !== window.location.href) {
+                    sessionStorage.setItem(CURRENT_URL_KEY, window.location.href);
+                    this.trackPageHit();
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
     // TODO: Add event listener and support for SPA and hash-based navigation
     // https://linear.app/getformo/issue/P-800/sdk-support-spa-and-hash-based-routing
     FormoAnalytics.prototype.trackPageHit = function () {
         var _this = this;
         var pathname = window.location.pathname;
         var href = window.location.href;
+        var hash = window.location.hash;
         setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 this.trackEvent(Event.PAGE, {
                     pathname: pathname,
                     href: href,
+                    hash: hash,
                 });
                 return [2 /*return*/];
             });
         }); }, 300);
     };
-    // TODO: refactor this with event queue and flushing 
+    // TODO: refactor this with event queue and flushing
     // https://linear.app/getformo/issue/P-835/sdk-refactor-retries-with-event-queue-and-batching
     FormoAnalytics.prototype.trackEvent = function (action, payload) {
         return __awaiter(this, void 0, void 0, function () {
-            var address, requestData, response, error_1;
+            var address, requestData, response, error_3;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -378,26 +654,84 @@ var FormoAnalytics = /** @class */ (function () {
                     case 4:
                         response = _b.sent();
                         if (response.status >= 200 && response.status < 300) {
-                            console.log("Event sent successfully:", action);
+                            console.log("Event sent successfully: ".concat(this.getActionDescriptor(action, payload)));
                         }
                         else {
                             throw new Error("Failed with status: ".concat(response.status));
                         }
                         return [3 /*break*/, 6];
                     case 5:
-                        error_1 = _b.sent();
-                        H.consumeError(error_1, "Request data: ".concat(JSON.stringify(requestData)));
-                        console.error("Event \"".concat(action, "\" failed. Error: ").concat(error_1));
+                        error_3 = _b.sent();
+                        H.consumeError(error_3, "Request data: ".concat(JSON.stringify(requestData)));
+                        console.error("Event \"".concat(action, "\" failed. Error: ").concat(error_3));
                         return [3 /*break*/, 6];
                     case 6: return [2 /*return*/];
                 }
             });
         });
     };
+    /*
+      Utility functions
+    */
+    FormoAnalytics.prototype.getProviders = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var store, providers;
+            return __generator(this, function (_a) {
+                store = createStore();
+                providers = __spreadArray([], store.getProviders(), true);
+                // TODO: consider using store.subscribe to detect changes to providers list
+                // store.subscribe(providers => (state.providers = providers))
+                // 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*/, providers];
+            });
+        });
+    };
+    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) {
+                    case 0:
+                        _i = 0, providers_1 = providers;
+                        _c.label = 1;
+                    case 1:
+                        if (!(_i < providers_1.length)) return [3 /*break*/, 10];
+                        _a = providers_1[_i], provider = _a.provider, info = _a.info;
+                        _c.label = 2;
+                    case 2:
+                        _c.trys.push([2, 8, , 9]);
+                        return [4 /*yield*/, this.getAccounts(provider)];
+                    case 3:
+                        accounts = _c.sent();
+                        if (!(accounts && accounts.length > 0)) return [3 /*break*/, 7];
+                        _b = 0, accounts_1 = accounts;
+                        _c.label = 4;
+                    case 4:
+                        if (!(_b < accounts_1.length)) return [3 /*break*/, 7];
+                        address = accounts_1[_b];
+                        return [4 /*yield*/, this.identify({ address: address, providerName: info.name, rdns: info.rdns })];
+                    case 5:
+                        _c.sent();
+                        _c.label = 6;
+                    case 6:
+                        _b++;
+                        return [3 /*break*/, 4];
+                    case 7: return [3 /*break*/, 9];
+                    case 8:
+                        err_1 = _c.sent();
+                        return [3 /*break*/, 9];
+                    case 9:
+                        _i++;
+                        return [3 /*break*/, 1];
+                    case 10: return [2 /*return*/];
+                }
+            });
+        });
+    };
     Object.defineProperty(FormoAnalytics.prototype, "provider", {
-        /*
-          Utility functions
-        */
         get: function () {
             return this._provider;
         },
@@ -406,10 +740,12 @@ var FormoAnalytics = /** @class */ (function () {
     });
     FormoAnalytics.prototype.getAddress = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var accounts, address, err_1;
+            var accounts, err_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        if (this.currentConnectedAddress)
+                            return [2 /*return*/, this.currentConnectedAddress];
                         if (!this.provider) {
                             console.log("FormoAnalytics::getAddress: the provider is not set");
                             return [2 /*return*/, null];
@@ -421,54 +757,52 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         accounts = _a.sent();
                         if (accounts && accounts.length > 0) {
-                            address = accounts[0];
+                            return [2 /*return*/, accounts[0]];
                             // TODO: how to handle multiple addresses? Should we emit a connect event here? Since the user has not manually connected
                             // https://linear.app/getformo/issue/P-691/sdk-detect-multiple-wallets-using-eip6963
-                            this.onAddressConnected(address);
-                            return [2 /*return*/, address];
                         }
                         return [3 /*break*/, 4];
                     case 3:
-                        err_1 = _a.sent();
-                        console.log("Failed to fetch accounts from provider:", err_1);
+                        err_2 = _a.sent();
+                        console.log("Failed to fetch accounts from provider:", err_2);
                         return [2 /*return*/, null];
                     case 4: return [2 /*return*/, null];
                 }
             });
         });
     };
-    FormoAnalytics.prototype.getAccounts = function () {
+    FormoAnalytics.prototype.getAccounts = function (provider) {
         return __awaiter(this, void 0, void 0, function () {
-            var res, err_2;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var p, res, err_3;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
-                        _b.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, ((_a = this.provider) === null || _a === void 0 ? void 0 : _a.request({
+                        p = provider || this.provider;
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, (p === null || p === void 0 ? void 0 : p.request({
                                 method: "eth_accounts",
                             }))];
-                    case 1:
-                        res = _b.sent();
-                        if (!res || res.length === 0) {
-                            console.log("FormoAnalytics::getAccounts: unable to get account. eth_accounts returned empty");
+                    case 2:
+                        res = _a.sent();
+                        if (!res || res.length === 0)
                             return [2 /*return*/, null];
-                        }
                         return [2 /*return*/, res];
-                    case 2:
-                        err_2 = _b.sent();
-                        if (err_2.code !== 4001) {
-                            console.log("FormoAnalytics::getAccounts: eth_accounts threw an error", err_2);
+                    case 3:
+                        err_3 = _a.sent();
+                        if (err_3.code !== 4001) {
+                            console.log("FormoAnalytics::getAccounts: eth_accounts threw an error", err_3);
                         }
                         return [2 /*return*/, null];
-                    case 3: return [2 /*return*/];
+                    case 4: return [2 /*return*/];
                 }
             });
         });
     };
     FormoAnalytics.prototype.getCurrentChainId = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var chainIdHex, err_3;
+            var chainIdHex, err_4;
             var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -490,8 +824,8 @@ var FormoAnalytics = /** @class */ (function () {
                         }
                         return [2 /*return*/, parseInt(chainIdHex, 16)];
                     case 3:
-                        err_3 = _b.sent();
-                        console.log("FormoAnalytics::fetchChainId: eth_chainId threw an error", err_3);
+                        err_4 = _b.sent();
+                        console.log("FormoAnalytics::fetchChainId: eth_chainId threw an error", err_4);
                         return [2 /*return*/, 0];
                     case 4: return [2 /*return*/];
                 }
@@ -501,11 +835,13 @@ var FormoAnalytics = /** @class */ (function () {
     FormoAnalytics.prototype.getLocation = function () {
         try {
             var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-            return COUNTRY_LIST[timezone];
+            if (timezone in COUNTRY_LIST)
+                return COUNTRY_LIST[timezone];
+            return timezone;
         }
         catch (error) {
             console.error("Error resolving timezone:", error);
-            return undefined;
+            return "";
         }
     };
     FormoAnalytics.prototype.getLanguage = function () {
@@ -540,6 +876,47 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
+    FormoAnalytics.prototype.buildSignatureEventPayload = function (method, params, response) {
+        var basePayload = {
+            chainId: this.currentChainId,
+            address: method === "personal_sign"
+                ? params[1]
+                : params[0],
+        };
+        if (method === "personal_sign") {
+            var message = Buffer.from(params[0].slice(2), "hex").toString("utf8");
+            return __assign(__assign(__assign({}, basePayload), { message: message }), (response ? { signatureHash: response } : {}));
+        }
+        return __assign(__assign(__assign({}, basePayload), { message: params[1] }), (response ? { signatureHash: response } : {}));
+    };
+    FormoAnalytics.prototype.buildTransactionEventPayload = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, data, from, to, value, _b;
+            var _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        _a = params[0], data = _a.data, from = _a.from, to = _a.to, value = _a.value;
+                        _c = {};
+                        _b = this.currentChainId;
+                        if (_b) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.getCurrentChainId()];
+                    case 1:
+                        _b = (_d.sent());
+                        _d.label = 2;
+                    case 2: return [2 /*return*/, (_c.chainId = _b,
+                            _c.data = data,
+                            _c.address = from,
+                            _c.to = to,
+                            _c.value = value,
+                            _c)];
+                }
+            });
+        });
+    };
+    FormoAnalytics.prototype.getActionDescriptor = function (action, payload) {
+        return "".concat(action).concat(payload.status ? " ".concat(payload.status) : "");
+    };
     return FormoAnalytics;
 }());
 export { FormoAnalytics };