@open-wxa/wxa-runner-core 0.2.5 → 0.3.0

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { ResolvedBaseLib } from '@open-wxa/wxa-runner-extractor';
-import { D as DeviceProfile } from './setup-COzZ6vzS.mjs';
-export { A as ApiContext, a as ApiHandler, b as ApiResult, c as AppInfo, M as MockConfig, d as MockRequest, e as MockResponse, f as MockValue, N as NetworkConfig, R as RouteHandler, S as SetupApi, g as SetupConfig, h as SetupContext, i as SetupDefinition } from './setup-COzZ6vzS.mjs';
-export { F as FrameError, P as PageSnapshot, R as RecordedRequest, W as WxaTestApi } from './testApi-CbBoHXdN.mjs';
+import { D as DeviceProfile } from './setup-Cv340Lvj.mjs';
+export { A as ApiContext, a as ApiHandler, b as ApiResult, c as AppInfo, M as MockConfig, d as MockRequest, e as MockResponse, f as MockValue, N as NetworkConfig, R as RouteHandler, S as SetupApi, g as SetupConfig, h as SetupContext, i as SetupDefinition } from './setup-Cv340Lvj.mjs';
+export { F as FrameError, P as PageSnapshot, R as RecordedRequest, W as WxaTestApi } from './testApi-DO2FyR78.mjs';
 
 /**
  * 小程序项目结构解析

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { ResolvedBaseLib } from '@open-wxa/wxa-runner-extractor';
-import { D as DeviceProfile } from './setup-COzZ6vzS.js';
-export { A as ApiContext, a as ApiHandler, b as ApiResult, c as AppInfo, M as MockConfig, d as MockRequest, e as MockResponse, f as MockValue, N as NetworkConfig, R as RouteHandler, S as SetupApi, g as SetupConfig, h as SetupContext, i as SetupDefinition } from './setup-COzZ6vzS.js';
-export { F as FrameError, P as PageSnapshot, R as RecordedRequest, W as WxaTestApi } from './testApi-DRZ-hXpC.js';
+import { D as DeviceProfile } from './setup-Cv340Lvj.js';
+export { A as ApiContext, a as ApiHandler, b as ApiResult, c as AppInfo, M as MockConfig, d as MockRequest, e as MockResponse, f as MockValue, N as NetworkConfig, R as RouteHandler, S as SetupApi, g as SetupConfig, h as SetupContext, i as SetupDefinition } from './setup-Cv340Lvj.js';
+export { F as FrameError, P as PageSnapshot, R as RecordedRequest, W as WxaTestApi } from './testApi-nKsjjEhz.js';
 
 /**
  * 小程序项目结构解析

package/dist/runtime/host.js

@@ -76,6 +76,7 @@
     return { ...extra, errMsg: `${api}:fail ${reason2}` };
   }
   function normalize(api, result) {
+    if (typeof result === "string") return result;
     if (!result) return { errMsg: `${api}:ok` };
     return result.errMsg ? result : { ...result, errMsg: `${api}:ok` };
   }
@@ -238,6 +239,44 @@
     return { loadLibFiles, loadLibFilesSync: loadLibFiles };
   }
 
+  // src/runtime/host/api/map.ts
+  function createMapApis({ registry, operations }) {
+    return {
+      private_geolocation: async (_args, context) => {
+        const location2 = await registry.invoke("getLocation", { type: "gcj02" }, { ...context, api: "getLocation" });
+        if (location2.errMsg !== "getLocation:ok") return JSON.stringify({ message: location2.errMsg });
+        return JSON.stringify({ result: { location: { lat: location2.latitude, lng: location2.longitude } } });
+      },
+      // 开发者工具上没有原生地图，照基础库的格式转给当前页的 map 组件
+      moveToMapLocation: (args, { webviewId }) => operations.send(webviewId, { ...args, method: "moveToMapLocation" })
+    };
+  }
+  var MapOperations = class {
+    /** @param publish 发给渲染层，渲染层的 WeixinJSBridge.subscribe 收到 */
+    constructor(publish) {
+      this.publish = publish;
+      this.pending = /* @__PURE__ */ new Map();
+      this.seq = 0;
+    }
+    /** map 组件做完才返回；页面上没有这个 map 时一直不返回，同基础库自己发的操作 */
+    send(webviewId, operation) {
+      const callbackId = `wxa_${++this.seq}`;
+      return new Promise((resolve) => {
+        this.pending.set(callbackId, resolve);
+        this.publish(webviewId, "operateMap", { data: { ...operation, callbackId }, options: { timestamp: Date.now() } });
+      });
+    }
+    /** map 组件发回的 operateMapCallback：是宿主发的操作时收下并返回 true，不再交给逻辑层 */
+    receive(message) {
+      const reply = message?.data;
+      const resolve = this.pending.get(reply?.callbackId);
+      if (!resolve) return false;
+      this.pending.delete(reply.callbackId);
+      resolve({ errMsg: reply.errMsg });
+      return true;
+    }
+  };
+
   // src/runtime/host/api/tempFiles.ts
   var TEMP_DIR = "/__wxa__/tmp";
   async function saveTempFile(data, type) {
@@ -467,7 +506,11 @@
         return { tempFilePath: await saveTempFile(bytes, String(args.fileType || "png")) };
       },
       // 基础库经这两个接口向后台拉各种配置和小程序信息
-      operateWXData: (args, { api }) => args.data?.api_name === "webapi_getwxanetwork" ? bizDomainUnavailable(api) : ok(api),
+      operateWXData: (args, { api }) => {
+        if (args.data?.api_name === "webapi_getwxanetwork") return bizDomainUnavailable(api);
+        if (args.data?.api_name === "webapi_getwxauserprivacyauthinfo") return ok(api, { data: { data: JSON.stringify(PRIVACY_AUTH_INFO) } });
+        return ok(api);
+      },
       getAppContact: (args, { api }) => args.keyPath === "WxaAppInfo.Network.BizDomain" ? bizDomainUnavailable(api) : ok(api),
       // 真实登录失败时明确返回 fail，不退回假数据：配置或登录态的问题要让开发者马上发现
       login: options?.realLogin ? async (_args, { api }) => ok(api, { code: (await realLogin(api, "/__wxa__/api/login")).code }) : (_args, { api }) => ok(api, { code: `wxa_mock_code_${Date.now().toString(36)}` }),
@@ -514,6 +557,7 @@
   function mockUser() {
     return { nickName: "wxa-runner", avatarUrl: "", gender: 0, country: "", province: "", city: "", language: "zh_CN" };
   }
+  var PRIVACY_AUTH_INFO = { action_code: 0, need_popup_scope_list: [], unauth_scope_list: [], wording: {} };
   function bizDomainUnavailable(api) {
     return fail(api, "not available in wxa-runner");
   }
@@ -565,7 +609,7 @@
       const requestTaskId = startTask(args, async (signal, id) => {
         try {
           const mocked = route && await route.respond(signal);
-          const res = mocked ? { statusCode: mocked.statusCode, header: mocked.header, cookies: [], text: async () => mocked.data } : await proxyFetch(request.url, { method: request.method, header: args.header, body: args.data, signal }).then((proxied) => ({ ...proxied, text: () => proxied.response.text() }));
+          const res = mocked ? { statusCode: mocked.statusCode, header: mocked.header, cookies: [], response: new Response(mocked.body) } : await proxyFetch(request.url, { method: request.method, header: args.header, body: args.data, signal });
           emit("onRequestTaskStateChange", {
             requestTaskId: id,
             state: "headersReceived",
@@ -573,7 +617,7 @@
             statusCode: res.statusCode,
             cookies: res.cookies
           });
-          const data = await res.text();
+          const data = args.responseType === "arraybuffer" ? await res.response.arrayBuffer() : await res.response.text();
           emit("onRequestTaskStateChange", {
             requestTaskId: id,
             state: "success",
@@ -652,11 +696,7 @@
       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: typeof event.data === "string" ? event.data : "[binary message not supported]"
-      });
+      socket.onmessage = (event) => emit("onSocketTaskStateChange", { socketTaskId, state: "message", data: event.data });
       socket.onerror = () => emit("onSocketTaskStateChange", { socketTaskId, state: "error", errMsg: "connectSocket:fail" });
       socket.onclose = (event) => {
         sockets.delete(socketTaskId);
@@ -991,11 +1031,11 @@
           checkDelay(response.delay);
           if (response.delay) await sleep(response.delay, signal);
           const { body } = response;
-          const isText = typeof body === "string" || body === void 0;
+          const isJson = body !== void 0 && typeof body !== "string" && !isBinary(body);
           return {
             statusCode: response.status ?? 200,
-            header: { ...isText ? {} : { "Content-Type": "application/json" }, ...response.header },
-            data: body === void 0 ? "" : isText ? body : JSON.stringify(body)
+            header: { ...isJson ? { "Content-Type": "application/json" } : {}, ...response.header },
+            body: body === void 0 ? "" : isJson ? JSON.stringify(body) : body
           };
         }
       };
@@ -1010,6 +1050,9 @@
     const regexp = globToRegExp(url);
     return (request) => (!method || method === request.method) && regexp.test(String(request.url).replace(/[?#].*$/, ""));
   }
+  function isBinary(value) {
+    return ArrayBuffer.isView(value) || Object.prototype.toString.call(value) === "[object ArrayBuffer]";
+  }
   function checkDelay(delay) {
     if (delay !== void 0 && !(typeof delay === "number" && delay >= 0 && Number.isFinite(delay))) {
       throw new Error(`delay \u9700\u8981\u662F\u4E0D\u5C0F\u4E8E 0 \u7684\u6BEB\u79D2\u6570\uFF0C\u5B9E\u9645\u662F ${String(delay)}`);
@@ -2096,6 +2139,7 @@ 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();
+      this.mapOperations = new MapOperations((webviewId, event, data) => this.publishToPages(event, data, [webviewId]));
       this.service = null;
       /** 新版基础库的业务子上下文；旧版基础库业务代码直接在逻辑层 iframe 里 */
       this.appContext = null;
@@ -2164,22 +2208,27 @@ html, body { margin: 0; height: 100%; background: radial-gradient(120% 80% at 50
     }
     publish(kind, win, event, data, webviewIds) {
       if (kind === "service") {
-        const targets = webviewIds?.length ? webviewIds.map((id) => this.pages.get(Number(id))) : this.livePages();
-        const message = event === "canvasActionsChanged" ? withDrawableImages(data) : data;
-        for (const page of targets) {
-          page?.dispatch((bridge, target) => {
-            const payload2 = cloneInto(target, message);
-            queueMicrotask(() => bridge.__dispatchSub(event, payload2, 0));
-          });
-        }
+        this.publishToPages(event, data, webviewIds);
         return;
       }
+      if (event === "operateMapCallback" && this.mapOperations.receive(data)) return;
       const fromId = this.webviewIdOf(win);
       const service = this.service;
       if (!service) return;
       const payload = this.cloneForService(data);
       queueMicrotask(() => service.bridge.__dispatchSub(event, payload, fromId));
     }
+    /** 不指定目标时发给所有页面：旧版 canvas 的绘制指令就是这样发的，由 canvasNumber 找到对应画布 */
+    publishToPages(event, data, webviewIds) {
+      const targets = webviewIds?.length ? webviewIds.map((id) => this.pages.get(Number(id))) : this.livePages();
+      const message = event === "canvasActionsChanged" ? withDrawableImages(data) : data;
+      for (const page of targets) {
+        page?.dispatch((bridge, target) => {
+          const payload = cloneInto(target, message);
+          queueMicrotask(() => bridge.__dispatchSub(event, payload, 0));
+        });
+      }
+    }
     reportError(kind, webviewId, error) {
       const err = typeof error?.message === "string" ? error : null;
       this.errors.push({
@@ -2430,6 +2479,7 @@ html, body { margin: 0; height: 100%; background: radial-gradient(120% 80% at 50
           onRequest: (request) => this.requests.add(request)
         }),
         ...createAudioApis({ emit: (event, data) => this.emitToService(event, data) }),
+        ...createMapApis({ registry: this.api, operations: this.mapOperations }),
         ...createLibFileApis({ windowOf: (webviewId) => this.pages.get(webviewId)?.win }),
         ...createUiApis({ shell: this.shell, updateNavigation: (state) => this.updateNavigation(state) }),
         ...createMediaApis({