@formo/analytics 1.25.0 → 1.27.0

package/dist/cjs/src/FormoAnalytics.js

@@ -59,12 +59,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormoAnalytics = void 0;
 var mipd_1 = require("mipd");
 var constants_1 = require("./constants");
-var lib_1 = require("./lib");
+var storage_1 = require("./storage");
+var event_1 = require("./event");
+var queue_1 = require("./queue");
+var logger_1 = require("./logger");
+var consent_1 = require("./consent");
+var provider_1 = require("./provider");
+var session_1 = require("./session");
 var types_1 = require("./types");
 var utils_1 = require("./utils");
 var address_1 = require("./utils/address");
 var validators_1 = require("./validators");
 var chain_1 = require("./utils/chain");
+var wagmi_1 = require("./wagmi");
 /**
  * Constants for provider switching reasons
  */
@@ -98,14 +105,21 @@ var FormoAnalytics = /** @class */ (function () {
         this._processingAccountsChanged = false;
         // Set to efficiently track seen providers for deduplication and O(1) lookup
         this._seenProviders = new Set();
+        /**
+         * Flag indicating if Wagmi mode is enabled
+         * When true, EIP-1193 provider wrapping is skipped
+         */
+        this.isWagmiMode = false;
         this.currentUserId = "";
         this.config = {
             writeKey: writeKey,
         };
         this.options = options;
-        this.session = new FormoAnalyticsSession();
+        // Check if Wagmi mode is enabled
+        this.isWagmiMode = !!options.wagmi;
+        this.session = new session_1.FormoAnalyticsSession();
         this.currentUserId =
-            (0, lib_1.cookie)().get(constants_1.SESSION_USER_ID_KEY) || undefined;
+            (0, storage_1.cookie)().get(constants_1.SESSION_USER_ID_KEY) || undefined;
         this.identify = this.identify.bind(this);
         this.connect = this.connect.bind(this);
         this.disconnect = this.disconnect.bind(this);
@@ -116,32 +130,40 @@ var FormoAnalytics = /** @class */ (function () {
         this.track = this.track.bind(this);
         this.isAutocaptureEnabled = this.isAutocaptureEnabled.bind(this);
         // Initialize logger with configuration from options
-        lib_1.Logger.init({
+        logger_1.Logger.init({
             enabled: ((_a = options.logger) === null || _a === void 0 ? void 0 : _a.enabled) || false,
             enabledLevels: ((_b = options.logger) === null || _b === void 0 ? void 0 : _b.levels) || [],
         });
-        this.eventManager = new lib_1.EventManager(new lib_1.EventQueue(this.config.writeKey, {
+        this.eventManager = new event_1.EventManager(new queue_1.EventQueue(this.config.writeKey, {
             apiHost: options.apiHost || constants_1.EVENTS_API_HOST,
             flushAt: options.flushAt,
             retryCount: options.retryCount,
             maxQueueSize: options.maxQueueSize,
             flushInterval: options.flushInterval,
+            errorHandler: options.errorHandler,
         }), options);
         // Check consent status on initialization
         if (this.hasOptedOutTracking()) {
-            lib_1.logger.info("User has previously opted out of tracking");
+            logger_1.logger.info("User has previously opted out of tracking");
         }
-        // Handle initial provider (injected) as fallback; listeners for EIP-6963 are added later
-        var provider = undefined;
-        var optProvider = options.provider;
-        if (optProvider) {
-            provider = optProvider;
+        // Initialize Wagmi handler if Wagmi mode is enabled
+        if (this.isWagmiMode && options.wagmi) {
+            logger_1.logger.info("FormoAnalytics: Initializing in Wagmi mode");
+            this.wagmiHandler = new wagmi_1.WagmiEventHandler(this, options.wagmi.config, options.wagmi.queryClient);
         }
-        else if (typeof window !== "undefined" && window.ethereum) {
-            provider = window.ethereum;
-        }
-        if (provider) {
-            this.trackProvider(provider);
+        else {
+            // Handle initial provider (injected) as fallback; listeners for EIP-6963 are added later
+            var provider = undefined;
+            var optProvider = options.provider;
+            if (optProvider) {
+                provider = optProvider;
+            }
+            else if (typeof window !== "undefined" && window.ethereum) {
+                provider = window.ethereum;
+            }
+            if (provider) {
+                this.trackEIP1193Provider(provider);
+            }
         }
         this.trackPageHit();
         this.trackPageHits();
@@ -156,26 +178,15 @@ var FormoAnalytics = /** @class */ (function () {
         // This allows legitimate provider switching while preventing race conditions
         return this._provider != null && this._provider !== provider;
     };
-    /**
-     * Check if a provider is in a valid state for switching
-     * @param provider The provider to validate
-     * @returns true if the provider is in a valid state
-     */
-    FormoAnalytics.prototype.isProviderInValidState = function (provider) {
-        // Basic validation: ensure provider exists and has required methods
-        return (provider &&
-            typeof provider.request === "function" &&
-            typeof provider.on === "function" &&
-            typeof provider.removeListener === "function");
-    };
     FormoAnalytics.init = function (writeKey, options) {
         return __awaiter(this, void 0, void 0, function () {
             var analytics, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        (0, lib_1.initStorageManager)(writeKey);
+                        (0, storage_1.initStorageManager)(writeKey);
                         analytics = new FormoAnalytics(writeKey, options);
+                        if (!!analytics.isWagmiMode) return [3 /*break*/, 3];
                         // Auto-detect wallet provider
                         _a = analytics;
                         return [4 /*yield*/, analytics.getProviders()];
@@ -186,7 +197,11 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         _b.sent();
                         analytics.trackProviders(analytics._providers);
-                        return [2 /*return*/, analytics];
+                        return [3 /*break*/, 4];
+                    case 3:
+                        logger_1.logger.info("FormoAnalytics: Skipping provider detection (Wagmi mode)");
+                        _b.label = 4;
+                    case 4: return [2 /*return*/, analytics];
                 }
             });
         });
@@ -221,10 +236,31 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.reset = function () {
         this.currentUserId = undefined;
-        (0, lib_1.cookie)().remove(constants_1.LOCAL_ANONYMOUS_ID_KEY);
-        (0, lib_1.cookie)().remove(constants_1.SESSION_USER_ID_KEY);
-        (0, lib_1.cookie)().remove(constants_1.SESSION_WALLET_DETECTED_KEY);
-        (0, lib_1.cookie)().remove(constants_1.SESSION_WALLET_IDENTIFIED_KEY);
+        (0, storage_1.cookie)().remove(constants_1.LOCAL_ANONYMOUS_ID_KEY);
+        (0, storage_1.cookie)().remove(constants_1.SESSION_USER_ID_KEY);
+        (0, storage_1.cookie)().remove(session_1.SESSION_WALLET_DETECTED_KEY);
+        (0, storage_1.cookie)().remove(session_1.SESSION_WALLET_IDENTIFIED_KEY);
+    };
+    /**
+     * Clean up resources and event listeners
+     * Call this when destroying the analytics instance
+     * @returns {void}
+     */
+    FormoAnalytics.prototype.cleanup = function () {
+        logger_1.logger.info("FormoAnalytics: Cleaning up resources");
+        // Clean up Wagmi handler if present
+        if (this.wagmiHandler) {
+            this.wagmiHandler.cleanup();
+            this.wagmiHandler = undefined;
+        }
+        // Clean up EIP-1193 providers if not in Wagmi mode
+        if (!this.isWagmiMode) {
+            for (var _i = 0, _a = Array.from(this._trackedProviders); _i < _a.length; _i++) {
+                var provider = _a[_i];
+                this.untrackProvider(provider);
+            }
+        }
+        logger_1.logger.info("FormoAnalytics: Cleanup complete");
     };
     /**
      * Emits a connect wallet event.
@@ -243,17 +279,17 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         if (chainId === null || chainId === undefined) {
-                            lib_1.logger.warn("Connect: Chain ID cannot be null or undefined");
+                            logger_1.logger.warn("Connect: Chain ID cannot be null or undefined");
                             return [2 /*return*/];
                         }
                         if (!address) {
-                            lib_1.logger.warn("Connect: Address cannot be empty");
+                            logger_1.logger.warn("Connect: Address cannot be empty");
                             return [2 /*return*/];
                         }
                         this.currentChainId = chainId;
                         checksummedAddress = this.validateAndChecksumAddress(address);
                         if (!checksummedAddress) {
-                            lib_1.logger.warn("Connect: Invalid address provided (\"".concat(address, "\"). Please provide a valid Ethereum address in checksum format."));
+                            logger_1.logger.warn("Connect: Invalid address provided (\"".concat(address, "\"). Please provide a valid Ethereum address in checksum format."));
                             return [2 /*return*/];
                         }
                         this.currentAddress = checksummedAddress;
@@ -288,7 +324,7 @@ var FormoAnalytics = /** @class */ (function () {
                         providerInfo = this._provider
                             ? this.getProviderInfo(this._provider)
                             : null;
-                        lib_1.logger.info("Disconnect: Emitting disconnect event with:", {
+                        logger_1.logger.info("Disconnect: Emitting disconnect event with:", {
                             chainId: chainId,
                             address: address,
                             providerName: providerInfo === null || providerInfo === void 0 ? void 0 : providerInfo.name,
@@ -304,7 +340,7 @@ var FormoAnalytics = /** @class */ (function () {
                         this.currentAddress = undefined;
                         this.currentChainId = undefined;
                         this.clearActiveProvider();
-                        lib_1.logger.info("Wallet disconnected: Cleared currentAddress, currentChainId, and provider");
+                        logger_1.logger.info("Wallet disconnected: Cleared currentAddress, currentChainId, and provider");
                         return [2 /*return*/];
                 }
             });
@@ -326,15 +362,15 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         if (!chainId || Number(chainId) === 0) {
-                            lib_1.logger.warn("FormoAnalytics::chain: chainId cannot be empty or 0");
+                            logger_1.logger.warn("FormoAnalytics::chain: chainId cannot be empty or 0");
                             return [2 /*return*/];
                         }
                         if (isNaN(Number(chainId))) {
-                            lib_1.logger.warn("FormoAnalytics::chain: chainId must be a valid decimal number");
+                            logger_1.logger.warn("FormoAnalytics::chain: chainId must be a valid decimal number");
                             return [2 /*return*/];
                         }
                         if (!address && !this.currentAddress) {
-                            lib_1.logger.warn("FormoAnalytics::chain: address was empty and no previous address has been recorded");
+                            logger_1.logger.warn("FormoAnalytics::chain: address was empty and no previous address has been recorded");
                             return [2 /*return*/];
                         }
                         this.currentChainId = chainId;
@@ -390,10 +426,10 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.transaction = function (_a, properties_1, context_1, callback_1) {
         return __awaiter(this, arguments, void 0, function (_b, properties, context, callback) {
-            var status = _b.status, chainId = _b.chainId, address = _b.address, data = _b.data, to = _b.to, value = _b.value, transactionHash = _b.transactionHash;
+            var status = _b.status, chainId = _b.chainId, address = _b.address, data = _b.data, to = _b.to, value = _b.value, transactionHash = _b.transactionHash, function_name = _b.function_name, function_args = _b.function_args;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.trackEvent(constants_1.EventType.TRANSACTION, __assign({ status: status, chainId: chainId, address: address, data: data, to: to, value: value }, (transactionHash && { transactionHash: transactionHash })), properties, context, callback)];
+                    case 0: return [4 /*yield*/, this.trackEvent(constants_1.EventType.TRANSACTION, __assign(__assign(__assign({ status: status, chainId: chainId, address: address, data: data, to: to, value: value }, (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), properties, context, callback)];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];
@@ -422,7 +458,7 @@ var FormoAnalytics = /** @class */ (function () {
                         _c.trys.push([0, 12, , 13]);
                         if (!!params) return [3 /*break*/, 10];
                         // If no params provided, auto-identify
-                        lib_1.logger.info("Auto-identifying with providers:", this._providers.map(function (p) { return p.info.name; }));
+                        logger_1.logger.info("Auto-identifying with providers:", this._providers.map(function (p) { return p.info.name; }));
                         _i = 0, _a = this._providers;
                         _c.label = 1;
                     case 1:
@@ -439,7 +475,7 @@ var FormoAnalytics = /** @class */ (function () {
                         address_2 = _c.sent();
                         if (!address_2) return [3 /*break*/, 6];
                         validAddress_1 = this.validateAndChecksumAddress(address_2);
-                        lib_1.logger.info("Auto-identify: Checking deduplication", {
+                        logger_1.logger.info("Auto-identify: Checking deduplication", {
                             validAddress: validAddress_1,
                             rdns: providerDetail.info.rdns,
                             providerName: providerDetail.info.name,
@@ -449,7 +485,7 @@ var FormoAnalytics = /** @class */ (function () {
                         });
                         if (!(validAddress_1 &&
                             !this.session.isWalletIdentified(validAddress_1, providerDetail.info.rdns))) return [3 /*break*/, 5];
-                        lib_1.logger.info("Auto-identifying", validAddress_1, providerDetail.info.name, providerDetail.info.rdns);
+                        logger_1.logger.info("Auto-identifying", validAddress_1, providerDetail.info.name, providerDetail.info.rdns);
                         // NOTE: do not set this.currentAddress without explicit connect or identify
                         return [4 /*yield*/, this.identify({
                                 address: validAddress_1,
@@ -462,13 +498,13 @@ var FormoAnalytics = /** @class */ (function () {
                         return [3 /*break*/, 6];
                     case 5:
                         if (validAddress_1) {
-                            lib_1.logger.info("Auto-identify: Skipping already identified wallet", validAddress_1, providerDetail.info.name, providerDetail.info.rdns);
+                            logger_1.logger.info("Auto-identify: Skipping already identified wallet", validAddress_1, providerDetail.info.name, providerDetail.info.rdns);
                         }
                         _c.label = 6;
                     case 6: return [3 /*break*/, 8];
                     case 7:
                         err_1 = _c.sent();
-                        lib_1.logger.error("Failed to identify provider ".concat(providerDetail.info.name, ":"), err_1);
+                        logger_1.logger.error("Failed to identify provider ".concat(providerDetail.info.name, ":"), err_1);
                         return [3 /*break*/, 8];
                     case 8:
                         _i++;
@@ -476,13 +512,13 @@ var FormoAnalytics = /** @class */ (function () {
                     case 9: return [2 /*return*/];
                     case 10:
                         userId = params.userId, address = params.address, providerName = params.providerName, rdns = params.rdns;
-                        lib_1.logger.info("Identify", address, userId, providerName, rdns);
+                        logger_1.logger.info("Identify", address, userId, providerName, rdns);
                         validAddress = undefined;
                         if (address) {
                             validAddress = this.validateAndChecksumAddress(address);
                             this.currentAddress = validAddress || undefined;
                             if (!validAddress) {
-                                (_b = lib_1.logger.warn) === null || _b === void 0 ? void 0 : _b.call(lib_1.logger, "Invalid address provided to identify:", address);
+                                (_b = logger_1.logger.warn) === null || _b === void 0 ? void 0 : _b.call(logger_1.logger, "Invalid address provided to identify:", address);
                             }
                         }
                         else {
@@ -490,12 +526,12 @@ var FormoAnalytics = /** @class */ (function () {
                         }
                         if (userId) {
                             this.currentUserId = userId;
-                            (0, lib_1.cookie)().set(constants_1.SESSION_USER_ID_KEY, userId);
+                            (0, storage_1.cookie)().set(constants_1.SESSION_USER_ID_KEY, userId);
                         }
                         isAlreadyIdentified = validAddress
                             ? this.session.isWalletIdentified(validAddress, rdns || "")
                             : false;
-                        lib_1.logger.debug("Identify: Checking deduplication", {
+                        logger_1.logger.debug("Identify: Checking deduplication", {
                             validAddress: validAddress,
                             rdns: rdns,
                             providerName: providerName,
@@ -504,7 +540,7 @@ var FormoAnalytics = /** @class */ (function () {
                             isAlreadyIdentified: isAlreadyIdentified,
                         });
                         if (isAlreadyIdentified) {
-                            lib_1.logger.info("Identify: Wallet ".concat(providerName || "Unknown", " with address ").concat(validAddress, " already identified in this session (rdns: ").concat(rdns || "empty", ")"));
+                            logger_1.logger.info("Identify: Wallet ".concat(providerName || "Unknown", " with address ").concat(validAddress, " already identified in this session (rdns: ").concat(rdns || "empty", ")"));
                             return [2 /*return*/];
                         }
                         // Mark as identified before emitting the event
@@ -523,7 +559,7 @@ var FormoAnalytics = /** @class */ (function () {
                         return [3 /*break*/, 13];
                     case 12:
                         e_1 = _c.sent();
-                        lib_1.logger.log("identify error", e_1);
+                        logger_1.logger.log("identify error", e_1);
                         return [3 /*break*/, 13];
                     case 13: return [2 /*return*/];
                 }
@@ -546,7 +582,7 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_c.label) {
                     case 0:
                         if (this.session.isWalletDetected(rdns))
-                            return [2 /*return*/, lib_1.logger.warn("Detect: Wallet ".concat(providerName, " already detected in this session"))];
+                            return [2 /*return*/, logger_1.logger.warn("Detect: Wallet ".concat(providerName, " already detected in this session"))];
                         this.session.markWalletDetected(rdns);
                         return [4 /*yield*/, this.trackEvent(constants_1.EventType.DETECT, {
                                 providerName: providerName,
@@ -587,12 +623,12 @@ var FormoAnalytics = /** @class */ (function () {
      * @returns {void}
      */
     FormoAnalytics.prototype.optOutTracking = function () {
-        lib_1.logger.info("Opting out of tracking");
+        logger_1.logger.info("Opting out of tracking");
         // Set opt-out flag in persistent storage using direct cookie access
         // This must be done before switching storage to ensure persistence
-        (0, lib_1.setConsentFlag)(this.writeKey, constants_1.CONSENT_OPT_OUT_KEY, "true");
+        (0, consent_1.setConsentFlag)(this.writeKey, constants_1.CONSENT_OPT_OUT_KEY, "true");
         this.reset();
-        lib_1.logger.info("Successfully opted out of tracking");
+        logger_1.logger.info("Successfully opted out of tracking");
     };
     /**
      * Opt back into tracking after previously opting out. This will re-enable analytics tracking
@@ -600,28 +636,44 @@ var FormoAnalytics = /** @class */ (function () {
      * @returns {void}
      */
     FormoAnalytics.prototype.optInTracking = function () {
-        lib_1.logger.info("Opting back into tracking");
+        logger_1.logger.info("Opting back into tracking");
         // Remove opt-out flag
-        (0, lib_1.removeConsentFlag)(this.writeKey, constants_1.CONSENT_OPT_OUT_KEY);
-        lib_1.logger.info("Successfully opted back into tracking");
+        (0, consent_1.removeConsentFlag)(this.writeKey, constants_1.CONSENT_OPT_OUT_KEY);
+        logger_1.logger.info("Successfully opted back into tracking");
     };
     /**
      * Check if the user has opted out of tracking.
      * @returns {boolean} True if the user has opted out
      */
     FormoAnalytics.prototype.hasOptedOutTracking = function () {
-        return (0, lib_1.getConsentFlag)(this.writeKey, constants_1.CONSENT_OPT_OUT_KEY) === "true";
+        return (0, consent_1.getConsentFlag)(this.writeKey, constants_1.CONSENT_OPT_OUT_KEY) === "true";
     };
     /*
       SDK tracking and event listener functions
     */
-    FormoAnalytics.prototype.trackProvider = function (provider) {
-        lib_1.logger.info("trackProvider", provider);
+    /**
+     * Track an EIP-1193 provider by wrapping its request method and adding event listeners
+     * Note: This is only used in non-Wagmi mode. When Wagmi is enabled, all tracking
+     * happens through Wagmi's connector system instead of EIP-1193/EIP-6963.
+     * @param provider The EIP-1193 provider to track
+     */
+    FormoAnalytics.prototype.trackEIP1193Provider = function (provider) {
+        logger_1.logger.info("trackEIP1193Provider", provider);
+        // Defensive check: Skip provider tracking in Wagmi mode
+        // This should never be called in Wagmi mode due to guards in init(),
+        // but we check here for safety in case of future code changes
+        if (this.isWagmiMode) {
+            logger_1.logger.debug("trackEIP1193Provider: Skipping EIP-1193 provider tracking (Wagmi mode - using connector system instead)");
+            return;
+        }
         try {
-            if (!provider)
+            // Validate provider exists and has required methods
+            if (!(0, provider_1.isValidProvider)(provider)) {
+                logger_1.logger.warn("trackEIP1193Provider: Invalid provider - missing required methods");
                 return;
+            }
             if (this._trackedProviders.has(provider)) {
-                lib_1.logger.warn("TrackProvider: Provider already tracked.");
+                logger_1.logger.warn("trackEIP1193Provider: Provider already tracked");
                 return;
             }
             // CRITICAL: Always register accountsChanged for state management
@@ -639,7 +691,7 @@ var FormoAnalytics = /** @class */ (function () {
                 this.registerRequestListeners(provider);
             }
             else {
-                lib_1.logger.debug("TrackProvider: Skipping request wrapping (both signature and transaction autocapture disabled)");
+                logger_1.logger.debug("TrackProvider: Skipping request wrapping (both signature and transaction autocapture disabled)");
             }
             if (this.isAutocaptureEnabled("disconnect")) {
                 this.registerDisconnectListener(provider);
@@ -648,7 +700,7 @@ var FormoAnalytics = /** @class */ (function () {
             this._trackedProviders.add(provider);
         }
         catch (error) {
-            lib_1.logger.error("Error tracking provider:", error);
+            logger_1.logger.error("Error tracking provider:", error);
         }
     };
     FormoAnalytics.prototype.trackProviders = function (providers) {
@@ -657,12 +709,12 @@ var FormoAnalytics = /** @class */ (function () {
                 var eip6963ProviderDetail = providers_1[_i];
                 var provider = eip6963ProviderDetail === null || eip6963ProviderDetail === void 0 ? void 0 : eip6963ProviderDetail.provider;
                 if (provider && !this._trackedProviders.has(provider)) {
-                    this.trackProvider(provider);
+                    this.trackEIP1193Provider(provider);
                 }
             }
         }
         catch (error) {
-            lib_1.logger.error("Failed to track EIP-6963 providers during initialization:", error);
+            logger_1.logger.error("Failed to track EIP-6963 providers during initialization:", error);
         }
     };
     FormoAnalytics.prototype.addProviderListener = function (provider, event, listener) {
@@ -672,7 +724,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.registerAccountsChangedListener = function (provider) {
         var _this = this;
-        lib_1.logger.info("registerAccountsChangedListener");
+        logger_1.logger.info("registerAccountsChangedListener");
         var listener = function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
@@ -688,10 +740,10 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        lib_1.logger.info("onAccountsChanged", accounts);
+                        logger_1.logger.info("onAccountsChanged", accounts);
                         // Prevent concurrent processing of accountsChanged events to avoid race conditions
                         if (this._processingAccountsChanged) {
-                            lib_1.logger.debug("OnAccountsChanged: Already processing accountsChanged, skipping", {
+                            logger_1.logger.debug("OnAccountsChanged: Already processing accountsChanged, skipping", {
                                 provider: this.getProviderInfo(provider).name,
                             });
                             return [2 /*return*/];
@@ -730,7 +782,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 0:
                         if (!(accounts.length === 0)) return [3 /*break*/, 9];
                         if (!(this._provider === provider)) return [3 /*break*/, 7];
-                        lib_1.logger.info("OnAccountsChanged: Detecting disconnect, current state:", {
+                        logger_1.logger.info("OnAccountsChanged: Detecting disconnect, current state:", {
                             currentAddress: this.currentAddress,
                             currentChainId: this.currentChainId,
                             providerMatch: this._provider === provider,
@@ -750,11 +802,11 @@ var FormoAnalytics = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 3:
                         error_1 = _a.sent();
-                        lib_1.logger.error("Failed to disconnect provider on accountsChanged", error_1);
+                        logger_1.logger.error("Failed to disconnect provider on accountsChanged", error_1);
                         return [3 /*break*/, 4];
                     case 4: return [3 /*break*/, 6];
                     case 5:
-                        lib_1.logger.debug("OnAccountsChanged: Disconnect event skipped (autocapture.disconnect: false)");
+                        logger_1.logger.debug("OnAccountsChanged: Disconnect event skipped (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
                         this.currentAddress = undefined;
                         this.currentChainId = undefined;
@@ -762,19 +814,19 @@ var FormoAnalytics = /** @class */ (function () {
                         _a.label = 6;
                     case 6: return [3 /*break*/, 8];
                     case 7:
-                        lib_1.logger.info("OnAccountsChanged: Ignoring disconnect for non-active provider");
+                        logger_1.logger.info("OnAccountsChanged: Ignoring disconnect for non-active provider");
                         _a.label = 8;
                     case 8: return [2 /*return*/];
                     case 9:
                         address = this.validateAndChecksumAddress(accounts[0]);
                         if (!address) {
-                            lib_1.logger.warn("onAccountsChanged: Invalid address received", accounts[0]);
+                            logger_1.logger.warn("onAccountsChanged: Invalid address received", accounts[0]);
                             return [2 /*return*/];
                         }
                         if (!(this._provider && this._provider !== provider)) return [3 /*break*/, 26];
                         currentStoredAddress = this.currentAddress;
                         newProviderAddress = this.validateAndChecksumAddress(address);
-                        lib_1.logger.info("OnAccountsChanged: Different provider attempting to connect", {
+                        logger_1.logger.info("OnAccountsChanged: Different provider attempting to connect", {
                             activeProvider: this.getProviderInfo(this._provider).name,
                             eventProvider: this.getProviderInfo(provider).name,
                             currentStoredAddress: currentStoredAddress,
@@ -786,7 +838,7 @@ var FormoAnalytics = /** @class */ (function () {
                         return [4 /*yield*/, this.getAccounts(this._provider)];
                     case 11:
                         activeProviderAccounts = _a.sent();
-                        lib_1.logger.info("OnAccountsChanged: Checking current provider accounts", {
+                        logger_1.logger.info("OnAccountsChanged: Checking current provider accounts", {
                             activeProvider: this.getProviderInfo(this._provider).name,
                             accountsLength: activeProviderAccounts
                                 ? activeProviderAccounts.length
@@ -797,7 +849,7 @@ var FormoAnalytics = /** @class */ (function () {
                         if (!(newProviderAddress &&
                             currentStoredAddress &&
                             newProviderAddress !== currentStoredAddress)) return [3 /*break*/, 15];
-                        lib_1.logger.info("OnAccountsChanged: Different address detected, switching providers despite current provider having accounts", {
+                        logger_1.logger.info("OnAccountsChanged: Different address detected, switching providers despite current provider having accounts", {
                             activeProvider: this.getProviderInfo(this._provider).name,
                             eventProvider: this.getProviderInfo(provider).name,
                             currentAddress: currentStoredAddress,
@@ -813,7 +865,7 @@ var FormoAnalytics = /** @class */ (function () {
                         _a.sent();
                         return [3 /*break*/, 14];
                     case 13:
-                        lib_1.logger.debug("OnAccountsChanged: Disconnect event skipped during provider switch (autocapture.disconnect: false)");
+                        logger_1.logger.debug("OnAccountsChanged: Disconnect event skipped during provider switch (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
                         this.currentAddress = undefined;
                         this.currentChainId = undefined;
@@ -823,7 +875,7 @@ var FormoAnalytics = /** @class */ (function () {
                         this.clearActiveProvider();
                         return [3 /*break*/, 16];
                     case 15:
-                        lib_1.logger.info("OnAccountsChanged: Current provider still has accounts and same address, ignoring new provider", {
+                        logger_1.logger.info("OnAccountsChanged: Current provider still has accounts and same address, ignoring new provider", {
                             activeProvider: this.getProviderInfo(this._provider).name,
                             eventProvider: this.getProviderInfo(provider).name,
                             activeProviderAccountsCount: activeProviderAccounts.length,
@@ -833,7 +885,7 @@ var FormoAnalytics = /** @class */ (function () {
                         return [2 /*return*/];
                     case 16: return [3 /*break*/, 21];
                     case 17:
-                        lib_1.logger.info("OnAccountsChanged: Current provider has no accounts, switching to new provider", {
+                        logger_1.logger.info("OnAccountsChanged: Current provider has no accounts, switching to new provider", {
                             oldProvider: this.getProviderInfo(this._provider).name,
                             newProvider: this.getProviderInfo(provider).name,
                             reason: PROVIDER_SWITCH_REASONS.NO_ACCOUNTS,
@@ -847,7 +899,7 @@ var FormoAnalytics = /** @class */ (function () {
                         _a.sent();
                         return [3 /*break*/, 20];
                     case 19:
-                        lib_1.logger.debug("OnAccountsChanged: Disconnect event skipped for old provider (autocapture.disconnect: false)");
+                        logger_1.logger.debug("OnAccountsChanged: Disconnect event skipped for old provider (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
                         this.currentAddress = undefined;
                         this.currentChainId = undefined;
@@ -859,7 +911,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 21: return [3 /*break*/, 26];
                     case 22:
                         error_2 = _a.sent();
-                        lib_1.logger.warn("OnAccountsChanged: Could not check current provider accounts, switching to new provider", {
+                        logger_1.logger.warn("OnAccountsChanged: Could not check current provider accounts, switching to new provider", {
                             error: error_2 instanceof Error ? error_2.message : String(error_2),
                             errorType: error_2 instanceof Error ? error_2.constructor.name : typeof error_2,
                             oldProvider: this._provider
@@ -877,7 +929,7 @@ var FormoAnalytics = /** @class */ (function () {
                         _a.sent();
                         return [3 /*break*/, 25];
                     case 24:
-                        lib_1.logger.debug("OnAccountsChanged: Disconnect event skipped for failed provider check (autocapture.disconnect: false)");
+                        logger_1.logger.debug("OnAccountsChanged: Disconnect event skipped for failed provider check (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
                         this.currentAddress = undefined;
                         this.currentChainId = undefined;
@@ -905,7 +957,7 @@ var FormoAnalytics = /** @class */ (function () {
                         providerInfo = this.getProviderInfo(provider);
                         effectiveChainId = nextChainId || 0;
                         if (this.isAutocaptureEnabled("connect")) {
-                            lib_1.logger.info("OnAccountsChanged: Detected wallet connection, emitting connect event", {
+                            logger_1.logger.info("OnAccountsChanged: Detected wallet connection, emitting connect event", {
                                 chainId: nextChainId,
                                 address: address,
                                 wasDisconnected: wasDisconnected,
@@ -914,7 +966,7 @@ var FormoAnalytics = /** @class */ (function () {
                                 hasChainId: !!nextChainId,
                             });
                             if (effectiveChainId === 0) {
-                                lib_1.logger.info("OnAccountsChanged: Using fallback chainId 0 for connect event");
+                                logger_1.logger.info("OnAccountsChanged: Using fallback chainId 0 for connect event");
                             }
                             this.connect({
                                 chainId: effectiveChainId,
@@ -923,11 +975,11 @@ var FormoAnalytics = /** @class */ (function () {
                                 providerName: providerInfo.name,
                                 rdns: providerInfo.rdns,
                             }).catch(function (error) {
-                                lib_1.logger.error("Failed to track connect event during account change:", error);
+                                logger_1.logger.error("Failed to track connect event during account change:", error);
                             });
                         }
                         else {
-                            lib_1.logger.debug("OnAccountsChanged: Connect event skipped (autocapture.connect: false)", {
+                            logger_1.logger.debug("OnAccountsChanged: Connect event skipped (autocapture.connect: false)", {
                                 chainId: nextChainId,
                                 address: address,
                                 providerName: providerInfo.name,
@@ -940,7 +992,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.registerChainChangedListener = function (provider) {
         var _this = this;
-        lib_1.logger.info("registerChainChangedListener");
+        logger_1.logger.info("registerChainChangedListener");
         var listener = function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
@@ -955,7 +1007,7 @@ var FormoAnalytics = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var nextChainId;
             return __generator(this, function (_a) {
-                lib_1.logger.info("onChainChanged", chainIdHex);
+                logger_1.logger.info("onChainChanged", chainIdHex);
                 nextChainId = (0, chain_1.parseChainId)(chainIdHex);
                 // Only handle chain changes for the active provider (or if none is set yet)
                 if (this.isProviderMismatch(provider)) {
@@ -963,7 +1015,7 @@ var FormoAnalytics = /** @class */ (function () {
                 }
                 // Chain changes only matter for connected users
                 if (!this.currentAddress) {
-                    lib_1.logger.info("OnChainChanged: No current address, user appears disconnected");
+                    logger_1.logger.info("OnChainChanged: No current address, user appears disconnected");
                     return [2 /*return*/, Promise.resolve()];
                 }
                 // Set provider if none exists
@@ -980,14 +1032,14 @@ var FormoAnalytics = /** @class */ (function () {
                             })];
                     }
                     else {
-                        lib_1.logger.debug("OnChainChanged: Chain event skipped (autocapture.chain: false)", {
+                        logger_1.logger.debug("OnChainChanged: Chain event skipped (autocapture.chain: false)", {
                             chainId: this.currentChainId,
                             address: this.currentAddress,
                         });
                     }
                 }
                 catch (error) {
-                    lib_1.logger.error("OnChainChanged: Failed to emit chain event:", error);
+                    logger_1.logger.error("OnChainChanged: Failed to emit chain event:", error);
                 }
                 return [2 /*return*/];
             });
@@ -995,7 +1047,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.registerConnectListener = function (provider) {
         var _this = this;
-        lib_1.logger.info("registerConnectListener");
+        logger_1.logger.info("registerConnectListener");
         var listener = function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
@@ -1009,7 +1061,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.registerDisconnectListener = function (provider) {
         var _this = this;
-        lib_1.logger.info("registerDisconnectListener");
+        logger_1.logger.info("registerDisconnectListener");
         var listener = function (_error) { return __awaiter(_this, void 0, void 0, function () {
             var e_2;
             return __generator(this, function (_a) {
@@ -1017,7 +1069,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 0:
                         if (this._provider !== provider)
                             return [2 /*return*/];
-                        lib_1.logger.info("OnDisconnect: Wallet disconnect event received, current state:", {
+                        logger_1.logger.info("OnDisconnect: Wallet disconnect event received, current state:", {
                             currentAddress: this.currentAddress,
                             currentChainId: this.currentChainId,
                         });
@@ -1036,11 +1088,11 @@ var FormoAnalytics = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 3:
                         e_2 = _a.sent();
-                        lib_1.logger.error("Error during disconnect in disconnect listener", e_2);
+                        logger_1.logger.error("Error during disconnect in disconnect listener", e_2);
                         return [3 /*break*/, 4];
                     case 4: return [3 /*break*/, 6];
                     case 5:
-                        lib_1.logger.debug("OnDisconnect: Disconnect event skipped (autocapture.disconnect: false)");
+                        logger_1.logger.debug("OnDisconnect: Disconnect event skipped (autocapture.disconnect: false)");
                         // Still clear state even if not tracking the event
                         this.currentAddress = undefined;
                         this.currentChainId = undefined;
@@ -1059,7 +1111,7 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        lib_1.logger.info("onConnected", connection);
+                        logger_1.logger.info("onConnected", connection);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
@@ -1088,7 +1140,7 @@ var FormoAnalytics = /** @class */ (function () {
                                 providerInfo = this.getProviderInfo(provider);
                                 effectiveChainId = chainId || 0;
                                 if (this.isAutocaptureEnabled("connect")) {
-                                    lib_1.logger.info("OnConnected: Detected wallet connection, emitting connect event", {
+                                    logger_1.logger.info("OnConnected: Detected wallet connection, emitting connect event", {
                                         chainId: chainId,
                                         wasDisconnected: wasDisconnected,
                                         providerName: providerInfo.name,
@@ -1097,7 +1149,7 @@ var FormoAnalytics = /** @class */ (function () {
                                         isActiveProvider: isActiveProvider,
                                     });
                                     if (effectiveChainId === 0) {
-                                        lib_1.logger.info("OnConnected: Using fallback chainId 0 for connect event");
+                                        logger_1.logger.info("OnConnected: Using fallback chainId 0 for connect event");
                                     }
                                     this.connect({
                                         chainId: effectiveChainId,
@@ -1106,11 +1158,11 @@ var FormoAnalytics = /** @class */ (function () {
                                         providerName: providerInfo.name,
                                         rdns: providerInfo.rdns,
                                     }).catch(function (error) {
-                                        lib_1.logger.error("Failed to track connect event during provider connection:", error);
+                                        logger_1.logger.error("Failed to track connect event during provider connection:", error);
                                     });
                                 }
                                 else {
-                                    lib_1.logger.debug("OnConnected: Connect event skipped (autocapture.connect: false)", {
+                                    logger_1.logger.debug("OnConnected: Connect event skipped (autocapture.connect: false)", {
                                         chainId: chainId,
                                         address: address,
                                         providerName: providerInfo.name,
@@ -1119,7 +1171,7 @@ var FormoAnalytics = /** @class */ (function () {
                             }
                             else if (address && !isActiveProvider) {
                                 providerInfo = this.getProviderInfo(provider);
-                                lib_1.logger.debug("OnConnected: Skipping connect event for non-active provider", {
+                                logger_1.logger.debug("OnConnected: Skipping connect event for non-active provider", {
                                     chainId: chainId,
                                     providerName: providerInfo.name,
                                     rdns: providerInfo.rdns,
@@ -1133,7 +1185,7 @@ var FormoAnalytics = /** @class */ (function () {
                         return [3 /*break*/, 4];
                     case 3:
                         e_3 = _a.sent();
-                        lib_1.logger.error("Error handling connect event", e_3);
+                        logger_1.logger.error("Error handling connect event", e_3);
                         return [3 /*break*/, 4];
                     case 4: return [2 /*return*/];
                 }
@@ -1142,15 +1194,15 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.registerRequestListeners = function (provider) {
         var _this = this;
-        lib_1.logger.info("registerRequestListeners");
+        logger_1.logger.info("registerRequestListeners");
         if (!provider) {
-            lib_1.logger.error("Provider not found for request (signature, transaction) tracking");
+            logger_1.logger.error("Provider not found for request (signature, transaction) tracking");
             return;
         }
         // Check if the provider is already wrapped with our SDK's wrapper
         var currentRequest = provider.request;
         if (this.isProviderAlreadyWrapped(provider, currentRequest)) {
-            lib_1.logger.info("Provider already wrapped with our SDK; skipping request wrapping.");
+            logger_1.logger.info("Provider already wrapped with our SDK; skipping request wrapping.");
             return;
         }
         var request = provider.request.bind(provider);
@@ -1164,7 +1216,7 @@ var FormoAnalytics = /** @class */ (function () {
                         if (!(Array.isArray(params) &&
                             ["eth_signTypedData_v4", "personal_sign"].includes(method))) return [3 /*break*/, 6];
                         if (!this.isAutocaptureEnabled("signature")) {
-                            lib_1.logger.debug("Signature event skipped (autocapture.signature: false)", { method: method });
+                            logger_1.logger.debug("Signature event skipped (autocapture.signature: false)", { method: method });
                             return [2 /*return*/, request({ method: method, params: params })];
                         }
                         _c = this.currentChainId;
@@ -1182,7 +1234,7 @@ var FormoAnalytics = /** @class */ (function () {
                                     this.signature(__assign({ status: types_1.SignatureStatus.REQUESTED }, this.buildSignatureEventPayload(method, params, undefined, capturedChainId_1)));
                                 }
                                 catch (e) {
-                                    lib_1.logger.error("Formo: Failed to track signature request", e);
+                                    logger_1.logger.error("Formo: Failed to track signature request", e);
                                 }
                                 return [2 /*return*/];
                             });
@@ -1201,7 +1253,7 @@ var FormoAnalytics = /** @class */ (function () {
                                         this.signature(__assign({ status: types_1.SignatureStatus.CONFIRMED }, this.buildSignatureEventPayload(method, params, response_1, capturedChainId_1)));
                                     }
                                     catch (e) {
-                                        lib_1.logger.error("Formo: Failed to track signature confirmation", e);
+                                        logger_1.logger.error("Formo: Failed to track signature confirmation", e);
                                     }
                                     return [2 /*return*/];
                                 });
@@ -1219,7 +1271,7 @@ var FormoAnalytics = /** @class */ (function () {
                                         this.signature(__assign({ status: types_1.SignatureStatus.REJECTED }, this.buildSignatureEventPayload(method, params, undefined, capturedChainId_1)));
                                     }
                                     catch (e) {
-                                        lib_1.logger.error("Formo: Failed to track signature rejection", e);
+                                        logger_1.logger.error("Formo: Failed to track signature rejection", e);
                                     }
                                     return [2 /*return*/];
                                 });
@@ -1231,7 +1283,7 @@ var FormoAnalytics = /** @class */ (function () {
                             method === "eth_sendTransaction" &&
                             params[0])) return [3 /*break*/, 10];
                         if (!this.isAutocaptureEnabled("transaction")) {
-                            lib_1.logger.debug("Transaction event skipped (autocapture.transaction: false)", { method: method });
+                            logger_1.logger.debug("Transaction event skipped (autocapture.transaction: false)", { method: method });
                             return [2 /*return*/, request({ method: method, params: params })];
                         }
                         (function () { return __awaiter(_this, void 0, void 0, function () {
@@ -1247,7 +1299,7 @@ var FormoAnalytics = /** @class */ (function () {
                                         return [3 /*break*/, 3];
                                     case 2:
                                         e_4 = _a.sent();
-                                        lib_1.logger.error("Formo: Failed to track transaction start", e_4);
+                                        logger_1.logger.error("Formo: Failed to track transaction start", e_4);
                                         return [3 /*break*/, 3];
                                     case 3: return [2 /*return*/];
                                 }
@@ -1277,7 +1329,7 @@ var FormoAnalytics = /** @class */ (function () {
                                         return [3 /*break*/, 3];
                                     case 2:
                                         e_5 = _a.sent();
-                                        lib_1.logger.error("Formo: Failed to track transaction broadcast", e_5);
+                                        logger_1.logger.error("Formo: Failed to track transaction broadcast", e_5);
                                         return [3 /*break*/, 3];
                                     case 3: return [2 /*return*/];
                                 }
@@ -1302,7 +1354,7 @@ var FormoAnalytics = /** @class */ (function () {
                                             return [3 /*break*/, 3];
                                         case 2:
                                             e_6 = _a.sent();
-                                            lib_1.logger.error("Formo: Failed to track transaction rejection", e_6);
+                                            logger_1.logger.error("Formo: Failed to track transaction rejection", e_6);
                                             return [3 /*break*/, 3];
                                         case 3: return [2 /*return*/];
                                     }
@@ -1323,16 +1375,16 @@ var FormoAnalytics = /** @class */ (function () {
             provider.request = wrappedRequest;
         }
         catch (e) {
-            lib_1.logger.warn("Failed to wrap provider.request; skipping", e);
+            logger_1.logger.warn("Failed to wrap provider.request; skipping", e);
         }
     };
     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);
+                currentUrl = (0, storage_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);
+                    (0, storage_1.cookie)().set(constants_1.SESSION_CURRENT_URL_KEY, window.location.href);
                     this.trackPageHit();
                 }
                 return [2 /*return*/];
@@ -1375,7 +1427,7 @@ var FormoAnalytics = /** @class */ (function () {
             var _this = this;
             return __generator(this, function (_a) {
                 if (!this.shouldTrack()) {
-                    lib_1.logger.info("Track page hit: Skipping event due to tracking configuration");
+                    logger_1.logger.info("Track page hit: Skipping event due to tracking configuration");
                     return [2 /*return*/];
                 }
                 setTimeout(function () {
@@ -1394,7 +1446,7 @@ var FormoAnalytics = /** @class */ (function () {
                                     return [3 /*break*/, 3];
                                 case 2:
                                     e_7 = _a.sent();
-                                    lib_1.logger.error("Formo: Failed to track page hit", e_7);
+                                    logger_1.logger.error("Formo: Failed to track page hit", e_7);
                                     return [3 /*break*/, 3];
                                 case 3: return [2 /*return*/];
                             }
@@ -1413,7 +1465,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         if (!this.shouldTrack()) {
-                            lib_1.logger.info("Skipping ".concat(type, " event due to tracking configuration"));
+                            logger_1.logger.info("Skipping ".concat(type, " event due to tracking configuration"));
                             return [2 /*return*/];
                         }
                         return [4 /*yield*/, this.eventManager.addEvent(__assign(__assign({ type: type }, payload), { properties: properties, context: context, callback: callback }), this.currentAddress, this.currentUserId)];
@@ -1422,7 +1474,7 @@ var FormoAnalytics = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 2:
                         error_5 = _a.sent();
-                        lib_1.logger.error("Error tracking event:", error_5);
+                        logger_1.logger.error("Error tracking event:", error_5);
                         return [3 /*break*/, 3];
                     case 3: return [2 /*return*/];
                 }
@@ -1515,60 +1567,12 @@ var FormoAnalytics = /** @class */ (function () {
             };
         }
         // Fallback to injected provider detection
-        var injectedInfo = this.detectInjectedProviderInfo(provider);
+        var injectedInfo = (0, provider_1.detectInjectedProviderInfo)(provider);
         return {
             name: injectedInfo.name,
             rdns: injectedInfo.rdns,
         };
     };
-    /**
-     * Attempts to detect information about an injected provider
-     * @param provider The injected provider to analyze
-     * @returns Provider information with fallback values
-     */
-    FormoAnalytics.prototype.detectInjectedProviderInfo = function (provider) {
-        // Try to detect provider type from common properties
-        var name = "Injected Provider";
-        var rdns = "io.injected.provider";
-        // Use WalletProviderFlags interface for type safety
-        var flags = provider;
-        // Check if it's MetaMask
-        if (flags.isMetaMask) {
-            name = "MetaMask";
-            rdns = "io.metamask";
-        }
-        // Check if it's Coinbase Wallet
-        else if (flags.isCoinbaseWallet) {
-            name = "Coinbase Wallet";
-            rdns = "com.coinbase.wallet";
-        }
-        // Check if it's WalletConnect
-        else if (flags.isWalletConnect) {
-            name = "WalletConnect";
-            rdns = "com.walletconnect";
-        }
-        // Check if it's Trust Wallet
-        else if (flags.isTrust) {
-            name = "Trust Wallet";
-            rdns = "com.trustwallet";
-        }
-        // Check if it's Brave Wallet
-        else if (flags.isBraveWallet) {
-            name = "Brave Wallet";
-            rdns = "com.brave.wallet";
-        }
-        // Check if it's Phantom
-        else if (flags.isPhantom) {
-            name = "Phantom";
-            rdns = "app.phantom";
-        }
-        return {
-            name: name,
-            rdns: rdns,
-            uuid: "injected-".concat(rdns.replace(/[^a-zA-Z0-9]/g, "-")),
-            icon: constants_1.DEFAULT_PROVIDER_ICON,
-        };
-    };
     FormoAnalytics.prototype.getProviders = function () {
         return __awaiter(this, void 0, void 0, function () {
             var store, providers, injected_1, injectedProviderInfo, injectedDetail, uniqueProviders, _i, uniqueProviders_1, detail;
@@ -1608,7 +1612,7 @@ var FormoAnalytics = /** @class */ (function () {
                                         return [3 /*break*/, 3];
                                     case 2:
                                         e_8 = _a.sent();
-                                        lib_1.logger.error("Formo: Failed to detect wallets", e_8);
+                                        logger_1.logger.error("Formo: Failed to detect wallets", e_8);
                                         return [3 /*break*/, 3];
                                     case 3: return [2 /*return*/];
                                 }
@@ -1627,7 +1631,7 @@ var FormoAnalytics = /** @class */ (function () {
                             this._injectedProviderDetail.provider === injected_1) {
                             // Ensure it's tracked
                             if (!this._trackedProviders.has(injected_1)) {
-                                this.trackProvider(injected_1);
+                                this.trackEIP1193Provider(injected_1);
                             }
                             // Merge with existing providers instead of overwriting
                             if (!this._providers.some(function (existing) { return existing.provider === injected_1; })) {
@@ -1639,9 +1643,9 @@ var FormoAnalytics = /** @class */ (function () {
                         }
                         // Re-check if the injected provider is already tracked just before tracking
                         if (!this._trackedProviders.has(injected_1)) {
-                            this.trackProvider(injected_1);
+                            this.trackEIP1193Provider(injected_1);
                         }
-                        injectedProviderInfo = this.detectInjectedProviderInfo(injected_1);
+                        injectedProviderInfo = (0, provider_1.detectInjectedProviderInfo)(injected_1);
                         injectedDetail = {
                             provider: injected_1,
                             info: injectedProviderInfo,
@@ -1698,7 +1702,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 4: return [3 /*break*/, 6];
                     case 5:
                         err_2 = _a.sent();
-                        lib_1.logger.error("Error detect all wallets:", err_2);
+                        logger_1.logger.error("Error detect all wallets:", err_2);
                         return [3 /*break*/, 6];
                     case 6: return [2 /*return*/];
                 }
@@ -1722,7 +1726,7 @@ var FormoAnalytics = /** @class */ (function () {
                             return [2 /*return*/, this.currentAddress];
                         p = provider || this.provider;
                         if (!p) {
-                            lib_1.logger.info("The provider is not set");
+                            logger_1.logger.info("The provider is not set");
                             return [2 /*return*/, null];
                         }
                         _a.label = 1;
@@ -1739,7 +1743,7 @@ var FormoAnalytics = /** @class */ (function () {
                         err_3 = _a.sent();
                         code = err_3 === null || err_3 === void 0 ? void 0 : err_3.code;
                         if (code !== 4001) {
-                            lib_1.logger.error("FormoAnalytics::getAccounts: eth_accounts threw an error", err_3);
+                            logger_1.logger.error("FormoAnalytics::getAccounts: eth_accounts threw an error", err_3);
                         }
                         return [2 /*return*/, null];
                     case 4: return [2 /*return*/, null];
@@ -1772,7 +1776,7 @@ var FormoAnalytics = /** @class */ (function () {
                         err_4 = _a.sent();
                         code = err_4 === null || err_4 === void 0 ? void 0 : err_4.code;
                         if (code !== 4001) {
-                            lib_1.logger.error("FormoAnalytics::getAccounts: eth_accounts threw an error", err_4);
+                            logger_1.logger.error("FormoAnalytics::getAccounts: eth_accounts threw an error", err_4);
                         }
                         return [2 /*return*/, null];
                     case 4: return [2 /*return*/];
@@ -1788,7 +1792,7 @@ var FormoAnalytics = /** @class */ (function () {
                     case 0:
                         p = provider || this.provider;
                         if (!p) {
-                            lib_1.logger.error("Provider not set for chain ID");
+                            logger_1.logger.error("Provider not set for chain ID");
                             return [2 /*return*/, 0];
                         }
                         _a.label = 1;
@@ -1800,13 +1804,13 @@ var FormoAnalytics = /** @class */ (function () {
                     case 2:
                         chainIdHex = _a.sent();
                         if (!chainIdHex) {
-                            lib_1.logger.info("Chain id not found");
+                            logger_1.logger.info("Chain id not found");
                             return [2 /*return*/, 0];
                         }
                         return [2 /*return*/, (0, chain_1.parseChainId)(chainIdHex)];
                     case 3:
                         err_5 = _a.sent();
-                        lib_1.logger.error("eth_chainId threw an error:", err_5);
+                        logger_1.logger.error("eth_chainId threw an error:", err_5);
                         return [2 /*return*/, 0];
                     case 4: return [2 /*return*/];
                 }
@@ -1864,7 +1868,7 @@ var FormoAnalytics = /** @class */ (function () {
     /**
      * Polls for transaction receipt and emits tx.status = CONFIRMED or REVERTED.
      */
-    FormoAnalytics.prototype.pollTransactionReceipt = function (provider_1, transactionHash_2, payload_1) {
+    FormoAnalytics.prototype.pollTransactionReceipt = function (provider_2, transactionHash_2, payload_1) {
         return __awaiter(this, arguments, void 0, function (provider, transactionHash, payload, maxAttempts, intervalMs) {
             var attempts, poll;
             var _this = this;
@@ -1900,7 +1904,7 @@ var FormoAnalytics = /** @class */ (function () {
                                 return [3 /*break*/, 3];
                             case 2:
                                 e_9 = _a.sent();
-                                lib_1.logger.error("Error polling transaction receipt", e_9);
+                                logger_1.logger.error("Error polling transaction receipt", e_9);
                                 return [3 /*break*/, 3];
                             case 3:
                                 attempts++;
@@ -1921,12 +1925,12 @@ var FormoAnalytics = /** @class */ (function () {
         if (!listeners)
             return;
         for (var _i = 0, _a = Object.entries(listeners); _i < _a.length; _i++) {
-            var _b = _a[_i], event_1 = _b[0], fn = _b[1];
+            var _b = _a[_i], event_2 = _b[0], fn = _b[1];
             try {
-                provider.removeListener(event_1, fn);
+                provider.removeListener(event_2, fn);
             }
             catch (e) {
-                lib_1.logger.warn("Failed to remove listener for ".concat(String(event_1)), e);
+                logger_1.logger.warn("Failed to remove listener for ".concat(String(event_2)), e);
             }
         }
         this._providerListenersMap.delete(provider);
@@ -1941,7 +1945,7 @@ var FormoAnalytics = /** @class */ (function () {
             }
         }
         catch (e) {
-            lib_1.logger.warn("Failed to untrack provider", e);
+            logger_1.logger.warn("Failed to untrack provider", e);
         }
     };
     // Debug/monitoring helpers
@@ -1970,7 +1974,7 @@ var FormoAnalytics = /** @class */ (function () {
         for (var _i = 0, _a = Array.from(this._trackedProviders); _i < _a.length; _i++) {
             var provider = _a[_i];
             if (!currentProviderInstances.has(provider)) {
-                lib_1.logger.info("Cleaning up unavailable provider: ".concat(provider.constructor.name));
+                logger_1.logger.info("Cleaning up unavailable provider: ".concat(provider.constructor.name));
                 this.untrackProvider(provider);
             }
         }
@@ -2043,67 +2047,4 @@ var FormoAnalytics = /** @class */ (function () {
     return FormoAnalytics;
 }());
 exports.FormoAnalytics = FormoAnalytics;
-var FormoAnalyticsSession = /** @class */ (function () {
-    function FormoAnalyticsSession() {
-    }
-    FormoAnalyticsSession.prototype.generateIdentificationKey = function (address, rdns) {
-        // If rdns is missing, use address-only key as fallback for empty identifies
-        return rdns ? "".concat(address, ":").concat(rdns) : address;
-    };
-    FormoAnalyticsSession.prototype.isWalletDetected = function (rdns) {
-        var _a;
-        var rdnses = ((_a = (0, lib_1.cookie)().get(constants_1.SESSION_WALLET_DETECTED_KEY)) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
-        return rdnses.includes(rdns);
-    };
-    FormoAnalyticsSession.prototype.markWalletDetected = function (rdns) {
-        var _a;
-        var rdnses = ((_a = (0, lib_1.cookie)().get(constants_1.SESSION_WALLET_DETECTED_KEY)) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
-        if (!rdnses.includes(rdns)) {
-            rdnses.push(rdns);
-            (0, lib_1.cookie)().set(constants_1.SESSION_WALLET_DETECTED_KEY, rdnses.join(","), {
-                // by the end of the day
-                expires: new Date(Date.now() + 86400 * 1000).toUTCString(),
-                path: "/",
-            });
-        }
-    };
-    FormoAnalyticsSession.prototype.isWalletIdentified = function (address, rdns) {
-        var identifiedKey = this.generateIdentificationKey(address, rdns);
-        var cookieValue = (0, lib_1.cookie)().get(constants_1.SESSION_WALLET_IDENTIFIED_KEY);
-        var identifiedWallets = (cookieValue === null || cookieValue === void 0 ? void 0 : cookieValue.split(",")) || [];
-        var isIdentified = identifiedWallets.includes(identifiedKey);
-        lib_1.logger.debug("Session: Checking wallet identification", {
-            identifiedKey: identifiedKey,
-            isIdentified: isIdentified,
-            hasRdns: !!rdns,
-        });
-        return isIdentified;
-    };
-    FormoAnalyticsSession.prototype.markWalletIdentified = function (address, rdns) {
-        var _a;
-        var identifiedKey = this.generateIdentificationKey(address, rdns);
-        var identifiedWallets = ((_a = (0, lib_1.cookie)().get(constants_1.SESSION_WALLET_IDENTIFIED_KEY)) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
-        if (!identifiedWallets.includes(identifiedKey)) {
-            identifiedWallets.push(identifiedKey);
-            var newValue = identifiedWallets.join(",");
-            (0, lib_1.cookie)().set(constants_1.SESSION_WALLET_IDENTIFIED_KEY, newValue, {
-                // by the end of the day
-                expires: new Date(Date.now() + 86400 * 1000).toUTCString(),
-                path: "/",
-            });
-            lib_1.logger.debug("Session: Marked wallet as identified", {
-                identifiedKey: identifiedKey,
-                hasRdns: !!rdns,
-            });
-        }
-        else {
-            lib_1.logger.info("Session: Wallet already marked as identified", {
-                identifiedKey: identifiedKey,
-                existingWallets: identifiedWallets,
-                hasRdns: !!rdns,
-            });
-        }
-    };
-    return FormoAnalyticsSession;
-}());
 //# sourceMappingURL=FormoAnalytics.js.map