@opengeni/api-router 0.15.5 → 0.15.6

package/dist/app.js

@@ -22,7 +22,7 @@ import {
   validateToolRefs,
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession
-} from "./chunk-ICRZC3JH.js";
+} from "./chunk-MN7BW3UV.js";
 export {
   API_MAX_REQUEST_BODY_BYTES,
   allowedCorsOrigin,

package/dist/{chunk-ICRZC3JH.js → chunk-MN7BW3UV.js}

@@ -16092,6 +16092,7 @@ import {
   releaseLeaseHolder as releaseLeaseHolder2
 } from "@opengeni/db";
 import { appendAndPublishEvents as appendAndPublishEvents4 } from "@opengeni/events";
+import { sandboxOperationMetricObserver } from "@opengeni/observability";
 import { HTTPException as HTTPException22 } from "hono/http-exception";
 import {
   buildSelfhostedBackendSession,
@@ -16111,6 +16112,7 @@ import {
 import { relayConfigFromSettings as relayConfigFromSettings3, wrapChannelABoxWithRouting } from "@opengeni/core";
 async function withChannelA(services, ctx, fn) {
   const { db, settings, bus } = services;
+  const onSandboxOperation = services.observability ? sandboxOperationMetricObserver(services.observability) : void 0;
   const { accountId, workspaceId, session } = ctx;
   if (session.sandboxBackend === "none") {
     throw new HTTPException22(409, { message: "sandbox not available" });
@@ -16194,7 +16196,7 @@ async function withChannelA(services, ctx, fn) {
         backendId: "selfhosted"
       };
       const routed = wrapChannelABoxWithRouting(
-        { db, settings, bus },
+        { db, settings, bus, ...onSandboxOperation ? { onSandboxOperation } : {} },
         {
           accountId,
           workspaceId,
@@ -16317,7 +16319,7 @@ async function withChannelA(services, ctx, fn) {
       }
     }
     const routed = wrapChannelABoxWithRouting(
-      { db, settings, bus },
+      { db, settings, bus, ...onSandboxOperation ? { onSandboxOperation } : {} },
       {
         accountId,
         workspaceId,
@@ -17089,6 +17091,7 @@ async function serveWorkspaceCaptureFile(row, path, storage) {
 // src/routes/sessions.ts
 function registerSessionRoutes(app, deps) {
   const { settings, db, bus, workflowClient, objectStorage } = deps;
+  const channelAServices = { db, settings, bus, observability: deps.observability };
   const workspaceCaptureManifestCache = new WorkspaceCaptureManifestCache();
   const ptyIdentity = (pty) => ({
     leaseId: pty.leaseId,
@@ -18599,101 +18602,61 @@ function registerSessionRoutes(app, deps) {
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/list", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, FsListRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.fsList(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsList(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/read", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, FsReadRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.fsRead(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsRead(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/write", async (c) => {
     const ctx = await channelAPreamble(c, "files:write");
     const req = await parseChannelABody(c, FsWriteRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.fsWrite(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsWrite(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/delete", async (c) => {
     const ctx = await channelAPreamble(c, "files:write");
     const req = await parseChannelABody(c, FsDeleteRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.fsDelete(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsDelete(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/move", async (c) => {
     const ctx = await channelAPreamble(c, "files:write");
     const req = await parseChannelABody(c, FsMoveRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.fsMove(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsMove(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/fs/mkdir", async (c) => {
     const ctx = await channelAPreamble(c, "files:write");
     const req = await parseChannelABody(c, FsMkdirRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.fsMkdir(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.fsMkdir(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/git/status", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, GitStatusRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.gitStatus(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.gitStatus(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/git/diff", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, GitDiffRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.gitDiff(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.gitDiff(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/git/log", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, GitLogRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.gitLog(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.gitLog(req));
     return c.json(out);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/git/show", async (c) => {
     const ctx = await channelAPreamble(c, "files:read");
     const req = await parseChannelABody(c, GitShowRequest);
-    const out = await withChannelA(
-      { db, settings, bus },
-      ctx,
-      ({ service }) => service.gitShow(req)
-    );
+    const out = await withChannelA(channelAServices, ctx, ({ service }) => service.gitShow(req));
     return c.json(out);
   });
   app.get("/v1/workspaces/:workspaceId/sessions/:sessionId/workspace/capture", async (c) => {
@@ -18747,7 +18710,7 @@ function registerSessionRoutes(app, deps) {
     const ctx = await channelAPreamble(c, "terminal:attach");
     const req = await parseChannelABody(c, TerminalExecRequest);
     const out = await withChannelA(
-      { db, settings, bus },
+      channelAServices,
       ctx,
       ({ service }) => service.terminalExec(req)
     );
@@ -18762,7 +18725,7 @@ function registerSessionRoutes(app, deps) {
       });
     }
     const ptyId = crypto.randomUUID();
-    const out = await withChannelA({ db, settings, bus }, ctx, async (handle) => {
+    const out = await withChannelA(channelAServices, ctx, async (handle) => {
       if (!handle.lease) {
         throw new HTTPException24(409, {
           message: "durable interactive terminals require a session-home provider lease"
@@ -18853,7 +18816,7 @@ function registerSessionRoutes(app, deps) {
       throw new HTTPException24(404, { message: "pty not found or closed" });
     }
     let seq = 1;
-    await withChannelA({ db, settings, bus }, ctx, async (handle) => {
+    await withChannelA(channelAServices, ctx, async (handle) => {
       await adoptPtyProcess(ctx, handle, pty);
       let output;
       try {
@@ -18915,7 +18878,7 @@ function registerSessionRoutes(app, deps) {
     if (!pty) {
       throw new HTTPException24(404, { message: "pty not found or closed" });
     }
-    await withChannelA({ db, settings, bus }, ctx, async (handle) => {
+    await withChannelA(channelAServices, ctx, async (handle) => {
       await adoptPtyProcess(ctx, handle, pty);
       await handle.service.ptyResize(req, pty.execSessionId);
       const updated = await updatePtySessionActivity(db, {
@@ -18944,7 +18907,7 @@ function registerSessionRoutes(app, deps) {
       ptyId: req.ptyId
     });
     if (pty) {
-      await withChannelA({ db, settings, bus }, ctx, async (handle) => {
+      await withChannelA(channelAServices, ctx, async (handle) => {
         await adoptPtyProcess(ctx, handle, pty);
         await handle.service.ptyClose(req, pty.execSessionId);
         const terminal = await getRetainedProcess(db, {
@@ -23455,4 +23418,4 @@ export {
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession2 as workflowIdForSession
 };
-//# sourceMappingURL=chunk-ICRZC3JH.js.map
+//# sourceMappingURL=chunk-MN7BW3UV.js.map