@formo/analytics 1.13.4-alpha.1 → 1.13.4-alpha.11

package/CONTRIBUTING.md

@@ -89,5 +89,5 @@ Run the following command to publish the package to NPM:
 npm version <major/minor/patch>
 
 // Publish the package to NPM
-npm publish 
+npm pub
 ```

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

@@ -31,16 +31,15 @@ interface IFormoAnalytics {
     }): Promise<void>;
     identify(params: {
         address: Address;
-        providerName?: string;
-        rdns?: string;
     }): Promise<void>;
     track(action: string, payload: Record<string, any>): Promise<void>;
 }
 export declare class FormoAnalytics implements IFormoAnalytics {
     readonly apiKey: string;
     options: Options;
-    currentProvider?: EIP1193Provider;
-    currentProviderListeners: Record<string, (...args: unknown[]) => void>;
+    private _provider?;
+    private _providerListeners;
+    private session;
     config: Config;
     currentChainId?: ChainID;
     currentConnectedAddress?: Address;
@@ -121,12 +120,12 @@ export declare class FormoAnalytics implements IFormoAnalytics {
         transactionHash?: string;
     }): Promise<void>;
     /**
-     * Emits a identify event with current wallet address.
+     * Emits an identify event with current wallet address.
      * @param {Address} params.address
      * @returns {Promise<void>}
      */
     identify({ address, providerName, rdns, }: {
-        address: Address;
+        address: Address | null;
         providerName?: string;
         rdns?: string;
     }): Promise<void>;
@@ -138,15 +137,14 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      */
     track(action: string, payload: Record<string, any>): Promise<void>;
     private trackProvider;
-    private clearProvider;
     private registerAddressChangedListener;
     private registerChainChangedListener;
     private registerSignatureListener;
     private registerTransactionListener;
     private onAddressChanged;
     private onAddressConnected;
-    private onAddressDisconnected;
     private handleDisconnect;
+    private onAddressDisconnected;
     private onChainChanged;
     private trackFirstPageHit;
     private trackPageHits;

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

@@ -1 +1 @@
-{"version":3,"file":"FormoAnalytics.d.ts","sourceRoot":"","sources":["../../../src/FormoAnalytics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"FormoAnalytics.d.ts","sourceRoot":"","sources":["../../../src/FormoAnalytics.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,OAAO,EACP,OAAO,EACP,eAAe,EACf,OAAO,EACP,MAAM,EAGN,eAAe,EACf,iBAAiB,EAClB,MAAM,SAAS,CAAC;AAIjB,UAAU,eAAe;IACvB,IAAI,IAAI,IAAI,CAAC;IACb,OAAO,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,UAAU,CAAC,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7E,KAAK,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtE,SAAS,CAAC,EACR,MAAM,EACN,OAAO,EACP,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,MAAM,EAAE,eAAe,CAAC;QACxB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,WAAW,CAAC,EACV,MAAM,EACN,OAAO,EACP,OAAO,EACP,IAAI,EACJ,EAAE,EACF,KAAK,EACL,eAAe,GAChB,EAAE;QACD,MAAM,EAAE,iBAAiB,CAAC;QAC1B,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAED,qBAAa,cAAe,YAAW,eAAe;aAUlC,MAAM,EAAE,MAAM;IACvB,OAAO,EAAE,OAAO;IAVzB,OAAO,CAAC,SAAS,CAAC,CAAkB;IACpC,OAAO,CAAC,kBAAkB,CAAoD;IAC9E,OAAO,CAAC,OAAO,CAAwB;IAEvC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,OAAO;WAqBM,IAAI,CACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,cAAc,CAAC;IAc1B;;;OAGG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;OAMG;IACG,OAAO,CAAC,EACZ,OAAO,EACP,OAAO,GACR,EAAE;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBjB;;;;;OAKG;IACG,UAAU,CAAC,MAAM,CAAC,EAAE;QACxB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,IAAI,CAAC;IAOjB;;;;;;;OAOG;IACG,KAAK,CAAC,EACV,OAAO,EACP,OAAO,GACR,EAAE;QACD,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBjB;;;;;;;;OAQG;IACG,SAAS,CAAC,EACd,MAAM,EACN,OAAO,EACP,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,MAAM,EAAE,eAAe,CAAC;QACxB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjB;;;;;;;;;;OAUG;IACG,WAAW,CAAC,EAChB,MAAM,EACN,OAAO,EACP,OAAO,EACP,IAAI,EACJ,EAAE,EACF,KAAK,EACL,eAAe,GAChB,EAAE;QACD,MAAM,EAAE,iBAAiB,CAAC;QAC1B,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjB;;;;OAIG;IACU,QAAQ,CAAC,EACpB,OAAO,EACP,YAAY,EACZ,IAAI,GACL,EAAE;QACD,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;QACxB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GAAG,OAAO,CAAC,IAAI,CAAC;IAcjB;;;;;OAKG;IACG,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxE,OAAO,CAAC,aAAa;IA0BrB,OAAO,CAAC,8BAA8B;IAYtC,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,yBAAyB;IAuDjC,OAAO,CAAC,2BAA2B;YA2DrB,gBAAgB;YAQhB,kBAAkB;YAYlB,gBAAgB;YAchB,qBAAqB;YAOrB,cAAc;YAkCd,iBAAiB;YAQjB,aAAa;YAmBb,gBAAgB;IAS9B,OAAO,CAAC,YAAY;YAsBN,UAAU;YA0CV,YAAY;YAaZ,WAAW;IA2BzB,IAAI,QAAQ,IAAI,eAAe,GAAG,SAAS,CAE1C;YAEa,UAAU;YAmBV,WAAW;YAqBX,iBAAiB;IAwB/B,OAAO,CAAC,WAAW;IAYnB,OAAO,CAAC,WAAW;YAcL,iBAAiB;IAwB/B,OAAO,CAAC,0BAA0B;YAgCpB,4BAA4B;IAgB1C,OAAO,CAAC,mBAAmB;CAG5B"}

package/dist/cjs/src/FormoAnalytics.js

@@ -63,19 +63,20 @@ exports.FormoAnalytics = void 0;
 var axios_1 = __importDefault(require("axios"));
 var mipd_1 = require("mipd");
 var constants_1 = require("./constants");
-var highlight_run_1 = require("highlight.run");
 var types_1 = require("./types");
-var utils_1 = require("./lib/utils");
+var lib_1 = require("./lib");
+var constants_2 = require("./constants");
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(apiKey, options) {
         if (options === void 0) { options = {}; }
         this.apiKey = apiKey;
         this.options = options;
-        this.currentProviderListeners = {};
+        this._providerListeners = {};
         this.config = {
             apiKey: apiKey,
-            options: options
+            trackLocalhost: options.trackLocalhost,
         };
+        this.session = new FormoAnalyticsSession();
         // TODO: replace with eip6963
         var provider = options.provider || (window === null || window === void 0 ? void 0 : window.ethereum);
         if (provider) {
@@ -257,7 +258,7 @@ var FormoAnalytics = /** @class */ (function () {
         });
     };
     /**
-     * Emits a identify event with current wallet address.
+     * Emits an identify event with current wallet address.
      * @param {Address} params.address
      * @returns {Promise<void>}
      */
@@ -267,7 +268,9 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        if (!address) return [3 /*break*/, 2];
+                        if (this.session.isIdentified())
+                            return [2 /*return*/, console.warn("FormoAnalytics::identify: Wallet already identified in this session")];
+                        this.session.identify();
                         return [4 /*yield*/, this.trackEvent(constants_1.Event.IDENTIFY, {
                                 address: address,
                                 providerName: providerName,
@@ -275,8 +278,7 @@ var FormoAnalytics = /** @class */ (function () {
                             })];
                     case 1:
                         _c.sent();
-                        _c.label = 2;
-                    case 2: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
             });
         });
@@ -303,38 +305,26 @@ var FormoAnalytics = /** @class */ (function () {
       SDK tracking and event listener functions
     */
     FormoAnalytics.prototype.trackProvider = function (provider) {
-        console.log('trackProvider', provider, this.currentProvider);
-        if (provider === this.currentProvider) {
-            console.log("Provider already tracked.");
+        if (provider === this._provider) {
+            console.warn("FormoAnalytics::trackProvider: Provider already tracked.");
             return;
         }
-        this.clearProvider(this.currentProvider);
-        this.currentProvider = provider;
-        // Register listeners for web3 provider events
-        console.log('registering listeners for', provider);
-        this.registerAddressChangedListener(provider);
-        this.registerChainChangedListener(provider);
-        this.registerSignatureListener(provider);
-        this.registerTransactionListener(provider);
-    };
-    FormoAnalytics.prototype.clearProvider = function (provider) {
-        console.log('clearProvider', provider, this.currentProvider);
-        // Only clear if the current provider is the same as the one we are clearing
-        if (this.currentProvider && provider === this.currentProvider) {
-            this.currentChainId = undefined;
-            this.currentConnectedAddress = undefined;
-            var actions = Object.keys(this.currentProviderListeners);
+        this.currentChainId = undefined;
+        this.currentConnectedAddress = undefined;
+        if (this._provider) {
+            var actions = Object.keys(this._providerListeners);
             for (var _i = 0, actions_1 = actions; _i < actions_1.length; _i++) {
                 var action = actions_1[_i];
-                this.currentProvider.removeListener(action, this.currentProviderListeners[action]);
-                delete this.currentProviderListeners[action];
+                this._provider.removeListener(action, this._providerListeners[action]);
+                delete this._providerListeners[action];
             }
-            this.currentProvider = undefined;
-            console.log('cleared provider', provider);
-        }
-        else {
-            console.log('skip clearing provider', provider);
         }
+        this._provider = provider;
+        // Register listeners for web3 provider events
+        this.registerAddressChangedListener();
+        this.registerChainChangedListener();
+        this.registerSignatureListener();
+        this.registerTransactionListener();
     };
     FormoAnalytics.prototype.registerAddressChangedListener = function () {
         var _this = this;
@@ -346,11 +336,11 @@ var FormoAnalytics = /** @class */ (function () {
             }
             return _this.onAddressChanged(args[0]);
         };
-        (_a = this.currentProvider) === null || _a === void 0 ? void 0 : _a.on("accountsChanged", listener);
-        this.currentProviderListeners["accountsChanged"] = listener;
+        (_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.currentProvider) === null || _b === void 0 ? void 0 : _b.on("disconnect", onAddressDisconnected);
-        this.currentProviderListeners["disconnect"] = onAddressDisconnected;
+        (_b = this._provider) === null || _b === void 0 ? void 0 : _b.on("disconnect", onAddressDisconnected);
+        this._providerListeners["disconnect"] = onAddressDisconnected;
     };
     FormoAnalytics.prototype.registerChainChangedListener = function () {
         var _this = this;
@@ -362,29 +352,28 @@ var FormoAnalytics = /** @class */ (function () {
             }
             return _this.onChainChanged(args[0]);
         };
-        (_a = this.currentProvider) === null || _a === void 0 ? void 0 : _a.on("chainChanged", listener);
-        this.currentProviderListeners["chainChanged"] = listener;
+        (_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.currentProvider) {
+        if (!this.provider) {
             console.error("_trackSigning: provider not found");
             return;
         }
-        if (((_a = Object.getOwnPropertyDescriptor(this.currentProvider, "request")) === null || _a === void 0 ? void 0 : _a.writable) ===
+        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.currentProvider.request.bind(this.currentProvider);
-        this.currentProvider.request = function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+        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:
-                        console.log('signature listener', method, params, this.currentProvider);
                         if (!(Array.isArray(params) &&
                             ["eth_signTypedData_v4", "personal_sign"].includes(method))) return [3 /*break*/, 4];
                         // Emit signature request event
@@ -417,17 +406,17 @@ var FormoAnalytics = /** @class */ (function () {
     FormoAnalytics.prototype.registerTransactionListener = function () {
         var _this = this;
         var _a;
-        if (!this.currentProvider) {
+        if (!this.provider) {
             console.error("_trackTransactions: provider not found");
             return;
         }
-        if (((_a = Object.getOwnPropertyDescriptor(this.currentProvider, "request")) === null || _a === void 0 ? void 0 : _a.writable) ===
+        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.currentProvider.request.bind(this.currentProvider);
-        this.currentProvider.request = function (_a) { return __awaiter(_this, [_a], void 0, function (_b) {
+        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) {
@@ -451,6 +440,8 @@ var FormoAnalytics = /** @class */ (function () {
                         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
@@ -466,7 +457,6 @@ var FormoAnalytics = /** @class */ (function () {
     FormoAnalytics.prototype.onAddressChanged = function (addresses) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                console.log('onAddressChanged', addresses);
                 if (addresses.length > 0) {
                     this.onAddressConnected(addresses[0]);
                 }
@@ -483,7 +473,6 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        console.log('onAddressConnected', address);
                         if (address === this.currentConnectedAddress) {
                             // We have already reported this address
                             return [2 /*return*/];
@@ -501,13 +490,19 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.onAddressDisconnected = function () {
+    FormoAnalytics.prototype.handleDisconnect = function (chainId, address) {
         return __awaiter(this, void 0, void 0, function () {
+            var payload;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.log('onAddressDisconnected', this.currentChainId, this.currentConnectedAddress);
-                        return [4 /*yield*/, this.handleDisconnect(this.currentChainId, this.currentConnectedAddress)];
+                        payload = {
+                            chain_id: chainId || this.currentChainId,
+                            address: address || this.currentConnectedAddress,
+                        };
+                        this.currentChainId = undefined;
+                        this.currentConnectedAddress = undefined;
+                        return [4 /*yield*/, this.trackEvent(constants_1.Event.DISCONNECT, payload)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -515,19 +510,11 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.handleDisconnect = function (chainId, address) {
+    FormoAnalytics.prototype.onAddressDisconnected = function () {
         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,
-                        };
-                        this.currentChainId = undefined;
-                        this.currentConnectedAddress = undefined;
-                        return [4 /*yield*/, this.trackEvent(constants_1.Event.DISCONNECT, payload)];
+                    case 0: return [4 /*yield*/, this.handleDisconnect(this.currentChainId, this.currentConnectedAddress)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -542,9 +529,8 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         this.currentChainId = parseInt(chainIdHex);
-                        console.log('onChainChanged', this.currentChainId);
                         if (!!this.currentConnectedAddress) return [3 /*break*/, 2];
-                        if (!this.currentProvider) {
+                        if (!this.provider) {
                             console.log("FormoAnalytics::onChainChanged: provider not found. CHAIN_CHANGED not reported");
                             return [2 /*return*/, Promise.resolve()];
                         }
@@ -576,8 +562,8 @@ var FormoAnalytics = /** @class */ (function () {
     FormoAnalytics.prototype.trackFirstPageHit = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                if (sessionStorage.getItem(constants_1.CURRENT_URL_KEY) === null) {
-                    sessionStorage.setItem(constants_1.CURRENT_URL_KEY, window.location.href);
+                if (lib_1.session.get(constants_1.CURRENT_URL_KEY) === null) {
+                    lib_1.session.set(constants_1.CURRENT_URL_KEY, window.location.href);
                 }
                 return [2 /*return*/, this.trackPageHit()];
             });
@@ -618,9 +604,9 @@ var FormoAnalytics = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var currentUrl;
             return __generator(this, function (_a) {
-                currentUrl = sessionStorage.getItem(constants_1.CURRENT_URL_KEY);
+                currentUrl = lib_1.session.get(constants_1.CURRENT_URL_KEY);
                 if (currentUrl !== window.location.href) {
-                    sessionStorage.setItem(constants_1.CURRENT_URL_KEY, window.location.href);
+                    lib_1.session.set(constants_1.CURRENT_URL_KEY, window.location.href);
                     this.trackPageHit();
                 }
                 return [2 /*return*/];
@@ -632,6 +618,9 @@ var FormoAnalytics = /** @class */ (function () {
         var pathname = window.location.pathname;
         var href = window.location.href;
         var hash = window.location.hash;
+        if (!this.config.trackLocalhost && (0, lib_1.isLocalhost)()) {
+            return console.warn("FormoAnalytics::trackPageHit: Ignoring event because website is running locally");
+        }
         setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 this.trackEvent(constants_1.Event.PAGE, {
@@ -647,53 +636,46 @@ var FormoAnalytics = /** @class */ (function () {
     // 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, _a, requestData, response, error_3;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _a = payload.address;
-                        if (_a) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.getAddress()];
+            var address, requestData, response, error_3;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.getAddress()];
                     case 1:
-                        _a = (_c.sent());
-                        _c.label = 2;
-                    case 2:
-                        address = _a;
-                        _b = {
+                        address = _b.sent();
+                        _a = {
                             address: address,
                             timestamp: new Date().toISOString(),
                             action: action,
                             version: "1"
                         };
-                        return [4 /*yield*/, this.buildEventPayload((0, utils_1.toSnakeCase)(payload))];
+                        return [4 /*yield*/, this.buildEventPayload((0, lib_1.toSnakeCase)(payload))];
+                    case 2:
+                        requestData = (_a.payload = _b.sent(),
+                            _a);
+                        _b.label = 3;
                     case 3:
-                        requestData = (_b.payload = _c.sent(),
-                            _b);
-                        _c.label = 4;
-                    case 4:
-                        _c.trys.push([4, 6, , 7]);
+                        _b.trys.push([3, 5, , 6]);
                         return [4 /*yield*/, axios_1.default.post(constants_1.EVENTS_API_URL, JSON.stringify(requestData), {
                                 headers: {
                                     "Content-Type": "application/json",
                                     Authorization: "Bearer ".concat(this.config.apiKey),
                                 },
                             })];
-                    case 5:
-                        response = _c.sent();
+                    case 4:
+                        response = _b.sent();
                         if (response.status >= 200 && response.status < 300) {
                             console.log("Event sent successfully: ".concat(this.getActionDescriptor(action, payload)));
                         }
                         else {
                             throw new Error("Failed with status: ".concat(response.status));
                         }
-                        return [3 /*break*/, 7];
-                    case 6:
-                        error_3 = _c.sent();
-                        highlight_run_1.H.consumeError(error_3, "Request data: ".concat(JSON.stringify(requestData)));
+                        return [3 /*break*/, 6];
+                    case 5:
+                        error_3 = _b.sent();
                         console.error("Event \"".concat(action, "\" failed. Error: ").concat(error_3));
-                        return [3 /*break*/, 7];
-                    case 7: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -726,15 +708,15 @@ var FormoAnalytics = /** @class */ (function () {
                         _i = 0, providers_1 = providers;
                         _c.label = 1;
                     case 1:
-                        if (!(_i < providers_1.length)) return [3 /*break*/, 10];
+                        if (!(_i < providers_1.length)) return [3 /*break*/, 13];
                         _a = providers_1[_i], provider = _a.provider, info = _a.info;
                         _c.label = 2;
                     case 2:
-                        _c.trys.push([2, 8, , 9]);
+                        _c.trys.push([2, 11, , 12]);
                         return [4 /*yield*/, this.getAccounts(provider)];
                     case 3:
                         accounts = _c.sent();
-                        if (!(accounts && accounts.length > 0)) return [3 /*break*/, 7];
+                        if (!(accounts && accounts.length > 0)) return [3 /*break*/, 8];
                         _b = 0, accounts_1 = accounts;
                         _c.label = 4;
                     case 4:
@@ -751,21 +733,34 @@ var FormoAnalytics = /** @class */ (function () {
                     case 6:
                         _b++;
                         return [3 /*break*/, 4];
-                    case 7: return [3 /*break*/, 9];
-                    case 8:
-                        err_1 = _c.sent();
-                        return [3 /*break*/, 9];
+                    case 7: return [3 /*break*/, 10];
+                    case 8: 
+                    // Identify without accounts
+                    return [4 /*yield*/, this.identify({
+                            address: null,
+                            providerName: info.name,
+                            rdns: info.rdns,
+                        })];
                     case 9:
+                        // Identify without accounts
+                        _c.sent();
+                        _c.label = 10;
+                    case 10: return [3 /*break*/, 12];
+                    case 11:
+                        err_1 = _c.sent();
+                        console.log("identifying all => err", err_1);
+                        return [3 /*break*/, 12];
+                    case 12:
                         _i++;
                         return [3 /*break*/, 1];
-                    case 10: return [2 /*return*/];
+                    case 13: return [2 /*return*/];
                 }
             });
         });
     };
     Object.defineProperty(FormoAnalytics.prototype, "provider", {
         get: function () {
-            return this.currentProvider;
+            return this._provider;
         },
         enumerable: false,
         configurable: true
@@ -785,18 +780,18 @@ var FormoAnalytics = /** @class */ (function () {
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.getAccounts(this.provider)];
+                        return [4 /*yield*/, this.getAccounts()];
                     case 2:
                         accounts = _a.sent();
                         if (accounts && accounts.length > 0) {
-                            return [2 /*return*/, accounts[0]];
+                            return [2 /*return*/, (0, lib_1.isAddress)(accounts[0]) ? accounts[0] : null];
                         }
-                        return [2 /*return*/, null];
+                        return [3 /*break*/, 4];
                     case 3:
                         err_2 = _a.sent();
                         console.log("Failed to fetch accounts from provider:", err_2);
                         return [2 /*return*/, null];
-                    case 4: return [2 /*return*/];
+                    case 4: return [2 /*return*/, null];
                 }
             });
         });
@@ -837,14 +832,13 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!this.currentProvider) {
+                        if (!this.provider) {
                             console.error("FormoAnalytics::getCurrentChainId: provider not set");
-                            return [2 /*return*/, 0];
                         }
                         _b.label = 1;
                     case 1:
                         _b.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, ((_a = this.currentProvider) === null || _a === void 0 ? void 0 : _a.request({
+                        return [4 /*yield*/, ((_a = this.provider) === null || _a === void 0 ? void 0 : _a.request({
                                 method: "eth_chainId",
                             }))];
                     case 2:
@@ -897,7 +891,7 @@ var FormoAnalytics = /** @class */ (function () {
                 location = this.getLocation();
                 language = this.getLanguage();
                 // common browser properties
-                return [2 /*return*/, __assign({ "user-agent": window.navigator.userAgent, locale: language, location: location, referrer: document.referrer, utm_source: params.get("utm_source"), utm_medium: params.get("utm_medium"), utm_campaign: params.get("utm_campaign"), ref: params.get("ref") }, eventSpecificPayload)];
+                return [2 /*return*/, __assign({ "user-agent": window.navigator.userAgent, origin: url.origin, locale: language, location: location, referrer: document.referrer, utm_source: params.get("utm_source"), utm_medium: params.get("utm_medium"), utm_campaign: params.get("utm_campaign"), ref: params.get("ref") }, eventSpecificPayload)];
             });
         });
     };
@@ -945,4 +939,15 @@ var FormoAnalytics = /** @class */ (function () {
     return FormoAnalytics;
 }());
 exports.FormoAnalytics = FormoAnalytics;
+var FormoAnalyticsSession = /** @class */ (function () {
+    function FormoAnalyticsSession() {
+    }
+    FormoAnalyticsSession.prototype.isIdentified = function () {
+        return lib_1.session.get(constants_2.SESSION_IDENTIFIED_KEY) === true;
+    };
+    FormoAnalyticsSession.prototype.identify = function () {
+        lib_1.session.set(constants_2.SESSION_IDENTIFIED_KEY, true);
+    };
+    return FormoAnalyticsSession;
+}());
 //# sourceMappingURL=FormoAnalytics.js.map