GitHub/witty
3
0
Fork 0
mirror of https://github.com/syssecfsu/witty.git synced 2024-12-24 11:42:34 +01:00
Code Issues Projects Releases Wiki Activity

fix minor issues

Browse Source
This commit is contained in:
Zhi Wang 2022-01-12 06:54:49 -05:00
parent b4b1fb6139
commit e9241e7a6e
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/term.html
View File

@ -38,11 +38,11 @@
term = createTerminal("{{.path}}");
// print something to test output and scroll
var str = [
' ┌────────────────────────────────────────────────────────────────────────────┐',
' │ Powered by \u001b[32;1mGo, Gin, websocket, pty, and https://xtermjs.org\x1b[0m │',
' └────────────────────────────────────────────────────────────────────────────┘',
' ┌────────────────────────────────────────────────────────────────────────────┐\n',
' │ Powered by \u001b[32;1mGo, Gin, websocket, pty, and https://xtermjs.org\x1b[0m │\n',
' └────────────────────────────────────────────────────────────────────────────┘\n',
''
].join('\n\r');
].join('');
term.writeln(str);
</script>

8
term_conn/relay.go
View File

@ -189,7 +189,7 @@ func (tc *TermConn) ptyStdoutToWs(wg *sync.WaitGroup) {
break
}
readBuf = readBuf[:n] // slice the buffer so that it is exact the size of data read.
readBuf = readBuf[0:n] // slice the buffer so that it is exact the size of data read.
bufChan <- readBuf
}
}()
@ -209,7 +209,7 @@ out:
// We could add ws to viewers as well (then we can use io.MultiWriter),
// but we want to handle errors differently
tc.ws.SetWriteDeadline(time.Now().Add(writeWait))
if err := tc.ws.WriteMessage(websocket.BinaryMessage, buf); err != nil {
if err := tc.ws.WriteMessage(websocket.TextMessage, buf); err != nil {
log.Println("Failed to write message: ", err)
break out
}
@ -222,7 +222,7 @@ out:
// if the viewer exits, we will just ignore the error
w.SetWriteDeadline(time.Now().Add(viewWait))
if err := w.WriteMessage(websocket.BinaryMessage, buf); err != nil {
if err := w.WriteMessage(websocket.TextMessage, buf); err != nil {
log.Println("Failed to write message to viewer: ", err)
viewers[i] = nil
@ -231,7 +231,7 @@ out:
}
case viewer := <-tc.vchan:
log.Println("Received viewer", viewer.RemoteAddr().String() )
log.Println("Received viewer", viewer.RemoteAddr().String())
viewers = append(viewers, viewer)
case <-tc.ws_done: