|
|
@@ -1,16 +1,16 @@
|
|
|
import { mkdtempSync, mkdirSync, writeFileSync } from 'node:fs'
|
|
|
-import { createServer as createNetServer, type AddressInfo } from 'node:net'
|
|
|
+import { createServer as createNetServer, Server as NetServer, type AddressInfo } from 'node:net'
|
|
|
import { tmpdir } from 'node:os'
|
|
|
import { join } from 'node:path'
|
|
|
-import { afterEach, describe, expect, it } from 'vitest'
|
|
|
+import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
|
import { startWebServer, type RunningWebServer } from '../src/index.ts'
|
|
|
|
|
|
-/** RunningWebServer.port echoes options.port, so tests must pick a concrete free port up front. */
|
|
|
+/** Reserve a loopback port for tests that need to address a second server. */
|
|
|
function freePort(): Promise<number> {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
const probe = createNetServer()
|
|
|
probe.once('error', reject)
|
|
|
- probe.listen(0, () => {
|
|
|
+ probe.listen(0, '127.0.0.1', () => {
|
|
|
const port = (probe.address() as AddressInfo).port
|
|
|
probe.close(() => { resolve(port) })
|
|
|
})
|
|
|
@@ -107,16 +107,15 @@ afterEach(async () => {
|
|
|
async function boot(onError: (err: Error) => void = () => undefined): Promise<string> {
|
|
|
const { distIndex } = makeDist()
|
|
|
const port = await freePort()
|
|
|
- server = await startWebServer({ port, distIndex, apiHandler: echoingApi }, onError)
|
|
|
+ server = await startWebServer({ host: '127.0.0.1', port, distIndex, apiHandler: echoingApi }, onError)
|
|
|
return `http://127.0.0.1:${String(server.port)}`
|
|
|
}
|
|
|
|
|
|
describe('startWebServer', () => {
|
|
|
it('reports the listening port and closes idempotently', async () => {
|
|
|
const { distIndex } = makeDist()
|
|
|
- const port = await freePort()
|
|
|
- server = await startWebServer({ port, distIndex, apiHandler: echoingApi }, () => undefined)
|
|
|
- expect(server.port).toBe(port)
|
|
|
+ server = await startWebServer({ host: '127.0.0.1', port: 0, distIndex, apiHandler: echoingApi }, () => undefined)
|
|
|
+ expect(server.port).toBeGreaterThan(0)
|
|
|
const first = server.close()
|
|
|
const second = server.close()
|
|
|
expect(second).toBe(first)
|
|
|
@@ -124,11 +123,33 @@ describe('startWebServer', () => {
|
|
|
server = undefined
|
|
|
})
|
|
|
|
|
|
+ it.each(['127.0.0.1', '0.0.0.0'])('forwards bind address %s without opening a socket', async (host) => {
|
|
|
+ const { distIndex } = makeDist()
|
|
|
+ const port = 3080
|
|
|
+ const listen = vi.spyOn(NetServer.prototype, 'listen').mockImplementation(function (
|
|
|
+ this: NetServer, ...args: unknown[]
|
|
|
+ ): NetServer {
|
|
|
+ const callback = args.at(-1)
|
|
|
+ if (typeof callback !== 'function') throw new TypeError('listen callback missing')
|
|
|
+ queueMicrotask(callback as () => void)
|
|
|
+ return this
|
|
|
+ })
|
|
|
+ const address = vi.spyOn(NetServer.prototype, 'address').mockReturnValue({ address: host, family: 'IPv4', port })
|
|
|
+ try {
|
|
|
+ const inertServer = await startWebServer({ host, port, distIndex, apiHandler: echoingApi }, () => undefined)
|
|
|
+ expect(listen).toHaveBeenCalledWith(port, host, expect.any(Function))
|
|
|
+ await inertServer.close()
|
|
|
+ } finally {
|
|
|
+ address.mockRestore()
|
|
|
+ listen.mockRestore()
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
it('rejects when the port is already taken', async () => {
|
|
|
const { distIndex } = makeDist()
|
|
|
const port = await freePort()
|
|
|
- server = await startWebServer({ port, distIndex, apiHandler: echoingApi }, () => undefined)
|
|
|
- await expect(startWebServer({ port, distIndex, apiHandler: echoingApi }, () => undefined))
|
|
|
+ server = await startWebServer({ host: '127.0.0.1', port, distIndex, apiHandler: echoingApi }, () => undefined)
|
|
|
+ await expect(startWebServer({ host: '127.0.0.1', port, distIndex, apiHandler: echoingApi }, () => undefined))
|
|
|
.rejects.toMatchObject({ code: 'EADDRINUSE' })
|
|
|
})
|
|
|
})
|
|
|
@@ -185,7 +206,9 @@ describe.skipIf(process.platform === 'win32')('web plugin surfaces (boot injecti
|
|
|
clientPath: (id: string) => id === rows[0]?.id ? join(distRoot, 'bundle.js') : undefined,
|
|
|
}
|
|
|
const port = await freePort()
|
|
|
- server = await startWebServer({ port, distIndex, apiHandler: echoingApi, webPlugins }, () => undefined)
|
|
|
+ server = await startWebServer(
|
|
|
+ { host: '127.0.0.1', port, distIndex, apiHandler: echoingApi, webPlugins }, () => undefined,
|
|
|
+ )
|
|
|
return `http://127.0.0.1:${String(server.port)}`
|
|
|
}
|
|
|
|
|
|
@@ -221,7 +244,9 @@ describe.skipIf(process.platform === 'win32')('web plugin surfaces (boot injecti
|
|
|
clientPath: () => '/nonexistent/lib/client.js',
|
|
|
}
|
|
|
const port = await freePort()
|
|
|
- server = await startWebServer({ port, distIndex, apiHandler: echoingApi, webPlugins }, () => undefined)
|
|
|
+ server = await startWebServer(
|
|
|
+ { host: '127.0.0.1', port, distIndex, apiHandler: echoingApi, webPlugins }, () => undefined,
|
|
|
+ )
|
|
|
const res = await fetch(`http://127.0.0.1:${String(server.port)}/plugins/@deepseek-ai/dsh-client-connection/client.js`)
|
|
|
expect(res.status).toBe(404)
|
|
|
})
|
Tianyi Cui