@formo/analytics 1.28.4 → 1.28.6

package/README.md

@@ -23,8 +23,7 @@ You can install Formo on:
 - [Wagmi](https://docs.formo.so/install#wagmi) (recommended)
 - [HTML Snippet](https://docs.formo.so/install#html-snippet)
 - [React](https://docs.formo.so/install#react)
-- [Next.js app router](https://docs.formo.so/install#next-js-app-router)
-- [Next.js pages router](https://docs.formo.so/install#next-js-pages-router)
+- [Next.js](https://docs.formo.so/install#next-js)
 
 ## Configuration
 

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

@@ -45,6 +45,11 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      * When true, EIP-1193 provider wrapping is skipped
      */
     private isWagmiMode;
+    /**
+     * Flag indicating if EVM provider tracking is disabled.
+     * When true, all EIP-1193/EIP-6963 detection and wrapping is skipped.
+     */
+    private isEvmDisabled;
     /** Instance-level flag so multiple SDK instances don't interfere. */
     private crossSubdomainCookies;
     config: Config;
@@ -294,10 +299,9 @@ export declare class FormoAnalytics implements IFormoAnalytics {
      *
      * @example
      * ```tsx
-     * formo.solana.setWallet(wallet);
-     * formo.solana.setConnection(connection);
+     * formo.solana.setStore(client.store);
      * formo.solana.setCluster("devnet");
-     * formo.solana.syncWalletState();
+     * // For signatures, use formo.signature() directly
      * ```
      */
     get solana(): SolanaManager;

package/dist/cjs/src/FormoAnalytics.js

@@ -117,6 +117,11 @@ var FormoAnalytics = /** @class */ (function () {
          * When true, EIP-1193 provider wrapping is skipped
          */
         this.isWagmiMode = false;
+        /**
+         * Flag indicating if EVM provider tracking is disabled.
+         * When true, all EIP-1193/EIP-6963 detection and wrapping is skipped.
+         */
+        this.isEvmDisabled = false;
         this.currentUserId = "";
         this.config = {
             writeKey: writeKey,
@@ -124,6 +129,7 @@ var FormoAnalytics = /** @class */ (function () {
         this.options = options;
         // Check if Wagmi mode is enabled
         this.isWagmiMode = !!options.wagmi;
+        this.isEvmDisabled = options.evm === false;
         this.crossSubdomainCookies = (_a = options.crossSubdomainCookies) !== null && _a !== void 0 ? _a : true;
         // Normalize so downstream consumers (EventFactory) read the resolved value.
         options.crossSubdomainCookies = this.crossSubdomainCookies;
@@ -156,8 +162,11 @@ var FormoAnalytics = /** @class */ (function () {
         if (this.hasOptedOutTracking()) {
             logger_1.logger.info("User has previously opted out of tracking");
         }
-        // Initialize Wagmi handler if Wagmi mode is enabled
-        if (this.isWagmiMode && options.wagmi) {
+        // Initialize EVM provider tracking (unless explicitly disabled)
+        if (this.isEvmDisabled) {
+            logger_1.logger.info("FormoAnalytics: EVM provider tracking disabled");
+        }
+        else 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);
         }
@@ -226,22 +235,26 @@ var FormoAnalytics = /** @class */ (function () {
                     case 0:
                         (0, storage_1.initStorageManager)(writeKey);
                         analytics = new FormoAnalytics(writeKey, options);
-                        if (!!analytics.isWagmiMode) return [3 /*break*/, 3];
+                        if (!analytics.isEvmDisabled) return [3 /*break*/, 1];
+                        logger_1.logger.info("FormoAnalytics: Skipping provider detection (EVM disabled)");
+                        return [3 /*break*/, 5];
+                    case 1:
+                        if (!!analytics.isWagmiMode) return [3 /*break*/, 4];
                         // Auto-detect wallet provider
                         _a = analytics;
                         return [4 /*yield*/, analytics.getProviders()];
-                    case 1:
+                    case 2:
                         // Auto-detect wallet provider
                         _a._providers = _b.sent();
                         return [4 /*yield*/, analytics.detectWallets(analytics._providers)];
-                    case 2:
+                    case 3:
                         _b.sent();
                         analytics.trackProviders(analytics._providers);
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 5];
+                    case 4:
                         logger_1.logger.info("FormoAnalytics: Skipping provider detection (Wagmi mode)");
-                        _b.label = 4;
-                    case 4: return [2 /*return*/, analytics];
+                        _b.label = 5;
+                    case 5: return [2 /*return*/, analytics];
                 }
             });
         });
@@ -1770,10 +1783,9 @@ var FormoAnalytics = /** @class */ (function () {
          *
          * @example
          * ```tsx
-         * formo.solana.setWallet(wallet);
-         * formo.solana.setConnection(connection);
+         * formo.solana.setStore(client.store);
          * formo.solana.setCluster("devnet");
-         * formo.solana.syncWalletState();
+         * // For signatures, use formo.signature() directly
          * ```
          */
         get: function () {

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

@@ -4,5 +4,7 @@ export * from "./types";
 export { parsePrivyProperties } from "./privy";
 export type { PrivyUser, PrivyLinkedAccount, PrivyAccountType, PrivyProfileProperties, PrivyWalletInfo } from "./privy";
 export { SolanaManager } from "./solana";
-export type { SolanaOptions, SolanaCluster, ISolanaAdapter, SolanaWalletContext, SolanaPublicKey, SolanaConnection, } from "./solana";
+export { SOLANA_CHAIN_IDS, DEFAULT_SOLANA_CHAIN_ID, isSolanaChainId } from "./solana";
+export type { SolanaOptions, SolanaCluster, } from "./solana";
+export type { SolanaClientStore, SolanaClientState, } from "./solana";
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/src/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaManager = exports.parsePrivyProperties = void 0;
+exports.isSolanaChainId = exports.DEFAULT_SOLANA_CHAIN_ID = exports.SOLANA_CHAIN_IDS = exports.SolanaManager = exports.parsePrivyProperties = void 0;
 var initialization_1 = require("./initialization");
 __exportStar(require("./FormoAnalyticsProvider"), exports);
 __exportStar(require("./FormoAnalytics"), exports);
@@ -24,6 +24,10 @@ Object.defineProperty(exports, "parsePrivyProperties", { enumerable: true, get:
 // Solana integration exports
 var solana_1 = require("./solana");
 Object.defineProperty(exports, "SolanaManager", { enumerable: true, get: function () { return solana_1.SolanaManager; } });
+var solana_2 = require("./solana");
+Object.defineProperty(exports, "SOLANA_CHAIN_IDS", { enumerable: true, get: function () { return solana_2.SOLANA_CHAIN_IDS; } });
+Object.defineProperty(exports, "DEFAULT_SOLANA_CHAIN_ID", { enumerable: true, get: function () { return solana_2.DEFAULT_SOLANA_CHAIN_ID; } });
+Object.defineProperty(exports, "isSolanaChainId", { enumerable: true, get: function () { return solana_2.isSolanaChainId; } });
 if (typeof window !== "undefined")
     window.formofy = initialization_1.formofy;
 //# sourceMappingURL=index.js.map

package/dist/cjs/src/solana/SolanaManager.d.ts

@@ -1,24 +1,49 @@
 /**
  * SolanaManager
  *
- * Manages the lifecycle of the SolanaAdapter, handling lazy initialization
- * and pending configuration. This keeps Solana-specific lifecycle logic out of
- * the main FormoAnalytics class.
+ * Manages the lifecycle of the Solana store integration.
+ * Subscribes to framework-kit's zustand store for automatic event capture
+ * of wallet connect/disconnect and transaction lifecycle events.
+ *
+ * For signMessage/signTransaction tracking (not captured by the store),
+ * use formo.signature() directly with the address and chainId.
+ *
+ * For manual event tracking without the store, use the core API directly:
+ * formo.transaction(), formo.signature(), formo.connect(), formo.disconnect().
  */
 import { FormoAnalytics } from "../FormoAnalytics";
-import { SolanaAdapter } from "./SolanaAdapter";
-import { ISolanaAdapter, SolanaWalletContext, SolanaConnection, SolanaCluster, SolanaOptions } from "./types";
+import { SolanaCluster, SolanaOptions } from "./types";
+import { SolanaClientStore } from "./storeTypes";
 export declare class SolanaManager {
     private formo;
-    private handler?;
-    private pendingConnection?;
+    private storeHandler?;
     private pendingCluster?;
     constructor(formo: FormoAnalytics, options?: SolanaOptions);
-    get adapter(): SolanaAdapter | undefined;
-    setWallet(wallet: ISolanaAdapter | SolanaWalletContext | null): void;
-    setConnection(connection: SolanaConnection | null): void;
+    /**
+     * Set the framework-kit zustand store for automatic event tracking.
+     * This enables autocapture mode — connect/disconnect and transaction events
+     * are tracked automatically by subscribing to store state changes.
+     *
+     * @param store - The framework-kit client store (client.store)
+     * @param options - Optional configuration
+     *
+     * @example
+     * ```tsx
+     * import { createClient } from '@solana-foundation/framework-kit';
+     *
+     * const client = createClient({ endpoint: '...', walletConnectors: autoDiscover() });
+     * formo.solana.setStore(client.store);
+     * ```
+     */
+    setStore(store: SolanaClientStore, options?: {
+        cluster?: SolanaCluster;
+    }): void;
+    /**
+     * Update the cluster/network. Only needed if the store endpoint doesn't
+     * contain a recognizable cluster name (e.g. custom RPC URLs).
+     * In most cases, the cluster is auto-detected from the store's endpoint.
+     */
     setCluster(cluster: SolanaCluster): void;
-    syncWalletState(): void;
     cleanup(): void;
 }
 //# sourceMappingURL=SolanaManager.d.ts.map

package/dist/cjs/src/solana/SolanaManager.js

@@ -2,77 +2,75 @@
 /**
  * SolanaManager
  *
- * Manages the lifecycle of the SolanaAdapter, handling lazy initialization
- * and pending configuration. This keeps Solana-specific lifecycle logic out of
- * the main FormoAnalytics class.
+ * Manages the lifecycle of the Solana store integration.
+ * Subscribes to framework-kit's zustand store for automatic event capture
+ * of wallet connect/disconnect and transaction lifecycle events.
+ *
+ * For signMessage/signTransaction tracking (not captured by the store),
+ * use formo.signature() directly with the address and chainId.
+ *
+ * For manual event tracking without the store, use the core API directly:
+ * formo.transaction(), formo.signature(), formo.connect(), formo.disconnect().
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaManager = void 0;
 var logger_1 = require("../logger");
-var SolanaAdapter_1 = require("./SolanaAdapter");
+var SolanaStoreHandler_1 = require("./SolanaStoreHandler");
 var SolanaManager = /** @class */ (function () {
     function SolanaManager(formo, options) {
         this.formo = formo;
-        if (options === null || options === void 0 ? void 0 : options.wallet) {
-            logger_1.logger.info("SolanaManager: Initializing Solana wallet tracking");
-            this.handler = new SolanaAdapter_1.SolanaAdapter(formo, {
-                wallet: options.wallet,
-                connection: options.connection,
+        if (options === null || options === void 0 ? void 0 : options.store) {
+            logger_1.logger.info("SolanaManager: Initializing store-based Solana tracking");
+            this.storeHandler = new SolanaStoreHandler_1.SolanaStoreHandler(formo, options.store, {
                 cluster: options.cluster,
             });
         }
-        else if (options) {
-            // Store pending values for when wallet is set later
-            this.pendingConnection = options.connection;
+        else if (options === null || options === void 0 ? void 0 : options.cluster) {
+            // Store pending cluster for when setStore is called later
             this.pendingCluster = options.cluster;
         }
     }
-    Object.defineProperty(SolanaManager.prototype, "adapter", {
-        get: function () {
-            return this.handler;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    SolanaManager.prototype.setWallet = function (wallet) {
-        if (this.handler) {
-            this.handler.setWallet(wallet);
-        }
-        else if (wallet) {
-            logger_1.logger.info("SolanaManager: Initializing Solana wallet tracking (lazy)");
-            this.handler = new SolanaAdapter_1.SolanaAdapter(this.formo, {
-                wallet: wallet,
-                connection: this.pendingConnection,
-                cluster: this.pendingCluster,
-            });
-            this.pendingConnection = undefined;
-            this.pendingCluster = undefined;
-        }
-    };
-    SolanaManager.prototype.setConnection = function (connection) {
-        if (this.handler) {
-            this.handler.setConnection(connection);
-        }
-        else {
-            this.pendingConnection = connection !== null && connection !== void 0 ? connection : undefined;
-        }
+    /**
+     * Set the framework-kit zustand store for automatic event tracking.
+     * This enables autocapture mode — connect/disconnect and transaction events
+     * are tracked automatically by subscribing to store state changes.
+     *
+     * @param store - The framework-kit client store (client.store)
+     * @param options - Optional configuration
+     *
+     * @example
+     * ```tsx
+     * import { createClient } from '@solana-foundation/framework-kit';
+     *
+     * const client = createClient({ endpoint: '...', walletConnectors: autoDiscover() });
+     * formo.solana.setStore(client.store);
+     * ```
+     */
+    SolanaManager.prototype.setStore = function (store, options) {
+        var _a;
+        (_a = this.storeHandler) === null || _a === void 0 ? void 0 : _a.cleanup();
+        this.storeHandler = new SolanaStoreHandler_1.SolanaStoreHandler(this.formo, store, {
+            cluster: (options === null || options === void 0 ? void 0 : options.cluster) || this.pendingCluster,
+        });
+        this.pendingCluster = undefined;
     };
+    /**
+     * Update the cluster/network. Only needed if the store endpoint doesn't
+     * contain a recognizable cluster name (e.g. custom RPC URLs).
+     * In most cases, the cluster is auto-detected from the store's endpoint.
+     */
     SolanaManager.prototype.setCluster = function (cluster) {
-        if (this.handler) {
-            this.handler.setCluster(cluster);
+        if (this.storeHandler) {
+            this.storeHandler.setCluster(cluster);
         }
         else {
             this.pendingCluster = cluster;
         }
     };
-    SolanaManager.prototype.syncWalletState = function () {
-        var _a;
-        (_a = this.handler) === null || _a === void 0 ? void 0 : _a.syncWalletState();
-    };
     SolanaManager.prototype.cleanup = function () {
         var _a;
-        (_a = this.handler) === null || _a === void 0 ? void 0 : _a.cleanup();
-        this.handler = undefined;
+        (_a = this.storeHandler) === null || _a === void 0 ? void 0 : _a.cleanup();
+        this.storeHandler = undefined;
     };
     return SolanaManager;
 }());

package/dist/cjs/src/solana/SolanaStoreHandler.d.ts

@@ -0,0 +1,88 @@
+/**
+ * SolanaStoreHandler
+ *
+ * Handles wallet event tracking by subscribing to framework-kit's zustand store.
+ * This provides automatic event capture (autocapture) for Solana wallets without
+ * wrapping any wallet methods — similar to how WagmiEventHandler subscribes to
+ * TanStack Query's mutation/query caches.
+ *
+ * Subscribes to:
+ * - `state.wallet` — connect/disconnect events
+ * - `state.transactions` — transaction lifecycle events (sending → confirmed/failed)
+ *
+ * @see https://github.com/solana-foundation/framework-kit
+ */
+import { FormoAnalytics } from "../FormoAnalytics";
+import { SolanaClientStore } from "./storeTypes";
+import { SolanaCluster } from "./types";
+export declare class SolanaStoreHandler {
+    private formo;
+    private store;
+    private unsubscribers;
+    private cluster;
+    private chainId;
+    /**
+     * Track last known wallet status to detect transitions.
+     */
+    private lastWalletStatus;
+    private lastAddress?;
+    private lastChainId?;
+    /**
+     * Track processed transaction state changes to prevent duplicate events.
+     * Key format: `${signature}:${status}`
+     */
+    private processedTransactions;
+    /**
+     * Track transactions we've emitted STARTED for (status was "sending").
+     * Ensures we only emit STARTED once per transaction key.
+     */
+    private startedTransactions;
+    /**
+     * Per-transaction sender address captured at STARTED time.
+     * Ensures terminal events (confirmed/failed) are attributed correctly
+     * even if the wallet disconnects before the transaction settles.
+     */
+    private transactionSenders;
+    /**
+     * Whether the cluster was explicitly set (via options or setCluster).
+     * When true, auto-detection from the store endpoint is disabled.
+     */
+    private explicitCluster;
+    constructor(formoAnalytics: FormoAnalytics, store: SolanaClientStore, options?: {
+        cluster?: SolanaCluster;
+    });
+    /**
+     * Update the cluster/network.
+     */
+    setCluster(cluster: SolanaCluster): void;
+    /**
+     * Get the current chain ID.
+     */
+    getChainId(): number;
+    /**
+     * Resolve the current chainId from the live store state.
+     * This ensures correctness when wallet and cluster change in the same tick
+     * (the cluster subscription may not have fired yet).
+     */
+    private resolveCurrentChainId;
+    private setupWalletSubscription;
+    private checkInitialWalletState;
+    private handleWalletChange;
+    private handleConnect;
+    private handleDisconnect;
+    private setupClusterSubscription;
+    private handleClusterChange;
+    private setupTransactionSubscription;
+    private handleTransactionChanges;
+    private handleTransactionStatusChange;
+    /**
+     * Attempt to detect the Solana cluster from the store's endpoint URL.
+     */
+    private detectClusterFromStore;
+    /**
+     * Detect cluster from an RPC endpoint URL.
+     */
+    private detectClusterFromEndpoint;
+    cleanup(): void;
+}
+//# sourceMappingURL=SolanaStoreHandler.d.ts.map