U 优化web终端对中文编码支持

Author: vapao

spug_api/consumer/consumers.py

@@ -93,7 +93,11 @@ def loop_read(self):
             if not data:
                 self.close(3333)
                 break
-            self.send(bytes_data=data)
+            try:
+                text = data.decode()
+            except UnicodeDecodeError:
+                text = data.decode(encoding='GBK', errors='ignore')
+            self.send(text_data=text)
 
     def receive(self, text_data=None, bytes_data=None):
         data = text_data or bytes_data
@@ -120,15 +124,15 @@ def connect(self):
             self.close()
 
     def _init(self):
-        self.send(bytes_data=b'\r\33[KConnecting ...\r')
+        self.send(text_data='\r\33[KConnecting ...\r')
         host = Host.objects.filter(pk=self.id).first()
         if not host:
             self.send(text_data='Unknown host\r\n')
             self.close()
         try:
             self.ssh = host.get_ssh().get_client()
         except Exception as e:
-            self.send(bytes_data=f'Exception: {e}\r\n'.encode())
+            self.send(text_data=f'Exception: {e}\r\n'.encode())
             self.close()
             return
         self.chan = self.ssh.invoke_shell(term='xterm')

spug_web/src/pages/ssh/Terminal.js

@@ -24,7 +24,7 @@ function WebSSH(props) {
     term.write('WebSocket connecting ... ');
     const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
     const socket = new WebSocket(`${protocol}//${window.location.host}/api/ws/ssh/${props.id}/?x-token=${X_TOKEN}`);
-    socket.onmessage = e => _read_as_text(e.data);
+    socket.onmessage = e => term.write(e.data)
     socket.onopen = () => {
       term.write('ok')
       term.focus();
@@ -68,12 +68,6 @@ function WebSSH(props) {
     }
   }
 
-  function _read_as_text(data) {
-    const reader = new window.FileReader();
-    reader.onload = () => term.write(reader.result);
-    reader.readAsText(data, 'utf-8')
-  }
-
   return (
     <div className={styles.termContainer}>
       <div className={styles.terminal} ref={container}/>