fix: 替换 main 分支的假 server 命令为真实 serve 实现
- 移除 DangerousBackend、lockfile、createServerLogger 等不存在的 import - 使用 EventBus + SessionManager + startServer 真实实现 - 添加 serve 子命令作为 server 的别名 - 默认 host 改为 127.0.0.1，idle-timeout 改为 1800000ms - 启动 probe session 并正确处理 SIGINT/SIGTERM 关闭
This commit is contained in:
DoSun
parent
cbc948b044
commit
b11826c21c
184
src/main.tsx
184
src/main.tsx
|
|
@ -5955,14 +5955,80 @@ async function run(): Promise<CommanderCommand> {
|
||||||
await mcpResetChoicesHandler();
|
await mcpResetChoicesHandler();
|
||||||
});
|
});
|
||||||
|
|
||||||
// claude server
|
// csc serve — HTTP API server for IDE plugins and web clients.
|
||||||
|
// Also accessible via `csc server` alias.
|
||||||
if (feature("DIRECT_CONNECT")) {
|
if (feature("DIRECT_CONNECT")) {
|
||||||
|
const serveAction = async (opts: {
|
||||||
|
port: string;
|
||||||
|
host: string;
|
||||||
|
authToken?: string;
|
||||||
|
unix?: string;
|
||||||
|
workspace?: string;
|
||||||
|
idleTimeout: string;
|
||||||
|
maxSessions: string;
|
||||||
|
}) => {
|
||||||
|
const { startServer } = await import("./server/server.js");
|
||||||
|
const { EventBus } = await import("./server/eventBus.js");
|
||||||
|
const { SessionManager } =
|
||||||
|
await import("./server/sessionManager.js");
|
||||||
|
const { printBanner } =
|
||||||
|
await import("./server/serverBanner.js");
|
||||||
|
const { getScriptArgsForChild, saveChildSpawnPrefix } =
|
||||||
|
await import("./server/sessionHandle.js");
|
||||||
|
|
||||||
|
await saveChildSpawnPrefix();
|
||||||
|
const eventBus = new EventBus();
|
||||||
|
const config = {
|
||||||
|
port: parseInt(opts.port, 10),
|
||||||
|
host: opts.host,
|
||||||
|
authToken: undefined,
|
||||||
|
unix: opts.unix,
|
||||||
|
workspace: opts.workspace,
|
||||||
|
idleTimeoutMs: parseInt(opts.idleTimeout, 10),
|
||||||
|
maxSessions: parseInt(opts.maxSessions, 10),
|
||||||
|
};
|
||||||
|
|
||||||
|
const sessionManager = new SessionManager({
|
||||||
|
eventBus,
|
||||||
|
idleTimeoutMs: config.idleTimeoutMs,
|
||||||
|
maxSessions: config.maxSessions,
|
||||||
|
workspace: config.workspace,
|
||||||
|
});
|
||||||
|
await sessionManager.init();
|
||||||
|
|
||||||
|
const server = startServer(config, sessionManager, eventBus);
|
||||||
|
const actualPort = server.port ?? config.port;
|
||||||
|
printBanner(config, undefined, actualPort);
|
||||||
|
|
||||||
|
sessionManager.startProbeSession({
|
||||||
|
cwd: config.workspace || process.cwd(),
|
||||||
|
execPath: process.execPath,
|
||||||
|
scriptArgs: getScriptArgsForChild(),
|
||||||
|
});
|
||||||
|
|
||||||
|
let shuttingDown = false;
|
||||||
|
const shutdown = async () => {
|
||||||
|
if (shuttingDown) return;
|
||||||
|
shuttingDown = true;
|
||||||
|
sessionManager.killProbe();
|
||||||
|
server.stop(true);
|
||||||
|
eventBus.destroy();
|
||||||
|
await sessionManager.destroyAll();
|
||||||
|
process.exit(0);
|
||||||
|
};
|
||||||
|
process.on("SIGINT", () => void shutdown());
|
||||||
|
process.on("SIGTERM", () => void shutdown());
|
||||||
|
};
|
||||||
|
|
||||||
program
|
program
|
||||||
.command("server")
|
.command("server")
|
||||||
.description("Start a CoStrict session server")
|
.description("Start a CoStrict session server (alias: serve)")
|
||||||
.option("--port <number>", "HTTP port", "0")
|
.option("--port <number>", "HTTP port", "0")
|
||||||
.option("--host <string>", "Bind address", "0.0.0.0")
|
.option("--host <string>", "Bind address", "127.0.0.1")
|
||||||
.option("--auth-token <token>", "Bearer token for auth")
|
.option(
|
||||||
|
"--auth-token <token>",
|
||||||
|
"Bearer token for auth (currently disabled)",
|
||||||
|
)
|
||||||
.option("--unix <path>", "Listen on a unix domain socket")
|
.option("--unix <path>", "Listen on a unix domain socket")
|
||||||
.option(
|
.option(
|
||||||
"--workspace <dir>",
|
"--workspace <dir>",
|
||||||
|
|
@ -5971,96 +6037,40 @@ async function run(): Promise<CommanderCommand> {
|
||||||
.option(
|
.option(
|
||||||
"--idle-timeout <ms>",
|
"--idle-timeout <ms>",
|
||||||
"Idle timeout for detached sessions in ms (0 = never expire)",
|
"Idle timeout for detached sessions in ms (0 = never expire)",
|
||||||
"600000",
|
"1800000",
|
||||||
)
|
)
|
||||||
.option(
|
.option(
|
||||||
"--max-sessions <n>",
|
"--max-sessions <n>",
|
||||||
"Maximum concurrent sessions (0 = unlimited)",
|
"Maximum concurrent sessions (0 = unlimited)",
|
||||||
"32",
|
"32",
|
||||||
)
|
)
|
||||||
.action(
|
.action(serveAction);
|
||||||
async (opts: {
|
|
||||||
port: string;
|
|
||||||
host: string;
|
|
||||||
authToken?: string;
|
|
||||||
unix?: string;
|
|
||||||
workspace?: string;
|
|
||||||
idleTimeout: string;
|
|
||||||
maxSessions: string;
|
|
||||||
}) => {
|
|
||||||
const { randomBytes } = await import("crypto");
|
|
||||||
const { startServer } = await import("./server/server.js");
|
|
||||||
const { SessionManager } =
|
|
||||||
await import("./server/sessionManager.js");
|
|
||||||
const { DangerousBackend } =
|
|
||||||
await import("./server/backends/dangerousBackend.js");
|
|
||||||
const { printBanner } =
|
|
||||||
await import("./server/serverBanner.js");
|
|
||||||
const { createServerLogger } =
|
|
||||||
await import("./server/serverLog.js");
|
|
||||||
const {
|
|
||||||
writeServerLock,
|
|
||||||
removeServerLock,
|
|
||||||
probeRunningServer,
|
|
||||||
} = await import("./server/lockfile.js");
|
|
||||||
|
|
||||||
const existing = await probeRunningServer();
|
program
|
||||||
if (existing) {
|
.command("serve")
|
||||||
process.stderr.write(
|
.description("Start a CoStrict HTTP API server")
|
||||||
`A claude server is already running (pid ${existing.pid}) at ${existing.httpUrl}\n`,
|
.option("--port <number>", "HTTP port", "0")
|
||||||
);
|
.option("--host <string>", "Bind address", "127.0.0.1")
|
||||||
process.exit(1);
|
.option(
|
||||||
}
|
"--auth-token <token>",
|
||||||
|
"Bearer token for auth (currently disabled)",
|
||||||
const authToken =
|
)
|
||||||
opts.authToken ??
|
.option("--unix <path>", "Listen on a unix domain socket")
|
||||||
`sk-ant-cc-${randomBytes(16).toString("base64url")}`;
|
.option(
|
||||||
|
"--workspace <dir>",
|
||||||
const config = {
|
"Default working directory for sessions that do not specify cwd",
|
||||||
port: parseInt(opts.port, 10),
|
)
|
||||||
host: opts.host,
|
.option(
|
||||||
authToken,
|
"--idle-timeout <ms>",
|
||||||
unix: opts.unix,
|
"Idle timeout for detached sessions in ms (0 = never expire)",
|
||||||
workspace: opts.workspace,
|
"1800000",
|
||||||
idleTimeoutMs: parseInt(opts.idleTimeout, 10),
|
)
|
||||||
maxSessions: parseInt(opts.maxSessions, 10),
|
.option(
|
||||||
};
|
"--max-sessions <n>",
|
||||||
|
"Maximum concurrent sessions (0 = unlimited)",
|
||||||
const backend = new DangerousBackend();
|
"32",
|
||||||
const sessionManager = new SessionManager(backend, {
|
)
|
||||||
idleTimeoutMs: config.idleTimeoutMs,
|
.action(serveAction);
|
||||||
maxSessions: config.maxSessions,
|
|
||||||
});
|
|
||||||
const logger = createServerLogger();
|
|
||||||
|
|
||||||
const server = startServer(config, sessionManager, logger);
|
|
||||||
const actualPort = server.port ?? config.port;
|
|
||||||
printBanner(config, authToken, actualPort);
|
|
||||||
|
|
||||||
await writeServerLock({
|
|
||||||
pid: process.pid,
|
|
||||||
port: actualPort,
|
|
||||||
host: config.host,
|
|
||||||
httpUrl: config.unix
|
|
||||||
? `unix:${config.unix}`
|
|
||||||
: `http://${config.host}:${actualPort}`,
|
|
||||||
startedAt: Date.now(),
|
|
||||||
});
|
|
||||||
|
|
||||||
let shuttingDown = false;
|
|
||||||
const shutdown = async () => {
|
|
||||||
if (shuttingDown) return;
|
|
||||||
shuttingDown = true;
|
|
||||||
// Stop accepting new connections before tearing down sessions.
|
|
||||||
server.stop(true);
|
|
||||||
await sessionManager.destroyAll();
|
|
||||||
await removeServerLock();
|
|
||||||
process.exit(0);
|
|
||||||
};
|
|
||||||
process.once("SIGINT", () => void shutdown());
|
|
||||||
process.once("SIGTERM", () => void shutdown());
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// `claude ssh <host> [dir]` — registered here only so --help shows it.
|
// `claude ssh <host> [dir]` — registered here only so --help shows it.
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user