@open-wxa/wxa-runner-core 0.12.1 → 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);
@@ -3168,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,