@whitesev/utils 1.5.8 → 1.6.0

package/dist/index.cjs.js

@@ -1532,12 +1532,21 @@ class Hooks {
     }
 }
 
-const GenerateUUID = () => {
-    return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
-        var r = (Math.random() * 16) | 0, v = c == "x" ? r : (r & 0x3) | 0x8;
-        return v.toString(16);
-    });
+/**
+ * 生成uuid
+ */
+const GenerateUUID = function () {
+    if (typeof UtilsCore.globalThis?.crypto?.randomUUID === "function") {
+        return UtilsCore.globalThis.crypto.randomUUID();
+    }
+    else {
+        return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (charStr) {
+            var randomValue = (Math.random() * 16) | 0, randomCharValue = charStr === "x" ? randomValue : (randomValue & 0x3) | 0x8;
+            return randomCharValue.toString(16);
+        });
+    }
 };
+
 class Httpx {
     GM_Api = {
         xmlHttpRequest: null,
@@ -1556,6 +1565,12 @@ class Httpx {
          * @private
          */
         beforeRequestCallBack(details) {
+            if (!details.allowInterceptConfig) {
+                return details;
+            }
+            if (!details.allowInterceptConfig.beforeRequest) {
+                return details;
+            }
             for (let index = 0; index < this.$config.configList.length; index++) {
                 let item = this.$config.configList[index];
                 if (typeof item.fn === "function") {
@@ -1617,6 +1632,12 @@ class Httpx {
          * @param details 请求的配置
          */
         successResponseCallBack(response, details) {
+            if (!details.allowInterceptConfig) {
+                return details;
+            }
+            if (!details.allowInterceptConfig.afterResponseSuccess) {
+                return details;
+            }
             for (let index = 0; index < this.$config.configList.length; index++) {
                 let item = this.$config.configList[index];
                 if (typeof item.successFn === "function") {
@@ -1632,6 +1653,12 @@ class Httpx {
          * @param data 配置
          */
         errorResponseCallBack(data) {
+            if (!data.details.allowInterceptConfig) {
+                return data;
+            }
+            if (!data.details.allowInterceptConfig.afterResponseError) {
+                return data;
+            }
             for (let index = 0; index < this.$config.configList.length; index++) {
                 let item = this.$config.configList[index];
                 if (typeof item.errorFn === "function") {
@@ -2243,6 +2270,11 @@ class Httpx {
         anonymous: void 0,
         fetch: void 0,
         fetchInit: void 0,
+        allowInterceptConfig: {
+            beforeRequest: true,
+            afterResponseSuccess: true,
+            afterResponseError: true,
+        },
         user: void 0,
         password: void 0,
         onabort() { },
@@ -3431,13 +3463,20 @@ class Utils {
                 return source;
             }
         }
+        if (source == null) {
+            return target;
+        }
+        if (target == null) {
+            target = {};
+        }
         if (isAdd) {
             for (const sourceKeyName in source) {
                 const targetKeyName = sourceKeyName;
                 let targetValue = target[targetKeyName];
                 let sourceValue = source[sourceKeyName];
-                if (sourceKeyName in target &&
-                    typeof sourceValue === "object" &&
+                if (typeof sourceValue === "object" &&
+                    sourceValue != null &&
+                    sourceKeyName in target &&
                     !UtilsContext.isDOM(sourceValue)) {
                     /* 源端的值是object类型，且不是元素节点 */
                     target[sourceKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
@@ -3452,6 +3491,7 @@ class Utils {
                     let targetValue = target[targetKeyName];
                     let sourceValue = source[targetKeyName];
                     if (typeof sourceValue === "object" &&
+                        sourceValue != null &&
                         !UtilsContext.isDOM(sourceValue) &&
                         Object.keys(sourceValue).length) {
                         /* 源端的值是object类型，且不是元素节点 */
@@ -6356,17 +6396,7 @@ class Utils {
      * @example
      * Utils.generateUUID()
      */
-    generateUUID() {
-        if (typeof globalThis?.crypto?.randomUUID === "function") {
-            return globalThis.crypto.randomUUID();
-        }
-        else {
-            return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (charStr) {
-                var randomValue = (Math.random() * 16) | 0, randomCharValue = charStr === "x" ? randomValue : (randomValue & 0x3) | 0x8;
-                return randomCharValue.toString(16);
-            });
-        }
-    }
+    generateUUID = GenerateUUID;
 }
 let utils = new Utils();