@ysgroup/core 0.1.0 → 0.1.2

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@ysgroup/core",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "main": "src/index.ts",
   "types": "src/index.ts",
-  "dependencies": {
-    "@ysgroup/contracts": "0.1.1"
-  },
   "peerDependencies": {
     "pinia": ">=2.2",
     "vue": ">=3.5"

package/src/rest.ts

@@ -85,26 +85,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,17 +190,11 @@ 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`);
@@ -217,9 +215,10 @@ export class YsRest {
 export interface TopologyNode {
   name: string;
   title: string;
-  kind: string;
+  kind: "service" | "link";
   status: string;
   port: number;
+  logo_url?: string;
   online: boolean;
   last_heartbeat_at: number;
   subscribed_tables: 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,
   };