@open-wxa/wxa-runner-core 0.12.4 → 0.13.0

package/dist/index.mjs

@@ -118,12 +118,12 @@ var FileStore = class {
         for (const [key, value] of entries) this.nodes.set(target + key.slice(source.length), value);
         return {};
       },
-      access: ({ path: path7 }) => {
-        this.existing(path7);
+      access: ({ path: path8 }) => {
+        this.existing(path8);
         return {};
       },
-      stat: ({ path: path7 }) => {
-        const node = this.existing(path7);
+      stat: ({ path: path8 }) => {
+        const node = this.existing(path8);
         const stats = {
           mode: node.dir ? 16877 : 33188,
           size: node.data.length,
@@ -476,8 +476,8 @@ import fs2 from "fs";
 import os2 from "os";
 import path2 from "path";
 var WxmlMirror = class {
-  constructor(transform) {
-    this.transform = transform;
+  constructor(transform2) {
+    this.transform = transform2;
     this.dir = null;
     /** 已写入的文件：源内容（判断要不要重新转换）与写入的内容 */
     this.files = /* @__PURE__ */ new Map();
@@ -1309,9 +1309,9 @@ var DROPPED_RESPONSE_HEADERS = /* @__PURE__ */ new Set(["content-encoding", "con
 var REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 async function proxyFetch(request, options = {}) {
   const url = new URL(request.url);
-  const path7 = url.pathname + url.search;
-  const target = fromServerPath(PROXY_PREFIX, path7);
-  if (!target) return proxyError(400, `invalid url "${path7}"`);
+  const path8 = url.pathname + url.search;
+  const target = fromServerPath(PROXY_PREFIX, path8);
+  if (!target) return proxyError(400, `invalid url "${path8}"`);
   try {
     let current = new URL(target);
     if (options.isAllowed && !options.isAllowed(current)) return forbiddenHost(current, 0);
@@ -1519,11 +1519,12 @@ import { findDeveloperTicket, findElectronDevtoolsCli, TICKET_ENV } from "@open-
 var AUTO_PORT = 9420;
 var CLI_TIMEOUT = 6e4;
 var AUTOMATOR_TIMEOUT = 5e3;
+var LOGIN_TIMEOUT = 2e4;
 var WINDOW_TIMEOUT = 1e4;
 var WINDOW_RETRY_INTERVAL = 500;
-function developerTicketSource(projectPath, logger) {
+function devtoolsSession(projectPath, logger) {
   const cli = findElectronDevtoolsCli();
-  if (!cli) return async () => findDeveloperTicket();
+  if (!cli) return { findTicket: async () => findDeveloperTicket(), loginCode: null };
   let automatorPort = null;
   const startOnce = () => {
     if (!automatorPort) {
@@ -1538,15 +1539,31 @@ function developerTicketSource(projectPath, logger) {
     }
     return automatorPort;
   };
-  return async () => {
-    if (process.env[TICKET_ENV]) return { newticket: process.env[TICKET_ENV] };
+  const withRestart = async (run) => {
     const port = startOnce();
     try {
-      return await requestTicketOnceWindowReady(await port, projectPath);
+      return await run(await port);
     } catch (error) {
       if (!(error instanceof AutomatorGone)) throw error;
       if (automatorPort === port) automatorPort = null;
-      return requestTicketOnceWindowReady(await startOnce(), projectPath);
+      return run(await startOnce());
+    }
+  };
+  let loginCodeNoticed = false;
+  return {
+    findTicket: async () => {
+      if (process.env[TICKET_ENV]) return { newticket: process.env[TICKET_ENV] };
+      return withRestart((port) => onceWindowReady(() => requestTicket(port), projectPath));
+    },
+    loginCode: async () => {
+      const code = await withRestart((port) => onceWindowReady(() => requestLoginCode(port), projectPath));
+      if (!loginCodeNoticed) {
+        loginCodeNoticed = true;
+        logger.log(
+          "[wxa-runner] --devtools-login\uFF1A\u5FAE\u4FE1\u540E\u53F0\u4E0D\u7ED9\u8FD9\u4E2A appid \u53D6\u767B\u5F55\u7968\u636E\uFF0Cwx.login \u7684 code \u6539\u7531\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u6A21\u62DF\u5668\u83B7\u53D6\uFF1B\u624B\u673A\u53F7\u3001\u670D\u52A1\u5E02\u573A\u548C\u63D2\u4EF6\u6CA1\u6709\u8FD9\u6761\u8DEF\uFF0C\u8C03\u7528\u65F6\u4F1A\u5931\u8D25"
+        );
+      }
+      return code;
     }
   };
 }
@@ -1554,11 +1571,13 @@ var AutomatorGone = class extends Error {
 };
 var WindowNotFound = class extends Error {
 };
-async function requestTicketOnceWindowReady(port, projectPath) {
+var TicketNotAllowed = class extends Error {
+};
+async function onceWindowReady(run, projectPath) {
   const deadline = Date.now() + WINDOW_TIMEOUT;
   for (; ; ) {
     try {
-      return await requestTicket(port);
+      return await run();
     } 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}`);
@@ -1602,7 +1621,7 @@ function cliErrorMessage(stdout) {
   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) {
+function sendCommand(port, method, params, timeout) {
   return new Promise((resolve, reject) => {
     const id = `wxa-runner-${randomUUID()}`;
     const socket = new WebSocket2(`ws://127.0.0.1:${port}`);
@@ -1612,15 +1631,13 @@ function requestTicket(port) {
       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
+      () => settle(() => reject(new AutomatorGone(`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u81EA\u52A8\u5316\u63A5\u53E3 ${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`))),
+      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("open", () => socket.send(JSON.stringify({ id, method, params })));
     socket.on("message", (data) => {
       let message;
       try {
@@ -1630,16 +1647,33 @@ function requestTicket(port) {
       }
       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 }));
+      else settle(() => resolve(message.result ?? {}));
     });
   });
 }
+async function requestTicket(port) {
+  const result = await sendCommand(port, "Tool.getTicket", {}, AUTOMATOR_TIMEOUT);
+  if (typeof result.ticket !== "string") throw new Error("\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u6CA1\u6709\u8FD4\u56DE\u767B\u5F55\u7968\u636E");
+  return { newticket: result.ticket, expiredAt: result.expiredTime };
+}
+async function requestLoginCode(port) {
+  const result = await sendCommand(port, "App.callWxMethod", { method: "login", args: [{}] }, LOGIN_TIMEOUT);
+  const { code, errMsg } = result.result ?? {};
+  if (typeof code !== "string" || !code) {
+    throw new Error(`\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u6A21\u62DF\u5668\u6CA1\u6709\u8FD4\u56DE code${errMsg ? `\uFF1A${errMsg}` : ""}`);
+  }
+  return code;
+}
 function explainAutomatorError(message) {
   if (message.includes("GUI project window is not found")) return new WindowNotFound(message);
-  if (message.includes("not allow to get")) {
+  if (message.includes("navigate to security settings")) {
     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("not allow to get")) {
+    return new TicketNotAllowed(
+      `\u5FAE\u4FE1\u5F00\u53D1\u8005\u5DE5\u5177\u4E0D\u7ED9\u8FD9\u4E2A appid \u53D6\u767B\u5F55\u7968\u636E\uFF1A\u662F\u5426\u5141\u8BB8\u7531\u5FAE\u4FE1\u540E\u53F0\u4E0B\u53D1\uFF0C\u8FD9\u4E2A appid \u6CA1\u6709\u5F00\uFF0C\u300C\u8BBE\u7F6E \u2192 \u5B89\u5168\u8BBE\u7F6E\u300D\u91CC\u4E5F\u5C31\u4E0D\u663E\u793A\u300C\u5141\u8BB8\u83B7\u53D6\u5DE5\u5177\u767B\u5F55\u7968\u636E\u300D\uFF0C\u672C\u673A\u6539\u4E0D\u4E86\u3002wx.login \u4F1A\u81EA\u52A8\u6539\u7531\u5F00\u53D1\u8005\u5DE5\u5177\u7684\u6A21\u62DF\u5668\u83B7\u53D6\uFF1B\u624B\u673A\u53F7\u548C\u670D\u52A1\u5E02\u573A\u8BF7\u53BB\u6389 --devtools-login\uFF0C\u7528 setup \u7684 mock \u9020\u6570\u636E\uFF0C\u6216\u53E6\u53D6\u4E00\u5F20\u7968\u636E\u7528\u73AF\u5883\u53D8\u91CF ${TICKET_ENV} \u4F20\u8FDB\u6765`
+    );
+  }
   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}`);
 }
@@ -1686,9 +1720,9 @@ var WechatDevClient = class {
    *
    * @throws 没有可用的登录态、超时、连不上、HTTP 状态不是 2xx 时，消息是给用户看的原因
    */
-  async post(path7, body, timeout = DEFAULT_TIMEOUT) {
+  async post(path8, body, timeout = DEFAULT_TIMEOUT) {
     const query = new URLSearchParams({ appid: this.appid, newticket: requireUsableTicket(await this.findTicket()), clientversion: CLIENT_VERSION });
-    const response = await fetch(`${BASE_URL}/${path7}?${query}`, {
+    const response = await fetch(`${BASE_URL}/${path8}?${query}`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify(body),
@@ -1700,8 +1734,8 @@ var WechatDevClient = class {
     return response;
   }
   /** 同 post，返回解析后的 JSON */
-  async postJson(path7, body) {
-    return (await this.post(path7, body)).json();
+  async postJson(path8, body) {
+    return (await this.post(path8, body)).json();
   }
 };
 
@@ -1800,14 +1834,19 @@ import { findDeveloperTicket as findDeveloperTicket2 } from "@open-wxa/wxa-runne
 var LOOPBACK_ADDRESSES = ["127.0.0.1", "::1", "::ffff:127.0.0.1"];
 var LOOPBACK_HOSTS = ["localhost", "127.0.0.1", "[::1]"];
 var FORWARDED_WX_DATA_APIS = ["webapi_servicemarket_jsapi_comm"];
-function devtoolsLoginRouter(appid, findTicket = findDeveloperTicket2) {
+function devtoolsLoginRouter(appid, findTicket = findDeveloperTicket2, loginCode) {
   const wechat = new WechatDevClient(appid, findTicket);
   const router = express.Router();
   router.use(onlyLoopback);
   router.post("/login", respond(async () => {
-    const body = requireOk(await wechat.postJson("wxa-dev-logic/jslogin", { scope: ["snsapi_base"] }), "\u5FAE\u4FE1\u767B\u5F55\u5931\u8D25");
-    if (!body.code) throw new Error("\u5FAE\u4FE1\u767B\u5F55\u5931\u8D25\uFF1A\u5FAE\u4FE1\u6CA1\u6709\u8FD4\u56DE code");
-    return { code: body.code };
+    try {
+      const body = requireOk(await wechat.postJson("wxa-dev-logic/jslogin", { scope: ["snsapi_base"] }), "\u5FAE\u4FE1\u767B\u5F55\u5931\u8D25");
+      if (!body.code) throw new Error("\u5FAE\u4FE1\u767B\u5F55\u5931\u8D25\uFF1A\u5FAE\u4FE1\u6CA1\u6709\u8FD4\u56DE code");
+      return { code: body.code };
+    } catch (error) {
+      if (!loginCode || !(error instanceof TicketNotAllowed)) throw error;
+      return { code: await loginCode() };
+    }
   }));
   router.post("/phone-number", respond(async () => {
     const body = await wechat.postJson("wxa-dev-logic/jsgetuserwxphone", { appid });
@@ -1980,7 +2019,7 @@ function applyExtensions(base, extensions, context) {
     if (setup.wxmlTransform) transforms.push(setup.wxmlTransform);
     if (setup.entry) entries.push({ name: extension.name, ...setup.entry });
   }
-  const wxmlTransform = transforms.length === 0 ? void 0 : (code, file) => transforms.reduce((result, transform) => transform(result, file), code);
+  const wxmlTransform = transforms.length === 0 ? void 0 : (code, file) => transforms.reduce((result, transform2) => transform2(result, file), code);
   return { webviewScripts, middlewares, wxmlTransform, entries };
 }
 
@@ -2016,11 +2055,9 @@ var DevServer = class {
     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 !== void 0 && options.devtoolsLogin === void 0) {
-      this.logger.warn("[wxa-runner] realLogin\uFF08--real-login\uFF09\u5DF2\u6539\u540D\u4E3A devtoolsLogin\uFF08--devtools-login\uFF09\uFF0C\u65E7\u540D\u4EE5\u540E\u4F1A\u79FB\u9664");
-    }
-    this.devtoolsLogin = (options.devtoolsLogin ?? options.realLogin) === true;
-    this.ticketSource = this.devtoolsLogin ? developerTicketSource(this.project.projectPath, this.logger) : null;
+    this.devtoolsLogin = options.devtoolsLogin === true;
+    this.devtools = this.devtoolsLogin ? devtoolsSession(this.project.projectPath, this.logger) : null;
+    this.ticketSource = this.devtools?.findTicket ?? null;
     this.plugins = new PluginStore(this.ticketSource && new WechatDevClient(this.project.appid, this.ticketSource), this.logger);
     this.device = { ...DEFAULT_DEVICE, ...options.device };
     this.builder = new AppBuilder(this.project, { wxmlTransform: extended.wxmlTransform });
@@ -2078,7 +2115,10 @@ ${error.message}`);
     this.server = server;
     this.lanAccess = LOCAL_HOST_OF_ANY_ADDRESS.has(host);
     this.address = `http://${LOCAL_HOST_OF_ANY_ADDRESS.get(host) ?? host}:${port}`;
-    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}`));
+    this.ticketSource?.().then(requireUsableTicket).catch((error) => {
+      if (error instanceof TicketNotAllowed && this.devtools?.loginCode) return;
+      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;
   }
   async close() {
@@ -2116,6 +2156,7 @@ ${error.message}`);
         appid: this.project.appid,
         baseLibVersion: this.baseLib.version,
         device: this.device,
+        pageTransition: this.options.pageTransition ?? false,
         devtoolsLogin: this.devtoolsLogin,
         socketProxy: true,
         forwardConsole: this.options.forwardConsole ?? false,
@@ -2257,7 +2298,7 @@ ${error.message}`);
         res.status(404).end();
       }
     });
-    if (this.ticketSource) app.use("/__wxa__/api", devtoolsLoginRouter(this.project.appid, this.ticketSource));
+    if (this.devtools) app.use("/__wxa__/api", devtoolsLoginRouter(this.project.appid, this.devtools.findTicket, this.devtools.loginCode));
     app.use("/__wxa__/webview", express2.static(root));
     app.use(express2.static(root));
     app.use((error, _req, res, _next) => {
@@ -2410,17 +2451,96 @@ function findRuntimeDir(explicit) {
   }
   return found;
 }
+
+// src/server/config.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import fs7 from "fs";
+import path7 from "path";
+import { pathToFileURL as pathToFileURL2 } from "url";
+import { transform } from "esbuild";
+var CONFIG_FILE_NAMES = ["wxa.config.ts", "wxa.config.mts", "wxa.config.js", "wxa.config.mjs", "wxa.config.cjs"];
+var CONFIG_KEYS = /* @__PURE__ */ new Set([
+  "project",
+  "port",
+  "host",
+  "open",
+  "baselib",
+  "watch",
+  "setup",
+  "devtoolsLogin",
+  "forwardConsole",
+  "extensions",
+  "pageTransition",
+  "webViewWindow"
+]);
+function findConfigFile(dir) {
+  for (const name of CONFIG_FILE_NAMES) {
+    const file = path7.join(dir, name);
+    if (fs7.existsSync(file)) return file;
+  }
+  return null;
+}
+async function loadConfigFile(file, warn) {
+  let exported;
+  try {
+    exported = await importConfig(file);
+  } catch (error) {
+    throw new Error(`\u914D\u7F6E\u6587\u4EF6 ${file} \u52A0\u8F7D\u5931\u8D25\uFF1A${error instanceof Error ? error.message : String(error)}`);
+  }
+  if (typeof exported !== "object" || exported === null || Array.isArray(exported)) {
+    throw new Error(`\u914D\u7F6E\u6587\u4EF6 ${file} \u8981\u9ED8\u8BA4\u5BFC\u51FA\u4E00\u4E2A\u5BF9\u8C61\uFF0C\u5982 export default { port: 3000 }`);
+  }
+  const config = exported;
+  const unknown = Object.keys(config).filter((key) => !CONFIG_KEYS.has(key));
+  if (unknown.length) warn(`\u914D\u7F6E\u6587\u4EF6 ${file} \u91CC\u6709\u4E0D\u8BA4\u8BC6\u7684\u914D\u7F6E\u9879\uFF1A${unknown.join("\u3001")}\uFF0C\u5DF2\u5FFD\u7565`);
+  const dir = path7.dirname(file);
+  const resolve = (value) => path7.resolve(dir, value);
+  return {
+    ...config,
+    project: config.project && resolve(config.project),
+    setup: typeof config.setup === "string" ? resolve(config.setup) : config.setup,
+    extensions: config.extensions?.map((extension) => typeof extension === "string" && extension.startsWith(".") ? resolve(extension) : extension)
+  };
+}
+async function importConfig(file) {
+  if (!/\.m?ts$/.test(file)) return defaultExport(await import(pathToFileURL2(file).href));
+  const { code } = await transform(fs7.readFileSync(file, "utf8"), {
+    loader: "ts",
+    format: "esm",
+    platform: "node",
+    sourcefile: file,
+    define: {
+      __dirname: JSON.stringify(path7.dirname(file)),
+      __filename: JSON.stringify(file),
+      "import.meta.url": JSON.stringify(pathToFileURL2(file).href)
+    }
+  });
+  const compiled = `${file}.${randomUUID3()}.mjs`;
+  fs7.writeFileSync(compiled, code);
+  try {
+    return defaultExport(await import(pathToFileURL2(compiled).href));
+  } finally {
+    fs7.rmSync(compiled, { force: true });
+  }
+}
+function defaultExport(module) {
+  const exported = module.default;
+  return exported?.__esModule ? exported.default : exported;
+}
 export {
   AppBuilder,
+  CONFIG_FILE_NAMES,
   DEFAULT_DEVICE,
   DevServer,
   LOCAL_HOST_OF_ANY_ADDRESS,
   MiniProgram,
   bundleSetup,
   createWxConfig,
+  findConfigFile,
   findRuntimeDir,
   findSetupFile,
   handleProxy,
-  listen
+  listen,
+  loadConfigFile
 };
 //# sourceMappingURL=index.mjs.map