Skip to content

fix(cli): open the actual serve fallback port #7501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiliang114 merged 4 commits into from
Jul 23, 2026
Merged

fix(cli): open the actual serve fallback port #7501

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09fdb67
fix(cli): open actual serve fallback port
yiliang114 Jul 22, 2026
1aedef2
test(cli): match serve URL to fallback listener
yiliang114 Jul 22, 2026
481496b
docs(cli): clarify serve listen error handling
yiliang114 Jul 22, 2026
9fed48f
Merge branch 'main' into codex/fix-7500-serve-open-port
wenshao Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions packages/cli/src/serve/run-qwen-serve.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7901,17 +7901,15 @@ describe('runQwenServe channel worker supervisor', () => {
listen: vi.fn((port, _host, cb) => {
portsAttempted.push(port);
const srv = createServer();
if (typeof cb === 'function') {
srv.once('error', cb);
}
if (portsAttempted.length === 1) {
const err = new Error('address in use') as NodeJS.ErrnoException;
err.code = 'EADDRINUSE';
setImmediate(() => srv.emit('error', err));
} else {
srv.listen(0, '127.0.0.1', () => {
setImmediate(() => {
srv.emit('listening');
if (typeof cb === 'function') cb();
});
});
srv.listen(0, '127.0.0.1', cb);
}
return srv;
}),
Expand All @@ -7934,8 +7932,12 @@ describe('runQwenServe channel worker supervisor', () => {
try {
stderrSpy.mockRestore();
expect(portsAttempted).toEqual([4170, 4171]);
expect(handle.server.listening).toBe(true);
expect(handle.url).toMatch(/^http:\/\/127\.0\.0\.1:\d+$/);
expect(handle.url).not.toContain(':4170');
expect(new URL(handle.url).port).toBe(
String((handle.server.address() as AddressInfo).port),
);
expect(
stderrWrites.some((w) =>
w.includes('port 4170 is in use, trying 4171'),
Expand Down
4 changes: 3 additions & 1 deletion packages/cli/src/serve/run-qwen-serve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4716,7 +4716,9 @@ async function runQwenServeImpl(
// `server.maxConnections`, `server.address()`, `attachServer(server)`,
// graceful close — is unchanged). Otherwise `app.listen()` keeps the
// existing plain-HTTP path bit-for-bit.
const onListening = () => {
const onListening = (error?: Error) => {
if (error) return;

startup.listenerReadyAt = new Date().toISOString();
startup.processToListenMs = Math.round(process.uptime() * 1000);
startup.runQwenServeToListenMs = Math.round(
Expand Down
Loading