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

package/dist/preload/windows/simulator.cjs

@@ -399,7 +399,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 SimulatorCustomApiBridgeChannel = {
   Request: "simulator:custom-apis:bridge-request",
@@ -751,115 +765,8 @@ function createAppDataSource() {
   };
 }
 
-// ../dimina-electron-runtime/dist/shared/request-core.js
-var DEFAULT_REQUEST_TIMEOUT_MS = 6e4;
-var MAX_TIMEOUT_MS = 2147483647;
-function resolveTimeoutBudgetMs(timeout) {
-  const t = Number(timeout);
-  return Number.isFinite(t) && t > 0 && t <= MAX_TIMEOUT_MS ? t : DEFAULT_REQUEST_TIMEOUT_MS;
-}
-function buildHeaders(header) {
-  const headers = new Headers();
-  for (const [key, value] of Object.entries(header ?? {})) {
-    if (value != null)
-      headers.set(key, String(value));
-  }
-  if (!headers.has("content-type"))
-    headers.set("content-type", "application/json");
-  return headers;
-}
-function appendQueryParams(url, data) {
-  const base = typeof location !== "undefined" ? location.href : void 0;
-  const resolved = new URL(url, base);
-  for (const [key, value] of Object.entries(data)) {
-    resolved.searchParams.append(key, String(value));
-  }
-  return resolved.toString();
-}
-function encodeBody(data, contentType) {
-  if (typeof data === "string")
-    return data;
-  if (contentType.includes("application/x-www-form-urlencoded")) {
-    const form = new URLSearchParams();
-    for (const [key, value] of Object.entries(data)) {
-      form.append(key, String(value));
-    }
-    return form.toString();
-  }
-  return JSON.stringify(data);
-}
-async function decodeResponseData(response, dataType, responseType) {
-  if (responseType === "arraybuffer" || dataType === "arraybuffer") {
-    return response.arrayBuffer();
-  }
-  const text = await response.text();
-  if (dataType !== "json")
-    return text;
-  try {
-    return JSON.parse(text);
-  } catch {
-    return text;
-  }
-}
-function performRequest(opts, callbacks) {
-  const method = (opts.method || "GET").toUpperCase();
-  const canHaveBody = method !== "GET" && method !== "HEAD";
-  const headers = buildHeaders(opts.header);
-  let url = opts.url;
-  const init = { method, headers };
-  if (!canHaveBody) {
-    if (opts.data && typeof opts.data === "object") {
-      url = appendQueryParams(url, opts.data);
-    }
-  } else if (opts.data != null) {
-    init.body = encodeBody(opts.data, headers.get("content-type") ?? "");
-  }
-  const controller = new AbortController();
-  init.signal = controller.signal;
-  let settled = false;
-  function settleSuccess(res) {
-    if (settled)
-      return;
-    settled = true;
-    clearTimeout(timer);
-    callbacks.success?.(res);
-    callbacks.complete?.(res);
-  }
-  function settleFail(err) {
-    if (settled)
-      return;
-    settled = true;
-    clearTimeout(timer);
-    callbacks.fail?.(err);
-    callbacks.complete?.(err);
-  }
-  const timeoutMs = resolveTimeoutBudgetMs(opts.timeout);
-  const timer = setTimeout(() => {
-    settleFail({ errMsg: "request:fail timeout" });
-    controller.abort();
-  }, timeoutMs);
-  const dataType = opts.dataType ?? "json";
-  const responseType = opts.responseType ?? "text";
-  fetch(url, init).then(async (response) => {
-    const header = {};
-    response.headers.forEach((value, key) => {
-      header[key] = value;
-    });
-    const data = await decodeResponseData(response, dataType, responseType);
-    settleSuccess({ data, statusCode: response.status, header, errMsg: "request:ok" });
-  }).catch((error) => {
-    const reason = error instanceof Error ? error.message : String(error);
-    settleFail({ errMsg: `request:fail ${reason || "network error"}` });
-  });
-  return {
-    abort() {
-      settleFail({ errMsg: "request:fail abort" });
-      controller.abort();
-    }
-  };
-}
-
 // src/preload/shared/api-compat.ts
+var import_electron5 = require("electron");
 function call(fn, payload) {
   try {
     fn?.(payload);
@@ -975,8 +882,12 @@ function ensureWxApi(wx) {
     };
   }
   if (typeof wx.request !== "function") {
-    wx.request = (opts) => performRequest(
-      {
+    wx.request = (opts) => {
+      const requestId = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+      const task = {
+        abort: () => import_electron5.ipcRenderer.send(BRIDGE_CHANNELS.NATIVE_REQUEST_ABORT, requestId)
+      };
+      import_electron5.ipcRenderer.invoke(BRIDGE_CHANNELS.NATIVE_REQUEST, requestId, {
         url: opts.url,
         data: opts.data,
         header: opts.header,
@@ -984,13 +895,23 @@ function ensureWxApi(wx) {
         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)
-      }
-    );
+      }).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;
+    };
   }
 }
 function setupApiCompatHook() {
@@ -1010,7 +931,7 @@ function setupApiCompatHook() {
 }
 
 // src/preload/runtime/native-host.ts
-var import_electron5 = require("electron");
+var import_electron6 = require("electron");
 
 // ../dimina-electron-runtime/dist/shared/dmb-resource-url.js
 var DMB_PAGEFRAME_DOC_NAME = "__frame__.html";
@@ -1045,7 +966,7 @@ function buildRenderHostDocumentUrl(opts) {
 // src/preload/runtime/native-host.ts
 function queryNativeHostConfig() {
   try {
-    const res = import_electron5.ipcRenderer.sendSync(BRIDGE_CHANNELS.NATIVE_HOST_ENABLED);
+    const res = import_electron6.ipcRenderer.sendSync(BRIDGE_CHANNELS.NATIVE_HOST_ENABLED);
     return res && res.enabled ? res : null;
   } catch {
     return null;
@@ -1055,33 +976,33 @@ function buildBridge2(cfg) {
   return {
     enabled: true,
     spawn(opts) {
-      return import_electron5.ipcRenderer.invoke(BRIDGE_CHANNELS.SPAWN, opts);
+      return import_electron6.ipcRenderer.invoke(BRIDGE_CHANNELS.SPAWN, opts);
     },
     dispose(bridgeId) {
       const payload = { bridgeId };
-      import_electron5.ipcRenderer.send(BRIDGE_CHANNELS.DISPOSE, payload);
+      import_electron6.ipcRenderer.send(BRIDGE_CHANNELS.DISPOSE, payload);
     },
     openPage(opts) {
-      return import_electron5.ipcRenderer.invoke(BRIDGE_CHANNELS.PAGE_OPEN, opts);
+      return import_electron6.ipcRenderer.invoke(BRIDGE_CHANNELS.PAGE_OPEN, opts);
     },
     closePage(bridgeId) {
       const payload = { bridgeId };
-      import_electron5.ipcRenderer.send(BRIDGE_CHANNELS.PAGE_CLOSE, payload);
+      import_electron6.ipcRenderer.send(BRIDGE_CHANNELS.PAGE_CLOSE, payload);
     },
     notifyLifecycle(payload) {
-      import_electron5.ipcRenderer.send(BRIDGE_CHANNELS.PAGE_LIFECYCLE, payload);
+      import_electron6.ipcRenderer.send(BRIDGE_CHANNELS.PAGE_LIFECYCLE, payload);
     },
     notifyNavCallback(payload) {
-      import_electron5.ipcRenderer.send(BRIDGE_CHANNELS.NAV_CALLBACK, payload);
+      import_electron6.ipcRenderer.send(BRIDGE_CHANNELS.NAV_CALLBACK, payload);
     },
     notifyApiResponse(payload) {
-      import_electron5.ipcRenderer.send(BRIDGE_CHANNELS.API_RESPONSE, payload);
+      import_electron6.ipcRenderer.send(BRIDGE_CHANNELS.API_RESPONSE, payload);
     },
     notifyActivePage(payload) {
-      import_electron5.ipcRenderer.send(BRIDGE_CHANNELS.ACTIVE_PAGE, payload);
+      import_electron6.ipcRenderer.send(BRIDGE_CHANNELS.ACTIVE_PAGE, payload);
     },
     notifyPageStack(payload) {
-      import_electron5.ipcRenderer.send(BRIDGE_CHANNELS.PAGE_STACK, payload);
+      import_electron6.ipcRenderer.send(BRIDGE_CHANNELS.PAGE_STACK, payload);
     },
     createRenderHostUrl(opts) {
       return buildRenderHostDocumentUrl(opts);
@@ -1093,8 +1014,8 @@ function buildBridge2(cfg) {
         ;
         listener(payload);
       };
-      import_electron5.ipcRenderer.on(channel, wrapped);
-      return () => import_electron5.ipcRenderer.removeListener(channel, wrapped);
+      import_electron6.ipcRenderer.on(channel, wrapped);
+      return () => import_electron6.ipcRenderer.removeListener(channel, wrapped);
     }
   };
 }
@@ -1106,11 +1027,11 @@ function installNativeHostBridge() {
 }
 
 // src/preload/runtime/clipboard.ts
-var import_electron6 = require("electron");
+var import_electron7 = require("electron");
 function buildBridge3() {
   return {
-    readText: () => import_electron6.clipboard.readText(),
-    writeText: (text) => import_electron6.clipboard.writeText(text)
+    readText: () => import_electron7.clipboard.readText(),
+    writeText: (text) => import_electron7.clipboard.writeText(text)
   };
 }
 function installClipboardBridge() {