@e-xi/xion 0.0.24 → 0.0.26

package/dist/chunk-files/{chunk-ILNU65BZ.js → chunk-KBVHM5ZU.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-P4CX6I4J.js";
 
 // package.json
-var version = "0.0.24";
+var version = "0.0.26";
 
 // src/main/banner/banner-abstract.ts
 var BannerAbstract = class {

package/dist/chunk-files/{chunk-PRRVKBOL.js → chunk-UWIJOHQU.js}

@@ -611,7 +611,7 @@ var JwtAuthManager = class {
   }
   /**
    * 更新为初始化状态
-   * @param {XoAuth.RegistryValue<'User'>} user 持久化的用户快照
+   * @param {XoAuth.User} user 持久化的用户快照
    * @returns {void}
    * @private
    */
@@ -636,8 +636,8 @@ var JwtAuthManager = class {
   }
   /**
    * 更新为已认证状态
-   * @param {XoAuth.RegistryValue<'User'>} user 认证用户
-   * @param {string}                       error 可选错误信息
+   * @param {XoAuth.User} user 认证用户
+   * @param {string}      error 可选错误信息
    * @returns {void}
    * @private
    */

package/dist/main/app/index.js

@@ -39,12 +39,12 @@ import {
 import "../../chunk-files/chunk-SVTZ4T6S.js";
 import {
   JwtAuthManager
-} from "../../chunk-files/chunk-PRRVKBOL.js";
+} from "../../chunk-files/chunk-UWIJOHQU.js";
 import "../../chunk-files/chunk-J34MOWJP.js";
 import "../../chunk-files/chunk-RSUM4GBD.js";
 import {
   BannerManager
-} from "../../chunk-files/chunk-ILNU65BZ.js";
+} from "../../chunk-files/chunk-KBVHM5ZU.js";
 import "../../chunk-files/chunk-YLZRRUY7.js";
 import {
   defineAppConfig,

package/dist/main/auth/index.js

@@ -1,7 +1,7 @@
 import {
   JwtAuthManager,
   JwtAuthRefreshRejectedError
-} from "../../chunk-files/chunk-PRRVKBOL.js";
+} from "../../chunk-files/chunk-UWIJOHQU.js";
 import {
   JwtAuthSessionChangedError,
   RemoteServiceAllowedRequestMethods

package/dist/main/auth/jwt-auth-manager.d.ts

@@ -238,7 +238,7 @@ export declare class JwtAuthManager {
     private updateState;
     /**
      * 更新为初始化状态
-     * @param {XoAuth.RegistryValue<'User'>} user 持久化的用户快照
+     * @param {XoAuth.User} user 持久化的用户快照
      * @returns {void}
      * @private
      */
@@ -257,8 +257,8 @@ export declare class JwtAuthManager {
     private updateStateRefreshing;
     /**
      * 更新为已认证状态
-     * @param {XoAuth.RegistryValue<'User'>} user 认证用户
-     * @param {string}                       error 可选错误信息
+     * @param {XoAuth.User} user 认证用户
+     * @param {string}      error 可选错误信息
      * @returns {void}
      * @private
      */

package/dist/main/auth/jwt-auth-provider-abstract.d.ts

@@ -8,7 +8,7 @@
  * @template TLogoutResponse  退出响应类型
  * @class JwtAuthProviderAbstract
  */
-export declare abstract class JwtAuthProviderAbstract<TUser = XoAuth.RegistryValue<'User'>, TLoginRequest = XoAuth.LoginRequest, TLoginResponse = unknown, TRefreshResponse = unknown, TLogoutResponse = unknown> {
+export declare abstract class JwtAuthProviderAbstract<TUser = XoAuth.User, TLoginRequest = XoAuth.LoginRequest, TLoginResponse = unknown, TRefreshResponse = unknown, TLogoutResponse = unknown> {
     /** 访问令牌提前刷新的时间，单位毫秒 */
     readonly refreshBeforeExpiration: number;
     /** 刷新失败后的重试间隔，单位毫秒 */

package/dist/main/banner/index.js

@@ -1,7 +1,7 @@
 import {
   BannerAbstract,
   BannerManager
-} from "../../chunk-files/chunk-ILNU65BZ.js";
+} from "../../chunk-files/chunk-KBVHM5ZU.js";
 import "../../chunk-files/chunk-YLZRRUY7.js";
 import "../../chunk-files/chunk-P4CX6I4J.js";
 export {

package/dist/main/store/jwt-auth-store.d.ts

@@ -21,13 +21,13 @@ export declare class JwtAuthStore {
      * @param {XoAuth.StoredRefreshSession<TUser>} session 会话数据
      * @returns {boolean} 是否已持久化
      */
-    setSession<TUser = XoAuth.RegistryValue<'User'>>(session: XoAuth.StoredRefreshSession<TUser>): boolean;
+    setSession<TUser = XoAuth.User>(session: XoAuth.StoredRefreshSession<TUser>): boolean;
     /**
      * 读取并解密会话
      * @template TUser 用户类型
      * @returns {XoAuth.StoredRefreshSession<TUser> | undefined}
      */
-    getSession<TUser = XoAuth.RegistryValue<'User'>>(): XoAuth.StoredRefreshSession<TUser> | undefined;
+    getSession<TUser = XoAuth.User>(): XoAuth.StoredRefreshSession<TUser> | undefined;
     /**
      * 清除持久化会话
      * @returns {void}

package/dist/renderer/store/auth/auth-store.d.ts

@@ -1,43 +1,53 @@
+import { type Pinia } from 'pinia';
+import { type ComputedRef, type Ref } from 'vue';
 /**
- * JWT 认证 Store
+ * JWT 认证 Store 的 setup 返回类型
  */
-export declare const useXoAuthStore: import("pinia").StoreDefinition<"useXoAuthStore", Pick<{
-    status: import("vue").Ref<"error" | "unauthenticated" | "initializing" | "authenticating" | "refreshing" | "authenticated", "error" | "unauthenticated" | "initializing" | "authenticating" | "refreshing" | "authenticated">;
-    user: import("vue").Ref<unknown, unknown>;
-    error: import("vue").Ref<string | undefined, string | undefined>;
-    isInitializing: import("vue").ComputedRef<boolean>;
-    isAuthenticating: import("vue").ComputedRef<boolean>;
-    isRefreshing: import("vue").ComputedRef<boolean>;
-    isAuthenticated: import("vue").ComputedRef<boolean>;
-    isUnauthenticated: import("vue").ComputedRef<boolean>;
-    isError: import("vue").ComputedRef<boolean>;
-    initialize: () => Promise<void>;
-    login: (request: XoAuth.LoginRequest) => Promise<void>;
-    logout: () => Promise<void>;
-}, "error" | "status" | "user">, Pick<{
-    status: import("vue").Ref<"error" | "unauthenticated" | "initializing" | "authenticating" | "refreshing" | "authenticated", "error" | "unauthenticated" | "initializing" | "authenticating" | "refreshing" | "authenticated">;
-    user: import("vue").Ref<unknown, unknown>;
-    error: import("vue").Ref<string | undefined, string | undefined>;
-    isInitializing: import("vue").ComputedRef<boolean>;
-    isAuthenticating: import("vue").ComputedRef<boolean>;
-    isRefreshing: import("vue").ComputedRef<boolean>;
-    isAuthenticated: import("vue").ComputedRef<boolean>;
-    isUnauthenticated: import("vue").ComputedRef<boolean>;
-    isError: import("vue").ComputedRef<boolean>;
-    initialize: () => Promise<void>;
-    login: (request: XoAuth.LoginRequest) => Promise<void>;
-    logout: () => Promise<void>;
-}, "isInitializing" | "isAuthenticating" | "isRefreshing" | "isAuthenticated" | "isUnauthenticated" | "isError">, Pick<{
-    status: import("vue").Ref<"error" | "unauthenticated" | "initializing" | "authenticating" | "refreshing" | "authenticated", "error" | "unauthenticated" | "initializing" | "authenticating" | "refreshing" | "authenticated">;
-    user: import("vue").Ref<unknown, unknown>;
-    error: import("vue").Ref<string | undefined, string | undefined>;
-    isInitializing: import("vue").ComputedRef<boolean>;
-    isAuthenticating: import("vue").ComputedRef<boolean>;
-    isRefreshing: import("vue").ComputedRef<boolean>;
-    isAuthenticated: import("vue").ComputedRef<boolean>;
-    isUnauthenticated: import("vue").ComputedRef<boolean>;
-    isError: import("vue").ComputedRef<boolean>;
+interface AuthStoreSetup {
+    /** 当前认证状态 */
+    status: Ref<XoAuth.Status>;
+    /** 当前登录用户 */
+    user: Ref<XoAuth.User | undefined>;
+    /** 最近一次认证错误信息 */
+    error: Ref<string | undefined>;
+    /** 是否正在初始化 */
+    isInitializing: ComputedRef<boolean>;
+    /** 是否正在登录 */
+    isAuthenticating: ComputedRef<boolean>;
+    /** 是否正在刷新 */
+    isRefreshing: ComputedRef<boolean>;
+    /** 是否已登录 */
+    isAuthenticated: ComputedRef<boolean>;
+    /** 是否未登录 */
+    isUnauthenticated: ComputedRef<boolean>;
+    /** 是否认证异常 */
+    isError: ComputedRef<boolean>;
+    /** 初始化认证状态与监听器 */
     initialize: () => Promise<void>;
+    /** 登录 */
     login: (request: XoAuth.LoginRequest) => Promise<void>;
+    /** 退出登录 */
     logout: () => Promise<void>;
-}, "login" | "logout" | "initialize">>;
+}
+/**
+ * JWT 认证 Store
+ */
+declare const useXoAuthStoreDefinition: import("pinia").StoreDefinition<"useXoAuthStore", Pick<AuthStoreSetup, "error" | "status" | "user">, Pick<AuthStoreSetup, "isInitializing" | "isAuthenticating" | "isRefreshing" | "isAuthenticated" | "isUnauthenticated" | "isError">, Pick<AuthStoreSetup, "login" | "logout" | "initialize">>;
+/**
+ * 认证 Store 实例类型
+ * @template TUser 业务端指定的登录用户类型
+ */
+export type XoAuthStore<TUser = XoAuth.User> = Omit<ReturnType<typeof useXoAuthStoreDefinition>, 'user'> & {
+    /** 当前登录用户 */
+    user: TUser | undefined;
+};
+/**
+ * 获取认证 Store 实例
+ * @template TUser 业务端指定的登录用户类型
+ * @param {Pinia | null | undefined} pinia Pinia 实例
+ * @returns {XoAuthStore<TUser>} 认证 Store 实例
+ * @example
+ * const authStore = useXoAuthStore<User>()
+ */
+export declare function useXoAuthStore<TUser = XoAuth.User>(pinia?: Pinia | null): XoAuthStore<TUser>;
+export {};

package/dist/renderer/store/index.js

@@ -69,7 +69,7 @@ var useXoAppStore = defineStore("useXoAppStore", () => {
 // src/renderer/store/auth/auth-store.ts
 import { defineStore as defineStore2 } from "pinia";
 import { computed as computed2, ref as ref2, shallowRef } from "vue";
-var useXoAuthStore = defineStore2("useXoAuthStore", () => {
+var useXoAuthStoreDefinition = defineStore2("useXoAuthStore", () => {
   const initializePromise = shallowRef();
   const offState = shallowRef();
   const status = ref2("initializing");
@@ -135,6 +135,9 @@ var useXoAuthStore = defineStore2("useXoAuthStore", () => {
     logout
   };
 });
+function useXoAuthStore(pinia) {
+  return useXoAuthStoreDefinition(pinia);
+}
 
 // src/shared/remote-service/const/remote-service.ts
 var RemoteServiceStatusOptions = [

package/dist/shared/auth/types/auth.d.ts

@@ -42,7 +42,7 @@ declare global {
          * 认证结果
          * @template TUser 用户类型
          */
-        interface AuthResult<TUser = RegistryValue<'User'>> extends TokenPair {
+        interface AuthResult<TUser = User> extends TokenPair {
             /** 可选用户信息 */
             user?: TUser
         }
@@ -51,7 +51,7 @@ declare global {
          * 加密持久化会话
          * @template TUser 用户类型
          */
-        interface StoredRefreshSession<TUser = RegistryValue<'User'>> {
+        interface StoredRefreshSession<TUser = User> {
             /** 刷新令牌 */
             refreshToken: string
             /** 刷新令牌绝对过期时间戳，单位毫秒 */
@@ -65,7 +65,7 @@ declare global {
             /** 当前认证状态 */
             status: Status
             /** 当前登录用户，不包含任何令牌 */
-            user?: RegistryValue<'User'>
+            user?: User
             /** 最近一次错误信息 */
             error?: string
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-xi/xion",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "type": "module",
   "description": "Electron Vite Vue3 TypeScript framework.",
   "exports": {