@inzombieland/core 1.18.2 → 1.18.4

package/api-client.mjs

@@ -1,7 +1,5 @@
 import bus from "./bus.mjs";
-import { useApiActions } from "./composables/use-api-actions.mjs";
-import { useUser } from "./composables/use-user.mjs";
-import { getVisitor } from "./get-visitor.mjs";
+import { useApiActions, useUser, useVisitor } from "./composables/index.mjs";
 import { apiHelper, once } from "./helpers/index.mjs";
 let token = null;
 export const setUser = (newUser) => {
@@ -93,9 +91,9 @@ const optionsHandler = (options = {}, config) => {
     visitor.hostname = location.hostname;
   }
   const { platform, hostname } = visitor;
-  const visitorIdentifier = getVisitor();
-  if (visitorIdentifier) {
-    const { id, ip, device, appName } = visitorIdentifier;
+  const visitorIdentifier = useVisitor();
+  if (visitorIdentifier.value) {
+    const { id, ip, device, appName } = visitorIdentifier.value;
     headers.visitor = btoa(`${platform}|:|${hostname}|:|${id}|:|${ip}|:|${device}|:|${appName}`);
   } else {
     headers.visitor = btoa(`${platform}|:|${hostname}`);

package/comet-client.mjs

@@ -1,7 +1,7 @@
 import { Centrifuge } from "centrifuge";
 import { getToken } from "./api-client.mjs";
 import bus from "./bus.mjs";
-import { useApiActions } from "./composables/use-api-actions.mjs";
+import { useApiActions } from "./composables/index.mjs";
 import { apiHelper } from "./helpers/index.mjs";
 if (typeof window !== "undefined" && import.meta.env.MODE !== "production") {
   window.wsPublish = (eventName, data) => {

package/composables/index.d.ts

@@ -0,0 +1,7 @@
+export { useActiveSessions } from "./use-active-sessions";
+export { useApiActions } from "./use-api-actions";
+export { useAppLocale } from "./use-app-locale";
+export { useSubscribe } from "./use-subscribe";
+export { useThemeMode } from "./use-theme-mode";
+export { useUser } from "./use-user";
+export { useVisitor } from "./use-visitor";

package/composables/index.mjs

@@ -0,0 +1,7 @@
+export { useActiveSessions } from "./use-active-sessions.mjs";
+export { useApiActions } from "./use-api-actions.mjs";
+export { useAppLocale } from "./use-app-locale.mjs";
+export { useSubscribe } from "./use-subscribe.mjs";
+export { useThemeMode } from "./use-theme-mode.mjs";
+export { useUser } from "./use-user.mjs";
+export { useVisitor } from "./use-visitor.mjs";

package/composables/use-visitor.d.ts

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

package/composables/use-visitor.mjs

@@ -0,0 +1,5 @@
+import { ref } from "vue";
+const visitor = ref(null);
+export function useVisitor() {
+  return visitor;
+}

package/get-user.mjs

@@ -1,7 +1,6 @@
 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 { useApiActions, useUser } from "./composables/index.mjs";
 import { createSingletonAsync, once } from "./helpers/index.mjs";
 async function getUserRequest(fetch, config) {
   const token = getToken();

package/get-visitor.d.ts

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

package/get-visitor.mjs

@@ -1,18 +1,14 @@
 import { hashComponents, load } from "@fingerprintjs/fingerprintjs";
 import { ofetch } from "ofetch";
+import { useVisitor } from "./composables/index.mjs";
 import { createSingletonAsync, once } from "./helpers/index.mjs";
-let visitor = null;
-export const getVisitorId = () => {
-  return visitor?.id;
-};
-export const getVisitor = () => {
-  return visitor;
-};
 const setVisitor = (newVisitor) => {
-  visitor = !visitor ? newVisitor : { ...visitor, ...newVisitor };
+  const visitor = useVisitor();
+  visitor.value = !visitor.value ? newVisitor : { ...visitor.value, ...newVisitor };
 };
 const getVisitorRequest = async (config) => {
-  if (typeof window === "undefined" || visitor) {
+  const visitor = useVisitor();
+  if (typeof window === "undefined" || visitor.value) {
     return;
   }
   const fp = await load();

package/helpers/index.d.ts

@@ -1,5 +1,7 @@
 export { apiHelper } from "./api-helper";
 export { dateHelper } from "./date-helper";
+export { phoneHelper } from "./phone-helper";
+export { stringHelper } from "./string-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

@@ -1,5 +1,7 @@
 export { apiHelper } from "./api-helper.mjs";
 export { dateHelper } from "./date-helper.mjs";
+export { phoneHelper } from "./phone-helper.mjs";
+export { stringHelper } from "./string-helper.mjs";
 export { deviceHelper } from "./device-helper.mjs";
 export function once(fn) {
   let executed = false;

package/helpers/phone-helper.d.ts

@@ -0,0 +1,13 @@
+export declare function getPlainPhoneNumber(value: string): string;
+/**
+ * Преобразование номера телефона в формат: +7 (987) 777-88-99
+ * @param value - номер телефона
+ * @param addLastSymbol -
+ */
+export declare function convertToPhone(value: string, addLastSymbol?: boolean): string;
+export declare function maskPhone(phone?: string): string;
+export declare const phoneHelper: {
+    getPlainPhoneNumber: typeof getPlainPhoneNumber;
+    convertToPhone: typeof convertToPhone;
+    maskPhone: typeof maskPhone;
+};

package/helpers/phone-helper.mjs

@@ -0,0 +1,58 @@
+export function getPlainPhoneNumber(value) {
+  const symbol = "+ ";
+  const tempNumber = value.replace(symbol, "").replace(symbol.trim(), "");
+  return tempNumber.replaceAll(/\D+/g, "");
+}
+export function convertToPhone(value, addLastSymbol = true) {
+  const plainNumber = getPlainPhoneNumber(value);
+  if (plainNumber.length === 0) {
+    return value;
+  }
+  const mask = getCountryMask(plainNumber);
+  return getFormattedByMask(plainNumber, mask, addLastSymbol);
+}
+function getCountryMask(value = "") {
+  if (value.length === 0) {
+    return "";
+  }
+  if (value.startsWith("7")) {
+    return "+# (###) ###-##-###########";
+  }
+  if (value.startsWith("8")) {
+    return "# (###) ###-##-###########";
+  }
+  if (value.startsWith("1")) {
+    return "+# ### ### ## ###########";
+  }
+  if (value.startsWith("375")) {
+    return "+### ## ### ## ##########";
+  }
+  if (value.startsWith("380")) {
+    return "+### ## ### ## ##########";
+  }
+  return "+####################";
+}
+function getFormattedByMask(plainNumber, mask, addLastSymbol) {
+  let number = "";
+  let symbolIterator = 0;
+  [...mask].forEach((value) => {
+    if (plainNumber.length >= symbolIterator) {
+      if (value === "#") {
+        if (plainNumber.length > symbolIterator) {
+          number += plainNumber[symbolIterator];
+        }
+        symbolIterator++;
+      } else {
+        const notPasteSymbol = symbolIterator === plainNumber.length && !addLastSymbol;
+        if (!notPasteSymbol) {
+          number += value;
+        }
+      }
+    }
+  });
+  return number;
+}
+export function maskPhone(phone = "") {
+  return `+${phone.slice(0, 1)} *****${phone.slice(-4)}`;
+}
+export const phoneHelper = { getPlainPhoneNumber, convertToPhone, maskPhone };

package/helpers/string-helper.d.ts

@@ -0,0 +1,4 @@
+export declare function maskEmail(email?: string): string;
+export declare const stringHelper: {
+    maskEmail: typeof maskEmail;
+};

package/helpers/string-helper.mjs

@@ -0,0 +1,8 @@
+export function maskEmail(email = "") {
+  const [name, domain] = email.split("@");
+  if (name && name.length < 5) return email;
+  return `${name?.slice(0, 2)}*****${name?.slice(-2)}@${domain}`;
+}
+export const stringHelper = {
+  maskEmail
+};

package/index.d.ts

@@ -1,13 +1,8 @@
 import { type Ref } from "vue";
-import type { ActiveSession, Fetch, FetchConfig, User, Visitor } from "./types";
-export type { ActiveSession, Fetch, FetchConfig, User, Visitor };
+import type { Fetch, FetchConfig } from "./types";
 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 } from "./get-visitor";
+export * from "./composables";
+export * from "./types";
 export declare function initApiFetch($fetch: Fetch, config: FetchConfig): {
     fetch: Fetch;
     getUser: () => Promise<import("./types").GetUserResponse>;
@@ -22,7 +17,7 @@ export declare function initApiFetch($fetch: Fetch, config: FetchConfig): {
         }>;
         logout: () => Promise<void>;
         fetchActiveSessions: () => Promise<{
-            sessions: ActiveSession[];
+            sessions: import("./types").ActiveSession[];
         }>;
     };
 };
@@ -36,7 +31,7 @@ export declare const useUserActions: () => Ref<{
     }>;
     logout: () => Promise<void>;
     fetchActiveSessions: () => Promise<{
-        sessions: ActiveSession[];
+        sessions: import("./types").ActiveSession[];
     }>;
 }, {
     signIn: (body: {
@@ -48,6 +43,6 @@ export declare const useUserActions: () => Ref<{
     }>;
     logout: () => Promise<void>;
     fetchActiveSessions: () => Promise<{
-        sessions: ActiveSession[];
+        sessions: import("./types").ActiveSession[];
     }>;
 }> | undefined;

package/index.mjs

@@ -3,19 +3,15 @@ import { ref } from "vue";
 import { createApiFetch } from "./api-client.mjs";
 import bus from "./bus.mjs";
 import { newCometClient } from "./comet-client.mjs";
-import { useApiActions } from "./composables/use-api-actions.mjs";
+import { useApiActions } from "./composables/index.mjs";
 import { createApiGetUser } from "./get-user.mjs";
 import { createApiGetVisitorIdentifier } from "./get-visitor.mjs";
 import { createInitApplication } from "./init-application.mjs";
 import { createApiRefreshToken } from "./refresh-token.mjs";
 import { createApiUserActions } from "./user-actions.mjs";
 export { default as AppProvider } from "./AppProvider.vue";
-export { useUser } from "./composables/use-user.mjs";
-export { useSubscribe } from "./composables/use-subscribe.mjs";
-export { useActiveSessions } from "./composables/use-active-sessions.mjs";
-export { useThemeMode } from "./composables/use-theme-mode.mjs";
-export { useAppLocale } from "./composables/use-app-locale.mjs";
-export { getVisitor, getVisitorId } from "./get-visitor.mjs";
+export * from "./composables/index.mjs";
+export * from "./types.mjs";
 const apiActions = useApiActions();
 let userActions;
 export function initApiFetch($fetch, config) {

package/init-application.mjs

@@ -5,11 +5,9 @@ import ruRU from "vant/es/locale/lang/ru-RU";
 import { watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useRouter } from "vue-router";
-import { useActiveSessions } from "./composables/use-active-sessions.mjs";
-import { useSubscribe } from "./composables/use-subscribe.mjs";
-import { useUser } from "./composables/use-user.mjs";
+import { useActiveSessions, useSubscribe, useUser } from "./composables/index.mjs";
 import { once } from "./helpers/index.mjs";
-import { getVisitorId, useAppLocale, useThemeMode, useUserActions } from "./index.mjs";
+import { useAppLocale, useThemeMode, useUserActions, useVisitor } from "./index.mjs";
 function initApplication() {
   const router = useRouter();
   const user = useUser();
@@ -73,7 +71,8 @@ function initApplication() {
         return activeSession;
       });
     }
-    if (session?.status === "SignedOut" && session?.visitorId === getVisitorId()) {
+    const visitor = useVisitor();
+    if (session?.status === "SignedOut" && session?.visitorId === visitor.value?.id) {
       const userActions = useUserActions();
       const data = await userActions?.value.fetchActiveSessions();
       const isCurrentSession = data?.sessions.some((s) => s.isCurrentSession && s.id === session?.sessionId);

package/package.json

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

package/user-actions.mjs

@@ -1,5 +1,5 @@
 import { flush, setToken } from "./api-client.mjs";
-import { useUser } from "./composables/use-user.mjs";
+import { useUser } from "./composables/index.mjs";
 import { once } from "./helpers/index.mjs";
 export const createApiUserActions = once(
   (fetch, config, getUser) => {