@sparkelf/dsh-plus 0.1.0-rc.31 → 0.1.0-rc.32

package/lib/bin.js

@@ -204,6 +204,31 @@ async function waitForServer(url, timeoutMilliseconds) {
 	}
 	return false;
 }
+/**
+* Wait until the launcher's log carries the authenticated URL.
+*
+* Readiness and the printed line are separate events: the server answers before the
+* launcher finishes its own startup, so the log is polled here rather than read once.
+*
+* @param logPath - the launcher's log file.
+* @param timeoutMilliseconds - how long to keep polling.
+* @returns the printed URL, or undefined when it never appeared.
+*/
+async function waitForAuthenticatedUrl(logPath, timeoutMilliseconds) {
+	const deadline = Date.now() + timeoutMilliseconds;
+	for (;;) {
+		let text = "";
+		try {
+			text = readFileSync(logPath, "utf8");
+		} catch {}
+		const found = /dsh web: (http:\/\/\S+)/u.exec(text);
+		if (found?.[1] !== void 0) return found[1];
+		if (Date.now() >= deadline) return void 0;
+		await new Promise((resolveDelay) => {
+			setTimeout(resolveDelay, 250);
+		});
+	}
+}
 //#endregion
 //#region lib/types/standalone-profile.js
 /**
@@ -550,12 +575,13 @@ async function startDetached(home, entry, options) {
 		if (isRunning(pid)) process.kill(pid, "SIGTERM");
 		return 1;
 	}
+	const opened = await waitForAuthenticatedUrl(logPath, READY_TIMEOUT_MILLISECONDS) ?? url;
 	writeState(home, {
 		pid,
 		port,
-		url
+		url: opened
 	});
-	console.log("Plus is running at " + url);
+	console.log("Plus is running at " + opened);
 	console.log("Logs: " + logPath);
 	console.log("Stop it with: dsh-plus stop");
 	return 0;

package/lib/types/standalone-cli.js

@@ -13,7 +13,7 @@ import { createRequire } from 'node:module';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { newerVersion } from "./registry-versions.js";
-import { DEFAULT_PORT, STOP_GRACE_MILLISECONDS, choosePort, clearState, isRunning, portAvailable, readState, spawnServer, stateDirectory, waitForServer, writeState, } from "./standalone-server.js";
+import { DEFAULT_PORT, STOP_GRACE_MILLISECONDS, choosePort, clearState, isRunning, portAvailable, readState, spawnServer, stateDirectory, waitForAuthenticatedUrl, waitForServer, writeState, } from "./standalone-server.js";
 import { STANDALONE_PROFILE, ensureProfile, readDistributionProfile, resolvePaths, } from "./standalone-profile.js";
 /** Milliseconds a start waits for the server to answer before reporting failure. */
 const READY_TIMEOUT_MILLISECONDS = 90_000;
@@ -137,8 +137,13 @@ async function startDetached(home, entry, options) {
             process.kill(pid, 'SIGTERM');
         return 1;
     }
-    writeState(home, { pid, port, url });
-    console.log('Plus is running at ' + url);
+    // The launcher prints the URL carrying the process launch token, and the server
+    // refuses every request without the cookie that token mints. Reporting the bare
+    // address sends the user to a 401 that tells them to reopen the launcher's URL,
+    // which lives only in the log this command points at.
+    const opened = await waitForAuthenticatedUrl(logPath, READY_TIMEOUT_MILLISECONDS) ?? url;
+    writeState(home, { pid, port, url: opened });
+    console.log('Plus is running at ' + opened);
     console.log('Logs: ' + logPath);
     console.log('Stop it with: dsh-plus stop');
     return 0;

package/lib/types/standalone-server.d.ts

@@ -56,4 +56,15 @@ export declare function spawnServer(options: {
  * @returns whether the server answered within the budget.
  */
 export declare function waitForServer(url: string, timeoutMilliseconds: number): Promise<boolean>;
+/**
+ * Wait until the launcher's log carries the authenticated URL.
+ *
+ * Readiness and the printed line are separate events: the server answers before the
+ * launcher finishes its own startup, so the log is polled here rather than read once.
+ *
+ * @param logPath - the launcher's log file.
+ * @param timeoutMilliseconds - how long to keep polling.
+ * @returns the printed URL, or undefined when it never appeared.
+ */
+export declare function waitForAuthenticatedUrl(logPath: string, timeoutMilliseconds: number): Promise<string | undefined>;
 //# sourceMappingURL=standalone-server.d.ts.map

package/lib/types/standalone-server.js

@@ -126,4 +126,33 @@ export async function waitForServer(url, timeoutMilliseconds) {
     }
     return false;
 }
+/**
+ * Wait until the launcher's log carries the authenticated URL.
+ *
+ * Readiness and the printed line are separate events: the server answers before the
+ * launcher finishes its own startup, so the log is polled here rather than read once.
+ *
+ * @param logPath - the launcher's log file.
+ * @param timeoutMilliseconds - how long to keep polling.
+ * @returns the printed URL, or undefined when it never appeared.
+ */
+export async function waitForAuthenticatedUrl(logPath, timeoutMilliseconds) {
+    const deadline = Date.now() + timeoutMilliseconds;
+    for (;;) {
+        let text = '';
+        try {
+            text = readFileSync(logPath, 'utf8');
+        }
+        catch {
+            // The launcher creates the log before it prints, so an absent file is a race
+            // with its first write rather than an error to report.
+        }
+        const found = /dsh web: (http:\/\/\S+)/u.exec(text);
+        if (found?.[1] !== undefined)
+            return found[1];
+        if (Date.now() >= deadline)
+            return undefined;
+        await new Promise((resolveDelay) => { setTimeout(resolveDelay, 250); });
+    }
+}
 //# sourceMappingURL=standalone-server.js.map

package/package.json

@@ -138,5 +138,5 @@
   },
   "type": "module",
   "types": "lib/types/index.d.ts",
-  "version": "0.1.0-rc.31"
+  "version": "0.1.0-rc.32"
 }