@open-wxa/wxa-runner-core 0.12.1 → 0.12.3

package/dist/index.d.mts

@@ -1,9 +1,9 @@
 import http, { IncomingMessage, ServerResponse } from 'http';
 import { ResolvedBaseLib } from '@open-wxa/wxa-runner-extractor';
-import { D as DeviceProfile, F as ForwardConsole } from './setup-D0ubZt2C.mjs';
-export { A as ApiContext, a as ApiHandler, b as ApiResult, c as AppInfo, M as MockConfig, d as MockRequest, e as MockResponse, f as MockValue, N as NetworkConfig, R as RouteHandler, S as SetupApi, g as SetupConfig, h as SetupContext, i as SetupDefinition } from './setup-D0ubZt2C.mjs';
+import { D as DeviceProfile, F as ForwardConsole } from './setup--EIOgQvG.mjs';
+export { A as ApiContext, a as ApiHandler, b as ApiResult, c as AppInfo, M as MockConfig, d as MockRequest, e as MockResponse, f as MockValue, N as NetworkConfig, R as RouteHandler, S as SetupApi, g as SetupConfig, h as SetupContext, i as SetupDefinition } from './setup--EIOgQvG.mjs';
 import { Request, Response } from 'express';
-export { F as FrameError, P as PageSnapshot, R as RecordedRequest, W as WebViewInfo, a as WxaTestApi } from './testApi-x2Yph6M2.mjs';
+export { F as FrameError, P as PageSnapshot, R as RecordedRequest, W as WebViewInfo, a as WxaTestApi } from './testApi-CoYw0cPm.mjs';
 
 /**
  * 样式预处理：project.config.json 的 setting.useCompilerPlugins 开启 less / sass 时，
@@ -266,6 +266,7 @@ interface ExtensionEntry {
  *   /__wxa__/usr/<会话>/<路径>   用户目录（USER_DATA_PATH）下的文件，image 等组件和 uploadFile 按地址读取
  *   /__wxa__/region/<kind>     地区选择器用的行政区划数据（districts / streets），取自本机开发者工具
  *   /__wxa__/api/*             --devtools-login：wx.login 的 code、手机号，服务市场、插件的请求转发，只允许本机访问
+ *   /__wxa__/socket            带自定义请求头的 WebSocket 转发，只接受同源连接
  *   /__wxa__/ws                文件变化通知：热更新（hot）或整页刷新（reload）；开启 forwardConsole 时浏览器从这里发来报错
  *   middlewares / 扩展挂载的路径  排在 runner 自己的路由之前
  *   其余路径                    小程序目录下的静态资源
@@ -355,8 +356,11 @@ declare class DevServer {
     private readonly logger;
     private readonly app;
     private server;
+    private socketProxy;
     private sockets;
     private watcher;
+    /** 上次编译失败时页面上显示着错误，修好后整页刷新才能清掉 */
+    private lastBuildFailed;
     private address;
     private lanAccess;
     /** 运行时生成的临时文件（canvas 导出、拍照等），随服务器进程存在 */
@@ -386,6 +390,7 @@ declare class DevServer {
     private runtimeDir;
     /** 只在监听文件变化时打开基础库的热更新开关，跑测试（watch: false）时运行环境与真机一致 */
     private get hotEnabled();
+    /** 返回初次扫描完成的时刻，此前已存在的文件不会作为改动报告 */
     private startWatching;
     private broadcast;
 }

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import http, { IncomingMessage, ServerResponse } from 'http';
 import { ResolvedBaseLib } from '@open-wxa/wxa-runner-extractor';
-import { D as DeviceProfile, F as ForwardConsole } from './setup-D0ubZt2C.js';
-export { A as ApiContext, a as ApiHandler, b as ApiResult, c as AppInfo, M as MockConfig, d as MockRequest, e as MockResponse, f as MockValue, N as NetworkConfig, R as RouteHandler, S as SetupApi, g as SetupConfig, h as SetupContext, i as SetupDefinition } from './setup-D0ubZt2C.js';
+import { D as DeviceProfile, F as ForwardConsole } from './setup--EIOgQvG.js';
+export { A as ApiContext, a as ApiHandler, b as ApiResult, c as AppInfo, M as MockConfig, d as MockRequest, e as MockResponse, f as MockValue, N as NetworkConfig, R as RouteHandler, S as SetupApi, g as SetupConfig, h as SetupContext, i as SetupDefinition } from './setup--EIOgQvG.js';
 import { Request, Response } from 'express';
-export { F as FrameError, P as PageSnapshot, R as RecordedRequest, W as WebViewInfo, a as WxaTestApi } from './testApi-Df0ltBI6.js';
+export { F as FrameError, P as PageSnapshot, R as RecordedRequest, W as WebViewInfo, a as WxaTestApi } from './testApi-BfzCTOhg.js';
 
 /**
  * 样式预处理：project.config.json 的 setting.useCompilerPlugins 开启 less / sass 时，
@@ -266,6 +266,7 @@ interface ExtensionEntry {
  *   /__wxa__/usr/<会话>/<路径>   用户目录（USER_DATA_PATH）下的文件，image 等组件和 uploadFile 按地址读取
  *   /__wxa__/region/<kind>     地区选择器用的行政区划数据（districts / streets），取自本机开发者工具
  *   /__wxa__/api/*             --devtools-login：wx.login 的 code、手机号，服务市场、插件的请求转发，只允许本机访问
+ *   /__wxa__/socket            带自定义请求头的 WebSocket 转发，只接受同源连接
  *   /__wxa__/ws                文件变化通知：热更新（hot）或整页刷新（reload）；开启 forwardConsole 时浏览器从这里发来报错
  *   middlewares / 扩展挂载的路径  排在 runner 自己的路由之前
  *   其余路径                    小程序目录下的静态资源
@@ -355,8 +356,11 @@ declare class DevServer {
     private readonly logger;
     private readonly app;
     private server;
+    private socketProxy;
     private sockets;
     private watcher;
+    /** 上次编译失败时页面上显示着错误，修好后整页刷新才能清掉 */
+    private lastBuildFailed;
     private address;
     private lanAccess;
     /** 运行时生成的临时文件（canvas 导出、拍照等），随服务器进程存在 */
@@ -386,6 +390,7 @@ declare class DevServer {
     private runtimeDir;
     /** 只在监听文件变化时打开基础库的热更新开关，跑测试（watch: false）时运行环境与真机一致 */
     private get hotEnabled();
+    /** 返回初次扫描完成的时刻，此前已存在的文件不会作为改动报告 */
     private startWatching;
     private broadcast;
 }

package/dist/index.js

@@ -140,6 +140,26 @@ var FileStore = class {
         this.write(destPath, this.read(srcPath));
         return {};
       },
+      rename: ({ oldPath, newPath }) => {
+        const source = this.normalize(oldPath);
+        const target = this.normalize(newPath);
+        const node = this.existing(oldPath);
+        this.assertNotRoot(source);
+        this.assertNotRoot(target);
+        if (source === target) return {};
+        const parent = target.slice(0, target.lastIndexOf("/")) || "/";
+        if (!this.nodes.get(parent)?.dir) throw new Error(`no such file or directory ${newPath}`);
+        if (node.dir && target.startsWith(source + "/")) throw new Error("invalid argument: directory moved into itself");
+        const destination = this.nodes.get(target);
+        if (destination) {
+          if (destination.dir !== node.dir) throw new Error(`incompatible file type ${newPath}`);
+          if (destination.dir && this.readdir(target).length) throw new Error(`directory not empty ${newPath}`);
+        }
+        const entries = [...this.nodes].filter(([key]) => key === source || node.dir && key.startsWith(source + "/"));
+        for (const [key] of entries) this.nodes.delete(key);
+        for (const [key, value] of entries) this.nodes.set(target + key.slice(source.length), value);
+        return {};
+      },
       access: ({ path: path7 }) => {
         this.existing(path7);
         return {};
@@ -267,7 +287,7 @@ var import_net = __toESM(require("net"));
 var import_os3 = __toESM(require("os"));
 var import_path6 = __toESM(require("path"));
 var import_express2 = __toESM(require("express"));
-var import_ws2 = require("ws");
+var import_ws3 = require("ws");
 var import_wxa_runner_extractor5 = require("@open-wxa/wxa-runner-extractor");
 
 // src/project/AppBuilder.ts
@@ -622,8 +642,8 @@ var AppBuilder = class {
         this.pending = { covers: this.changes, result: result2 };
       }
       const { covers, result } = this.pending;
-      const built = await result;
-      if (covers >= wanted) return built;
+      if (covers >= wanted) return result;
+      await result.catch(() => void 0);
     }
   }
   /**
@@ -1453,6 +1473,71 @@ async function handleProxy(req, res) {
   }
 }
 
+// src/server/socketProxy.ts
+var import_ws = require("ws");
+function mirrorClose(to, code, reason) {
+  if (code === 1005) to.close();
+  else if (code === 1006 || code === 1015) to.terminate();
+  else to.close(code, reason);
+}
+function createSocketProxy() {
+  const server = new import_ws.WebSocketServer({
+    noServer: true,
+    // 不能让其他网站借本地开发服务器建立任意带凭据的连接。
+    verifyClient: ({ origin, req }) => origin === `http://${req.headers.host}`
+  });
+  server.on("connection", (client) => {
+    let upstream;
+    const timer = setTimeout(() => client.close(1008, "Missing socket request"), 1e4);
+    timer.unref();
+    client.on("error", () => void 0);
+    client.once("message", (data, binary) => {
+      clearTimeout(timer);
+      try {
+        if (binary || data.toString().length > 64 * 1024) throw new Error("Invalid socket request");
+        const { url, header: header2, protocols, timeout } = JSON.parse(data.toString());
+        const target = new URL(url);
+        if (!["ws:", "wss:"].includes(target.protocol) || target.username || target.password) throw new Error("Invalid socket URL");
+        upstream = new import_ws.WebSocket(target, protocols || [], {
+          headers: header2 || {},
+          handshakeTimeout: typeof timeout === "number" && timeout > 0 ? timeout : 6e4
+        });
+      } catch {
+        client.close(1008, "Invalid socket request");
+        return;
+      }
+      const socket = upstream;
+      let header = {};
+      socket.on("upgrade", (response) => {
+        header = response.headers;
+      });
+      socket.on("open", () => {
+        if (client.readyState !== import_ws.WebSocket.OPEN) {
+          socket.close();
+          return;
+        }
+        client.send(JSON.stringify({ ready: true, header }));
+      });
+      socket.on("message", (message, isBinary) => {
+        if (client.readyState === import_ws.WebSocket.OPEN) client.send(message, { binary: isBinary });
+      });
+      client.on("message", (message, isBinary) => {
+        if (socket.readyState === import_ws.WebSocket.OPEN) socket.send(message, { binary: isBinary });
+      });
+      socket.on("error", () => client.terminate());
+      socket.on("close", (code, reason) => {
+        if (client.readyState === import_ws.WebSocket.OPEN) mirrorClose(client, code, reason);
+      });
+    });
+    client.on("close", (code, reason) => {
+      clearTimeout(timer);
+      if (upstream?.readyState === import_ws.WebSocket.OPEN) mirrorClose(upstream, code, reason);
+      else if (upstream) upstream.terminate();
+    });
+  });
+  return server;
+}
+
 // src/server/hmr.ts
 var STYLE_FILE = /\.(wxss|less|scss|sass|css)$/;
 function planHotUpdate(files, units) {
@@ -1471,7 +1556,7 @@ function planHotUpdate(files, units) {
 var import_child_process = require("child_process");
 var import_crypto = require("crypto");
 var import_promises2 = require("timers/promises");
-var import_ws = require("ws");
+var import_ws2 = require("ws");
 var import_wxa_runner_extractor = require("@open-wxa/wxa-runner-extractor");
 var AUTO_PORT = 9420;
 var CLI_TIMEOUT = 6e4;
@@ -1562,7 +1647,7 @@ function cliErrorMessage(stdout) {
 function requestTicket(port) {
   return new Promise((resolve, reject) => {
     const id = `wxa-runner-${(0, import_crypto.randomUUID)()}`;
-    const socket = new import_ws.WebSocket(`ws://127.0.0.1:${port}`);
+    const socket = new import_ws2.WebSocket(`ws://127.0.0.1:${port}`);
     const settle = (finish) => {
       clearTimeout(timer);
       socket.removeAllListeners().on("error", () => void 0).terminate();
@@ -1948,8 +2033,11 @@ var DevServer = class {
   constructor(options) {
     this.options = options;
     this.server = null;
+    this.socketProxy = null;
     this.sockets = null;
     this.watcher = null;
+    /** 上次编译失败时页面上显示着错误，修好后整页刷新才能清掉 */
+    this.lastBuildFailed = false;
     this.address = "";
     this.lanAccess = false;
     /** 运行时生成的临时文件（canvas 导出、拍照等），随服务器进程存在 */
@@ -1993,20 +2081,27 @@ var DevServer = class {
     return Object.values(import_os3.default.networkInterfaces()).flat().filter((net2) => net2 && net2.family === "IPv4" && !net2.internal).map((net2) => `http://${net2.address}:${port}`);
   }
   async start() {
+    if (this.options.watch !== false) await this.startWatching();
     try {
       const build2 = await this.builder.build();
       this.logger.log(`[wxa-runner] \u7F16\u8BD1\u5B8C\u6210\uFF1A${build2.pages.length} \u4E2A\u9875\u9762\uFF0C${build2.components.length} \u4E2A\u7EC4\u4EF6\uFF0C${build2.durationMs}ms`);
     } catch (error) {
+      this.lastBuildFailed = true;
       this.logger.error(`[wxa-runner] \u7F16\u8BD1\u5931\u8D25\uFF1A
 ${error.message}`);
     }
     const server = import_http.default.createServer(this.app);
-    this.sockets = new import_ws2.WebSocketServer({ noServer: true, maxPayload: 64 * 1024 });
+    this.sockets = new import_ws3.WebSocketServer({ noServer: true, maxPayload: 64 * 1024 });
     this.sockets.on("connection", (socket) => {
       socket.on("error", () => void 0);
       if (this.options.forwardConsole) printBrowserReports(socket, this.logger);
     });
+    this.socketProxy = createSocketProxy();
     server.on("upgrade", (req, socket, head) => {
+      if (req.url === "/__wxa__/socket") {
+        this.socketProxy.handleUpgrade(req, socket, head, (ws) => this.socketProxy.emit("connection", ws, req));
+        return;
+      }
       if (req.url?.startsWith("/__wxa__/ws")) {
         this.sockets.handleUpgrade(req, socket, head, (ws) => this.sockets.emit("connection", ws, req));
       } else {
@@ -2014,11 +2109,17 @@ ${error.message}`);
       }
     });
     const host = this.options.host || "localhost";
-    const port = await listen(server, this.options.port, host, this.logger);
+    let port;
+    try {
+      port = await listen(server, this.options.port, host, this.logger);
+    } catch (error) {
+      await this.watcher?.close();
+      this.watcher = null;
+      throw error;
+    }
     this.server = server;
     this.lanAccess = LOCAL_HOST_OF_ANY_ADDRESS.has(host);
     this.address = `http://${LOCAL_HOST_OF_ANY_ADDRESS.get(host) ?? host}:${port}`;
-    if (this.options.watch !== false) this.startWatching();
     this.ticketSource?.().then(requireUsableTicket).catch((error) => this.logger.warn(`[wxa-runner] \u5F00\u53D1\u8005\u5DE5\u5177\u7684\u767B\u5F55\u6001\u6682\u4E0D\u53EF\u7528\uFF08--devtools-login\uFF09\uFF1A${error.message}`));
     return this.address;
   }
@@ -2026,6 +2127,8 @@ ${error.message}`);
     await this.watcher?.close();
     this.sockets?.clients.forEach((client) => client.terminate());
     this.sockets?.close();
+    this.socketProxy?.clients.forEach((client) => client.terminate());
+    this.socketProxy?.close();
     const server = this.server;
     this.server = null;
     if (server) {
@@ -2056,6 +2159,7 @@ ${error.message}`);
         baseLibVersion: this.baseLib.version,
         device: this.device,
         devtoolsLogin: this.devtoolsLogin,
+        socketProxy: true,
         forwardConsole: this.options.forwardConsole ?? false,
         webViewWindow: this.options.webViewWindow ?? false
       };
@@ -2252,36 +2356,37 @@ ${error.message}`);
   get hotEnabled() {
     return this.options.watch !== false;
   }
+  /** 返回初次扫描完成的时刻，此前已存在的文件不会作为改动报告 */
   startWatching() {
-    let lastBuildFailed = false;
     const watched = [this.project.root];
     const outsideRoot = (file) => import_path6.default.relative(this.project.root, file).startsWith("..");
     if (this.setupFile && outsideRoot(this.setupFile)) watched.push(this.setupFile);
     const projectConfig = import_path6.default.join(this.project.projectPath, "project.config.json");
     if (outsideRoot(projectConfig) && import_fs6.default.existsSync(projectConfig)) watched.push(projectConfig);
     this.watcher = watchProject(this.project.root, watched, async ({ files, structural }) => {
-      const reloadOnly = structural || lastBuildFailed;
+      const reloadOnly = structural || this.lastBuildFailed;
       this.builder.invalidate(files);
       const label = files.length > 3 ? `${files.slice(0, 3).join(", ")} \u7B49 ${files.length} \u4E2A\u6587\u4EF6` : files.join(", ");
       try {
         const build2 = await this.builder.build();
-        lastBuildFailed = false;
+        this.lastBuildFailed = false;
         const plan = reloadOnly ? null : planHotUpdate(files, build2);
         this.logger.log(`[wxa-runner] ${label} \u5DF2\u66F4\u65B0\uFF0C\u91CD\u65B0\u7F16\u8BD1 ${build2.durationMs}ms${plan ? "\uFF0C\u70ED\u66F4\u65B0" : ""}`);
         this.broadcast(plan ? { type: "hot", version: build2.version, ...plan } : { type: "reload" });
       } catch (error) {
-        lastBuildFailed = true;
+        this.lastBuildFailed = true;
         const message = error.message;
         this.logger.error(`[wxa-runner] \u7F16\u8BD1\u5931\u8D25\uFF1A
 ${message}`);
         this.broadcast({ type: "error", message });
       }
     });
+    return this.watcher.ready;
   }
   broadcast(message) {
     const data = JSON.stringify(message);
     this.sockets?.clients.forEach((client) => {
-      if (client.readyState === import_ws2.WebSocket.OPEN) client.send(data);
+      if (client.readyState === import_ws3.WebSocket.OPEN) client.send(data);
     });
   }
 };