tools-min-ns 1.18.18 → 1.18.20

package/README.md

@@ -5,6 +5,12 @@ pnpm i tools-min-ns --save
 ```
 
 # updates
+## v1.18.20
+fix: 解密失败为undefined
+
+## v1.18.19
+fix: streamsaver 按需引入
+
 ## v1.18.18
 fix: FileUtil not export
 ## v1.18.17

package/esm/check/CheckUtil.js

@@ -522,11 +522,11 @@ var CheckUtil;
           return __generator(this, function (_a) {
             if (!value) return [2 /*return*/, Promise.resolve()];
             if (type === 'MOBILE_AES') {
-              if (CheckUtil.checkAny(PasswordUtil.strDecrypt(value), 'MOBILE')) return [2 /*return*/, Promise.resolve()];
+              if (CheckUtil.checkAny(PasswordUtil.strDecrypt(value) || '', 'MOBILE')) return [2 /*return*/, Promise.resolve()];
               return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u8F93\u5165\u6B63\u786E\u7684".concat(msg, "\uFF01")))];
             }
             if (type === 'ID_CARD_AES') {
-              if (CheckUtil.checkAny(PasswordUtil.strDecrypt(value), 'ID_CARD')) return [2 /*return*/, Promise.resolve()];
+              if (CheckUtil.checkAny(PasswordUtil.strDecrypt(value) || '', 'ID_CARD')) return [2 /*return*/, Promise.resolve()];
               return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u8F93\u5165\u6B63\u786E\u7684".concat(msg, "\uFF01")))];
             }
             if (CheckUtil.checkAny(value, type)) return [2 /*return*/, Promise.resolve()];

package/esm/pwd/PasswordUtil.d.ts

@@ -12,7 +12,7 @@ declare namespace PasswordUtil {
      * @example
      * strEncrypt('XX') => 3f231e9c5040a51a663a4e12ddd509fc31f201caf95f
      */
-    const strEncrypt: (str: string, pwd?: string) => string;
+    const strEncrypt: (str: string, pwd?: string) => string | undefined;
     /**
      * AES解密函数
      * @param str 待解密字符串
@@ -20,7 +20,7 @@ declare namespace PasswordUtil {
      * @example
      * strDecrypt('3f231e9c5040a51a663a4e12ddd509fc31f201caf95f') => XX
      */
-    const strDecrypt: (str: string, pwd?: string) => any;
+    const strDecrypt: (str: string, pwd?: string) => string | undefined;
     /**
      * MD5加密函数
      * @param str 待加密字符串
@@ -28,7 +28,7 @@ declare namespace PasswordUtil {
      * @example
      * str2MD5('1111') => ea69274f6555a750bec9985a07f80455
      */
-    const str2MD5: (str: string, pwd?: string) => any;
+    const str2MD5: (str: string, pwd?: string) => string | undefined;
     /**
      * 加密函数
      * @param {Object} data - 要加密的 JSON 对象
@@ -42,7 +42,7 @@ declare namespace PasswordUtil {
      * @param {string} pwd - 密钥
      * @returns {Object} 解密后的 JSON 对象
      */
-    function xorDecryptData(encodedData: string, pwd?: string): any;
+    function xorDecryptData(encodedData: string, pwd?: string): string | undefined;
     /**
      * 加密函数
      * @param {Object} data - 要加密的 JSON 对象
@@ -56,6 +56,6 @@ declare namespace PasswordUtil {
      * @param {string} pwd - 密钥
      * @returns {Object} 解密后的 JSON 对象
      */
-    function minDecryptData(encodedData: string, pwd?: string): any;
+    function minDecryptData(encodedData: string, pwd?: string): string | undefined;
 }
 export default PasswordUtil;

package/esm/pwd/PasswordUtil.js

@@ -22,7 +22,7 @@ var PasswordUtil;
     if (pwd === void 0) {
       pwd = defaultPwd;
     }
-    if (!str) return '';
+    if (!str) return undefined;
     var key = CryptoJS.enc.Utf8.parse(pwd);
     var srcs = CryptoJS.enc.Utf8.parse(str);
     var encrypted = CryptoJS.AES.encrypt(srcs, key, {
@@ -42,7 +42,7 @@ var PasswordUtil;
     if (pwd === void 0) {
       pwd = defaultPwd;
     }
-    if (str == '') return '';
+    if (str == '') return undefined;
     var key = CryptoJS.enc.Utf8.parse(pwd);
     var decrypt = CryptoJS.AES.decrypt(decodeURIComponent(str), key, {
       mode: CryptoJS.mode.ECB,
@@ -61,7 +61,7 @@ var PasswordUtil;
     if (pwd === void 0) {
       pwd = defaultMD5Key;
     }
-    if (!str) return '';
+    if (!str) return undefined;
     return CryptoJS.MD5(pwd + str).toString();
   };
   /**
@@ -103,7 +103,7 @@ var PasswordUtil;
       }
       return JSON.parse(decompressed); // 解析 JSON
     } catch (error) {
-      return '';
+      return undefined;
     }
   }
   PasswordUtil.xorDecryptData = xorDecryptData;

package/esm/storage/StorageUtil.d.ts

@@ -1,7 +1,7 @@
 import { SessionOpts } from '../types';
 declare namespace StorageUtil {
     function setItem<T>(name: string, data: T, opts?: SessionOpts): void;
-    function getItem<T>(name: string, opts?: SessionOpts): T;
+    function getItem<T>(name: string, opts?: SessionOpts): T | undefined;
     function removeItem(name: string, opts?: SessionOpts): void;
     function clear(opts?: SessionOpts): void;
     function clearTitle(opts?: SessionOpts): void;

package/esm/system/SystemUtil.js

@@ -121,9 +121,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
  */
 import FileUtil from '../file/FileUtil';
 import TransferUtil from '../transfer/TransferUtil';
-import streamSaver from 'streamsaver';
 var MITM = 'https://ns.nihaonanshen.com/assets/stream/mitm.html';
-streamSaver.mitm = MITM;
 var SystemUtil;
 (function (SystemUtil) {
   /**
@@ -153,18 +151,22 @@ var SystemUtil;
   function downloadFile(url, name) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-      var response, contentLength, total, finalFilename, fileStream, error_1;
+      var streamSaver, response, contentLength, total, finalFilename, fileStream, error_1;
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            _b.trys.push([0, 2,, 3]);
+            streamSaver = require('streamsaver');
+            streamSaver.mitm = MITM;
+            _b.label = 1;
+          case 1:
+            _b.trys.push([1, 3,, 4]);
             return [4 /*yield*/, fetch(url, {
               method: 'GET',
               headers: {
                 'Cache-Control': 'no-cache'
               }
             })];
-          case 1:
+          case 2:
             response = _b.sent();
             if (!response.ok) throw new Error("HTTP error! status: ".concat(response.status));
             contentLength = response.headers.get('content-length');
@@ -186,14 +188,14 @@ var SystemUtil;
               // 降级方案：手动读取和写入
               return [2 /*return*/, manualStreamDownload(response, fileStream)];
             }
-            return [3 /*break*/, 3];
-          case 2:
+            return [3 /*break*/, 4];
+          case 3:
             error_1 = _b.sent();
             console.error('下载失败:', error_1);
             // 降级方案
             fallbackDownload(url, name);
-            return [3 /*break*/, 3];
-          case 3:
+            return [3 /*break*/, 4];
+          case 4:
             return [2 /*return*/];
         }
       });

package/lib/check/CheckUtil.js

@@ -532,11 +532,11 @@ var CheckUtil;
           return __generator(this, function (_a) {
             if (!value) return [2 /*return*/, Promise.resolve()];
             if (type === 'MOBILE_AES') {
-              if (CheckUtil.checkAny(PasswordUtil_1.default.strDecrypt(value), 'MOBILE')) return [2 /*return*/, Promise.resolve()];
+              if (CheckUtil.checkAny(PasswordUtil_1.default.strDecrypt(value) || '', 'MOBILE')) return [2 /*return*/, Promise.resolve()];
               return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u8F93\u5165\u6B63\u786E\u7684".concat(msg, "\uFF01")))];
             }
             if (type === 'ID_CARD_AES') {
-              if (CheckUtil.checkAny(PasswordUtil_1.default.strDecrypt(value), 'ID_CARD')) return [2 /*return*/, Promise.resolve()];
+              if (CheckUtil.checkAny(PasswordUtil_1.default.strDecrypt(value) || '', 'ID_CARD')) return [2 /*return*/, Promise.resolve()];
               return [2 /*return*/, Promise.reject(new Error((options === null || options === void 0 ? void 0 : options.errMsg) || "\u683C\u5F0F\u9519\u8BEF\uFF0C\u8BF7\u8F93\u5165\u6B63\u786E\u7684".concat(msg, "\uFF01")))];
             }
             if (CheckUtil.checkAny(value, type)) return [2 /*return*/, Promise.resolve()];

package/lib/pwd/PasswordUtil.d.ts

@@ -12,7 +12,7 @@ declare namespace PasswordUtil {
      * @example
      * strEncrypt('XX') => 3f231e9c5040a51a663a4e12ddd509fc31f201caf95f
      */
-    const strEncrypt: (str: string, pwd?: string) => string;
+    const strEncrypt: (str: string, pwd?: string) => string | undefined;
     /**
      * AES解密函数
      * @param str 待解密字符串
@@ -20,7 +20,7 @@ declare namespace PasswordUtil {
      * @example
      * strDecrypt('3f231e9c5040a51a663a4e12ddd509fc31f201caf95f') => XX
      */
-    const strDecrypt: (str: string, pwd?: string) => any;
+    const strDecrypt: (str: string, pwd?: string) => string | undefined;
     /**
      * MD5加密函数
      * @param str 待加密字符串
@@ -28,7 +28,7 @@ declare namespace PasswordUtil {
      * @example
      * str2MD5('1111') => ea69274f6555a750bec9985a07f80455
      */
-    const str2MD5: (str: string, pwd?: string) => any;
+    const str2MD5: (str: string, pwd?: string) => string | undefined;
     /**
      * 加密函数
      * @param {Object} data - 要加密的 JSON 对象
@@ -42,7 +42,7 @@ declare namespace PasswordUtil {
      * @param {string} pwd - 密钥
      * @returns {Object} 解密后的 JSON 对象
      */
-    function xorDecryptData(encodedData: string, pwd?: string): any;
+    function xorDecryptData(encodedData: string, pwd?: string): string | undefined;
     /**
      * 加密函数
      * @param {Object} data - 要加密的 JSON 对象
@@ -56,6 +56,6 @@ declare namespace PasswordUtil {
      * @param {string} pwd - 密钥
      * @returns {Object} 解密后的 JSON 对象
      */
-    function minDecryptData(encodedData: string, pwd?: string): any;
+    function minDecryptData(encodedData: string, pwd?: string): string | undefined;
 }
 export default PasswordUtil;

package/lib/pwd/PasswordUtil.js

@@ -32,7 +32,7 @@ var PasswordUtil;
     if (pwd === void 0) {
       pwd = defaultPwd;
     }
-    if (!str) return '';
+    if (!str) return undefined;
     var key = crypto_1.default.enc.Utf8.parse(pwd);
     var srcs = crypto_1.default.enc.Utf8.parse(str);
     var encrypted = crypto_1.default.AES.encrypt(srcs, key, {
@@ -52,7 +52,7 @@ var PasswordUtil;
     if (pwd === void 0) {
       pwd = defaultPwd;
     }
-    if (str == '') return '';
+    if (str == '') return undefined;
     var key = crypto_1.default.enc.Utf8.parse(pwd);
     var decrypt = crypto_1.default.AES.decrypt(decodeURIComponent(str), key, {
       mode: crypto_1.default.mode.ECB,
@@ -71,7 +71,7 @@ var PasswordUtil;
     if (pwd === void 0) {
       pwd = defaultMD5Key;
     }
-    if (!str) return '';
+    if (!str) return undefined;
     return crypto_1.default.MD5(pwd + str).toString();
   };
   /**
@@ -113,7 +113,7 @@ var PasswordUtil;
       }
       return JSON.parse(decompressed); // 解析 JSON
     } catch (error) {
-      return '';
+      return undefined;
     }
   }
   PasswordUtil.xorDecryptData = xorDecryptData;

package/lib/storage/StorageUtil.d.ts

@@ -1,7 +1,7 @@
 import { SessionOpts } from '../types';
 declare namespace StorageUtil {
     function setItem<T>(name: string, data: T, opts?: SessionOpts): void;
-    function getItem<T>(name: string, opts?: SessionOpts): T;
+    function getItem<T>(name: string, opts?: SessionOpts): T | undefined;
     function removeItem(name: string, opts?: SessionOpts): void;
     function clear(opts?: SessionOpts): void;
     function clearTitle(opts?: SessionOpts): void;

package/lib/system/SystemUtil.js

@@ -131,9 +131,7 @@ Object.defineProperty(exports, "__esModule", {
  */
 var FileUtil_1 = __importDefault(require("../file/FileUtil"));
 var TransferUtil_1 = __importDefault(require("../transfer/TransferUtil"));
-var streamsaver_1 = __importDefault(require("streamsaver"));
 var MITM = 'https://ns.nihaonanshen.com/assets/stream/mitm.html';
-streamsaver_1.default.mitm = MITM;
 var SystemUtil;
 (function (SystemUtil) {
   /**
@@ -163,24 +161,28 @@ var SystemUtil;
   function downloadFile(url, name) {
     var _a;
     return __awaiter(this, void 0, void 0, function () {
-      var response, contentLength, total, finalFilename, fileStream, error_1;
+      var streamSaver, response, contentLength, total, finalFilename, fileStream, error_1;
       return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            _b.trys.push([0, 2,, 3]);
+            streamSaver = require('streamsaver');
+            streamSaver.mitm = MITM;
+            _b.label = 1;
+          case 1:
+            _b.trys.push([1, 3,, 4]);
             return [4 /*yield*/, fetch(url, {
               method: 'GET',
               headers: {
                 'Cache-Control': 'no-cache'
               }
             })];
-          case 1:
+          case 2:
             response = _b.sent();
             if (!response.ok) throw new Error("HTTP error! status: ".concat(response.status));
             contentLength = response.headers.get('content-length');
             total = contentLength ? parseInt(contentLength, 10) : undefined;
             finalFilename = name || FileUtil_1.default.extractFilename(url, response);
-            fileStream = streamsaver_1.default.createWriteStream(finalFilename, {
+            fileStream = streamSaver.createWriteStream(finalFilename, {
               size: total
             });
             // 检查浏览器是否支持流式传输
@@ -196,14 +198,14 @@ var SystemUtil;
               // 降级方案：手动读取和写入
               return [2 /*return*/, manualStreamDownload(response, fileStream)];
             }
-            return [3 /*break*/, 3];
-          case 2:
+            return [3 /*break*/, 4];
+          case 3:
             error_1 = _b.sent();
             console.error('下载失败:', error_1);
             // 降级方案
             fallbackDownload(url, name);
-            return [3 /*break*/, 3];
-          case 3:
+            return [3 /*break*/, 4];
+          case 4:
             return [2 /*return*/];
         }
       });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tools-min-ns",
   "description": "工具包适用于前端以及node",
-  "version": "1.18.18",
+  "version": "1.18.20",
   "main": "lib/index.js",
   "license": "MIT",
   "author": "nanshen",