@camstack/system 1.1.26 → 1.1.27

package/dist/index.js

@@ -3339,32 +3339,30 @@ var AddonInstaller = class AddonInstaller {
 	}
 	/** Install addon from a tgz file (uploaded or downloaded) */
 	async installFromTgz(tgzPath) {
-		const tmpDir = node_fs.mkdtempSync(node_path.join(node_os.tmpdir(), "camstack-addon-install-"));
+		const stagingRoot = node_path.join(this.addonsDir, ".staging");
+		ensureDir(stagingRoot);
+		await this.sweepGraveyard(stagingRoot);
+		const stagingDir = node_path.join(stagingRoot, `install-${process.pid}-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`);
+		ensureDir(stagingDir);
 		try {
 			await execFileAsync("tar", [
 				"-xzf",
 				tgzPath,
 				"-C",
-				tmpDir
-			], { timeout: 3e4 });
-			const extractedDir = node_path.join(tmpDir, "package");
-			const pkgJsonPath = node_fs.existsSync(node_path.join(extractedDir, "package.json")) ? node_path.join(extractedDir, "package.json") : node_path.join(tmpDir, "package.json");
+				stagingDir
+			], { timeout: 12e4 });
+			const pkgDir = node_fs.existsSync(node_path.join(stagingDir, "package", "package.json")) ? node_path.join(stagingDir, "package") : stagingDir;
+			const pkgJsonPath = node_path.join(pkgDir, "package.json");
 			if (!node_fs.existsSync(pkgJsonPath)) throw new Error("No package.json found in tgz archive");
 			const pkgView = readPackageJson(pkgJsonPath);
 			if (!pkgView) throw new Error(`Invalid package.json at ${pkgJsonPath}`);
 			if (!pkgView.camstackAddons) throw new Error(`Package ${pkgView.name} has no camstack.addons manifest`);
 			const targetDir = node_path.join(this.addonsDir, pkgView.name);
-			await this.evictInstallDir(targetDir);
-			ensureDir(targetDir);
-			const sourceDir = node_path.dirname(pkgJsonPath);
 			const strippedManifest = stripCamstackDeps(pkgView.raw);
-			await node_fs.promises.writeFile(node_path.join(targetDir, "package.json"), JSON.stringify(strippedManifest, null, 2));
-			const sourceDist = node_path.join(sourceDir, "dist");
-			if (node_fs.existsSync(sourceDist)) await copyDirRecursive(sourceDist, node_path.join(targetDir, "dist"));
-			await copyExtraFileDirs(pkgView.raw, sourceDir, targetDir);
+			await node_fs.promises.writeFile(pkgJsonPath, JSON.stringify(strippedManifest, null, 2));
 			const strippedRuntimeDeps = strippedManifest["dependencies"];
 			if (strippedRuntimeDeps != null && typeof strippedRuntimeDeps === "object" && Object.keys(strippedRuntimeDeps).length > 0) {
-				this.logger.info(`${pkgView.name} — installing runtime dependencies`, { meta: { targetDir } });
+				this.logger.info(`${pkgView.name} — installing runtime dependencies`, { meta: { stagingDir: pkgDir } });
 				try {
 					await execFileAsync("npm", [
 						"install",
@@ -3375,7 +3373,7 @@ var AddonInstaller = class AddonInstaller {
 						"--no-package-lock",
 						...this.registry ? ["--registry", this.registry] : []
 					], {
-						cwd: targetDir,
+						cwd: pkgDir,
 						timeout: 24e4
 					});
 				} catch (err) {
@@ -3383,14 +3381,13 @@ var AddonInstaller = class AddonInstaller {
 				}
 			}
 			try {
-				await require_manifest_python_deps.installManifestNativeDeps(targetDir, pkgView.raw, this.logger, this.registry);
+				await require_manifest_python_deps.installManifestNativeDeps(pkgDir, pkgView.raw, this.logger, this.registry);
 			} catch (nativeErr) {
-				await node_fs.promises.rm(targetDir, {
-					recursive: true,
-					force: true
-				});
 				throw new Error(`${pkgView.name} — native deps install failed: ${(0, _camstack_types.errMsg)(nativeErr)}`, { cause: nativeErr });
 			}
+			await this.evictInstallDir(targetDir);
+			ensureDir(node_path.dirname(targetDir));
+			await node_fs.promises.rename(pkgDir, targetDir);
 			this.manifest.upsert(pkgView.name, {
 				version: pkgView.version,
 				source: "bundled"
@@ -3400,10 +3397,10 @@ var AddonInstaller = class AddonInstaller {
 				version: pkgView.version
 			};
 		} finally {
-			await node_fs.promises.rm(tmpDir, {
+			await node_fs.promises.rm(stagingDir, {
 				recursive: true,
 				force: true
-			});
+			}).catch(() => void 0);
 		}
 	}
 	/**

package/dist/index.mjs

@@ -3331,32 +3331,30 @@ var AddonInstaller = class AddonInstaller {
 	}
 	/** Install addon from a tgz file (uploaded or downloaded) */
 	async installFromTgz(tgzPath) {
-		const tmpDir = fs$17.mkdtempSync(path$39.join(os$18.tmpdir(), "camstack-addon-install-"));
+		const stagingRoot = path$39.join(this.addonsDir, ".staging");
+		ensureDir(stagingRoot);
+		await this.sweepGraveyard(stagingRoot);
+		const stagingDir = path$39.join(stagingRoot, `install-${process.pid}-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`);
+		ensureDir(stagingDir);
 		try {
 			await execFileAsync("tar", [
 				"-xzf",
 				tgzPath,
 				"-C",
-				tmpDir
-			], { timeout: 3e4 });
-			const extractedDir = path$39.join(tmpDir, "package");
-			const pkgJsonPath = fs$17.existsSync(path$39.join(extractedDir, "package.json")) ? path$39.join(extractedDir, "package.json") : path$39.join(tmpDir, "package.json");
+				stagingDir
+			], { timeout: 12e4 });
+			const pkgDir = fs$17.existsSync(path$39.join(stagingDir, "package", "package.json")) ? path$39.join(stagingDir, "package") : stagingDir;
+			const pkgJsonPath = path$39.join(pkgDir, "package.json");
 			if (!fs$17.existsSync(pkgJsonPath)) throw new Error("No package.json found in tgz archive");
 			const pkgView = readPackageJson(pkgJsonPath);
 			if (!pkgView) throw new Error(`Invalid package.json at ${pkgJsonPath}`);
 			if (!pkgView.camstackAddons) throw new Error(`Package ${pkgView.name} has no camstack.addons manifest`);
 			const targetDir = path$39.join(this.addonsDir, pkgView.name);
-			await this.evictInstallDir(targetDir);
-			ensureDir(targetDir);
-			const sourceDir = path$39.dirname(pkgJsonPath);
 			const strippedManifest = stripCamstackDeps(pkgView.raw);
-			await fs$17.promises.writeFile(path$39.join(targetDir, "package.json"), JSON.stringify(strippedManifest, null, 2));
-			const sourceDist = path$39.join(sourceDir, "dist");
-			if (fs$17.existsSync(sourceDist)) await copyDirRecursive(sourceDist, path$39.join(targetDir, "dist"));
-			await copyExtraFileDirs(pkgView.raw, sourceDir, targetDir);
+			await fs$17.promises.writeFile(pkgJsonPath, JSON.stringify(strippedManifest, null, 2));
 			const strippedRuntimeDeps = strippedManifest["dependencies"];
 			if (strippedRuntimeDeps != null && typeof strippedRuntimeDeps === "object" && Object.keys(strippedRuntimeDeps).length > 0) {
-				this.logger.info(`${pkgView.name} — installing runtime dependencies`, { meta: { targetDir } });
+				this.logger.info(`${pkgView.name} — installing runtime dependencies`, { meta: { stagingDir: pkgDir } });
 				try {
 					await execFileAsync("npm", [
 						"install",
@@ -3367,7 +3365,7 @@ var AddonInstaller = class AddonInstaller {
 						"--no-package-lock",
 						...this.registry ? ["--registry", this.registry] : []
 					], {
-						cwd: targetDir,
+						cwd: pkgDir,
 						timeout: 24e4
 					});
 				} catch (err) {
@@ -3375,14 +3373,13 @@ var AddonInstaller = class AddonInstaller {
 				}
 			}
 			try {
-				await installManifestNativeDeps(targetDir, pkgView.raw, this.logger, this.registry);
+				await installManifestNativeDeps(pkgDir, pkgView.raw, this.logger, this.registry);
 			} catch (nativeErr) {
-				await fs$17.promises.rm(targetDir, {
-					recursive: true,
-					force: true
-				});
 				throw new Error(`${pkgView.name} — native deps install failed: ${errMsg(nativeErr)}`, { cause: nativeErr });
 			}
+			await this.evictInstallDir(targetDir);
+			ensureDir(path$39.dirname(targetDir));
+			await fs$17.promises.rename(pkgDir, targetDir);
 			this.manifest.upsert(pkgView.name, {
 				version: pkgView.version,
 				source: "bundled"
@@ -3392,10 +3389,10 @@ var AddonInstaller = class AddonInstaller {
 				version: pkgView.version
 			};
 		} finally {
-			await fs$17.promises.rm(tmpDir, {
+			await fs$17.promises.rm(stagingDir, {
 				recursive: true,
 				force: true
-			});
+			}).catch(() => void 0);
 		}
 	}
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/system",
-  "version": "1.1.26",
+  "version": "1.1.27",
   "description": "Core addon for CamStack — builtins, pipeline, process management, auth, logging, events",
   "keywords": [
     "camstack",