@pipelab/cli 2.0.0-beta.7 → 2.0.0-beta.9

package/index.mjs

@@ -5,12 +5,12 @@ import "./dist-BC_B45iu.mjs";
 import path, { delimiter, dirname, isAbsolute, join, normalize, resolve, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { constants, homedir, platform, release, tmpdir } from "node:os";
-import fs, { appendFileSync, createReadStream, createWriteStream, existsSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import fs, { appendFileSync, createReadStream, createWriteStream, existsSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
 import http from "http";
 import http$1 from "node:http";
 import { webcrypto } from "node:crypto";
 import { dirname as dirname$1, isAbsolute as isAbsolute$1, posix, relative, sep as sep$1 } from "path";
-import fs$1, { access, chmod, cp, mkdir, mkdtemp, readFile, readdir, realpath, rm, stat, unlink, writeFile } from "node:fs/promises";
+import fs$1, { access, chmod, cp, mkdir, mkdtemp, readFile, readdir, realpath, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { ChildProcess, execFile, spawn, spawnSync } from "node:child_process";
 import { StringDecoder } from "node:string_decoder";
 import { aborted, callbackify, debuglog, inspect, promisify, stripVTControlCharacters, styleText } from "node:util";
@@ -104155,6 +104155,25 @@ async function serveCommand(options, version, _dirname) {
 //#region ../../packages/core-node/src/utils/remote.ts
 const DEFAULT_NODE_VERSION = "24.14.1";
 const DEFAULT_PNPM_VERSION = "10.12.0";
+function isPackageComplete(packageDir) {
+	return existsSync(join(packageDir, "package.json"));
+}
+function isNodeJSComplete(nodePath) {
+	try {
+		return existsSync(nodePath) && statSync(nodePath).size > 0;
+	} catch {
+		return false;
+	}
+}
+function isDependenciesInstalledSync(packageDir) {
+	const nodeModulesPath = join(packageDir, "node_modules");
+	if (!existsSync(nodeModulesPath)) return false;
+	try {
+		return readdirSync(nodeModulesPath).length > 0;
+	} catch {
+		return false;
+	}
+}
 /**
 * In-memory lock to prevent concurrent operations on the same resource (e.g., downloading Node.js).
 */
@@ -104207,15 +104226,35 @@ async function fetchPackage(packageName, versionOrRange, options) {
 	}
 	const cachePath = join(ctx.userDataPath, "cache", "pacote");
 	const packageDir = join(baseDir, resolvedVersion);
-	if (existsSync(packageDir) && !options?.installDeps) return {
+	if (options?.installDeps ? isPackageComplete(packageDir) && isDependenciesInstalledSync(packageDir) : isPackageComplete(packageDir)) return {
 		packageDir,
 		resolvedVersion
 	};
 	return withLock(`package:${packageName}:${resolvedVersion}`, async () => {
-		if (!existsSync(packageDir)) {
+		if (!isPackageComplete(packageDir)) {
 			console.log(`[Fetcher] ${packageName}@${resolvedVersion}: Downloading to ${packageDir}...`);
-			await mkdir(packageDir, { recursive: true });
-			await import_lib.default.extract(`${packageName}@${resolvedVersion}`, packageDir, { cache: cachePath });
+			const tempDir = join(baseDir, `.tmp-${resolvedVersion}-${Math.random().toString(36).slice(2)}`);
+			await mkdir(tempDir, { recursive: true });
+			try {
+				await import_lib.default.extract(`${packageName}@${resolvedVersion}`, tempDir, { cache: cachePath });
+				await resolveEntryPoint(tempDir, packageName);
+				if (existsSync(packageDir)) await rm(packageDir, {
+					recursive: true,
+					force: true
+				}).catch(() => {});
+				try {
+					await rename(tempDir, packageDir);
+				} catch (err) {
+					if (isPackageComplete(packageDir)) console.log(`[Fetcher] Destination ${packageDir} already exists and is valid.`);
+					else throw err;
+				}
+			} catch (err) {
+				await rm(tempDir, {
+					recursive: true,
+					force: true
+				}).catch(() => {});
+				throw err;
+			}
 		}
 		const entryPoint = await resolveEntryPoint(packageDir, packageName);
 		if (options?.installDeps) await installDependencies(packageDir, packageName, options);
@@ -104260,9 +104299,9 @@ async function ensureNodeJS(context, version = DEFAULT_NODE_VERSION) {
 	const isWindows = process.platform === "win32";
 	const nodeDir = context.getThirdPartyPath("node", version);
 	const finalNodePath = join(nodeDir, isWindows ? "node.exe" : "bin/node");
-	if (existsSync(finalNodePath)) return finalNodePath;
+	if (isNodeJSComplete(finalNodePath)) return finalNodePath;
 	return withLock(`node:${version}`, async () => {
-		if (existsSync(finalNodePath)) return finalNodePath;
+		if (isNodeJSComplete(finalNodePath)) return finalNodePath;
 		const arch = process.arch === "x64" ? "x64" : process.arch === "arm64" ? "arm64" : "x86";
 		const platform = isWindows ? "win" : process.platform === "darwin" ? "osx" : "linux";
 		const extension = isWindows ? "zip" : "tar.gz";
@@ -104282,17 +104321,33 @@ async function ensureNodeJS(context, version = DEFAULT_NODE_VERSION) {
 		const nodeSubDir = (await readdir(extractTempDir)).find((entry) => entry.startsWith(`node-v${version}`));
 		if (!nodeSubDir) throw new Error(`Could not find extracted Node.js directory`);
 		const sourceDir = join(extractTempDir, nodeSubDir);
-		await mkdir(dirname(nodeDir), { recursive: true });
-		await rm(nodeDir, {
-			recursive: true,
-			force: true
-		});
-		await cp(sourceDir, nodeDir, { recursive: true });
-		await rm(tempDir, {
-			recursive: true,
-			force: true
-		});
-		if (!isWindows) await chmod(finalNodePath, 493).catch(() => {});
+		const parentDir = dirname(nodeDir);
+		await mkdir(parentDir, { recursive: true });
+		const tempNodeDir = join(parentDir, `.tmp-node-${version}-${Math.random().toString(36).slice(2)}`);
+		await mkdir(tempNodeDir, { recursive: true });
+		try {
+			await cp(sourceDir, tempNodeDir, { recursive: true });
+			if (!isWindows) await chmod(join(tempNodeDir, "bin/node"), 493).catch(() => {});
+			if (existsSync(nodeDir)) await rm(nodeDir, {
+				recursive: true,
+				force: true
+			}).catch(() => {});
+			try {
+				await rename(tempNodeDir, nodeDir);
+			} catch (err) {
+				if (isNodeJSComplete(finalNodePath)) console.log(`[Fetcher] Node.js directory already exists and is valid.`);
+				else throw err;
+			}
+		} finally {
+			await rm(tempNodeDir, {
+				recursive: true,
+				force: true
+			}).catch(() => {});
+			await rm(tempDir, {
+				recursive: true,
+				force: true
+			}).catch(() => {});
+		}
 		return finalNodePath;
 	});
 }
@@ -104311,25 +104366,36 @@ async function ensurePNPM(context, version = DEFAULT_PNPM_VERSION) {
 }
 async function installDependencies(packageDir, packageName, options) {
 	const nodeModulesPath = join(packageDir, "node_modules");
-	if (existsSync(nodeModulesPath)) try {
-		if ((await readdir(nodeModulesPath)).length === 0) console.warn(`[Fetcher] ${packageName}: node_modules exists but is empty. Re-installing...`);
-		else {
-			console.log(`[Fetcher] ${packageName}: Dependencies already installed, skipping.`);
-			return;
-		}
-	} catch (e) {}
-	console.log(`[Fetcher] ${packageName}: Ensuring dependencies are installed...`);
+	if (isDependenciesInstalledSync(packageDir)) {
+		console.log(`[Fetcher] ${packageName}: Dependencies already installed, skipping.`);
+		return;
+	}
+	const tempDir = `${packageDir}.tmp-deps-${Math.random().toString(36).slice(2)}`;
+	await mkdir(tempDir, { recursive: true });
 	try {
-		const { all } = await runPnpm(packageDir, {
+		await cp(join(packageDir, "package.json"), join(tempDir, "package.json"));
+		console.log(`[Fetcher] ${packageName}: Ensuring dependencies are installed...`);
+		const { all } = await runPnpm(tempDir, {
 			signal: options.signal,
 			context: options.context
 		});
 		if (all) console.log(`[Fetcher] ${packageName}: Installation trace:\n${all}`);
+		const tempNodeModules = join(tempDir, "node_modules");
+		if (existsSync(nodeModulesPath)) await rm(nodeModulesPath, {
+			recursive: true,
+			force: true
+		}).catch(() => {});
+		await rename(tempNodeModules, nodeModulesPath);
 		console.log(`[Fetcher] ${packageName}: Dependencies installed successfully.`);
 	} catch (err) {
 		console.error(`[Fetcher] ${packageName}: CRITICAL ERROR during dependency installation: ${err.message}`);
 		if (err.all) console.error(`[Fetcher] ${packageName}: Error details:\n${err.all}`);
 		throw new Error(`Failed to install dependencies for ${packageName}. See logs for details.`);
+	} finally {
+		await rm(tempDir, {
+			recursive: true,
+			force: true
+		}).catch(() => {});
 	}
 }
 async function fetchPipelabAsset(packageName, versionOrRange, options) {
@@ -105582,7 +105648,7 @@ async function runPipelineCommand(file, options, version) {
 }
 //#endregion
 //#region package.json
-var version$2 = "2.0.0-beta.7";
+var version$2 = "2.0.0-beta.9";
 //#endregion
 //#region src/paths.ts
 const getDefaultUserDataPath = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipelab/cli",
-  "version": "2.0.0-beta.7",
+  "version": "2.0.0-beta.9",
   "description": "The command line interface for Pipelab",
   "license": "FSL-1.1-MIT",
   "author": "CynToolkit",