@ggterm/core 0.3.0 → 0.3.1

package/dist/cli-plot.js

@@ -14601,6 +14601,9 @@ __export(exports_serve, {
 });
 import { watch, writeFileSync as writeFileSync3, unlinkSync } from "fs";
 import { join as join3 } from "path";
+import { createServer } from "http";
+import { createHash } from "crypto";
+import { spawn } from "child_process";
 function plotToVegaLite(plot) {
   const geomTypes = plot._provenance.geomTypes;
   const hasCompositeMark = geomTypes.some((t) => COMPOSITE_MARKS.has(t));
@@ -14617,6 +14620,32 @@ function getLatestPayload() {
   const { spec, provenance } = plotToVegaLite(plot);
   return JSON.stringify({ type: "plot", spec, provenance });
 }
+function encodeWebSocketFrame(data) {
+  const payload = Buffer.from(data, "utf-8");
+  const len = payload.length;
+  let header;
+  if (len < 126) {
+    header = Buffer.alloc(2);
+    header[0] = 129;
+    header[1] = len;
+  } else if (len < 65536) {
+    header = Buffer.alloc(4);
+    header[0] = 129;
+    header[1] = 126;
+    header.writeUInt16BE(len, 2);
+  } else {
+    header = Buffer.alloc(10);
+    header[0] = 129;
+    header[1] = 127;
+    header.writeBigUInt64BE(BigInt(len), 2);
+  }
+  return Buffer.concat([header, payload]);
+}
+function jsonResponse(res, data, status = 200) {
+  const body = JSON.stringify(data);
+  res.writeHead(status, { "content-type": "application/json" });
+  res.end(body);
+}
 function handleServe(port) {
   const p = port || 4242;
   ensureHistoryDirs();
@@ -14632,85 +14661,119 @@ function handleServe(port) {
       const payload = getLatestPayload();
       if (!payload)
         return;
+      const frame = encodeWebSocketFrame(payload);
       for (const client of clients) {
         try {
-          client.send(payload);
+          client.write(frame);
         } catch {
           clients.delete(client);
         }
       }
     }, 150);
   });
-  const server = Bun.serve({
-    port: p,
-    fetch(req, server2) {
-      const url2 = new URL(req.url);
-      if (url2.pathname === "/ws") {
-        if (server2.upgrade(req))
-          return;
-        return new Response("WebSocket upgrade failed", { status: 400 });
-      }
-      if (url2.pathname === "/api/latest") {
-        const payload = getLatestPayload();
-        if (!payload)
-          return Response.json({ type: "empty" });
-        return new Response(payload, { headers: { "content-type": "application/json" } });
-      }
-      if (url2.pathname === "/api/history") {
-        const entries = getHistory().slice(-50);
-        return Response.json(entries);
-      }
-      if (url2.pathname.startsWith("/api/plot/")) {
-        const id = url2.pathname.slice("/api/plot/".length);
-        const plot = loadPlotFromHistory(id);
-        if (!plot)
-          return Response.json({ error: "not found" }, { status: 404 });
-        const { spec, provenance } = plotToVegaLite(plot);
-        return Response.json({ type: "plot", spec, provenance });
-      }
-      return new Response(CLIENT_HTML, {
-        headers: { "content-type": "text/html; charset=utf-8" }
-      });
-    },
-    websocket: {
-      open(ws) {
-        clients.add(ws);
-        const payload = getLatestPayload();
-        if (payload)
-          ws.send(payload);
-      },
-      close(ws) {
-        clients.delete(ws);
-      },
-      message() {}
+  const server = createServer((req, res) => {
+    const url = new URL(req.url || "/", `http://localhost:${p}`);
+    if (url.pathname === "/api/latest") {
+      const payload = getLatestPayload();
+      if (!payload)
+        return jsonResponse(res, { type: "empty" });
+      res.writeHead(200, { "content-type": "application/json" });
+      res.end(payload);
+      return;
     }
+    if (url.pathname === "/api/history") {
+      const entries = getHistory().slice(-50);
+      jsonResponse(res, entries);
+      return;
+    }
+    if (url.pathname.startsWith("/api/plot/")) {
+      const id = url.pathname.slice("/api/plot/".length);
+      const plot = loadPlotFromHistory(id);
+      if (!plot)
+        return jsonResponse(res, { error: "not found" }, 404);
+      const { spec, provenance } = plotToVegaLite(plot);
+      jsonResponse(res, { type: "plot", spec, provenance });
+      return;
+    }
+    res.writeHead(200, { "content-type": "text/html; charset=utf-8" });
+    res.end(CLIENT_HTML);
   });
-  const url = `http://localhost:${server.port}`;
-  console.log(`ggterm live viewer running at ${url}`);
-  const markerPath = join3(getGGTermDir(), "serve.json");
-  writeFileSync3(markerPath, JSON.stringify({ port: server.port, pid: process.pid }));
-  const cleanup = () => {
-    try {
-      unlinkSync(markerPath);
-    } catch {}
-  };
-  process.on("SIGINT", () => {
-    cleanup();
-    process.exit(0);
+  server.on("upgrade", (req, socket, _head) => {
+    const url = new URL(req.url || "/", `http://localhost:${p}`);
+    if (url.pathname !== "/ws") {
+      socket.destroy();
+      return;
+    }
+    const key = req.headers["sec-websocket-key"];
+    if (!key) {
+      socket.destroy();
+      return;
+    }
+    const accept = createHash("sha1").update(key + "258EAFA5-E914-47DA-95CA-5AB5DC85B7A8").digest("base64");
+    socket.write(`HTTP/1.1 101 Switching Protocols\r
+` + `Upgrade: websocket\r
+` + `Connection: Upgrade\r
+` + `Sec-WebSocket-Accept: ${accept}\r
+` + `\r
+`);
+    clients.add(socket);
+    const payload = getLatestPayload();
+    if (payload)
+      socket.write(encodeWebSocketFrame(payload));
+    socket.on("close", () => clients.delete(socket));
+    socket.on("error", () => clients.delete(socket));
+    socket.on("data", (data) => {
+      if (data.length < 2)
+        return;
+      const opcode = data[0] & 15;
+      if (opcode === 8) {
+        const closeFrame = Buffer.alloc(2);
+        closeFrame[0] = 136;
+        closeFrame[1] = 0;
+        try {
+          socket.write(closeFrame);
+        } catch {}
+        socket.end();
+        clients.delete(socket);
+        return;
+      }
+      if (opcode === 9) {
+        const pong = Buffer.from(data);
+        pong[0] = pong[0] & 240 | 10;
+        try {
+          socket.write(pong);
+        } catch {}
+      }
+    });
   });
-  process.on("SIGTERM", () => {
-    cleanup();
-    process.exit(0);
+  server.listen(p, () => {
+    const url = `http://localhost:${p}`;
+    console.log(`ggterm live viewer running at ${url}`);
+    const markerPath = join3(getGGTermDir(), "serve.json");
+    writeFileSync3(markerPath, JSON.stringify({ port: p, pid: process.pid }));
+    const cleanup = () => {
+      try {
+        unlinkSync(markerPath);
+      } catch {}
+    };
+    process.on("SIGINT", () => {
+      cleanup();
+      process.exit(0);
+    });
+    process.on("SIGTERM", () => {
+      cleanup();
+      process.exit(0);
+    });
+    process.on("exit", cleanup);
+    if (process.env.TERM_PROGRAM === "waveterm") {
+      spawn("wsh", ["web", "open", url], { stdio: "ignore", detached: true }).unref();
+      console.log(`Opened Wave panel`);
+    } else {
+      console.log(`Open in browser or Wave panel: wsh web open ${url}`);
+    }
+    console.log(`Watching ${plotsDir} for new plots...`);
+    console.log(`Press Ctrl+C to stop`);
   });
-  process.on("exit", cleanup);
-  if (process.env.TERM_PROGRAM === "waveterm") {
-    Bun.spawn(["wsh", "web", "open", url]);
-    console.log(`Opened Wave panel`);
-  } else {
-    console.log(`Open in browser or Wave panel: wsh web open ${url}`);
-  }
-  console.log(`Watching ${plotsDir} for new plots...`);
-  console.log(`Press Ctrl+C to stop`);
 }
 var COMPOSITE_MARKS, CLIENT_HTML = `<!DOCTYPE html>
 <html lang="en">

package/dist/serve.d.ts

@@ -3,6 +3,8 @@
  *
  * Watches .ggterm/plots/ for new plots and pushes them to connected
  * browsers via WebSocket. Renders interactive Vega-Lite in a dark-themed page.
+ *
+ * Uses node:http and a minimal WebSocket implementation for Node.js compatibility.
  */
 export declare function handleServe(port?: number): void;
 //# sourceMappingURL=serve.d.ts.map

package/dist/serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAweH,wBAAgB,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAkG/C"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../src/serve.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AA6gBH,wBAAgB,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CA2I/C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ggterm/core",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Grammar of Graphics engine for terminals",
   "type": "module",
   "main": "./dist/index.js",