xctc-utils 1.6.34 → 1.6.35

package/dist/crypto/index.d.ts

@@ -1,4 +1,4 @@
 import CryptoJS from "crypto-js";
 export declare const cryptojs: typeof CryptoJS;
-export declare function encrypt(word: any, key?: any, iv?: any): string;
+export declare function encrypt(word: any, key?: any, iv?: any): any;
 export declare function decrypt(word: any, key?: any, iv?: any): any;

package/dist/crypto/index.js

@@ -15,6 +15,10 @@ function formatVal(val) {
 exports.cryptojs = crypto_js_1.default;
 // 加密
 function encrypt(word, key, iv) {
+    if (!word) {
+        console.error("encrypt函数第一个参数不能为空");
+        return;
+    }
     if (word instanceof Object) {
         word = JSON.stringify(word);
     }
@@ -23,25 +27,42 @@ function encrypt(word, key, iv) {
     var src = crypto_js_1.default.enc.Utf8.parse(word);
     key = formatVal(key);
     iv = formatVal(iv);
-    var encrypted = crypto_js_1.default.AES.encrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
-    return encrypted.ciphertext.toString().toUpperCase();
+    var encryptedData = "";
+    try {
+        var encrypted = crypto_js_1.default.AES.encrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
+        encryptedData = encrypted.ciphertext.toString().toUpperCase();
+    }
+    catch (error) {
+        console.error("encrypt函数加密失败：", error);
+    }
+    return encryptedData;
 }
 exports.encrypt = encrypt;
 ;
 // 解密
 function decrypt(word, key, iv) {
+    if (!word) {
+        console.error("decrypt函数第一个参数不能为空");
+        return;
+    }
     key = formatVal(key);
     iv = formatVal(iv);
     var encryptedHexStr = crypto_js_1.default.enc.Hex.parse(word);
     var src = crypto_js_1.default.enc.Base64.stringify(encryptedHexStr);
-    var decrypt = crypto_js_1.default.AES.decrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
-    var decryptedStr = decrypt.toString(crypto_js_1.default.enc.Utf8);
-    var data = decryptedStr.toString();
-    if ((0, utils_1.isJson)(data)) {
-        return JSON.parse(data);
+    var decryptedData = "";
+    try {
+        var decrypt_1 = crypto_js_1.default.AES.decrypt(src, key, { iv: iv, mode: crypto_js_1.default.mode.CBC, padding: crypto_js_1.default.pad.Pkcs7 });
+        var decryptedStr = decrypt_1.toString(crypto_js_1.default.enc.Utf8);
+        decryptedData = decryptedStr.toString();
+    }
+    catch (error) {
+        console.error("decrypt函数解密失败：", error);
+    }
+    if ((0, utils_1.isJson)(decryptedData)) {
+        return JSON.parse(decryptedData);
     }
     else {
-        return data;
+        return decryptedData;
     }
 }
 exports.decrypt = decrypt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xctc-utils",
-  "version": "1.6.34",
+  "version": "1.6.35",
   "description": "localStorage存储\r ```\r sessionStorage存储\r ```\r crypto-js加密、解密\r ```\r 微信授权登录、微信分享\r ```\r 设备环境获取\r ```\r 是否是微信浏览器\r ```\r 时间戳转时间，字符串转时间戳",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",