@clawos-dev/clawd 0.2.105 → 0.2.106-beta.202.2cc5279

package/dist/cli.cjs

@@ -19257,8 +19257,8 @@ var require_websocket = __commonJS({
     "use strict";
     var EventEmitter2 = require("events");
     var https = require("https");
-    var http2 = require("http");
-    var net2 = require("net");
+    var http3 = require("http");
+    var net3 = require("net");
     var tls = require("tls");
     var { randomBytes, createHash: createHash2 } = require("crypto");
     var { Duplex, Readable: Readable3 } = require("stream");
@@ -19791,7 +19791,7 @@ var require_websocket = __commonJS({
       }
       const defaultPort = isSecure ? 443 : 80;
       const key = randomBytes(16).toString("base64");
-      const request = isSecure ? https.request : http2.request;
+      const request = isSecure ? https.request : http3.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
       opts.createConnection = opts.createConnection || (isSecure ? tlsConnect : netConnect);
@@ -19992,12 +19992,12 @@ var require_websocket = __commonJS({
     }
     function netConnect(options) {
       options.path = options.socketPath;
-      return net2.connect(options);
+      return net3.connect(options);
     }
     function tlsConnect(options) {
       options.path = void 0;
       if (!options.servername && options.servername !== "") {
-        options.servername = net2.isIP(options.host) ? "" : options.host;
+        options.servername = net3.isIP(options.host) ? "" : options.host;
       }
       return tls.connect(options);
     }
@@ -20285,7 +20285,7 @@ var require_websocket_server = __commonJS({
   "../node_modules/.pnpm/ws@8.20.0/node_modules/ws/lib/websocket-server.js"(exports2, module2) {
     "use strict";
     var EventEmitter2 = require("events");
-    var http2 = require("http");
+    var http3 = require("http");
     var { Duplex } = require("stream");
     var { createHash: createHash2 } = require("crypto");
     var extension2 = require_extension();
@@ -20360,8 +20360,8 @@ var require_websocket_server = __commonJS({
           );
         }
         if (options.port != null) {
-          this._server = http2.createServer((req, res) => {
-            const body = http2.STATUS_CODES[426];
+          this._server = http3.createServer((req, res) => {
+            const body = http3.STATUS_CODES[426];
             res.writeHead(426, {
               "Content-Length": body.length,
               "Content-Type": "text/plain"
@@ -20648,7 +20648,7 @@ var require_websocket_server = __commonJS({
       this.destroy();
     }
     function abortHandshake(socket, code, message, headers) {
-      message = message || http2.STATUS_CODES[code];
+      message = message || http3.STATUS_CODES[code];
       headers = {
         Connection: "close",
         "Content-Type": "text/html",
@@ -20657,7 +20657,7 @@ var require_websocket_server = __commonJS({
       };
       socket.once("finish", socket.destroy);
       socket.end(
-        `HTTP/1.1 ${code} ${http2.STATUS_CODES[code]}\r
+        `HTTP/1.1 ${code} ${http3.STATUS_CODES[code]}\r
 ` + Object.keys(headers).map((h) => `${h}: ${headers[h]}`).join("\r\n") + "\r\n\r\n" + message
       );
     }
@@ -30870,6 +30870,8 @@ function resolveConfig(opts) {
   const frpcBinary = env.CLAWD_FRPC_BIN ?? null;
   const rawMode = env.CLAWD_CC_MODE;
   const mode = DAEMON_MODE_VALUES.includes(rawMode ?? "") ? rawMode : "sdk";
+  const filePreviewPorts = Array.isArray(fileCfg.previewPorts) ? fileCfg.previewPorts.map((n) => Number(n)).filter((n) => Number.isInteger(n) && n > 0) : null;
+  const previewPorts = env.CLAWD_PREVIEW_PORTS ? env.CLAWD_PREVIEW_PORTS.split(",").map((s) => Number(s.trim())).filter((n) => Number.isInteger(n) && n > 0) : filePreviewPorts && filePreviewPorts.length > 0 ? filePreviewPorts : null;
   return {
     port,
     host,
@@ -30881,7 +30883,8 @@ function resolveConfig(opts) {
     authToken,
     noTunnelPersist,
     frpcBinary,
-    mode
+    mode,
+    previewPorts
   };
 }
 var HELP_TEXT = `clawd [options]
@@ -36252,7 +36255,58 @@ var import_websocket_server = __toESM(require_websocket_server(), 1);
 var wrapper_default = import_websocket.default;
 
 // src/transport/local-ws-server.ts
+var import_node_http2 = __toESM(require("http"), 1);
+
+// src/transport/preview-proxy.ts
 var import_node_http = __toESM(require("http"), 1);
+var import_node_net = __toESM(require("net"), 1);
+var PREVIEW_RE = /^\/preview\/(\d+)(?:\/.*)?$/;
+function matchPreviewPort(pathname) {
+  const m2 = pathname.match(PREVIEW_RE);
+  return m2 ? Number(m2[1]) : null;
+}
+function isPreviewPortAllowed(port, cfg) {
+  return cfg.allowedPorts.includes(port);
+}
+function proxyPreviewHttp(req, res, port) {
+  return new Promise((resolve6) => {
+    const upstream = import_node_http.default.request(
+      { host: "localhost", port, method: req.method, path: req.url, headers: req.headers },
+      (upRes) => {
+        res.writeHead(upRes.statusCode || 502, upRes.headers);
+        upRes.pipe(res);
+        upRes.on("end", () => resolve6());
+      }
+    );
+    upstream.on("error", (e) => {
+      if (!res.headersSent) {
+        res.writeHead(502, { "content-type": "text/plain; charset=utf-8" });
+      }
+      res.end(`preview upstream error: ${e.message}`);
+      resolve6();
+    });
+    req.pipe(upstream);
+  });
+}
+function proxyPreviewUpgrade(req, socket, head, port) {
+  const upstream = import_node_net.default.connect(port, "localhost", () => {
+    let raw = `${req.method} ${req.url} HTTP/1.1\r
+`;
+    for (let i = 0; i < req.rawHeaders.length; i += 2) {
+      raw += `${req.rawHeaders[i]}: ${req.rawHeaders[i + 1]}\r
+`;
+    }
+    raw += "\r\n";
+    upstream.write(raw);
+    if (head && head.length) upstream.write(head);
+    upstream.pipe(socket);
+    socket.pipe(upstream);
+  });
+  upstream.on("error", () => socket.destroy());
+  socket.on("error", () => upstream.destroy());
+}
+
+// src/transport/local-ws-server.ts
 var LocalWsServer = class {
   constructor(opts) {
     this.opts = opts;
@@ -36272,9 +36326,25 @@ var LocalWsServer = class {
   async start() {
     const host = this.opts.host ?? "127.0.0.1";
     await new Promise((resolve6, reject) => {
-      const httpServer = import_node_http.default.createServer((req, res) => this.handleHttpRequest(req, res));
+      const httpServer = import_node_http2.default.createServer((req, res) => this.handleHttpRequest(req, res));
       const wss = new import_websocket_server.default({ noServer: true, clientTracking: true });
       httpServer.on("upgrade", (req, socket, head) => {
+        if (req.url?.startsWith("/preview/")) {
+          const pathname = (() => {
+            try {
+              return new URL(req.url, "http://localhost").pathname;
+            } catch {
+              return "/";
+            }
+          })();
+          const port = matchPreviewPort(pathname);
+          if (port != null && (this.opts.previewPorts ?? []).includes(port)) {
+            proxyPreviewUpgrade(req, socket, head, port);
+          } else {
+            socket.destroy();
+          }
+          return;
+        }
         wss.handleUpgrade(req, socket, head, (ws) => {
           this.routeConnection(ws, req);
         });
@@ -37922,6 +37992,15 @@ function createHttpRouter(deps) {
       });
       return true;
     }
+    if (url.pathname.startsWith("/preview/")) {
+      const port = matchPreviewPort(url.pathname);
+      if (port != null && isPreviewPortAllowed(port, { allowedPorts: deps.previewPorts ?? [] })) {
+        await proxyPreviewHttp(req, res, port);
+        return true;
+      }
+      sendJson(res, 403, { code: "PREVIEW_PORT_FORBIDDEN", message: "preview port not allowed" });
+      return true;
+    }
     if (!url.pathname.startsWith("/session/") && !url.pathname.startsWith("/files/") && url.pathname !== "/attachments/upload" && url.pathname !== "/extensions/import") {
       return false;
     }
@@ -41518,7 +41597,7 @@ var import_node_path41 = __toESM(require("path"), 1);
 var import_promises10 = require("timers/promises");
 
 // src/extension/port-allocator.ts
-var import_node_net = __toESM(require("net"), 1);
+var import_node_net2 = __toESM(require("net"), 1);
 var PortExhaustedError = class extends Error {
   constructor(min, max) {
     super(`no free port in [${min},${max}]`);
@@ -41531,7 +41610,7 @@ var PortExhaustedError = class extends Error {
 };
 function probe(port) {
   return new Promise((resolve6) => {
-    const srv = import_node_net.default.createServer();
+    const srv = import_node_net2.default.createServer();
     srv.once("error", () => resolve6(false));
     srv.once("listening", () => {
       srv.close(() => resolve6(true));
@@ -42185,7 +42264,9 @@ async function startDaemon(config) {
       getHttpBaseUrl: () => currentTunnelUrl ? getHttpBaseUrl() : null
     },
     // POST /extensions/import lands in ~/.clawd/extensions/<id>/
-    extensionsRoot: () => extensionsRoot()
+    extensionsRoot: () => extensionsRoot(),
+    // app-builder build 模式：/preview/<port>/ 反代 dev server 的端口白名单（见 spec §三.2）
+    previewPorts: config.previewPorts ?? void 0
   });
   wsServer = new LocalWsServer({
     host: config.host,
@@ -42224,6 +42305,8 @@ async function startDaemon(config) {
     },
     // file-sharing HTTP 路由复用 daemon 同端口（spec §5 第 3 条）；router 自己处理 auth + 404
     httpRequestHandler: httpRouter,
+    // app-builder build 模式：/preview/<port>/ HMR websocket upgrade 转发的端口白名单（同 http-router 配置）
+    previewPorts: config.previewPorts ?? void 0,
     // 订阅成功后给该 client 重放 in-flight pendingQuestions（plan: clawd-question-server-truth）。
     // daemon 是 pendingQuestions 的唯一 source of truth；新 client 接入 / 刷新页面时
     // 把当前所有未决 question 以 session:question 帧定向回放，让 UI 不再误显示 Ended。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawos-dev/clawd",
-  "version": "0.2.105",
+  "version": "0.2.106-beta.202.2cc5279",
   "description": "Standalone clawd daemon — Claude Code (and future Codex) session server over WebSocket",
   "type": "module",
   "license": "MIT",