@base-web-kits/base-tools-web 1.3.8 → 1.3.10

package/dist/index.mjs

@@ -1303,7 +1303,7 @@ function request(config) {
   onTaskReady == null ? void 0 : onTaskReady(task);
   return new Promise((resolve, reject) => {
     const execute = () => __async(null, null, function* () {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       const isGet = method === "GET";
       const isObjectData = isPlainObject(data);
       const isArrayData = !isObjectData && Array.isArray(data);
@@ -1357,7 +1357,7 @@ function request(config) {
         controller.abort();
       }, timeout);
       try {
-        const response = yield fetch(fillUrl, {
+        let response = yield fetch(fillUrl, {
           method,
           headers: fillHeader,
           body: fillBody,
@@ -1365,9 +1365,20 @@ function request(config) {
         });
         if (!response.ok) {
           if (showLoading) (_b = appConfig2.hideLoading) == null ? void 0 : _b.call(appConfig2);
-          throw new Error(`HTTP Error ${response.status}: ${response.statusText}`);
+          let errorText;
+          try {
+            errorText = yield response.text();
+            JSON.parse(errorText);
+          } catch (e) {
+            throw new Error(`HTTP Error ${response.status}`);
+          }
+          response = new Response(errorText, {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers
+          });
         }
-        if (enableChunked) {
+        if (enableChunked && response.ok) {
           if (showLoading) (_c = appConfig2.hideLoading) == null ? void 0 : _c.call(appConfig2);
           const res2 = yield handleStreamResponse(response, sseTask);
           logRequestInfo({ status: "success", config: logConfig, startTime, res: res2 });
@@ -1394,17 +1405,18 @@ function request(config) {
           reject(res);
         }
       } catch (e) {
+        if (showLoading) (_g = appConfig2.hideLoading) == null ? void 0 : _g.call(appConfig2);
         const status = "fail";
         const isAbortError = e instanceof DOMException && e.name === "AbortError";
         if (isAbortError && isTimeout) {
-          if (toastError) (_g = appConfig2.toast) == null ? void 0 : _g.call(appConfig2, { status, msg: "\u8BF7\u6C42\u8D85\u65F6" });
+          if (toastError) (_h = appConfig2.toast) == null ? void 0 : _h.call(appConfig2, { status, msg: "\u8BF7\u6C42\u8D85\u65F6" });
           const timeoutError = new Error("Request Timeout");
           logRequestInfo({ status, config: logConfig, startTime, e: timeoutError });
           reject(timeoutError);
           return;
         }
         if (!isAbortError && toastError)
-          (_h = appConfig2.toast) == null ? void 0 : _h.call(appConfig2, { status, msg: `\u8BF7\u6C42\u5931\u8D25,${String(e)}` });
+          (_i = appConfig2.toast) == null ? void 0 : _i.call(appConfig2, { status, msg: `\u8BF7\u6C42\u5931\u8D25,${String(e)}` });
         logRequestInfo({ status, config: logConfig, startTime, e });
         reject(e);
       } finally {