@formo/analytics 1.29.1 → 1.30.0

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

@@ -136,18 +136,16 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      * @param {ChainID} params.chainId
      * @param {Address} params.address
      * @param {string} params.message
-     * @param {string} params.signatureHash - only provided if status is confirmed
      * @param {IFormoEventProperties} properties
      * @param {IFormoEventContext} context
      * @param {(...args: unknown[]) => void} callback
      * @returns {Promise<void>}
      */
-    signature({ status, chainId, address, message, signatureHash, }: {
+    signature({ status, chainId, address, message, }: {
         status: SignatureStatus;
         chainId?: ChainID;
         address: Address;
         message: string;
-        signatureHash?: string;
     }, properties?: IFormoEventProperties, context?: IFormoEventContext, callback?: (...args: unknown[]) => void): Promise<void>;
     /**
      * Emits a transaction event.
@@ -381,6 +379,25 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      * Clear per-chain state for a given namespace (or chainId) and sync derived state.
      */
     private clearChainState;
+    /**
+     * Sync validated wallet/chain state into the SDK's central state
+     * WITHOUT emitting an event.
+     *
+     * Integrations (e.g. the wagmi handler) must call this on every
+     * connect / chain-change / disconnect — even when the corresponding
+     * autocapture event is disabled. Otherwise `currentChainId` stays
+     * stale/undefined and `shouldTrack()`'s `tracking.excludeChains`
+     * check (which keys off `currentChainId`, not the event payload) can
+     * be bypassed, letting wallet activity on an excluded chain still be
+     * collected.
+     *
+     * - valid `address` present → record per-chain + derived state
+     * - `address` absent → clear chain state (disconnect)
+     */
+    syncWalletState(params: {
+        chainId?: ChainID;
+        address?: Address;
+    }): void;
     /**
      * Synchronize currentAddress/currentChainId from the active namespace.
      * Last-connected-chain-wins: _activeNamespace takes precedence.

package/dist/cjs/src/FormoAnalytics.js

@@ -85,6 +85,7 @@ var PROVIDER_SWITCH_REASONS = {
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(writeKey, options) {
         if (options === void 0) { options = {}; }
+        var _this = this;
         var _a, _b, _c;
         this.writeKey = writeKey;
         this.options = options;
@@ -160,6 +161,10 @@ var FormoAnalytics = /** @class */ (function () {
             maxQueueSize: options.maxQueueSize,
             flushInterval: options.flushInterval,
             errorHandler: options.errorHandler,
+            // Hard consent gate at the queue boundary: nothing buffered is
+            // ever sent once the user has opted out, even via a timer or
+            // pagehide flush scheduled before opt-out.
+            canSend: function () { return !_this.hasOptedOutTracking(); },
         }), options);
         // Check consent status on initialization
         if (this.hasOptedOutTracking()) {
@@ -297,11 +302,25 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.reset = function () {
         this.currentUserId = undefined;
+        // Clear in-memory wallet identity too. Without this, a logout/reset
+        // (also triggered by optOutTracking) still leaks the previous wallet
+        // address on subsequent track()/page() events for the rest of the
+        // page lifetime, because they fall back to currentAddress. Keep the
+        // EVM provider reference so tracking can resume on the next connect.
+        this.currentAddress = undefined;
+        this.currentChainId = undefined;
+        var evmProvider = this._chainState.evm.provider;
+        this._chainState = { evm: { provider: evmProvider }, solana: {} };
+        this._activeNamespace = undefined;
         (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);
         (0, storage_1.cookie)().remove(constants_1.ACTIVE_WALLET_KEY);
+        // Stored traffic-source attribution (referrer/UTM) is tracking data;
+        // clear it too so reset()/optOutTracking() don't leave it to be
+        // re-attached to the next session's events.
+        (0, storage_1.session)().remove(constants_1.SESSION_TRAFFIC_SOURCE_KEY);
     };
     /**
      * Clean up resources and event listeners
@@ -310,6 +329,8 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.cleanup = function () {
         logger_1.logger.debug("FormoAnalytics: Cleaning up resources");
+        // Drop buffered events so a torn-down instance can't flush later.
+        this.eventManager.clear();
         // Clean up Wagmi handler if present
         if (this.wagmiHandler) {
             this.wagmiHandler.cleanup();
@@ -473,7 +494,6 @@ var FormoAnalytics = /** @class */ (function () {
      * @param {ChainID} params.chainId
      * @param {Address} params.address
      * @param {string} params.message
-     * @param {string} params.signatureHash - only provided if status is confirmed
      * @param {IFormoEventProperties} properties
      * @param {IFormoEventContext} context
      * @param {(...args: unknown[]) => void} callback
@@ -481,10 +501,15 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.signature = 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, message = _b.message, signatureHash = _b.signatureHash;
+            var status = _b.status, chainId = _b.chainId, address = _b.address, message = _b.message;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.trackEvent(constants_1.EventType.SIGNATURE, __assign({ status: status, chainId: chainId, address: address, message: message }, (signatureHash && { signatureHash: signatureHash })), properties, context, callback)];
+                    case 0: return [4 /*yield*/, this.trackEvent(constants_1.EventType.SIGNATURE, {
+                            status: status,
+                            chainId: chainId,
+                            address: address,
+                            message: message,
+                        }, properties, context, callback)];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];
@@ -555,6 +580,13 @@ var FormoAnalytics = /** @class */ (function () {
                 switch (_d.label) {
                     case 0:
                         _d.trys.push([0, 12, , 13]);
+                        // identify() writes the user-id cookie and marks wallet
+                        // identification before trackEvent's consent check — gate the
+                        // whole method so an opted-out user gets no identity persistence.
+                        if (this.hasOptedOutTracking()) {
+                            logger_1.logger.info("identify() skipped: user has opted out of tracking");
+                            return [2 /*return*/];
+                        }
                         if (!!params) return [3 /*break*/, 10];
                         // If no params provided, auto-identify
                         logger_1.logger.info("Auto-identifying with providers:", this._providers.map(function (p) { return p.info.name; }));
@@ -630,7 +662,7 @@ var FormoAnalytics = /** @class */ (function () {
                         if (userId) {
                             this.currentUserId = userId;
                             domain = (0, cookiePolicy_1.getIdentityCookieDomain)(this.crossSubdomainCookies);
-                            (0, storage_1.cookie)().set(constants_1.SESSION_USER_ID_KEY, userId, __assign({ path: "/" }, (domain ? { domain: domain } : {})));
+                            (0, storage_1.cookie)().set(constants_1.SESSION_USER_ID_KEY, userId, __assign(__assign({ path: "/" }, (0, cookiePolicy_1.getIdentityCookieSecurity)()), (domain ? { domain: domain } : {})));
                         }
                         isAlreadyIdentified = this.session.isWalletIdentified(validAddress, rdns || "");
                         logger_1.logger.debug("Identify: Checking deduplication", {
@@ -679,6 +711,12 @@ var FormoAnalytics = /** @class */ (function () {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        // detect() marks wallet detection (a cookie write) before
+                        // trackEvent's consent check — gate it on opt-out.
+                        if (this.hasOptedOutTracking()) {
+                            logger_1.logger.info("detect() skipped: user has opted out of tracking");
+                            return [2 /*return*/];
+                        }
                         if (this.session.isWalletDetected(rdns))
                             return [2 /*return*/, logger_1.logger.warn("Detect: Wallet ".concat(providerName, " already detected in this session"))];
                         this.session.markWalletDetected(rdns);
@@ -725,6 +763,9 @@ var FormoAnalytics = /** @class */ (function () {
         // Set opt-out flag in persistent storage using direct cookie access
         // This must be done before switching storage to ensure persistence
         (0, consent_1.setConsentFlag)(this.writeKey, constants_1.CONSENT_OPT_OUT_KEY, "true");
+        // Drop anything already buffered so a pending timer/pagehide flush
+        // cannot ship events after consent withdrawal.
+        this.eventManager.clear();
         this.reset();
         logger_1.logger.info("Successfully opted out of tracking");
     };
@@ -1944,7 +1985,9 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
-    FormoAnalytics.prototype.buildSignatureEventPayload = function (method, params, response, chainId) {
+    FormoAnalytics.prototype.buildSignatureEventPayload = function (method, params, 
+    // Intentionally not read. Kept for positional call-site arity.
+    _response, chainId) {
         var _a;
         var rawAddress = method === "personal_sign"
             ? params[1]
@@ -1961,9 +2004,10 @@ var FormoAnalytics = /** @class */ (function () {
         };
         if (method === "personal_sign") {
             var message = Buffer.from(params[0].slice(2), "hex").toString("utf8");
-            return __assign(__assign(__assign({}, basePayload), { message: message }), (response ? { signatureHash: response } : {}));
+            return __assign(__assign({}, basePayload), { message: message });
         }
-        return __assign(__assign(__assign({}, basePayload), { message: params[1] }), (response ? { signatureHash: response } : {}));
+        // eth_signTypedData*: params[1] is the full EIP-712 struct.
+        return __assign(__assign({}, basePayload), { message: params[1] });
     };
     FormoAnalytics.prototype.buildTransactionEventPayload = function (params, provider) {
         return __awaiter(this, void 0, void 0, function () {
@@ -2079,7 +2123,8 @@ var FormoAnalytics = /** @class */ (function () {
         }
         this._providerListenersMap.delete(provider);
     };
-    // Explicitly untrack a provider: remove listeners, clear wrapper flag and tracking
+    // Explicitly untrack a provider: remove listeners, clear wrapper flag
+    // and tracking
     FormoAnalytics.prototype.untrackProvider = function (provider) {
         try {
             this.removeProviderListeners(provider);
@@ -2197,6 +2242,42 @@ var FormoAnalytics = /** @class */ (function () {
         }
         this.syncDerivedState();
     };
+    /**
+     * Sync validated wallet/chain state into the SDK's central state
+     * WITHOUT emitting an event.
+     *
+     * Integrations (e.g. the wagmi handler) must call this on every
+     * connect / chain-change / disconnect — even when the corresponding
+     * autocapture event is disabled. Otherwise `currentChainId` stays
+     * stale/undefined and `shouldTrack()`'s `tracking.excludeChains`
+     * check (which keys off `currentChainId`, not the event payload) can
+     * be bypassed, letting wallet activity on an excluded chain still be
+     * collected.
+     *
+     * - valid `address` present → record per-chain + derived state
+     * - `address` absent → clear chain state (disconnect)
+     */
+    FormoAnalytics.prototype.syncWalletState = function (params) {
+        var chainId = params.chainId, address = params.address;
+        if (!address) {
+            if (chainId !== undefined && chainId !== null) {
+                this.clearChainState(chainId);
+            }
+            else {
+                this.clearChainState("evm");
+                this.clearChainState("solana");
+            }
+            return;
+        }
+        if (chainId === null || chainId === undefined)
+            return;
+        var validAddress = (0, address_1.validateAddress)(address, chainId);
+        if (!validAddress) {
+            logger_1.logger.warn("syncWalletState: invalid address (\"".concat(address, "\") for chain ").concat(chainId));
+            return;
+        }
+        this.setChainState(chainId, { address: validAddress });
+    };
     /**
      * Synchronize currentAddress/currentChainId from the active namespace.
      * Last-connected-chain-wins: _activeNamespace takes precedence.
@@ -2235,10 +2316,16 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.persistActiveWallet = function () {
         try {
+            // Never write an identity cookie for an opted-out user; ensure any
+            // prior snapshot is removed instead.
+            if (this.hasOptedOutTracking()) {
+                (0, storage_1.cookie)().remove(constants_1.ACTIVE_WALLET_KEY);
+                return;
+            }
             if (this.currentAddress) {
                 var value = JSON.stringify(__assign({ address: this.currentAddress }, (this.currentChainId !== undefined && { chainId: this.currentChainId })));
                 var domain = (0, cookiePolicy_1.getIdentityCookieDomain)(this.crossSubdomainCookies);
-                (0, storage_1.cookie)().set(constants_1.ACTIVE_WALLET_KEY, value, __assign({ path: "/", expires: new Date(Date.now() + constants_1.ACTIVE_WALLET_TTL_MS).toUTCString() }, (domain ? { domain: domain } : {})));
+                (0, storage_1.cookie)().set(constants_1.ACTIVE_WALLET_KEY, value, __assign(__assign({ path: "/", expires: new Date(Date.now() + constants_1.ACTIVE_WALLET_TTL_MS).toUTCString() }, (0, cookiePolicy_1.getIdentityCookieSecurity)()), (domain ? { domain: domain } : {})));
             }
             else {
                 (0, storage_1.cookie)().remove(constants_1.ACTIVE_WALLET_KEY);
@@ -2254,6 +2341,12 @@ var FormoAnalytics = /** @class */ (function () {
      */
     FormoAnalytics.prototype.loadActiveWallet = function () {
         try {
+            // Never restore wallet identity into memory for an opted-out user
+            // (mirrors persistActiveWallet's guard); drop any stale snapshot.
+            if (this.hasOptedOutTracking()) {
+                (0, storage_1.cookie)().remove(constants_1.ACTIVE_WALLET_KEY);
+                return;
+            }
             var raw = (0, storage_1.cookie)().get(constants_1.ACTIVE_WALLET_KEY);
             if (!raw)
                 return;

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

@@ -35,7 +35,7 @@ declare class EventFactory implements IEventFactory {
     generateConnectEvent(chainId: ChainID, address: Address, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     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>;
+    generateSignatureEvent(status: SignatureStatus, chainId: ChainID, address: Address, message: 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/cjs/src/event/EventFactory.js

@@ -419,12 +419,12 @@ var EventFactory = /** @class */ (function () {
             });
         });
     };
-    EventFactory.prototype.generateSignatureEvent = function (status, chainId, address, message, signatureHash, properties, context) {
+    EventFactory.prototype.generateSignatureEvent = function (status, chainId, address, message, properties, context) {
         return __awaiter(this, void 0, void 0, function () {
             var signatureEvent;
             return __generator(this, function (_a) {
                 signatureEvent = {
-                    properties: __assign(__assign({ status: status, chainId: chainId, message: message }, (signatureHash && { signatureHash: signatureHash })), properties),
+                    properties: __assign({ status: status, chainId: chainId, message: message }, properties),
                     address: address,
                     type: "signature",
                 };
@@ -512,7 +512,7 @@ var EventFactory = /** @class */ (function () {
                     case 12:
                         formoEvent = _b.sent();
                         return [3 /*break*/, 19];
-                    case 13: return [4 /*yield*/, this.generateSignatureEvent(event.status, event.chainId, event.address, event.message, event.signatureHash, event.properties, event.context)];
+                    case 13: return [4 /*yield*/, this.generateSignatureEvent(event.status, event.chainId, event.address, event.message, event.properties, event.context)];
                     case 14:
                         formoEvent = _b.sent();
                         return [3 /*break*/, 19];

package/dist/cjs/src/event/EventManager.d.ts

@@ -18,6 +18,8 @@ declare class EventManager implements IEventManager {
      * @param event Incoming event data
      */
     addEvent(event: APIEvent, address?: Address, userId?: string): Promise<void>;
+    /** Drop any buffered events (consent withdrawal / teardown). */
+    clear(): void;
 }
 export { EventManager };
 //# sourceMappingURL=EventManager.d.ts.map

package/dist/cjs/src/event/EventManager.js

@@ -96,6 +96,10 @@ var EventManager = /** @class */ (function () {
             });
         });
     };
+    /** Drop any buffered events (consent withdrawal / teardown). */
+    EventManager.prototype.clear = function () {
+        this.eventQueue.clear();
+    };
     return EventManager;
 }());
 exports.EventManager = EventManager;

package/dist/cjs/src/event/type.d.ts

@@ -1,6 +1,7 @@
 import { Address, APIEvent, IFormoEvent } from "../types";
 export interface IEventManager {
     addEvent(event: APIEvent, address?: Address, userId?: string): Promise<void>;
+    clear(): void;
 }
 export interface IEventFactory {
     create(event: APIEvent, address?: Address, userId?: string): Promise<IFormoEvent>;

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

@@ -26,7 +26,7 @@ var generateAnonymousId = function (key, crossSubdomainCookies) {
     // 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.
-    (0, storage_1.cookie)().set(key, anonymousId, __assign({ expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365).toUTCString(), path: "/" }, (domain ? { domain: domain } : {})));
+    (0, storage_1.cookie)().set(key, anonymousId, __assign(__assign({ expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 365).toUTCString(), path: "/" }, (0, cookiePolicy_1.getIdentityCookieSecurity)()), (domain ? { domain: domain } : {})));
     return anonymousId;
 };
 exports.generateAnonymousId = generateAnonymousId;

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

@@ -11,6 +11,7 @@ type Options = {
     retryCount?: number;
     errorHandler?: any;
     maxQueueSize?: number;
+    canSend?: () => boolean;
 };
 export declare class EventQueue implements IEventQueue {
     private writeKey;
@@ -21,12 +22,19 @@ export declare class EventQueue implements IEventQueue {
     private flushIntervalMs;
     private flushed;
     private maxQueueSize;
+    private queueByteSize;
     private errorHandler;
     private retryCount;
     private pendingFlush;
     private payloadHashes;
+    private canSend?;
     constructor(writeKey: string, options: Options);
     private generateMessageId;
+    /**
+     * Drop all queued data and cancel the flush timer. Called on consent
+     * withdrawal / SDK teardown so nothing buffered can be sent later.
+     */
+    clear(): void;
     enqueue(event: IFormoEvent, callback?: (...args: any) => void): Promise<void>;
     flush(callback?: (...args: any) => void, drainAll?: boolean): Promise<void | IFormoEventFlushPayload[]>;
     /**

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

@@ -87,6 +87,7 @@ var EventQueue = /** @class */ (function () {
     function EventQueue(writeKey, options) {
         var _this = this;
         this.queue = [];
+        this.queueByteSize = 0; // running total of queued items' byteSize
         this.payloadHashes = new Set();
         this.onPageLeave = function (callback) {
             // To ensure the callback is only called once even if more than one events
@@ -142,6 +143,7 @@ var EventQueue = /** @class */ (function () {
         this.queue = [];
         this.writeKey = writeKey;
         this.apiHost = options.apiHost;
+        this.canSend = options.canSend;
         this.retryCount = (0, utils_1.clampNumber)(options.retryCount || DEFAULT_RETRY, MAX_RETRY, MIN_RETRY);
         this.flushAt = (0, utils_1.clampNumber)(options.flushAt || DEFAULT_FLUSH_AT, MAX_FLUSH_AT, MIN_FLUSH_AT);
         this.maxQueueSize = (0, utils_1.clampNumber)(options.maxQueueSize || DEFAULT_QUEUE_SIZE, MAX_QUEUE_SIZE, MIN_QUEUE_SIZE);
@@ -175,13 +177,31 @@ var EventQueue = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Drop all queued data and cancel the flush timer. Called on consent
+     * withdrawal / SDK teardown so nothing buffered can be sent later.
+     */
+    EventQueue.prototype.clear = function () {
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+        }
+        this.queue = [];
+        this.queueByteSize = 0;
+        this.payloadHashes.clear();
+    };
     EventQueue.prototype.enqueue = function (event, callback) {
         return __awaiter(this, void 0, void 0, function () {
-            var message_id, hasReachedFlushAt, hasReachedQueueSize;
+            var message_id, queueItem, hasReachedFlushAt, hasReachedQueueSize;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         callback = callback || noop;
+                        // Refuse to buffer anything once consent is withdrawn.
+                        if (this.canSend && !this.canSend()) {
+                            this.clear();
+                            return [2 /*return*/];
+                        }
                         return [4 /*yield*/, this.generateMessageId(event)];
                     case 1:
                         message_id = _a.sent();
@@ -190,10 +210,18 @@ var EventQueue = /** @class */ (function () {
                             logger_1.logger.warn("Event already enqueued, try again after ".concat((0, utils_1.millisecondsToSecond)(this.flushIntervalMs), " seconds."));
                             return [2 /*return*/];
                         }
-                        this.queue.push({
+                        queueItem = {
                             message: __assign(__assign({}, event), { message_id: message_id }),
                             callback: callback,
-                        });
+                            byteSize: 0,
+                        };
+                        // Measure once here (message only — JSON.stringify drops the
+                        // callback function anyway), then track the total incrementally.
+                        queueItem.byteSize = JSON.stringify({
+                            message: queueItem.message,
+                        }).length;
+                        this.queue.push(queueItem);
+                        this.queueByteSize += queueItem.byteSize;
                         logger_1.logger.log("Event enqueued: ".concat((0, utils_1.getActionDescriptor)(event.type, event.properties)));
                         if (!this.flushed) {
                             this.flushed = true;
@@ -201,8 +229,7 @@ var EventQueue = /** @class */ (function () {
                             return [2 /*return*/];
                         }
                         hasReachedFlushAt = this.queue.length >= this.flushAt;
-                        hasReachedQueueSize = this.queue.reduce(function (acc, item) { return acc + JSON.stringify(item).length; }, 0) >=
-                            this.maxQueueSize;
+                        hasReachedQueueSize = this.queueByteSize >= this.maxQueueSize;
                         if (hasReachedFlushAt || hasReachedQueueSize) {
                             this.flush();
                             return [2 /*return*/];
@@ -228,6 +255,13 @@ var EventQueue = /** @class */ (function () {
                             clearTimeout(this.timer);
                             this.timer = null;
                         }
+                        // Final consent gate: a timer/pagehide flush may have been scheduled
+                        // before opt-out. Drop everything rather than send post-withdrawal.
+                        if (this.canSend && !this.canSend()) {
+                            this.clear();
+                            callback();
+                            return [2 /*return*/, Promise.resolve()];
+                        }
                         if (!this.queue.length) {
                             callback();
                             return [2 /*return*/, Promise.resolve()];
@@ -241,11 +275,17 @@ var EventQueue = /** @class */ (function () {
                     case 2:
                         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.
+                        // active for events still in the queue. Also decrement the running
+                        // byte total by exactly what left the queue.
                         for (_i = 0, items_1 = items; _i < items_1.length; _i++) {
                             item = items_1[_i];
                             this.payloadHashes.delete(item.message.message_id);
+                            this.queueByteSize -= item.byteSize;
                         }
+                        // Re-anchor to the exact invariant when the queue empties, so any
+                        // accumulated drift can never wedge the size gate.
+                        if (this.queue.length === 0)
+                            this.queueByteSize = 0;
                         sentAt = new Date().toISOString();
                         data = items.map(function (item) { return (__assign(__assign({}, item.message), { sent_at: sentAt })); });
                         batches = this.splitIntoBatches(items, data);
@@ -348,6 +388,12 @@ var EventQueue = /** @class */ (function () {
                     case 1:
                         if (!(_i < batches_1.length)) return [3 /*break*/, 6];
                         batch = batches_1[_i];
+                        // Consent can be withdrawn while a flush is already in flight:
+                        // batches were spliced before opt-out, and split batches / retry
+                        // backoff span seconds. Re-check before every send and abandon
+                        // the remaining batches if consent was revoked mid-flush.
+                        if (this.canSend && !this.canSend())
+                            return [3 /*break*/, 6];
                         _a.label = 2;
                     case 2:
                         _a.trys.push([2, 4, , 5]);

package/dist/cjs/src/queue/type.d.ts

@@ -2,5 +2,6 @@ import { IFormoEvent } from "../types";
 export interface IEventQueue {
     enqueue(event: IFormoEvent, callback?: (...args: any) => void): Promise<void>;
     flush(callback?: (...args: any) => void): Promise<any>;
+    clear(): void;
 }
 //# sourceMappingURL=type.d.ts.map

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

@@ -5,9 +5,21 @@
  * Handles tracking of detected wallets and identified wallet-address pairs
  * using cookies to maintain state across page loads within a session.
  */
+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);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormoAnalyticsSession = exports.SESSION_WALLET_IDENTIFIED_KEY = exports.SESSION_WALLET_DETECTED_KEY = void 0;
 var storage_1 = require("../storage");
+var cookiePolicy_1 = require("../storage/cookiePolicy");
 var logger_1 = require("../logger");
 /**
  * Cookie keys for session tracking
@@ -66,11 +78,9 @@ var FormoAnalyticsSession = /** @class */ (function () {
             if (rdnses.length > MAX_SESSION_ENTRIES) {
                 rdnses.splice(0, rdnses.length - MAX_SESSION_ENTRIES);
             }
-            (0, storage_1.cookie)().set(exports.SESSION_WALLET_DETECTED_KEY, rdnses.join(","), {
+            (0, storage_1.cookie)().set(exports.SESSION_WALLET_DETECTED_KEY, rdnses.join(","), __assign({ 
                 // Expires by the end of the day
-                expires: new Date(Date.now() + 86400 * 1000).toUTCString(),
-                path: "/",
-            });
+                expires: new Date(Date.now() + 86400 * 1000).toUTCString(), path: "/" }, (0, cookiePolicy_1.getIdentityCookieSecurity)()));
         }
     };
     /**
@@ -110,11 +120,9 @@ var FormoAnalyticsSession = /** @class */ (function () {
                 identifiedWallets.splice(0, identifiedWallets.length - MAX_SESSION_ENTRIES);
             }
             var newValue = identifiedWallets.join(",");
-            (0, storage_1.cookie)().set(exports.SESSION_WALLET_IDENTIFIED_KEY, newValue, {
+            (0, storage_1.cookie)().set(exports.SESSION_WALLET_IDENTIFIED_KEY, newValue, __assign({ 
                 // Expires by the end of the day
-                expires: new Date(Date.now() + 86400 * 1000).toUTCString(),
-                path: "/",
-            });
+                expires: new Date(Date.now() + 86400 * 1000).toUTCString(), path: "/" }, (0, cookiePolicy_1.getIdentityCookieSecurity)()));
             logger_1.logger.debug("Session: Marked wallet as identified", {
                 identifiedKey: identifiedKey,
                 hasRdns: !!rdns,

package/dist/cjs/src/storage/cookiePolicy.d.ts

@@ -7,4 +7,20 @@
  * @param crossSubdomain Whether cookies should be shared across subdomains.
  */
 export declare function getIdentityCookieDomain(crossSubdomain?: boolean): string;
+/**
+ * Security attributes for identity/session cookies (user-id,
+ * active-wallet, wallet-detected/identified).
+ *
+ * - `sameSite: "lax"` — first-party analytics identity. Lax keeps the
+ *   cookie on top-level navigations (so attribution survives a click-in
+ *   from another site) while blocking it on cross-site subrequests.
+ *   Strict would silently drop identity on inbound navigation.
+ * - `secure` — only on HTTPS. Setting Secure over plain HTTP (local dev)
+ *   makes the browser reject the cookie outright, so it must be
+ *   conditional.
+ */
+export declare function getIdentityCookieSecurity(): {
+    sameSite: "lax";
+    secure: boolean;
+};
 //# sourceMappingURL=cookiePolicy.d.ts.map

package/dist/cjs/src/storage/cookiePolicy.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIdentityCookieDomain = getIdentityCookieDomain;
+exports.getIdentityCookieSecurity = getIdentityCookieSecurity;
 /**
  * Cookie domain policy — centralizes the decision of whether identity
  * cookies should be host-scoped or apex-scoped.
@@ -24,4 +25,22 @@ function getIdentityCookieDomain(crossSubdomain) {
     var domain = (0, domain_1.getApexDomain)();
     return domain ? ".".concat(domain) : "";
 }
+/**
+ * Security attributes for identity/session cookies (user-id,
+ * active-wallet, wallet-detected/identified).
+ *
+ * - `sameSite: "lax"` — first-party analytics identity. Lax keeps the
+ *   cookie on top-level navigations (so attribution survives a click-in
+ *   from another site) while blocking it on cross-site subrequests.
+ *   Strict would silently drop identity on inbound navigation.
+ * - `secure` — only on HTTPS. Setting Secure over plain HTTP (local dev)
+ *   makes the browser reject the cookie outright, so it must be
+ *   conditional.
+ */
+function getIdentityCookieSecurity() {
+    var _a;
+    var isHttps = typeof window !== "undefined" &&
+        ((_a = window.location) === null || _a === void 0 ? void 0 : _a.protocol) === "https:";
+    return { sameSite: "lax", secure: isHttps };
+}
 //# sourceMappingURL=cookiePolicy.js.map

package/dist/cjs/src/types/base.d.ts

@@ -40,7 +40,6 @@ export interface IFormoAnalytics {
         chainId?: ChainID;
         address: Address;
         message: string;
-        signatureHash?: string;
     }, properties?: IFormoEventProperties, context?: IFormoEventContext, callback?: (...args: unknown[]) => void): Promise<void>;
     transaction(params: {
         status: TransactionStatus;

package/dist/cjs/src/types/events.d.ts

@@ -76,7 +76,6 @@ export interface SignatureAPIEvent {
     chainId: ChainID;
     address: Address;
     message: string;
-    signatureHash?: string;
 }
 export interface ConnectAPIEvent {
     type: "connect";

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

@@ -1,2 +1,2 @@
-export declare const version = "1.29.1";
+export declare const version = "1.30.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/cjs/src/version.js

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // This file is auto-generated by scripts/update-version.js during npm version
 // Do not edit manually - it will be overwritten
-exports.version = '1.29.1';
+exports.version = '1.30.0';
 //# sourceMappingURL=version.js.map