@sparkelf/dsh-plus 0.1.0-rc.38 → 0.1.0-rc.40

package/lib/bin.js

@@ -363,11 +363,40 @@ function installProfilePackages(paths, consumerDirectory) {
 		linkNestedBundles(paths, profileModules);
 		return;
 	}
-	runPnpm(paths.profileDirectory, ["install", "--no-frozen-lockfile"], "pnpm install in the plus profile");
+	installWithRegistryFallback(paths);
 	alignReplacedPackageNames(profileModules);
 	linkNestedBundles(paths, profileModules);
 }
 /**
+* Install the profile from the first registry that answers.
+*
+* The install fetches a full dependency closure, and a mainland consumer reaches the
+* mirror far faster than the origin. Trying the preferred registry and falling back once
+* keeps a first start quick without failing when the preferred one is unreachable.
+*
+* @param paths - resolved standalone paths.
+*/
+function installWithRegistryFallback(paths) {
+	const registries = registryOrder();
+	for (const [index, registry] of registries.entries()) {
+		const result = spawnSync("pnpm", [
+			"install",
+			"--no-frozen-lockfile",
+			"--registry",
+			registry
+		], {
+			cwd: paths.profileDirectory,
+			stdio: "inherit",
+			shell: process.platform === "win32"
+		});
+		if (result.error !== void 0) throw result.error;
+		if (result.status === 0) return;
+		const next = registries[index + 1];
+		if (next === void 0) throw new Error("pnpm install in the plus profile failed with exit code " + String(result.status));
+		console.log("Install from " + registry + " failed; trying " + next + ".");
+	}
+}
+/**
 * Make each replaced package declare the name of the location it occupies.
 *
 * \`overrides\` installs our build at the official path, but the manifest inside still
@@ -401,25 +430,63 @@ function alignReplacedPackageNames(profileModules) {
 		renameSync(temporary, manifestPath);
 	}
 }
+/** The npm registry the distribution installs from by default. */
+const OFFICIAL_REGISTRY = "https://registry.npmjs.org";
+/** The mainland mirror, which serves the same packages and answers faster there. */
+const MAINLAND_REGISTRY = "https://registry.npmmirror.com";
 /**
-* Run pnpm in one directory, inheriting its output.
+* The registries to try, in order, for this machine.
 *
-* Windows resolves a command through its shell: \`spawnSync\` on a \`.cmd\` shim fails
-* with EINVAL, so the call goes through \`cmd.exe\` there. This matches the runner in
-* \`apply.ts\`, which the apply path has used on Windows since it shipped.
+* A mainland locale reaches the mirror faster than the origin, which is why the Desktop
+* installer already prefers it there. The same choice belongs to the profile install: it
+* fetches a full dependency closure, so the delay is the first thing a consumer notices.
+* `DSH_PLUS_INSTALL_REGISTRY` overrides the choice, and a failure falls back once.
 *
-* @param cwd - the directory pnpm runs in.
-* @param args - pnpm arguments, without the executable.
-* @param label - the failing step's name, for the error.
+* @returns registries to try in order.
 */
-function runPnpm(cwd, args, label) {
-	const result = spawnSync("pnpm", [...args], {
-		cwd,
-		stdio: "inherit",
-		shell: process.platform === "win32"
-	});
-	if (result.error !== void 0) throw result.error;
-	if (result.status !== 0) throw new Error(label + " failed with exit code " + String(result.status));
+function registryOrder() {
+	const configured = process.env.DSH_PLUS_INSTALL_REGISTRY;
+	if (configured !== void 0 && configured !== "") return [configured, MAINLAND_REGISTRY];
+	const locale = (process.env.LANG ?? process.env.LC_ALL ?? "").toLowerCase();
+	return locale.includes("zh") || locale.includes("cn") ? [MAINLAND_REGISTRY, OFFICIAL_REGISTRY] : [OFFICIAL_REGISTRY, MAINLAND_REGISTRY];
+}
+/**
+* Report whether pnpm can run.
+*
+* The profile installs its own tree so its \`overrides\` apply, and only pnpm reads those
+* from a workspace, so pnpm is a prerequisite the distribution cannot supply. Probing
+* first turns a cryptic failure from the install into a message naming what is missing.
+*
+* @returns \`true\` when pnpm answers with a version.
+*/
+function pnpmAvailable() {
+	return spawnSync("pnpm", ["--version"], {
+		stdio: "pipe",
+		shell: process.platform === "win32",
+		encoding: "utf8"
+	}).status === 0;
+}
+/**
+* The commands that install pnpm, in the order worth trying.
+*
+* Corepack ships with Node and needs no download, so it comes first; npm is the fallback
+* for an installation whose Corepack is absent or disabled. Both are the consumer's own
+* toolchain, which is what lets the first start offer to install rather than only report.
+*
+* @returns commands to try in order, stopping at the first that works.
+*/
+function pnpmInstallCommands() {
+	const registry = registryOrder()[0];
+	if (registry === void 0) return ["corepack enable pnpm", "npm install -g pnpm"];
+	return ["corepack enable pnpm", "npm install -g pnpm --registry " + registry];
+}
+/**
+* The command to show a consumer who declines the automatic install.
+*
+* @returns the preferred command, which is the one the offer runs first.
+*/
+function pnpmInstallCommand() {
+	return pnpmInstallCommands()[0] ?? "npm install -g pnpm";
 }
 /**
 * Expose the distribution's nested packages at the top level the profile searches.
@@ -698,6 +765,35 @@ async function start(argv) {
 	const options = parseStartOptions(argv);
 	const anchor = installationAnchor();
 	const paths = resolvePaths(anchor);
+	if (!pnpmAvailable()) {
+		const command = pnpmInstallCommand();
+		console.log("pnpm is required to install the plus profile, and was not found.");
+		console.log("Install it with: " + command);
+		if (!await confirm("Install pnpm now?")) {
+			console.log("Install pnpm and run dsh-plus start again.");
+			return 1;
+		}
+		let installed = false;
+		const preferred = registryOrder()[0];
+		for (const candidate of pnpmInstallCommands()) if (spawnSync(candidate, {
+			stdio: "inherit",
+			shell: true,
+			env: preferred === void 0 ? process.env : {
+				...process.env,
+				COREPACK_NPM_REGISTRY: preferred
+			}
+		}).status === 0 && pnpmAvailable()) {
+			installed = true;
+			break;
+		}
+		if (!installed) {
+			console.log("Could not install pnpm automatically.");
+			console.log("Run one of these, then run dsh-plus start again:");
+			for (const candidate of pnpmInstallCommands()) console.log("  " + candidate);
+			return 1;
+		}
+		console.log("pnpm installed.");
+	}
 	const created = ensureProfile(paths, installationRoot());
 	console.log(created ? "Created the plus profile at " + paths.profileDirectory : "Using the existing plus profile");
 	for (const label of applyProfileNpmPatches(paths.distributionDirectory, paths.profileDirectory)) console.log("Applied the reviewed patch " + label);

package/lib/types/standalone-cli.js

@@ -14,7 +14,7 @@ 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, waitForAuthenticatedUrl, waitForServer, writeState, } from "./standalone-server.js";
-import { STANDALONE_PROFILE, applyProfileNpmPatches, ensureProfile, readDistributionProfile, resolvePaths, } from "./standalone-profile.js";
+import { STANDALONE_PROFILE, applyProfileNpmPatches, ensureProfile, pnpmAvailable, pnpmInstallCommand, pnpmInstallCommands, registryOrder, readDistributionProfile, resolvePaths, } from "./standalone-profile.js";
 /** Milliseconds a start waits for the server to answer before reporting failure. */
 const READY_TIMEOUT_MILLISECONDS = 90_000;
 function parseStartOptions(argv) {
@@ -100,6 +100,45 @@ async function start(argv) {
     const options = parseStartOptions(argv);
     const anchor = installationAnchor();
     const paths = resolvePaths(anchor);
+    // The profile installs its own dependency tree, which needs pnpm. Asking here rather
+    // than failing inside the install turns a missing prerequisite into a decision the
+    // consumer makes, and the install it can run is the one command that provides it.
+    if (!pnpmAvailable()) {
+        const command = pnpmInstallCommand();
+        console.log('pnpm is required to install the ' + STANDALONE_PROFILE + ' profile, and was not found.');
+        console.log('Install it with: ' + command);
+        if (!await confirm('Install pnpm now?')) {
+            console.log('Install pnpm and run dsh-plus start again.');
+            return 1;
+        }
+        // Try each installer in turn: Corepack is absent on an installation that disabled it,
+        // and npm succeeds there. A failure reports the commands rather than a stack trace.
+        let installed = false;
+        const preferred = registryOrder()[0];
+        for (const candidate of pnpmInstallCommands()) {
+            // Corepack reads its registry from the environment; npm takes a flag, which the
+            // command already carries. Setting it for both keeps the download on the mirror.
+            const attempt = spawnSync(candidate, {
+                stdio: 'inherit',
+                shell: true,
+                env: preferred === undefined
+                    ? process.env
+                    : { ...process.env, COREPACK_NPM_REGISTRY: preferred },
+            });
+            if (attempt.status === 0 && pnpmAvailable()) {
+                installed = true;
+                break;
+            }
+        }
+        if (!installed) {
+            console.log('Could not install pnpm automatically.');
+            console.log('Run one of these, then run dsh-plus start again:');
+            for (const candidate of pnpmInstallCommands())
+                console.log('  ' + candidate);
+            return 1;
+        }
+        console.log('pnpm installed.');
+    }
     const created = ensureProfile(paths, installationRoot());
     console.log(created
         ? 'Created the ' + STANDALONE_PROFILE + ' profile at ' + paths.profileDirectory

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

@@ -94,6 +94,43 @@ export declare function installProfilePackages(paths: StandalonePaths, consumerD
  * @param profileModules - the profile's \`node_modules\` directory.
  */
 export declare function alignReplacedPackageNames(profileModules: string): void;
+/**
+ * The registries to try, in order, for this machine.
+ *
+ * A mainland locale reaches the mirror faster than the origin, which is why the Desktop
+ * installer already prefers it there. The same choice belongs to the profile install: it
+ * fetches a full dependency closure, so the delay is the first thing a consumer notices.
+ * `DSH_PLUS_INSTALL_REGISTRY` overrides the choice, and a failure falls back once.
+ *
+ * @returns registries to try in order.
+ */
+export declare function registryOrder(): readonly string[];
+/**
+ * Report whether pnpm can run.
+ *
+ * The profile installs its own tree so its \`overrides\` apply, and only pnpm reads those
+ * from a workspace, so pnpm is a prerequisite the distribution cannot supply. Probing
+ * first turns a cryptic failure from the install into a message naming what is missing.
+ *
+ * @returns \`true\` when pnpm answers with a version.
+ */
+export declare function pnpmAvailable(): boolean;
+/**
+ * The commands that install pnpm, in the order worth trying.
+ *
+ * Corepack ships with Node and needs no download, so it comes first; npm is the fallback
+ * for an installation whose Corepack is absent or disabled. Both are the consumer's own
+ * toolchain, which is what lets the first start offer to install rather than only report.
+ *
+ * @returns commands to try in order, stopping at the first that works.
+ */
+export declare function pnpmInstallCommands(): readonly string[];
+/**
+ * The command to show a consumer who declines the automatic install.
+ *
+ * @returns the preferred command, which is the one the offer runs first.
+ */
+export declare function pnpmInstallCommand(): string;
 /** Resolve every path a command needs, without creating anything. */
 export declare function resolvePaths(anchor: string, env?: NodeJS.ProcessEnv): StandalonePaths;
 /**

package/lib/types/standalone-profile.js

@@ -159,10 +159,38 @@ export function installProfilePackages(paths, consumerDirectory) {
         linkNestedBundles(paths, profileModules);
         return;
     }
-    runPnpm(paths.profileDirectory, ['install', '--no-frozen-lockfile'], 'pnpm install in the plus profile');
+    installWithRegistryFallback(paths);
     alignReplacedPackageNames(profileModules);
     linkNestedBundles(paths, profileModules);
 }
+/**
+ * Install the profile from the first registry that answers.
+ *
+ * The install fetches a full dependency closure, and a mainland consumer reaches the
+ * mirror far faster than the origin. Trying the preferred registry and falling back once
+ * keeps a first start quick without failing when the preferred one is unreachable.
+ *
+ * @param paths - resolved standalone paths.
+ */
+function installWithRegistryFallback(paths) {
+    const registries = registryOrder();
+    for (const [index, registry] of registries.entries()) {
+        const result = spawnSync('pnpm', ['install', '--no-frozen-lockfile', '--registry', registry], {
+            cwd: paths.profileDirectory,
+            stdio: 'inherit',
+            shell: process.platform === 'win32',
+        });
+        if (result.error !== undefined)
+            throw result.error;
+        if (result.status === 0)
+            return;
+        const next = registries[index + 1];
+        if (next === undefined) {
+            throw new Error('pnpm install in the plus profile failed with exit code ' + String(result.status));
+        }
+        console.log('Install from ' + registry + ' failed; trying ' + next + '.');
+    }
+}
 /**
  * Make each replaced package declare the name of the location it occupies.
  *
@@ -197,27 +225,70 @@ export function alignReplacedPackageNames(profileModules) {
         renameSync(temporary, manifestPath);
     }
 }
+/** The npm registry the distribution installs from by default. */
+const OFFICIAL_REGISTRY = 'https://registry.npmjs.org';
+/** The mainland mirror, which serves the same packages and answers faster there. */
+const MAINLAND_REGISTRY = 'https://registry.npmmirror.com';
+/**
+ * The registries to try, in order, for this machine.
+ *
+ * A mainland locale reaches the mirror faster than the origin, which is why the Desktop
+ * installer already prefers it there. The same choice belongs to the profile install: it
+ * fetches a full dependency closure, so the delay is the first thing a consumer notices.
+ * `DSH_PLUS_INSTALL_REGISTRY` overrides the choice, and a failure falls back once.
+ *
+ * @returns registries to try in order.
+ */
+export function registryOrder() {
+    const configured = process.env.DSH_PLUS_INSTALL_REGISTRY;
+    if (configured !== undefined && configured !== '')
+        return [configured, MAINLAND_REGISTRY];
+    const locale = (process.env.LANG ?? process.env.LC_ALL ?? '').toLowerCase();
+    const mainlandFirst = locale.includes('zh') || locale.includes('cn');
+    return mainlandFirst ? [MAINLAND_REGISTRY, OFFICIAL_REGISTRY] : [OFFICIAL_REGISTRY, MAINLAND_REGISTRY];
+}
 /**
- * Run pnpm in one directory, inheriting its output.
+ * Report whether pnpm can run.
  *
- * Windows resolves a command through its shell: \`spawnSync\` on a \`.cmd\` shim fails
- * with EINVAL, so the call goes through \`cmd.exe\` there. This matches the runner in
- * \`apply.ts\`, which the apply path has used on Windows since it shipped.
+ * The profile installs its own tree so its \`overrides\` apply, and only pnpm reads those
+ * from a workspace, so pnpm is a prerequisite the distribution cannot supply. Probing
+ * first turns a cryptic failure from the install into a message naming what is missing.
  *
- * @param cwd - the directory pnpm runs in.
- * @param args - pnpm arguments, without the executable.
- * @param label - the failing step's name, for the error.
+ * @returns \`true\` when pnpm answers with a version.
  */
-function runPnpm(cwd, args, label) {
-    const result = spawnSync('pnpm', [...args], {
-        cwd,
-        stdio: 'inherit',
+export function pnpmAvailable() {
+    const probe = spawnSync('pnpm', ['--version'], {
+        stdio: 'pipe',
         shell: process.platform === 'win32',
+        encoding: 'utf8',
     });
-    if (result.error !== undefined)
-        throw result.error;
-    if (result.status !== 0)
-        throw new Error(label + ' failed with exit code ' + String(result.status));
+    return probe.status === 0;
+}
+/**
+ * The commands that install pnpm, in the order worth trying.
+ *
+ * Corepack ships with Node and needs no download, so it comes first; npm is the fallback
+ * for an installation whose Corepack is absent or disabled. Both are the consumer's own
+ * toolchain, which is what lets the first start offer to install rather than only report.
+ *
+ * @returns commands to try in order, stopping at the first that works.
+ */
+export function pnpmInstallCommands() {
+    const registry = registryOrder()[0];
+    if (registry === undefined)
+        return ['corepack enable pnpm', 'npm install -g pnpm'];
+    // Both installers take the registry explicitly. npm does so with a flag; corepack reads
+    // COREPACK_NPM_REGISTRY, which the caller sets. A mainland consumer therefore downloads
+    // the package from the mirror, for the same reason the profile install prefers it.
+    return ['corepack enable pnpm', 'npm install -g pnpm --registry ' + registry];
+}
+/**
+ * The command to show a consumer who declines the automatic install.
+ *
+ * @returns the preferred command, which is the one the offer runs first.
+ */
+export function pnpmInstallCommand() {
+    return pnpmInstallCommands()[0] ?? 'npm install -g pnpm';
 }
 /**
  * Expose the distribution's nested packages at the top level the profile searches.

package/package.json

@@ -166,5 +166,5 @@
   },
   "type": "module",
   "types": "lib/types/index.d.ts",
-  "version": "0.1.0-rc.38"
+  "version": "0.1.0-rc.40"
 }