@axiom-lattice/gateway 2.1.53 → 2.1.55

package/src/controllers/sandbox.ts

@@ -1,4 +1,3 @@
-import { Readable } from "stream";
 import { FastifyInstance } from "fastify";
 import { sandboxService } from "../services/sandbox_service";
 import { getSandBoxManager } from "@axiom-lattice/core";
@@ -55,15 +54,15 @@ export function registerSandboxProxyRoutes(app: FastifyInstance): void {
       const { assistantId, threadId } = request.params;
       const tenantId = (request.headers["x-tenant-id"] as string) || "default";
 
-      const isolatedLevel = sandboxService.getFilesystemIsolatedLevel(tenantId, assistantId);
-      if (!isolatedLevel) {
+      const vmIsolation = sandboxService.getFilesystemVmIsolation(tenantId, assistantId);
+      if (!vmIsolation) {
         return reply.status(500).send({ error: "Assistant sandbox config not found" });
       }
 
       const sandboxName = sandboxService.computeSandboxName(
         assistantId,
         threadId,
-        isolatedLevel
+        vmIsolation
       );
 
       const sandboxManager = getSandBoxManager()
@@ -84,20 +83,15 @@ export function registerSandboxProxyRoutes(app: FastifyInstance): void {
               ? pathEntry
               : undefined;
 
-        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: path,
-        })
-
-        if (!uploadResult.ok) {
-          return reply.status(502).send({ error: `Upload error: ${uploadResult.error}` });
+        const filePath = `~/uploads/${pathValue ? pathValue : ""}${data.filename}`;
+        try {
+          await sandbox.file.uploadFile({ file: filePath, data: buffer });
+        } catch (err) {
+          reply.status(500).send({ error: String(err) });
+          return;
         }
 
-        const relativePath = uploadResult.body?.data?.file_path.replace(`/home/gem`, "");
+        const relativePath = filePath.replace(`~/`, "");
         const result = { id: relativePath, name: data.filename, size: buffer.length };
 
         return reply.status(200).send({ message: "File uploaded successfully", ...result });
@@ -123,79 +117,35 @@ export function registerSandboxProxyRoutes(app: FastifyInstance): void {
         return reply.status(400).send({ error: "Query parameter 'path' is required" });
       }
 
-      const isolatedLevel = sandboxService.getFilesystemIsolatedLevel(tenantId, assistantId);
-      if (!isolatedLevel) {
-        return reply.status(500).send({ error: "Assistant filesystem isolated level not found" });
+      const vmIsolation = sandboxService.getFilesystemVmIsolation(tenantId, assistantId);
+      if (!vmIsolation) {
+        return reply.status(500).send({ error: "Assistant filesystem vmIsolation not found" });
       }
 
       const sandboxName = sandboxService.computeSandboxName(
         assistantId,
         threadId,
-        isolatedLevel
+        vmIsolation
       );
 
       const sandboxManager = getSandBoxManager();
       const sandbox = await sandboxManager.createSandbox(sandboxName);
 
       try {
-        // Resolve path: if relative (no leading /), prefix with /home/gem
-        const resolvedPath = filePath.startsWith("/home/gem") ? filePath : `/home/gem/${filePath.replace(/^\//, "")}`;
+        // Resolve path: convert ~/ prefix or relative path to sandbox path
+        const resolvedPath = filePath.startsWith("~/") ? filePath : `~/${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)}`,
-          });
-        }
-
-        // Use body.stream() to get ReadableStream and pipe directly (no buffering)
-        const body = downloadResult.body as unknown as {
-          stream?: () => ReadableStream<Uint8Array>;
-          contentType?: string;
-          contentDisposition?: string;
-        };
-        if (typeof body?.stream === "function") {
-          const webStream = body.stream();
-          const nodeStream = Readable.fromWeb(webStream);
-          const contentType = body.contentType ?? inferredContentType;
-          const contentDisposition =
-            body.contentDisposition ?? `inline; filename="${filename.replace(/"/g, '\\"')}"; filename*=UTF-8''${encodeURIComponent(filename)}`;
-          reply = reply.status(200).type(contentType).header("Content-Disposition", contentDisposition).send(nodeStream);
+        try {
+          const buf = await sandbox.file.downloadFile({ file: resolvedPath });
+          const contentDisposition = `inline; filename="${filename.replace(/"/g, '\\"')}"; filename*=UTF-8''${encodeURIComponent(filename)}`;
+          reply = reply.status(200).type(inferredContentType).header("Content-Disposition", contentDisposition).send(buf);
           return reply;
+        } catch (err) {
+          reply.status(500).send({ error: String(err) });
+          return;
         }
-
-        // Fallback: buffer body when stream is not available
-        const bodyUnknown = downloadResult.body as unknown;
-        let buf: Buffer;
-        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 as { arrayBuffer?: () => Promise<ArrayBuffer> }).arrayBuffer === "function"
-        ) {
-          const res = bodyUnknown as { arrayBuffer: () => Promise<ArrayBuffer>; headers?: Headers };
-          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 as { blob?: () => Promise<Blob> }).blob === "function") {
-          const blob = await (bodyUnknown as { blob: () => Promise<Blob> }).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: unknown) {
         const message = error instanceof Error ? error.message : String(error);
         return reply.status(502).send({ error: `Download proxy error: ${message}` });
@@ -219,11 +169,11 @@ export function registerSandboxProxyRoutes(app: FastifyInstance): void {
   //       return reply.status(404).type("text/html").send(errorHtml);
   //     }
 
-  //     const { isolatedLevel } = sandboxConfig;
+  //     const { vmIsolation } = sandboxConfig;
   //     const sandboxName = sandboxService.computeSandboxName(
   //       assistantId,
   //       threadId,
-  //       isolatedLevel
+  //       vmIsolation
   //     );
 
   //     try {
@@ -234,7 +184,7 @@ export function registerSandboxProxyRoutes(app: FastifyInstance): void {
   //       const errorHtml = sandboxService.generateErrorHtml(
   //         assistantId,
   //         threadId,
-  //         isolatedLevel,
+  //         vmIsolation,
   //         error.message || "Failed to connect to sandbox"
   //       );
   //       return reply.status(502).type("text/html").send(errorHtml);
@@ -270,11 +220,11 @@ export function registerSandboxProxyRoutes(app: FastifyInstance): void {
   //       return;
   //     }
 
-  //     const { isolatedLevel } = sandboxConfig;
+  //     const { vmIsolation } = sandboxConfig;
   //     const sandboxName = sandboxService.computeSandboxName(
   //       assistantId,
   //       threadId,
-  //       isolatedLevel
+  //       vmIsolation
   //     );
 
   //     const targetUrl = sandboxService.getTargetUrl(sandboxName);
@@ -308,11 +258,11 @@ export function registerSandboxProxyRoutes(app: FastifyInstance): void {
   //       return reply.status(404).send("Assistant not found");
   //     }
 
-  //     const { isolatedLevel } = sandboxConfig;
+  //     const { vmIsolation } = sandboxConfig;
   //     const sandboxName = sandboxService.computeSandboxName(
   //       assistantId,
   //       threadId,
-  //       isolatedLevel
+  //       vmIsolation
   //     );
 
   //     const targetPath = restPath ? `/vnc/${restPath}` : "/vnc/";