@inzombieland/core 1.18.13 → 1.18.14

package/AppProvider.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { onMounted, ref } from "vue"
-import { bus } from "./api-client"
+import { onBeforeMount, onMounted, ref } from "vue"
+import bus from "./bus"
 import { useThemeMode, useUser } from "./index"
 import type { ConfigProviderTheme } from "vant"
 import "@vant/touch-emulator"
@@ -9,12 +9,18 @@ const theme = useThemeMode()
 const user = useUser()
 const appLoading = ref(Boolean(user.value))
 
+onBeforeMount(() => {
+	bus.publish("app:beforeMount", true)
+})
+
 onMounted(() => {
 	appLoading.value = false
 })
+</script>
 
-if (typeof window !== "undefined") {
-	bus.publish("app:mounted", true)
+<script lang="ts">
+export const useBus = () => {
+	return bus
 }
 </script>
 

package/api-client.d.ts

@@ -1,6 +1,4 @@
-import bus from "./bus";
 import type { Fetch, FetchConfig, FetchExtraOptions as FetchOptions, User } from "./types";
-export { bus };
 export declare const setUser: (newUser?: User | null) => void;
 export declare const updateUser: (newUser: Partial<User>) => void;
 export declare const getToken: () => string | null | undefined;

package/api-client.mjs

@@ -1,12 +1,11 @@
-import bus from "./bus.mjs";
-import { useUser, useVisitor } from "./composables/index.mjs";
+import { useApiActions, useUser, useVisitor } from "./composables/index.mjs";
 import { apiHelper, once } from "./helpers/index.mjs";
-import { useApiActions } from "./index.mjs";
-export { bus };
+import { useBus } from "./index.mjs";
 let token = null;
 export const setUser = (newUser) => {
   const user = useUser();
   user.value = newUser;
+  const bus = useBus();
   bus.publish("user:onUpdated", user.value);
 };
 export const updateUser = (newUser) => {
@@ -27,6 +26,7 @@ export const flush = () => {
 };
 const eventHandler = (requestID, eventName) => {
   return new Promise((resolve, reject) => {
+    const bus = useBus();
     const subscription = bus.subscribe(eventName, (data) => {
       if (requestID !== data?.requestID) {
         return;
@@ -117,7 +117,7 @@ const fetchRequest = (url, options = {}, fetch, config) => {
       const { status } = error?.response ?? { status: 500 };
       if (status === 401 && url !== "/account/1/offline") {
         const apiActions = useApiActions();
-        await apiActions?.value?.refreshToken?.();
+        await apiActions.value?.refreshToken?.();
         return request();
       }
       throw errorHandler(error);

package/comet-client.mjs

@@ -1,9 +1,11 @@
 import { Centrifuge } from "centrifuge";
-import { bus, getToken } from "./api-client.mjs";
+import { getToken } from "./api-client.mjs";
+import { useApiActions } from "./composables/index.mjs";
 import { apiHelper } from "./helpers/index.mjs";
-import { useApiActions } from "./index.mjs";
+import { useBus } from "./index.mjs";
 if (typeof window !== "undefined" && import.meta.env.MODE !== "production") {
   window.wsPublish = (eventName, data) => {
+    const bus = useBus();
     setTimeout(() => bus.publish(`WS.${eventName}`, data), 0);
   };
 }
@@ -27,10 +29,11 @@ export function newCometClient(user, cometServerURL) {
     debug: import.meta.env.MODE !== "production",
     getToken: async () => {
       const apiActions = useApiActions();
-      return await apiActions?.value?.refreshToken?.() ?? "";
+      return await apiActions.value?.refreshToken?.() ?? "";
     }
   });
   const publish = (eventName, data) => () => {
+    const bus = useBus();
     bus.publish(`WS.${eventName}`, apiHelper.convertToClient(data));
   };
   let userSubscription;

package/composables/index.d.ts

@@ -1,5 +1,6 @@
 export * from "../helpers/composables";
 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";

package/composables/index.mjs

@@ -1,5 +1,6 @@
 export * from "../helpers/composables.mjs";
 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";

package/composables/use-api-actions.d.ts

@@ -0,0 +1,13 @@
+export declare const useApiActions: () => import("vue").Ref<{
+    initialized: boolean;
+    getVisitorIdentifier?: (() => Promise<void>) | undefined;
+    refreshToken?: (() => Promise<string>) | undefined;
+}, {
+    initialized: boolean;
+    getVisitorIdentifier?: () => Promise<void>;
+    refreshToken?: () => Promise<string>;
+} | {
+    initialized: boolean;
+    getVisitorIdentifier?: (() => Promise<void>) | undefined;
+    refreshToken?: (() => Promise<string>) | undefined;
+}>;

package/composables/use-api-actions.mjs

@@ -0,0 +1,5 @@
+import { ref } from "vue";
+const apiActions = ref({ initialized: false });
+export const useApiActions = () => {
+  return apiActions;
+};

package/composables/use-subscribe.d.ts

@@ -1,4 +1,4 @@
-import { type Subscription } from "../bus";
+import type { Subscription } from "rxjs";
 export declare const useSubscribe: <T>(eventName: string, func: (data: T) => void, options?: {
     once?: boolean;
     unsubscribeOnUnmount?: boolean;

package/composables/use-subscribe.mjs

@@ -1,6 +1,7 @@
 import { onMounted, onUnmounted } from "vue";
-import bus from "../bus.mjs";
+import { useBus } from "../index.mjs";
 export const useSubscribe = (eventName, func, options = { once: false, unsubscribeOnUnmount: true }) => {
+  const bus = useBus();
   let subscription;
   onMounted(() => {
     subscription = bus.subscribe(eventName, (data) => {

package/get-user.mjs

@@ -1,8 +1,7 @@
 import { useLocalStorage } from "@vueuse/core";
 import { flush, getToken, setUser } from "./api-client.mjs";
-import { useUser } from "./composables/index.mjs";
+import { useApiActions, useUser } from "./composables/index.mjs";
 import { createSingletonAsync, once } from "./helpers/index.mjs";
-import { useApiActions } from "./index.mjs";
 async function getUserRequest(fetch, config) {
   const token = getToken();
   const user = useUser();
@@ -17,8 +16,8 @@ async function getUserRequest(fetch, config) {
     }
     try {
       const apiActions = useApiActions();
-      await apiActions?.value?.getVisitorIdentifier?.();
-      await apiActions?.value?.refreshToken?.();
+      await apiActions.value?.getVisitorIdentifier?.();
+      await apiActions.value?.refreshToken?.();
     } catch {
       flush();
       return { token: null, user: null };

package/index.d.ts

@@ -1,13 +1,9 @@
 import { type Ref } from "vue";
 import type { Fetch, FetchConfig } from "./types";
 export { defineVuePlugins } from "./define-vue-plugins";
-export { default as AppProvider } from "./AppProvider.vue";
+export { default as AppProvider, useBus } from "./AppProvider.vue";
 export * from "./composables";
 export * from "./types";
-type ApiActions = {
-    getVisitorIdentifier?: () => Promise<void>;
-    refreshToken?: () => Promise<string>;
-};
 export declare function initApiFetch($fetch: Fetch, config: FetchConfig): {
     fetch: Fetch;
     getUser: () => Promise<import("./types").GetUserResponse>;
@@ -69,4 +65,3 @@ export declare const useUserActions: () => Ref<{
         locale: string;
     }) => Promise<void>;
 }> | undefined;
-export declare const useApiActions: () => Ref<ApiActions, ApiActions> | undefined;

package/index.mjs

@@ -1,18 +1,20 @@
 import { useLocalStorage } from "@vueuse/core";
 import { ref } from "vue";
-import { bus, createApiFetch } from "./api-client.mjs";
+import { createApiFetch } from "./api-client.mjs";
+import { useBus } from "./AppProvider.vue";
 import { newCometClient } from "./comet-client.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 { defineVuePlugins } from "./define-vue-plugins.mjs";
-export { default as AppProvider } from "./AppProvider.vue";
+export { default as AppProvider, useBus } from "./AppProvider.vue";
 export * from "./composables/index.mjs";
 export * from "./types.mjs";
+const apiActions = useApiActions();
 let userActions;
-let apiActions;
 export function initApiFetch($fetch, config) {
   const fetch = createApiFetch($fetch, config);
   const getUser = createApiGetUser(fetch, config);
@@ -20,11 +22,16 @@ export function initApiFetch($fetch, config) {
   const initApplication = createInitApplication();
   const refreshToken = createApiRefreshToken(fetch, config);
   userActions = ref(createApiUserActions(fetch, config, getUser));
-  apiActions = ref({ getVisitorIdentifier, refreshToken });
+  apiActions.value = {
+    initialized: true,
+    getVisitorIdentifier,
+    refreshToken
+  };
   if (typeof window !== "undefined") {
     const loggedIn = useLocalStorage("lin", "no");
     const cometServerURL = config.cometServerURL;
     let cometClient;
+    const bus = useBus();
     bus.subscribe("user:onUpdated", (user) => {
       if (user) {
         cometClient || (cometClient = newCometClient(user, cometServerURL));
@@ -38,7 +45,8 @@ export function initApiFetch($fetch, config) {
       }
       loggedIn.value = user ? "yes" : "no";
     });
-    bus.subscribe("app:mounted", () => {
+    bus.subscribe("app:beforeMount", () => {
+      console.log("Service started in mode", import.meta.env.MODE);
       getVisitorIdentifier();
       initApplication();
     });
@@ -49,6 +57,3 @@ export function initApiFetch($fetch, config) {
 export const useUserActions = () => {
   return userActions;
 };
-export const useApiActions = () => {
-  return apiActions;
-};

package/package.json

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