@dimina-kit/devtools 0.4.0-dev.20260703051110 → 0.4.0-dev.20260706064107

package/dist/preload/windows/simulator.js

@@ -624,6 +624,108 @@ function createAppDataSource() {
   };
 }
 
+// src/shared/request-core.ts
+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
 function call(fn, payload) {
   try {
@@ -740,51 +842,22 @@ function ensureWxApi(wx) {
     };
   }
   if (typeof wx.request !== "function") {
-    wx.request = (opts) => {
-      const controller = new AbortController();
-      const method = (opts.method || "GET").toUpperCase();
-      let requestUrl = opts.url;
-      const init = {
-        method,
-        headers: { "Content-Type": "application/json", ...opts.header || {} },
-        signal: controller.signal
-      };
-      if (method === "GET" && opts.data && typeof opts.data === "object") {
-        const url = new URL(requestUrl, window.location.href);
-        Object.entries(opts.data).forEach(([key, value]) => {
-          url.searchParams.append(key, String(value));
-        });
-        requestUrl = url.toString();
-      } else if (opts.data != null) {
-        init.body = typeof opts.data === "string" ? opts.data : JSON.stringify(opts.data);
+    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)
       }
-      const timeoutId = Number(opts.timeout) > 0 ? window.setTimeout(() => controller.abort(), Number(opts.timeout)) : null;
-      fetch(requestUrl, init).then(async (response) => {
-        const headers = Object.fromEntries(response.headers.entries());
-        let data;
-        if (opts.dataType === "arraybuffer") data = await response.arrayBuffer();
-        else {
-          const text = await response.text();
-          if (opts.dataType === "text") data = text;
-          else {
-            try {
-              data = JSON.parse(text);
-            } catch {
-              data = text;
-            }
-          }
-        }
-        call(opts.success, { data, statusCode: response.status, header: headers, errMsg: "request:ok" });
-      }).catch((error) => {
-        call(opts.fail, { errMsg: `request:fail ${error instanceof Error ? error.message : String(error)}` });
-      }).finally(() => {
-        if (timeoutId != null) window.clearTimeout(timeoutId);
-        call(opts.complete, void 0);
-      });
-      return {
-        abort: () => controller.abort()
-      };
-    };
+    );
   }
 }
 function setupApiCompatHook() {