fix startup of webclient through cli

This commit is contained in:
cliffhall 2025-07-10 13:51:15 -04:00
commit 6a66ca5b23

View file

@ -50,21 +50,13 @@ function delay(ms: number): Promise<void> {
} }
async function runWebClient(args: Args): Promise<void> { async function runWebClient(args: Args): Promise<void> {
const inspectorServerPath = resolve(
__dirname,
"../../",
"server",
"build",
"index.js",
);
// Path to the client entry point // Path to the client entry point
const inspectorClientPath = resolve( const inspectorClientPath = resolve(
__dirname, __dirname,
"../../", "../../",
"client", "client",
"bin", "bin",
"client.js", "start.js",
); );
const CLIENT_PORT: string = process.env.CLIENT_PORT ?? "6274"; const CLIENT_PORT: string = process.env.CLIENT_PORT ?? "6274";
@ -82,30 +74,6 @@ async function runWebClient(args: Args): Promise<void> {
let server: ReturnType<typeof spawnPromise>; let server: ReturnType<typeof spawnPromise>;
let serverOk: unknown; let serverOk: unknown;
try {
server = spawnPromise(
"node",
[
inspectorServerPath,
...(args.command ? [`--env`, args.command] : []),
...(args.args ? [`--args=${args.args.join(" ")}`] : []),
],
{
env: {
...process.env,
PORT: SERVER_PORT,
MCP_ENV_VARS: JSON.stringify(args.envArgs),
},
signal: abort.signal,
echoOutput: true,
},
);
// Make sure server started before starting client
serverOk = await Promise.race([server, delay(2 * 1000)]);
} catch (error) {}
if (serverOk) {
try { try {
await spawnPromise("node", [inspectorClientPath], { await spawnPromise("node", [inspectorClientPath], {
env: { ...process.env, PORT: CLIENT_PORT }, env: { ...process.env, PORT: CLIENT_PORT },
@ -116,7 +84,6 @@ async function runWebClient(args: Args): Promise<void> {
if (!cancelled || process.env.DEBUG) throw e; if (!cancelled || process.env.DEBUG) throw e;
} }
} }
}
async function runCli(args: Args): Promise<void> { async function runCli(args: Args): Promise<void> {
const projectRoot = resolve(__dirname, ".."); const projectRoot = resolve(__dirname, "..");