Paul 5 jaren geleden
bovenliggende
commit
be483f1f6a
5 gewijzigde bestanden met toevoegingen van 38 en 20 verwijderingen
  1. 5
    5
      dist/types/utils.d.ts
  2. 2
    2
      dist/utils.js
  3. 1
    1
      dist/utils.js.map
  4. 10
    10
      src/utils.ts
  5. 20
    2
      test/utils.test.ts

+ 5
- 5
dist/types/utils.d.ts Bestand weergeven

@@ -3,11 +3,11 @@ declare class Utils {
3 3
     static crc32(str: string): number;
4 4
     static ab2str(buf: ArrayBuffer): string;
5 5
     static str2ab(str: string): ArrayBuffer;
6
-    static decrypt(data: any, key: any, iv: any): any;
7
-    static encrypt(data: any, key: any, iv: any): string;
8
-    static binToBase64(bitString: any): string;
9
-    static base64ToBin(str: any): string;
6
+    static decrypt(data: string, key: string, iv: string): string;
7
+    static encrypt(data: string, key: string, iv: string): string;
8
+    static binToBase64(bitString: string): string;
9
+    static base64ToBin(str: string): string;
10 10
     static stringToBin(str: string): string;
11
-    static binToStr(bin: string): string;
11
+    static binToString(bin: string): string;
12 12
 }
13 13
 export { Utils };

+ 2
- 2
dist/utils.js Bestand weergeven

@@ -65,7 +65,7 @@ var Utils = /** @class */ (function () {
65 65
             mode: crypto_js_1.mode.CBC,
66 66
             padding: crypto_js_1.pad.Pkcs7
67 67
         });
68
-        return Utils.binToStr(Utils.base64ToBin(result.toString()));
68
+        return Utils.binToString(Utils.base64ToBin(result.toString()));
69 69
     };
70 70
     // 字节数组转换为base64编码
71 71
     Utils.binToBase64 = function (bitString) {
@@ -109,7 +109,7 @@ var Utils = /** @class */ (function () {
109 109
         return result;
110 110
     };
111 111
     // 字节数组转化为字符串
112
-    Utils.binToStr = function (bin) {
112
+    Utils.binToString = function (bin) {
113 113
         var result = '';
114 114
         for (var i = 0; i < bin.length; i += 8) {
115 115
             result += String.fromCharCode(parseInt(bin.substr(i, 8), 2));

+ 1
- 1
dist/utils.js.map Bestand weergeven

@@ -1 +1 @@
1
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
1
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

+ 10
- 10
src/utils.ts Bestand weergeven

@@ -61,11 +61,11 @@ class Utils {
61 61
   }
62 62
 
63 63
   // 解密服务端传递过来的字符串
64
-  static decrypt(data, key, iv) {
65
-    let binData = Utils.stringToBin(data);
66
-    let base64Data = Utils.binToBase64(binData);
64
+  static decrypt(data: string, key: string, iv: string): string {
65
+    const binData = Utils.stringToBin(data);
66
+    const base64Data = Utils.binToBase64(binData);
67 67
 
68
-    let bytes = AES.decrypt(base64Data, enc.Latin1.parse(key), {
68
+    const bytes = AES.decrypt(base64Data, enc.Latin1.parse(key), {
69 69
       iv: enc.Latin1.parse(iv),
70 70
       mode: mode.CBC,
71 71
       padding: pad.Pkcs7,
@@ -75,18 +75,18 @@ class Utils {
75 75
   }
76 76
 
77 77
   // 加密字符串以后传递到服务端
78
-  static encrypt(data, key, iv) {
79
-    let result = AES.encrypt(data, enc.Latin1.parse(key), {
78
+  static encrypt(data: string, key: string, iv: string): string {
79
+    const result = AES.encrypt(data, enc.Latin1.parse(key), {
80 80
       iv: enc.Latin1.parse(iv),
81 81
       mode: mode.CBC,
82 82
       padding: pad.Pkcs7,
83 83
     });
84 84
 
85
-    return Utils.binToStr(Utils.base64ToBin(result.toString()));
85
+    return Utils.binToString(Utils.base64ToBin(result.toString()));
86 86
   }
87 87
 
88 88
   // 字节数组转换为base64编码
89
-  static binToBase64(bitString) {
89
+  static binToBase64(bitString: string): string {
90 90
     let result = '';
91 91
     let tail = bitString.length % 6;
92 92
     let bitStringTemp1 = bitString.substr(0, bitString.length - tail);
@@ -107,7 +107,7 @@ class Utils {
107 107
   }
108 108
 
109 109
   // base64编码转换为字节数组
110
-  static base64ToBin(str) {
110
+  static base64ToBin(str: string): string {
111 111
     let bitString = '';
112 112
     let tail = 0;
113 113
 
@@ -135,7 +135,7 @@ class Utils {
135 135
   }
136 136
 
137 137
   // 字节数组转化为字符串
138
-  public static binToStr(bin: string): string {
138
+  public static binToString(bin: string): string {
139 139
     let result = '';
140 140
     for (let i = 0; i < bin.length; i += 8) {
141 141
       result += String.fromCharCode(parseInt(bin.substr(i, 8), 2));

+ 20
- 2
test/utils.test.ts Bestand weergeven

@@ -1,6 +1,24 @@
1 1
 import { Utils } from '../src/utils';
2 2
 
3
-test('object assignment', () => {
3
+test('utils crc32', () => {
4 4
   const v = Utils.crc32('/v1/session/init');
5
-  console.log(v);
5
+  expect(v).toBe(1897767088);
6
+});
7
+
8
+test('utils str2ab and ab2str', () => {
9
+  expect(Utils.ab2str(Utils.str2ab('test'))).toBe('test');
10
+});
11
+
12
+test('utils encrypt and decrypt', () => {
13
+  const key = 'b8ca9aa66def05ff3f24919274bb4a66';
14
+  const iv = key;
15
+  expect(Utils.decrypt(Utils.encrypt('test', key, iv), key, iv)).toBe('test');
16
+});
17
+
18
+test('utils binToBase64 and base64ToBin', () => {
19
+  expect(Utils.binToBase64(Utils.base64ToBin('test'))).toBe('test');
20
+});
21
+
22
+test('utils stringToBin and binToString', () => {
23
+  expect(Utils.binToString(Utils.stringToBin('test'))).toBe('test');
6 24
 });