npm - @axiom-lattice/gateway - Versions diffs - 2.1.22 → 2.1.23 - Mend

@axiom-lattice/gateway 2.1.22 → 2.1.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/.turbo/turbo-build.log +8 -8
package/CHANGELOG.md +8 -0
package/dist/index.js +134 -48
package/dist/index.js.map +1 -1
package/dist/index.mjs +124 -38
package/dist/index.mjs.map +1 -1
package/package.json +3 -2
package/src/controllers/sandbox.ts +235 -51
package/src/index.ts +8 -0
package/src/services/agent_service.ts +2 -0
package/src/services/sandbox_service.ts +3 -8

package/.turbo/turbo-build.log CHANGED Viewed

@@ -1,5 +1,5 @@
-> @axiom-lattice/gateway@2.1.22 build /home/runner/work/agentic/agentic/packages/gateway
+> @axiom-lattice/gateway@2.1.23 build /home/runner/work/agentic/agentic/packages/gateway
 > tsup src/index.ts --format cjs,esm --dts --clean --sourcemap
 [34mCLI[39m Building entry: src/index.ts
@@ -9,13 +9,13 @@
 [34mCLI[39m Cleaning output folder
 [34mCJS[39m Build start
 [34mESM[39m Build start
-[32mESM[39m [1mdist/index.mjs     [22m[32m79.68 KB[39m
-[32mESM[39m [1mdist/index.mjs.map [22m[32m189.84 KB[39m
-[32mESM[39m ⚡️ Build success in 174ms
-[32mCJS[39m [1mdist/index.js     [22m[32m82.25 KB[39m
-[32mCJS[39m [1mdist/index.js.map [22m[32m189.88 KB[39m
-[32mCJS[39m ⚡️ Build success in 174ms
+[32mESM[39m [1mdist/index.mjs     [22m[32m83.88 KB[39m
+[32mESM[39m [1mdist/index.mjs.map [22m[32m200.51 KB[39m
+[32mESM[39m ⚡️ Build success in 221ms
+[32mCJS[39m [1mdist/index.js     [22m[32m86.51 KB[39m
+[32mCJS[39m [1mdist/index.js.map [22m[32m200.54 KB[39m
+[32mCJS[39m ⚡️ Build success in 223ms
 [34mDTS[39m Build start
-[32mDTS[39m ⚡️ Build success in 8703ms
+[32mDTS[39m ⚡️ Build success in 9197ms
 [32mDTS[39m [1mdist/index.d.ts  [22m[32m3.72 KB[39m
 [32mDTS[39m [1mdist/index.d.mts [22m[32m3.72 KB[39m

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,13 @@
 # @axiom-lattice/gateway
+## 2.1.23
+### Patch Changes
+- e0a5f54: enhance file
+- Updated dependencies [e0a5f54]
+  - @axiom-lattice/core@2.1.18
 ## 2.1.22
 ### Patch Changes

package/dist/index.js CHANGED Viewed

@@ -35,6 +35,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 var import_fastify = __toESM(require("fastify"));
 var import_cors = __toESM(require("@fastify/cors"));
+var import_multipart = __toESM(require("@fastify/multipart"));
 var import_sensible = __toESM(require("@fastify/sensible"));
 var import_websocket = __toESM(require("@fastify/websocket"));
@@ -85,6 +86,7 @@ async function agent_invoke({
         "x-tenant-id": tenant_id,
         "x-request-id": run_id,
         "x-thread-id": thread_id,
+        "x-assistant-id": assistant_id,
         runConfig
         // Inject runConfig for tools to access
       },
@@ -139,6 +141,7 @@ async function agent_stream({
           "x-tenant-id": tenant_id,
           "x-request-id": run_id,
           "x-thread-id": thread_id,
+          "x-assistant-id": assistant_id,
           runConfig
           // Inject runConfig for tools to access
         },
@@ -2006,9 +2009,11 @@ var getHealthSchema = {
   }
 };
+// src/controllers/sandbox.ts
+var import_stream = require("stream");
 // src/services/sandbox_service.ts
 var import_core12 = require("@axiom-lattice/core");
-var SANDBOX_BASE_URL = process.env.SANDBOX_BASE_URL || "http://localhost:8080";
 var ERROR_HTML = `<!DOCTYPE html>
 <html lang="zh-CN">
 <head>
@@ -2119,9 +2124,6 @@ var ERROR_HTML = `<!DOCTYPE html>
 </body>
 </html>`;
 var SandboxService = class {
-  constructor(baseUrl) {
-    this.baseUrl = baseUrl || SANDBOX_BASE_URL;
-  }
   getSandboxConfig(assistantId) {
     const agentConfig = (0, import_core12.getAgentConfig)(assistantId);
     if (!agentConfig) {
@@ -2147,7 +2149,8 @@ var SandboxService = class {
     return (0, import_core12.normalizeSandboxName)(sandboxName);
   }
   getTargetUrl(sandboxName) {
-    return `${this.baseUrl}/sandbox/${sandboxName}`;
+    const sandboxManager = (0, import_core12.getSandBoxManager)("default");
+    return `${sandboxManager.getBaseURL()}/sandbox/${sandboxName}`;
   }
   async getVncHtml(sandboxName) {
     const response = await fetch(`${this.getTargetUrl(sandboxName)}/vnc/index.html`);
@@ -2191,21 +2194,41 @@ var SandboxService = class {
 var sandboxService = new SandboxService();
 // src/controllers/sandbox.ts
-var SANDBOX_BASE_URL2 = process.env.SANDBOX_BASE_URL || "http://localhost:8080";
-async function registerSandboxProxyRoutes(app2) {
-  app2.get(
-    "/api/assistants/:assistantId/threads/:threadId/sandbox",
+var import_core13 = require("@axiom-lattice/core");
+function getFilenameFromPath(path) {
+  const segments = path.replace(/\/+$/, "").split("/");
+  return segments[segments.length - 1] || "download";
+}
+var EXT_TO_MIME = {
+  ".txt": "text/plain",
+  ".html": "text/html",
+  ".css": "text/css",
+  ".js": "application/javascript",
+  ".json": "application/json",
+  ".pdf": "application/pdf",
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".svg": "image/svg+xml",
+  ".zip": "application/zip",
+  ".csv": "text/csv",
+  ".xml": "application/xml"
+};
+function getContentTypeFromFilename(filename) {
+  const ext = filename.includes(".") ? filename.slice(filename.lastIndexOf(".")).toLowerCase() : "";
+  return EXT_TO_MIME[ext] ?? "application/octet-stream";
+}
+function registerSandboxProxyRoutes(app2) {
+  app2.post(
+    "/api/assistants/:assistantId/threads/:threadId/sandbox/uploadfile",
     async (request, reply) => {
+      console.log("[Sandbox Upload] Route matched:", request.url);
       const { assistantId, threadId } = request.params;
       const sandboxConfig = sandboxService.getSandboxConfig(assistantId);
       if (!sandboxConfig) {
-        const errorHtml = sandboxService.generateErrorHtml(
-          assistantId,
-          threadId,
-          "unknown",
-          `Assistant ${assistantId} not found`
-        );
-        return reply.status(404).type("text/html").send(errorHtml);
+        return reply.status(500).send({ error: "Assistant sandbox config not found" });
       }
       const { isolatedLevel } = sandboxConfig;
       const sandboxName = sandboxService.computeSandboxName(
@@ -2213,28 +2236,46 @@ async function registerSandboxProxyRoutes(app2) {
         threadId,
         isolatedLevel
       );
+      const sandboxManager = (0, import_core13.getSandBoxManager)("default");
+      const sandbox = await sandboxManager.createSandbox(sandboxName);
       try {
-        const html = await sandboxService.getVncHtml(sandboxName);
-        const rewrittenHtml = sandboxService.rewriteHtml(html, assistantId, threadId);
-        return reply.type("text/html").send(rewrittenHtml);
+        const data = await request.file();
+        if (!data) {
+          return reply.status(400).send({ error: "No file in request" });
+        }
+        const buffer = await data.toBuffer();
+        const pathEntry = data.fields?.path;
+        const pathValue = pathEntry && typeof pathEntry === "object" && "value" in pathEntry ? String(pathEntry.value) : typeof pathEntry === "string" ? pathEntry : void 0;
+        const formData = new FormData();
+        formData.append("file", new Blob([buffer]), data.filename ?? "file");
+        const path = `/home/gem/uploads/${pathValue ? pathValue : ""}${data.filename}`;
+        const uploadResult = await sandbox.file.uploadFile({
+          file: buffer,
+          path
+        });
+        if (!uploadResult.ok) {
+          return reply.status(502).send({ error: `Upload error: ${uploadResult.error}` });
+        }
+        const relativePath = uploadResult.body?.data?.file_path.replace(`/home/gem`, "");
+        const result = { id: relativePath, name: data.filename, size: buffer.length };
+        return reply.status(200).send({ message: "File uploaded successfully", ...result });
       } catch (error) {
-        const errorHtml = sandboxService.generateErrorHtml(
-          assistantId,
-          threadId,
-          isolatedLevel,
-          error.message || "Failed to connect to sandbox"
-        );
-        return reply.status(502).type("text/html").send(errorHtml);
+        const message = error instanceof Error ? error.message : String(error);
+        return reply.status(502).send({ error: `Upload proxy error: ${message}` });
       }
     }
   );
   app2.get(
-    "/api/assistants/:assistantId/threads/:threadId/sandbox/vnc/*",
+    "/api/assistants/:assistantId/threads/:threadId/sandbox/downloadfile",
     async (request, reply) => {
-      const { assistantId, threadId, "*": restPath } = request.params;
+      const { assistantId, threadId } = request.params;
+      const { path: filePath } = request.query;
+      if (!filePath || typeof filePath !== "string") {
+        return reply.status(400).send({ error: "Query parameter 'path' is required" });
+      }
       const sandboxConfig = sandboxService.getSandboxConfig(assistantId);
       if (!sandboxConfig) {
-        return reply.status(404).send("Assistant not found");
+        return reply.status(404).send({ error: "Assistant sandbox config not found" });
       }
       const { isolatedLevel } = sandboxConfig;
       const sandboxName = sandboxService.computeSandboxName(
@@ -2242,15 +2283,53 @@ async function registerSandboxProxyRoutes(app2) {
         threadId,
         isolatedLevel
       );
-      const targetPath = restPath ? `/vnc/${restPath}` : "/vnc/";
-      const targetUrl = `${sandboxService.getTargetUrl(sandboxName)}${targetPath}`;
+      const sandboxManager = (0, import_core13.getSandBoxManager)("default");
+      const sandbox = await sandboxManager.createSandbox(sandboxName);
       try {
-        const response = await fetch(targetUrl);
-        const contentType = response.headers.get("content-type") || "application/octet-stream";
-        const body = await response.arrayBuffer();
-        reply.status(response.status).type(contentType).send(Buffer.from(body));
+        const resolvedPath = filePath.startsWith("/home/gem") ? filePath : `/home/gem/${filePath.replace(/^\//, "")}`;
+        const filename = getFilenameFromPath(resolvedPath);
+        const inferredContentType = getContentTypeFromFilename(filename);
+        const downloadResult = await sandbox.file.downloadFile({
+          path: resolvedPath
+        });
+        if (!downloadResult.ok) {
+          return reply.status(502).send({
+            error: `Download error: ${JSON.stringify(downloadResult.error)}`
+          });
+        }
+        const body = downloadResult.body;
+        if (typeof body?.stream === "function") {
+          const webStream = body.stream();
+          const nodeStream = import_stream.Readable.fromWeb(webStream);
+          const contentType2 = body.contentType ?? inferredContentType;
+          const contentDisposition2 = body.contentDisposition ?? `inline; filename="${filename.replace(/"/g, '\\"')}"; filename*=UTF-8''${encodeURIComponent(filename)}`;
+          reply = reply.status(200).type(contentType2).header("Content-Disposition", contentDisposition2).send(nodeStream);
+          return reply;
+        }
+        const bodyUnknown = downloadResult.body;
+        let buf;
+        let contentType = inferredContentType;
+        let contentDisposition = `inline; filename="${filename.replace(/"/g, '\\"')}"; filename*=UTF-8''${encodeURIComponent(filename)}`;
+        if (bodyUnknown instanceof ArrayBuffer) {
+          buf = Buffer.from(bodyUnknown);
+        } else if (bodyUnknown instanceof Buffer) {
+          buf = bodyUnknown;
+        } else if (bodyUnknown && typeof bodyUnknown.arrayBuffer === "function") {
+          const res = bodyUnknown;
+          buf = Buffer.from(await res.arrayBuffer());
+          if (res.headers?.get("content-type")) contentType = res.headers.get("content-type");
+          if (res.headers?.get("content-disposition")) contentDisposition = res.headers.get("content-disposition");
+        } else if (bodyUnknown && typeof bodyUnknown.blob === "function") {
+          const blob = await bodyUnknown.blob();
+          buf = Buffer.from(await blob.arrayBuffer());
+        } else {
+          return reply.status(502).send({ error: "Unexpected download response format" });
+        }
+        reply = reply.status(200).type(contentType).header("Content-Disposition", contentDisposition).send(buf);
+        return reply;
       } catch (error) {
-        reply.status(502).send(`Proxy error: ${error.message}`);
+        const message = error instanceof Error ? error.message : String(error);
+        return reply.status(502).send({ error: `Download proxy error: ${message}` });
       }
     }
   );
@@ -2440,7 +2519,7 @@ var configureSwagger = async (app2, customSwaggerConfig, customSwaggerUiConfig)
 };
 // src/services/agent_task_consumer.ts
-var import_core13 = require("@axiom-lattice/core");
+var import_core14 = require("@axiom-lattice/core");
 var handleAgentTask = async (taskRequest, retryCount = 0) => {
   const {
     assistant_id,
@@ -2504,7 +2583,7 @@ var handleAgentTask = async (taskRequest, retryCount = 0) => {
       }
       if (callback_event) {
         const state = await agent_state({ assistant_id, thread_id });
-        import_core13.eventBus.publish(callback_event, {
+        import_core14.eventBus.publish(callback_event, {
           success: true,
           state,
           config: { assistant_id, thread_id, tenant_id }
@@ -2518,7 +2597,7 @@ var handleAgentTask = async (taskRequest, retryCount = 0) => {
       await response.text();
       if (callback_event) {
         const state = await agent_state({ assistant_id, thread_id });
-        import_core13.eventBus.publish(callback_event, {
+        import_core14.eventBus.publish(callback_event, {
           success: true,
           state,
           config: { assistant_id, thread_id, tenant_id }
@@ -2545,7 +2624,7 @@ var handleAgentTask = async (taskRequest, retryCount = 0) => {
       return handleAgentTask(taskRequest, nextRetryCount);
     }
     if (callback_event) {
-      import_core13.eventBus.publish(callback_event, {
+      import_core14.eventBus.publish(callback_event, {
         success: false,
         error: error instanceof Error ? error.message : String(error),
         config: { assistant_id, thread_id, tenant_id }
@@ -2583,7 +2662,7 @@ var _AgentTaskConsumer = class _AgentTaskConsumer {
    * 初始化事件监听和队列轮询
    */
   initialize() {
-    import_core13.eventBus.subscribe(import_core13.AGENT_TASK_EVENT, this.trigger_agent_task.bind(this));
+    import_core14.eventBus.subscribe(import_core14.AGENT_TASK_EVENT, this.trigger_agent_task.bind(this));
     this.startPollingQueue();
     console.log("Agent\u4EFB\u52A1\u6D88\u8D39\u8005\u5DF2\u542F\u52A8\u5E76\u76D1\u542C\u4EFB\u52A1\u4E8B\u4EF6\u548C\u961F\u5217");
   }
@@ -2702,7 +2781,7 @@ var _AgentTaskConsumer = class _AgentTaskConsumer {
     handleAgentTask(taskRequest).catch((error) => {
       console.error("\u5904\u7406Agent\u4EFB\u52A1\u65F6\u53D1\u751F\u672A\u6355\u83B7\u7684\u9519\u8BEF:", error);
       if (taskRequest.callback_event) {
-        import_core13.eventBus.publish(taskRequest.callback_event, {
+        import_core14.eventBus.publish(taskRequest.callback_event, {
           success: false,
           error: error instanceof Error ? error.message : String(error),
           config: {
@@ -2722,7 +2801,7 @@ _AgentTaskConsumer.agent_run_endpoint = "http://localhost:4001/api/runs";
 var AgentTaskConsumer = _AgentTaskConsumer;
 // src/index.ts
-var import_core14 = require("@axiom-lattice/core");
+var import_core15 = require("@axiom-lattice/core");
 var import_protocols2 = require("@axiom-lattice/protocols");
 process.on("unhandledRejection", (reason, promise) => {
   console.error("\u672A\u5904\u7406\u7684Promise\u62D2\u7EDD:", reason);
@@ -2737,11 +2816,11 @@ var DEFAULT_LOGGER_CONFIG = {
 var loggerLattice = initializeLogger(DEFAULT_LOGGER_CONFIG);
 var logger = loggerLattice.client;
 function initializeLogger(config) {
-  if (import_core14.loggerLatticeManager.hasLattice("default")) {
-    import_core14.loggerLatticeManager.removeLattice("default");
+  if (import_core15.loggerLatticeManager.hasLattice("default")) {
+    import_core15.loggerLatticeManager.removeLattice("default");
   }
-  (0, import_core14.registerLoggerLattice)("default", config);
-  return (0, import_core14.getLoggerLattice)("default");
+  (0, import_core15.registerLoggerLattice)("default", config);
+  return (0, import_core15.getLoggerLattice)("default");
 }
 var app = (0, import_fastify.default)({
   logger: false,
@@ -2787,12 +2866,19 @@ app.register(import_cors.default, {
     "Authorization",
     "X-Requested-With",
     "x-tenant-id",
-    "x-request-id"
+    "x-request-id",
+    "x-assistant-id",
+    "x-thread-id"
   ],
   exposedHeaders: ["Content-Type"],
   credentials: true
 });
 app.register(import_sensible.default);
+app.register(import_multipart.default, {
+  limits: {
+    fileSize: Number(process.env.BODY_LIMIT) || 50 * 1024 * 1024
+  }
+});
 app.register(import_websocket.default);
 app.setErrorHandler((error, request, reply) => {
   const getHeaderValue = (header) => {