@formo/analytics 1.15.0 → 1.15.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formo/analytics",
-  "version": "1.15.0",
+  "version": "1.15.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/getformo/sdk.git"

package/src/FormoAnalytics.ts

@@ -21,7 +21,7 @@ import {
   TransactionStatus,
   RequestEvent,
 } from "./types";
-import { session, local, logger, EventQueue, fetch } from "./lib";
+import { session, local, logger, EventQueue, fetch, Logger } from "./lib";
 import {
   isLocalhost,
   isAddress,
@@ -95,13 +95,10 @@ export class FormoAnalytics implements IFormoAnalytics {
     this.session = new FormoAnalyticsSession();
 
     // Initialize logger with configuration from options
-    const loggerConfig = options.logger || {
-      enabled: false,
-    };
-    logger.setEnabled(loggerConfig.enabled);
-    if (loggerConfig.levels) {
-      logger.setEnabledLevels(loggerConfig.levels);
-    }
+    Logger.init({
+      enabled: options.logger?.enabled || false,
+      enabledLevels: options.logger?.levels || [],
+    });
 
     this.eventQueue = new EventQueue(this.config.writeKey, {
       url: EVENTS_API_URL,
@@ -498,7 +495,6 @@ export class FormoAnalytics implements IFormoAnalytics {
 
           return;
         } catch (error) {
-          logger.info("Transaction listener catch");
           logger.error("Transaction error:", error);
           const rpcError = error as RPCError;
           if (rpcError && rpcError?.code === 4001) {
@@ -769,7 +765,6 @@ export class FormoAnalytics implements IFormoAnalytics {
     try {
       const accounts = await this.getAccounts();
       if (accounts && accounts.length > 0) {
-        // TODO: fetch userId if account is valid, generate userId if no userId matches address from tinybird
         if (isAddress(accounts[0])) {
           return accounts[0];
         }

package/src/constants/config.ts

@@ -1,6 +1,6 @@
 export const EVENTS_API_HOST = "https://events.formo.so";
 export const EVENTS_API_URL = `${EVENTS_API_HOST}/events`;
-export const USER_API_URL = `${EVENTS_API_HOST}/user-id`;
+export const USER_API_URL = `${EVENTS_API_HOST}/user`;
 
 export const EVENTS_API_REQUEST_HEADER = (writeKey: string) => ({
   "Content-Type": "application/json",

package/src/lib/logger.ts

@@ -5,17 +5,39 @@ export class Logger {
   private enabledLevels: Set<LogLevel>;
   private enabled: boolean;
 
-  private constructor(enabled: boolean = true, enabledLevels: LogLevel[] = []) {
+  private constructor(
+    enabled: boolean = false,
+    enabledLevels: LogLevel[] = []
+  ) {
     this.enabled = enabled;
     this.enabledLevels = new Set(enabledLevels);
   }
 
-  public static getInstance(
-    enabled: boolean = false,
-    enabledLevels: LogLevel[] = []
-  ): Logger {
+  public static init(config: {
+    enabled?: boolean;
+    enabledLevels?: LogLevel[];
+  }): void {
+    // Get or create instance
+    const instance = Logger.getInstance();
+
+    // Update configuration
+    if (config.enabled !== undefined) {
+      instance.setEnabled(config.enabled);
+    }
+    if (config.enabledLevels !== undefined) {
+      instance.setEnabledLevels(config.enabledLevels);
+    }
+  }
+
+  public static getInstance(config?: {
+    enabled?: boolean;
+    enabledLevels?: LogLevel[];
+  }): Logger {
     if (!Logger.instance) {
-      Logger.instance = new Logger(enabled, enabledLevels);
+      Logger.instance = new Logger(
+        config?.enabled ?? false,
+        config?.enabledLevels ?? []
+      );
     }
     return Logger.instance;
   }

package/src/lib/queue.ts

@@ -96,16 +96,16 @@ export class EventQueue {
   }
 
   //#region Public functions
-  async enqueue(message: RequestEvent, callback?: (...args: any) => void) {
+  async enqueue(event: RequestEvent, callback?: (...args: any) => void) {
     callback = callback || noop;
 
-    const formattedTimestamp = toDateHourMinute(new Date(message.timestamp));
-    message.timestamp = formattedTimestamp;
+    const formattedTimestamp = toDateHourMinute(new Date(event.timestamp));
+    event.timestamp = formattedTimestamp;
 
-    const messageString = JSON.stringify(message);
-    const hashToken = await hash(messageString);
+    const eventString = JSON.stringify(event);
+    const eventId = await hash(eventString);
     // check if the message already exists
-    if (await this.isDuplicated(hashToken)) {
+    if (await this.isDuplicate(eventId)) {
       logger.warn(
         `Event already enqueued, try again after ${millisecondsToSecond(
           this.flushIntervalMs
@@ -114,10 +114,10 @@ export class EventQueue {
       return;
     }
 
-    this.queue.push({ message: { ...message, id: hashToken }, callback });
+    this.queue.push({ message: { ...event, id: eventId }, callback });
 
     logger.log(
-      `Event enqueued: ${getActionDescriptor(message.action, message.payload)}`
+      `Event enqueued: ${getActionDescriptor(event.action, event.payload)}`
     );
 
     if (!this.flushed) {
@@ -220,11 +220,11 @@ export class EventQueue {
     return false;
   }
 
-  private async isDuplicated(hashToken: string) {
+  private async isDuplicate(eventId: string) {
     // check if exists a message with identical payload within 1 minute
-    if (this.payloadHashes.has(hashToken)) return true;
+    if (this.payloadHashes.has(eventId)) return true;
 
-    this.payloadHashes.add(hashToken);
+    this.payloadHashes.add(eventId);
     return false;
   }