@open-wxa/wxa-runner-core 0.2.3 → 0.2.4

package/dist/{chunk-22T3D5KS.mjs → chunk-NGXYLLYS.mjs}

@@ -1,4 +1,4 @@
-// ../../node_modules/.pnpm/tsup@8.5.1_postcss@8.5.30_typescript@5.9.3/node_modules/tsup/assets/esm_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.30_typescript@5.9.3/node_modules/tsup/assets/esm_shims.js
 import path from "path";
 import { fileURLToPath } from "url";
 var getFilename = () => fileURLToPath(import.meta.url);
@@ -8,4 +8,4 @@ var __dirname = /* @__PURE__ */ getDirname();
 export {
   __dirname
 };
-//# sourceMappingURL=chunk-22T3D5KS.mjs.map
+//# sourceMappingURL=chunk-NGXYLLYS.mjs.map

package/dist/chunk-NGXYLLYS.mjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../node_modules/.pnpm/tsup@8.5.1_jiti@2.6.1_postcss@8.5.30_typescript@5.9.3/node_modules/tsup/assets/esm_shims.js"],"sourcesContent":["// Shim globals in esm bundle\nimport path from 'node:path'\nimport { fileURLToPath } from 'node:url'\n\nconst getFilename = () => fileURLToPath(import.meta.url)\nconst getDirname = () => path.dirname(getFilename())\n\nexport const __dirname = /* @__PURE__ */ getDirname()\nexport const __filename = /* @__PURE__ */ getFilename()\n"],"mappings":";AACA,OAAO,UAAU;AACjB,SAAS,qBAAqB;AAE9B,IAAM,cAAc,MAAM,cAAc,YAAY,GAAG;AACvD,IAAM,aAAa,MAAM,KAAK,QAAQ,YAAY,CAAC;AAE5C,IAAM,YAA4B,2BAAW;","names":[]}

package/dist/index.d.mts

@@ -204,6 +204,8 @@ declare class DevServer {
     private address;
     /** 运行时生成的临时文件（canvas 导出、拍照等），随服务器进程存在 */
     private readonly tempFiles;
+    /** 开启 --real-login 时才有 */
+    private readonly ticketSource;
     constructor(options: DevServerOptions);
     get url(): string;
     start(): Promise<string>;

package/dist/index.d.ts

@@ -204,6 +204,8 @@ declare class DevServer {
     private address;
     /** 运行时生成的临时文件（canvas 导出、拍照等），随服务器进程存在 */
     private readonly tempFiles;
+    /** 开启 --real-login 时才有 */
+    private readonly ticketSource;
     constructor(options: DevServerOptions);
     get url(): string;
     start(): Promise<string>;

package/dist/index.js

@@ -39,13 +39,13 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/server/DevServer.ts
-var import_crypto2 = require("crypto");
+var import_crypto3 = require("crypto");
 var import_fs4 = __toESM(require("fs"));
 var import_http = __toESM(require("http"));
 var import_path4 = __toESM(require("path"));
 var import_express2 = __toESM(require("express"));
-var import_ws = require("ws");
-var import_wxa_runner_extractor2 = require("@open-wxa/wxa-runner-extractor");
+var import_ws2 = require("ws");
+var import_wxa_runner_extractor3 = require("@open-wxa/wxa-runner-extractor");
 
 // src/project/AppBuilder.ts
 var import_wxa_runner_compiler = require("@open-wxa/wxa-runner-compiler");
@@ -689,28 +689,164 @@ function planHotUpdate(files, units) {
   return plan;
 }
 
+// src/server/developerTicket.ts
+var import_child_process = require("child_process");
+var import_crypto = require("crypto");
+var import_promises = require("timers/promises");
+var import_ws = require("ws");
+var import_wxa_runner_extractor = require("@open-wxa/wxa-runner-extractor");
+var AUTO_PORT = 9420;
+var CLI_TIMEOUT = 6e4;
+var AUTOMATOR_TIMEOUT = 5e3;
+var WINDOW_TIMEOUT = 1e4;
+var WINDOW_RETRY_INTERVAL = 500;
+function developerTicketSource(projectPath, logger) {
+  const cli = (0, import_wxa_runner_extractor.findElectronDevtoolsCli)();
+  if (!cli) return async () => (0, import_wxa_runner_extractor.findDeveloperTicket)();
+  let automatorPort = null;
+  const startOnce = () => {
+    if (!automatorPort) {
+      const starting = startAutomation(cli, projectPath).then((port) => {
+        logger.log(`[wxa-runner] \u771F\u5B9E\u767B\u5F55\uFF1A\u5DF2\u5728\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u91CC\u4E3A\u9879\u76EE\u5F00\u542F\u81EA\u52A8\u5316\u63A5\u53E3\uFF08\u7AEF\u53E3 ${port}\uFF09\uFF0Cticket \u4ECE\u5F00\u53D1\u8005\u5DE5\u5177\u5B9E\u65F6\u83B7\u53D6`);
+        return port;
+      });
+      starting.catch(() => {
+        if (automatorPort === starting) automatorPort = null;
+      });
+      automatorPort = starting;
+    }
+    return automatorPort;
+  };
+  return async () => {
+    if (process.env[import_wxa_runner_extractor.TICKET_ENV]) return { newticket: process.env[import_wxa_runner_extractor.TICKET_ENV] };
+    const port = startOnce();
+    try {
+      return await requestTicketOnceWindowReady(await port, projectPath);
+    } catch (error) {
+      if (!(error instanceof AutomatorGone)) throw error;
+      if (automatorPort === port) automatorPort = null;
+      return requestTicketOnceWindowReady(await startOnce(), projectPath);
+    }
+  };
+}
+var AutomatorGone = class extends Error {
+};
+var WindowNotFound = class extends Error {
+};
+async function requestTicketOnceWindowReady(port, projectPath) {
+  const deadline = Date.now() + WINDOW_TIMEOUT;
+  for (; ; ) {
+    try {
+      return await requestTicket(port);
+    } catch (error) {
+      if (!(error instanceof WindowNotFound)) throw error;
+      if (Date.now() >= deadline) throw new Error(`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u91CC\u627E\u4E0D\u5230\u9879\u76EE\u7A97\u53E3\uFF0C\u8BF7\u5728\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u91CC\u6253\u5F00\u9879\u76EE ${projectPath}`);
+      await (0, import_promises.setTimeout)(WINDOW_RETRY_INTERVAL);
+    }
+  }
+}
+async function startAutomation(cli, projectPath) {
+  const stdout = await runCli(cli, ["agent", "start", "--project", projectPath, "--auto-port", String(AUTO_PORT), "--lang", "zh"]);
+  let autoPort = NaN;
+  try {
+    autoPort = Number(JSON.parse(stdout.match(/^\{$[\s\S]*?^\}$/m)?.[0] ?? "").autoPort);
+  } catch {
+  }
+  if (Number.isInteger(autoPort) && autoPort > 0) return autoPort;
+  if (stdout.includes("\u670D\u52A1\u7AEF\u53E3\u5DF2\u5173\u95ED")) {
+    throw new Error("\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u670D\u52A1\u7AEF\u53E3\u5DF2\u5173\u95ED\uFF0C\u8BF7\u5728\u5F00\u53D1\u8005\u5DE5\u5177\u300C\u8BBE\u7F6E \u2192 \u5B89\u5168\u8BBE\u7F6E\u300D\u91CC\u5F00\u542F\u670D\u52A1\u7AEF\u53E3");
+  }
+  throw new Error(`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u6CA1\u80FD\u4E3A\u9879\u76EE\u5F00\u542F\u81EA\u52A8\u5316\u63A5\u53E3\uFF1A${cliErrorMessage(stdout)}`);
+}
+function runCli(cli, args) {
+  const bat = cli.endsWith(".bat");
+  const [file, fileArgs] = bat ? [`"${cli}"`, args.map((arg) => `"${arg}"`)] : [cli, args];
+  return new Promise((resolve, reject) => {
+    const child = (0, import_child_process.execFile)(file, fileArgs, { shell: bat, timeout: CLI_TIMEOUT, windowsHide: true }, (error, stdout) => {
+      if (error?.killed) {
+        reject(new Error(`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u547D\u4EE4\u884C ${CLI_TIMEOUT / 1e3}s \u5185\u6CA1\u6709\u5B8C\u6210\uFF0C\u8BF7\u770B\u5F00\u53D1\u8005\u5DE5\u5177\u91CC\u662F\u5426\u6709\u7B49\u5F85\u786E\u8BA4\u7684\u5F39\u7A97\uFF08\u5982\u4FE1\u4EFB\u9879\u76EE\u3001\u626B\u7801\u767B\u5F55\uFF09`));
+      } else if (error && !stdout) {
+        reject(new Error(`\u8FD0\u884C\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u547D\u4EE4\u884C\u5931\u8D25\uFF1A${error.message}`));
+      } else {
+        resolve(stdout);
+      }
+    });
+    child.stdin?.end();
+  });
+}
+function cliErrorMessage(stdout) {
+  const output = stdout.replace(/\x1b\[[0-9;]*m/g, "");
+  const start = output.indexOf("[error]");
+  const error = (start < 0 ? output : output.slice(start + "[error]".length)).trim();
+  const message = error.match(/message: (['"`])((?:\\.|(?!\1)[^\\])*?)(?:\\n|\1)/)?.[2];
+  return message ?? (error.replace(/\s+/g, " ").slice(0, 200) || "\u547D\u4EE4\u884C\u6CA1\u6709\u8F93\u51FA");
+}
+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 settle = (finish) => {
+      clearTimeout(timer);
+      socket.removeAllListeners().on("error", () => void 0).terminate();
+      finish();
+    };
+    const timer = setTimeout(
+      () => settle(
+        () => reject(new AutomatorGone(`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u81EA\u52A8\u5316\u63A5\u53E3 ${AUTOMATOR_TIMEOUT / 1e3}s \u5185\u6CA1\u6709\u54CD\u5E94\uFF0C\u8BF7\u786E\u8BA4\u5F00\u53D1\u8005\u5DE5\u5177\u91CC\u6253\u5F00\u4E86\u9879\u76EE\u7A97\u53E3`))
+      ),
+      AUTOMATOR_TIMEOUT
+    );
+    const gone = () => settle(() => reject(new AutomatorGone(`\u8FDE\u4E0D\u4E0A\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u81EA\u52A8\u5316\u63A5\u53E3\uFF08\u7AEF\u53E3 ${port}\uFF09\uFF0C\u8BF7\u786E\u8BA4\u5F00\u53D1\u8005\u5DE5\u5177\u5728\u8FD0\u884C`)));
+    socket.on("error", gone);
+    socket.on("close", gone);
+    socket.on("open", () => socket.send(JSON.stringify({ id, method: "Tool.getTicket", params: {} })));
+    socket.on("message", (data) => {
+      let message;
+      try {
+        message = JSON.parse(String(data));
+      } catch {
+        return;
+      }
+      if (message?.id !== id) return;
+      if (message.error) settle(() => reject(explainAutomatorError(String(message.error.message))));
+      else if (typeof message.result?.ticket !== "string") settle(() => reject(new Error("\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u6CA1\u6709\u8FD4\u56DE\u767B\u5F55\u7968\u636E")));
+      else settle(() => resolve({ newticket: message.result.ticket, expiredAt: message.result.expiredTime }));
+    });
+  });
+}
+function explainAutomatorError(message) {
+  if (message.includes("GUI project window is not found")) return new WindowNotFound(message);
+  if (message.includes("not allow to get")) {
+    return new Error("\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u4E0D\u5141\u8BB8\u83B7\u53D6\u767B\u5F55\u7968\u636E\uFF0C\u8BF7\u5728\u5F00\u53D1\u8005\u5DE5\u5177\u300C\u8BBE\u7F6E \u2192 \u5B89\u5168\u8BBE\u7F6E\u300D\u91CC\u6253\u5F00\u300C\u5141\u8BB8\u83B7\u53D6\u5DE5\u5177\u767B\u5F55\u7968\u636E\u300D");
+  }
+  if (message.includes("need to login")) return new Error("\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u672A\u767B\u5F55\uFF0C\u8BF7\u5148\u5728\u5F00\u53D1\u8005\u5DE5\u5177\u91CC\u767B\u5F55");
+  return new Error(`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u8FD4\u56DE\u9519\u8BEF\uFF1A${message}`);
+}
+
 // src/server/realLogin.ts
 var import_express = __toESM(require("express"));
-var import_wxa_runner_extractor = require("@open-wxa/wxa-runner-extractor");
+var import_wxa_runner_extractor2 = require("@open-wxa/wxa-runner-extractor");
 var DEV_LOGIC = "https://servicewechat.com/wxa-dev-logic";
 var CLIENT_VERSION = "1021810240";
 var UPSTREAM_TIMEOUT = 1e4;
 var LOOPBACK_ADDRESSES = ["127.0.0.1", "::1", "::ffff:127.0.0.1"];
 var LOOPBACK_HOSTS = ["localhost", "127.0.0.1", "[::1]"];
 var ERROR_HINTS = {
+  // 40001：开发者工具刷新过 ticket，旧的随即作废
+  40001: "\uFF08\u767B\u5F55\u6001\u5DF2\u5931\u6548\uFF0C\u8BF7\u5728\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u91CC\u91CD\u65B0\u767B\u5F55\uFF09",
   40029: "\uFF08\u767B\u5F55\u6001\u5DF2\u5931\u6548\uFF0C\u8BF7\u5728\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u91CC\u91CD\u65B0\u767B\u5F55\uFF09",
   85023: "\uFF08\u5F53\u524D\u5FAE\u4FE1\u8D26\u53F7\u4E0D\u662F\u8BE5\u5C0F\u7A0B\u5E8F\u7684\u5F00\u53D1\u8005\uFF09"
 };
 function requireUsableTicket(ticket) {
-  if (!ticket) throw new Error(`\u672A\u627E\u5230\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u767B\u5F55\u6001\uFF0C\u8BF7\u767B\u5F55\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u6216\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF ${import_wxa_runner_extractor.TICKET_ENV}`);
+  if (!ticket) throw new Error(`\u672A\u627E\u5230\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u767B\u5F55\u6001\uFF0C\u8BF7\u767B\u5F55\u5F00\u53D1\u8005\u5DE5\u5177\uFF0C\u6216\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF ${import_wxa_runner_extractor2.TICKET_ENV}`);
   if (ticket.expiredAt !== void 0 && ticket.expiredAt <= Date.now()) {
     throw new Error("\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u767B\u5F55\u6001\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u6253\u5F00\u5F00\u53D1\u8005\u5DE5\u5177\u5237\u65B0\u767B\u5F55\u6001");
   }
   return ticket.newticket;
 }
-function realLoginRouter(appid, findTicket = import_wxa_runner_extractor.findDeveloperTicket) {
+function realLoginRouter(appid, findTicket = import_wxa_runner_extractor2.findDeveloperTicket) {
   const callDevLogic = async (endpoint, body) => {
-    const query = new URLSearchParams({ appid, newticket: requireUsableTicket(findTicket()), clientversion: CLIENT_VERSION });
+    const query = new URLSearchParams({ appid, newticket: requireUsableTicket(await findTicket()), clientversion: CLIENT_VERSION });
     const response = await fetch(`${DEV_LOGIC}/${endpoint}?${query}`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -810,7 +946,7 @@ function builtinSetupModule() {
 }
 
 // src/server/watcher.ts
-var import_crypto = require("crypto");
+var import_crypto2 = require("crypto");
 var import_fs3 = __toESM(require("fs"));
 var import_path3 = __toESM(require("path"));
 var import_chokidar = __toESM(require("chokidar"));
@@ -854,7 +990,7 @@ function updateFingerprint(fingerprints, file, event) {
   if (event !== "add" && event !== "change" || !FINGERPRINTED.test(file)) return false;
   let next;
   try {
-    next = (0, import_crypto.createHash)("sha1").update(import_fs3.default.readFileSync(file)).digest("hex");
+    next = (0, import_crypto2.createHash)("sha1").update(import_fs3.default.readFileSync(file)).digest("hex");
   } catch {
     return false;
   }
@@ -885,17 +1021,11 @@ var DevServer = class {
     this.tempFiles = /* @__PURE__ */ new Map();
     this.logger = options.logger || console;
     this.project = new MiniProgram(import_path4.default.resolve(options.projectPath));
-    this.baseLib = (0, import_wxa_runner_extractor2.resolveBaseLib)({ version: options.baseLibVersion, cacheDir: options.baseLibCacheDir });
+    this.baseLib = (0, import_wxa_runner_extractor3.resolveBaseLib)({ version: options.baseLibVersion, cacheDir: options.baseLibCacheDir });
     if (!this.baseLib.compatible) {
       this.logger.warn(`[wxa-runner] \u57FA\u7840\u5E93 ${this.baseLib.version} \u9AD8\u4E8E\u5DF2\u9A8C\u8BC1\u7684\u7248\u672C\u8303\u56F4\uFF0C\u53EF\u80FD\u65E0\u6CD5\u6B63\u5E38\u8FD0\u884C`);
     }
-    if (options.realLogin) {
-      try {
-        requireUsableTicket((0, import_wxa_runner_extractor2.findDeveloperTicket)());
-      } catch (error) {
-        this.logger.warn(`[wxa-runner] \u771F\u5B9E\u767B\u5F55\u6682\u4E0D\u53EF\u7528\uFF1A${error.message}`);
-      }
-    }
+    this.ticketSource = options.realLogin ? developerTicketSource(this.project.projectPath, this.logger) : null;
     this.device = { ...DEFAULT_DEVICE, ...options.device };
     this.builder = new AppBuilder(this.project);
     this.setupFile = resolveSetupFile(options.setup, this.project.projectPath);
@@ -914,7 +1044,7 @@ var DevServer = class {
 ${error.message}`);
     }
     const server = import_http.default.createServer(this.app);
-    this.sockets = new import_ws.WebSocketServer({ noServer: true });
+    this.sockets = new import_ws2.WebSocketServer({ noServer: true });
     server.on("upgrade", (req, socket, head) => {
       if (req.url?.startsWith("/__wxa__/ws")) {
         this.sockets.handleUpgrade(req, socket, head, (ws) => this.sockets.emit("connection", ws, req));
@@ -931,6 +1061,7 @@ ${error.message}`);
     const { port } = server.address();
     this.address = `http://${host}:${port}`;
     if (this.options.watch !== false) this.startWatching();
+    this.ticketSource?.().then(requireUsableTicket).catch((error) => this.logger.warn(`[wxa-runner] \u771F\u5B9E\u767B\u5F55\u6682\u4E0D\u53EF\u7528\uFF1A${error.message}`));
     return this.address;
   }
   async close() {
@@ -982,7 +1113,7 @@ ${error.message}`);
     app.get("/__wxa__/appservice.html", this.withBuild((build2, req, res) => {
       const launchPath = String(req.query.path || "").replace(/^\//, "");
       const launch = build2.pages.includes(launchPath) ? { path: launchPath, query: Object.fromEntries(new URLSearchParams(String(req.query.query || ""))) } : { path: build2.pages[0], query: {} };
-      res.type("html").send(appserviceHtml(build2, launch, { hot: this.hotEnabled, isolated: (0, import_wxa_runner_extractor2.usesIsolatedContext)(this.baseLib.version) }));
+      res.type("html").send(appserviceHtml(build2, launch, { hot: this.hotEnabled, isolated: (0, import_wxa_runner_extractor3.usesIsolatedContext)(this.baseLib.version) }));
     }));
     app.get("/__wxa__/subcontext.html", (req, res) => {
       const id = Number(req.query.id);
@@ -1041,18 +1172,18 @@ ${error.message}`);
         res.status(400).type("text").send(`\u975E\u6CD5\u7684\u6587\u4EF6\u7C7B\u578B ${type}`);
         return;
       }
-      const name = `${(0, import_crypto2.randomUUID)()}.${type}`;
+      const name = `${(0, import_crypto3.randomUUID)()}.${type}`;
       this.tempFiles.set(name, Buffer.isBuffer(req.body) ? req.body : Buffer.alloc(0));
       res.json({ url: `${req.protocol}://${req.get("host")}/__wxa__/tmp/${name}` });
     });
     app.get("/__wxa__/region/:kind", (req, res) => {
       const kind = req.params.kind;
-      const file = kind === "districts" || kind === "streets" ? (0, import_wxa_runner_extractor2.findRegionDataFile)(kind) : null;
-      if (!file) {
+      const data = kind === "districts" || kind === "streets" ? (0, import_wxa_runner_extractor3.readRegionData)(kind) : null;
+      if (!data) {
         res.status(404).end();
         return;
       }
-      res.type("text/plain; charset=utf-8").sendFile(file, { maxAge: "1d" });
+      res.type("text/plain; charset=utf-8").set("Cache-Control", "public, max-age=86400").send(data);
     });
     app.get("/__wxa__/tmp/:name", (req, res) => {
       const data = this.tempFiles.get(req.params.name);
@@ -1065,7 +1196,7 @@ ${error.message}`);
     app.delete("/__wxa__/tmp/:name", (req, res) => {
       res.status(this.tempFiles.delete(req.params.name) ? 204 : 404).end();
     });
-    if (this.options.realLogin) app.use("/__wxa__/api", realLoginRouter(this.project.appid));
+    if (this.ticketSource) app.use("/__wxa__/api", realLoginRouter(this.project.appid, this.ticketSource));
     app.use("/__wxa__/webview", import_express2.default.static(root));
     app.use(import_express2.default.static(root));
     app.use((error, _req, res, _next) => {
@@ -1144,7 +1275,7 @@ ${message}`);
   broadcast(message) {
     const data = JSON.stringify(message);
     this.sockets?.clients.forEach((client) => {
-      if (client.readyState === import_ws.WebSocket.OPEN) client.send(data);
+      if (client.readyState === import_ws2.WebSocket.OPEN) client.send(data);
     });
   }
 };