@aletheia-ios/tools 0.2.0 → 0.2.1

package/dist/cli.js

@@ -1131,22 +1131,50 @@ function watchRepo(repo) {
 	return [watch(repo.packages, { recursive: true }, trigger), watch(repo.lists, { recursive: true }, trigger)];
 }
 /**
+* Binds the port and reports the one it got, since port 0 picks a free one.
+*
+* A busy port is the common way this fails and it arrives as an `error` event rather than a
+* rejection, so without this it surfaces as an unhandled event and a stack trace.
+*
+* @throws `CliError` naming the port when something already holds it.
+*/
+async function listen(server, port) {
+	try {
+		await new Promise((resolve, reject) => {
+			server.once("error", reject);
+			server.listen(port, "0.0.0.0", () => {
+				server.removeListener("error", reject);
+				resolve();
+			});
+		});
+	} catch (error) {
+		if (error.code === "EADDRINUSE") throw new CliError([`port ${port} is already in use - pass --port <n> to pick another`], { cause: error });
+		throw error;
+	}
+	const address = server.address();
+	return typeof address === "object" && address !== null ? address.port : port;
+}
+/**
 * The `serve` command: packs, indexes, serves `dist/` on the lan and rebuilds on change.
 *
 * Binds every interface and prints the lan URL of each list's `index.json`, which is what
 * the app's developer list points at. Port 0 binds a free port. Resolves once listening;
 * the returned `close` stops the watchers and the server.
 *
-* @throws `CliError` when there is no `lists/` directory, before any port is bound.
+* @throws `CliError` when there is no `lists/` directory, or when the port is taken.
 */
 async function serve(repo, port) {
 	const lists = await loadLists(repo);
 	await rebuild(repo);
 	const server = fileServer(repo.dist);
 	const watchers = watchRepo(repo);
-	await new Promise((resolve) => server.listen(port, "0.0.0.0", resolve));
-	const address = server.address();
-	const bound = typeof address === "object" && address !== null ? address.port : port;
+	let bound;
+	try {
+		bound = await listen(server, port);
+	} catch (error) {
+		for (const watcher of watchers) watcher.close();
+		throw error;
+	}
 	const url = `http://${lanAddress()}:${bound}/`;
 	info(`serving ${repo.dist} on ${url}`);
 	for (const list of lists) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aletheia-ios/tools",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "The aletheia CLI: build, check, pack, index and serve source packages",
   "license": "MIT",
   "repository": {