@ysgroup/core 0.1.8 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ysgroup/core",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -16,4 +16,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/index.ts

@@ -1,5 +1,5 @@
 /* @ysgroup/core —— 前端运行时：WS RPC 客户端 / 登录态 / 差量订阅 / REST。 */
 
-export { YsWsClient, type Envelope } from "./ws";
+export { YsWsClient, YsRpcError, type Envelope } from "./ws";
 export { useYsStore } from "./store";
 export { YsRest, YsRestError, type YsAdminRpcCall, type DeleteBlocker, type DeleteImpact, type RevealedCredential, type TopologyNode } from "./rest";

package/src/rest.ts

@@ -1,5 +1,7 @@
 /* @ysgroup/core —— 管理接口客户端（支持 HTTP 或统一 WS RPC 传输）。 */
 
+import { YsRpcError } from "./ws";
+
 export type YsAdminRpcCall = (data: {
   method: string;
   path: string;
@@ -213,9 +215,10 @@ export class YsRest {
   getUserApps(id: string) {
     return this.request<{ app_id: string; admin: boolean }[]>("GET", `/api/users/${id}/apps`);
   }
-  setUserApps(id: string, grants: { app_id: string; admin: boolean }[]) {
+  setUserApps(id: string, grants: { app_id: string; admin: boolean }[], reason = "") {
     return this.request<{ grants: { app_id: string; admin: boolean }[] }>("PUT", `/api/users/${id}/apps`, {
       grants,
+      reason,
     });
   }
   uploadOpenAccountConfirmation(ownerId: string, file: File) {
@@ -237,8 +240,8 @@ export class YsRest {
   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[], reason = "") {
+    return this.request<{ ids: string[] }>("PUT", `/api/${entity}/${id}/relations/${relation}`, { ids, reason });
   }
   listOwnerFiles(ownerId: string) {
     return this.request<Record<string, unknown>[]>("GET", `/api/owners/${ownerId}/files`);
@@ -264,6 +267,15 @@ export class YsRest {
 }
 
 function rpcError(error: unknown): YsRestError {
+  if (error instanceof YsRpcError) {
+    let detail: unknown = error.clientMessage;
+    try {
+      detail = JSON.parse(error.clientMessage);
+    } catch {
+      // 普通文本错误保持原文。
+    }
+    return new YsRestError(error.code, detail);
+  }
   const message = String(error).replace(/^Error:\s*/, "");
   const match = message.match(/^\[(\d+)\]\s*(.*)$/s);
   if (!match) return new YsRestError(500, message);

package/src/ws.ts

@@ -6,10 +6,27 @@ export interface Envelope {
   reply_to?: string;
   code?: number;
   message?: string;
+  request_id?: string;
   ts?: number;
   data?: unknown;
 }
 
+/** 服务端非零信封。500 时展示文案附带编号，便于对照日志。 */
+export class YsRpcError extends Error {
+  readonly clientMessage: string;
+
+  constructor(
+    public code: number,
+    message: string,
+    public requestId = "",
+  ) {
+    const display = code >= 500 && requestId ? `${message}（编号 ${requestId}）` : message;
+    super(display);
+    this.name = "YsRpcError";
+    this.clientMessage = message;
+  }
+}
+
 type EventHandler = (data: unknown) => void;
 
 export class YsWsClient {
@@ -106,7 +123,7 @@ export class YsWsClient {
       if (p) {
         this.pending.delete(msg.reply_to);
         if ((msg.code ?? 0) === 0) p.resolve(msg.data);
-        else p.reject(new Error(`[${msg.code}] ${msg.message ?? ""}`));
+        else p.reject(new YsRpcError(msg.code ?? 500, msg.message ?? "", msg.request_id ?? ""));
       }
       return;
     }