Update to version 0.4.0

*** IMPORTANT NOTE ***

This is the last minor version to support the Hixie protocol. I may do
bug fixes (e.g. 0.4.1) but 0.5.0 will drop the Hixie protocol support.
The latest released version of all major browsers (and web-socket-js)
support the IETF 6455 protocol.

- Other changes: updating TODO and release process notes.

CHANGES.txt

@@ -1,6 +1,12 @@
 Changes
 =======
 
+0.4.0 - Mar 12, 2013
+--------------------
+
+ * ***NOTE*** : 0.5.0 will drop Hixie protocol support
+ * use Buffer base64 support in Node.js implementation
+
 0.3.0 - Jan 15, 2013
 --------------------
 

docs/TODO

@@ -1,9 +1,6 @@
 - Go implementation
-
-- Support multiple targets that are selected by the path line. Some
-  sort of wildcarding of ports too.
-
-- Support SSL targets too.
-
+- Rust implementation
+- Add sub-protocol support to upstream einaros/ws module and use that
+  instead of the patched module.
 - wstelnet: support CSI L and CSI M
 

docs/notes

@@ -13,5 +13,12 @@ browser.
 
 Building web-socket-js emulator:
 
-cd include/web-socket-js/flash-src
-mxmlc -static-link-runtime-shared-libraries WebSocketMain.as
+    cd include/web-socket-js/flash-src
+    mxmlc -static-link-runtime-shared-libraries WebSocketMain.as
+
+Building release tarball:
+    - not really necessary since tagged revision can be downloaded
+      from github as tarballs
+
+    git archive --format=tar --prefix=websockify-${WVER}/ v${WVER} > websockify-${WVER}.tar
+    gzip websockify-${WVER}.tar

docs/release.txt

@@ -4,8 +4,6 @@
     git tag v${WVER}
     git push origin master
     git push origin v${WVER}
-    git archive --format=tar --prefix=websockify-${WVER}/ v${WVER} > websockify-${WVER}.tar
-    gzip websockify-${WVER}.tar
 - Register with pypi.python.org (once):
     python setup.py register
 - Upload the source distribution to pypi

other/websockify.js

@@ -5,8 +5,8 @@
 // Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
 
 // Known to work with node 0.8.9
-// Requires node modules: ws, base64, optimist and policyfile
-//     npm install ws base64 optimist policyfile
+// Requires node modules: ws, optimist and policyfile
+//     npm install ws optimist policyfile
 //
 // NOTE: 
 // This version requires a patched version of einaros/ws that supports
@@ -26,7 +26,6 @@ var argv = require('optimist').argv,
     fs = require('fs'),
     policyfile = require('policyfile'),
 
-    base64 = require('base64/build/Release/base64'),
     Buffer = require('buffer').Buffer,
     WebSocketServer = require('ws').Server,
 
@@ -51,7 +50,7 @@ new_client = function(client) {
         //log("sending message: " + data);
         try {
             if (client.protocol === 'base64') {
-                client.send(base64.encode(new Buffer(data)));
+                client.send(new Buffer(data).toString('base64'));
             } else {
                 client.send(data,{binary: true});
             }
@@ -67,7 +66,7 @@ new_client = function(client) {
     client.on('message', function(msg) {
         //log('got message: ' + msg);
         if (client.protocol === 'base64') {
-            target.write(base64.decode(msg),'binary');
+            target.write(new Buffer(msg, 'base64'));
         } else {
             target.write(msg,'binary');
         }

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.3.0'
+version = '0.4.0'
 name = 'websockify'
 long_description = open("README.md").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"