Hypatia May
61163b7da5
Conflict resolutions: - `session.list`: master's projection columns fold into the PR's cancellable, batched `listVisibleSessionSummaries`, which `session.search` shares as its visibility baseline; master's goal helpers stay beside it. - Client sessions face: master narrowed `ctx.sessions` to `ISessions`, so the search verb and its protocol-constant bound are declared there and the test-runtime double implements them (recorded, empty page unless a scenario stubs hits). - `WorkspaceBrowser`: master's per-row Rename wiring rides the PR's search results view; the tree keeps the PR's query-free derivations. - `dsh web` bin: the PR's shutdown-handlers-before-readiness order with master's boot-time LAN address snapshot. - `session-query-sqlite`: master's `SCHEMA_VERSION` 7 stands; the PR's bump carried no schema change. - Specs: master wraps assistant/steering message payloads and requires an `application/json` carrier request, so the search fixtures and tests follow. - Web aria goldens keep master's recording plus the PR's search placeholder; the navigation-panes inventory keeps master's terminal-card golden next to the PR's search-results golden.
62 lines
2.6 KiB
TypeScript
62 lines
2.6 KiB
TypeScript
/**
|
|
* `dsh web` — thin bin over the config-tree boot: run AppCLIEntry with the
|
|
* already-parsed host/port/dev, print the URL line, wire signals. All
|
|
* composition lives in cordis.yml; all boot glue lives in AppCLIEntry. Host and
|
|
* port are unvalidated pass-through overrides — the `dsh-host-webserver` schema
|
|
* gates them at boot.
|
|
*/
|
|
|
|
import { fileURLToPath } from 'node:url'
|
|
import { AppCLIEntry } from './app-cli-entry.ts'
|
|
|
|
const CONFIG_PATH = fileURLToPath(new URL('../cordis.yml', import.meta.url))
|
|
|
|
// Display-only mirror of the webserver schema's loopback host: the address the
|
|
// local URL always prints. Not a source of truth — the schema is.
|
|
const LOOPBACK_HOST = '127.0.0.1'
|
|
|
|
/**
|
|
* Serve the browser UI from the shipped config tree. `host`/`port` are passed
|
|
* through only when the flag was given; absent, the `cordis.yml` value stands.
|
|
* @param host - the bind host, or `undefined` to keep the config default.
|
|
* @param port - the listen port (`0` requests an OS-assigned port), or `undefined` to keep the config default.
|
|
* @param dev - mount the client HMR driver and watch plugin bundles for rebuilds.
|
|
* @param workspaceRoot - parent directory for name-created workspaces, or `undefined` for the gateway's cwd fallback.
|
|
* @param trustedHosts - extra authorities for the /api browser-trust fence, or `undefined` for the derived LAN literals alone.
|
|
*/
|
|
export async function runWeb(
|
|
host: string | undefined,
|
|
port: number | undefined,
|
|
dev: boolean,
|
|
workspaceRoot: string | undefined,
|
|
trustedHosts: string[] | undefined,
|
|
): Promise<void> {
|
|
const entry = new AppCLIEntry({
|
|
configPath: CONFIG_PATH,
|
|
dev,
|
|
...host !== undefined && { host },
|
|
...port !== undefined && { port },
|
|
...workspaceRoot !== undefined && { workspaceRoot },
|
|
...trustedHosts !== undefined && { trustedHosts },
|
|
})
|
|
const { ctx, port: boundPort } = await entry.run()
|
|
|
|
let exiting = false
|
|
const shutdown = (code: number): void => {
|
|
if (exiting) return
|
|
exiting = true
|
|
void Promise.resolve(ctx.fiber.dispose()).finally(() => { process.exit(code) })
|
|
}
|
|
|
|
// Install shutdown handling before publishing readiness: supervisors may
|
|
// send a signal as soon as they observe the URL line.
|
|
process.on('SIGTERM', () => { shutdown(0) })
|
|
process.on('SIGINT', () => { shutdown(130) })
|
|
|
|
// The entry's boot-time snapshot, not a fresh sample: the printed LAN URL
|
|
// must name an address the /api trust fence was configured with.
|
|
const lanCandidate = entry.lanAddresses[0]
|
|
const localUrl = `http://${LOOPBACK_HOST}:${boundPort}`
|
|
console.log(`dsh web: ${localUrl}${lanCandidate === undefined ? '' : ` (LAN: http://${lanCandidate}:${boundPort})`}`)
|
|
}
|