Merge branch 'main' of github.com:sizzldev/ctrlplane into init-rename…

…-target-to-resource
ctrlplanedev · Nov 13, 2024 · 8051c7f · 8051c7f
2 parents 972785d + 6e242d8
commit 8051c7f
Show file tree

Hide file tree

Showing 66 changed files with 2,162 additions and 501 deletions.
diff --git a/apps/ctrlshell/README.md b/apps/ctrlshell/README.md
diff --git a/apps/ctrlshell/src/agent-socket.ts b/apps/ctrlshell/src/agent-socket.ts
diff --git a/apps/ctrlshell/src/payloads/index.ts b/apps/ctrlshell/src/payloads/index.ts
diff --git a/apps/ctrlshell/src/payloads/session-create.ts b/apps/ctrlshell/src/payloads/session-create.ts
diff --git a/apps/ctrlshell/src/payloads/session-input.ts b/apps/ctrlshell/src/payloads/session-input.ts
diff --git a/apps/ctrlshell/src/payloads/session-output.ts b/apps/ctrlshell/src/payloads/session-output.ts
diff --git a/apps/ctrlshell/src/routing.ts b/apps/ctrlshell/src/routing.ts
diff --git a/apps/ctrlshell/src/session-auditor.ts b/apps/ctrlshell/src/session-auditor.ts
diff --git a/apps/ctrlshell/src/user-socket.ts b/apps/ctrlshell/src/user-socket.ts
diff --git a/apps/ctrlshell/src/utils.ts b/apps/ctrlshell/src/utils.ts
diff --git a/apps/ctrlshell/Dockerfile → apps/target-proxy/Dockerfile b/apps/ctrlshell/Dockerfile → apps/target-proxy/Dockerfile
@@ -36,4 +36,4 @@ RUN adduser --system --uid 1001 expressjs
 USER expressjs
 
 COPY --from=installer /app .
-CMD ["node", "apps/webshell-router/dist/index.js"]
+CMD ["node", "apps/target-proxy/dist/index.js"]
diff --git a/apps/target-proxy/README.md b/apps/target-proxy/README.md
@@ -0,0 +1,30 @@
+# Target Proxy Router
+
+Simple router that redirects web terminal requests to instances and vis-versa.
+
+### Sequence Diagram
+
+```mermaid
+sequenceDiagram
+    autonumber
+
+    participant AG as Agebt
+    participant PR as Proxy
+    participant CP as Ctrlplane
+    participant DE as Developer
+
+    opt Init Agent
+        AG->>PR: Connects to Proxy
+        PR->>CP: Register as target
+        AG->>PR: Sends heartbeat
+    end
+
+    opt Session
+        DE->>CP: Opens session
+        CP->>PR: Forwards commands
+        PR->>AG: Receives commands
+        AG->>PR: Sends output
+        PR->>CP: Sends output
+        CP->>DE: Displays output
+    end
+```
diff --git a/apps/ctrlshell/eslint.config.js → apps/target-proxy/eslint.config.js b/apps/ctrlshell/eslint.config.js → apps/target-proxy/eslint.config.js
diff --git a/apps/ctrlshell/package.json → apps/target-proxy/package.json b/apps/ctrlshell/package.json → apps/target-proxy/package.json
@@ -1,15 +1,19 @@
 {
-  "name": "@ctrlplane/ctrlshell",
+  "name": "@ctrlplane/target-proxy",
   "private": true,
   "type": "module",
   "scripts": {
     "clean": "rm -rf .turbo node_modules",
-    "dev": "tsx watch --clear-screen=false src/index.ts",
+    "dev:t": "pnpm with-env tsx watch --clear-screen=false src/index.ts",
     "lint": "eslint",
-    "format": "prettier --check . --ignore-path ../../.gitignore"
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "with-env": "dotenv -e ../../.env --"
   },
   "dependencies": {
     "@ctrlplane/db": "workspace:*",
+    "@ctrlplane/job-dispatch": "workspace:*",
+    "@ctrlplane/logger": "workspace:*",
+    "@ctrlplane/validators": "workspace:*",
     "@t3-oss/env-core": "catalog:",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",

diff --git a/apps/ctrlshell/src/auth.ts → apps/target-proxy/src/auth.ts b/apps/ctrlshell/src/auth.ts → apps/target-proxy/src/auth.ts
diff --git a/apps/ctrlshell/src/config.ts → apps/target-proxy/src/config.ts b/apps/ctrlshell/src/config.ts → apps/target-proxy/src/config.ts