@formo/analytics 1.29.0 → 1.30.0

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.0";
+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.0';
+exports.version = '1.30.0';
 //# sourceMappingURL=version.js.map

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

@@ -173,6 +173,11 @@ var WagmiEventHandler = /** @class */ (function () {
                             chainId: chainId,
                         });
                         if (!(status === "disconnected" && prevStatus === "connected")) return [3 /*break*/, 4];
+                        // Clear central chain state regardless of autocapture so a later
+                        // event can't carry a stale excluded/!excluded chainId.
+                        this.formo.syncWalletState({
+                            chainId: this.trackingState.lastChainId,
+                        });
                         if (!this.formo.isAutocaptureEnabled("disconnect")) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.formo.disconnect({
                                 chainId: this.trackingState.lastChainId,
@@ -190,6 +195,9 @@ var WagmiEventHandler = /** @class */ (function () {
                         if (!(address && chainId !== undefined)) return [3 /*break*/, 6];
                         this.trackingState.lastAddress = address;
                         this.trackingState.lastChainId = chainId;
+                        // Sync central state unconditionally so tracking.excludeChains
+                        // is enforced even when connect autocapture is disabled.
+                        this.formo.syncWalletState({ chainId: chainId, address: address });
                         if (!this.formo.isAutocaptureEnabled("connect")) return [3 /*break*/, 6];
                         connectorName = this.getConnectorName(state);
                         return [4 /*yield*/, this.formo.connect({ chainId: chainId, address: address }, __assign({}, (connectorName && { providerName: connectorName })))];
@@ -238,6 +246,9 @@ var WagmiEventHandler = /** @class */ (function () {
                             address: address,
                         });
                         this.trackingState.lastChainId = chainId;
+                        // Sync central state unconditionally so a chain switch to an
+                        // excluded chain is honored even when chain autocapture is disabled.
+                        this.formo.syncWalletState({ chainId: chainId, address: address });
                         if (!this.formo.isAutocaptureEnabled("chain")) return [3 /*break*/, 4];
                         _a.label = 1;
                     case 1:
@@ -359,14 +370,21 @@ var WagmiEventHandler = /** @class */ (function () {
             logger_1.logger.warn("WagmiEventHandler: Transaction receipt query but no hash found");
             return;
         }
-        // Retrieve stored transaction details from BROADCASTED event
-        // Normalize hash to lowercase for consistent lookup
+        // Retrieve stored transaction details from the BROADCASTED event.
+        // Normalize hash to lowercase for consistent lookup.
         var normalizedHash = transactionHash.toLowerCase();
         var pendingTx = this.pendingTransactions.get(normalizedHash);
-        // Use the original sender address from BROADCASTED event if available,
-        // otherwise fall back to current connected address.
-        // This handles wallet switches between broadcast and confirmation.
-        var address = (pendingTx === null || pendingTx === void 0 ? void 0 : pendingTx.address) || this.trackingState.lastAddress;
+        // Only emit receipt-derived events for a hash we actually observed
+        // being broadcast through this handler. The QueryClient is supplied
+        // by the host app and its cache can be written by app code or other
+        // deps, so without this gate a forged waitForTransactionReceipt
+        // entry could fabricate a confirmed/reverted transaction for an
+        // arbitrary hash. No pendingTx → not our broadcast → ignore.
+        if (!pendingTx) {
+            logger_1.logger.debug("WagmiEventHandler: Receipt for unobserved tx hash; ignoring", { transactionHash: transactionHash });
+            return;
+        }
+        var address = pendingTx.address;
         if (!address) {
             logger_1.logger.warn("WagmiEventHandler: Transaction receipt query but no address available");
             return;
@@ -374,9 +392,13 @@ var WagmiEventHandler = /** @class */ (function () {
         try {
             // Extract receipt data
             var receipt = state.data;
-            // Determine transaction status from receipt
-            // receipt.status is 'success' or 'reverted' in viem
-            var txStatus = (receipt === null || receipt === void 0 ? void 0 : receipt.status) === "reverted"
+            // Only act on an explicit on-chain outcome. A missing/unknown
+            // status must NOT be treated as a confirmation.
+            if ((receipt === null || receipt === void 0 ? void 0 : receipt.status) !== "success" && (receipt === null || receipt === void 0 ? void 0 : receipt.status) !== "reverted") {
+                logger_1.logger.debug("WagmiEventHandler: Receipt without explicit success/reverted status; ignoring", { transactionHash: transactionHash, status: receipt === null || receipt === void 0 ? void 0 : receipt.status });
+                return;
+            }
+            var txStatus = receipt.status === "reverted"
                 ? events_1.TransactionStatus.REVERTED
                 : events_1.TransactionStatus.CONFIRMED;
             logger_1.logger.info("WagmiEventHandler: Tracking transaction confirmation", {
@@ -455,15 +477,13 @@ var WagmiEventHandler = /** @class */ (function () {
             return;
         }
         try {
-            // Map Wagmi mutation status to Formo signature status
+            // Map Wagmi mutation status to Formo signature status.
             var status_1;
-            var signatureHash = void 0;
             if (state.status === "pending") {
                 status_1 = events_1.SignatureStatus.REQUESTED;
             }
             else if (state.status === "success") {
                 status_1 = events_1.SignatureStatus.CONFIRMED;
-                signatureHash = state.data;
             }
             else if (state.status === "error") {
                 status_1 = events_1.SignatureStatus.REJECTED;
@@ -471,13 +491,11 @@ var WagmiEventHandler = /** @class */ (function () {
             else {
                 return; // Ignore idle state
             }
-            // Extract message from variables
             var message = void 0;
             if (mutationType === "signMessage") {
                 message = variables.message || "";
             }
             else {
-                // For signTypedData, stringify the typed data
                 message = JSON.stringify(variables.message || variables.types || {});
             }
             logger_1.logger.info("WagmiEventHandler: Tracking signature event", {
@@ -486,7 +504,12 @@ var WagmiEventHandler = /** @class */ (function () {
                 address: address,
                 chainId: chainId,
             });
-            this.formo.signature(__assign({ status: status_1, chainId: chainId, address: address, message: message }, (signatureHash && { signatureHash: signatureHash })));
+            this.formo.signature({
+                status: status_1,
+                chainId: chainId,
+                address: address,
+                message: message,
+            });
         }
         catch (error) {
             logger_1.logger.error("WagmiEventHandler: Error handling signature mutation:", error);

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

@@ -54,6 +54,10 @@ export declare class FormoAnalytics implements IFormoAnalytics {
     private crossSubdomainCookies;
     /** In-memory URL used to deduplicate SPA pageview events. */
     private _currentUrl;
+    /** Page-hit hooks installed in trackPageHits() so cleanup() can undo them. */
+    private _onPopStateListener?;
+    private _onLocationChangeListener?;
+    private _pageHooksDisposed;
     config: Config;
     currentChainId?: ChainID;
     currentAddress?: Address;
@@ -132,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.
@@ -272,6 +274,12 @@ export declare class FormoAnalytics implements IFormoAnalytics {
     private registerRequestListeners;
     private onLocationChange;
     private trackPageHits;
+    /**
+     * Wrap history.pushState / replaceState exactly once per `history` object,
+     * regardless of how many SDK instances are constructed. Uses a Symbol
+     * marker so we recognize our own wrapper across module reloads in HMR.
+     */
+    private static installHistoryHooksOnce;
     private trackPageHit;
     private trackEvent;
     /**
@@ -312,6 +320,15 @@ export declare class FormoAnalytics implements IFormoAnalytics {
     private getCurrentChainId;
     private buildSignatureEventPayload;
     private buildTransactionEventPayload;
+    /**
+     * Persist an EVM address discovered through autocapture (signature / transaction)
+     * as the current EVM address when none is currently set. This lets subsequent
+     * track()/page() calls carry the address even when the underlying wallet never
+     * fires an EIP-1193 `accountsChanged` event (embedded wallets, smart accounts,
+     * social-login wrappers). If `accountsChanged` later fires it overwrites this
+     * value in the normal way; existing connections are never clobbered.
+     */
+    private backfillActiveWallet;
     /**
      * Polls for transaction receipt and emits tx.status = CONFIRMED or REVERTED.
      */
@@ -362,11 +379,43 @@ 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.
      */
     private syncDerivedState;
+    /**
+     * Persist (or clear) the current wallet snapshot in a cookie so that the
+     * SDK can repopulate `currentAddress`/`currentChainId` at init on the next
+     * page load — closing the gap between page-show and wagmi/EIP-1193
+     * reconnection during which track()/page() events would otherwise ship
+     * with an empty address.
+     */
+    private persistActiveWallet;
+    /**
+     * Seed `currentAddress`/`currentChainId` from the persisted snapshot, if
+     * any. Called once during construction before the first page hit fires.
+     */
+    private loadActiveWallet;
     /**
      * Helper method to clear the active provider state
      * Centralizes provider clearing logic for consistency