aljaz/ttyd
1
1
Fork 0
mirror of https://github.com/tsl0922/ttyd.git synced 2025-12-22 11:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve base64 decode and utf8 handling

Browse Source
This commit is contained in:
Shuanglei Tao
2017-02-03 11:23:59 +08:00
parent de75490d3e
commit f0414d30d8
7 changed files with 129 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
html/index.html
View File

@@ -9,11 +9,12 @@
<link inline href="css/app.css"> <link inline href="css/app.css">
<script inline src="node_modules/xterm/dist/xterm.js"></script> <script inline src="node_modules/xterm/dist/xterm.js"></script>
<script inline src="node_modules/xterm/dist/addons/fit/fit.js"></script> <script inline src="node_modules/xterm/dist/addons/fit/fit.js"></script>
<script inline src="js/overlay/overlay.js"></script> <script inline src="js/utf8.js"></script>
<script inline src="js/overlay.js"></script>
</head> </head>
<body> <body>
<div id="terminal-container"></div> <div id="terminal-container"></div>
<script src="auth_token.js"></script> <script src="auth_token.js"></script>
<script inline src="js/app.js"></script> <script inline src="js/app.js"></script>
</body> </body>
</html> </html>

2
html/js/app.js
View File

@@ -52,7 +52,7 @@
var data = event.data.slice(1); var data = event.data.slice(1);
switch(event.data[0]) { switch(event.data[0]) {
case '0': case '0':
term.write(decodeURIComponent(escape(window.atob(data)))); term.writeUTF8(window.atob(data));
break; break;
case '1': // pong case '1': // pong
break; break;

2
html/js/overlay/overlay.js → html/js/overlay.js
View File

@@ -1,4 +1,6 @@
// ported from hterm.Terminal.prototype.showOverlay // ported from hterm.Terminal.prototype.showOverlay
// https://chromium.googlesource.com/apps/libapps/+/master/hterm/js/hterm_terminal.js
Terminal.prototype.showOverlay = function(msg, timeout) { Terminal.prototype.showOverlay = function(msg, timeout) {
if (!this.overlayNode_) { if (!this.overlayNode_) {
if (!this.element) if (!this.element)

118
html/js/utf8.js Normal file
View File

@@ -0,0 +1,118 @@
// ported from hterm.Terminal.IO.prototype.writeUTF8
// https://chromium.googlesource.com/apps/libapps/+/master/hterm/js/hterm_terminal_io.js
UTF8Decoder = function() {
this.bytesLeft = 0;
this.codePoint = 0;
this.lowerBound = 0;
};
UTF8Decoder.prototype.decode = function(str) {
var ret = '';
for (var i = 0; i < str.length; i++) {
var c = str.charCodeAt(i);
if (this.bytesLeft == 0) {
if (c <= 0x7F) {
ret += str.charAt(i);
} else if (0xC0 <= c && c <= 0xDF) {
this.codePoint = c - 0xC0;
this.bytesLeft = 1;
this.lowerBound = 0x80;
} else if (0xE0 <= c && c <= 0xEF) {
this.codePoint = c - 0xE0;
this.bytesLeft = 2;
this.lowerBound = 0x800;
} else if (0xF0 <= c && c <= 0xF7) {
this.codePoint = c - 0xF0;
this.bytesLeft = 3;
this.lowerBound = 0x10000;
} else if (0xF8 <= c && c <= 0xFB) {
this.codePoint = c - 0xF8;
this.bytesLeft = 4;
this.lowerBound = 0x200000;
} else if (0xFC <= c && c <= 0xFD) {
this.codePoint = c - 0xFC;
this.bytesLeft = 5;
this.lowerBound = 0x4000000;
} else {
ret += '\ufffd';
}
} else {
if (0x80 <= c && c <= 0xBF) {
this.bytesLeft--;
this.codePoint = (this.codePoint << 6) + (c - 0x80);
if (this.bytesLeft == 0) {
var codePoint = this.codePoint;
if (codePoint < this.lowerBound
|| (0xD800 <= codePoint && codePoint <= 0xDFFF)
|| codePoint > 0x10FFFF) {
ret += '\ufffd';
} else {
if (codePoint < 0x10000) {
ret += String.fromCharCode(codePoint);
} else {
codePoint -= 0x10000;
ret += String.fromCharCode(
0xD800 + ((codePoint >>> 10) & 0x3FF),
0xDC00 + (codePoint & 0x3FF));
}
}
}
} else {
ret += '\ufffd';
this.bytesLeft = 0;
i--;
}
}
}
return ret;
};
Terminal.prototype.decodeUTF8 = function(str) {
return (new UTF8Decoder()).decode(str);
};
Terminal.prototype.encodeUTF8 = function(str) {
var ret = '';
for (var i = 0; i < str.length; i++) {
var c = str.charCodeAt(i);
if (0xDC00 <= c && c <= 0xDFFF) {
c = 0xFFFD;
} else if (0xD800 <= c && c <= 0xDBFF) {
if (i+1 < str.length) {
var d = str.charCodeAt(i+1);
if (0xDC00 <= d && d <= 0xDFFF) {
c = 0x10000 + ((c & 0x3FF) << 10) + (d & 0x3FF);
i++;
} else {
c = 0xFFFD;
}
} else {
c = 0xFFFD;
}
}
var bytesLeft;
if (c <= 0x7F) {
ret += str.charAt(i);
continue;
} else if (c <= 0x7FF) {
ret += String.fromCharCode(0xC0 | (c >>> 6));
bytesLeft = 1;
} else if (c <= 0xFFFF) {
ret += String.fromCharCode(0xE0 | (c >>> 12));
bytesLeft = 2;
} else {
ret += String.fromCharCode(0xF0 | (c >>> 18));
bytesLeft = 3;
}
while (bytesLeft > 0) {
bytesLeft--;
ret += String.fromCharCode(0x80 | ((c >>> (6 * bytesLeft)) & 0x3F));
}
}
return ret;
};
Terminal.prototype.writeUTF8 = function (str) {
this.write(this.decodeUTF8(str));
};

5
src/index.html vendored
View File

File diff suppressed because one or more lines are too long

2
src/utils.c
View File

@@ -37,7 +37,7 @@ uppercase(char *str) {
} }
bool bool
endswith(const char * str, const char * suffix) { endswith(const char *str, const char *suffix) {
size_t str_len = strlen(str); size_t str_len = strlen(str);
size_t suffix_len = strlen(suffix); size_t suffix_len = strlen(suffix);
return str_len > suffix_len && !strcmp(str + (str_len - suffix_len), suffix); return str_len > suffix_len && !strcmp(str + (str_len - suffix_len), suffix);

2
src/utils.h
View File

@@ -15,7 +15,7 @@ uppercase(char *str);
// Check whether str ends with suffix // Check whether str ends with suffix
bool bool
endswith(const char * str, const char * suffix); endswith(const char *str, const char *suffix);
// Get human readable signal string // Get human readable signal string
int int