@formo/analytics 1.11.5-alpha.4 → 1.11.6

package/README.md

@@ -4,7 +4,7 @@
 
 ---
 
-Add the following to your `index.html`:
+Add the following to your page:
 
 ```html
 <script>
@@ -33,21 +33,96 @@ Add the following to your `index.html`:
 
 ---
 
-### 1. Install the npm package:
+### React Application
 
-Install @formo/analytics via yarn or npm:
+**1. Install the SDK**
+Install the Formo Analytics SDK using Yarn or NPM:
 
-```
+```jsx
 yarn add @formo/analytics
 ```
 
 or
 
+```jsx
+npm install @formo/analytics --save
+```
+
+**2. Set up FormoAnalyticsProvider in Your Application**
+
+Wrap your entire React application in the `FormoAnalyticsProvider` provided by the SDK.
+
+```jsx 
+//App.tsx (or App.js)
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import { FormoAnalyticsProvider } from '@formo/analytics';
+import App from './App';
+
+const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
+
+root.render(
+  <React.StrictMode>
+    <FormoAnalyticsProvider apiKey="YOUR_API_KEY" projectId="YOUR_PROJECT_ID">
+      <App />
+    </FormoAnalyticsProvider>
+  </React.StrictMode>
+);
 ```
+
+**3. Tracking Events and Page Views**
+
+You can use the `useFormoAnalytics` hook from the SDK to track user interactions and page views.
+
+Example: Tracking a Page View and Custom Event
+
+```jsx
+import React, { useEffect } from 'react';
+import { useFormoAnalytics } from '@formo/analytics';
+
+const HomePage = () => {
+  const analytics = useFormoAnalytics();
+
+  useEffect(() => {
+    // Track a custom event
+    analytics?.track('custom_event', { key: 'value' });
+  }, [analytics]);
+
+  return <div>Welcome to the Home Page!</div>;
+};
+
+export default HomePage;
+```
+
+**4. Folder Structure Example**
+
+```
+/src
+ ├── /components
+ │    └── HomePage.tsx
+ ├── /App.tsx
+ └── /index.tsx (or index.js)
+```
+
+---
+
+### Next.js Application
+
+**1. Install the npm package:**
+
+Install `@formo/analytics` via yarn or npm:
+
+```jsx
+yarn add @formo/analytics
+```
+
+or
+
+```jsx
 npm install @formo/analytics --save
 ```
 
-### 2. Set up the `FormoAnalyticsProvider` in your application:
+**2. Set up the `FormoAnalyticsProvider` in your application:**
 
 ```jsx
 // AnalyticsProvider.tsx
@@ -69,32 +144,6 @@ export const AnalyticsProvider: FC<FormoAnalyticsProviderProps> = ({
   projectId,
   children,
 }) => {
-  // Initialize the FormoAnalytics SDK inside useEffect
-  const [isInitialized, setIsInitialized] = useState(false);
-
-  useEffect(() => {
-    const initialize = async () => {
-      try {
-        await FormoAnalytics.init(apiKey, projectId);
-        console.log('FormoAnalytics SDK initialized');
-        setIsInitialized(true);
-      } catch (error) {
-        console.error('Failed to initialize FormoAnalytics SDK', error);
-      }
-    };
-
-    initialize();
-  }, [apiKey, projectId]);
-
-  // To prevent app crashes, render a loading state during initialization
-  if (!isInitialized) {
-    return (
-      <FormoAnalyticsProvider apiKey={apiKey} projectId={projectId}>
-        Loading Content
-      </FormoAnalyticsProvider>
-    );
-  }
-
   return (
     <FormoAnalyticsProvider apiKey={apiKey} projectId={projectId}>
       {children}
@@ -105,7 +154,7 @@ export const AnalyticsProvider: FC<FormoAnalyticsProviderProps> = ({
 export default AnalyticsProvider;
 ```
 
-### 3. Integrating the Provider in Your Root Layout
+**3. Integrating the Provider in Your Root Layout**
 
 Wrap your application with the newly created `AnalyticsProvider` in your main layout file:
 
@@ -129,7 +178,7 @@ export default function RootLayout({
 }
 ```
 
-### 4. Using the SDK
+**4. Using the SDK**
 
 Once the SDK is initialized, you can use its methods to track events and user interactions. Here’s how to do that:
 
@@ -144,7 +193,6 @@ const YourComponent = () => {
     const track = async () => {
       try {
         console.log('Tracking page hit...');
-        analytics.page(); // Track the page view
         analytics.track('custom_event', { key: 'value' }); // Track a custom event
       } catch (error) {
         console.error('Failed to track page hit', error);
@@ -158,10 +206,54 @@ const YourComponent = () => {
 };
 ```
 
-# Development notes
+# Development Notes
+
+If you want to contribute or run a local version of the Formo Analytics SDK, follow these steps:
+
+1. Build the SDK Locally
+
+Run the following command to build both CommonJS and ESM versions of the SDK:
+
+```jsx
+yarn build-cjs && yarn build-esm && yarn webpack --mode=production
+```
+
+or if you're using NPM:
+
+```jsx
+npm run build
+```
+
+2. Authenticate with NPM
+
+To publish a new version of the package, log in to your NPM account:
+
+```jsx
+npm login
+```
+
+or:
+
+```jsx
+npm adduser
+```
+
+3. Publish the Package
+
+Run the following command to publish the package to NPM:
+
+```jsx
+yarn publish
+```
+
+or:
+
+```jsx
+npm run publish
+```
 
-To run a local version of the script:
+# Troubleshooting
 
-1. Run `yarn build-cjs && yarn build-esm && yarn webpack --mode=production` or `npm run build` at the root level to build the script.
-2. To authorize device, login into npmjs using `npm login` or `npm adduser`
-3. Run `yarn publish` or `npm run publish` to publish new versions of the package.
+**API Key Not Provided:** Ensure you pass a valid apiKey when initializing the SDK.
+**SDK Not Initialized:** If you encounter issues with initialization, check the console logs for errors and ensure the project ID and API key are correct.
+**Network Errors:** Verify that the analytics service URL is accessible from your network.

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

@@ -1,17 +1,57 @@
+import { ChainID, EIP1193Provider } from './types';
 interface IFormoAnalytics {
+    /**
+     * Initializes the FormoAnalytics instance with the provided API key and project ID.
+     */
     init(apiKey: string, projectId: string): Promise<FormoAnalytics>;
-    identify(userData: any): void;
+    /**
+     * Identifies the user with the provided user data.
+     */
+    identify(userData: Record<string, any>): void;
+    /**
+     * Tracks page visit events.
+     */
     page(): void;
-    track(eventName: string, eventData: any): void;
+    /**
+     * Connects to a wallet with the specified chain ID and address.
+     */
+    connect(params: {
+        account: string;
+        chainId: ChainID;
+    }): Promise<void>;
+    /**
+     * Disconnects the current wallet and clears the session information.
+     */
+    disconnect(attributes?: {
+        account?: string;
+        chainId?: ChainID;
+    }): void;
+    /**
+     * Tracks a specific event with a name and associated data.
+     */
+    track(eventName: string, eventData: Record<string, any>): void;
+    /**
+     * Switches the blockchain chain context and optionally logs additional attributes.
+     */
+    chain(attributes: {
+        chainId: ChainID;
+        account?: string;
+    }): void;
 }
 export declare class FormoAnalytics implements IFormoAnalytics {
     readonly apiKey: string;
     projectId: string;
+    private _provider?;
+    private _registeredProviderListeners;
+    private sessionKey;
     private config;
     private sessionIdKey;
     private timezoneToCountry;
+    currentChainId?: string | null;
+    currentConnectedAccount?: string;
     private constructor();
     static init(apiKey: string, projectId: string): Promise<FormoAnalytics>;
+    get provider(): EIP1193Provider | undefined;
     private identifyUser;
     private getSessionId;
     private setSessionCookie;
@@ -20,7 +60,37 @@ export declare class FormoAnalytics implements IFormoAnalytics {
     private trackEvent;
     private maskSensitiveData;
     private trackPageHit;
+    private trackProvider;
+    private registerChainChangedListener;
+    private handleAccountDisconnected;
+    private onChainChanged;
+    private onAccountsChanged;
+    private registerAccountsChangedListener;
+    private getCurrentChainId;
+    private handleAccountConnected;
+    private getCurrentWallet;
+    /**
+     * Stores the wallet address in session storage when connected.
+     * @param address - The wallet address to store.
+     */
+    private storeWalletAddress;
+    /**
+     * Clears the wallet address from session storage when disconnected.
+     */
+    private clearWalletAddress;
     private buildApiUrl;
+    connect({ account, chainId }: {
+        account: string;
+        chainId: ChainID;
+    }): Promise<void>;
+    disconnect(attributes?: {
+        account?: string;
+        chainId?: ChainID;
+    }): Promise<void> | undefined;
+    chain({ chainId, account }: {
+        chainId: ChainID;
+        account?: string;
+    }): Promise<void>;
     init(apiKey: string, projectId: string): Promise<FormoAnalytics>;
     identify(userData: any): void;
     page(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"FormoAnalytics.d.ts","sourceRoot":"","sources":["../../../src/FormoAnalytics.ts"],"names":[],"mappings":"AAKA,UAAU,eAAe;IACvB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACjE,QAAQ,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI,CAAC;IAC9B,IAAI,IAAI,IAAI,CAAC;IACb,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAAC;CAChD;AACD,qBAAa,cAAe,YAAW,eAAe;aAMlC,MAAM,EAAE,MAAM;IACvB,SAAS,EAAE,MAAM;IAN1B,OAAO,CAAC,MAAM,CAAM;IACpB,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,iBAAiB,CAAwC;IAEjE,OAAO;WASM,IAAI,CACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,CAAC;IAU1B,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,gBAAgB;IAUxB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,cAAc;YAUR,UAAU;IAyDxB,OAAO,CAAC,iBAAiB;IAkEzB,OAAO,CAAC,YAAY;IAoCpB,OAAO,CAAC,WAAW;IAiBnB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAMhE,QAAQ,CAAC,QAAQ,EAAE,GAAG;IAItB,IAAI;IAIJ,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG;CAGxC"}
+{"version":3,"file":"FormoAnalytics.d.ts","sourceRoot":"","sources":["../../../src/FormoAnalytics.ts"],"names":[],"mappings":"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"}

package/dist/cjs/src/FormoAnalytics.js

@@ -57,13 +57,20 @@ var utils_1 = require("./utils");
 var highlight_run_1 = require("highlight.run");
 var FormoAnalytics = /** @class */ (function () {
     function FormoAnalytics(apiKey, projectId) {
+        var _a;
         this.apiKey = apiKey;
         this.projectId = projectId;
+        this._registeredProviderListeners = {};
+        this.sessionKey = 'walletAddress';
         this.sessionIdKey = constants_1.SESSION_STORAGE_ID_KEY;
         this.timezoneToCountry = constants_1.COUNTRY_LIST;
         this.config = {
             token: this.apiKey,
         };
+        var provider = (window === null || window === void 0 ? void 0 : window.ethereum) || ((_a = window.web3) === null || _a === void 0 ? void 0 : _a.currentProvider);
+        if (provider) {
+            this.trackProvider(provider);
+        }
     }
     FormoAnalytics.init = function (apiKey, projectId) {
         return __awaiter(this, void 0, void 0, function () {
@@ -78,8 +85,15 @@ var FormoAnalytics = /** @class */ (function () {
             });
         });
     };
+    Object.defineProperty(FormoAnalytics.prototype, "provider", {
+        get: function () {
+            return this._provider;
+        },
+        enumerable: false,
+        configurable: true
+    });
     FormoAnalytics.prototype.identifyUser = function (userData) {
-        this.trackEvent('identify', userData);
+        this.trackEvent(constants_1.Event.IDENTIFY, userData);
     };
     FormoAnalytics.prototype.getSessionId = function () {
         var existingSessionId = this.getCookieValue(this.sessionIdKey);
@@ -114,7 +128,7 @@ var FormoAnalytics = /** @class */ (function () {
     // Function to send tracking data
     FormoAnalytics.prototype.trackEvent = function (action, payload) {
         return __awaiter(this, void 0, void 0, function () {
-            var maxRetries, attempt, apiUrl, requestData, sendRequest;
+            var maxRetries, attempt, apiUrl, address, requestData, sendRequest;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -123,9 +137,12 @@ var FormoAnalytics = /** @class */ (function () {
                         attempt = 0;
                         this.setSessionCookie(this.config.domain);
                         apiUrl = this.buildApiUrl();
+                        return [4 /*yield*/, this.getCurrentWallet()];
+                    case 1:
+                        address = _a.sent();
                         requestData = {
                             project_id: this.projectId,
-                            address: '', // TODO: get cached / session wallet address
+                            address: address,
                             session_id: this.getSessionId(),
                             timestamp: new Date().toISOString(),
                             action: action,
@@ -170,7 +187,7 @@ var FormoAnalytics = /** @class */ (function () {
                             });
                         }); };
                         return [4 /*yield*/, sendRequest()];
-                    case 1:
+                    case 2:
                         _a.sent();
                         return [2 /*return*/];
                 }
@@ -254,7 +271,7 @@ var FormoAnalytics = /** @class */ (function () {
         setTimeout(function () {
             var url = new URL(window.location.href);
             var params = new URLSearchParams(url.search);
-            _this.trackEvent('page_hit', {
+            _this.trackEvent(constants_1.Event.PAGE, {
                 'user-agent': window.navigator.userAgent,
                 locale: language,
                 location: location,
@@ -268,6 +285,221 @@ var FormoAnalytics = /** @class */ (function () {
             });
         }, 300);
     };
+    FormoAnalytics.prototype.trackProvider = function (provider) {
+        if (provider === this._provider) {
+            return;
+        }
+        this.currentChainId = undefined;
+        this.currentConnectedAccount = undefined;
+        if (this._provider) {
+            var eventNames = Object.keys(this._registeredProviderListeners);
+            for (var _i = 0, eventNames_1 = eventNames; _i < eventNames_1.length; _i++) {
+                var eventName = eventNames_1[_i];
+                this._provider.removeListener(eventName, this._registeredProviderListeners[eventName]);
+                delete this._registeredProviderListeners[eventName];
+            }
+        }
+        this._provider = provider;
+        this.getCurrentWallet();
+        this.registerAccountsChangedListener();
+        this.registerChainChangedListener();
+    };
+    FormoAnalytics.prototype.registerChainChangedListener = function () {
+        var _this = this;
+        var _a;
+        var listener = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return _this.onChainChanged(args[0]);
+        };
+        (_a = this.provider) === null || _a === void 0 ? void 0 : _a.on('chainChanged', listener);
+        this._registeredProviderListeners['chainChanged'] = listener;
+    };
+    FormoAnalytics.prototype.handleAccountDisconnected = function () {
+        if (!this.currentConnectedAccount) {
+            return;
+        }
+        var disconnectAttributes = {
+            address: this.currentConnectedAccount,
+            chainId: this.currentChainId,
+        };
+        this.currentChainId = undefined;
+        this.currentConnectedAccount = undefined;
+        this.clearWalletAddress();
+        return this.trackEvent(constants_1.Event.DISCONNECT, disconnectAttributes);
+    };
+    FormoAnalytics.prototype.onChainChanged = function (chainIdHex) {
+        return __awaiter(this, void 0, void 0, function () {
+            var res, err_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.currentChainId = parseInt(chainIdHex).toString();
+                        if (!!this.currentConnectedAccount) return [3 /*break*/, 4];
+                        if (!this.provider) {
+                            console.error('error', 'FormoAnalytics::onChainChanged: provider not found. CHAIN_CHANGED not reported');
+                            return [2 /*return*/];
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.provider.request({
+                                method: 'eth_accounts',
+                            })];
+                    case 2:
+                        res = _a.sent();
+                        if (!res || res.length === 0) {
+                            console.error('error', 'FormoAnalytics::onChainChanged: unable to get account. eth_accounts returned empty');
+                            return [2 /*return*/];
+                        }
+                        this.currentConnectedAccount = res[0];
+                        return [3 /*break*/, 4];
+                    case 3:
+                        err_1 = _a.sent();
+                        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                        if (err_1.code !== 4001) {
+                            // 4001: The request is rejected by the user , see https://docs.metamask.io/wallet/reference/provider-api/#errors
+                            console.error('error', "FormoAnalytics::onChainChanged: unable to get account. eth_accounts threw an error", err_1);
+                            return [2 /*return*/];
+                        }
+                        return [3 /*break*/, 4];
+                    case 4: return [2 /*return*/, this.chain({
+                            chainId: this.currentChainId,
+                            account: this.currentConnectedAccount,
+                        })];
+                }
+            });
+        });
+    };
+    FormoAnalytics.prototype.onAccountsChanged = function (accounts) {
+        return __awaiter(this, void 0, void 0, function () {
+            var newAccount;
+            return __generator(this, function (_a) {
+                if (accounts.length > 0) {
+                    newAccount = accounts[0];
+                    if (newAccount !== this.currentConnectedAccount) {
+                        this.handleAccountConnected(newAccount);
+                    }
+                }
+                else {
+                    this.handleAccountDisconnected();
+                }
+                return [2 /*return*/];
+            });
+        });
+    };
+    FormoAnalytics.prototype.registerAccountsChangedListener = function () {
+        var _this = this;
+        var _a, _b;
+        var listener = function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return _this.onAccountsChanged(args[0]);
+        };
+        (_a = this._provider) === null || _a === void 0 ? void 0 : _a.on('accountsChanged', listener);
+        this._registeredProviderListeners['accountsChanged'] = listener;
+        var handleAccountDisconnected = this.handleAccountDisconnected.bind(this);
+        (_b = this._provider) === null || _b === void 0 ? void 0 : _b.on('disconnect', handleAccountDisconnected);
+        this._registeredProviderListeners['disconnect'] = handleAccountDisconnected;
+    };
+    FormoAnalytics.prototype.getCurrentChainId = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var chainIdHex;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (!this.provider) {
+                            console.error('FormoAnalytics::getCurrentChainId: provider not set');
+                        }
+                        return [4 /*yield*/, ((_a = this.provider) === null || _a === void 0 ? void 0 : _a.request({
+                                method: 'eth_chainId',
+                            }))];
+                    case 1:
+                        chainIdHex = _b.sent();
+                        // Because we're connected, the chainId cannot be null
+                        if (!chainIdHex) {
+                            console.error("FormoAnalytics::getCurrentChainId: chainIdHex is: ".concat(chainIdHex));
+                        }
+                        return [2 /*return*/, parseInt(chainIdHex, 16).toString()];
+                }
+            });
+        });
+    };
+    FormoAnalytics.prototype.handleAccountConnected = function (account) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (account === this.currentConnectedAccount) {
+                            // We have already reported this account
+                            return [2 /*return*/];
+                        }
+                        else {
+                            this.currentConnectedAccount = account;
+                        }
+                        _a = this;
+                        return [4 /*yield*/, this.getCurrentChainId()];
+                    case 1:
+                        _a.currentChainId = _b.sent();
+                        this.connect({ account: account, chainId: this.currentChainId });
+                        this.storeWalletAddress(account);
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    FormoAnalytics.prototype.getCurrentWallet = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var sessionData, parsedData, sessionExpiry, currentTime;
+            return __generator(this, function (_a) {
+                if (!this.provider) {
+                    console.warn('FormoAnalytics::getCurrentWallet: the provider is not set');
+                    return [2 /*return*/];
+                }
+                sessionData = sessionStorage.getItem(this.sessionKey);
+                if (!sessionData) {
+                    return [2 /*return*/, null];
+                }
+                parsedData = JSON.parse(sessionData);
+                sessionExpiry = 30 * 60 * 1000;
+                currentTime = Date.now();
+                if (currentTime - parsedData.timestamp > sessionExpiry) {
+                    console.warn('Session expired. Ignoring wallet address.');
+                    sessionStorage.removeItem(this.sessionKey); // Clear expired session data
+                    return [2 /*return*/, ''];
+                }
+                this.handleAccountConnected(parsedData.address);
+                return [2 /*return*/, parsedData.address || ''];
+            });
+        });
+    };
+    /**
+     * Stores the wallet address in session storage when connected.
+     * @param address - The wallet address to store.
+     */
+    FormoAnalytics.prototype.storeWalletAddress = function (address) {
+        if (!address) {
+            console.error('No wallet address provided to store.');
+            return;
+        }
+        var sessionData = {
+            address: address,
+            timestamp: Date.now(),
+        };
+        sessionStorage.setItem(this.sessionKey, JSON.stringify(sessionData));
+    };
+    /**
+     * Clears the wallet address from session storage when disconnected.
+     */
+    FormoAnalytics.prototype.clearWalletAddress = function () {
+        sessionStorage.removeItem(this.sessionKey);
+    };
     // Function to build the API URL
     FormoAnalytics.prototype.buildApiUrl = function () {
         var _a = this.config, host = _a.host, proxy = _a.proxy, token = _a.token, _b = _a.dataSource, dataSource = _b === void 0 ? 'analytics_events' : _b;
@@ -282,6 +514,51 @@ var FormoAnalytics = /** @class */ (function () {
         }
         return 'Error: No token provided';
     };
+    FormoAnalytics.prototype.connect = function (_a) {
+        var account = _a.account, chainId = _a.chainId;
+        if (!chainId) {
+            throw new Error('FormoAnalytics::connect: chainId cannot be empty');
+        }
+        if (!account) {
+            throw new Error('FormoAnalytics::connect: account cannot be empty');
+        }
+        this.currentChainId = chainId.toString();
+        this.currentConnectedAccount = account;
+        return this.trackEvent(constants_1.Event.CONNECT, {
+            chainId: chainId,
+            address: account,
+        });
+    };
+    FormoAnalytics.prototype.disconnect = function (attributes) {
+        var account = (attributes === null || attributes === void 0 ? void 0 : attributes.account) || this.currentConnectedAccount;
+        if (!account) {
+            // We have most likely already reported this disconnection with the automatic
+            // `disconnect` detection
+            return;
+        }
+        var chainId = (attributes === null || attributes === void 0 ? void 0 : attributes.chainId) || this.currentChainId;
+        var eventAttributes = __assign({ account: account }, (chainId && { chainId: chainId }));
+        this.currentChainId = undefined;
+        this.currentConnectedAccount = undefined;
+        return this.trackEvent(constants_1.Event.DISCONNECT, eventAttributes);
+    };
+    FormoAnalytics.prototype.chain = function (_a) {
+        var chainId = _a.chainId, account = _a.account;
+        if (!chainId || Number(chainId) === 0) {
+            throw new Error('FormoAnalytics::chain: chainId cannot be empty or 0');
+        }
+        if (!account && !this.currentConnectedAccount) {
+            throw new Error('FormoAnalytics::chain: account was empty and no previous account has been recorded. You can either pass an account or call connect() first');
+        }
+        if (isNaN(Number(chainId))) {
+            throw new Error('FormoAnalytics::chain: chainId must be a valid hex or decimal number');
+        }
+        this.currentChainId = chainId.toString();
+        return this.trackEvent(constants_1.Event.CHAIN_CHANGED, {
+            chainId: chainId,
+            account: account || this.currentConnectedAccount,
+        });
+    };
     FormoAnalytics.prototype.init = function (apiKey, projectId) {
         var instance = new FormoAnalytics(apiKey, projectId);
         return Promise.resolve(instance);