@dimina-kit/devtools 0.4.0-dev.20260907055341 → 0.5.0-dev.20260908120530

package/dist/preload/shared/api-compat.js

@@ -1,4 +1,5 @@
-import { performRequest } from '../../shared/request-core.js';
+import { ipcRenderer } from "electron";
+import { BRIDGE_CHANNELS } from "../../shared/bridge-channels.js";
 function call(fn, payload) {
     try {
         fn?.(payload);
@@ -33,10 +34,10 @@ function makeStorageKey(key) {
     return `dimina:${key}`;
 }
 function ensureWxApi(wx) {
-    if (typeof wx.canIUse !== 'function') {
+    if (typeof wx.canIUse !== "function") {
         wx.canIUse = (_schema) => true;
     }
-    if (typeof wx.getWindowInfo !== 'function') {
+    if (typeof wx.getWindowInfo !== "function") {
         wx.getWindowInfo = (opts = {}) => {
             const info = buildWindowInfo();
             call(opts.success, info);
@@ -44,41 +45,41 @@ function ensureWxApi(wx) {
             return info;
         };
     }
-    if (typeof wx.getSystemSetting !== 'function') {
+    if (typeof wx.getSystemSetting !== "function") {
         wx.getSystemSetting = (opts = {}) => {
             const info = {
                 bluetoothEnabled: false,
                 locationEnabled: true,
                 wifiEnabled: true,
-                deviceOrientation: 'portrait',
+                deviceOrientation: "portrait",
             };
             call(opts.success, info);
             call(opts.complete, undefined);
             return info;
         };
     }
-    if (typeof wx.getSystemInfoSync !== 'function') {
+    if (typeof wx.getSystemInfoSync !== "function") {
         wx.getSystemInfoSync = () => ({
-            brand: 'simulator',
-            model: 'web',
-            platform: 'simulator',
-            system: 'web',
-            language: 'zh_CN',
-            SDKVersion: '3.0.0',
+            brand: "simulator",
+            model: "web",
+            platform: "simulator",
+            system: "web",
+            language: "zh_CN",
+            SDKVersion: "3.0.0",
             ...buildWindowInfo(),
         });
     }
-    if (typeof wx.setStorageSync !== 'function') {
+    if (typeof wx.setStorageSync !== "function") {
         wx.setStorageSync = (key, data) => {
-            const value = typeof data === 'string' ? data : JSON.stringify(data);
+            const value = typeof data === "string" ? data : JSON.stringify(data);
             localStorage.setItem(makeStorageKey(String(key)), value);
         };
     }
-    if (typeof wx.getStorageSync !== 'function') {
+    if (typeof wx.getStorageSync !== "function") {
         wx.getStorageSync = (key) => {
             const raw = localStorage.getItem(makeStorageKey(String(key)));
             if (raw == null)
-                return '';
+                return "";
             try {
                 return JSON.parse(raw);
             }
@@ -87,14 +88,14 @@ function ensureWxApi(wx) {
             }
         };
     }
-    if (typeof wx.removeStorageSync !== 'function') {
+    if (typeof wx.removeStorageSync !== "function") {
         wx.removeStorageSync = (key) => {
             localStorage.removeItem(makeStorageKey(String(key)));
         };
     }
-    if (typeof wx.clearStorageSync !== 'function') {
+    if (typeof wx.clearStorageSync !== "function") {
         wx.clearStorageSync = () => {
-            const prefix = 'dimina:';
+            const prefix = "dimina:";
             const keys = [];
             for (let i = 0; i < localStorage.length; i++) {
                 const key = localStorage.key(i);
@@ -104,9 +105,9 @@ function ensureWxApi(wx) {
             keys.forEach((key) => localStorage.removeItem(key));
         };
     }
-    if (typeof wx.getStorageInfoSync !== 'function') {
+    if (typeof wx.getStorageInfoSync !== "function") {
         wx.getStorageInfoSync = () => {
-            const prefix = 'dimina:';
+            const prefix = "dimina:";
             const keys = [];
             let currentSize = 0;
             for (let i = 0; i < localStorage.length; i++) {
@@ -114,35 +115,56 @@ function ensureWxApi(wx) {
                 if (!fullKey?.startsWith(prefix))
                     continue;
                 keys.push(fullKey.slice(prefix.length));
-                currentSize += (localStorage.getItem(fullKey) || '').length * 2;
+                currentSize += (localStorage.getItem(fullKey) || "").length * 2;
             }
             return { keys, currentSize, limitSize: 10 * 1024 * 1024 };
         };
     }
-    if (typeof wx.request !== 'function') {
-        // Delegates to the shared wx.request core (shared/request-core.ts) — the
-        // single owner of success/fail semantics, header dedup, timeout default,
-        // and body encoding. This shim only adapts the wx.request option bag onto
-        // the core's callbacks.
-        wx.request = (opts) => performRequest({
-            url: opts.url,
-            data: opts.data,
-            header: opts.header,
-            timeout: opts.timeout,
-            method: opts.method,
-            dataType: opts.dataType,
-            responseType: opts.responseType,
-        }, {
-            success: (res) => call(opts.success, res),
-            fail: (err) => call(opts.fail, err),
-            complete: (res) => call(opts.complete, res),
-        });
+    if (typeof wx.request !== "function") {
+        // Route wx.request through the main-process native HTTP transport so it
+        // never executes in the renderer (no Chromium Fetch/CORS algorithm, no
+        // preflight). The main process owns the network I/O and returns a result
+        // object that already carries the wx.request success/fail shape.
+        wx.request = (opts) => {
+            const requestId = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+            const task = {
+                abort: () => ipcRenderer.send(BRIDGE_CHANNELS.NATIVE_REQUEST_ABORT, requestId),
+            };
+            ipcRenderer
+                .invoke(BRIDGE_CHANNELS.NATIVE_REQUEST, requestId, {
+                url: opts.url,
+                data: opts.data,
+                header: opts.header,
+                timeout: opts.timeout,
+                method: opts.method,
+                dataType: opts.dataType,
+                responseType: opts.responseType,
+            })
+                .then((result) => {
+                if (result && typeof result === "object" && "statusCode" in result) {
+                    call(opts.success, result);
+                    call(opts.complete, result);
+                }
+                else {
+                    call(opts.fail, result);
+                    call(opts.complete, result);
+                }
+            })
+                .catch((error) => {
+                const err = {
+                    errMsg: `request:fail ${error instanceof Error ? error.message : String(error)}`,
+                };
+                call(opts.fail, err);
+                call(opts.complete, err);
+            });
+            return task;
+        };
     }
 }
 export function setupApiCompatHook() {
     const apply = () => {
         const target = window;
-        if (!target.wx || typeof target.wx !== 'object') {
+        if (!target.wx || typeof target.wx !== "object") {
             target.wx = {};
         }
         const wx = target.wx;

package/dist/preload/windows/main.cjs

@@ -3191,7 +3191,21 @@ var BRIDGE_CHANNELS = {
    * active bridgeId via ACTIVE_PAGE), so automation's `App.getPageStack` needs
    * this to report multi-page stacks. Fire-and-forget.
    */
-  PAGE_STACK: "dmb:page-stack"
+  PAGE_STACK: "dmb:page-stack",
+  /**
+   * preload (window.wx.request, no service-host in the picture) → main
+   * (invoke): run an HTTP request through the main-process native transport
+   * (`main/services/native-request`) instead of the renderer's `fetch()`, so
+   * it never hits Chromium's Fetch/CORS algorithm (no spurious OPTIONS
+   * preflight). Reply is a `NativeRequestResult` (success or fail shape).
+   */
+  NATIVE_REQUEST: "dmb:native-request",
+  /**
+   * preload → main: cancel the in-flight native request named by the
+   * requestId a prior NATIVE_REQUEST call was invoked with. Fire-and-forget;
+   * a requestId that already settled or belongs to another sender is a no-op.
+   */
+  NATIVE_REQUEST_ABORT: "dmb:native-request-abort"
 };
 var SIMULATOR_EVENTS = {
   DOM_READY: "simulator:dom-ready",