@open-wxa/wxa-runner-core 0.12.0 → 0.12.2

package/dist/runtime/host.js

@@ -348,6 +348,7 @@ ${frames}` : "");
       "rmdir",
       "getFileInfo",
       "copyFile",
+      "rename",
       "readFile"
     ]) {
       const handler = (args, { api }) => {
@@ -752,6 +753,7 @@ ${frames}` : "");
   function createNetworkApis(options) {
     const controllers = /* @__PURE__ */ new Map();
     const sockets = /* @__PURE__ */ new Map();
+    const pendingSockets = /* @__PURE__ */ new Set();
     const { emit } = options;
     const startTask = (args, run) => {
       const id = String(++taskSeq);
@@ -889,17 +891,42 @@ ${frames}` : "");
       const socketTaskId = String(++taskSeq);
       let socket;
       try {
-        socket = new WebSocket(args.url, args.protocols && args.protocols.length ? args.protocols : void 0);
+        if (options.socketProxy) {
+          const url = new URL("/__wxa__/socket", location.href);
+          url.protocol = location.protocol === "https:" ? "wss:" : "ws:";
+          socket = new WebSocket(url);
+          pendingSockets.add(socketTaskId);
+        } else socket = new WebSocket(args.url, args.protocols && args.protocols.length ? args.protocols : void 0);
       } catch (error) {
         return fail(api, reason(error));
       }
       socket.binaryType = "arraybuffer";
       sockets.set(socketTaskId, socket);
-      socket.onopen = () => emit("onSocketTaskStateChange", { socketTaskId, state: "open", header: {}, profile: {} });
-      socket.onmessage = (event) => emit("onSocketTaskStateChange", { socketTaskId, state: "message", data: event.data });
-      socket.onerror = () => emit("onSocketTaskStateChange", { socketTaskId, state: "error", errMsg: "connectSocket:fail" });
+      let failed = false;
+      const onError = () => {
+        failed = true;
+        emit("onSocketTaskStateChange", { socketTaskId, state: "error", errMsg: "connectSocket:fail" });
+      };
+      socket.onopen = () => {
+        if (options.socketProxy) socket.send(JSON.stringify({
+          url: args.url,
+          header: args.header,
+          protocols: args.protocols,
+          timeout: args.timeout || options.defaultSocketTimeout?.() || 6e4
+        }));
+        else emit("onSocketTaskStateChange", { socketTaskId, state: "open", header: {}, profile: {} });
+      };
+      socket.onmessage = (event) => {
+        if (pendingSockets.has(socketTaskId)) {
+          const result = JSON.parse(event.data);
+          pendingSockets.delete(socketTaskId);
+          emit("onSocketTaskStateChange", { socketTaskId, state: "open", header: result.header, profile: {} });
+        } else emit("onSocketTaskStateChange", { socketTaskId, state: "message", data: event.data });
+      };
+      socket.onerror = onError;
       socket.onclose = (event) => {
         sockets.delete(socketTaskId);
+        if (pendingSockets.delete(socketTaskId) && !failed) onError();
         emit("onSocketTaskStateChange", { socketTaskId, state: "close", code: event.code, reason: event.reason });
       };
       return ok(api, { socketTaskId });
@@ -908,7 +935,7 @@ ${frames}` : "");
       const socket = sockets.get(String(args.socketTaskId));
       if (!socket) return fail(api, "socket task not found");
       if (args.operationType === "send") {
-        if (socket.readyState !== WebSocket.OPEN) return fail(api, "socket is not open");
+        if (pendingSockets.has(String(args.socketTaskId)) || socket.readyState !== WebSocket.OPEN) return fail(api, "socket is not open");
         socket.send(args.data);
       } else if (args.operationType === "close") {
         socket.close(args.code || 1e3, args.reason);
@@ -1769,6 +1796,7 @@ ${frames}` : "");
   function iframeWebViews(doc) {
     return Array.from(doc?.querySelectorAll("iframe[data-wxa-src]") ?? []).map((frame) => ({ src: frame.dataset.wxaSrc, windowName: null }));
   }
+  var COMMIT_WAIT_MS = 5e3;
   var WebViewWindows = class {
     /** @param isShown 页面当前是否显示：隐藏的页面先记下地址，显示时再打开窗口 */
     constructor(device, isShown) {
@@ -1847,14 +1875,36 @@ ${frames}` : "");
     open(record) {
       if (!record.src) return;
       if (record.win && !record.win.closed) {
-        record.win.location.href = record.src;
+        this.navigate(record);
       } else {
         const features = `popup,width=${this.device.screenWidth},height=${this.device.screenHeight}`;
         record.win = window.open(record.src, record.name, features);
-        if (record.win) notify("open", record.name, record.src);
+        if (record.win) {
+          record.opening = { src: record.src, at: Date.now() };
+          notify("open", record.name, record.src);
+        }
       }
       this.render(record);
     }
+    /**
+     * 已打开的窗口跳到最新的 src。用已有的引用跳转，不靠窗口名：网页可能改了自己的 window.name，按名字找不到时会多开一个窗口。
+     *
+     * Chrome 里新窗口的初始页面还没提交时改它的地址，这次跳转偶尔会被丢掉，窗口停在原来的网页上（不经过 CDP 也一样）。
+     * 窗口刚打开就改 src 会碰上，所以等初始页面提交后再跳
+     */
+    navigate(record) {
+      const win = record.win;
+      if (!win || win.closed || !record.src || record.retry !== void 0) return;
+      if (record.opening && !committed(win, record.opening.src) && Date.now() - record.opening.at < COMMIT_WAIT_MS) {
+        record.retry = window.setTimeout(() => {
+          record.retry = void 0;
+          this.navigate(record);
+        }, 20);
+        return;
+      }
+      record.opening = void 0;
+      win.location.href = record.src;
+    }
     render(record) {
       const opened = record.win && !record.win.closed;
       const [title, detail] = !record.src ? ["web-view \u8FD8\u6CA1\u6709\u8BBE\u7F6E src", ""] : opened ? ["H5 \u5DF2\u5728\u65B0\u7A97\u53E3\u6253\u5F00", record.src] : record.win === null && this.isShown(record.webviewId) ? ["\u6D4F\u89C8\u5668\u62E6\u622A\u4E86\u5F39\u51FA\u7A97\u53E3\uFF0C\u70B9\u4E0B\u9762\u7684\u6309\u94AE\u6253\u5F00 H5", record.src] : ["H5 \u5728\u65B0\u7A97\u53E3\u6253\u5F00", record.src];
@@ -1869,7 +1919,17 @@ ${frames}` : "");
   function windowName(webviewId, htmlId) {
     return `wxa-h5-${webviewId}-${htmlId}`;
   }
+  function committed(win, src) {
+    try {
+      return win.location.href !== "about:blank" || src === "about:blank";
+    } catch {
+      return true;
+    }
+  }
   function close(record) {
+    clearTimeout(record.retry);
+    record.retry = void 0;
+    record.opening = void 0;
     if (!record.win) return;
     record.win.close();
     record.win = null;
@@ -3135,6 +3195,8 @@ html, body { margin: 0; height: 100%; background: radial-gradient(120% 80% at 50
           screenTop: () => this.shell.screenTop()
         }),
         ...createNetworkApis({
+          socketProxy: this.info.socketProxy,
+          defaultSocketTimeout: () => this.info.wxConfig.networkTimeout?.connectSocket || 6e4,
           emit: (event, data) => this.emitToService(event, data),
           defaultTimeout: () => this.info.wxConfig.networkTimeout?.request || 6e4,
           routes: this.routes,