@sleep2agi/commhub-server 0.9.0-preview.75 → 0.9.0-preview.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sleep2agi/commhub-server",
-  "version": "0.9.0-preview.75",
+  "version": "0.9.0-preview.76",
   "description": "CommHub Server — AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and MCP tools (17 collaboration-core + node/provider ops tools; authoritative list: docs-site/docs/api/mcp-tools.md).",
   "type": "module",
   "main": "src/index.ts",

package/src/requirements-people-http.test.ts

@@ -0,0 +1,114 @@
+// GET /api/requirements/people 的 display_name 字段 —— HTTP 集成测试(真实 Bun.serve,私有端口,临时库)。
+// test2123 在真实 PostgreSQL 上原样再跑一遍(COMMHUB_TEST_PG_URL)。
+//
+// name 保持原样:成员 = display_name,没设回落到用户名;节点 = display_name → alias → node_name(旧 app 只读它)。
+// display_name 另给一份,没设就是 "" —— 分享图等对外场景据此不把 admin 之类的账号名印出去。
+// 成员的 display_name 等于用户名也返回 "":register() 没给显示名时存的就是 username。
+
+import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
+const DIR = mkdtempSync(join(tmpdir(), "anet-req-people-"));
+process.env.COMMHUB_DB ||= join(DIR, "hub.db");
+process.env.COMMHUB_UPLOADS_DIR = join(DIR, "uploads");
+process.env.HOST = "127.0.0.1";
+const PW = "ReqPeoplePassw0rd!x";
+
+let BASE = "";
+let hub: any = null;
+let NET = "";
+let owner = { token: "", id: "", username: "" };
+let named = { id: "" };
+let plain = { id: "", username: "" };
+let same = { id: "", username: "" };
+
+async function people(token: string) {
+  const res = await fetch(`${BASE}/api/requirements/people?network_id=${NET}`, { headers: { Authorization: `Bearer ${token}` } });
+  return { status: res.status, body: await res.json() as any };
+}
+
+beforeAll(async () => {
+  const { db } = await import("./db.js");
+  const { addNetworkMember, register } = await import("./auth.js");
+  const stamp = Date.now();
+  const o = register(`rp_owner_${stamp}`, PW, undefined, "");
+  expect(o.ok).toBe(true);
+  owner = { token: o.token!, id: o.user!.user_id, username: o.user!.username };
+  NET = o.network_id!;
+  const m = register(`rp_member_${stamp}`, PW, undefined, "");
+  expect(m.ok).toBe(true);
+  named = { id: m.user!.user_id };
+  addNetworkMember(NET, named.id, "member", owner.id, { taskAccess: "all" });
+  // owner:没有显示名(= 只有用户名);member:有显示名。
+  db.run("UPDATE users SET display_name = NULL WHERE user_id = ?1", [owner.id]);
+  db.run("UPDATE users SET display_name = ?1 WHERE user_id = ?2", ["Placeholder Person", named.id]);
+  // plain:注册时没给显示名 —— register() 存的是 display_name = username,不改。
+  const pl = register(`rp_plain_${stamp}`, PW);
+  expect(pl.ok).toBe(true);
+  plain = { id: pl.user!.user_id, username: pl.user!.username };
+  addNetworkMember(NET, plain.id, "member", owner.id, { taskAccess: "all" });
+  // same:显示名被显式设成和用户名一模一样。
+  const sm = register(`rp_same_${stamp}`, PW, undefined, "Placeholder Other");
+  expect(sm.ok).toBe(true);
+  same = { id: sm.user!.user_id, username: sm.user!.username };
+  addNetworkMember(NET, same.id, "member", owner.id, { taskAccess: "all" });
+  db.run("UPDATE users SET display_name = username WHERE user_id = ?1", [same.id]);
+  db.run("INSERT INTO nodes(node_id,node_name,alias,display_name,network_id) VALUES (?1,?2,?3,?4,?5)", ["rp-node-alias", "rp-node-name", "placeholder-alias", "", NET]);
+  db.run("INSERT INTO nodes(node_id,node_name,alias,display_name,network_id) VALUES (?1,?2,?3,?4,?5)", ["rp-node-named", "rp-node-name-2", "placeholder-alias-2", "Placeholder Agent", NET]);
+  db.run("INSERT INTO nodes(node_id,node_name,network_id) VALUES (?1,?2,?3)", ["rp-node-bare", "rp-node-bare-name", NET]);
+  const mod: any = await import("./server.js");
+  hub = mod.bootServer({ port: 0, hostname: "127.0.0.1" });
+  BASE = `http://127.0.0.1:${hub.port}`;
+}, 30_000);
+
+afterAll(() => {
+  try { hub?.stop?.(true); } catch {}
+  try { rmSync(DIR, { recursive: true, force: true }); } catch {}
+});
+
+describe("GET /api/requirements/people display_name", () => {
+  test("display_name is its own field, empty when unset; name keeps the username / alias fallback", async () => {
+    const r = await people(owner.token);
+    expect(r.status).toBe(200);
+    const find = (kind: string, id: string) => r.body.people.find((p: any) => p.kind === kind && p.id === id);
+    expect(find("user", owner.id)).toMatchObject({ name: owner.username, display_name: "", networkId: NET });
+    expect(find("user", named.id)).toMatchObject({ name: "Placeholder Person", display_name: "Placeholder Person" });
+    expect(find("node", "rp-node-alias")).toMatchObject({ name: "placeholder-alias", display_name: "" });
+    expect(find("node", "rp-node-named")).toMatchObject({ name: "Placeholder Agent", display_name: "Placeholder Agent" });
+    expect(find("node", "rp-node-bare")).toMatchObject({ name: "rp-node-bare-name", display_name: "" });
+    expect(r.body.people.every((p: any) => typeof p.display_name === "string")).toBe(true);
+  });
+
+  test("a member whose display_name is just the username gets display_name \"\" (name still the username)", async () => {
+    const { db } = await import("./db.js");
+    // 前提是真的:register() 没给显示名时存的就是用户名。
+    expect(db.get<{ display_name: string }>("SELECT display_name FROM users WHERE user_id = ?1", plain.id)!.display_name).toBe(plain.username);
+    const r = await people(owner.token);
+    const find = (id: string) => r.body.people.find((p: any) => p.kind === "user" && p.id === id);
+    expect(find(plain.id)).toMatchObject({ name: plain.username, display_name: "" });
+    expect(find(same.id)).toMatchObject({ name: same.username, display_name: "" });
+    // 显示名只是「包含」用户名、不等于它:照常返回。
+    db.run("UPDATE users SET display_name = ?1 WHERE user_id = ?2", [`${same.username} (placeholder)`, same.id]);
+    const r2 = await people(owner.token);
+    expect(r2.body.people.find((p: any) => p.kind === "user" && p.id === same.id)).toMatchObject({ display_name: `${same.username} (placeholder)` });
+    db.run("UPDATE users SET display_name = username WHERE user_id = ?1", [same.id]);
+  });
+
+  test("sort order is still by name, then id", async () => {
+    const r = await people(owner.token);
+    const users = r.body.people.filter((p: any) => p.kind === "user");
+    const sorted = [...users].sort((a: any, b: any) => (a.name < b.name ? -1 : a.name > b.name ? 1 : a.id < b.id ? -1 : 1));
+    expect(users.map((p: any) => p.id)).toEqual(sorted.map((p: any) => p.id));
+  });
+
+  test("the existing fields keep their shape for old apps", async () => {
+    const r = await people(owner.token);
+    for (const p of r.body.people) {
+      expect(Object.keys(p).sort()).toEqual(["display_name", "id", "kind", "name", "networkId"]);
+      expect(typeof p.name).toBe("string");
+      expect(p.name.length).toBeGreaterThan(0);
+    }
+  });
+});

package/src/requirements.ts

@@ -1155,12 +1155,16 @@ async function handleRequirementsRequestInner(ctx: RequirementsRequestContext):
   if (url.pathname === '/api/requirements/people' && req.method === 'GET') {
     const networkId = resolveRestWriteNetworkId(ctx.scope, ctx.auth, ctx.isAdmin);
     if (!networkId) return jsonError('network_id_required', 400);
-    const users = db.all<{ id: string; name: string }>(
-      "SELECT u.user_id AS id, COALESCE(NULLIF(u.display_name,''), u.username) AS name FROM network_members m JOIN users u ON u.user_id=m.user_id WHERE m.network_id=?1 ORDER BY name, id", networkId,
+    // name = 显示用的名字(没设 display_name 时回落到用户名 / alias,旧 app 只读它);display_name 单独给出、没设为 ""
+    // —— 分享图等对外场景据此判断「只有用户名」,不把 admin 之类的账号名印出去。
+    // 成员的 display_name 等于用户名也算「没设」:register() 在没给显示名时存的就是 username(auth.ts),
+    // 否则没设过显示名的账号(比如 admin)照样把账号名当显示名送出去。
+    const users = db.all<{ id: string; name: string; display_name: string }>(
+      "SELECT u.user_id AS id, COALESCE(NULLIF(u.display_name,''), u.username) AS name, CASE WHEN u.display_name IS NULL OR u.display_name = '' OR u.display_name = u.username THEN '' ELSE u.display_name END AS display_name FROM network_members m JOIN users u ON u.user_id=m.user_id WHERE m.network_id=?1 ORDER BY name, id", networkId,
     );
     const hidden = hiddenNodeFilter(ctx, networkId);
-    const nodes = db.all<{ id: string; name: string }>(
-      "SELECT node_id AS id, COALESCE(NULLIF(display_name,''), NULLIF(alias,''), node_name) AS name FROM nodes WHERE network_id=?1 ORDER BY name, id", networkId,
+    const nodes = db.all<{ id: string; name: string; display_name: string }>(
+      "SELECT node_id AS id, COALESCE(NULLIF(display_name,''), NULLIF(alias,''), node_name) AS name, COALESCE(display_name,'') AS display_name FROM nodes WHERE network_id=?1 ORDER BY name, id", networkId,
     ).filter(row => !hidden?.(row.id));
     return Response.json({ ok: true, people: [...users.map(row => ({ ...row, kind: 'user', networkId })), ...nodes.map(row => ({ ...row, kind: 'node', networkId }))] });
   }