Eggify websockify #15
Conversation
|
@desaintmartin, did you see my questions on the pull request? |
|
Yes! I don't have any time those days. I will come back in a few days to answer/improve what I tried to do. |
Pull 63aa9ce07 from https://github.com/kumina/wsproxy
Signed-off-by: Chris Gordon <snorkeyg@gmail.com>
Need to detect leading TLS/SSL character by number too for python 3.
This current code accepts WebSocket connections and can send data back and forth.
Still needs some cleanup related to cleaning up client and target connections.
Also, disable verbose debug.
Generic TCP client and Websocket server code is now split out from the websockify specific code.
Can now be launched like so: lein run websockify --web ../../noVNC/ 6080 localhost:5901
It's probably broken and it's definitely still messy in several ways, but basic tests work with Chrome. Several other C websockify cleanups: - Remove most of the non-thread safe global variable usage (still a little bit that could be fixed so that threading would be easier). - Remove wswrapper. It is unmaintained, out of date, and never worked well anyways (since it really needed a way to do asynchronous queued work but it was running in another process context making that hard). - Use md5 routines from openssl. - Remove md5.c and md5.h since no longer needed. Thanks to https://github.com/dew111 for spurring me on to get this done by writing code. I didn't end up using much his forked code, but having something there goaded me enough to just get it working.
Significant refactor of decode_hybi() and use of it in do_proxy().
IE9 still doesn't support [].map() so add it to the prototype in include/util.js.
|
I see you added symlink websockify.py. I will clean my fork to change pull-request without my own symlink and with correct manifest. |
|
@desaintmartin, this pull request is backwards in time. I.e. if I merge it I will get your changes but it will back out several months of my changes. Can you merge forward and update the pull? |
|
I have already pulled your changes into my repo (using pull --rebase, not pull) and updated pull request, but it seems github wanted me to use pull (i.e merge). I am not familiar yet with github workflow, I will create new clean fork, apply my patches, and create new pull request. |
Websockify is now an egg.
The egg only includes python code and not js files. It may be changed (tell me, and I'll try in another pull request).
It will allow easy deployment ($ easy_install websockify) and can be uploaded to pypi.python.org.