@open-wxa/wxa-runner-core 0.6.0 → 0.7.0

package/dist/runtime/host.js

@@ -551,12 +551,13 @@
   }
 
   // src/runtime/host/api/misc.ts
+  var SERVICE_MARKET = "webapi_servicemarket_jsapi_comm";
   function createMiscApis(appid, options) {
-    const realLogin = async (api, url) => {
+    const viaDevtools = async (api, url, json) => {
       try {
-        return await postDevServer(url);
+        return await postDevServer(url, json);
       } catch (error) {
-        options?.onRealLoginFail?.(api, error.message);
+        options?.onDevtoolsLoginFail?.(api, error.message);
         throw error;
       }
     };
@@ -568,15 +569,28 @@
       },
       // 基础库经这两个接口向后台拉各种配置和小程序信息
       operateWXData: (args, { api }) => {
+        if (args.data?.api_name === SERVICE_MARKET) {
+          const serviceMarketFail = (reason2) => fail(api, reason2, { err_code: -1 });
+          if (!options?.devtoolsLogin) return serviceMarketFail("wx.serviceMarket \u8981\u5411\u5FAE\u4FE1\u670D\u52A1\u5E02\u573A\u771F\u5B9E\u8C03\u7528\uFF0C\u542F\u52A8\u65F6\u52A0 --devtools-login");
+          return viaDevtools("serviceMarket.invokeService", "/__wxa__/api/operate-wx-data", { data: args.data }).then(
+            ({ data }) => ok(api, { data }),
+            (error) => serviceMarketFail(error.message)
+          );
+        }
         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)}` }),
+      // 插件：基础库启动时校验插件、取插件信息，插件里的网络请求要等拿到这两样才发出。插件代码也只在 --devtools-login 时下载
+      ...options?.devtoolsLogin ? {
+        verifyPlugin: (async (args, { api }) => ok(api, await viaDevtools(api, "/__wxa__/api/verify-plugin", { data: args.data }))),
+        batchGetContact: (async (args, { api }) => ok(api, await viaDevtools(api, "/__wxa__/api/batch-get-contact", { appIds: args.appIds })))
+      } : {},
+      // 向微信取不到时明确返回 fail，不退回假数据：配置或登录态的问题要让开发者马上发现
+      login: options?.devtoolsLogin ? async (_args, { api }) => ok(api, { code: (await viaDevtools(api, "/__wxa__/api/login")).code }) : (_args, { api }) => ok(api, { code: `wxa_mock_code_${Date.now().toString(36)}` }),
       // 基础库只从 JSON.parse(data) 里取手机号的 code
-      getPhoneNumber: options?.realLogin ? async (_args, { api }) => ok(api, await realLogin(api, "/__wxa__/api/phone-number")) : (_args, { api }) => ok(api, { data: JSON.stringify({ code: `mock_phone_code_${Date.now()}` }), encryptedData: "mock_encrypted", iv: "mock_iv" }),
+      getPhoneNumber: options?.devtoolsLogin ? async (_args, { api }) => ok(api, await viaDevtools(api, "/__wxa__/api/phone-number")) : (_args, { api }) => ok(api, { data: JSON.stringify({ code: `mock_phone_code_${Date.now()}` }), encryptedData: "mock_encrypted", iv: "mock_iv" }),
       checkSession: () => void 0,
       authorize: () => void 0,
       getSetting: (_args, { api }) => ok(api, {
@@ -601,8 +615,9 @@
     };
   }
   var clipboard = "";
-  async function postDevServer(url) {
-    const response = await fetch(url, { method: "POST" });
+  async function postDevServer(url, json) {
+    const init = json ? { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(json) } : { method: "POST" };
+    const response = await fetch(url, init);
     const body = await response.json().catch(() => null);
     if (!response.ok || !body) throw new Error(body?.error || `\u5F00\u53D1\u670D\u52A1\u5668\u8FD4\u56DE HTTP ${response.status}`);
     return body;
@@ -800,7 +815,10 @@
   }
   var rejectBaseLib = (_args, { api }) => fail(api, "\u57FA\u7840\u5E93\u5185\u90E8\u7684\u7F51\u7EDC\u8BF7\u6C42\uFF0Cwxa-runner \u4E0D\u53D1\u51FA");
   function byCaller(forApp, forBaseLib = rejectBaseLib) {
-    return (args, context) => args?.__skipDomainCheck__ === true ? forBaseLib(args, context) : forApp(args, context);
+    return (args, context) => args?.__skipDomainCheck__ === true && !hasPluginSign(args) ? forBaseLib(args, context) : forApp(args, context);
+  }
+  function hasPluginSign(args) {
+    return Object.keys(args.header || {}).some((name) => name.toLowerCase() === "x-wechat-hostsign");
   }
   function isAudioDownload(args) {
     return args.responseType === "arraybuffer" && args.enableCache === true;
@@ -2214,7 +2232,7 @@ html, body { margin: 0; height: 100%; background: radial-gradient(120% 80% at 50
       openImagePreview(this.overlay, urls, current);
     }
     /**
-     * 在手机外面提示 wxa-runner 自身的问题（如真实登录失败），不混进小程序的界面。
+     * 在手机外面提示 wxa-runner 自身的问题（如借用开发者工具登录态失败），不混进小程序的界面。
      * 同一时间只显示一条，新的替换旧的：业务代码反复重试时不会堆满屏幕
      */
     showNotice(title, message) {
@@ -2685,8 +2703,8 @@ html, body { margin: 0; height: 100%; background: radial-gradient(120% 80% at 50
           emitToWebview: (webviewId, event, data) => this.emitToWebview(webviewId, event, data)
         }),
         ...createMiscApis(this.info.appid, {
-          realLogin: this.info.realLogin,
-          onRealLoginFail: (api, reason2) => this.shell.showNotice(`wx.${api} \u771F\u5B9E\u767B\u5F55\u5931\u8D25`, reason2)
+          devtoolsLogin: this.info.devtoolsLogin,
+          onDevtoolsLoginFail: (api, reason2) => this.shell.showNotice(`wx.${api} \u501F\u7528\u5F00\u53D1\u8005\u5DE5\u5177\u767B\u5F55\u6001\u5931\u8D25`, reason2)
         })
       });
     }