fix garbled characters

package.json

@@ -1,6 +1,6 @@
 {
   "name": "trzsz",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Making webshell and terminal supports trzsz ( trz / tsz ), which similar to ( rz / sz ), and compatible with tmux.",
   "main": "lib/trzsz.js",
   "types": "lib/trzsz.d.ts",

src/comm.ts

@@ -37,14 +37,18 @@ export function strToUint8(str: string): Uint8Array {
   return Uint8Array.from(str, (v) => v.charCodeAt(0));
 }
 
-export async function uint8ToStr(buf: Uint8Array): Promise<string> {
+export async function uint8ToStr(buf: Uint8Array, encoding: BufferEncoding = "binary"): Promise<string> {
   if (typeof Buffer === "function") {
-    return Buffer.from(buf).toString("latin1");
+    return Buffer.from(buf).toString(encoding);
   }
   return new Promise<string>((resolve) => {
     const reader = new FileReader();
     reader.onloadend = () => resolve(reader.result as string);
-    reader.readAsBinaryString(new Blob([buf]));
+    if (encoding == "binary") {
+      reader.readAsBinaryString(new Blob([buf]));
+    } else {
+      reader.readAsText(new Blob([buf]), encoding);
+    }
   });
 }
 

src/transfer.ts

@@ -146,7 +146,7 @@ export class TrzszTransfer {
 
   private async recvString(typ: string, mayHasJunk: boolean = false) {
     const buf = await this.recvCheck(typ, mayHasJunk);
-    return uint8ToStr(decodeBuffer(buf));
+    return uint8ToStr(decodeBuffer(buf), "utf8");
   }
 
   private async checkString(expect: string) {

test/comm.test.ts

@@ -35,11 +35,13 @@ test("string and Uint8Array transform", async () => {
   const str2 = "\xAB\xCD\xEF\xFE\xDC\xBA\x80\x81\x82\x83\x84";
   expect(await uint8ToStr(strToUint8(str1))).toBe(str1);
   expect(await uint8ToStr(strToUint8(str2))).toBe(str2);
+  expect(await uint8ToStr(strToUint8("\xE4\xB8\xAD\xE6\x96\x87UTF8"), "utf8")).toBe("中文UTF8");
   const buffer = global.Buffer;
   global.Buffer = undefined;
   try {
     expect(await uint8ToStr(strToUint8(str1))).toBe(str1);
     expect(await uint8ToStr(strToUint8(str2))).toBe(str2);
+    expect(await uint8ToStr(strToUint8("\xE4\xB8\xAD\xE6\x96\x87UTF8"), "utf8")).toBe("中文UTF8");
   } finally {
     global.Buffer = buffer;
   }

test/filter.test.ts

@@ -286,7 +286,7 @@ test("cancel upload files", async () => {
   expect(sendToServer.mock.calls.length).toBe(1);
   const data = sendToServer.mock.calls[0][0];
   expect(data).toContain("#ACT:");
-  const action = JSON.parse(await uint8ToStr(decodeBuffer(data.substring(5, data.length - 1))));
+  const action = JSON.parse(await uint8ToStr(decodeBuffer(data.substring(5, data.length - 1)), "utf8"));
   expect(action.confirm).toBe(false);
 });
 
@@ -312,7 +312,7 @@ test("cancel download files", async () => {
   expect(sendToServer.mock.calls.length).toBe(1);
   const data = sendToServer.mock.calls[0][0];
   expect(data).toContain("#ACT:");
-  const action = JSON.parse(await uint8ToStr(decodeBuffer(data.substring(5, data.length - 1))));
+  const action = JSON.parse(await uint8ToStr(decodeBuffer(data.substring(5, data.length - 1)), "utf8"));
   expect(action.confirm).toBe(false);
 });
 

test/transfer.test.ts

@@ -560,7 +560,7 @@ test("send config to remote", async () => {
   expect(writer.mock.calls[1][0]).toContain("#CFG:");
   expect((trzsz as any).transferConfig.bufsize).toBe(100);
   const cfgOut = writer.mock.calls[1][0];
-  const cfgStr = await uint8ToStr(decodeBuffer(cfgOut.substring(5, cfgOut.length - 1)));
+  const cfgStr = await uint8ToStr(decodeBuffer(cfgOut.substring(5, cfgOut.length - 1)), "utf8");
   expect(cfgStr).toContain('["\\u00ee","\\u00ee\\u00ee"]');
   expect(cfgStr).toContain('["~","\\u00ee1"]');
   expect(cfgStr).toContain('["\\u0002","\\u00eeA"]');