@whitesev/utils 2.5.3 → 2.5.5

package/dist/index.cjs.js

@@ -272,24 +272,24 @@ class UtilsGMCookie {
     }
     /**
      *  获取多组Cookie
-     * @param paramDetails 配置
+     * @param option 配置
      * @param callback 获取操作后的回调
      * + cookies object[]
      * + error string|undefined
      **/
-    list(paramDetails, callback) {
-        if (paramDetails == null) {
+    list(option, callback) {
+        if (option == null) {
             throw new Error("Utils.GMCookie.list 参数不能为空");
         }
         let resultData = [];
         try {
-            let details = {
+            let defaultOption = {
                 url: this.windowApi.window.location.href,
                 domain: this.windowApi.window.location.hostname,
                 name: "",
                 path: "/",
             };
-            details = utils.assign(details, paramDetails);
+            defaultOption = utils.assign(defaultOption, option);
             let cookies = this.windowApi.document.cookie.split(";");
             cookies.forEach((item) => {
                 item = item.trim();
@@ -297,9 +297,9 @@ class UtilsGMCookie {
                 let itemName = itemSplit[0];
                 itemSplit.splice(0, 1);
                 let itemValue = decodeURIComponent(itemSplit.join(""));
-                let nameRegexp = details.name instanceof RegExp
-                    ? details.name
-                    : new RegExp("^" + details.name, "g");
+                let nameRegexp = defaultOption.name instanceof RegExp
+                    ? defaultOption.name
+                    : new RegExp("^" + defaultOption.name, "g");
                 if (itemName.match(nameRegexp)) {
                     resultData.push({
                         domain: this.windowApi.window.location.hostname,
@@ -327,20 +327,20 @@ class UtilsGMCookie {
     }
     /**
      *  获取多组Cookie
-     * @param paramDetails 配置
+     * @param option 配置
      **/
-    getList(paramDetails) {
-        if (paramDetails == null) {
+    getList(option) {
+        if (option == null) {
             throw new Error("Utils.GMCookie.list 参数不能为空");
         }
         let resultData = [];
-        let details = {
+        let defaultOption = {
             url: this.windowApi.window.location.href,
             domain: this.windowApi.window.location.hostname,
             name: "",
             path: "/",
         };
-        details = utils.assign(details, paramDetails);
+        defaultOption = utils.assign(defaultOption, option);
         let cookies = this.windowApi.document.cookie.split(";");
         cookies.forEach((item) => {
             item = item.trim();
@@ -348,9 +348,9 @@ class UtilsGMCookie {
             let itemName = itemSplit[0];
             itemSplit.splice(0, 1);
             let itemValue = decodeURIComponent(itemSplit.join(""));
-            let nameRegexp = details.name instanceof RegExp
-                ? details.name
-                : new RegExp("^" + details.name, "g");
+            let nameRegexp = defaultOption.name instanceof RegExp
+                ? defaultOption.name
+                : new RegExp("^" + defaultOption.name, "g");
             if (itemName.match(nameRegexp)) {
                 resultData.push({
                     domain: this.windowApi.window.location.hostname,
@@ -370,12 +370,13 @@ class UtilsGMCookie {
     }
     /**
      * 设置Cookie
-     * @param paramDetails 配置
+     * @param option 配置
      * @param callback 设置操作后的回调(成功/失败)
      */
-    set(paramDetails, callback = (error) => { }) {
+    set(option, callback) {
+        let errorInfo;
         try {
-            let details = {
+            let defaultOption = {
                 url: this.windowApi.window.location.href,
                 name: "",
                 value: "",
@@ -388,43 +389,52 @@ class UtilsGMCookie {
                  */
                 expirationDate: Math.floor(Date.now()) + 60 * 60 * 24 * 30,
             };
-            details = utils.assign(details, paramDetails);
-            let life = details.expirationDate
-                ? details.expirationDate
+            defaultOption = utils.assign(defaultOption, option);
+            let life = defaultOption.expirationDate
+                ? defaultOption.expirationDate
                 : Math.floor(Date.now()) + 60 * 60 * 24 * 30;
-            let cookieStr = details.name +
+            let cookieStr = defaultOption.name +
                 "=" +
-                decodeURIComponent(details.value) +
+                decodeURIComponent(defaultOption.value) +
                 ";expires=" +
                 new Date(life).toGMTString() +
                 "; path=/";
             this.windowApi.document.cookie = cookieStr;
-            callback();
         }
         catch (error) {
-            callback(error);
+            errorInfo = error;
+        }
+        finally {
+            if (typeof callback === "function") {
+                callback(errorInfo);
+            }
         }
     }
     /**
      * 删除Cookie
-     * @param paramDetails 配置
+     * @param option 配置
      * @param callback 删除操作后的回调(成功/失败)
      */
-    delete(paramDetails, callback = (error) => { }) {
+    delete(option, callback) {
+        let errorInfo;
         try {
-            let details = {
+            let defaultOption = {
                 url: this.windowApi.window.location.href,
                 name: "",
-                // @ts-ignore
-                firstPartyDomain: "",
+                path: "/",
+                firstPartyDomain: this.windowApi.window.location.hostname,
             };
-            details = utils.assign(details, paramDetails);
-            let cookieStr = details.name + "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
+            defaultOption = utils.assign(defaultOption, option);
+            let cookieStr = `${defaultOption.name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=${defaultOption.path}; domain=${defaultOption.firstPartyDomain};`;
             this.windowApi.document.cookie = cookieStr;
-            callback();
         }
         catch (error) {
-            callback(error);
+            errorInfo = error;
+        }
+        finally {
+            if (typeof callback === "function") {
+                callback(errorInfo);
+            }
         }
     }
 }
@@ -4110,7 +4120,7 @@ class Utils {
         this.windowApi = new WindowApi(option);
     }
     /** 版本号 */
-    version = "2024.11.16";
+    version = "2024.12.3";
     addStyle(cssText) {
         if (typeof cssText !== "string") {
             throw new Error("Utils.addStyle 参数cssText 必须为String类型");