befly-shared 2.8.0 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "befly-shared",
-    "version": "2.8.0",
+    "version": "2.10.0",
     "gitHead": "70c48ac058875255ac8b54c5f4b5987b997c3bfd",
     "private": false,
     "description": "Befly Shared - 通用工具函数库",

package/utils/createHttp.js

@@ -1,40 +1,35 @@
-function shouldDropHttpValue(key, value, dropList, dropKeyMap) {
-    for (const dropValue of dropList) {
-        if (Object.is(value, dropValue)) {
-            return true;
-        }
-    }
-
-    if (Array.isArray(dropKeyMap[key])) {
-        for (const dropValue of dropKeyMap[key]) {
-            if (Object.is(value, dropValue)) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
 export function createHttp(options) {
-    const config = options && typeof options === "object" ? options : {};
-    const apiPath = typeof config.apiPath === "string" ? config.apiPath : "";
-    const getToken = typeof config.getToken === "function" ? config.getToken : () => "";
-    const onReturn = typeof config.onReturn === "function" ? config.onReturn : null;
-
-    const request = async function (url, data, dropValues, dropKeyValue) {
+    const request = async function (url, data, dropValues = [], dropKeyValue = {}) {
         try {
-            const fullUrl = /^https?:\/\//i.test(url) ? url : `${apiPath}${url}`;
+            const fullUrl = /^https?:\/\//i.test(url) ? url : `${options.apiPath}${url}`;
             const isForm = data instanceof FormData;
-            const dropList = Array.isArray(dropValues) ? dropValues : [null, undefined];
-            const dropKeyMap = dropKeyValue && typeof dropKeyValue === "object" ? dropKeyValue : {};
+            const dropList = [null, undefined, ...dropValues];
+            const dropKeyMap = {
+                ...dropKeyValue,
+                keyword: [""]
+            };
             let payloadData = data ?? {};
             if (isForm) {
                 const nextForm = new FormData();
                 for (const entry of payloadData.entries()) {
                     const key = entry[0];
                     const value = entry[1];
-                    if (!shouldDropHttpValue(key, value, dropList, dropKeyMap)) {
+                    let shouldDrop = false;
+                    for (const dropValue of dropList) {
+                        if (Object.is(value, dropValue)) {
+                            shouldDrop = true;
+                            break;
+                        }
+                    }
+                    if (!shouldDrop) {
+                        for (const dropValue of dropKeyMap[key] || []) {
+                            if (Object.is(value, dropValue)) {
+                                shouldDrop = true;
+                                break;
+                            }
+                        }
+                    }
+                    if (!shouldDrop) {
                         nextForm.append(key, value);
                     }
                 }
@@ -43,7 +38,22 @@ export function createHttp(options) {
                 const nextData = {};
                 for (const key of Object.keys(payloadData)) {
                     const value = payloadData[key];
-                    if (!shouldDropHttpValue(key, value, dropList, dropKeyMap)) {
+                    let shouldDrop = false;
+                    for (const dropValue of dropList) {
+                        if (Object.is(value, dropValue)) {
+                            shouldDrop = true;
+                            break;
+                        }
+                    }
+                    if (!shouldDrop) {
+                        for (const dropValue of dropKeyMap[key] || []) {
+                            if (Object.is(value, dropValue)) {
+                                shouldDrop = true;
+                                break;
+                            }
+                        }
+                    }
+                    if (!shouldDrop) {
                         nextData[key] = value;
                     }
                 }
@@ -53,7 +63,7 @@ export function createHttp(options) {
             if (!isForm) {
                 headers.set("Content-Type", "application/json");
             }
-            const tokenValue = getToken();
+            const tokenValue = options.getToken();
             if (tokenValue) {
                 headers.set("Authorization", "Bearer " + tokenValue);
             }
@@ -75,12 +85,7 @@ export function createHttp(options) {
                     msg: `请求失败：HTTP ${res.status}`
                 };
             }
-            if (onReturn) {
-                const result = await onReturn(payload);
-                if (result && typeof result === "object") {
-                    payload = result;
-                }
-            }
+            payload = await options.onReturn(payload);
             if (payload?.code !== 0) {
                 return Promise.reject({
                     msg: payload.msg ?? "请求失败",
@@ -97,12 +102,5 @@ export function createHttp(options) {
         }
     };
 
-    return {
-        get: function (url, data, dropValues, dropKeyValue) {
-            return request(url, data, Array.isArray(dropValues) ? [null, undefined, "", ...dropValues] : [null, undefined, ""], dropKeyValue);
-        },
-        post: function (url, data, dropValues, dropKeyValue) {
-            return request(url, data, Array.isArray(dropValues) ? [null, undefined, ...dropValues] : [null, undefined], dropKeyValue);
-        }
-    };
+    return request;
 }