@kevisual/api 0.0.47 → 0.0.49

package/query/query-login/query-login.ts

@@ -39,7 +39,7 @@ export class QueryLogin extends BaseQuery {
     this.isBrowser = opts?.isBrowser ?? true;
     this.init();
     this.onLoad = opts?.onLoad;
-    this.storage = opts?.storage || localStorage;
+    this.storage = opts?.storage || globalThis?.localStorage;
   }
   setQuery(query: Query) {
     this.query = query;
@@ -67,9 +67,9 @@ export class QueryLogin extends BaseQuery {
   async login(data: QueryLoginData) {
     const res = await this.post<QueryLoginResult>({ key: 'login', ...data });
     if (res.code === 200) {
-      const { accessToken, refreshToken } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem('token', accessToken || '');
-      await this.beforeSetLoginUser({ accessToken, refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
     }
     return res;
   }
@@ -81,9 +81,9 @@ export class QueryLogin extends BaseQuery {
   async loginByCode(data: { phone: string; code: string }) {
     const res = await this.post<QueryLoginResult>({ path: 'sms', key: 'login', data });
     if (res.code === 200) {
-      const { accessToken, refreshToken } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem('token', accessToken || '');
-      await this.beforeSetLoginUser({ accessToken, refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
     }
     return res;
   }
@@ -91,17 +91,17 @@ export class QueryLogin extends BaseQuery {
    * 设置token
    * @param token
    */
-  async setLoginToken(token: { accessToken: string; refreshToken: string }) {
-    const { accessToken, refreshToken } = token;
+  async setLoginToken(token: { accessToken: string; refreshToken: string; accessTokenExpiresIn?: number }) {
+    const { accessToken, refreshToken, accessTokenExpiresIn } = token;
     this.storage.setItem('token', accessToken || '');
-    await this.beforeSetLoginUser({ accessToken, refreshToken });
+    await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
   }
   async loginByWechat(data: { code: string }) {
     const res = await this.post<QueryLoginResult>({ path: 'wx', key: 'open-login', code: data.code });
     if (res.code === 200) {
-      const { accessToken, refreshToken } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem('token', accessToken || '');
-      await this.beforeSetLoginUser({ accessToken, refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
     }
     return res;
   }
@@ -126,7 +126,7 @@ export class QueryLogin extends BaseQuery {
    * 登陆成功，需要获取用户信息进行缓存
    * @param param0
    */
-  async beforeSetLoginUser({ accessToken, refreshToken, check401 }: { accessToken?: string; refreshToken?: string; check401?: boolean }) {
+  async beforeSetLoginUser({ accessToken, refreshToken, check401, accessTokenExpiresIn }: { accessTokenExpiresIn?: number, accessToken?: string; refreshToken?: string; check401?: boolean }) {
     if (accessToken && refreshToken) {
       const resUser = await this.getMe(accessToken, check401);
       if (resUser.code === 200) {
@@ -137,6 +137,8 @@ export class QueryLogin extends BaseQuery {
             id: user.id,
             accessToken,
             refreshToken,
+            accessTokenExpiresIn,
+            createdAt: Date.now(),
           });
         } else {
           console.error('登录失败');
@@ -185,9 +187,9 @@ export class QueryLogin extends BaseQuery {
       if (hasRefreshToken) {
         const res = await that.queryRefreshToken(hasRefreshToken);
         if (res.code === 200) {
-          const { accessToken, refreshToken } = res?.data || {};
+          const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
           that.storage.setItem('token', accessToken || '');
-          await that.beforeSetLoginUser({ accessToken, refreshToken, check401: false });
+          await that.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn, check401: false });
           if (refetch && ctx && ctx.req && ctx.req.url && ctx.fetch) {
             await new Promise((resolve) => setTimeout(resolve, 1500));
             const url = ctx.req?.url;
@@ -336,12 +338,17 @@ export class QueryLogin extends BaseQuery {
     const user = localUserList.find((userItem) => userItem.user!.username === username);
     if (user) {
       this.storage.setItem('token', user.accessToken || '');
-      await this.beforeSetLoginUser({ accessToken: user.accessToken, refreshToken: user.refreshToken });
+      await this.beforeSetLoginUser({
+        accessToken: user.accessToken,
+        refreshToken: user.refreshToken,
+        accessTokenExpiresIn: user.accessTokenExpiresIn
+      });
       return {
         code: 200,
         data: {
           accessToken: user.accessToken,
           refreshToken: user.refreshToken,
+          accessTokenExpiresIn: user.accessTokenExpiresIn,
         },
         success: true,
         message: '切换用户成功',
@@ -350,9 +357,9 @@ export class QueryLogin extends BaseQuery {
     const res = await this.postSwitchUser(username);
 
     if (res.code === 200) {
-      const { accessToken, refreshToken } = res?.data || {};
+      const { accessToken, refreshToken, accessTokenExpiresIn } = res?.data || {};
       this.storage.setItem('token', accessToken || '');
-      await this.beforeSetLoginUser({ accessToken, refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
     }
     return res;
   }
@@ -409,9 +416,9 @@ export class QueryLogin extends BaseQuery {
       loginToken: token,
     });
     if (res.code === 200) {
-      const accessToken = res.data?.accessToken;
+      const { accessTokenExpiresIn, accessToken, refreshToken } = res.data;
       this.storage.setItem('token', accessToken || '');
-      await this.beforeSetLoginUser({ accessToken, refreshToken: res.data?.refreshToken });
+      await this.beforeSetLoginUser({ accessToken, refreshToken, accessTokenExpiresIn });
       return res;
     }
     return false;
@@ -421,7 +428,7 @@ export class QueryLogin extends BaseQuery {
    * 
    * 
 
-import MD5 from 'crypto-js/md5.js';
+// import MD5 from 'crypto-js/md5.js';
 import jsonwebtoken from 'jsonwebtoken';
 
    */

package/query/query-mark/index.ts

@@ -0,0 +1,154 @@
+import { Query } from '@kevisual/query';
+import type { Result, DataOpts } from '@kevisual/query/query';
+
+export type SimpleObject = Record<string, any>;
+export const markType = ['simple', 'md', 'mdx', 'wallnote', 'excalidraw', 'chat'] as const;
+export type MarkType = (typeof markType)[number];
+export type MarkData = {
+  nodes?: any[];
+  edges?: any[];
+  elements?: any[];
+  permission?: any;
+
+  [key: string]: any;
+};
+export type Mark = {
+  id: string;
+  title: string;
+  description: string;
+  markType: MarkType;
+  link: string;
+  data?: MarkData;
+  uid: string;
+  puid: string;
+  summary: string;
+  thumbnail?: string;
+  tags: string[];
+  createdAt: string;
+  updatedAt: string;
+  version: number;
+};
+export type ShowMarkPick = Pick<Mark, 'id' | 'title' | 'description' | 'summary' | 'link' | 'tags' | 'thumbnail' | 'updatedAt'>;
+
+export type SearchOpts = {
+  page?: number;
+  pageSize?: number;
+  search?: string;
+  sort?: string; // DESC, ASC
+  markType?: MarkType; // 类型
+  [key: string]: any;
+};
+
+export type QueryMarkOpts<T extends SimpleObject = SimpleObject> = {
+  query?: Query;
+  isBrowser?: boolean;
+  onLoad?: () => void;
+} & T;
+
+export type ResultMarkList = {
+  list: Mark[];
+  pagination: {
+    pageSize: number;
+    current: number;
+    total: number;
+  };
+};
+export type QueryMarkData = {
+  id?: string;
+  title?: string;
+  description?: string;
+  [key: string]: any;
+};
+export type QueryMarkResult = {
+  accessToken: string;
+  refreshToken: string;
+};
+
+export class QueryMarkBase<T extends SimpleObject = SimpleObject> {
+  query: Query;
+  isBrowser: boolean;
+  load?: boolean;
+  storage?: Storage;
+  onLoad?: () => void;
+
+  constructor(opts?: QueryMarkOpts<T>) {
+    this.query = opts?.query || new Query();
+    this.isBrowser = opts?.isBrowser ?? true;
+    this.init();
+    this.onLoad = opts?.onLoad;
+  }
+  setQuery(query: Query) {
+    this.query = query;
+  }
+  private async init() {
+    this.load = true;
+    this.onLoad?.();
+  }
+
+  async post<T = Result<any>>(data: any, opts?: DataOpts): Promise<T> {
+    try {
+      return this.query.post({ path: 'mark', ...data }, opts) as Promise<T>;
+    } catch (error) {
+      console.log('error', error);
+      return {
+        code: 400,
+      } as any;
+    }
+  }
+
+  async getMarkList(search: SearchOpts, opts?: DataOpts) {
+    return this.post<Result<ResultMarkList>>({ key: 'list', ...search }, opts);
+  }
+
+  async getMark(id: string, opts?: DataOpts) {
+    return this.post<Result<Mark>>({ key: 'get', id }, opts);
+  }
+  async getVersion(id: string, opts?: DataOpts) {
+    return this.post<Result<{ version: number; id: string }>>({ key: 'getVersion', id }, opts);
+  }
+  /**
+   * 检查版本
+   * 当需要更新时，返回true
+   * @param id
+   * @param version
+   * @param opts
+   * @returns
+   */
+  async checkVersion(id: string, version?: number, opts?: DataOpts) {
+    if (!version) {
+      return true;
+    }
+    const res = await this.getVersion(id, opts);
+    if (res.code === 200) {
+      if (res.data!.version > version) {
+        return true;
+      }
+      return false;
+    }
+    return true;
+  }
+
+  async updateMark(data: any, opts?: DataOpts) {
+    return this.post<Result<Mark>>({ key: 'update', data }, opts);
+  }
+
+  async deleteMark(id: string, opts?: DataOpts) {
+    return this.post<Result<Mark>>({ key: 'delete', id }, opts);
+  }
+}
+export class QueryMark extends QueryMarkBase<SimpleObject> {
+  markType: string;
+  constructor(opts?: QueryMarkOpts & { markType?: MarkType }) {
+    super(opts);
+    this.markType = opts?.markType || 'simple';
+  }
+  async getMarkList(search?: SearchOpts, opts?: DataOpts) {
+    return this.post<Result<ResultMarkList>>({ key: 'list', ...search, markType: this.markType }, opts);
+  }
+  async updateMark(data: any, opts?: DataOpts) {
+    if (!data.id) {
+      data.markType = this.markType || 'simple';
+    }
+    return super.updateMark(data, opts);
+  }
+}

package/query/query-resources/utils.ts

@@ -1,13 +1,12 @@
-import MD5 from 'crypto-js/md5';
 import SparkMD5 from 'spark-md5';
 
 export const hashContent = (str: string | Blob | Buffer): Promise<string> | string => {
   if (typeof str === 'string') {
-    return MD5(str).toString();
+    return SparkMD5.hash(str);
   } else if (str instanceof Blob) {
     return hashBlob(str);
   } else if (Buffer.isBuffer(str)) {
-    return MD5(str.toString()).toString();
+    return SparkMD5.hash(str.toString());
   }
   console.error('hashContent error: input must be a string, Blob, or Buffer');
   return '';

package/store/store-auth/index.ts

@@ -0,0 +1,66 @@
+'use strict';
+import { create } from 'zustand';
+import { toast } from 'sonner';
+import { useContextKey } from '@kevisual/context';
+import { type QueryLoginBrowser } from '@/query/query-login/index.ts'
+const queryLogin = useContextKey<QueryLoginBrowser>('queryLogin');
+
+type Me = {
+  id?: string;
+  username?: string;
+  nickname?: string | null;
+  needChangePassword?: boolean;
+  role?: string;
+  description?: string | null;
+  type?: 'user' | 'org';
+  orgs?: string[];
+  avatar?: string;
+};
+export type LayoutStore = {
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  me: Me;
+  setMe: (me: Me) => void;
+  getMe: () => Promise<void>;
+  openUser: boolean;
+  setOpenUser: (openUser: boolean) => void;
+  switchOrg: (username?: string, type?: 'user' | 'org') => Promise<void>;
+  isAdmin: boolean;
+  setIsAdmin: (isAdmin: boolean) => void;
+  checkHasOrg: () => boolean;
+};
+export const useLayoutStore = create<LayoutStore>((set, get) => ({
+  open: false,
+  setOpen: (open) => set({ open }),
+  me: {},
+  setMe: (me) => set({ me }),
+  getMe: async () => {
+    const res = await queryLogin.getMe();
+    if (res.code === 200) {
+      set({ me: res.data });
+      set({ isAdmin: res.data.orgs?.includes('admin') });
+    }
+  },
+  openUser: false,
+  setOpenUser: (openUser) => set({ openUser }),
+  switchOrg: async (username?: string, type?: string) => {
+    const res = await queryLogin.switchUser(username || '');
+    if (res.code === 200) {
+      toast.success('Switch success');
+      setTimeout(() => {
+        window.location.reload();
+      }, 1000);
+    } else {
+      toast.error(res.message || 'Request failed');
+    }
+  },
+  isAdmin: false,
+  setIsAdmin: (isAdmin) => set({ isAdmin }),
+  checkHasOrg: () => {
+    const user = get().me || {};
+    if (!user.orgs) {
+      return false;
+    }
+    return user?.orgs?.length > 0;
+  },
+}));

package/store/store-mark/index.ts

@@ -0,0 +1,132 @@
+import { create } from 'zustand';
+import { type Result } from '@kevisual/query/query';
+import { MarkType, Mark, QueryMark } from '@kevisual/api/query-mark';
+import { uniqBy } from 'es-toolkit';
+import { useContextKey } from '@kevisual/context';
+import { type QueryLoginBrowser } from '@/query/query-login/index.ts'
+const queryClient = useContextKey<QueryLoginBrowser>('queryLogin');
+
+type ManagerStore = {
+  /** 当前选中的Mark */
+  currentMarkId: string;
+  setCurrentMarkId: (markId: string) => void;
+  markData?: Mark | undefined;
+  setMarkData: (mark?: Partial<Mark>) => void;
+  /** 获取Mark列表 */
+  getList: () => Promise<any>;
+  getMarkFromList: (markId: string) => Mark | undefined;
+  updateMark: (mark: Mark) => Promise<any>;
+  getMark: (markId: string) => Promise<Result<Mark>>;
+  deleteMark: (markId: string) => Promise<any>;
+  /** Mark列表 */
+  list: Mark[];
+  setList: (list: Mark[]) => void;
+  pagination: {
+    current: number;
+    pageSize: number;
+    total: number;
+  };
+  setPagination: (pagination: { current: number; pageSize: number; total: number }) => void;
+  /** 搜索 */
+  search: string;
+  setSearch: (search: string) => void;
+  /** 初始化 */
+  init: (markType: MarkType) => Promise<void>;
+  queryMark?: QueryMark;
+  markType?: MarkType;
+  open: boolean;
+  setOpen: (open: boolean) => void;
+};
+export const useMarkStore = create<ManagerStore>((set, get) => {
+  return {
+    currentMarkId: '',
+    setCurrentMarkId: (markId: string) => set(() => ({ currentMarkId: markId })),
+    open: false,
+    setOpen: (open: boolean) => set(() => ({ open })),
+    getList: async () => {
+      const queryMark = get().queryMark!;
+      const { search, pagination } = get();
+      const res = await queryMark.getMarkList({ page: pagination.current, pageSize: pagination.pageSize, search });
+      const oldList = get().list;
+      if (res.code === 200) {
+        const { pagination, list } = res.data || {};
+        const newList = [...oldList, ...list!];
+        const uniqueList = uniqBy(newList, (item) => item.id);
+        set(() => ({ list: uniqueList }));
+        set(() => ({ pagination: { current: pagination!.current, pageSize: pagination!.pageSize, total: pagination!.total } }));
+      }
+    },
+    getMarkFromList: (markId: string) => {
+      return get().list.find((item) => item.id === markId);
+    },
+    updateMark: async (mark: Mark) => {
+      const queryMark = get().queryMark!;
+      const res = await queryMark.updateMark(mark);
+      if (res.code === 200) {
+        set((state) => {
+          const oldList = state.list;
+          const resMark = res.data!;
+          const newList = oldList.map((item) => (item.id === mark.id ? mark : item));
+          if (!mark.id) {
+            newList.unshift(resMark);
+          }
+          return {
+            list: newList,
+          };
+        });
+      }
+      return res;
+    },
+    getMark: async (markId: string) => {
+      const queryMark = get().queryMark!;
+      const res = await queryMark.getMark(markId);
+      return res;
+    },
+    list: [],
+    setList: (list: any[]) => set(() => ({ list })),
+    init: async (markType: MarkType = 'wallnote') => {
+      // await get().getList();
+      console.log('init', set, get);
+      const queryMark = new QueryMark({
+        query: queryClient as any,
+        markType,
+      });
+      const url = new URL(window.location.href);
+      const pageSize = url.searchParams.get('pageSize') || '10';
+      set({ queryMark, markType, list: [], pagination: { current: 1, pageSize: parseInt(pageSize), total: 0 }, currentMarkId: '', markData: undefined });
+      setTimeout(async () => {
+        console.log('get', get);
+        get().getList();
+      }, 1000);
+    },
+    deleteMark: async (markId: string) => {
+      const queryMark = get().queryMark!;
+      const res = await queryMark.deleteMark(markId);
+      const currentMarkId = get().currentMarkId;
+      if (res.code === 200) {
+        // get().getList();
+        set((state) => ({
+          list: state.list.filter((item) => item.id !== markId),
+        }));
+        if (currentMarkId === markId) {
+          set(() => ({ currentMarkId: '', markData: undefined }));
+        }
+      }
+      return res;
+    },
+    queryMark: undefined,
+    markType: 'simple',
+    markData: undefined,
+    setMarkData: (mark?: Partial<Mark>) => set(() => ({ markData: mark as Mark })),
+    pagination: {
+      current: 1,
+      pageSize: 10,
+      total: 0,
+    },
+    setPagination: (pagination: { current: number; pageSize: number; total: number }) => set(() => ({ pagination })),
+    /** 搜索 */
+    search: '',
+    setSearch: (search: string) => set(() => ({ search, list: [], pagination: { current: 1, pageSize: 10, total: 0 } })),
+  };
+});
+