@formo/analytics 1.27.0 → 1.28.1

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

@@ -4,6 +4,14 @@ declare class EventFactory implements IEventFactory {
     private options?;
     private compiledPathPattern?;
     constructor(options?: Options);
+    /**
+     * Validate an address for both EVM and Solana chains.
+     * Uses chainId for strict validation when available.
+     * @param address The address to validate
+     * @param chainId Optional chain ID for strict chain-specific validation
+     * @returns The validated address or null if invalid
+     */
+    private validateEventAddress;
     private getTimezone;
     private getLocation;
     private getLanguage;
@@ -22,12 +30,12 @@ declare class EventFactory implements IEventFactory {
     private getEnrichedEvent;
     generatePageEvent(category?: string, name?: string, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     generateDetectWalletEvent(providerName: string, rdns: string, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
-    generateIdentifyEvent(providerName: string, rdns: string, address: Nullable<Address>, userId?: Nullable<string>, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
+    generateIdentifyEvent(providerName?: string, rdns?: string, address?: Nullable<Address>, userId?: Nullable<string>, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     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>;
-    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>;
+    generateTransactionEvent(status: TransactionStatus, chainId: ChainID, address: Address, data?: string, to?: string, value?: string, transactionHash?: string, function_name?: string, function_args?: Record<string, unknown>, builder_codes?: string, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     generateTrackEvent(event: string, properties?: IFormoEventProperties, context?: IFormoEventContext): Promise<IFormoEvent>;
     create(event: APIEvent, address?: Address, userId?: string): Promise<IFormoEvent>;
 }

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

@@ -46,8 +46,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 import { COUNTRY_LIST, LOCAL_ANONYMOUS_ID_KEY, SESSION_TRAFFIC_SOURCE_KEY, } from "../constants";
-import { toChecksumAddress, toSnakeCase } from "../utils";
-import { getValidAddress } from "../utils/address";
+import { toSnakeCase } from "../utils";
+import { validateAddress } from "../utils/address";
 import { getCurrentTimeFormatted } from "../utils/timestamp";
 import { isUndefined } from "../validators";
 import { logger } from "../logger";
@@ -192,6 +192,19 @@ var EventFactory = /** @class */ (function () {
             }
         }
     }
+    /**
+     * Validate an address for both EVM and Solana chains.
+     * Uses chainId for strict validation when available.
+     * @param address The address to validate
+     * @param chainId Optional chain ID for strict chain-specific validation
+     * @returns The validated address or null if invalid
+     */
+    EventFactory.prototype.validateEventAddress = function (address, chainId) {
+        if (!address) {
+            return null;
+        }
+        return validateAddress(address, chainId) || null;
+    };
     EventFactory.prototype.getTimezone = function () {
         try {
             return Intl.DateTimeFormat().resolvedOptions().timeZone;
@@ -274,15 +287,16 @@ var EventFactory = /** @class */ (function () {
     };
     EventFactory.prototype.getEnrichedEvent = function (formoEvent, context) {
         return __awaiter(this, void 0, void 0, function () {
-            var commonEventData, validAddress, processedEvent;
+            var commonEventData, eventChainId, validAddress, processedEvent;
             var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         _a = {};
                         return [4 /*yield*/, this.generateContext(context)];
                     case 1:
-                        commonEventData = (_a.context = _b.sent(),
+                        commonEventData = (_a.context = _c.sent(),
                             _a.original_timestamp = getCurrentTimeFormatted(),
                             _a.user_id = formoEvent.user_id,
                             _a.type = formoEvent.type,
@@ -290,13 +304,9 @@ var EventFactory = /** @class */ (function () {
                             _a.version = VERSION,
                             _a);
                         commonEventData.anonymous_id = generateAnonymousId(LOCAL_ANONYMOUS_ID_KEY);
-                        validAddress = getValidAddress(formoEvent.address);
-                        if (validAddress) {
-                            commonEventData.address = toChecksumAddress(validAddress);
-                        }
-                        else {
-                            commonEventData.address = null;
-                        }
+                        eventChainId = (_b = formoEvent.properties) === null || _b === void 0 ? void 0 : _b.chainId;
+                        validAddress = this.validateEventAddress(formoEvent.address, eventChainId);
+                        commonEventData.address = validAddress;
                         processedEvent = mergeDeepRight(formoEvent, commonEventData);
                         if (processedEvent.event === undefined) {
                             processedEvent.event = null;
@@ -342,7 +352,7 @@ var EventFactory = /** @class */ (function () {
             var identifyEvent;
             return __generator(this, function (_a) {
                 identifyEvent = {
-                    properties: __assign({ providerName: providerName, rdns: rdns }, properties),
+                    properties: __assign(__assign(__assign({}, (providerName !== undefined && { providerName: providerName })), (rdns !== undefined && { rdns: rdns })), properties),
                     user_id: userId,
                     address: address,
                     type: "identify",
@@ -403,12 +413,12 @@ var EventFactory = /** @class */ (function () {
             });
         });
     };
-    EventFactory.prototype.generateTransactionEvent = function (status, chainId, address, data, to, value, transactionHash, function_name, function_args, properties, context) {
+    EventFactory.prototype.generateTransactionEvent = function (status, chainId, address, data, to, value, transactionHash, function_name, function_args, builder_codes, properties, context) {
         return __awaiter(this, void 0, void 0, function () {
             var transactionEvent;
             return __generator(this, function (_a) {
                 transactionEvent = {
-                    properties: __assign(__assign(__assign(__assign(__assign(__assign(__assign({ status: status, chainId: chainId }, (data && { data: data })), (to && { to: to })), (value && { value: value })), (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), properties),
+                    properties: __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ status: status, chainId: chainId }, (data && { data: data })), (to && { to: to })), (value && { value: value })), (transactionHash && { transactionHash: transactionHash })), (function_name && { function_name: function_name })), (function_args && { function_args: function_args })), (builder_codes && { builder_codes: builder_codes })), properties),
                     address: address,
                     type: "transaction",
                 };
@@ -441,7 +451,7 @@ var EventFactory = /** @class */ (function () {
     // Returns an event with type, context, properties, and common properties
     EventFactory.prototype.create = function (event, address, userId) {
         return __awaiter(this, void 0, void 0, function () {
-            var formoEvent, _a, validAddress;
+            var formoEvent, _a, chainId;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -487,7 +497,7 @@ var EventFactory = /** @class */ (function () {
                     case 14:
                         formoEvent = _b.sent();
                         return [3 /*break*/, 19];
-                    case 15: return [4 /*yield*/, this.generateTransactionEvent(event.status, event.chainId, event.address, event.data, event.to, event.value, event.transactionHash, event.function_name, event.function_args, event.properties, event.context)];
+                    case 15: return [4 /*yield*/, this.generateTransactionEvent(event.status, event.chainId, event.address, event.data, event.to, event.value, event.transactionHash, event.function_name, event.function_args, event.builder_codes, event.properties, event.context)];
                     case 16:
                         formoEvent = _b.sent();
                         return [3 /*break*/, 19];
@@ -497,11 +507,12 @@ var EventFactory = /** @class */ (function () {
                         return [3 /*break*/, 19];
                     case 19:
                         // Set address if not already set by the specific event generator
-                        if (formoEvent.address === undefined || formoEvent.address === null) {
-                            validAddress = getValidAddress(address);
-                            formoEvent.address = validAddress
-                                ? toChecksumAddress(validAddress)
-                                : null;
+                        // Uses chainId for strict chain-specific validation
+                        // Skip backfill for identify events to prevent stale address being used
+                        if ((formoEvent.address === undefined || formoEvent.address === null) &&
+                            event.type !== "identify") {
+                            chainId = 'chainId' in event ? event.chainId : undefined;
+                            formoEvent.address = this.validateEventAddress(address, chainId);
                         }
                         formoEvent.user_id = userId || null;
                         return [2 /*return*/, formoEvent];

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

@@ -1,4 +1,8 @@
 export * from "./FormoAnalyticsProvider";
 export * from "./FormoAnalytics";
 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";
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/src/index.js

@@ -2,6 +2,9 @@ import { formofy } from "./initialization";
 export * from "./FormoAnalyticsProvider";
 export * from "./FormoAnalytics";
 export * from "./types";
+export { parsePrivyProperties } from "./privy";
+// Solana integration exports
+export { SolanaManager } from "./solana";
 if (typeof window !== "undefined")
     window.formofy = formofy;
 //# sourceMappingURL=index.js.map

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

@@ -0,0 +1,9 @@
+/**
+ * Privy integration module
+ *
+ * Provides utilities for enriching wallet profiles with Privy user data.
+ * This module exports the property extraction utility and related types.
+ */
+export { parsePrivyProperties } from "./utils";
+export type { PrivyUser, PrivyLinkedAccount, PrivyAccountType, PrivyProfileProperties, PrivyWalletInfo, } from "./types";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1,8 @@
+/**
+ * Privy integration module
+ *
+ * Provides utilities for enriching wallet profiles with Privy user data.
+ * This module exports the property extraction utility and related types.
+ */
+export { parsePrivyProperties } from "./utils";
+//# sourceMappingURL=index.js.map

package/dist/esm/src/privy/types.d.ts

@@ -0,0 +1,176 @@
+/**
+ * Privy-specific type definitions for user profile enrichment
+ *
+ * These types provide TypeScript interfaces for Privy user objects
+ * from the Privy React SDK (`usePrivy()` hook).
+ *
+ * Based on the Privy user object structure:
+ * https://docs.privy.io/user-management/users/the-user-object
+ */
+/**
+ * Valid Privy linked account type strings.
+ */
+export type PrivyAccountType = "email" | "phone" | "wallet" | "smart_wallet" | "farcaster" | "telegram" | "apple_oauth" | "discord_oauth" | "github_oauth" | "google_oauth" | "instagram_oauth" | "linkedin_oauth" | "spotify_oauth" | "tiktok_oauth" | "twitter_oauth" | "twitch_oauth" | "line_oauth" | "custom_auth" | "passkey" | "cross_app" | "guest" | string;
+/**
+ * A linked account entry from the Privy user object.
+ * Each linked account has a `type` discriminator and type-specific fields.
+ */
+export interface PrivyLinkedAccount {
+    type: PrivyAccountType;
+    address?: string | null;
+    number?: string | null;
+    username?: string | null;
+    name?: string | null;
+    displayName?: string | null;
+    subject?: string | null;
+    email?: string | null;
+    chainType?: string | null;
+    walletClient?: string | null;
+    walletClientType?: string | null;
+    connectorType?: string | null;
+    delegated?: boolean;
+    fid?: number | null;
+    ownerAddress?: string | null;
+    bio?: string | null;
+    pfp?: string | null;
+    url?: string | null;
+    signerPublicKey?: string | null;
+    telegramUserId?: string | null;
+    firstName?: string | null;
+    lastName?: string | null;
+    firstVerifiedAt?: Date | null;
+    latestVerifiedAt?: Date | null;
+}
+/**
+ * Privy user object as returned by the Privy React SDK.
+ *
+ * Convenience accessors: user.email, user.phone, user.wallet, user.discord,
+ * user.twitter, user.farcaster, user.github, user.google, user.linkedin,
+ * user.apple, user.instagram, user.spotify, user.tiktok, user.telegram, user.line
+ */
+export interface PrivyUser {
+    /** Privy user ID in DID format (e.g., "did:privy:cm3np...") */
+    id: string;
+    /** Account creation timestamp */
+    createdAt?: Date;
+    /** All linked accounts */
+    linkedAccounts?: PrivyLinkedAccount[];
+    /** Optional custom metadata */
+    customMetadata?: Record<string, unknown>;
+    email?: {
+        address: string;
+    };
+    phone?: {
+        number: string;
+    };
+    wallet?: {
+        address: string;
+        chainType?: string;
+        walletClient?: string;
+        walletClientType?: string;
+        connectorType?: string;
+    };
+    google?: {
+        subject: string;
+        email: string;
+        name: string | null;
+    };
+    discord?: {
+        subject: string;
+        username: string | null;
+        email: string | null;
+    };
+    twitter?: {
+        subject: string;
+        username: string | null;
+        name: string | null;
+        profilePictureUrl: string | null;
+    };
+    farcaster?: {
+        fid: number | null;
+        ownerAddress: string;
+        username: string | null;
+        displayName: string | null;
+        bio: string | null;
+        pfp: string | null;
+    };
+    github?: {
+        subject: string;
+        username: string | null;
+        name: string | null;
+    };
+    linkedin?: {
+        subject: string;
+        name: string | null;
+        email: string | null;
+        vanityName: string | null;
+    };
+    apple?: {
+        subject: string;
+        email: string;
+    };
+    instagram?: {
+        subject: string;
+        username: string | null;
+    };
+    spotify?: {
+        subject: string;
+        email: string | null;
+        name: string | null;
+    };
+    tiktok?: {
+        subject: string;
+        username: string | null;
+        name: string | null;
+    };
+    line?: {
+        subject: string;
+        name: string | null;
+        email: string | null;
+    };
+    telegram?: {
+        telegramUserId: string;
+        firstName: string | null;
+        lastName: string | null;
+        username: string | null;
+        photoUrl: string | null;
+    };
+    /** MFA methods */
+    mfaMethods?: Array<string>;
+    /** Whether the user has accepted terms */
+    hasAcceptedTerms?: boolean;
+    /** Whether this is a guest user */
+    isGuest?: boolean;
+}
+/**
+ * Extracted profile properties from a Privy user.
+ * These are the properties that get sent as event properties via `identify()`.
+ */
+export interface PrivyProfileProperties {
+    privyDid: string;
+    privyCreatedAt?: number;
+    email?: string;
+    apple?: string;
+    discord?: string;
+    twitter?: string;
+    farcaster?: string;
+    github?: string;
+    google?: string;
+    linkedin?: string;
+    line?: string;
+    spotify?: string;
+    telegram?: string;
+    tiktok?: string;
+    instagram?: string;
+    [key: string]: unknown;
+}
+/**
+ * Wallet info extracted from Privy linked accounts.
+ */
+export interface PrivyWalletInfo {
+    address: string;
+    walletClient?: string;
+    chainType?: string;
+    isEmbedded: boolean;
+}
+//# sourceMappingURL=types.d.ts.map

package/dist/esm/src/privy/types.js

@@ -0,0 +1,11 @@
+/**
+ * Privy-specific type definitions for user profile enrichment
+ *
+ * These types provide TypeScript interfaces for Privy user objects
+ * from the Privy React SDK (`usePrivy()` hook).
+ *
+ * Based on the Privy user object structure:
+ * https://docs.privy.io/user-management/users/the-user-object
+ */
+export {};
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1,32 @@
+/**
+ * Utility functions for extracting profile properties from Privy user objects.
+ */
+import { PrivyProfileProperties, PrivyUser, PrivyWalletInfo } from "./types";
+/**
+ * Extract profile properties and wallet addresses from a Privy user object.
+ *
+ * Parses the Privy user's linked accounts into a flat properties object
+ * (email, social accounts, etc.) and extracts all linked wallet addresses.
+ *
+ * @param user - The Privy user object from `usePrivy()`
+ * @returns An object with `properties` and `wallets`
+ *
+ * @example
+ * ```ts
+ * import { parsePrivyProperties } from '@formo/analytics';
+ *
+ * const { user } = usePrivy();
+ * if (user) {
+ *   const { properties, wallets } = parsePrivyProperties(user);
+ *
+ *   for (const wallet of wallets) {
+ *     formo.identify({ address: wallet.address, userId: user.id }, properties);
+ *   }
+ * }
+ * ```
+ */
+export declare function parsePrivyProperties(user: PrivyUser): {
+    properties: PrivyProfileProperties;
+    wallets: PrivyWalletInfo[];
+};
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1,188 @@
+/**
+ * Utility functions for extracting profile properties from Privy user objects.
+ */
+/**
+ * Extract profile properties and wallet addresses from a Privy user object.
+ *
+ * Parses the Privy user's linked accounts into a flat properties object
+ * (email, social accounts, etc.) and extracts all linked wallet addresses.
+ *
+ * @param user - The Privy user object from `usePrivy()`
+ * @returns An object with `properties` and `wallets`
+ *
+ * @example
+ * ```ts
+ * import { parsePrivyProperties } from '@formo/analytics';
+ *
+ * const { user } = usePrivy();
+ * if (user) {
+ *   const { properties, wallets } = parsePrivyProperties(user);
+ *
+ *   for (const wallet of wallets) {
+ *     formo.identify({ address: wallet.address, userId: user.id }, properties);
+ *   }
+ * }
+ * ```
+ */
+export function parsePrivyProperties(user) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+    var accounts = user.linkedAccounts || [];
+    // Extract profile properties
+    var properties = {
+        privyDid: user.id,
+        privyCreatedAt: (_a = user.createdAt) === null || _a === void 0 ? void 0 : _a.getTime(),
+    };
+    // Email
+    if ((_b = user.email) === null || _b === void 0 ? void 0 : _b.address) {
+        properties.email = user.email.address;
+    }
+    // Social accounts - extract usernames/identifiers
+    if ((_c = user.apple) === null || _c === void 0 ? void 0 : _c.email) {
+        properties.apple = user.apple.email;
+    }
+    if ((_d = user.discord) === null || _d === void 0 ? void 0 : _d.username) {
+        properties.discord = user.discord.username;
+    }
+    if ((_e = user.farcaster) === null || _e === void 0 ? void 0 : _e.username) {
+        properties.farcaster = user.farcaster.username;
+    }
+    if ((_f = user.github) === null || _f === void 0 ? void 0 : _f.username) {
+        properties.github = user.github.username;
+    }
+    if ((_g = user.google) === null || _g === void 0 ? void 0 : _g.email) {
+        properties.google = user.google.email;
+    }
+    if ((_h = user.instagram) === null || _h === void 0 ? void 0 : _h.username) {
+        properties.instagram = user.instagram.username;
+    }
+    if ((_j = user.line) === null || _j === void 0 ? void 0 : _j.email) {
+        properties.line = user.line.email;
+    }
+    if ((_k = user.linkedin) === null || _k === void 0 ? void 0 : _k.email) {
+        properties.linkedin = user.linkedin.email;
+    }
+    if ((_l = user.spotify) === null || _l === void 0 ? void 0 : _l.email) {
+        properties.spotify = user.spotify.email;
+    }
+    if ((_m = user.telegram) === null || _m === void 0 ? void 0 : _m.username) {
+        properties.telegram = user.telegram.username;
+    }
+    if ((_o = user.tiktok) === null || _o === void 0 ? void 0 : _o.username) {
+        properties.tiktok = user.tiktok.username;
+    }
+    if ((_p = user.twitter) === null || _p === void 0 ? void 0 : _p.username) {
+        properties.twitter = user.twitter.username;
+    }
+    // Fallback to linkedAccounts if convenience accessors are not populated
+    if (!properties.email) {
+        var emailAccount = accounts.find(function (account) { return account.type === "email"; });
+        if (emailAccount === null || emailAccount === void 0 ? void 0 : emailAccount.address) {
+            properties.email = emailAccount.address;
+        }
+    }
+    if (!properties.apple) {
+        var appleAccount = accounts.find(function (a) { return a.type === "apple_oauth"; });
+        if (appleAccount === null || appleAccount === void 0 ? void 0 : appleAccount.email) {
+            properties.apple = appleAccount.email;
+        }
+    }
+    if (!properties.discord) {
+        var discordAccount = accounts.find(function (a) { return a.type === "discord_oauth"; });
+        if (discordAccount === null || discordAccount === void 0 ? void 0 : discordAccount.username) {
+            properties.discord = discordAccount.username;
+        }
+    }
+    if (!properties.farcaster) {
+        var farcasterAccount = accounts.find(function (a) { return a.type === "farcaster"; });
+        if (farcasterAccount === null || farcasterAccount === void 0 ? void 0 : farcasterAccount.username) {
+            properties.farcaster = farcasterAccount.username;
+        }
+        else if (farcasterAccount === null || farcasterAccount === void 0 ? void 0 : farcasterAccount.displayName) {
+            properties.farcaster = farcasterAccount.displayName;
+        }
+    }
+    if (!properties.github) {
+        var githubAccount = accounts.find(function (a) { return a.type === "github_oauth"; });
+        if (githubAccount === null || githubAccount === void 0 ? void 0 : githubAccount.username) {
+            properties.github = githubAccount.username;
+        }
+    }
+    if (!properties.google) {
+        var googleAccount = accounts.find(function (a) { return a.type === "google_oauth"; });
+        if (googleAccount === null || googleAccount === void 0 ? void 0 : googleAccount.email) {
+            properties.google = googleAccount.email;
+        }
+    }
+    if (!properties.instagram) {
+        var instagramAccount = accounts.find(function (a) { return a.type === "instagram_oauth"; });
+        if (instagramAccount === null || instagramAccount === void 0 ? void 0 : instagramAccount.username) {
+            properties.instagram = instagramAccount.username;
+        }
+    }
+    if (!properties.line) {
+        var lineAccount = accounts.find(function (a) { return a.type === "line_oauth"; });
+        if (lineAccount === null || lineAccount === void 0 ? void 0 : lineAccount.email) {
+            properties.line = lineAccount.email;
+        }
+    }
+    if (!properties.linkedin) {
+        var linkedinAccount = accounts.find(function (a) { return a.type === "linkedin_oauth"; });
+        if (linkedinAccount === null || linkedinAccount === void 0 ? void 0 : linkedinAccount.email) {
+            properties.linkedin = linkedinAccount.email;
+        }
+    }
+    if (!properties.spotify) {
+        var spotifyAccount = accounts.find(function (a) { return a.type === "spotify_oauth"; });
+        if (spotifyAccount === null || spotifyAccount === void 0 ? void 0 : spotifyAccount.email) {
+            properties.spotify = spotifyAccount.email;
+        }
+    }
+    if (!properties.telegram) {
+        var telegramAccount = accounts.find(function (a) { return a.type === "telegram"; });
+        if (telegramAccount === null || telegramAccount === void 0 ? void 0 : telegramAccount.username) {
+            properties.telegram = telegramAccount.username;
+        }
+        else if (telegramAccount === null || telegramAccount === void 0 ? void 0 : telegramAccount.telegramUserId) {
+            properties.telegram = telegramAccount.telegramUserId;
+        }
+    }
+    if (!properties.tiktok) {
+        var tiktokAccount = accounts.find(function (a) { return a.type === "tiktok_oauth"; });
+        if (tiktokAccount === null || tiktokAccount === void 0 ? void 0 : tiktokAccount.username) {
+            properties.tiktok = tiktokAccount.username;
+        }
+    }
+    if (!properties.twitter) {
+        var twitterAccount = accounts.find(function (a) { return a.type === "twitter_oauth"; });
+        if (twitterAccount === null || twitterAccount === void 0 ? void 0 : twitterAccount.username) {
+            properties.twitter = twitterAccount.username;
+        }
+    }
+    // Use OAuth emails as fallback for email if still blank
+    // Priority: email -> google -> apple -> linkedin
+    if (!properties.email) {
+        if (properties.google) {
+            properties.email = properties.google;
+        }
+        else if (properties.apple) {
+            properties.email = properties.apple;
+        }
+        else if (properties.linkedin) {
+            properties.email = properties.linkedin;
+        }
+    }
+    // Extract wallet addresses
+    var wallets = accounts
+        .filter(function (a) { return (a.type === "wallet" || a.type === "smart_wallet") && a.address; })
+        .map(function (a) {
+        var _a, _b;
+        return ({
+            address: a.address,
+            walletClient: (_a = (a.walletClientType || a.walletClient)) !== null && _a !== void 0 ? _a : undefined,
+            chainType: (_b = a.chainType) !== null && _b !== void 0 ? _b : undefined,
+            isEmbedded: a.walletClientType === "privy" || a.walletClient === "privy",
+        });
+    });
+    return { properties: properties, wallets: wallets };
+}
+//# sourceMappingURL=utils.js.map

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

@@ -96,7 +96,8 @@ var FormoAnalyticsSession = /** @class */ (function () {
         var _a;
         var identifiedKey = this.generateIdentificationKey(address, rdns);
         var identifiedWallets = ((_a = cookie().get(SESSION_WALLET_IDENTIFIED_KEY)) === null || _a === void 0 ? void 0 : _a.split(",")) || [];
-        if (!identifiedWallets.includes(identifiedKey)) {
+        var alreadyExists = identifiedWallets.includes(identifiedKey);
+        if (!alreadyExists) {
             identifiedWallets.push(identifiedKey);
             var newValue = identifiedWallets.join(",");
             cookie().set(SESSION_WALLET_IDENTIFIED_KEY, newValue, {