@ysgroup/core 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ysgroup/core",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/index.ts

@@ -5,6 +5,7 @@ export { useYsStore } from "./store";
 export {
 	YsRest,
 	YsRestError,
+	type YsAdminRpcCall,
 	type DeleteBlocker,
 	type DeleteImpact,
 	type RevealedCredential,

package/src/rest.ts

@@ -1,4 +1,13 @@
-/* @ysgroup/core —— REST 客户端（管理接口，带 JWT）。 */
+/* @ysgroup/core —— 管理接口客户端（支持 HTTP 或统一 WS RPC 传输）。 */
+
+export type YsAdminRpcCall = (data: {
+  method: string;
+  path: string;
+  access_token: string;
+  body?: unknown;
+  upload?: { name: string; content_type: string; base64: string };
+  user_agent: string;
+}) => Promise<unknown>;
 
 export class YsRestError extends Error {
   constructor(
@@ -33,9 +42,23 @@ export class YsRest {
   constructor(
     private baseUrl: string,
     private getToken: () => string,
+    private rpcCall?: YsAdminRpcCall,
   ) {}
 
   private async request<T>(method: string, path: string, body?: unknown): Promise<T> {
+    if (this.rpcCall) {
+      try {
+        return await this.rpcCall({
+          method,
+          path,
+          access_token: this.getToken(),
+          body,
+          user_agent: navigator.userAgent,
+        }) as T;
+      } catch (error) {
+        throw rpcError(error);
+      }
+    }
     const resp = await fetch(`${this.baseUrl}${path}`, {
       method,
       headers: {
@@ -59,6 +82,23 @@ export class YsRest {
   }
 
   private async upload<T>(path: string, file: File): Promise<T> {
+    if (this.rpcCall) {
+      try {
+        return await this.rpcCall({
+          method: "POST",
+          path,
+          access_token: this.getToken(),
+          upload: {
+            name: file.name,
+            content_type: file.type || "application/octet-stream",
+            base64: await fileToBase64(file),
+          },
+          user_agent: navigator.userAgent,
+        }) as T;
+      } catch (error) {
+        throw rpcError(error);
+      }
+    }
     const form = new FormData();
     form.append("upload", file);
     const resp = await fetch(`${this.baseUrl}${path}`, {
@@ -73,6 +113,10 @@ export class YsRest {
     return (await resp.json()) as T;
   }
 
+  raw<T>(method: string, path: string, body?: unknown) {
+    return this.request<T>(method, path, body);
+  }
+
   list<T = Record<string, unknown>>(table: string) {
     return this.request<T[]>("GET", `/api/tables/${table}`);
   }
@@ -85,26 +129,30 @@ export class YsRest {
   deleteImpact(table: string, id: string) {
     return this.request<DeleteImpact>("GET", `/api/tables/${table}/${id}/delete-impact`);
   }
-  revealCredentials(table: string, id: string, body: {
-    fields: string[];
-    password: string;
-    reason: string;
-  }) {
+  revealCredentials(
+    table: string,
+    id: string,
+    body: {
+      fields: string[];
+      password: string;
+      reason: string;
+    },
+  ) {
     return this.request<{
       credentials: Record<string, RevealedCredential>;
       expires_in: number;
     }>("POST", `/api/tables/${table}/${id}/credentials/reveal`, body);
   }
-  updateCredentials(table: string, id: string, body: {
-    credentials: Record<string, string>;
-    password: string;
-    reason: string;
-  }) {
-    return this.request<{ updated_fields: string[] }>(
-      "POST",
-      `/api/tables/${table}/${id}/credentials/update`,
-      body,
-    );
+  updateCredentials(
+    table: string,
+    id: string,
+    body: {
+      credentials: Record<string, string>;
+      password: string;
+      reason: string;
+    },
+  ) {
+    return this.request<{ updated_fields: string[] }>("POST", `/api/tables/${table}/${id}/credentials/update`, body);
   }
   listApps() {
     return this.request<Record<string, unknown>[]>("GET", "/api/apps");
@@ -186,22 +234,23 @@ export class YsRest {
       owner_ids: ownerIds,
     });
   }
-  getRelations(entity: "owners" | "accounts", id: string,
-               relation: "apps" | "strategies") {
-    return this.request<{ ids: string[] }>(
-      "GET", `/api/${entity}/${id}/relations/${relation}`,
-    );
+  getRelations(entity: "owners" | "accounts", id: string, relation: "apps" | "strategies") {
+    return this.request<{ ids: string[] }>("GET", `/api/${entity}/${id}/relations/${relation}`);
   }
-  setRelations(entity: "owners" | "accounts", id: string,
-               relation: "apps" | "strategies", ids: string[]) {
-    return this.request<{ ids: string[] }>(
-      "PUT", `/api/${entity}/${id}/relations/${relation}`, { ids },
-    );
+  setRelations(entity: "owners" | "accounts", id: string, relation: "apps" | "strategies", ids: string[]) {
+    return this.request<{ ids: string[] }>("PUT", `/api/${entity}/${id}/relations/${relation}`, { ids });
   }
   listOwnerFiles(ownerId: string) {
     return this.request<Record<string, unknown>[]>("GET", `/api/owners/${ownerId}/files`);
   }
-  downloadFile(fileId: string) {
+  async downloadFile(fileId: string) {
+    if (this.rpcCall) {
+      const result = await this.request<{
+        base64: string;
+        content_type: string;
+      }>("GET", `/api/files/${fileId}/download`);
+      return base64ToBlob(result.base64, result.content_type);
+    }
     return fetch(`${this.baseUrl}/api/files/${fileId}/download`, {
       headers: { Authorization: `Bearer ${this.getToken()}` },
     }).then(async (resp) => {
@@ -214,6 +263,35 @@ export class YsRest {
   }
 }
 
+function rpcError(error: unknown): YsRestError {
+  const message = String(error).replace(/^Error:\s*/, "");
+  const match = message.match(/^\[(\d+)\]\s*(.*)$/s);
+  if (!match) return new YsRestError(500, message);
+  let detail: unknown = match[2];
+  try {
+    detail = JSON.parse(match[2]);
+  } catch {
+    // 普通文本错误保持原文。
+  }
+  return new YsRestError(Number(match[1]), detail);
+}
+
+function fileToBase64(file: File): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onerror = () => reject(reader.error ?? new Error("读取上传文件失败"));
+    reader.onload = () => resolve(String(reader.result).split(",", 2)[1] ?? "");
+    reader.readAsDataURL(file);
+  });
+}
+
+function base64ToBlob(value: string, contentType: string): Blob {
+  const binary = atob(value);
+  const bytes = new Uint8Array(binary.length);
+  for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
+  return new Blob([bytes], { type: contentType });
+}
+
 export interface TopologyNode {
   name: string;
   title: string;

package/src/store.ts

@@ -19,13 +19,14 @@ export const useYsStore = defineStore("ys", () => {
   const refreshToken = ref<string>(localStorage.getItem(LS_REFRESH) ?? "");
   const connected = ref(false);
   const appName = ref("");
+  const sessionMessage = ref("");
   /** 差量订阅的表数据：table -> Map<id, doc> */
   const tables = ref<Record<string, Map<string, Record<string, unknown>>>>({});
 
   let ws: YsWsClient | null = null;
   let renewTimer: ReturnType<typeof setTimeout> | null = null;
 
-  const isLoggedIn = computed(() => !!accessToken.value);
+  const isLoggedIn = computed(() => !!accessToken.value && !!user.value);
 
   function tableList(table: string): Record<string, unknown>[] {
     return Array.from(tables.value[table]?.values() ?? []);
@@ -41,7 +42,7 @@ export const useYsStore = defineStore("ys", () => {
     ws.on("__disconnected", () => (connected.value = false));
     ws.on("snapshot", (d: unknown) => applySnapshot(d as SnapshotData));
     ws.on("delta", (d: unknown) => applyDelta(d as DeltaData));
-    ws.on("user_revoked", (d: unknown) => onRevoked(d as { user_id: string }));
+    ws.on("user_revoked", (d: unknown) => onRevoked(d as { user_id: string; reason?: string }));
     ws.on("resync", () => {}); // 前端订阅本子系统后端，resync 由后端 SDK 处理
     ws.start();
   }
@@ -78,12 +79,28 @@ export const useYsStore = defineStore("ys", () => {
     tables.value = { ...tables.value, [d.table]: new Map(map) };
   }
 
-  function onRevoked(d: { user_id: string }) {
-    if (user.value && String(user.value._id) === d.user_id) void logout();
+  function onRevoked(d: { user_id: string; reason?: string }) {
+    if (!user.value || String(user.value._id) !== d.user_id) return;
+    clearSession();
+    sessionMessage.value = revokedMessage(d.reason);
+  }
+
+  function revokedMessage(reason = ""): string {
+    if (reason === "password_changed") {
+      return "登录密码已修改，您已从所有系统退出，请使用新密码重新登录。";
+    }
+    if (reason === "user_disabled" || reason === "disabled") {
+      return "账号已停用，请联系管理员。";
+    }
+    if (reason === "app_access_revoked") {
+      return "当前账号已无权访问该系统。";
+    }
+    return "登录状态已失效，请重新登录。";
   }
 
   async function login(username: string, password: string, otp = ""): Promise<void> {
     if (!ws) throw new Error("未连接");
+    sessionMessage.value = "";
     const result = (await ws.call("login", {
       username,
       password,
@@ -135,6 +152,7 @@ export const useYsStore = defineStore("ys", () => {
   }
 
   function setSession(result: LoginResult) {
+    sessionMessage.value = "";
     if (result.user) user.value = result.user;
     accessToken.value = result.access_token;
     refreshToken.value = result.refresh_token;
@@ -162,7 +180,7 @@ export const useYsStore = defineStore("ys", () => {
       localStorage.setItem(LS_REFRESH, result.refresh_token);
       scheduleRenew(result.access_expires_in);
     } catch {
-      void logout();
+      clearSession();
     }
   }
 
@@ -189,7 +207,7 @@ export const useYsStore = defineStore("ys", () => {
   }
 
   return {
-    user, accessToken, refreshToken, connected, isLoggedIn, tables,
+    user, accessToken, refreshToken, connected, isLoggedIn, sessionMessage, tables,
     tableList, connect, login, loginByCode, waitUntilConnected, changeMyPassword, renew, logout,
     client: () => ws,
   };