@formo/analytics 1.28.1 → 1.28.3

package/dist/cjs/src/wagmi/WagmiEventHandler.js

@@ -58,7 +58,6 @@ exports.WagmiEventHandler = void 0;
 var events_1 = require("../types/events");
 var logger_1 = require("../logger");
 var utils_1 = require("./utils");
-var builderCode_1 = require("../utils/builderCode");
 /**
  * Built-in transaction fields that could collide with function args.
  * Defined at module level to avoid recreating on every method call.
@@ -73,7 +72,6 @@ var RESERVED_FIELDS = new Set([
     "transactionHash",
     "function_name",
     "function_args",
-    "builder_codes",
 ]);
 /**
  * Clean up old entries from a Set to prevent memory leaks.
@@ -388,7 +386,7 @@ var WagmiEventHandler = /** @class */ (function () {
                 chainId: chainId,
                 blockNumber: (_a = receipt === null || receipt === void 0 ? void 0 : receipt.blockNumber) === null || _a === void 0 ? void 0 : _a.toString(),
             });
-            this.formo.transaction(__assign(__assign(__assign(__assign(__assign(__assign({ status: txStatus, chainId: chainId || 0, address: address, transactionHash: transactionHash }, ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.data) && { data: pendingTx.data })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.to) && { to: pendingTx.to })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.value) && { value: pendingTx.value })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.function_name) && { function_name: pendingTx.function_name })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.function_args) && { function_args: pendingTx.function_args })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.builder_codes) && { builder_codes: pendingTx.builder_codes })), 
+            this.formo.transaction(__assign(__assign(__assign(__assign(__assign({ status: txStatus, chainId: chainId || 0, address: address, transactionHash: transactionHash }, ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.data) && { data: pendingTx.data })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.to) && { to: pendingTx.to })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.value) && { value: pendingTx.value })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.function_name) && { function_name: pendingTx.function_name })), ((pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.function_args) && { function_args: pendingTx.function_args })), 
             // Spread function args as additional properties (only colliding keys are prefixed)
             pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.safeFunctionArgs);
             // Clean up the pending transaction after confirmation
@@ -551,7 +549,7 @@ var WagmiEventHandler = /** @class */ (function () {
                     // Encode the function data synchronously if viem is available
                     var encodedData = (0, utils_1.encodeWriteContractData)(abi, fnName, args);
                     if (encodedData) {
-                        // Include dataSuffix (ERC-8021 builder code) so extractBuilderCodes sees full calldata
+                        // Include dataSuffix (e.g. ERC-8021 builder code) so full calldata is sent to server
                         data = (0, utils_1.concatCalldataWithSuffix)(encodedData, dataSuffix);
                         logger_1.logger.debug("WagmiEventHandler: Encoded writeContract data", data.substring(0, 10));
                     }
@@ -563,9 +561,14 @@ var WagmiEventHandler = /** @class */ (function () {
                 data = variables.data;
                 to = variables.to;
             }
-            // Extract builder codes from transaction data (ERC-8021)
-            var builder_codes = (0, builderCode_1.extractBuilderCodes)(data);
-            logger_1.logger.info("WagmiEventHandler: Tracking transaction event", __assign({ status: status_2, mutationType: mutationType, address: userAddress, chainId: chainId, transactionHash: transactionHash, function_name: function_name }, (builder_codes && { builder_codes: builder_codes })));
+            logger_1.logger.info("WagmiEventHandler: Tracking transaction event", {
+                status: status_2,
+                mutationType: mutationType,
+                address: userAddress,
+                chainId: chainId,
+                transactionHash: transactionHash,
+                function_name: function_name,
+            });
             // Build safeFunctionArgs with collision handling and struct flattening
             var safeFunctionArgs = (0, utils_1.buildSafeFunctionArgs)(function_args, RESERVED_FIELDS);
             // Store transaction details for BROADCASTED status to use in CONFIRMED/REVERTED
@@ -573,7 +576,7 @@ var WagmiEventHandler = /** @class */ (function () {
             // Include the sender address to handle wallet switches between broadcast and confirmation
             if (status_2 === events_1.TransactionStatus.BROADCASTED && transactionHash) {
                 var normalizedHash = transactionHash.toLowerCase();
-                var txDetails = __assign(__assign(__assign(__assign(__assign(__assign(__assign({ address: userAddress }, (data && { data: data })), (to && { to: to })), (value && { value: value })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), (builder_codes && { builder_codes: builder_codes })), (safeFunctionArgs && { safeFunctionArgs: safeFunctionArgs }));
+                var txDetails = __assign(__assign(__assign(__assign(__assign(__assign({ address: userAddress }, (data && { data: data })), (to && { to: to })), (value && { value: value })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), (safeFunctionArgs && { safeFunctionArgs: safeFunctionArgs }));
                 this.pendingTransactions.set(normalizedHash, txDetails);
                 logger_1.logger.debug("WagmiEventHandler: Stored pending transaction for confirmation", {
                     transactionHash: normalizedHash,
@@ -587,7 +590,7 @@ var WagmiEventHandler = /** @class */ (function () {
                     }
                 }
             }
-            this.formo.transaction(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ status: status_2, chainId: chainId || 0, address: userAddress }, (data && { data: data })), (to && { to: to })), (value && { value: value })), (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), (builder_codes && { builder_codes: builder_codes })), 
+            this.formo.transaction(__assign(__assign(__assign(__assign(__assign(__assign({ status: status_2, chainId: chainId || 0, address: userAddress }, (data && { data: data })), (to && { to: to })), (value && { value: value })), (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), 
             // Spread function args as additional properties (only colliding keys are prefixed)
             safeFunctionArgs);
         }

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

@@ -45,6 +45,8 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      * When true, EIP-1193 provider wrapping is skipped
      */
     private isWagmiMode;
+    /** Instance-level flag so multiple SDK instances don't interfere. */
+    private crossSubdomainCookies;
     config: Config;
     currentChainId?: ChainID;
     currentAddress?: Address;
@@ -150,7 +152,7 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
      */
-    transaction({ status, chainId, address, data, to, value, transactionHash, function_name, function_args, builder_codes, }: {
+    transaction({ status, chainId, address, data, to, value, transactionHash, function_name, function_args, }: {
         status: TransactionStatus;
         chainId: ChainID;
         address: Address;
@@ -160,7 +162,6 @@ export declare class FormoAnalytics implements IFormoAnalytics {
         transactionHash?: string;
         function_name?: string;
         function_args?: Record<string, unknown>;
-        builder_codes?: string;
     }, properties?: IFormoEventProperties, context?: IFormoEventContext, callback?: (...args: unknown[]) => void): Promise<void>;
     /**
      * Emits an identify event with current wallet address and provider info.

package/dist/esm/src/FormoAnalytics.js

@@ -57,6 +57,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { createStore } from "mipd";
 import { EVENTS_API_HOST, EventType, LOCAL_ANONYMOUS_ID_KEY, SESSION_CURRENT_URL_KEY, SESSION_USER_ID_KEY, CONSENT_OPT_OUT_KEY, } from "./constants";
 import { cookie, initStorageManager } from "./storage";
+import { getIdentityCookieDomain } from "./storage/cookiePolicy";
 import { EventManager } from "./event";
 import { EventQueue } from "./queue";
 import { logger, Logger } from "./logger";
@@ -65,7 +66,6 @@ import { detectInjectedProviderInfo, isValidProvider } from "./provider";
 import { FormoAnalyticsSession, SESSION_WALLET_DETECTED_KEY, SESSION_WALLET_IDENTIFIED_KEY, } from "./session";
 import { SignatureStatus, TransactionStatus, WRAPPED_REQUEST_SYMBOL, WRAPPED_REQUEST_REF_SYMBOL, } from "./types";
 import { validateAddress, validateAndChecksumAddress } from "./utils/address";
-import { extractBuilderCodes } from "./utils/builderCode";
 import { isLocalhost } from "./validators";
 import { parseChainId } from "./utils/chain";
 import { WagmiEventHandler } from "./wagmi";
@@ -82,7 +82,7 @@ var PROVIDER_SWITCH_REASONS = {
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(writeKey, options) {
         if (options === void 0) { options = {}; }
-        var _a, _b;
+        var _a, _b, _c;
         this.writeKey = writeKey;
         this.options = options;
         // Per-chain namespace state — isolates EVM and Solana connection state
@@ -121,6 +121,9 @@ var FormoAnalytics = /** @class */ (function () {
         this.options = options;
         // Check if Wagmi mode is enabled
         this.isWagmiMode = !!options.wagmi;
+        this.crossSubdomainCookies = (_a = options.crossSubdomainCookies) !== null && _a !== void 0 ? _a : true;
+        // Normalize so downstream consumers (EventFactory) read the resolved value.
+        options.crossSubdomainCookies = this.crossSubdomainCookies;
         this.session = new FormoAnalyticsSession();
         this.currentUserId =
             cookie().get(SESSION_USER_ID_KEY) || undefined;
@@ -135,8 +138,8 @@ var FormoAnalytics = /** @class */ (function () {
         this.isAutocaptureEnabled = this.isAutocaptureEnabled.bind(this);
         // Initialize logger with configuration from options
         Logger.init({
-            enabled: ((_a = options.logger) === null || _a === void 0 ? void 0 : _a.enabled) || false,
-            enabledLevels: ((_b = options.logger) === null || _b === void 0 ? void 0 : _b.levels) || [],
+            enabled: ((_b = options.logger) === null || _b === void 0 ? void 0 : _b.enabled) || false,
+            enabledLevels: ((_c = options.logger) === null || _c === void 0 ? void 0 : _c.levels) || [],
         });
         this.eventManager = new EventManager(new EventQueue(this.config.writeKey, {
             apiHost: options.apiHost || EVENTS_API_HOST,
@@ -465,10 +468,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, function_name = _b.function_name, function_args = _b.function_args, builder_codes = _b.builder_codes;
+            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(EventType.TRANSACTION, __assign(__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 })), (builder_codes && { builder_codes: builder_codes })), properties, context, callback)];
+                    case 0: return [4 /*yield*/, this.trackEvent(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*/];
@@ -506,7 +509,7 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.identify = function (params, properties, context, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, _a, providerDetail, provider, address_1, validAddress_1, err_1, address, providerName, userId, rdns, validAddress, isAlreadyIdentified, e_1;
+            var _i, _a, providerDetail, provider, address_1, validAddress_1, err_1, address, providerName, userId, rdns, validAddress, domain, isAlreadyIdentified, e_1;
             var _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -585,7 +588,8 @@ var FormoAnalytics = /** @class */ (function () {
                         }
                         if (userId) {
                             this.currentUserId = userId;
-                            cookie().set(SESSION_USER_ID_KEY, userId);
+                            domain = getIdentityCookieDomain(this.crossSubdomainCookies);
+                            cookie().set(SESSION_USER_ID_KEY, userId, __assign({ path: "/" }, (domain ? { domain: domain } : {})));
                         }
                         isAlreadyIdentified = this.session.isWalletIdentified(validAddress, rdns || "");
                         logger.debug("Identify: Checking deduplication", {
@@ -1900,7 +1904,7 @@ var FormoAnalytics = /** @class */ (function () {
     };
     FormoAnalytics.prototype.buildTransactionEventPayload = function (params, provider) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, data, from, to, value, validAddress, builder_codes, _b;
+            var _a, data, from, to, value, validAddress, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -1910,7 +1914,6 @@ var FormoAnalytics = /** @class */ (function () {
                         if (!validAddress) {
                             throw new Error("Invalid address in transaction payload: ".concat(from));
                         }
-                        builder_codes = extractBuilderCodes(data);
                         _c = {};
                         _b = this._evmChainId;
                         if (_b) return [3 /*break*/, 2];
@@ -1918,7 +1921,12 @@ var FormoAnalytics = /** @class */ (function () {
                     case 1:
                         _b = (_d.sent());
                         _d.label = 2;
-                    case 2: return [2 /*return*/, __assign.apply(void 0, [(_c.chainId = _b, _c.data = data, _c.address = validAddress, _c.to = to, _c.value = value, _c), (builder_codes && { builder_codes: builder_codes })])];
+                    case 2: return [2 /*return*/, (_c.chainId = _b,
+                            _c.data = data,
+                            _c.address = validAddress,
+                            _c.to = to,
+                            _c.value = value,
+                            _c)];
                 }
             });
         });

package/dist/esm/src/FormoAnalyticsProvider.js

@@ -95,6 +95,7 @@ var InitializedAnalytics = function (_a) {
         var serializableOptions = {
             tracking: options.tracking,
             autocapture: options.autocapture,
+            crossSubdomainCookies: options.crossSubdomainCookies,
             apiHost: options.apiHost,
             flushAt: options.flushAt,
             flushInterval: options.flushInterval,

package/dist/esm/src/consent/index.js

@@ -7,6 +7,7 @@
  * Formo projects on the same domain.
  */
 import { secureHash } from '../utils/hash';
+import { getApexDomain } from '../utils/domain';
 /**
  * Generate a project-specific cookie key to avoid conflicts between different Formo projects
  * Uses hashed writeKey for privacy and security
@@ -36,7 +37,14 @@ export function setConsentFlag(projectId, key, value) {
         var expires = new Date(Date.now() + 365 * 24 * 60 * 60 * 1000).toUTCString(); // 1 year (GDPR compliant)
         var isSecure = ((_a = window === null || window === void 0 ? void 0 : window.location) === null || _a === void 0 ? void 0 : _a.protocol) === 'https:';
         // Enhanced privacy settings: Secure (HTTPS), SameSite=Strict for consent cookies
-        document.cookie = "".concat(projectSpecificKey, "=").concat(encodeURIComponent(value), "; expires=").concat(expires, "; path=/; SameSite=Strict").concat(isSecure ? '; Secure' : '');
+        var domain = getApexDomain();
+        var domainAttr = domain ? "; domain=.".concat(domain) : '';
+        // Expire any legacy host-only cookie (pre-domain-attribute versions) so it
+        // doesn't shadow the new domain-wide cookie in document.cookie reads.
+        if (domain) {
+            document.cookie = "".concat(projectSpecificKey, "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;");
+        }
+        document.cookie = "".concat(projectSpecificKey, "=").concat(encodeURIComponent(value), "; expires=").concat(expires, "; path=/").concat(domainAttr, "; SameSite=Strict").concat(isSecure ? '; Secure' : '');
     }
 }
 /**
@@ -83,15 +91,9 @@ function deleteCookieDirectly(cookieName) {
     // Clear from current domain/path
     document.cookie = "".concat(cookieName, "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;");
     // Try to clear from parent domain if it's a proper multi-level domain
-    if (typeof window !== 'undefined') {
-        var hostname = window.location.hostname;
-        var parts = hostname.split('.');
-        // Only try parent domain deletion for proper domains with multiple parts
-        // Skip localhost and single-level domains
-        if (parts.length >= 2 && hostname !== 'localhost') {
-            var domain = parts.slice(-2).join('.');
-            document.cookie = "".concat(cookieName, "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/; domain=.").concat(domain, ";");
-        }
+    var domain = getApexDomain();
+    if (domain) {
+        document.cookie = "".concat(cookieName, "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/; domain=.").concat(domain, ";");
     }
 }
 //# sourceMappingURL=index.js.map

package/dist/esm/src/event/EventFactory.d.ts

@@ -35,7 +35,7 @@ declare class EventFactory implements IEventFactory {
     generateDisconnectEvent(chainId?: ChainID, address?: Address, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     generateChainChangedEvent(chainId: ChainID, address: Address, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     generateSignatureEvent(status: SignatureStatus, chainId: ChainID, address: Address, message: string, signatureHash?: string, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
-    generateTransactionEvent(status: TransactionStatus, chainId: ChainID, address: Address, data?: string, to?: string, value?: string, transactionHash?: string, function_name?: string, function_args?: Record<string, unknown>, builder_codes?: string, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
+    generateTransactionEvent(status: TransactionStatus, chainId: ChainID, address: Address, data?: string, to?: string, value?: string, transactionHash?: string, function_name?: string, function_args?: Record<string, unknown>, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     generateTrackEvent(event: string, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     create(event: APIEvent, address?: Address, userId?: string): Promise<IFormoEvent>;
 }

package/dist/esm/src/event/EventFactory.js

@@ -289,22 +289,22 @@ var EventFactory = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var commonEventData, eventChainId, validAddress, processedEvent;
             var _a;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         _a = {};
                         return [4 /*yield*/, this.generateContext(context)];
                     case 1:
-                        commonEventData = (_a.context = _c.sent(),
+                        commonEventData = (_a.context = _d.sent(),
                             _a.original_timestamp = getCurrentTimeFormatted(),
                             _a.user_id = formoEvent.user_id,
                             _a.type = formoEvent.type,
                             _a.channel = CHANNEL,
                             _a.version = VERSION,
                             _a);
-                        commonEventData.anonymous_id = generateAnonymousId(LOCAL_ANONYMOUS_ID_KEY);
-                        eventChainId = (_b = formoEvent.properties) === null || _b === void 0 ? void 0 : _b.chainId;
+                        commonEventData.anonymous_id = generateAnonymousId(LOCAL_ANONYMOUS_ID_KEY, (_b = this.options) === null || _b === void 0 ? void 0 : _b.crossSubdomainCookies);
+                        eventChainId = (_c = formoEvent.properties) === null || _c === void 0 ? void 0 : _c.chainId;
                         validAddress = this.validateEventAddress(formoEvent.address, eventChainId);
                         commonEventData.address = validAddress;
                         processedEvent = mergeDeepRight(formoEvent, commonEventData);
@@ -413,12 +413,12 @@ var EventFactory = /** @class */ (function () {
             });
         });
     };
-    EventFactory.prototype.generateTransactionEvent = function (status, chainId, address, data, to, value, transactionHash, function_name, function_args, builder_codes, properties, context) {
+    EventFactory.prototype.generateTransactionEvent = function (status, chainId, address, data, to, value, transactionHash, function_name, function_args, properties, context) {
         return __awaiter(this, void 0, void 0, function () {
             var transactionEvent;
             return __generator(this, function (_a) {
                 transactionEvent = {
-                    properties: __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ status: status, chainId: chainId }, (data && { data: data })), (to && { to: to })), (value && { value: value })), (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), (builder_codes && { builder_codes: builder_codes })), properties),
+                    properties: __assign(__assign(__assign(__assign(__assign(__assign(__assign({ status: status, chainId: chainId }, (data && { data: data })), (to && { to: to })), (value && { value: value })), (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), properties),
                     address: address,
                     type: "transaction",
                 };
@@ -497,7 +497,7 @@ var EventFactory = /** @class */ (function () {
                     case 14:
                         formoEvent = _b.sent();
                         return [3 /*break*/, 19];
-                    case 15: return [4 /*yield*/, this.generateTransactionEvent(event.status, event.chainId, event.address, event.data, event.to, event.value, event.transactionHash, event.function_name, event.function_args, event.builder_codes, event.properties, event.context)];
+                    case 15: return [4 /*yield*/, this.generateTransactionEvent(event.status, event.chainId, event.address, event.data, event.to, event.value, event.transactionHash, event.function_name, event.function_args, event.properties, event.context)];
                     case 16:
                         formoEvent = _b.sent();
                         return [3 /*break*/, 19];

package/dist/esm/src/event/utils.d.ts

@@ -1,5 +1,4 @@
 import { AnonymousID } from "../types";
-declare const generateAnonymousId: (key: string) => AnonymousID;
-declare function getCookieDomain(hostname?: string): string;
-export { generateAnonymousId, getCookieDomain };
+declare const generateAnonymousId: (key: string, crossSubdomainCookies?: boolean) => AnonymousID;
+export { generateAnonymousId };
 //# sourceMappingURL=utils.d.ts.map

package/dist/esm/src/event/utils.js

@@ -1,29 +1,30 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import { generateNativeUUID } from "../utils";
 import { cookie } from "../storage";
-var generateAnonymousId = function (key) {
+import { getIdentityCookieDomain } from "../storage/cookiePolicy";
+var generateAnonymousId = function (key, crossSubdomainCookies) {
     var storedAnonymousId = cookie().get(key);
-    if (storedAnonymousId && typeof storedAnonymousId === "string")
-        return storedAnonymousId;
-    var newAnonymousId = generateNativeUUID();
-    cookie().set(key, newAnonymousId, {
-        maxAge: Date.now() + 1000 * 60 * 60 * 24 * 365, // 1 year
-        domain: getCookieDomain(),
-        path: "/",
-    });
-    return newAnonymousId;
+    var anonymousId = (storedAnonymousId && typeof storedAnonymousId === "string"
+        ? storedAnonymousId
+        : generateNativeUUID());
+    var domain = getIdentityCookieDomain(crossSubdomainCookies);
+    // Re-set the cookie with the configured scope. When crossSubdomainCookies
+    // is true, this migrates legacy host-only cookies on the current host to the apex
+    // domain. Note: host-only cookies on other hosts (e.g. a cookie set on
+    // example.com is not visible from app.example.com) cannot be migrated
+    // until the user revisits that host.
+    cookie().set(key, anonymousId, __assign({ expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365).toUTCString(), path: "/" }, (domain ? { domain: domain } : {})));
+    return anonymousId;
 };
-function getCookieDomain(hostname) {
-    if (hostname === void 0) { hostname = window.location.hostname; }
-    // Special cases
-    if (hostname.includes("localhost") ||
-        /^\d{1,3}(\.\d{1,3}){3}$/.test(hostname)) {
-        // Localhost or IP address
-        return "";
-    }
-    var parts = hostname.split(".");
-    if (parts.includes("www"))
-        parts.splice(parts.indexOf("www"), 1);
-    return ".".concat(parts.join("."));
-}
-export { generateAnonymousId, getCookieDomain };
+export { generateAnonymousId };
 //# sourceMappingURL=utils.js.map

package/dist/esm/src/queue/EventQueue.d.ts

@@ -28,7 +28,7 @@ export declare class EventQueue implements IEventQueue {
     constructor(writeKey: string, options: Options);
     private generateMessageId;
     enqueue(event: IFormoEvent, callback?: (...args: any) => void): Promise<void>;
-    flush(callback?: (...args: any) => void): Promise<void | IFormoEventFlushPayload[]>;
+    flush(callback?: (...args: any) => void, drainAll?: boolean): Promise<void | IFormoEventFlushPayload[]>;
     /**
      * Returns the UTF-8 byte length of a string. The browser's keepalive limit
      * is enforced on the wire (UTF-8 bytes), not on JS string length (UTF-16

package/dist/esm/src/queue/EventQueue.js

@@ -118,12 +118,12 @@ var EventQueue = /** @class */ (function () {
             });
             // Catches the page being hidden, including scenarios like closing the tab.
             document.addEventListener("pagehide", function () {
-                isAccessible = document.visibilityState === "hidden";
+                isAccessible = document.visibilityState !== "hidden";
                 handleOnLeave();
             });
             // Catches visibility changes, such as switching tabs or minimizing the browser.
             document.addEventListener("visibilitychange", function () {
-                isAccessible = true;
+                isAccessible = document.visibilityState !== "hidden";
                 if (document.visibilityState === "hidden") {
                     handleOnLeave();
                 }
@@ -149,7 +149,7 @@ var EventQueue = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         if (!(isAccessible === false)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.flush()];
+                        return [4 /*yield*/, this.flush(undefined, true)];
                     case 1:
                         _a.sent();
                         _a.label = 2;
@@ -179,10 +179,8 @@ var EventQueue = /** @class */ (function () {
                         return [4 /*yield*/, this.generateMessageId(event)];
                     case 1:
                         message_id = _a.sent();
-                        return [4 /*yield*/, this.isDuplicate(message_id)];
-                    case 2:
                         // check if the message already exists
-                        if (_a.sent()) {
+                        if (this.isDuplicate(message_id)) {
                             logger.warn("Event already enqueued, try again after ".concat(millisecondsToSecond(this.flushIntervalMs), " seconds."));
                             return [2 /*return*/];
                         }
@@ -211,10 +209,11 @@ var EventQueue = /** @class */ (function () {
             });
         });
     };
-    EventQueue.prototype.flush = function (callback) {
-        return __awaiter(this, void 0, void 0, function () {
-            var items, sentAt, data, batches;
+    EventQueue.prototype.flush = function (callback_1) {
+        return __awaiter(this, arguments, void 0, function (callback, drainAll) {
+            var items, _i, items_1, item, sentAt, data, batches;
             var _this = this;
+            if (drainAll === void 0) { drainAll = false; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -228,13 +227,19 @@ var EventQueue = /** @class */ (function () {
                             return [2 /*return*/, Promise.resolve()];
                         }
                         if (!this.pendingFlush) return [3 /*break*/, 2];
+                        if (!!drainAll) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.pendingFlush];
                     case 1:
                         _a.sent();
                         _a.label = 2;
                     case 2:
-                        items = this.queue.splice(0, this.flushAt);
-                        this.payloadHashes.clear();
+                        items = this.queue.splice(0, drainAll ? this.queue.length : this.flushAt);
+                        // Only remove hashes for flushed items so duplicate detection remains
+                        // active for events still in the queue.
+                        for (_i = 0, items_1 = items; _i < items_1.length; _i++) {
+                            item = items_1[_i];
+                            this.payloadHashes.delete(item.message.message_id);
+                        }
                         sentAt = new Date().toISOString();
                         data = items.map(function (item) { return (__assign(__assign({}, item.message), { sent_at: sentAt })); });
                         batches = this.splitIntoBatches(items, data);
@@ -396,15 +401,11 @@ var EventQueue = /** @class */ (function () {
         return false;
     };
     EventQueue.prototype.isDuplicate = function (eventId) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                // check if exists a message with identical payload within 1 minute
-                if (this.payloadHashes.has(eventId))
-                    return [2 /*return*/, true];
-                this.payloadHashes.add(eventId);
-                return [2 /*return*/, false];
-            });
-        });
+        // check if exists a message with identical payload within 1 minute
+        if (this.payloadHashes.has(eventId))
+            return true;
+        this.payloadHashes.add(eventId);
+        return false;
     };
     return EventQueue;
 }());

package/dist/esm/src/session/index.d.ts

@@ -38,15 +38,6 @@ export interface IFormoAnalyticsSession {
      */
     markWalletIdentified(address: string, rdns: string): void;
 }
-/**
- * Implementation of session management using cookies
- *
- * Tracks:
- * - Detected wallets (by RDNS) - to prevent duplicate detection events
- * - Identified wallet-address pairs - to prevent duplicate identification events
- *
- * Session data expires at end of day (86400 seconds).
- */
 export declare class FormoAnalyticsSession implements IFormoAnalyticsSession {
     /**
      * Generate a unique key for wallet identification tracking

package/dist/esm/src/session/index.js

@@ -22,6 +22,7 @@ export var SESSION_WALLET_IDENTIFIED_KEY = "wallet-identified";
  *
  * Session data expires at end of day (86400 seconds).
  */
+var MAX_SESSION_ENTRIES = 20;
 var FormoAnalyticsSession = /** @class */ (function () {
     function FormoAnalyticsSession() {
     }
@@ -59,6 +60,9 @@ var FormoAnalyticsSession = /** @class */ (function () {
         var rdnses = ((_a = cookie().get(SESSION_WALLET_DETECTED_KEY)) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
         if (!rdnses.includes(rdns)) {
             rdnses.push(rdns);
+            if (rdnses.length > MAX_SESSION_ENTRIES) {
+                rdnses.splice(0, rdnses.length - MAX_SESSION_ENTRIES);
+            }
             cookie().set(SESSION_WALLET_DETECTED_KEY, rdnses.join(","), {
                 // Expires by the end of the day
                 expires: new Date(Date.now() + 86400 * 1000).toUTCString(),
@@ -99,6 +103,9 @@ var FormoAnalyticsSession = /** @class */ (function () {
         var alreadyExists = identifiedWallets.includes(identifiedKey);
         if (!alreadyExists) {
             identifiedWallets.push(identifiedKey);
+            if (identifiedWallets.length > MAX_SESSION_ENTRIES) {
+                identifiedWallets.splice(0, identifiedWallets.length - MAX_SESSION_ENTRIES);
+            }
             var newValue = identifiedWallets.join(",");
             cookie().set(SESSION_WALLET_IDENTIFIED_KEY, newValue, {
                 // Expires by the end of the day

package/dist/esm/src/solana/SolanaAdapter.d.ts

@@ -26,11 +26,10 @@ export declare class SolanaAdapter {
      */
     private pendingTransactions;
     /**
-     * Original adapter methods that we wrap for tracking
+     * Per-adapter original methods stored in a WeakMap to prevent routing
+     * to the wrong wallet after switching adapters.
      */
-    private originalAdapterSendTransaction?;
-    private originalAdapterSignMessage?;
-    private originalAdapterSignTransaction?;
+    private adapterOriginals;
     /**
      * Bound wrapper references — used to detect when external code (e.g. StandardWalletAdapter._reset())
      * overwrites our wraps so we can re-apply them.