@dev-anywhere/relay 0.4.64 → 0.4.65

package/dist/{chunk-PM4ZJUGS.js → chunk-H7OL7UK7.js}

@@ -62,6 +62,7 @@ import { z as z4 } from "zod";
 var providerValues = ["claude", "codex"];
 var ptyOwnerValues = ["local-terminal", "proxy-hosted"];
 var sessionModeValues = ["pty", "json"];
+var sessionKindValues = ["agent", "terminal"];
 
 // ../../packages/shared/dist/constants/pty.js
 var PtySemanticState = {
@@ -94,6 +95,7 @@ var agentStatusPhaseValues = [
 ];
 var SessionInfoSchema = z4.object({
   sessionId: IdSchema,
+  kind: z4.enum(sessionKindValues).optional(),
   name: z4.string().optional(),
   // cwd 只用于展示完整路径/tooltip，不作为前端路由或权限判断来源。
   cwd: z4.string().optional(),
@@ -505,6 +507,14 @@ var ProxyInfoSchema = z8.object({
   online: z8.boolean(),
   sessions: z8.array(z8.string()).optional()
 });
+var RelayClientInfoSchema = z8.object({
+  clientId: IdSchema,
+  proxyId: IdSchema.optional(),
+  connectedAt: z8.number().int().nonnegative(),
+  current: z8.boolean().optional(),
+  userAgent: z8.string().optional(),
+  remoteAddress: z8.string().optional()
+});
 var AgentCliAvailabilitySchema = z8.object({
   available: z8.boolean(),
   command: z8.string().optional(),
@@ -571,6 +581,21 @@ var relayControlDefinitions = [
     ...RequestIdShape,
     proxies: z8.array(ProxyInfoSchema)
   }),
+  control("relay_client_list_request", RequestIdShape),
+  control("relay_client_list_response", {
+    ...RequestIdShape,
+    clients: z8.array(RelayClientInfoSchema)
+  }),
+  control("relay_client_kick", { ...RequiredRequestIdShape, clientId: IdSchema }),
+  control("relay_client_kick_response", {
+    ...RequiredRequestIdShape,
+    clientId: IdSchema,
+    success: z8.boolean(),
+    ...RequestErrorShape
+  }),
+  control("relay_client_kicked", {
+    reason: z8.string().optional()
+  }),
   control("proxy_select", { ...RequestIdShape, proxyId: IdSchema }),
   control("proxy_select_response", {
     ...RequestIdShape,
@@ -810,9 +835,10 @@ var relayControlDefinitions = [
   // 远程创建 JSON 会话，client -> proxy -> response
   control("session_create", {
     ...RequestIdShape,
-    cwd: z8.string(),
+    kind: z8.enum(sessionKindValues).optional(),
+    cwd: z8.string().optional(),
     name: z8.string().optional(),
-    provider: z8.enum(providerValues),
+    provider: z8.enum(providerValues).optional(),
     mode: z8.enum(sessionModeValues).optional(),
     resumeSessionId: z8.string().optional(),
     // 透传给 claude CLI 的 --permission-mode, undefined 时 proxy 兜底为 "default"
@@ -824,6 +850,7 @@ var relayControlDefinitions = [
     sessionId: IdSchema.optional(),
     name: z8.string().optional(),
     nameLocked: z8.boolean().optional(),
+    kind: z8.enum(sessionKindValues).optional(),
     mode: z8.enum(sessionModeValues).optional(),
     provider: z8.enum(providerValues).optional(),
     ptyOwner: z8.enum(ptyOwnerValues).optional(),
@@ -902,6 +929,7 @@ var relayControlDefinitions = [
   control("session_sync", {
     sessions: z8.array(z8.object({
       id: z8.string(),
+      kind: z8.enum(sessionKindValues).optional(),
       mode: z8.enum(sessionModeValues),
       provider: z8.enum(providerValues),
       ptyOwner: z8.enum(ptyOwnerValues).optional(),
@@ -934,6 +962,11 @@ function isClientToProxyRelayControlType(type) {
   return ClientToProxyRelayControlTypes.has(type);
 }
 
+// ../../packages/shared/dist/constants/relay-close-codes.js
+var RelayCloseCode = {
+  CLIENT_KICKED: 4401
+};
+
 // ../../packages/shared/dist/binary-frame.js
 var SID_LEN_BYTES = 1;
 var SEQ_BYTES = 4;
@@ -977,7 +1010,7 @@ var proxyConnectionFSM = defineFSM({
 var RelayRegistry = class {
   proxyStates = /* @__PURE__ */ new Map();
   clientBindings = /* @__PURE__ */ new Map();
-  connectedClients = /* @__PURE__ */ new Set();
+  connectedClients = /* @__PURE__ */ new Map();
   registerProxy(proxyId, ws, name) {
     const existing = this.proxyStates.get(proxyId);
     if (existing) {
@@ -1135,21 +1168,43 @@ var RelayRegistry = class {
     }
     return count;
   }
-  addClientWs(ws) {
-    this.connectedClients.add(ws);
+  addClientWs(ws, metadata = {}) {
+    this.connectedClients.set(ws, {
+      connectedAt: metadata.connectedAt ?? Date.now(),
+      ...metadata.clientId !== void 0 ? { clientId: metadata.clientId } : {},
+      ...metadata.userAgent !== void 0 ? { userAgent: metadata.userAgent } : {},
+      ...metadata.remoteAddress !== void 0 ? { remoteAddress: metadata.remoteAddress } : {}
+    });
+  }
+  updateConnectedClientId(ws, clientId) {
+    const metadata = this.connectedClients.get(ws);
+    if (metadata) {
+      metadata.clientId = clientId;
+      return;
+    }
+    this.addClientWs(ws, { clientId });
   }
   removeClientWs(ws) {
     this.connectedClients.delete(ws);
   }
   getAllClientWs() {
     const clients = [];
-    for (const ws of this.connectedClients) {
+    for (const ws of this.connectedClients.keys()) {
       if (ws.readyState === WebSocket.OPEN) {
         clients.push(ws);
       }
     }
     return clients;
   }
+  getConnectedClientSockets(clientId) {
+    const sockets = [];
+    for (const [ws, metadata] of this.connectedClients) {
+      if (metadata.clientId === clientId && ws.readyState === WebSocket.OPEN) {
+        sockets.push(ws);
+      }
+    }
+    return sockets;
+  }
   // 获取单个 proxy 的详细状态信息
   getProxyDetail(proxyId) {
     const state = this.proxyStates.get(proxyId);
@@ -1176,6 +1231,22 @@ var RelayRegistry = class {
     }
     return details;
   }
+  getConnectedClientDetails(currentClientId) {
+    const details = [];
+    for (const [ws, metadata] of this.connectedClients) {
+      if (ws.readyState !== WebSocket.OPEN || !metadata.clientId) continue;
+      const binding = this.clientBindings.get(metadata.clientId);
+      details.push({
+        clientId: metadata.clientId,
+        ...binding?.proxyId !== void 0 ? { proxyId: binding.proxyId } : {},
+        connectedAt: metadata.connectedAt,
+        ...metadata.clientId === currentClientId ? { current: true } : {},
+        ...metadata.userAgent !== void 0 ? { userAgent: metadata.userAgent } : {},
+        ...metadata.remoteAddress !== void 0 ? { remoteAddress: metadata.remoteAddress } : {}
+      });
+    }
+    return details;
+  }
 };
 
 // src/health.ts
@@ -2335,6 +2406,7 @@ function handleVoiceConfigControl(msg, ws, store, logger, providers) {
 var MAX_JSON_MESSAGE_SIZE2 = 1 * 1024 * 1024;
 function handleClientRegister(clientId, clientWs, registry, logger) {
   clientWs.clientId = clientId;
+  registry.updateConnectedClientId(clientWs, clientId);
   const binding = registry.getClientBinding(clientId);
   if (!binding) {
     clientWs.send(
@@ -2369,6 +2441,72 @@ function handleClientRegister(clientId, clientWs, registry, logger) {
   );
   logger.info({ clientId, proxyId, status: "restored" }, "Client registered");
 }
+function handleRelayClientListRequest(clientWs, registry, requestId) {
+  clientWs.send(
+    JSON.stringify({
+      type: "relay_client_list_response",
+      requestId,
+      clients: registry.getConnectedClientDetails(clientWs.clientId)
+    })
+  );
+}
+function handleRelayClientKick(clientWs, registry, logger, requestId, targetClientId) {
+  if (targetClientId === clientWs.clientId) {
+    clientWs.send(
+      JSON.stringify({
+        type: "relay_client_kick_response",
+        requestId,
+        clientId: targetClientId,
+        success: false,
+        errorCode: ControlErrorCode.UNKNOWN,
+        error: "\u4E0D\u80FD\u65AD\u5F00\u5F53\u524D\u5BA2\u6237\u7AEF"
+      })
+    );
+    return;
+  }
+  const targets = registry.getConnectedClientSockets(targetClientId);
+  if (targets.length === 0) {
+    clientWs.send(
+      JSON.stringify({
+        type: "relay_client_kick_response",
+        requestId,
+        clientId: targetClientId,
+        success: false,
+        errorCode: ControlErrorCode.UNKNOWN,
+        error: "\u5BA2\u6237\u7AEF\u4E0D\u5728\u7EBF"
+      })
+    );
+    return;
+  }
+  const kickedMessage = JSON.stringify({
+    type: "relay_client_kicked",
+    reason: "\u7531\u5BA2\u6237\u7AEF\u7BA1\u7406\u65AD\u5F00"
+  });
+  for (const target of targets) {
+    try {
+      target.send(kickedMessage);
+      target.close(RelayCloseCode.CLIENT_KICKED, "client kicked");
+    } catch (err) {
+      logger.warn({ err, clientId: targetClientId }, "Failed to close kicked client");
+      target.terminate();
+    } finally {
+      registry.removeClientWs(target);
+      registry.unbindClientById(targetClientId);
+    }
+  }
+  clientWs.send(
+    JSON.stringify({
+      type: "relay_client_kick_response",
+      requestId,
+      clientId: targetClientId,
+      success: true
+    })
+  );
+  logger.info(
+    { byClientId: clientWs.clientId, targetClientId, targetCount: targets.length },
+    "Relay client kicked"
+  );
+}
 function rejectNotBound(ws) {
   ws.send(
     JSON.stringify({
@@ -2405,10 +2543,10 @@ function sendRelayProxyProbeFailure(ws, requestId, error, chaos) {
   }
   ws.send(response);
 }
-function handleClientConnection(ws, registry, logger, chaos, voiceConfigStore, voiceProviders) {
+function handleClientConnection(ws, registry, logger, chaos, voiceConfigStore, voiceProviders, connectionInfo = {}) {
   const clientWs = ws;
   clientWs.isAlive = true;
-  registry.addClientWs(clientWs);
+  registry.addClientWs(clientWs, connectionInfo);
   clientWs.on("pong", () => {
     clientWs.isAlive = true;
   });
@@ -2435,6 +2573,14 @@ function handleClientConnection(ws, registry, logger, chaos, voiceConfigStore, v
         handleClientRegister(msg.clientId, clientWs, registry, logger);
         return;
       }
+      if (msg.type === "relay_client_list_request") {
+        handleRelayClientListRequest(clientWs, registry, msg.requestId);
+        return;
+      }
+      if (msg.type === "relay_client_kick") {
+        handleRelayClientKick(clientWs, registry, logger, msg.requestId, msg.clientId);
+        return;
+      }
       if (msg.type === "proxy_list_request") {
         const proxies = registry.listProxiesWithName().map((p) => ({
           ...p,
@@ -3152,6 +3298,15 @@ function createVoiceProviderRegistry(adapters) {
 // src/server.ts
 var MODULE_DIR = dirname3(fileURLToPath2(import.meta.url));
 var PACKAGED_FONTS_DIR = resolve(MODULE_DIR, "../assets/fonts");
+function firstHeaderValue(value) {
+  if (Array.isArray(value)) return value[0];
+  return value;
+}
+function requestRemoteAddress(request) {
+  const forwardedFor = firstHeaderValue(request.headers["x-forwarded-for"]);
+  const firstForwarded = forwardedFor?.split(",")[0]?.trim();
+  return firstForwarded || request.socket.remoteAddress;
+}
 function createRelayServer(options) {
   const { heartbeatInterval = 3e4, logger, dataDir, proxyToken, clientToken, chaos } = options;
   const proxyTokenRequired = typeof proxyToken === "string" && proxyToken.length > 0;
@@ -3297,8 +3452,11 @@ function createRelayServer(options) {
   proxyWss.on("connection", (ws) => {
     handleProxyConnection(ws, registry, logger, relayChaos);
   });
-  clientWss.on("connection", (ws) => {
-    handleClientConnection(ws, registry, logger, relayChaos, voiceConfigStore, voiceProviders);
+  clientWss.on("connection", (ws, request) => {
+    handleClientConnection(ws, registry, logger, relayChaos, voiceConfigStore, voiceProviders, {
+      userAgent: firstHeaderValue(request.headers["user-agent"]),
+      remoteAddress: requestRemoteAddress(request)
+    });
   });
   voiceAsrWss.on("connection", (ws) => {
     handleVoiceAsrConnection(ws, voiceConfigStore, logger, voiceProviders);
@@ -3368,4 +3526,4 @@ export {
   parseRelayChaosFromEnv,
   createRelayServer
 };
-//# sourceMappingURL=chunk-PM4ZJUGS.js.map
+//# sourceMappingURL=chunk-H7OL7UK7.js.map