@formo/analytics 1.13.4-alpha.8 → 1.13.4-alpha.9

package/package.json

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

package/src/FormoAnalytics.ts

@@ -17,7 +17,8 @@ import {
   SignatureStatus,
   TransactionStatus,
 } from "./types";
-import { isLocalhost, toSnakeCase } from "./lib/utils";
+import { formoSessionStorage, isLocalhost, toSnakeCase } from "./lib";
+import { SESSION_IDENTIFIED_KEY } from "./constants";
 
 interface IFormoAnalytics {
   page(): void;
@@ -61,8 +62,7 @@ interface IFormoAnalytics {
 export class FormoAnalytics implements IFormoAnalytics {
   private _provider?: EIP1193Provider;
   private _providerListeners: Record<string, (...args: unknown[]) => void> = {};
-  private identifySent?: boolean;
-  readonly identifySentKey = "identifySent";
+  private sessionIdentified?: boolean = false;
 
   config: Config;
   currentChainId?: ChainID;
@@ -77,14 +77,8 @@ export class FormoAnalytics implements IFormoAnalytics {
       trackLocalhost: options.trackLocalhost,
     };
 
-    try {
-      const isWalletIdentified = JSON.parse(
-        sessionStorage.getItem(this.identifySentKey) || "false"
-      );
-      this.identifySent = isWalletIdentified;
-    } catch {
-      this.identifySent = false;
-    }
+    this.sessionIdentified =
+      (formoSessionStorage.getItem(SESSION_IDENTIFIED_KEY) as boolean) ?? false;
 
     // TODO: replace with eip6963
     const provider = options.provider || window?.ethereum;
@@ -288,9 +282,9 @@ export class FormoAnalytics implements IFormoAnalytics {
     providerName?: string;
     rdns?: string;
   }): Promise<void> {
-    if (this.identifySent === false) {
-      this.identifySent = true;
-      sessionStorage.setItem(this.identifySentKey, "true");
+    if (this.sessionIdentified === false) {
+      this.sessionIdentified = true;
+      formoSessionStorage.setItem(SESSION_IDENTIFIED_KEY, true);
       await this.trackEvent(Event.IDENTIFY, {
         address,
         providerName,
@@ -548,8 +542,8 @@ export class FormoAnalytics implements IFormoAnalytics {
   }
 
   private async trackFirstPageHit(): Promise<void> {
-    if (sessionStorage.getItem(CURRENT_URL_KEY) === null) {
-      sessionStorage.setItem(CURRENT_URL_KEY, window.location.href);
+    if (formoSessionStorage.getItem(CURRENT_URL_KEY) === null) {
+      formoSessionStorage.setItem(CURRENT_URL_KEY, window.location.href);
     }
 
     return this.trackPageHit();
@@ -575,10 +569,10 @@ export class FormoAnalytics implements IFormoAnalytics {
   }
 
   private async onLocationChange(): Promise<void> {
-    const currentUrl = sessionStorage.getItem(CURRENT_URL_KEY);
+    const currentUrl = formoSessionStorage.getItem(CURRENT_URL_KEY);
 
     if (currentUrl !== window.location.href) {
-      sessionStorage.setItem(CURRENT_URL_KEY, window.location.href);
+      formoSessionStorage.setItem(CURRENT_URL_KEY, window.location.href);
       this.trackPageHit();
     }
   }

package/src/constants/base.ts

@@ -0,0 +1,2 @@
+export const SESSION_PREFIX = "f0-";
+export const SESSION_IDENTIFIED_KEY = SESSION_PREFIX + "session_identified";

package/src/constants/index.ts

@@ -1,2 +1,3 @@
-export * from './config';
-export * from './events';
+export * from "./base";
+export * from "./config";
+export * from "./events";

package/src/lib/index.ts

@@ -0,0 +1,2 @@
+export { default as formoSessionStorage } from "./session-storage";
+export * from "./utils";

package/src/lib/session-storage.ts

@@ -0,0 +1,53 @@
+export class SessionStorage {
+  private readonly json_prefix = "__json=";
+
+  public setItem(key: string, value: any): void {
+    if (typeof value === "boolean") value = value === true ? "true" : "false";
+    if (typeof value === "object")
+      value = this.json_prefix + JSON.stringify(value);
+    sessionStorage.setItem(key, value);
+  }
+
+  public getItem(key: string): string | boolean | Record<any, any> | null {
+    const value = sessionStorage.getItem(key);
+
+    if (!value || typeof value !== "string") return null;
+    if (["null", "undefined"].some((item) => item == value)) return null;
+
+    if (value.startsWith(this.json_prefix)) {
+      try {
+        return JSON.parse(value.slice(7));
+      } catch (error) {
+        console.error(
+          "[FORMO_ERROR] SessionStorage failed to parse JSON",
+          error
+        );
+        return null;
+      }
+    }
+
+    if (["true", "false"].some((item) => item == value)) {
+      return JSON.parse(value);
+    }
+
+    return value;
+  }
+
+  public removeMatch(pattern: RegExp): void {
+    for (const key in sessionStorage) {
+      if (pattern.test(key)) {
+        this.removeItem(key);
+      }
+    }
+  }
+
+  public removeItem(key: string): void {
+    sessionStorage.removeItem(key);
+  }
+
+  public clear(): void {
+    sessionStorage.clear();
+  }
+}
+
+export default new SessionStorage();

package/test/lib.spec.ts

@@ -1,5 +1,5 @@
 import { describe, it } from "mocha";
-import { toSnakeCase } from "../src/lib/utils";
+import { toSnakeCase } from "../src/lib";
 import { expect } from "chai";
 
 describe("toSnakeCase", () => {