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

Merge pull request #1262 from shiramax/sub_protocols 

Add support in websocket sub-protocols
This commit is contained in:
Samuel Mannehed 2019-07-23 15:24:10 +02:00 committed by GitHub
parent 8f2bcfbe79 25b3d49d32
commit 21387f9c24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/rfb.js
View File

@ -53,6 +53,7 @@ export default class RFB extends EventTargetMixin {
this._shared = 'shared' in options ? !!options.shared : true; this._shared = 'shared' in options ? !!options.shared : true;
this._repeaterID = options.repeaterID || ''; this._repeaterID = options.repeaterID || '';
this._showDotCursor = options.showDotCursor || false; this._showDotCursor = options.showDotCursor || false;
this._wsProtocols = options.wsProtocols || ['binary'];
// Internal state // Internal state
this._rfb_connection_state = ''; this._rfb_connection_state = '';
@ -397,7 +398,7 @@ export default class RFB extends EventTargetMixin {
try { try {
// WebSocket.onopen transitions to the RFB init states // WebSocket.onopen transitions to the RFB init states
this._sock.open(this._url, ['binary']); this._sock.open(this._url, this._wsProtocols);
} catch (e) { } catch (e) {
if (e.name === 'SyntaxError') { if (e.name === 'SyntaxError') {
this._fail("Invalid host or port (" + e + ")"); this._fail("Invalid host or port (" + e + ")");

3
docs/API.md
View File

@ -187,6 +187,9 @@ connection to a specified VNC server.
- A `DOMString` specifying the ID to provide to any VNC repeater - A `DOMString` specifying the ID to provide to any VNC repeater
encountered. encountered.
`wsProtocols`
- Protocols to use in the WebSocket connection, the default is: ['binary']
#### connect #### connect
The `connect` event is fired after all the handshaking with the server The `connect` event is fired after all the handshaking with the server