disable websocket attach for now

.gitignore

@@ -2,6 +2,7 @@
 .env
 .envrc
 .npmrc
+.vscode
 *.tsbuildinfo
 *.tgz
 *.zip

generator/fixes.mjs

@@ -31,9 +31,8 @@ export function applyFixes(schema) {
 
   // it is not possible to infer that this endpoint returns a stream
   schema.paths["/images/create"].post.chunked = true;
-
-  //
   schema.paths["/containers/{id}/logs"].get.chunked = true;
+  schema.paths["/containers/{id}/attach/ws"].get.websocket = true;
 
   for (const path in schema.paths) {
     for (const endpoint in schema.paths[path]) {

generator/generator.mjs

@@ -68,7 +68,8 @@ async function main() {
       const output = {
         errors: [],
         stream: outputStream && !props.chunked,
-        websocket: false,
+        websocket: props.websocket === true,
+        upgrade: false,
         empty: false,
         noChange: false,
         chunked: props.chunked || (responses["101"] === undefined && outputStream),
@@ -78,7 +79,7 @@ async function main() {
         const code = parseInt(codeStr);
 
         if (code === 101) {
-          output.websocket = true;
+          output.upgrade = true;
         }
 
         else if (code === 200 || code === 201) {
@@ -157,10 +158,16 @@ async function main() {
         method: props.method,
         path: props.path,
         chunked: props.output.chunked,
+        websocket: props.output.websocket,
         upgrade: props.output.stream,
         path_has_params: props.path.includes("{") && props.path.includes("}"),
       };
 
+      if (attribs.websocket) {
+        // TODO: not sure how to support websocket, container exits as soon as we attach
+        continue;
+      }
+
       if ("input" in props) {
         attribs.input_name = `${name}Input`;
         attribs.input_type = jsonSchemaToZod(props.input);

justfile

@@ -1,3 +1,8 @@
+doit:
+  pnpm run generate && \
+    pnpm run test && \
+    pnpm run build  # dist files interfere with jest
+
 bump-version level:
   #!/bin/bash
 
@@ -23,3 +28,6 @@ create-release:
     --verify-tag \
     --title "${version}" \
     --repo manualpilot/docker-client-ts
+
+reverse-proxy:
+  caddy reverse-proxy --from http://localhost:8888 --to unix//var/run/docker.sock

static/etc.ts

@@ -78,16 +78,14 @@ export function chunked(resp: Dispatcher.ResponseData): Observable<string> {
   return stream.asObservable();
 }
 
-export type TerminalSession = {
-  // write commands to this stream
+export type CombinedTerminalSession = {
   input: ReplaySubject<string>;
-  // combined stdout/stderr output will through on this stream
   output: ReplaySubject<string>;
   close: () => void;
 };
 
 // WARN: this doesn't handle TTY mode yet
-export function terminal(resp: Dispatcher.UpgradeData): TerminalSession {
+export function terminal(resp: Dispatcher.UpgradeData): CombinedTerminalSession {
   const input = new ReplaySubject<string>(30);
   const output = new ReplaySubject<string>(30);
 

templates/tag.tmpl

@@ -1,5 +1,5 @@
-import { Pool } from "undici";
-import { Observable } from "rxjs";
+import type { Observable } from "rxjs";
+import type { Pool } from "undici";
 import { z } from "zod";
 import { chunked, sub, terminal } from "~/etc";