@mastra/docker 0.9.2 → 0.9.3

package/dist/index.js

@@ -3,6 +3,7 @@ import { isDeepStrictEqual, promisify } from "util";
 import { MastraSandbox, ProcessHandle, SandboxAbortError, SandboxError, SandboxNotReadyError, SandboxProcessManager, validateSandboxFileMode } from "@mastra/core/workspace";
 import Docker from "dockerode";
 import { pack } from "tar-stream";
+import { StringDecoder } from "string_decoder";
 import posixPath from "path/posix";
 import { Server, ServerCredentials } from "@grpc/grpc-js";
 import { createHash } from "crypto";
@@ -89,6 +90,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
@@ -104,11 +107,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
@@ -285,7 +289,13 @@ var DockerProcessHandle = class extends 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;
@@ -374,6 +384,8 @@ var DockerProcessManager = class extends SandboxProcessManager {
 		handle._setExecStream(stream);
 		const waitPromise = new Promise((resolve) => {
 			const buffer = [];
+			const stdoutDecoder = new StringDecoder("utf8");
+			const stderrDecoder = new StringDecoder("utf8");
 			stream.on("data", (chunk) => {
 				buffer.push(chunk);
 				let combined = Buffer.concat(buffer);
@@ -385,17 +397,32 @@ var DockerProcessManager = class extends SandboxProcessManager {
 						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,
@@ -453,6 +480,7 @@ var DockerProcessManager = class extends SandboxProcessManager {
 					settleTerminated();
 					return;
 				}
+				flushDecoders();
 				settle(1, { stderr: handle.stderr || "Stream error" });
 			});
 		});