@open-wxa/wxa-runner-core 0.10.0 → 0.11.0

package/dist/runtime/host.js

@@ -8,11 +8,15 @@
   var MINI_PROGRAM_ERROR = /^(\(in promise\) )?MiniProgramError\n/;
   var MODULE_URL = /\bhttps?:\/\/[^/\s]+\/__wxa__\/module\/([^?\s)]+?)(?:\?[^:\s)]*)?:(\d+):(\d+)/;
   var ConsoleForwarder = class {
-    /** @param pageOf 出错的页面路径，不知道时返回 undefined */
-    constructor(mode, send, pageOf) {
+    /**
+     * @param pageOf 出错的页面路径，不知道时返回 undefined
+     * @param hintsOf 附在报错后面的提示，帮开发者认出 wxa-runner 和真机不同造成的错误
+     */
+    constructor(mode, send, pageOf, hintsOf = () => []) {
       this.mode = mode;
       this.send = send;
       this.pageOf = pageOf;
+      this.hintsOf = hintsOf;
       this.recentErrors = /* @__PURE__ */ new Map();
     }
     /** 运行时错误：全局 error、未处理的 Promise 拒绝、基础库捕获的业务代码错误 */
@@ -20,8 +24,10 @@
       const frames = businessFrames(stack);
       if (!this.mode || this.isRepeated(`${kind}:${webviewId}:${message}
 ${frames}`)) return;
+      const hints = this.hintsOf(kind).map((hint) => `
+  \u63D0\u793A\uFF1A${hint}`).join("");
       this.post("error", `${this.origin(kind, webviewId)}\u62A5\u9519\uFF1A${message}${frames ? `
-${frames}` : ""}`);
+${frames}` : ""}${hints}`);
     }
     /** 运行时自己的提醒，如调用了未实现的 wx API */
     warn(text) {
@@ -1012,9 +1018,9 @@ ${frames}` : "");
       (this.replies.get(query.id) ?? Promise.resolve(null)).then((reply) => port.postMessage(reply));
     }
   };
-  function installMockMirror() {
-    if (navigator.webdriver || !navigator.serviceWorker) return null;
-    navigator.serviceWorker.register(SERVICE_WORKER_URL, { scope: "/" }).catch((error) => console.warn("[wxa-runner] Service Worker \u6CE8\u518C\u5931\u8D25\uFF0C\u88AB\u62E6\u622A\u7684\u8BF7\u6C42\u4E0D\u4F1A\u663E\u793A\u5728 Network \u9762\u677F\u91CC", error));
+  function installMockMirror(externalServiceWorker = false) {
+    if (!externalServiceWorker && navigator.webdriver || !navigator.serviceWorker) return null;
+    if (!externalServiceWorker) navigator.serviceWorker.register(SERVICE_WORKER_URL, { scope: "/" }).catch((error) => console.warn("[wxa-runner] Service Worker \u6CE8\u518C\u5931\u8D25\uFF0C\u88AB\u62E6\u622A\u7684\u8BF7\u6C42\u4E0D\u4F1A\u663E\u793A\u5728 Network \u9762\u677F\u91CC", error));
     return new MockMirror(navigator.serviceWorker);
   }
 
@@ -2547,8 +2553,6 @@ html, body { margin: 0; height: 100%; background: radial-gradient(120% 80% at 50
       this.api = new ApiRegistry((context) => this.reportUnimplemented(context));
       /** setup 和测试 API 声明的请求拦截 */
       this.routes = new RequestRoutes();
-      /** 把被拦截的请求显示在 Network 面板里 */
-      this.mockMirror = installMockMirror();
       this.mapOperations = new MapOperations((webviewId, event, data) => this.publishToPages(event, data, [webviewId]));
       this.service = null;
       /** 新版基础库的业务子上下文；旧版基础库业务代码直接在逻辑层 iframe 里 */
@@ -2564,11 +2568,13 @@ html, body { margin: 0; height: 100%; background: radial-gradient(120% 80% at 50
       this.routeListeners = [];
       /** 渲染层报来的 2d、webgl 画布，按编号记下所在页面和最近的位置，供 placeCanvas 认出逻辑层的画布元素 */
       this.canvases = /* @__PURE__ */ new Map();
+      this.mockMirror = installMockMirror(info.externalServiceWorker);
       this.device = info.device;
       this.forwarder = new ConsoleForwarder(
         info.forwardConsole ?? false,
         sendReport,
-        (kind, webviewId) => kind === "service" ? this.currentPage()?.path : this.pages.get(webviewId)?.path
+        (kind, webviewId) => kind === "service" ? this.currentPage()?.path : this.pages.get(webviewId)?.path,
+        (kind) => this.launchHints(kind)
       );
       this.shell = new PhoneShell(root, info.device);
       this.tabPaths = new Set((info.wxConfig.tabBar?.list || []).map((item) => stripHtml(item.pagePath)));
@@ -2719,6 +2725,13 @@ html, body { margin: 0; height: 100%; background: radial-gradient(120% 80% at 50
       this.errors.push({ kind: "service", webviewId: 0, api, message });
       this.forwarder.warn(message);
     }
+    /**
+     * 逻辑层在首页创建前出错时的提示：onLaunch、启动阶段的接口回调里读 getCurrentPages()[0] 是常见原因，
+     * 而报错本身只说读不到某个属性。被拦截的请求立即返回，比真机更容易在首页创建前执行回调
+     */
+    launchHints(kind) {
+      return kind === "service" && !this.currentPage() ? ["\u51FA\u9519\u65F6\u9996\u9875\u8FD8\u6CA1\u521B\u5EFA\uFF0CgetCurrentPages() \u8FD4\u56DE\u7684\u662F\u7A7A\u6570\u7EC4"] : [];
+    }
     // ---------------------------------------------------------------------------
     // 路由
     // ---------------------------------------------------------------------------
@@ -3404,7 +3417,7 @@ ${script}
     const root = document.getElementById("wxa-root");
     const info = await (await fetch("/__wxa__/app-info.json")).json();
     const restore = new PageStackRestore(info.appid);
-    const sendReport = connectDevServer(restore);
+    const sendReport = info.liveReload === false ? () => void 0 : connectDevServer(restore);
     if (info.buildError) {
       new PhoneShell(root, info.device).showError(`\u7F16\u8BD1\u5931\u8D25