Skip to content

Commit f17a967

Browse files
committed
Update V3.0.11
1 parent c4ec3ff commit f17a967

File tree

8 files changed

+416
-325
lines changed

8 files changed

+416
-325
lines changed

JavyInputAppendix.js

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
*/
2121

2222
function base64ToUint8Array(base64) {
23-
// 将Base64字符串转换为二进制字符串
24-
const binaryString = _atob(base64);
25-
// 将二进制字符串转换为Uint8Array
26-
const len = binaryString.length;
27-
const bytes = new Uint8Array(len);
28-
for (let i = 0; i < len; i++) {
29-
bytes[i] = binaryString.charCodeAt(i);
30-
}
31-
return bytes;
23+
// 将Base64字符串转换为二进制字符串
24+
const binaryString = _atob(base64);
25+
// 将二进制字符串转换为Uint8Array
26+
const len = binaryString.length;
27+
const bytes = new Uint8Array(len);
28+
for (let i = 0; i < len; i++) {
29+
bytes[i] = binaryString.charCodeAt(i);
30+
}
31+
return bytes;
3232
}
3333

3434
function uint8ArrayToBase64(uint8Array) {
35-
return _btoa(String.fromCharCode.apply(null, uint8Array));
35+
return _btoa(String.fromCharCode.apply(null, uint8Array));
3636
}
3737

3838
// Read input from stdin
@@ -44,53 +44,53 @@ JavywriteOutput(Javyresult);
4444

4545
// The main function.
4646
function index(input) {
47-
if(input === "ERROR"){
47+
if (input === "ERROR") {
4848
return "INCORRECT JSON";
4949
}
5050

51-
if(input.method == "NEXT"){
52-
if(input.inputType == "TEXT"){
53-
let Abra = new Abracadabra(input.inputType,input.outputType);
54-
Abra.Input_Next(input.input,input.mode,input.key,input.q,input.r);
55-
let Output = Abra.Output();
56-
if(input.outputType == "UINT8"){
57-
Output = uint8ArrayToBase64(Output);
58-
}
59-
return Output;
60-
}else if(input.inputType == "UINT8"){
61-
let Abra = new Abracadabra(input.inputType,input.outputType);
62-
let UINT8In = base64ToUint8Array(input.input);
63-
Abra.Input_Next(UINT8In,input.mode,input.key,input.q,input.r);
64-
let Output = Abra.Output();
65-
if(input.outputType == "UINT8"){
66-
Output = uint8ArrayToBase64(Output);
67-
}
68-
return Output;
69-
}else{
70-
return "ERROR inputType";
51+
if (input.method == "NEXT") {
52+
if (input.inputType == "TEXT") {
53+
let Abra = new Abracadabra(input.inputType, input.outputType);
54+
Abra.Input_Next(input.input, input.mode, input.key, input.q, input.r);
55+
let Output = Abra.Output();
56+
if (input.outputType == "UINT8") {
57+
Output = uint8ArrayToBase64(Output);
58+
}
59+
return Output;
60+
} else if (input.inputType == "UINT8") {
61+
let Abra = new Abracadabra(input.inputType, input.outputType);
62+
let UINT8In = base64ToUint8Array(input.input);
63+
Abra.Input_Next(UINT8In, input.mode, input.key, input.q, input.r);
64+
let Output = Abra.Output();
65+
if (input.outputType == "UINT8") {
66+
Output = uint8ArrayToBase64(Output);
67+
}
68+
return Output;
69+
} else {
70+
return "ERROR inputType";
7171
}
72-
}else if(input.method == "OLD"){
73-
if(input.inputType == "TEXT"){
74-
let Abra = new Abracadabra(input.inputType,input.outputType);
75-
Abra.Input(input.input,input.mode,input.key,input.q);
76-
let Output = Abra.Output();
77-
if(input.outputType == "UINT8"){
78-
Output = uint8ArrayToBase64(Output);
79-
}
80-
return Output;
81-
}else if(input.inputType == "UINT8"){
82-
let Abra = new Abracadabra(input.inputType,input.outputType);
83-
let UINT8In = base64ToUint8Array(input.input);
84-
Abra.Input(UINT8In,input.mode,input.key,input.q);
85-
let Output = Abra.Output();
86-
if(input.outputType == "UINT8"){
87-
Output = uint8ArrayToBase64(Output);
88-
}
89-
return Output;
90-
}else{
91-
return "ERROR inputType";
72+
} else if (input.method == "OLD") {
73+
if (input.inputType == "TEXT") {
74+
let Abra = new Abracadabra(input.inputType, input.outputType);
75+
Abra.Input(input.input, input.mode, input.key, input.q);
76+
let Output = Abra.Output();
77+
if (input.outputType == "UINT8") {
78+
Output = uint8ArrayToBase64(Output);
79+
}
80+
return Output;
81+
} else if (input.inputType == "UINT8") {
82+
let Abra = new Abracadabra(input.inputType, input.outputType);
83+
let UINT8In = base64ToUint8Array(input.input);
84+
Abra.Input(UINT8In, input.mode, input.key, input.q);
85+
let Output = Abra.Output();
86+
if (input.outputType == "UINT8") {
87+
Output = uint8ArrayToBase64(Output);
88+
}
89+
return Output;
90+
} else {
91+
return "ERROR inputType";
9292
}
93-
}else{
93+
} else {
9494
return "ERROR method";
9595
}
9696
}
@@ -122,12 +122,12 @@ function JavyreadInput() {
122122
context.bufferOffset += chunk.length;
123123
return context;
124124
},
125-
{ bufferOffset: 0, finalBuffer: new Uint8Array(totalBytes) },
125+
{ bufferOffset: 0, finalBuffer: new Uint8Array(totalBytes) }
126126
);
127127

128128
const InputDecoded = new TextDecoder().decode(finalBuffer);
129129
try {
130-
return JSON.parse(InputDecoded);;
130+
return JSON.parse(InputDecoded);
131131
} catch {
132132
return "ERROR";
133133
}
@@ -140,4 +140,4 @@ function JavywriteOutput(output) {
140140
// Stdout file descriptor
141141
const fd = 1;
142142
Javy.IO.writeSync(fd, buffer);
143-
}
143+
}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "abracadabra-cn",
33
"description": "Use Chinese to Encode Everything",
44
"private": false,
5-
"version": "3.0.10",
5+
"version": "3.0.11",
66
"main": "./dist/abracadabra-cn.js",
77
"type": "module",
88
"scripts": {

src/javascript/main.js

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export class Abracadabra {
172172
}
173173
}
174174
}
175-
/**
175+
/**
176176
* 输入数据以处理,请注意指定的类型
177177
*
178178
* **模式定义**
@@ -188,38 +188,36 @@ export class Abracadabra {
188188
* @param{bool}q 指定是否为密文添加标点符号,默认 true/添加;
189189
* @param{int}r 密文算法的随机程度,越大随机性越强,默认 50,最大100,超过100将会出错;
190190
*/
191-
Input_Next(input, mode, key = "ABRACADABRA", q = true , r = 50) {
191+
Input_Next(input, mode, key = "ABRACADABRA", q = true, r = 50) {
192192
if (this.#input == Abracadabra.UINT8) {
193193
//如果指定输入类型是UINT8
194194
if (Object.prototype.toString.call(input) != "[object Uint8Array]") {
195195
throw "Unexpected Input Type";
196196
}
197-
if(mode == Abracadabra.ENCRYPT){
198-
let Nextinput = new Object();
199-
Nextinput.output = input;
200-
this.#res = Util_Next.enMap(Nextinput, key, q, r);
201-
}else if(mode == Abracadabra.DECRYPT){
202-
let Nextinput = new Object();
203-
Nextinput.output = input;
204-
this.#res = Util_Next.deMap(Nextinput, key);
205-
}
206-
return 0;
207-
197+
if (mode == Abracadabra.ENCRYPT) {
198+
let Nextinput = new Object();
199+
Nextinput.output = input;
200+
this.#res = Util_Next.enMap(Nextinput, key, q, r);
201+
} else if (mode == Abracadabra.DECRYPT) {
202+
let Nextinput = new Object();
203+
Nextinput.output = input;
204+
this.#res = Util_Next.deMap(Nextinput, key);
205+
}
206+
return 0;
208207
} else if (this.#input == Abracadabra.TEXT) {
209208
//如果指定输入类型是TEXT
210209
if (Object.prototype.toString.call(input) != "[object String]") {
211210
throw "Unexpected Input Type";
212211
}
213-
let Nextinput = new Object();
214-
Nextinput.output = Util.stringToUint8Array(input);
215-
if(mode == Abracadabra.ENCRYPT){
216-
this.#res = Util_Next.enMap(Nextinput, key, q, r);
217-
}else if(mode == Abracadabra.DECRYPT){
218-
this.#res = Util_Next.deMap(Nextinput, key);
219-
}
220-
return 0;
212+
let Nextinput = new Object();
213+
Nextinput.output = Util.stringToUint8Array(input);
214+
if (mode == Abracadabra.ENCRYPT) {
215+
this.#res = Util_Next.enMap(Nextinput, key, q, r);
216+
} else if (mode == Abracadabra.DECRYPT) {
217+
this.#res = Util_Next.deMap(Nextinput, key);
218+
}
219+
return 0;
221220
}
222221
return 0;
223222
}
224-
225223
}

0 commit comments

Comments
 (0)