@mastra/docker 0.9.2 → 0.9.3-alpha.1

package/dist/index.cjs

@@ -27,6 +27,7 @@ let _mastra_core_workspace = require("@mastra/core/workspace");
 let dockerode = require("dockerode");
 dockerode = __toESM(dockerode, 1);
 let tar_stream = require("tar-stream");
+let string_decoder = require("string_decoder");
 let path_posix = require("path/posix");
 path_posix = __toESM(path_posix, 1);
 let _grpc_grpc_js = require("@grpc/grpc-js");
@@ -114,6 +115,8 @@ ret=$?
 rm -f "$1" 2>/dev/null
 exit $ret
 `;
+/** KILL_SCRIPT exit code when no PGID file was readable or it was empty. */
+const NO_PGID_EXIT_CODE = 3;
 /**
 * Kill script: read the recorded PGID and SIGKILL the whole process group.
 * A negative PID targets the kernel-owned process group, so descendants that
@@ -129,11 +132,12 @@ i=0
 while [ ! -r "$f" ] && [ "$i" -lt 40 ]; do sleep 0.05; i=$((i + 1)); done
 # If the PGID was never recorded (file absent/unreadable after the wait, or
 # empty), we have no group to signal or verify — report failure rather than
-# falsely claiming the tree was terminated.
-[ -r "$f" ] || exit 1
+# falsely claiming the tree was terminated. Exit code 3 marks this case so
+# kill() can tell it apart from a failed termination (exit 1).
+[ -r "$f" ] || exit 3
 pgid=$(cat "$f" 2>/dev/null)
 rm -f "$f" 2>/dev/null
-[ -n "$pgid" ] || exit 1
+[ -n "$pgid" ] || exit 3
 kill -STOP -"$pgid" 2>/dev/null
 kill -KILL -"$pgid" 2>/dev/null
 # Fallback for images without setsid: the leader is not a group leader, so also
@@ -310,7 +314,13 @@ var DockerProcessHandle = class extends _mastra_core_workspace.ProcessHandle {
 					await new Promise((resolve) => setTimeout(resolve, 10));
 					killInfo = await killExec.inspect();
 				}
-				if (killInfo.ExitCode !== 0) throw new Error(`kill helper exited with code ${killInfo.ExitCode}`);
+				if (killInfo.ExitCode !== 0) {
+					if (killInfo.ExitCode === NO_PGID_EXIT_CODE) {
+						const selfInfo = await this._exec.inspect().catch(() => void 0);
+						if (selfInfo && !selfInfo.Running) return false;
+					}
+					throw new Error(`kill helper exited with code ${killInfo.ExitCode}`);
+				}
 				this._killed = true;
 				this._destroyStream();
 				return true;
@@ -399,6 +409,8 @@ var DockerProcessManager = class extends _mastra_core_workspace.SandboxProcessMa
 		handle._setExecStream(stream);
 		const waitPromise = new Promise((resolve) => {
 			const buffer = [];
+			const stdoutDecoder = new string_decoder.StringDecoder("utf8");
+			const stderrDecoder = new string_decoder.StringDecoder("utf8");
 			stream.on("data", (chunk) => {
 				buffer.push(chunk);
 				let combined = Buffer.concat(buffer);
@@ -410,17 +422,32 @@ var DockerProcessManager = class extends _mastra_core_workspace.SandboxProcessMa
 						buffer.push(combined);
 						break;
 					}
-					const payload = combined.subarray(8, 8 + size).toString("utf-8");
-					if (type === 1) handle.emitStdout(payload);
-					else if (type === 2) handle.emitStderr(payload);
+					const payload = combined.subarray(8, 8 + size);
+					if (type === 1) {
+						const text = stdoutDecoder.write(payload);
+						if (text) handle.emitStdout(text);
+					} else if (type === 2) {
+						const text = stderrDecoder.write(payload);
+						if (text) handle.emitStderr(text);
+					}
 					combined = combined.subarray(8 + size);
 				}
 				if (combined.length > 0 && buffer.length === 0) buffer.push(combined);
 			});
+			let decodersFlushed = false;
+			const flushDecoders = () => {
+				if (decodersFlushed) return;
+				decodersFlushed = true;
+				const stdoutRest = stdoutDecoder.end();
+				if (stdoutRest) handle.emitStdout(stdoutRest);
+				const stderrRest = stderrDecoder.end();
+				if (stderrRest) handle.emitStderr(stderrRest);
+			};
 			let settled = false;
 			const settle = (exitCode, metadata = {}) => {
 				if (settled) return;
 				settled = true;
+				flushDecoders();
 				handle._setExitCode(exitCode);
 				resolve({
 					success: exitCode === 0,
@@ -478,6 +505,7 @@ var DockerProcessManager = class extends _mastra_core_workspace.SandboxProcessMa
 					settleTerminated();
 					return;
 				}
+				flushDecoders();
 				settle(1, { stderr: handle.stderr || "Stream error" });
 			});
 		});