mslxdff 0.1.199 → 0.1.203

package/src/routes/groups.js

@@ -1,122 +1,122 @@
-import { clientIp, json, readBody, errMsg } from "./helpers.js";
-import { fmtShanghaiYMDHMS } from "../time.js";
-
-export async function joinHandler({ req, res, groups, token, bans }) {
-  if (!groups) return json(res, 501, { error: "Groups service not configured" });
-  const ip = clientIp(req);
-  const banned = bans?.isBanned(ip);
-  if (banned) {
-    return json(res, 403, { error: `banned until ${fmtShanghaiYMDHMS(banned.until)}` });
-  }
-  let body;
-  try {
-    body = await readBody(req);
-  } catch {
-    return json(res, 400, { error: "Invalid JSON body" });
-  }
-  if (!body?.name) return json(res, 400, { error: "group name is required" });
-
-  const fail = (msg) => {
-    try {
-      if (bans) {
-        const b = bans.recordFailure(ip);
-        if (b) console.error(`${ip} banned (${bans.threshold} failed joins)`);
-      }
-    } catch {}
-    return json(res, 403, { error: msg });
-  };
-
-  if (!body.key) {
-    const auth = /^Bearer (.+)$/.exec(req.headers["authorization"] || "");
-    const hit = auth && groups.membersForToken(body.name, auth[1]);
-    if (!hit) return fail("invalid member token");
-    try {
-      const isBroadbandRe = String(body.url || hit.member?.url || "").startsWith("relay://") || body.kind === "broadband" || hit.member?.kind === "broadband";
-      const extra = {};
-      if (isBroadbandRe) {
-        extra.kind = "broadband";
-        extra.publicIp = ip;
-        extra.lastSeen = Date.now();
-        if (body.url) extra.url = String(body.url);
-      }
-      const refreshed = groups.upsertMember(body.name, {
-        memberName: body.memberName,
-        url: body.url || hit.member.url,
-        token: body.token || hit.member.token,
-        kind: extra.kind,
-        publicIp: extra.publicIp,
-        lastSeen: extra.lastSeen,
-      });
-      if (isBroadbandRe && refreshed) {
-        const targetId = Object.keys(refreshed).find((k) => refreshed[k].url === (body.url || hit.member.url));
-        if (targetId) {
-          refreshed[targetId].publicIp = ip;
-          refreshed[targetId].lastSeen = Date.now();
-          refreshed[targetId].kind = "broadband";
-        }
-      }
-      return json(res, 200, { object: "group", name: body.name, members: refreshed });
-    } catch (err) {
-      return json(res, 400, { error: errMsg(err) });
-    }
-  }
-
-  try {
-    const youPort = Number(body.myPort);
-    const youUrl = Number.isInteger(youPort) && youPort > 0 ? `http://${ip}:${youPort}` : "";
-    let memberUrl = String(body.url || youUrl);
-    if (!memberUrl) throw new Error("member url is required");
-    const isBroadband = String(memberUrl).startsWith("relay://") || body.kind === "broadband";
-    if (isBroadband) {
-      memberUrl = String(body.url || memberUrl);
-    }
-    const members = groups.addMember(body.name, {
-      key: body.key,
-      memberName: body.memberName,
-      url: memberUrl,
-      token: body.token,
-      kind: isBroadband ? "broadband" : "static",
-      publicIp: isBroadband ? ip : undefined,
-      lastSeen: isBroadband ? Date.now() : undefined,
-    });
-    if (bans) bans.clear(ip);
-    if (!members.leader) {
-      const leaderUrl = String(body.leaderUrl || "").replace(/\/+$/, "");
-      if (leaderUrl) {
-        groups.upsertMember(body.name, { memberName: "leader", url: leaderUrl, token });
-        Object.assign(members, { leader: { url: leaderUrl, token } });
-      }
-    }
-    json(res, 200, { object: "group", name: body.name, members, you: { url: memberUrl } });
-  } catch (err) {
-    return fail(errMsg(err));
-  }
-}
-
-export async function leaveHandler({ req, res, groups }) {
-  if (!groups) return json(res, 501, { error: "Groups service not configured" });
-  let body;
-  try {
-    body = await readBody(req);
-  } catch {
-    return json(res, 400, { error: "Invalid JSON body" });
-  }
-  if (!body?.name) return json(res, 400, { error: "group name is required" });
-  const auth = /^Bearer (.+)$/.exec(req.headers["authorization"] || "");
-  if (!auth) return json(res, 401, { error: "bearer token required" });
-  const group = groups.list()[body.name];
-  if (!group) return json(res, 404, { error: `group "${body.name}" not found` });
-  const hit = groups.membersForToken(body.name, auth[1]);
-  if (!hit) return json(res, 403, { error: "invalid member token" });
-  try {
-    const removed = groups.removeMember(body.name, { url: hit.member.url });
-    return json(res, 200, {
-      object: "group",
-      name: body.name,
-      removed: removed?.removed ?? null,
-      members: groups.list()[body.name]?.members ?? {},
-    });
-  } catch (err) {
-    return json(res, 400, { error: errMsg(err) });
-  }
-}
+import { clientIp, json, readBody, errMsg } from "./helpers.js";
+import { fmtShanghaiYMDHMS } from "../time.js";
+
+export async function joinHandler({ req, res, groups, token, bans }) {
+  if (!groups) return json(res, 501, { error: "Groups service not configured" });
+  const ip = clientIp(req);
+  const banned = bans?.isBanned(ip);
+  if (banned) {
+    return json(res, 403, { error: `banned until ${fmtShanghaiYMDHMS(banned.until)}` });
+  }
+  let body;
+  try {
+    body = await readBody(req);
+  } catch {
+    return json(res, 400, { error: "Invalid JSON body" });
+  }
+  if (!body?.name) return json(res, 400, { error: "group name is required" });
+
+  const fail = (msg) => {
+    try {
+      if (bans) {
+        const b = bans.recordFailure(ip);
+        if (b) console.error(`${ip} banned (${bans.threshold} failed joins)`);
+      }
+    } catch {}
+    return json(res, 403, { error: msg });
+  };
+
+  if (!body.key) {
+    const auth = /^Bearer (.+)$/.exec(req.headers["authorization"] || "");
+    const hit = auth && groups.membersForToken(body.name, auth[1]);
+    if (!hit) return fail("invalid member token");
+    try {
+      const isBroadbandRe = String(body.url || hit.member?.url || "").startsWith("relay://") || body.kind === "broadband" || hit.member?.kind === "broadband";
+      const extra = {};
+      if (isBroadbandRe) {
+        extra.kind = "broadband";
+        extra.publicIp = ip;
+        extra.lastSeen = Date.now();
+        if (body.url) extra.url = String(body.url);
+      }
+      const refreshed = groups.upsertMember(body.name, {
+        memberName: body.memberName,
+        url: body.url || hit.member.url,
+        token: body.token || hit.member.token,
+        kind: extra.kind,
+        publicIp: extra.publicIp,
+        lastSeen: extra.lastSeen,
+      });
+      if (isBroadbandRe && refreshed) {
+        const targetId = Object.keys(refreshed).find((k) => refreshed[k].url === (body.url || hit.member.url));
+        if (targetId) {
+          refreshed[targetId].publicIp = ip;
+          refreshed[targetId].lastSeen = Date.now();
+          refreshed[targetId].kind = "broadband";
+        }
+      }
+      return json(res, 200, { object: "group", name: body.name, members: refreshed });
+    } catch (err) {
+      return json(res, 400, { error: errMsg(err) });
+    }
+  }
+
+  try {
+    const youPort = Number(body.myPort);
+    const youUrl = Number.isInteger(youPort) && youPort > 0 ? `http://${ip}:${youPort}` : "";
+    let memberUrl = String(body.url || youUrl);
+    if (!memberUrl) throw new Error("member url is required");
+    const isBroadband = String(memberUrl).startsWith("relay://") || body.kind === "broadband";
+    if (isBroadband) {
+      memberUrl = String(body.url || memberUrl);
+    }
+    const members = groups.addMember(body.name, {
+      key: body.key,
+      memberName: body.memberName,
+      url: memberUrl,
+      token: body.token,
+      kind: isBroadband ? "broadband" : "static",
+      publicIp: isBroadband ? ip : undefined,
+      lastSeen: isBroadband ? Date.now() : undefined,
+    });
+    if (bans) bans.clear(ip);
+    if (!members.leader) {
+      const leaderUrl = String(body.leaderUrl || "").replace(/\/+$/, "");
+      if (leaderUrl) {
+        groups.upsertMember(body.name, { memberName: "leader", url: leaderUrl, token });
+        Object.assign(members, { leader: { url: leaderUrl, token } });
+      }
+    }
+    json(res, 200, { object: "group", name: body.name, members, you: { url: memberUrl } });
+  } catch (err) {
+    return fail(errMsg(err));
+  }
+}
+
+export async function leaveHandler({ req, res, groups }) {
+  if (!groups) return json(res, 501, { error: "Groups service not configured" });
+  let body;
+  try {
+    body = await readBody(req);
+  } catch {
+    return json(res, 400, { error: "Invalid JSON body" });
+  }
+  if (!body?.name) return json(res, 400, { error: "group name is required" });
+  const auth = /^Bearer (.+)$/.exec(req.headers["authorization"] || "");
+  if (!auth) return json(res, 401, { error: "bearer token required" });
+  const group = groups.list()[body.name];
+  if (!group) return json(res, 404, { error: `group "${body.name}" not found` });
+  const hit = groups.membersForToken(body.name, auth[1]);
+  if (!hit) return json(res, 403, { error: "invalid member token" });
+  try {
+    const removed = groups.removeMember(body.name, { url: hit.member.url });
+    return json(res, 200, {
+      object: "group",
+      name: body.name,
+      removed: removed?.removed ?? null,
+      members: groups.list()[body.name]?.members ?? {},
+    });
+  } catch (err) {
+    return json(res, 400, { error: errMsg(err) });
+  }
+}

package/src/routes/helpers.js

@@ -1,83 +1,83 @@
-import { timingSafeEqual, createHash } from "node:crypto";
-
-export const errMsg = (err) => String(err?.message || err);
-
-export function clientIp(req) {
-  const fwd = req.headers["x-forwarded-for"];
-  const head = typeof fwd === "string" ? fwd.split(",")[0].trim() : "";
-  const raw = String(head || req.socket.remoteAddress || "");
-  return raw.replace(/^::ffff:/, "").replace(/^::1$/, "127.0.0.1") || null;
-}
-
-export function authorized(req, token) {
-  const header = req.headers["authorization"] || "";
-  const match = /^Bearer (.+)$/.exec(header);
-  if (!match) return false;
-  const digests = (s) => createHash("sha256").update(s).digest();
-  return timingSafeEqual(digests(match[1]), digests(token));
-}
-
-export function json(res, status, body) {
-  // 幂等守卫：已收场的响应必须 no-op（空轮 hold 后多处共用收场出口，二次 end 会抛）
-  if (!res || res.writableEnded) return;
-  if (!res.headersSent) {
-    res.statusCode = status;
-    try { res.setHeader("Content-Type", "application/json"); } catch { /* ignore */ }
-    try { res.end(JSON.stringify(body)); } catch { /* ignore */ }
-    return;
-  }
-  // headers 已 flush（failover 前候选写过 SSE 注释帧、或空轮 hold 期间发过 keepalive）：
-  // 设 statusCode 会抛 ERR_HTTP_HEADERS_SENT，写 JSON 体更会把 application/json 混进 text/event-stream
-  // （客户端只会当噪声丢掉，等于悄悄吞掉错误）。SSE 一律改用 in-band 错误帧 + [DONE] 收场。
-  const ct = typeof res.getHeader === "function" ? String(res.getHeader("content-type") || "") : "";
-  if (ct.includes("text/event-stream")) {
-    try {
-      const msg = body && typeof body === "object" ? String(body.error ?? body.message ?? JSON.stringify(body)) : String(body ?? "error");
-      res.write(`data: ${JSON.stringify({ error: { message: msg, type: "mslxdff_error" } })}\n\n`);
-      res.write("data: [DONE]\n\n");
-    } catch { /* 下游已断 */ }
-  }
-  try { res.end(); } catch { /* ignore */ }
-}
-
-export function notFound(res) {
-  return json(res, 404, { error: "Not Found" });
-}
-
-export function readBody(req) {
-  return new Promise((resolve, reject) => {
-    let data = "";
-    req.on("data", (c) => (data += c));
-    req.on("end", () => {
-      try {
-        resolve(data ? JSON.parse(data) : {});
-      } catch (err) {
-        reject(err);
-      }
-    });
-    req.on("error", reject);
-  });
-}
-
-export function parseHops(header) {
-  const n = Number(header);
-  return Number.isInteger(n) && n >= 0 ? n : 0;
-}
-
-export const PROMPT_MAX_LEN = 160;
-
-export function summarizePrompt(body) {
-  const msgs = body?.messages;
-  if (!Array.isArray(msgs) || !msgs.length) return "";
-  const msg = msgs[msgs.length - 1];
-  const c = msg?.content;
-  let text = "";
-  if (typeof c === "string") text = c;
-  else if (Array.isArray(c)) {
-    text = c
-      .map((p) => (typeof p === "string" ? p : p && typeof p.text === "string" ? p.text : ""))
-      .join(" ");
-  }
-  text = String(text || "").replace(/\s+/g, " ").trim();
-  return text.length > PROMPT_MAX_LEN ? text.slice(0, PROMPT_MAX_LEN) + "…" : text;
-}
+import { timingSafeEqual, createHash } from "node:crypto";
+
+export const errMsg = (err) => String(err?.message || err);
+
+export function clientIp(req) {
+  const fwd = req.headers["x-forwarded-for"];
+  const head = typeof fwd === "string" ? fwd.split(",")[0].trim() : "";
+  const raw = String(head || req.socket.remoteAddress || "");
+  return raw.replace(/^::ffff:/, "").replace(/^::1$/, "127.0.0.1") || null;
+}
+
+export function authorized(req, token) {
+  const header = req.headers["authorization"] || "";
+  const match = /^Bearer (.+)$/.exec(header);
+  if (!match) return false;
+  const digests = (s) => createHash("sha256").update(s).digest();
+  return timingSafeEqual(digests(match[1]), digests(token));
+}
+
+export function json(res, status, body) {
+  // 幂等守卫：已收场的响应必须 no-op（空轮 hold 后多处共用收场出口，二次 end 会抛）
+  if (!res || res.writableEnded) return;
+  if (!res.headersSent) {
+    res.statusCode = status;
+    try { res.setHeader("Content-Type", "application/json"); } catch { /* ignore */ }
+    try { res.end(JSON.stringify(body)); } catch { /* ignore */ }
+    return;
+  }
+  // headers 已 flush（failover 前候选写过 SSE 注释帧、或空轮 hold 期间发过 keepalive）：
+  // 设 statusCode 会抛 ERR_HTTP_HEADERS_SENT，写 JSON 体更会把 application/json 混进 text/event-stream
+  // （客户端只会当噪声丢掉，等于悄悄吞掉错误）。SSE 一律改用 in-band 错误帧 + [DONE] 收场。
+  const ct = typeof res.getHeader === "function" ? String(res.getHeader("content-type") || "") : "";
+  if (ct.includes("text/event-stream")) {
+    try {
+      const msg = body && typeof body === "object" ? String(body.error ?? body.message ?? JSON.stringify(body)) : String(body ?? "error");
+      res.write(`data: ${JSON.stringify({ error: { message: msg, type: "mslxdff_error" } })}\n\n`);
+      res.write("data: [DONE]\n\n");
+    } catch { /* 下游已断 */ }
+  }
+  try { res.end(); } catch { /* ignore */ }
+}
+
+export function notFound(res) {
+  return json(res, 404, { error: "Not Found" });
+}
+
+export function readBody(req) {
+  return new Promise((resolve, reject) => {
+    let data = "";
+    req.on("data", (c) => (data += c));
+    req.on("end", () => {
+      try {
+        resolve(data ? JSON.parse(data) : {});
+      } catch (err) {
+        reject(err);
+      }
+    });
+    req.on("error", reject);
+  });
+}
+
+export function parseHops(header) {
+  const n = Number(header);
+  return Number.isInteger(n) && n >= 0 ? n : 0;
+}
+
+export const PROMPT_MAX_LEN = 160;
+
+export function summarizePrompt(body) {
+  const msgs = body?.messages;
+  if (!Array.isArray(msgs) || !msgs.length) return "";
+  const msg = msgs[msgs.length - 1];
+  const c = msg?.content;
+  let text = "";
+  if (typeof c === "string") text = c;
+  else if (Array.isArray(c)) {
+    text = c
+      .map((p) => (typeof p === "string" ? p : p && typeof p.text === "string" ? p.text : ""))
+      .join(" ");
+  }
+  text = String(text || "").replace(/\s+/g, " ").trim();
+  return text.length > PROMPT_MAX_LEN ? text.slice(0, PROMPT_MAX_LEN) + "…" : text;
+}