Use libapps utf8 decoder

00pf00 · Aug 23, 2017 · ba1aa69 · ba1aa69
1 parent 248f51b
commit ba1aa69
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 39 deletions.
diff --git a/js/dist/gotty-bundle.js b/js/dist/gotty-bundle.js
diff --git a/js/src/webtty.ts b/js/src/webtty.ts
@@ -1,3 +1,5 @@
+import { lib } from "libapps"
+
 export const protocols = ["webtty"];
 
 export const msgInputUnknown = '0';
@@ -62,6 +64,8 @@ export class WebTTY {
         let pingTimer: number;
         let reconnectTimeout: number;
 
+        const decoder = new lib.UTF8Decoder()
+
         const setup = () => {
             connection.onOpen(() => {
                 const termInfo = this.term.info();
@@ -104,11 +108,7 @@ export class WebTTY {
                 const payload = data.slice(1);
                 switch (data[0]) {
                     case msgOutput:
-                        this.term.output(
-                            decodeURIComponent(Array.prototype.map.call(atob(payload), function(c) {
-                                return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-                            }).join(''))
-                        );
+                        this.term.output(decoder.decode(atob(payload)));
                         break;
                     case msgPong:
                         break;

diff --git a/js/typings/libapps/index.d.ts b/js/typings/libapps/index.d.ts
@@ -44,4 +44,8 @@ export declare namespace lib {
     export var Storage: {
         Memory: Memory
     }
+
+    export class UTF8Decoder {
+        decode(str: string)
+    }
 }
diff --git a/server/asset.go b/server/asset.go