@cloud-cli/on 1.2.8 → 1.2.10

package/dist/on.js

@@ -8699,10 +8699,9 @@ var Vo = class {
 		}
 	}
 	async execute(t) {
-		let n = Date.now(), r = null, i = "";
+		let n = Date.now(), r = null, i = "", o = a.join(t.workspacePath, ".logs"), s = a.join(t.workspacePath, "wd");
 		try {
-			let n = a.join(t.workspacePath, ".logs");
-			e.mkdirSync(n, { recursive: !0 }), i = a.join(n, `step-${t.stepId}.log`), r = e.openSync(i, "a");
+			e.mkdirSync(o, { recursive: !0 }), e.mkdirSync(s, { recursive: !0 }), e.chmodSync(s, 511), console.log(`📁 Created workspace at ${s}`), i = a.join(o, `step-${t.stepId}.log`), r = e.openSync(i, "a");
 		} catch (e) {
 			return {
 				done: Promise.resolve({
@@ -8714,26 +8713,27 @@ var Vo = class {
 				logFilePath: ""
 			};
 		}
-		let o = `workflow-${t.jobId}-${t.stepId}`.replace(/[^a-zA-Z0-9_-]/g, "_"), s = [
-			`--unit=${o}`,
+		let c = `workflow-${t.jobId}-${t.stepId}`.replace(/[^a-zA-Z0-9_-]/g, "_"), l = [
+			`--unit=${c}`,
 			"--wait",
 			"--pipe",
-			`--working-directory=${t.workspacePath}/wd`
+			"--collect",
+			`--working-directory=${s}`
 		];
-		if (t.env) for (let [e, n] of Object.entries(t.env)) s.push(`--setenv=${e}=${n}`);
+		if (t.env) for (let [e, n] of Object.entries(t.env)) l.push(`--setenv=${e}=${n}`);
 		if (t.timeoutMs) {
 			let e = Math.ceil(t.timeoutMs / 1e3);
-			s.push(`--property=RuntimeMaxSec=${e}`);
+			l.push(`--property=RuntimeMaxSec=${e}`);
 		}
-		let c;
-		c = t.image ? [
+		let u;
+		u = t.image ? [
 			"docker",
 			"run",
 			"--rm",
 			"--init",
-			`--name=${o}`,
+			`--name=${c}`,
 			"-v",
-			`${t.workspacePath}/wd:/workspace`,
+			`${s}:/workspace`,
 			"-w",
 			"/workspace",
 			t.image,
@@ -8744,13 +8744,17 @@ var Vo = class {
 			process.env.SHELL || "sh",
 			"-c",
 			t.command
-		], e.mkdirSync(`${t.workspacePath}/wd`, { recursive: !0 });
-		let l;
+		], process.env.DEBUG && console.log("$ systemd-run", [
+			...l,
+			"--",
+			...u
+		].join(" "));
+		let d;
 		try {
-			l = _("systemd-run", [
-				...s,
+			d = _("systemd-run", [
+				...l,
 				"--",
-				...c
+				...u
 			], { stdio: [
 				"ignore",
 				r,
@@ -8770,7 +8774,7 @@ var Vo = class {
 				logFilePath: i
 			};
 		}
-		let u = !1;
+		let f = !1;
 		return {
 			done: new Promise((t) => {
 				let i = !1, a = (n) => {
@@ -8782,13 +8786,13 @@ var Vo = class {
 						t(n);
 					}
 				};
-				l.on("close", (e) => {
+				d.on("close", (e) => {
 					a({
-						exitCode: e ?? (u ? 130 : 1),
+						exitCode: e ?? (f ? 130 : 1),
 						durationMs: Date.now() - n,
-						error: u ? /* @__PURE__ */ Error("Step cancelled by user or systemd timeout") : void 0
+						error: f ? /* @__PURE__ */ Error("Step cancelled by user or systemd timeout") : void 0
 					});
-				}), l.on("error", (e) => {
+				}), d.on("error", (e) => {
 					a({
 						exitCode: 1,
 						durationMs: Date.now() - n,
@@ -8797,9 +8801,9 @@ var Vo = class {
 				});
 			}),
 			cancel: async () => {
-				u = !0;
+				f = !0;
 				try {
-					t.image && await Go(`docker stop -t 2 ${o}`).catch(() => {}), await Go(`systemctl stop ${o}.service`).catch(() => {});
+					t.image && await Go(`docker stop -t 2 ${c}`).catch(() => {}), await Go(`systemctl stop ${c}.service`).catch(() => {});
 				} catch {}
 			},
 			logFilePath: i
@@ -8813,10 +8817,9 @@ var Vo = class {
 		return !0;
 	}
 	async execute(t) {
-		let n = Date.now(), r = null, i = "";
+		let n = Date.now(), r = null, i = "", o = a.join(t.workspacePath, ".logs"), s = a.join(t.workspacePath, "wd");
 		try {
-			let n = a.join(t.workspacePath, ".logs");
-			e.mkdirSync(n, { recursive: !0 }), i = a.join(n, `step-${t.stepId}.log`), r = e.openSync(i, "a");
+			e.mkdirSync(o, { recursive: !0 }), e.mkdirSync(s, { recursive: !0 }), e.chmodSync(s, 511), console.log(`📁 Created workspace at ${s}`), i = a.join(o, `step-${t.stepId}.log`), r = e.openSync(i, "a");
 		} catch (e) {
 			return {
 				done: Promise.resolve({
@@ -8828,13 +8831,13 @@ var Vo = class {
 				logFilePath: ""
 			};
 		}
-		let o, s;
-		t.image ? (o = "docker", s = [
+		let c, l;
+		t.image ? (c = "docker", l = [
 			"run",
 			"--rm",
 			"--init",
 			"-v",
-			`${t.workspacePath}/wd:/workspace`,
+			`${s}:/workspace`,
 			"-w",
 			"/workspace",
 			"--entrypoint",
@@ -8842,11 +8845,11 @@ var Vo = class {
 			t.image,
 			"-c",
 			t.command
-		]) : (o = process.env.SHELL || "sh", s = ["-c", t.command]), e.mkdirSync(`${t.workspacePath}/wd`, { recursive: !0 });
-		let c;
+		]) : (c = process.env.SHELL || "sh", l = ["-c", t.command]), process.env.DEBUG && console.log("$ " + c, l.join(" "));
+		let u;
 		try {
-			c = _(o, s, {
-				cwd: t.workspacePath + "/wd",
+			u = _(c, l, {
+				cwd: s,
 				env: {
 					...process.env,
 					...t.env
@@ -8872,27 +8875,27 @@ var Vo = class {
 				logFilePath: i
 			};
 		}
-		let l = !1, u = null;
+		let d = !1, f = null;
 		return {
 			done: new Promise((i) => {
 				let a = !1, o = (t) => {
 					if (!a) {
-						a = !0, u && clearTimeout(u);
+						a = !0, f && clearTimeout(f);
 						try {
 							r !== null && e.closeSync(r);
 						} catch {}
 						i(t);
 					}
 				};
-				t.timeoutMs && (u = setTimeout(() => {
-					l = !0, this.killProcessGroup(c);
-				}, t.timeoutMs), u.unref()), c.on("close", (e) => {
+				t.timeoutMs && (f = setTimeout(() => {
+					d = !0, this.killProcessGroup(u);
+				}, t.timeoutMs), f.unref()), u.on("close", (e) => {
 					o({
-						exitCode: e ?? (l ? 130 : 1),
+						exitCode: e ?? (d ? 130 : 1),
 						durationMs: Date.now() - n,
-						error: l ? /* @__PURE__ */ Error("Step timed out or was cancelled by user") : void 0
+						error: d ? /* @__PURE__ */ Error("Step timed out or was cancelled by user") : void 0
 					});
-				}), c.on("error", (e) => {
+				}), u.on("error", (e) => {
 					o({
 						exitCode: 1,
 						durationMs: Date.now() - n,
@@ -8901,7 +8904,7 @@ var Vo = class {
 				});
 			}),
 			cancel: async () => {
-				l = !0, this.killProcessGroup(c);
+				d = !0, this.killProcessGroup(u);
 			},
 			logFilePath: i
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-cli/on",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "description": "CLI entry point for the on plugin ecosystem.",
   "type": "module",
   "packageManager": "pnpm@10.30.3",