Websockify was removed from noVNC as of this commit. Currently we are running a quite old version of websocket.py which is the only file we use directly from the websockify project. We should set up so that we can do vendordrops from websockify just as we can with noVNC.
There are files living in both noVNC and websockify upstreams and there is no official consensus yet as to which project owns which files. Due to this we don't think we would benefit from adding infrastructure for this atm.
This isn't true anymore. The Websockify project is now the only proper upstream for these files.
NEVER MIND! /webaccess/noVNC/include/websock.js still lives in both the noVNC project and Websockify.. There seems to be more shared files in include.
It is correct that there's some confusion over files such as websock.js. However, for websocket.py, it is clear that the websockify project is the only upstream. This file is no longer a part of the noVNC project. It is also still true that we are using this file, and that we are lagging behind. This is suboptimal. This means that we are not getting bug fixes or work such as Python 3 compatibility. See https://github.com/kanaka/websockify/commits/master/websockify/websocket.py .
Without a vendordrop structure, it's also difficult to see our own changes. r31509 does some changes that have not been pushed upstream, though.
Should be all done.
Tester should try to torment the websocket/VNC connection and see if there is some way to get it to misbehave.
Tried to torment websock/VNC connection but did not find anything to remark about. Works good. (Firefox 81)
There is this complaint in logs now:
> Oct 23 14:59:20 ubuntu1804 bash: /opt/thinlinc/modules/thinlinc/websocket.py:30: UserWarning: no 'numpy' module, HyBi protocol will be slower
> Oct 23 14:59:20 ubuntu1804 bash: warnings.warn("no 'numpy' module, HyBi protocol will be slower")
No warning now. Rechecked on Ubuntu 18.04.
Oops. I only tested client disconnects, and not logouts. Should be fixed now.
No longer crashes on log out.