@google/adk 2.0.0 → 2.1.0

package/dist/cjs/code_executors/docker_container.js

@@ -0,0 +1,282 @@
+/**
+  * @license
+  * Copyright 2026 Google LLC
+  * SPDX-License-Identifier: Apache-2.0
+  */
+
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var docker_container_exports = {};
+__export(docker_container_exports, {
+  DockerContainer: () => DockerContainer,
+  TIMEOUT_EXIT_CODE: () => TIMEOUT_EXIT_CODE
+});
+module.exports = __toCommonJS(docker_container_exports);
+var fs = __toESM(require("node:fs/promises"), 1);
+var import_node_stream = require("node:stream");
+var import_consumers = require("node:stream/consumers");
+var import_promises = require("node:timers/promises");
+var import_logger = require("../utils/logger.js");
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+const TIMEOUT_EXIT_CODE = 124;
+const STREAM_WAIT_GRACE_SECONDS = 5;
+const MAX_INSPECT_ATTEMPTS = 50;
+const INSPECT_POLL_MS = 100;
+const KEEP_ALIVE_COMMAND = ["tail", "-f", "/dev/null"];
+let dockerodeCtor;
+function loadDockerodeCtor() {
+  dockerodeCtor != null ? dockerodeCtor : dockerodeCtor = Promise.resolve().then(() => __toESM(require("dockerode"), 1)).then(
+    (mod) => mod.default,
+    () => {
+      throw new Error(
+        "The `dockerode` package is required to use ContainerCodeExecutor. Install it with `npm install dockerode`."
+      );
+    }
+  );
+  return dockerodeCtor;
+}
+__name(loadDockerodeCtor, "loadDockerodeCtor");
+const activeContainers = /* @__PURE__ */ new Set();
+let exitHooksRegistered = false;
+async function stopAndRemove(container) {
+  if (!container) {
+    return true;
+  }
+  try {
+    await container.stop();
+  } catch (error) {
+    import_logger.logger.debug(`Container ${container.id} was not running: ${error}`);
+  }
+  try {
+    await container.remove({ force: true });
+    return true;
+  } catch (error) {
+    import_logger.logger.error(`Failed to remove container ${container.id}: ${error}`);
+    return false;
+  }
+}
+__name(stopAndRemove, "stopAndRemove");
+async function cleanupContainers() {
+  for (const container of activeContainers) {
+    if (await stopAndRemove(container)) {
+      activeContainers.delete(container);
+    }
+  }
+}
+__name(cleanupContainers, "cleanupContainers");
+async function handleTerminationSignal(signal) {
+  await cleanupContainers();
+  process.kill(process.pid, signal);
+}
+__name(handleTerminationSignal, "handleTerminationSignal");
+function registerExitHooks() {
+  if (exitHooksRegistered) {
+    return;
+  }
+  exitHooksRegistered = true;
+  process.once("beforeExit", cleanupContainers);
+  process.once("SIGINT", handleTerminationSignal);
+  process.once("SIGTERM", handleTerminationSignal);
+}
+__name(registerExitHooks, "registerExitHooks");
+const PROTOCOL_BY_SCHEME = {
+  "https:": "https",
+  "ssh:": "ssh"
+};
+async function inspectExitCode(exec) {
+  for (let attempt = 0; attempt < MAX_INSPECT_ATTEMPTS; attempt++) {
+    const info = await exec.inspect();
+    if (!info.Running) {
+      return info.ExitCode;
+    }
+    await (0, import_promises.setTimeout)(INSPECT_POLL_MS);
+  }
+  return (await exec.inspect()).ExitCode;
+}
+__name(inspectExitCode, "inspectExitCode");
+function parseBaseUrl(baseUrl) {
+  var _a;
+  const url = new URL(baseUrl);
+  if (url.protocol === "unix:") {
+    return { socketPath: url.pathname };
+  }
+  return {
+    host: url.hostname,
+    port: url.port || void 0,
+    protocol: (_a = PROTOCOL_BY_SCHEME[url.protocol]) != null ? _a : "http"
+  };
+}
+__name(parseBaseUrl, "parseBaseUrl");
+const _DockerContainer = class _DockerContainer {
+  constructor(options) {
+    this.options = options;
+  }
+  /**
+   * Builds the image from a directory containing a Dockerfile. `src` is the raw
+   * directory listing; unlike the Docker CLI this does not honor
+   * `.dockerignore`.
+   */
+  async build(dockerPath) {
+    try {
+      await fs.access(dockerPath);
+    } catch {
+      throw new Error(`Invalid Docker path: ${dockerPath}`);
+    }
+    const client = await this.getClient();
+    import_logger.logger.debug("Building Docker image...");
+    const stream = await client.buildImage(
+      { context: dockerPath, src: await fs.readdir(dockerPath) },
+      { t: this.options.image }
+    );
+    await new Promise((resolve, reject) => {
+      client.modem.followProgress(
+        stream,
+        (error) => error ? reject(error) : resolve()
+      );
+    });
+    import_logger.logger.debug(`Docker image ${this.options.image} built.`);
+  }
+  /**
+   * Creates and starts the container, registering it for cleanup on process
+   * exit. Throws if already started: overwriting the handle would orphan the
+   * running container. Call {@link stop} first.
+   */
+  async start() {
+    if (this.container) {
+      throw new Error("Container is already started.");
+    }
+    const client = await this.getClient();
+    import_logger.logger.debug("Starting container...");
+    this.container = await client.createContainer({
+      Image: this.options.image,
+      Tty: true,
+      Cmd: KEEP_ALIVE_COMMAND,
+      NetworkDisabled: !this.options.networkEnabled,
+      HostConfig: { CapDrop: ["ALL"], SecurityOpt: ["no-new-privileges"] }
+    });
+    await this.container.start();
+    activeContainers.add(this.container);
+    registerExitHooks();
+    import_logger.logger.debug(`Container ${this.container.id} started.`);
+  }
+  /**
+   * Runs a command inside the container and returns its decoded output. The
+   * exec is created without a TTY so the stream stays multiplexed and can be
+   * split into stdout and stderr via `modem.demuxStream`.
+   *
+   * `timeoutSeconds` bounds the wait, not the in-container run: a process that
+   * keeps the exec's stdio open (e.g. a surviving background child) means
+   * `'end'` never fires, so without this cap the promise never settles (the
+   * same hang #793 fixed in the local executor). Callers that need to bound the
+   * run itself must wrap the command (see {@link ContainerCodeExecutor}). On a
+   * cap breach the result carries {@link TIMEOUT_EXIT_CODE}.
+   */
+  async execute(cmd, timeoutSeconds) {
+    if (!this.container) {
+      throw new Error("Container is not started.");
+    }
+    const client = await this.getClient();
+    const exec = await this.container.exec({
+      Cmd: cmd,
+      AttachStdout: true,
+      AttachStderr: true
+    });
+    const stream = await exec.start({ hijack: true, stdin: false });
+    const stdout = new import_node_stream.PassThrough();
+    const stderr = new import_node_stream.PassThrough();
+    client.modem.demuxStream(stream, stdout, stderr);
+    const collected = Promise.all([(0, import_consumers.text)(stdout), (0, import_consumers.text)(stderr)]);
+    let timedOut = false;
+    await new Promise((resolve, reject) => {
+      const timer = setTimeout(
+        () => {
+          timedOut = true;
+          stream.destroy();
+          resolve();
+        },
+        (timeoutSeconds + STREAM_WAIT_GRACE_SECONDS) * 1e3
+      );
+      timer.unref();
+      stream.on("end", () => {
+        clearTimeout(timer);
+        resolve();
+      });
+      stream.on("error", (error) => {
+        clearTimeout(timer);
+        reject(error);
+      });
+    });
+    stdout.end();
+    stderr.end();
+    const [stdoutText, stderrText] = await collected;
+    if (timedOut) {
+      return {
+        stdout: stdoutText,
+        stderr: stderrText,
+        exitCode: TIMEOUT_EXIT_CODE
+      };
+    }
+    const exitCode = await inspectExitCode(exec);
+    return { stdout: stdoutText, stderr: stderrText, exitCode };
+  }
+  /** Stops and removes the container. Safe to call when never started. */
+  async stop() {
+    const container = this.container;
+    if (!container) {
+      return;
+    }
+    if (await stopAndRemove(container)) {
+      this.container = void 0;
+      activeContainers.delete(container);
+    }
+  }
+  /**
+   * Resolves the Docker client once, lazily loading dockerode when no client
+   * was injected.
+   */
+  async getClient() {
+    var _a, _b;
+    (_b = this.client) != null ? _b : this.client = (_a = this.options.docker) != null ? _a : new (await loadDockerodeCtor())(
+      this.options.baseUrl ? parseBaseUrl(this.options.baseUrl) : void 0
+    );
+    return this.client;
+  }
+};
+__name(_DockerContainer, "DockerContainer");
+let DockerContainer = _DockerContainer;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DockerContainer,
+  TIMEOUT_EXIT_CODE
+});

package/dist/cjs/code_executors/unsafe_local_code_executor.js

@@ -173,13 +173,17 @@ const _UnsafeLocalCodeExecutor = class _UnsafeLocalCodeExecutor extends import_b
         }
       }
       const executionResult = await new Promise((resolve) => {
-        const child = (0, import_node_child_process.spawn)(command, args, {
-          timeout: this.timeoutSeconds * 1e3,
-          killSignal: "SIGKILL",
-          cwd: tempDir
-        });
+        const child = (0, import_node_child_process.spawn)(command, args, { cwd: tempDir });
         let stdout = "";
         let stderr = "";
+        let timedOut = false;
+        const timer = setTimeout(() => {
+          var _a2, _b;
+          timedOut = true;
+          child.kill("SIGKILL");
+          (_a2 = child.stdout) == null ? void 0 : _a2.destroy();
+          (_b = child.stderr) == null ? void 0 : _b.destroy();
+        }, this.timeoutSeconds * 1e3);
         if (child.stdout) {
           child.stdout.on("data", (data) => {
             stdout += data.toString();
@@ -195,7 +199,8 @@ const _UnsafeLocalCodeExecutor = class _UnsafeLocalCodeExecutor extends import_b
 `;
         });
         child.on("close", (exitCode, signal) => {
-          if (signal === "SIGKILL" || signal === "SIGTERM") {
+          clearTimeout(timer);
+          if (timedOut || signal === "SIGKILL" || signal === "SIGTERM") {
             stderr += `
 Code execution timed out after ${this.timeoutSeconds} seconds.`;
           } else if (exitCode !== 0 && exitCode !== null) {