@base-web-kits/base-tools-web 1.1.0-alpha.0 → 1.1.0-alpha.2

package/dist/network/request.d.ts

@@ -63,7 +63,7 @@ export interface RequestTask {
     /** 取消请求 */
     abort: () => void;
     /** 监听流式数据块接收事件 */
-    onChunkReceived: (callback: ChunkCallback) => void;
+    onProgressUpdate: (callback: ChunkCallback) => void;
     /** 取消监听流式数据块接收事件 */
     offChunkReceived: () => void;
 }
@@ -138,7 +138,7 @@ export type ChunkCallback = (response: {
  *
  * const { task } = apiChatStream({question: '你好'}); // 发起流式请求
  *
- * task.onChunkReceived((res) => {
+ * task.onProgressUpdate((res) => {
  *   console.log('ArrayBuffer', res.data); // 接收流式数据
  * });
  *

package/dist/network/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/web/network/request.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/web/network/request.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base-web-kits/base-tools-web",
-  "version": "1.1.0-alpha.0",
+  "version": "1.1.0-alpha.2",
   "sideEffects": false,
   "description": "Independent Web utilities package built from src/web.",
   "keywords": [

package/src/web/network/request.ts

@@ -113,7 +113,7 @@ export interface RequestTask {
   abort: () => void;
 
   /** 监听流式数据块接收事件 */
-  onChunkReceived: (callback: ChunkCallback) => void;
+  onProgressUpdate: (callback: ChunkCallback) => void;
 
   /** 取消监听流式数据块接收事件 */
   offChunkReceived: () => void;
@@ -192,7 +192,7 @@ const requestCache = new Map<string, { res: unknown; expire: number }>();
  *
  * const { task } = apiChatStream({question: '你好'}); // 发起流式请求
  *
- * task.onChunkReceived((res) => {
+ * task.onProgressUpdate((res) => {
  *   console.log('ArrayBuffer', res.data); // 接收流式数据
  * });
  *
@@ -208,7 +208,7 @@ export function request<T, D extends RequestData = RequestData>(config: RequestC
   // 构造 Task 对象
   const task: RequestTask = {
     abort: () => controller.abort(),
-    onChunkReceived: (cb) => {
+    onProgressUpdate: (cb) => {
       chunkCallback = cb;
     },
     offChunkReceived: () => {
@@ -250,7 +250,13 @@ export function request<T, D extends RequestData = RequestData>(config: RequestC
       // 请求头: 过滤空值 (undefined 、null 、"" 、false 、0), 因为服务器端接收到的都是字符串
       const fillHeader = (header ? pickBy(header, (val) => !!val) : {}) as Record<string, string>;
 
-      if (!isGet && fillData && (isObjectData || isArrayData) && !fillHeader['Content-Type']) {
+      // 获取 Content-Type (忽略大小写)
+      const contentTypeKey = Object.keys(fillHeader).find(
+        (k) => k.toLowerCase() === 'content-type',
+      );
+      const contentType = contentTypeKey ? fillHeader[contentTypeKey].toLowerCase() : '';
+
+      if (!isGet && fillData && (isObjectData || isArrayData) && !contentType) {
         fillHeader['Content-Type'] = 'application/json';
       }
 
@@ -258,12 +264,23 @@ export function request<T, D extends RequestData = RequestData>(config: RequestC
       const fillUrl =
         isGet && isObjectData ? appendUrlParam(url, fillData as Record<string, unknown>) : url;
 
-      const fillBody =
-        !isGet && fillData
-          ? isObjectData || isArrayData
-            ? JSON.stringify(fillData)
-            : (fillData as BodyInit)
-          : undefined;
+      let fillBody: BodyInit | null | undefined;
+
+      if (!isGet && fillData) {
+        if (isObjectData && contentType.includes('application/x-www-form-urlencoded')) {
+          // application/x-www-form-urlencoded: 转换为 URLSearchParams
+          fillBody = toSearchParams(fillData as Record<string, unknown>);
+        } else if (isObjectData && contentType.includes('multipart/form-data')) {
+          // multipart/form-data: 转换为 FormData
+          fillBody = toFormData(fillData as Record<string, unknown>);
+          // 删除 Content-Type, 让 fetch 自动生成 boundary
+          if (contentTypeKey) delete fillHeader[contentTypeKey];
+        } else if (isObjectData || isArrayData) {
+          fillBody = JSON.stringify(fillData);
+        } else {
+          fillBody = fillData as BodyInit;
+        }
+      }
 
       // 2.3 日志与缓存配置
       const logConfig = { ...config, data: fillData, header: fillHeader, url: fillUrl };
@@ -489,3 +506,49 @@ async function parseResponse(response: Response, responseType: string) {
   }
   return resData;
 }
+
+/**
+ * 转换为 URLSearchParams
+ */
+function toSearchParams(data: Record<string, unknown>) {
+  const params = new URLSearchParams();
+  for (const key in data) {
+    const val = data[key];
+    // undefined 已在 fillData 阶段过滤，此处仅需判断 null
+    // null 在 Form 中会被转为字符串 "null"，通常不符合预期，故过滤
+    if (val === null) continue;
+    if (Array.isArray(val)) {
+      val.forEach((v) => params.append(key, typeof v === 'object' ? JSON.stringify(v) : String(v)));
+    } else {
+      params.append(key, typeof val === 'object' ? JSON.stringify(val) : String(val));
+    }
+  }
+  return params;
+}
+
+/**
+ * 转换为 FormData
+ */
+function toFormData(data: Record<string, unknown>) {
+  const formData = new FormData();
+  for (const key in data) {
+    const val = data[key];
+    // undefined 已在 fillData 阶段过滤，此处仅需判断 null
+    // null 在 Form 中会被转为字符串 "null"，通常不符合预期，故过滤
+    if (val === null) continue;
+    if (Array.isArray(val)) {
+      val.forEach((v) =>
+        formData.append(
+          key,
+          v instanceof Blob ? v : typeof v === 'object' ? JSON.stringify(v) : String(v),
+        ),
+      );
+    } else {
+      formData.append(
+        key,
+        val instanceof Blob ? val : typeof val === 'object' ? JSON.stringify(val) : String(val),
+      );
+    }
+  }
+  return formData;
+}