@inzombieland/core 1.18.0 → 1.18.2

package/get-user.mjs

@@ -2,23 +2,7 @@ import { useLocalStorage } from "@vueuse/core";
 import { flush, getToken, setUser } from "./api-client.mjs";
 import { useApiActions } from "./composables/use-api-actions.mjs";
 import { useUser } from "./composables/use-user.mjs";
-import { once } from "./helpers/index.mjs";
-let gettingUserInProgress = false;
-let gettingUserPromise = null;
-function getUser(fetch, config) {
-  if (gettingUserInProgress && gettingUserPromise) {
-    return gettingUserPromise;
-  }
-  return gettingUserStart(fetch, config);
-}
-function gettingUserStart(fetch, config) {
-  gettingUserInProgress = true;
-  gettingUserPromise = getUserRequest(fetch, config).finally(() => {
-    gettingUserInProgress = false;
-    gettingUserPromise = null;
-  });
-  return gettingUserPromise;
-}
+import { createSingletonAsync, once } from "./helpers/index.mjs";
 async function getUserRequest(fetch, config) {
   const token = getToken();
   const user = useUser();
@@ -50,6 +34,7 @@ async function getUserRequest(fetch, config) {
     return { token: null, user: null };
   }
 }
+const getUser = createSingletonAsync(getUserRequest);
 export const createApiGetUser = once((fetch, config) => {
   return () => getUser(fetch, config);
 });

package/get-visitor.d.ts

@@ -1,11 +1,4 @@
-import type { FetchConfig } from "./types";
-export declare type Visitor = {
-    id?: string;
-    ip?: string;
-    device?: string;
-    appName?: string;
-};
+import type { FetchConfig, Visitor } from "./types";
 export declare const getVisitorId: () => string | undefined;
 export declare const getVisitor: () => Visitor | null;
-export declare const getVisitorRequest: (config: FetchConfig) => Promise<void>;
 export declare const createApiGetVisitorIdentifier: (config: FetchConfig) => () => Promise<void>;

package/get-visitor.mjs

@@ -1,6 +1,6 @@
 import { hashComponents, load } from "@fingerprintjs/fingerprintjs";
 import { ofetch } from "ofetch";
-import { once } from "./helpers/index.mjs";
+import { createSingletonAsync, once } from "./helpers/index.mjs";
 let visitor = null;
 export const getVisitorId = () => {
   return visitor?.id;
@@ -11,23 +11,7 @@ export const getVisitor = () => {
 const setVisitor = (newVisitor) => {
   visitor = !visitor ? newVisitor : { ...visitor, ...newVisitor };
 };
-let gettingInProgress = false;
-let gettingPromise = null;
-function getVisitorIdentifier(config) {
-  if (gettingInProgress && gettingPromise) {
-    return gettingPromise;
-  }
-  return gettingVisitorStart(config);
-}
-function gettingVisitorStart(config) {
-  gettingInProgress = true;
-  gettingPromise = getVisitorRequest(config).finally(() => {
-    gettingInProgress = false;
-    gettingPromise = null;
-  });
-  return gettingPromise;
-}
-export const getVisitorRequest = async (config) => {
+const getVisitorRequest = async (config) => {
   if (typeof window === "undefined" || visitor) {
     return;
   }
@@ -43,6 +27,7 @@ export const getVisitorRequest = async (config) => {
   const appName = config.appName || "unknown";
   setVisitor({ id, ip, device, appName });
 };
+const getVisitorIdentifier = createSingletonAsync(getVisitorRequest);
 export const createApiGetVisitorIdentifier = once((config) => {
   return () => getVisitorIdentifier(config);
 });

package/helpers/index.d.ts

@@ -2,3 +2,4 @@ export { apiHelper } from "./api-helper";
 export { dateHelper } from "./date-helper";
 export { deviceHelper, type Device } from "./device-helper";
 export declare function once<T extends (...args: any[]) => any>(fn: T): T;
+export declare function createSingletonAsync<T, Args extends unknown[]>(fn: (...args: Args) => Promise<T>): (...args: Args) => Promise<T>;

package/helpers/index.mjs

@@ -13,3 +13,17 @@ export function once(fn) {
     return result;
   };
 }
+export function createSingletonAsync(fn) {
+  const inProgressMap = /* @__PURE__ */ new Map();
+  return (...args) => {
+    const key = JSON.stringify(args);
+    if (inProgressMap.has(key)) {
+      return inProgressMap.get(key);
+    }
+    const promise = fn(...args).finally(() => {
+      inProgressMap.delete(key);
+    });
+    inProgressMap.set(key, promise);
+    return promise;
+  };
+}

package/index.d.ts

@@ -1,13 +1,13 @@
 import { type Ref } from "vue";
-import type { ActiveSession, Fetch, FetchConfig, User } from "./types";
-export type { ActiveSession, Fetch, FetchConfig, User };
+import type { ActiveSession, Fetch, FetchConfig, User, Visitor } from "./types";
+export type { ActiveSession, Fetch, FetchConfig, User, Visitor };
 export { default as AppProvider } from "./AppProvider.vue";
 export { useUser } from "./composables/use-user";
 export { useSubscribe } from "./composables/use-subscribe";
 export { useActiveSessions } from "./composables/use-active-sessions";
 export { useThemeMode } from "./composables/use-theme-mode";
 export { useAppLocale } from "./composables/use-app-locale";
-export { getVisitor, getVisitorId, type Visitor } from "./get-visitor";
+export { getVisitor, getVisitorId } from "./get-visitor";
 export declare function initApiFetch($fetch: Fetch, config: FetchConfig): {
     fetch: Fetch;
     getUser: () => Promise<import("./types").GetUserResponse>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inzombieland/core",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "type": "module",
   "license": "ISC",
   "main": "./index.mjs",

package/refresh-token.mjs

@@ -1,21 +1,5 @@
 import { flush, setToken } from "./api-client.mjs";
-import { once } from "./helpers/index.mjs";
-let refreshingTokenInProgress = false;
-let refreshingTokenPromise = null;
-function refreshToken(fetch, config) {
-  if (refreshingTokenInProgress && refreshingTokenPromise) {
-    return refreshingTokenPromise;
-  }
-  return refreshingTokenStart(fetch, config);
-}
-function refreshingTokenStart(fetch, config) {
-  refreshingTokenInProgress = true;
-  refreshingTokenPromise = refreshTokenRequest(fetch, config).finally(() => {
-    refreshingTokenInProgress = false;
-    refreshingTokenPromise = null;
-  });
-  return refreshingTokenPromise;
-}
+import { createSingletonAsync, once } from "./helpers/index.mjs";
 async function refreshTokenRequest(fetch, config) {
   setToken(null);
   try {
@@ -34,6 +18,7 @@ async function refreshTokenRequest(fetch, config) {
     throw error;
   }
 }
+const refreshToken = createSingletonAsync(refreshTokenRequest);
 export const createApiRefreshToken = once((fetch, config) => {
   return () => refreshToken(fetch, config);
 });

package/types.d.ts

@@ -56,6 +56,12 @@ export type User = {
     locale: string;
     avatar: string;
 };
+export type Visitor = {
+    id?: string;
+    ip?: string;
+    device?: string;
+    appName?: string;
+};
 export type ActiveSession = {
     id: string;
     visitorId: string;