parsec-libs 0.0.225-ertong → 0.0.226-ertong

package/CHANGELOG.md

@@ -14,3 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 ### Added
 
 - 版本号 0.0.225-ertong
+
+### Changed
+
+- aes 加密模式切换为 ceb

package/lib/utils/aes.d.ts

@@ -1,2 +1,2 @@
-export declare function encryptAES(text: string): string;
-export declare function decryptAES(encryptedHex: string): string;
+export declare function encryptAES(plainText: any): string;
+export declare function decryptAES(cipherBase64: any): string;

package/lib/utils/aes.js

@@ -8,50 +8,68 @@ Object.defineProperty(exports, "__esModule", {
 exports.encryptAES = encryptAES;
 exports.decryptAES = decryptAES;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _aesJs = _interopRequireDefault(require("aes-js"));
 
-// 必须是 16 字节（128 位）的 key
-var key = _aesJs.default.utils.utf8.toBytes('tfPY4ceiCfhOGmsNnILk89EqjHsB5fPWypIE97PY1os'); // 加密
+var FIXED_KEY = 'tfPY4ceiCfhOGmsNnILk89EqjHsB5fPWypIE97PY1os';
 
+function base64ToBytes(base64) {
+  var binaryString = atob(base64);
+  return Uint8Array.from(binaryString, function (c) {
+    return c.charCodeAt(0);
+  });
+}
 
-function encryptAES(text) {
-  var textBytes = _aesJs.default.utils.utf8.toBytes(text); // 使用 ECB 模式，注意需要补齐为 16 字节块
+function pkcs7Pad(data) {
+  var blockSize = 16;
+  var padLength = blockSize - data.length % blockSize;
+  var padding = new Uint8Array(padLength).fill(padLength);
+  return Uint8Array.from([].concat((0, _toConsumableArray2.default)(data), (0, _toConsumableArray2.default)(padding)));
+}
 
+function encryptAES(plainText) {
+  try {
+    // 1. Base64 解码密钥
+    var keyBytes = base64ToBytes(FIXED_KEY); // 2. 将明文转为字节数组
 
-  var paddedTextBytes = padZeroToBlock(textBytes);
-  var aesEcb = new _aesJs.default.ModeOfOperation.ecb(key);
-  var encryptedBytes = aesEcb.encrypt(paddedTextBytes); // 转为十六进制字符串（也可以用 Base64）
+    var textBytes = _aesJs.default.utils.utf8.toBytes(plainText); // 3. PKCS7 填充
 
-  return _aesJs.default.utils.hex.fromBytes(encryptedBytes);
-} // 解密
 
+    var paddedBytes = pkcs7Pad(textBytes); // 4. 创建 AES ECB 加密器
 
-function decryptAES(encryptedHex) {
-  var encryptedBytes = _aesJs.default.utils.hex.toBytes(encryptedHex);
+    var aesEcb = new _aesJs.default.ModeOfOperation.ecb(keyBytes); // 5. 加密
 
-  var aesEcb = new _aesJs.default.ModeOfOperation.ecb(key);
-  var decryptedBytes = aesEcb.decrypt(encryptedBytes); // 去除填充
+    var encryptedBytes = aesEcb.encrypt(paddedBytes); // 6. 返回 base64 编码结果
 
-  var unpadded = removePadding(decryptedBytes);
-  return _aesJs.default.utils.utf8.fromBytes(unpadded);
-} // ------- 工具函数 -------
-// AES 块大小为 16 字节，补 0
+    var encryptedBase64 = btoa(String.fromCharCode.apply(String, (0, _toConsumableArray2.default)(encryptedBytes)));
+    return encryptedBase64;
+  } catch (e) {
+    throw new Error('AES加密失败: ' + e.message);
+  }
+}
 
+function pkcs7Unpad(data) {
+  var padLength = data[data.length - 1];
+  return data.slice(0, data.length - padLength);
+}
 
-function padZeroToBlock(bytes) {
-  var padding = 16 - bytes.length % 16;
-  var padded = new Uint8Array(bytes.length + padding);
-  padded.set(bytes);
-  return padded;
-} // 移除结尾的 0
+function decryptAES(cipherBase64) {
+  try {
+    // 1. Base64 解码密钥和密文
+    var keyBytes = base64ToBytes(FIXED_KEY);
+    var encryptedBytes = base64ToBytes(cipherBase64); // 2. 创建 AES 解密器（ECB 模式）
 
+    var aesEcb = new _aesJs.default.ModeOfOperation.ecb(keyBytes); // 3. 解密
 
-function removePadding(bytes) {
-  var i = bytes.length;
+    var decryptedBytes = aesEcb.decrypt(encryptedBytes); // 4. 去除 PKCS7 填充
 
-  while (i > 0 && bytes[i - 1] === 0) {
-    i--;
-  }
+    var unpaddedBytes = pkcs7Unpad(decryptedBytes); // 5. 转成 UTF8 字符串
 
-  return bytes.slice(0, i);
+    var decryptedText = _aesJs.default.utils.utf8.fromBytes(unpaddedBytes);
+
+    return decryptedText;
+  } catch (e) {
+    throw new Error('AES解密失败: ' + e.message);
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "parsec-libs",
-  "version": "0.0.225-ertong",
+  "version": "0.0.226-ertong",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",