Move responsibility to decode output encoding to terminal implementation

js/dist/xterm.d.ts

@@ -1,11 +1,13 @@
 import * as bare from "xterm";
+import { lib } from "libapps";
 export declare class Xterm {
     elem: HTMLElement;
+    term: bare;
+    resizeListener: () => void;
+    decoder: lib.UTF8Decoder;
     message: HTMLElement;
     messageTimeout: number;
     messageTimer: number;
-    term: bare;
-    resizeListener: () => void;
     constructor(elem: HTMLElement);
     info(): {
         columns: number;

js/src/hterm.ts

@@ -29,7 +29,7 @@ export class Hterm {
 
     output(data: string) {
         if (this.term.io != null) {
-            this.term.io.writeUTF16(data);
+            this.term.io.writeUTF8(data);
         }
     };
 

js/src/webtty.ts

@@ -1,5 +1,3 @@
-import { lib } from "libapps"
-
 export const protocols = ["webtty"];
 
 export const msgInputUnknown = '0';
@@ -65,8 +63,6 @@ export class WebTTY {
         let reconnectTimeout: number;
 
         const setup = () => {
-            const decoder = new lib.UTF8Decoder()
-
             connection.onOpen(() => {
                 const termInfo = this.term.info();
 
@@ -108,7 +104,7 @@ export class WebTTY {
                 const payload = data.slice(1);
                 switch (data[0]) {
                     case msgOutput:
-                        this.term.output(decoder.decode(atob(payload)));
+                        this.term.output(atob(payload));
                         break;
                     case msgPong:
                         break;

js/src/xterm.ts

@@ -1,16 +1,19 @@
 import * as bare from "xterm";
+import { lib } from "libapps"
+
 
 bare.loadAddon("fit");
 
 export class Xterm {
     elem: HTMLElement;
+    term: bare;
+    resizeListener: () => void;
+    decoder: lib.UTF8Decoder;
 
     message: HTMLElement;
     messageTimeout: number;
     messageTimer: number;
 
-    term: bare;
-    resizeListener: () => void;
 
     constructor(elem: HTMLElement) {
         this.elem = elem;
@@ -20,7 +23,6 @@ export class Xterm {
         this.message.className = "xterm-overlay";
         this.messageTimeout = 2000;
 
-
         this.resizeListener = () => {
             this.term.fit();
             this.term.scrollToBottom();
@@ -33,6 +35,8 @@ export class Xterm {
         });
 
         this.term.open(elem, true);
+
+        this.decoder = new lib.UTF8Decoder()
     };
 
     info(): { columns: number, rows: number } {
@@ -40,7 +44,7 @@ export class Xterm {
     };
 
     output(data: string) {
-        this.term.write(data);
+        this.term.write(this.decoder.decode(data));
     };
 
     showMessage(message: string, timeout: number) {