@inzombieland/core 1.20.1 → 1.20.3

package/api-client.d.ts

@@ -5,6 +5,5 @@ export declare const getToken: () => string | null | undefined;
 export declare const setToken: (newToken?: string | null) => void;
 export declare const getSecretKey: () => string | undefined;
 export declare const setSecretKey: (newSecretKey?: string) => void;
-export declare const setVisitorId: (visitorId?: string) => void;
 export declare const flush: () => void;
 export declare const createApiFetch: (fetch: Fetch, config: FetchConfig) => (url: string, options?: FetchOptions) => Promise<any>;

package/api-client.js

@@ -27,9 +27,6 @@ export const getSecretKey = () => {
 export const setSecretKey = (newSecretKey) => {
   secretKey = newSecretKey;
 };
-export const setVisitorId = (visitorId = "") => {
-  localStorage.setItem("vid", visitorId);
-};
 export const flush = () => {
   setToken(null);
   setUser(null);
@@ -105,8 +102,8 @@ const optionsHandler = (options = {}, config) => {
   const { platform, hostname } = visitor;
   const visitorIdentifier = useVisitor();
   if (visitorIdentifier.value) {
-    const { id, ip, device, appName } = visitorIdentifier.value;
-    headers.visitor = btoa(`${platform}|:|${hostname}|:|${id}|:|${ip}|:|${device}|:|${appName}`);
+    const { id, fid, device, appName } = visitorIdentifier.value;
+    headers.visitor = btoa(`${platform}|:|${hostname}|:|${id}|:|${fid}|:|${device}|:|${appName}`);
   } else {
     headers.visitor = btoa(`${platform}|:|${hostname}`);
   }

package/composables/use-visitor.d.ts

@@ -1,12 +1,12 @@
 import type { Visitor } from "../types.js";
 export declare function useVisitor(): import("vue").Ref<{
     id?: string | undefined;
-    ip?: string | undefined;
+    fid?: string | undefined;
     device?: string | undefined;
     appName?: string | undefined;
 } | null | undefined, Visitor | {
     id?: string | undefined;
-    ip?: string | undefined;
+    fid?: string | undefined;
     device?: string | undefined;
     appName?: string | undefined;
 } | null | undefined>;

package/get-visitor.js

@@ -1,6 +1,7 @@
 import { hashComponents, load } from "@fingerprintjs/fingerprintjs";
 import { useVisitor } from "./composables/index.js";
 import { createSingletonAsync, once } from "./helpers/index.js";
+import { getVisitorId } from "./local-storage-utils.js";
 const setVisitor = (newVisitor) => {
   const visitor = useVisitor();
   visitor.value = !visitor.value ? newVisitor : { ...visitor.value, ...newVisitor };
@@ -13,11 +14,14 @@ const getVisitorRequest = async (config) => {
   const fp = await load();
   const result = await fp.get();
   const { canvas, colorDepth, hdr, languages, screenFrame, screenResolution, ...components } = result.components;
-  const id = hashComponents(components);
-  const ip = "unknown";
+  const fid = hashComponents(components);
+  let id = getVisitorId() ?? "";
+  if (!/^[0-9a-f]{32}$/i.test(id)) {
+    id = fid;
+  }
   const device = await config.getDevice() || "unknown";
   const appName = config.appName || "unknown";
-  setVisitor({ id, ip, device, appName });
+  setVisitor({ id, fid, device, appName });
 };
 const getVisitorIdentifier = createSingletonAsync(getVisitorRequest);
 export const createApiGetVisitorIdentifier = once((config) => {

package/local-storage-utils.d.ts

@@ -0,0 +1,4 @@
+export declare const getSessionId: () => string | null;
+export declare const setSessionId: (sessionId?: string) => void;
+export declare const getVisitorId: () => string | null;
+export declare const setVisitorId: (visitorId?: string) => void;

package/local-storage-utils.js

@@ -0,0 +1,22 @@
+export const getSessionId = () => {
+  if (typeof window !== "undefined") {
+    return window.localStorage.getItem("sid");
+  }
+  return null;
+};
+export const setSessionId = (sessionId = "") => {
+  if (typeof window !== "undefined") {
+    window.localStorage.setItem("sid", sessionId);
+  }
+};
+export const getVisitorId = () => {
+  if (typeof window !== "undefined") {
+    return window.localStorage.getItem("vid");
+  }
+  return null;
+};
+export const setVisitorId = (visitorId = "") => {
+  if (typeof window !== "undefined") {
+    window.localStorage.setItem("vid", visitorId);
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/core",
-  "version": "1.20.1",
+  "version": "1.20.3",
   "type": "module",
   "license": "ISC",
   "main": "./index.js",

package/types.d.ts

@@ -59,7 +59,7 @@ export type User = {
 };
 export type Visitor = {
     id?: string;
-    ip?: string;
+    fid?: string;
     device?: string;
     appName?: string;
 };

package/user-actions.js

@@ -1,6 +1,7 @@
-import { flush, setSecretKey, setVisitorId, setToken, updateUser } from "./api-client.js";
+import { flush, setSecretKey, setToken, updateUser } from "./api-client.js";
 import { useUser } from "./composables/index.js";
 import { once } from "./helpers/index.js";
+import { setSessionId, setVisitorId } from "./local-storage-utils.js";
 export const createApiUserActions = once(
   (fetch, config, getUser) => {
     return {
@@ -28,21 +29,19 @@ export const createApiUserActions = once(
         });
       },
       signInByCodeVerifyCode: async (body) => {
-        const response = await fetch(
-          "/account/0/signinbycode/verifycode",
-          {
-            body,
-            method: "POST",
-            ...config.useRequestHeaders?.(["cookie"]) ?? {}
-          }
-        );
-        const { accessToken, secretKey, visitorId, ...rest } = response;
-        if (!accessToken) {
+        const response = await fetch("/account/0/signinbycode/verifycode", {
+          body,
+          method: "POST",
+          ...config.useRequestHeaders?.(["cookie"]) ?? {}
+        });
+        const { accessToken, sessionId, visitorId, secretKey, ...rest } = response;
+        if (!accessToken || !sessionId) {
           throw rest;
         }
         setToken(accessToken);
-        setSecretKey(secretKey);
+        setSessionId(sessionId);
         setVisitorId(visitorId);
+        setSecretKey(secretKey);
         return await getUser();
       },
       getToken: async (body) => {