crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Encode & decode message in Base64 according to the websocket protocol

This commit is contained in:
Cyrille Bourgois 2019-09-19 11:16:51 +02:00
parent 9886d5951d
commit 082223fdca
No known key found for this signature in database
GPG Key ID: 6CE60F56870D5FD7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/websock.js
View File

@ -13,6 +13,7 @@
*/ */
import * as Log from './util/logging.js'; import * as Log from './util/logging.js';
import Base64 from './base64.js';
// this has performance issues in some versions Chromium, and // this has performance issues in some versions Chromium, and
// doesn't gain a tremendous amount of performance increase in Firefox // doesn't gain a tremendous amount of performance increase in Firefox
@ -222,6 +223,9 @@ export default class Websock {
_encode_message() { _encode_message() {
// Put in a binary arraybuffer // Put in a binary arraybuffer
// according to the spec, you can send ArrayBufferViews with the send method // according to the spec, you can send ArrayBufferViews with the send method
if (this._websocket.protocol === 'base64') {
return Base64.encode(new Uint8Array(this._sQ.buffer, 0, this._sQlen));
}
return new Uint8Array(this._sQ.buffer, 0, this._sQlen); return new Uint8Array(this._sQ.buffer, 0, this._sQlen);
} }
@ -264,7 +268,13 @@ export default class Websock {
_decode_message(data) { _decode_message(data) {
// push arraybuffer values onto the end // push arraybuffer values onto the end
const u8 = new Uint8Array(data); let u8;
if (this._websocket.protocol === 'base64') {
u8 = Base64.decode(data);
} else {
u8 = new Uint8Array(data);
}
if (u8.length > this._rQbufferSize - this._rQlen) { if (u8.length > this._rQbufferSize - this._rQlen) {
this._expand_compact_rQ(u8.length); this._expand_compact_rQ(u8.length);
} }