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

package/lib/bin.js

@@ -3,7 +3,7 @@ import { r as runApply } from "./apply-e0aMC4B4.js";
 import { createRequire } from "node:module";
 import { execFileSync, spawn, spawnSync } from "node:child_process";
 import { createWriteStream, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, symlinkSync, writeFileSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join, posix, resolve, win32 } from "node:path";
 import { homedir } from "node:os";
 import semver from "semver";
 import { fileURLToPath } from "node:url";
@@ -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
 /**
@@ -232,6 +257,27 @@ function resolveHome(env = process.env) {
 	return configured === void 0 || configured === "" ? join(homedir(), ".dsh") : resolve(configured);
 }
 /**
+* Whether one absolute path is the other or sits beneath it.
+*
+* A path outside the parent has a relative form starting with `..`, which every
+* platform answers the same way. Comparing the text against a literal separator is
+* not: Windows separates with a backslash, so a nested path never matched its own
+* ancestor and every Windows installation reported the distribution as sitting
+* outside its own tree.
+*
+* @param candidate - absolute path to test.
+* @param parent - absolute path that may contain it.
+* @param platform - separating convention, injectable so the Windows answer is
+* testable where the suite runs on a POSIX host.
+* @returns true when the candidate is the parent or inside it.
+*/
+function isWithin(candidate, parent, platform = process.platform) {
+	if (candidate === parent) return true;
+	const path = platform === "win32" ? win32 : posix;
+	const inside = path.relative(parent, candidate);
+	return inside !== "" && !inside.startsWith("..") && !inside.startsWith(path.sep + "..");
+}
+/**
 * Resolve the installed distribution directory from one requiring anchor.
 *
 * The anchor must be a path inside the consumer's own tree. Resolving from this
@@ -250,7 +296,7 @@ function resolveDistributionDirectory(anchor) {
 	}
 	let current = resolve(dirname(anchor));
 	for (;;) {
-		if (resolved === current || resolved.startsWith(current + "/")) return resolved;
+		if (isWithin(resolved, current)) return resolved;
 		const parent = dirname(current);
 		if (parent === current) break;
 		current = parent;
@@ -529,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-profile.d.ts

@@ -21,6 +21,22 @@ export interface StandalonePaths {
 }
 /** Resolve the DSH home, honouring the environment override the launcher itself reads. */
 export declare function resolveHome(env?: NodeJS.ProcessEnv): string;
+/**
+ * Whether one absolute path is the other or sits beneath it.
+ *
+ * A path outside the parent has a relative form starting with `..`, which every
+ * platform answers the same way. Comparing the text against a literal separator is
+ * not: Windows separates with a backslash, so a nested path never matched its own
+ * ancestor and every Windows installation reported the distribution as sitting
+ * outside its own tree.
+ *
+ * @param candidate - absolute path to test.
+ * @param parent - absolute path that may contain it.
+ * @param platform - separating convention, injectable so the Windows answer is
+ * testable where the suite runs on a POSIX host.
+ * @returns true when the candidate is the parent or inside it.
+ */
+export declare function isWithin(candidate: string, parent: string, platform?: NodeJS.Platform): boolean;
 /**
  * Resolve the installed distribution directory from one requiring anchor.
  *

package/lib/types/standalone-profile.js

@@ -11,7 +11,7 @@
 import { existsSync, mkdirSync, readdirSync, readFileSync, symlinkSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join, posix, resolve, win32 } from 'node:path';
 /** Profile name a standalone installation owns. */
 export const STANDALONE_PROFILE = 'plus';
 function requireRecord(value, label) {
@@ -29,6 +29,28 @@ export function resolveHome(env = process.env) {
     const configured = env.DSH_HOME;
     return configured === undefined || configured === '' ? join(homedir(), '.dsh') : resolve(configured);
 }
+/**
+ * Whether one absolute path is the other or sits beneath it.
+ *
+ * A path outside the parent has a relative form starting with `..`, which every
+ * platform answers the same way. Comparing the text against a literal separator is
+ * not: Windows separates with a backslash, so a nested path never matched its own
+ * ancestor and every Windows installation reported the distribution as sitting
+ * outside its own tree.
+ *
+ * @param candidate - absolute path to test.
+ * @param parent - absolute path that may contain it.
+ * @param platform - separating convention, injectable so the Windows answer is
+ * testable where the suite runs on a POSIX host.
+ * @returns true when the candidate is the parent or inside it.
+ */
+export function isWithin(candidate, parent, platform = process.platform) {
+    if (candidate === parent)
+        return true;
+    const path = platform === 'win32' ? win32 : posix;
+    const inside = path.relative(parent, candidate);
+    return inside !== '' && !inside.startsWith('..') && !inside.startsWith(path.sep + '..');
+}
 /**
  * Resolve the installed distribution directory from one requiring anchor.
  *
@@ -54,7 +76,7 @@ export function resolveDistributionDirectory(anchor) {
     // reports \`<root>/node_modules/@sparkelf/dsh-plus\`.
     let current = resolve(dirname(anchor));
     for (;;) {
-        if (resolved === current || resolved.startsWith(current + '/'))
+        if (isWithin(resolved, current))
             return resolved;
         const parent = dirname(current);
         if (parent === current)

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.30"
+  "version": "0.1.0-rc.32"
 }