@ysgroup/core 0.1.2 → 0.1.4

package/package.json

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

package/src/index.ts

@@ -2,11 +2,4 @@
 
 export { YsWsClient, type Envelope } from "./ws";
 export { useYsStore } from "./store";
-export {
-	YsRest,
-	YsRestError,
-	type DeleteBlocker,
-	type DeleteImpact,
-	type RevealedCredential,
-	type TopologyNode,
-} from "./rest";
+export { YsRest, YsRestError, type YsAdminRpcCall, type DeleteBlocker, type DeleteImpact, type RevealedCredential, type TopologyNode } from "./rest";

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}`);
   }
@@ -199,7 +243,14 @@ export class YsRest {
   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) => {
@@ -212,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

@@ -139,7 +139,9 @@ export const useYsStore = defineStore("ys", () => {
     if (!ws || !accessToken.value) throw new Error("未登录");
     if (
       String(user.value?.role ?? "") === "Root" ||
-      String(user.value?.username ?? "").trim().toLowerCase() === "root"
+      String(user.value?.username ?? "")
+        .trim()
+        .toLowerCase() === "root"
     ) {
       throw new Error("Root 不允许修改登录密码");
     }
@@ -196,6 +198,11 @@ export const useYsStore = defineStore("ys", () => {
     clearSession();
   }
 
+  function forceLogout(message = "") {
+    clearSession();
+    sessionMessage.value = message;
+  }
+
   function clearSession() {
     user.value = null;
     accessToken.value = "";
@@ -207,8 +214,22 @@ export const useYsStore = defineStore("ys", () => {
   }
 
   return {
-    user, accessToken, refreshToken, connected, isLoggedIn, sessionMessage, tables,
-    tableList, connect, login, loginByCode, waitUntilConnected, changeMyPassword, renew, logout,
+    user,
+    accessToken,
+    refreshToken,
+    connected,
+    isLoggedIn,
+    sessionMessage,
+    tables,
+    tableList,
+    connect,
+    login,
+    loginByCode,
+    waitUntilConnected,
+    changeMyPassword,
+    renew,
+    logout,
+    forceLogout,
     client: () => ws,
   };
 });