@pipelab/plugin-filesystem 1.0.0-beta.28 → 1.0.0-beta.31

package/dist/index.cjs

@@ -89411,7 +89411,7 @@ const runWithLiveLogs = async (command, args, execaOptions, log, hooks, abortSig
 			TERM: "xterm-256color",
 			FORCE_STDERR_LOGGING: "1"
 		},
-		cancelSignal: abortSignal
+		cancelSignal: abortSignal ?? execaOptions.cancelSignal
 	});
 	hooks?.onCreated?.(subprocess);
 	subprocess.stdout?.on("data", (data) => {
@@ -151152,16 +151152,32 @@ const zip = createAction({
 	meta: {}
 });
 const zipRunner = createActionRunner(async ({ log, inputs, setOutput, abortSignal }) => {
-	abortSignal.addEventListener("abort", () => {
-		throw new Error("Aborted");
-	});
-	const output = (0, node_fs.createWriteStream)(inputs.output);
+	const { folder, output: outputPath } = inputs;
+	if (!folder) throw new Error("Missing folder");
+	if (!outputPath) throw new Error("Missing output path");
+	if (abortSignal.aborted) {
+		const abortError = /* @__PURE__ */ new Error("Aborted");
+		abortError.name = "AbortError";
+		throw abortError;
+	}
+	const output = (0, node_fs.createWriteStream)(outputPath);
 	const archive = (0, import_archiver.default)("zip", { zlib: { level: 9 } });
 	return new Promise((resolve, reject) => {
+		const onAbort = () => {
+			try {
+				archive.abort();
+			} catch {}
+			try {
+				output.destroy();
+			} catch {}
+			const abortError = /* @__PURE__ */ new Error("Aborted");
+			abortError.name = "AbortError";
+			reject(abortError);
+		};
+		abortSignal.addEventListener("abort", onAbort);
 		output.on("close", function() {
-			console.log(archive.pointer() + " total bytes");
-			console.log("archiver has been finalized and the output file descriptor has closed.");
-			setOutput("path", inputs.output);
+			abortSignal.removeEventListener("abort", onAbort);
+			setOutput("path", outputPath);
 			resolve();
 		});
 		output.on("end", function() {
@@ -151169,9 +151185,13 @@ const zipRunner = createActionRunner(async ({ log, inputs, setOutput, abortSigna
 		});
 		archive.on("warning", function(err) {
 			if (err.code === "ENOENT") console.log("Archiver warning: ENOENT");
-			else reject(err);
+			else {
+				abortSignal.removeEventListener("abort", onAbort);
+				reject(err);
+			}
 		});
 		archive.on("error", function(err) {
+			abortSignal.removeEventListener("abort", onAbort);
 			reject(err);
 		});
 		archive.on("entry", function(data) {
@@ -151181,7 +151201,7 @@ const zipRunner = createActionRunner(async ({ log, inputs, setOutput, abortSigna
 			log("finish");
 		});
 		archive.pipe(output);
-		archive.directory(inputs.folder, false);
+		archive.directory(folder, false);
 		archive.finalize();
 	});
 });
@@ -151207,18 +151227,31 @@ const zipV2 = createAction({
 	meta: {}
 });
 const zipV2Runner = createActionRunner(async ({ log, inputs, setOutput, abortSignal, paths }) => {
-	abortSignal.addEventListener("abort", () => {
-		throw new Error("Aborted");
-	});
+	if (abortSignal.aborted) {
+		const abortError = /* @__PURE__ */ new Error("Aborted");
+		abortError.name = "AbortError";
+		throw abortError;
+	}
 	const outputDir = paths.cache;
 	const outputFile = (0, node_path.join)(outputDir, "output.zip");
 	console.log("outputFile", outputFile);
 	const output = (0, node_fs.createWriteStream)(outputFile);
 	const archive = (0, import_archiver.default)("zip", { zlib: { level: 9 } });
 	return new Promise((resolve, reject) => {
+		const onAbort = () => {
+			try {
+				archive.abort();
+			} catch {}
+			try {
+				output.destroy();
+			} catch {}
+			const abortError = /* @__PURE__ */ new Error("Aborted");
+			abortError.name = "AbortError";
+			reject(abortError);
+		};
+		abortSignal.addEventListener("abort", onAbort);
 		output.on("close", function() {
-			console.log(archive.pointer() + " total bytes");
-			console.log("archiver has been finalized and the output file descriptor has closed.");
+			abortSignal.removeEventListener("abort", onAbort);
 			setOutput("path", outputFile);
 			resolve();
 		});
@@ -151227,9 +151260,13 @@ const zipV2Runner = createActionRunner(async ({ log, inputs, setOutput, abortSig
 		});
 		archive.on("warning", function(err) {
 			if (err.code === "ENOENT") console.log("Archiver warning: ENOENT");
-			else reject(err);
+			else {
+				abortSignal.removeEventListener("abort", onAbort);
+				reject(err);
+			}
 		});
 		archive.on("error", function(err) {
+			abortSignal.removeEventListener("abort", onAbort);
 			reject(err);
 		});
 		archive.on("entry", function(data) {
@@ -152106,20 +152143,34 @@ const unzip = createAction({
 	icon: "",
 	meta: {}
 });
-const unzipRunner = createActionRunner(async ({ log, inputs, setOutput, cwd }) => {
-	console.log("inputs", inputs);
-	console.log("inputs.file", inputs.file);
+const unzipRunner = createActionRunner(async ({ log, inputs, setOutput, cwd, abortSignal }) => {
+	if (abortSignal.aborted) {
+		const abortError = /* @__PURE__ */ new Error("Aborted");
+		abortError.name = "AbortError";
+		throw abortError;
+	}
 	const file = inputs.file;
-	console.log("file", file);
 	const output = (0, node_path.join)(cwd);
-	console.log("file", file);
-	console.log("output", output);
 	log("Unzip file", inputs.file, "to", output);
 	const zip = new import_node_stream_zip.default.async({ file });
-	const bytes = await zip.extract(null, output);
-	await zip.close();
-	console.log("bytes", bytes);
-	setOutput("output", output);
+	const onAbort = () => {
+		zip.close().catch(() => {});
+	};
+	abortSignal.addEventListener("abort", onAbort);
+	try {
+		await zip.extract(null, output);
+		await zip.close();
+		setOutput("output", output);
+	} catch (e) {
+		if (abortSignal.aborted) {
+			const abortError = /* @__PURE__ */ new Error("Aborted");
+			abortError.name = "AbortError";
+			throw abortError;
+		}
+		throw e;
+	} finally {
+		abortSignal.removeEventListener("abort", onAbort);
+	}
 });
 const copy = createAction({
 	id: "fs:copy",
@@ -152189,18 +152240,10 @@ const copy = createAction({
 	icon: "",
 	meta: {}
 });
-const copyRunner = createActionRunner(async ({ log, inputs, setOutput }) => {
+const copyRunner = createActionRunner(async ({ log, inputs, setOutput, abortSignal }) => {
 	log("");
 	const from = inputs.from;
 	let to = inputs.to;
-	let fromIsAFile = false;
-	try {
-		if ((await (0, node_fs_promises.stat)(from)).isFile()) fromIsAFile = true;
-	} catch (e) {
-		log("Error getting file stats", e);
-		throw e;
-	}
-	const fromFileName = fromIsAFile ? (0, node_path.basename)(from) : "";
 	if (!from) {
 		log("From", from);
 		throw new Error("Missing source");
@@ -152209,6 +152252,14 @@ const copyRunner = createActionRunner(async ({ log, inputs, setOutput }) => {
 		log("To", to);
 		throw new Error("Missing destination");
 	}
+	let fromIsAFile = false;
+	try {
+		if ((await (0, node_fs_promises.stat)(from)).isFile()) fromIsAFile = true;
+	} catch (e) {
+		log("Error getting file stats", e);
+		throw e;
+	}
+	const fromFileName = fromIsAFile ? (0, node_path.basename)(from) : "";
 	if (fromIsAFile) try {
 		if ((await (0, node_fs_promises.stat)(to)).isDirectory()) to = (0, node_path.join)(to, fromFileName);
 	} catch (e) {}
@@ -152271,7 +152322,7 @@ const remove = createAction({
 	icon: "",
 	meta: {}
 });
-const removeRunner = createActionRunner(async ({ log, inputs }) => {
+const removeRunner = createActionRunner(async ({ log, inputs, abortSignal }) => {
 	log("");
 	const from = inputs.from;
 	log("Removing", from, inputs.recursive);
@@ -152388,10 +152439,11 @@ const runRunner = createActionRunner(async ({ log, inputs, setOutput, abortSigna
 		console.log("error", error);
 		if (inputs.stopOnError === true) throw error;
 		else if (error) {
-			setOutput("exitCode", error.exitCode === void 0 ? -1 : error.exitCode);
-			setOutput("stdout", error.stdout ?? "");
-			setOutput("stderr", error.stderr ?? "");
-			setOutput("duration", error.durationMs ?? 0);
+			const err = error;
+			setOutput("exitCode", err.exitCode === void 0 ? -1 : err.exitCode);
+			setOutput("stdout", err.stdout ?? "");
+			setOutput("stderr", err.stderr ?? "");
+			setOutput("duration", err.durationMs ?? 0);
 		}
 	}
 });
@@ -152418,7 +152470,7 @@ const openInExplorer = createAction({
 	icon: "",
 	meta: {}
 });
-const openInExplorerRunner = createActionRunner(async ({ log, inputs, setOutput }) => {
+const openInExplorerRunner = createActionRunner(async ({ log, inputs, setOutput, abortSignal }) => {
 	log(`Opening ${inputs.path}`);
 	return new Promise((resolve, reject) => {
 		let command = "";
@@ -152426,8 +152478,14 @@ const openInExplorerRunner = createActionRunner(async ({ log, inputs, setOutput
 		if (p === "win32") command = `start "" "${inputs.path}"`;
 		else if (p === "darwin") command = `open "${inputs.path}"`;
 		else command = `xdg-open "${inputs.path}"`;
-		(0, node_child_process.exec)(command, (error) => {
+		(0, node_child_process.exec)(command, { signal: abortSignal }, (error) => {
 			if (error) {
+				if (abortSignal.aborted) {
+					const abortError = /* @__PURE__ */ new Error("Aborted");
+					abortError.name = "AbortError";
+					reject(abortError);
+					return;
+				}
 				log(`Error opening path: ${error.message}`);
 				setOutput("message", error.message);
 				resolve();

package/dist/index.mjs

@@ -89405,7 +89405,7 @@ const runWithLiveLogs = async (command, args, execaOptions, log, hooks, abortSig
 			TERM: "xterm-256color",
 			FORCE_STDERR_LOGGING: "1"
 		},
-		cancelSignal: abortSignal
+		cancelSignal: abortSignal ?? execaOptions.cancelSignal
 	});
 	hooks?.onCreated?.(subprocess);
 	subprocess.stdout?.on("data", (data) => {
@@ -151147,16 +151147,32 @@ const zip = createAction({
 	meta: {}
 });
 const zipRunner = createActionRunner(async ({ log, inputs, setOutput, abortSignal }) => {
-	abortSignal.addEventListener("abort", () => {
-		throw new Error("Aborted");
-	});
-	const output = createWriteStream(inputs.output);
+	const { folder, output: outputPath } = inputs;
+	if (!folder) throw new Error("Missing folder");
+	if (!outputPath) throw new Error("Missing output path");
+	if (abortSignal.aborted) {
+		const abortError = /* @__PURE__ */ new Error("Aborted");
+		abortError.name = "AbortError";
+		throw abortError;
+	}
+	const output = createWriteStream(outputPath);
 	const archive = (0, import_archiver.default)("zip", { zlib: { level: 9 } });
 	return new Promise((resolve, reject) => {
+		const onAbort = () => {
+			try {
+				archive.abort();
+			} catch {}
+			try {
+				output.destroy();
+			} catch {}
+			const abortError = /* @__PURE__ */ new Error("Aborted");
+			abortError.name = "AbortError";
+			reject(abortError);
+		};
+		abortSignal.addEventListener("abort", onAbort);
 		output.on("close", function() {
-			console.log(archive.pointer() + " total bytes");
-			console.log("archiver has been finalized and the output file descriptor has closed.");
-			setOutput("path", inputs.output);
+			abortSignal.removeEventListener("abort", onAbort);
+			setOutput("path", outputPath);
 			resolve();
 		});
 		output.on("end", function() {
@@ -151164,9 +151180,13 @@ const zipRunner = createActionRunner(async ({ log, inputs, setOutput, abortSigna
 		});
 		archive.on("warning", function(err) {
 			if (err.code === "ENOENT") console.log("Archiver warning: ENOENT");
-			else reject(err);
+			else {
+				abortSignal.removeEventListener("abort", onAbort);
+				reject(err);
+			}
 		});
 		archive.on("error", function(err) {
+			abortSignal.removeEventListener("abort", onAbort);
 			reject(err);
 		});
 		archive.on("entry", function(data) {
@@ -151176,7 +151196,7 @@ const zipRunner = createActionRunner(async ({ log, inputs, setOutput, abortSigna
 			log("finish");
 		});
 		archive.pipe(output);
-		archive.directory(inputs.folder, false);
+		archive.directory(folder, false);
 		archive.finalize();
 	});
 });
@@ -151202,18 +151222,31 @@ const zipV2 = createAction({
 	meta: {}
 });
 const zipV2Runner = createActionRunner(async ({ log, inputs, setOutput, abortSignal, paths }) => {
-	abortSignal.addEventListener("abort", () => {
-		throw new Error("Aborted");
-	});
+	if (abortSignal.aborted) {
+		const abortError = /* @__PURE__ */ new Error("Aborted");
+		abortError.name = "AbortError";
+		throw abortError;
+	}
 	const outputDir = paths.cache;
 	const outputFile = join(outputDir, "output.zip");
 	console.log("outputFile", outputFile);
 	const output = createWriteStream(outputFile);
 	const archive = (0, import_archiver.default)("zip", { zlib: { level: 9 } });
 	return new Promise((resolve, reject) => {
+		const onAbort = () => {
+			try {
+				archive.abort();
+			} catch {}
+			try {
+				output.destroy();
+			} catch {}
+			const abortError = /* @__PURE__ */ new Error("Aborted");
+			abortError.name = "AbortError";
+			reject(abortError);
+		};
+		abortSignal.addEventListener("abort", onAbort);
 		output.on("close", function() {
-			console.log(archive.pointer() + " total bytes");
-			console.log("archiver has been finalized and the output file descriptor has closed.");
+			abortSignal.removeEventListener("abort", onAbort);
 			setOutput("path", outputFile);
 			resolve();
 		});
@@ -151222,9 +151255,13 @@ const zipV2Runner = createActionRunner(async ({ log, inputs, setOutput, abortSig
 		});
 		archive.on("warning", function(err) {
 			if (err.code === "ENOENT") console.log("Archiver warning: ENOENT");
-			else reject(err);
+			else {
+				abortSignal.removeEventListener("abort", onAbort);
+				reject(err);
+			}
 		});
 		archive.on("error", function(err) {
+			abortSignal.removeEventListener("abort", onAbort);
 			reject(err);
 		});
 		archive.on("entry", function(data) {
@@ -152098,20 +152135,34 @@ const unzip = createAction({
 	icon: "",
 	meta: {}
 });
-const unzipRunner = createActionRunner(async ({ log, inputs, setOutput, cwd }) => {
-	console.log("inputs", inputs);
-	console.log("inputs.file", inputs.file);
+const unzipRunner = createActionRunner(async ({ log, inputs, setOutput, cwd, abortSignal }) => {
+	if (abortSignal.aborted) {
+		const abortError = /* @__PURE__ */ new Error("Aborted");
+		abortError.name = "AbortError";
+		throw abortError;
+	}
 	const file = inputs.file;
-	console.log("file", file);
 	const output = join(cwd);
-	console.log("file", file);
-	console.log("output", output);
 	log("Unzip file", inputs.file, "to", output);
 	const zip = new import_node_stream_zip.default.async({ file });
-	const bytes = await zip.extract(null, output);
-	await zip.close();
-	console.log("bytes", bytes);
-	setOutput("output", output);
+	const onAbort = () => {
+		zip.close().catch(() => {});
+	};
+	abortSignal.addEventListener("abort", onAbort);
+	try {
+		await zip.extract(null, output);
+		await zip.close();
+		setOutput("output", output);
+	} catch (e) {
+		if (abortSignal.aborted) {
+			const abortError = /* @__PURE__ */ new Error("Aborted");
+			abortError.name = "AbortError";
+			throw abortError;
+		}
+		throw e;
+	} finally {
+		abortSignal.removeEventListener("abort", onAbort);
+	}
 });
 const copy = createAction({
 	id: "fs:copy",
@@ -152181,18 +152232,10 @@ const copy = createAction({
 	icon: "",
 	meta: {}
 });
-const copyRunner = createActionRunner(async ({ log, inputs, setOutput }) => {
+const copyRunner = createActionRunner(async ({ log, inputs, setOutput, abortSignal }) => {
 	log("");
 	const from = inputs.from;
 	let to = inputs.to;
-	let fromIsAFile = false;
-	try {
-		if ((await stat(from)).isFile()) fromIsAFile = true;
-	} catch (e) {
-		log("Error getting file stats", e);
-		throw e;
-	}
-	const fromFileName = fromIsAFile ? basename(from) : "";
 	if (!from) {
 		log("From", from);
 		throw new Error("Missing source");
@@ -152201,6 +152244,14 @@ const copyRunner = createActionRunner(async ({ log, inputs, setOutput }) => {
 		log("To", to);
 		throw new Error("Missing destination");
 	}
+	let fromIsAFile = false;
+	try {
+		if ((await stat(from)).isFile()) fromIsAFile = true;
+	} catch (e) {
+		log("Error getting file stats", e);
+		throw e;
+	}
+	const fromFileName = fromIsAFile ? basename(from) : "";
 	if (fromIsAFile) try {
 		if ((await stat(to)).isDirectory()) to = join(to, fromFileName);
 	} catch (e) {}
@@ -152263,7 +152314,7 @@ const remove = createAction({
 	icon: "",
 	meta: {}
 });
-const removeRunner = createActionRunner(async ({ log, inputs }) => {
+const removeRunner = createActionRunner(async ({ log, inputs, abortSignal }) => {
 	log("");
 	const from = inputs.from;
 	log("Removing", from, inputs.recursive);
@@ -152380,10 +152431,11 @@ const runRunner = createActionRunner(async ({ log, inputs, setOutput, abortSigna
 		console.log("error", error);
 		if (inputs.stopOnError === true) throw error;
 		else if (error) {
-			setOutput("exitCode", error.exitCode === void 0 ? -1 : error.exitCode);
-			setOutput("stdout", error.stdout ?? "");
-			setOutput("stderr", error.stderr ?? "");
-			setOutput("duration", error.durationMs ?? 0);
+			const err = error;
+			setOutput("exitCode", err.exitCode === void 0 ? -1 : err.exitCode);
+			setOutput("stdout", err.stdout ?? "");
+			setOutput("stderr", err.stderr ?? "");
+			setOutput("duration", err.durationMs ?? 0);
 		}
 	}
 });
@@ -152410,7 +152462,7 @@ const openInExplorer = createAction({
 	icon: "",
 	meta: {}
 });
-const openInExplorerRunner = createActionRunner(async ({ log, inputs, setOutput }) => {
+const openInExplorerRunner = createActionRunner(async ({ log, inputs, setOutput, abortSignal }) => {
 	log(`Opening ${inputs.path}`);
 	return new Promise((resolve, reject) => {
 		let command = "";
@@ -152418,8 +152470,14 @@ const openInExplorerRunner = createActionRunner(async ({ log, inputs, setOutput
 		if (p === "win32") command = `start "" "${inputs.path}"`;
 		else if (p === "darwin") command = `open "${inputs.path}"`;
 		else command = `xdg-open "${inputs.path}"`;
-		exec(command, (error) => {
+		exec(command, { signal: abortSignal }, (error) => {
 			if (error) {
+				if (abortSignal.aborted) {
+					const abortError = /* @__PURE__ */ new Error("Aborted");
+					abortError.name = "AbortError";
+					reject(abortError);
+					return;
+				}
 				log(`Error opening path: ${error.message}`);
 				setOutput("message", error.message);
 				resolve();