clean up agent checks for proxy

ctrlplanedev · Nov 15, 2024 · d9cfe08 · d9cfe08
1 parent 825d069
commit d9cfe08
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/apps/pty-proxy/package.json b/apps/pty-proxy/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "build": "tsc",
     "clean": "rm -rf .turbo node_modules",
-    "dev:t": "pnpm with-env tsx watch --clear-screen=false src/index.ts",
+    "dev": "pnpm with-env tsx watch --clear-screen=false src/index.ts",
     "lint": "eslint",
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "with-env": "dotenv -e ../../.env --"

diff --git a/apps/pty-proxy/src/controller/agent-socket.ts b/apps/pty-proxy/src/controller/agent-socket.ts
@@ -69,10 +69,12 @@ export class AgentSocket {
       throw new Error("User does not have access.");
     }
 
-    return new AgentSocket(socket, name, workspace.id);
+    const agent = new AgentSocket(socket, name, workspace.id);
+    await agent.updateResource({});
+    return agent;
   }
 
-  private resource: ResourceToInsert | null = null;
+  resource: ResourceToInsert | null = null;
 
   private constructor(
     private readonly socket: WebSocket,

diff --git a/apps/pty-proxy/src/controller/index.ts b/apps/pty-proxy/src/controller/index.ts
@@ -12,10 +12,13 @@ import { UserSocket } from "./user-socket.js";
 const onConnect = async (ws: WebSocket, request: IncomingMessage) => {
   const agent = await AgentSocket.from(ws, request);
   if (agent != null) {
-    logger.info("Agent connected", {
-      resourceId: agent.resource.id,
-      name: agent.resource.name,
-    });
+    logger.info("Agent connected");
+    if (agent.resource?.id == null) {
+      logger.error("Agent resource id is null");
+      ws.close();
+      throw new Error("Agent resource id is null");
+    }
+
     agents.set(agent.resource.id, agent);
     return;
   }

diff --git a/apps/pty-proxy/src/routing.ts b/apps/pty-proxy/src/routing.ts
@@ -13,12 +13,12 @@ export const addSocket = (expressApp: Express) => {
     }
 
     const { pathname } = new URL(request.url, "ws://base.ws");
-    if (pathname.startsWith("/api/v1/target/proxy/session")) {
+    if (pathname.startsWith("/api/v1/resources/proxy/session")) {
       sessionOnUpgrade(request, socket, head);
       return;
     }
 
-    if (pathname.startsWith("/api/v1/target/proxy/controller")) {
+    if (pathname.startsWith("/api/v1/resources/proxy/controller")) {
       controllerOnUpgrade(request, socket, head);
       return;
     }

diff --git a/apps/webservice/next.config.js b/apps/webservice/next.config.js
@@ -33,18 +33,19 @@ const config = {
     ],
   },
 
-  // async rewrites() {
-  //   return [
-  //     {
-  //       source: "/api/v1/target/proxy/controller",
-  //       destination: "http://localhost:4000/api/v1/target/proxy/controller",
-  //     },
-  //     {
-  //       source: "/api/v1/target/proxy/session/:path*",
-  //       destination: "http://localhost:4000/api/v1/target/proxy/session/:path*",
-  //     },
-  //   ];
-  // },
+  async rewrites() {
+    return [
+      {
+        source: "/api/v1/resources/proxy/controller",
+        destination: "http://localhost:4000/api/v1/resources/proxy/controller",
+      },
+      {
+        source: "/api/v1/resources/proxy/session/:path*",
+        destination:
+          "http://localhost:4000/api/v1/resources/proxy/session/:path*",
+      },
+    ];
+  },
   /** We already do linting and typechecking as separate tasks in CI */
   eslint: { ignoreDuringBuilds: true },
   typescript: { ignoreBuildErrors: true },