add new unit tests and expand testing, fix makefile

Makefile

@@ -11,11 +11,18 @@ default:
 
 clean:
 	rm -rf build
-	rm -rf ./node_modules
-	rm -f .sconsign.dblite
+	#rm -rf ./node_modules
+	#rm -f .sconsign.dblite
 
 requirements:
-	pip install scons boto taschenmesser
+	pip install -U scons boto taschenmesser
+	sudo apt install -y npm nodejs-legacy default-jre
+	node -v
+	sudo npm install -g google-closure-compiler nodeunit
+
+browser_deps:
+	npm install
+	npm update
 
 build: build_browser build_npm
 
@@ -27,11 +34,14 @@ build_npm:
 
 publish: publish_browser publish_npm
 
-publish_browser:
+publish_browser: build_browser
 	scons publish
+
+copy_browser: build_browser
 	git -C ../autobahn-js-built pull
 	cp ./build/* ../autobahn-js-built
-	@echo "Now commit and push autobahn-js-built!"
+	cp ./build/* ../crossbar/crossbar/templates/default/web/js/
+	@echo "Now commit and push these repos: autobahn-js-built, crossbar"
 
 publish_npm:
 	npm publish

SConstruct

@@ -4,9 +4,13 @@ import pkg_resources
 
 taschenmesser = pkg_resources.resource_filename('taschenmesser', '..')
 #taschenmesser = "../../infrequent/taschenmesser"
+ENV=os.environ
+
+ENV['JS_COMPILER'] = '/usr/local/lib/node_modules/google-closure-compiler/compiler.jar'
+
 env = Environment(tools = ['default', 'taschenmesser'],
                   toolpath = [taschenmesser],
-                  ENV = os.environ)
+                  ENV = ENV)
 
 # Get package version
 version = json.load(open('package.json'))['version']
@@ -23,7 +27,7 @@ sources = [os.path.join(sourcedir, d) for d in os.listdir(sourcedir)]
 # browserified
 ab = env.Command("build/autobahn.js",
                  "lib/autobahn.js",
-                 "browserify $SOURCE --standalone autobahn -o $TARGET")
+                 "/usr/local/lib/node_modules/browserify/bin/cmd.js $SOURCE --ignore-missing --standalone autobahn -o $TARGET")
 Depends(ab, sources)
 
 # minimized (with Google Closure)

lib/connection.js

@@ -149,11 +149,11 @@ Connection.prototype._create_transport = function () {
          }
       } catch (e) {
          // ignore
-         log.debug("could not create WAMP transport '" + transport_factory.type + "': " + e);
+         log.warn("could not create WAMP transport '" + transport_factory.type + "': " + e);
       }
    }
 
-   // could not create any WAMP transport
+   log.warn('could not create any WAMP transport');
    return null;
 };
 
@@ -276,7 +276,11 @@ Connection.prototype.open = function () {
    function retry () {
 
       // create a WAMP transport
-      self._transport = self._create_transport();
+      try {
+         self._transport = self._create_transport();
+      } catch (e) {
+         console.log(e);
+      }
 
       if (!self._transport) {
          // failed to create a WAMP transport

lib/log.js

@@ -20,4 +20,7 @@ if ('AUTOBAHN_DEBUG' in global && AUTOBAHN_DEBUG && 'console' in global) {
    }
 }
 
+var warn = console.warn;
+
 exports.debug = debug;
+exports.warn = warn;

package.json

@@ -1,41 +1,45 @@
 {
-    "name": "autobahn",
-    "version": "0.11.2",
-    "description": "An implementation of The Web Application Messaging Protocol (WAMP).",
-    "main": "index.js",
-    "scripts": {
-        "test": "nodeunit test/test.js"
-    },
-    "dependencies": {
-        "crypto-js": ">= 3.1.8",
-        "tweetnacl": ">= 0.14.3",
-        "when": ">= 3.7.7",
-        "ws": ">= 1.1.1",
-        "msgpack-lite": ">= 0.1.26",
-        "int64-buffer": ">= 0.1.9"
-    },
-    "optionalDependencies": {
-        "bufferutil": ">= 1.2.1",
-        "utf-8-validate": ">= 1.2.1"
-    },
-    "devDependencies": {
-        "browserify": ">= 13.1.1",
-        "nodeunit": ">= 0.10.2"
-    },
-    "browser": {
-        "ws": false,
-        "lib/transport/rawsocket.js": false
-    },
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/crossbario/autobahn-js.git"
-    },
-    "keywords": [
-        "WAMP",
-        "WebSocket",
-        "RPC",
-        "PubSub"
-    ],
-    "author": "Crossbar.io Technologies GmbH",
-    "license": "MIT"
+  "name": "autobahn",
+  "version": "0.12.0",
+  "description": "An implementation of The Web Application Messaging Protocol (WAMP).",
+  "main": "index.js",
+  "scripts": {
+    "test": "nodeunit test/test.js"
+  },
+  "engines": {
+    "node": ">= 4.2.6"
+  },
+  "dependencies": {
+    "crypto-js": ">= 3.1.8",
+    "google-closure-compiler": "^20170218.0.0",
+    "int64-buffer": ">= 0.1.9",
+    "msgpack-lite": ">= 0.1.26",
+    "tweetnacl": ">= 0.14.3",
+    "when": ">= 3.7.7",
+    "ws": "< 2.0.0"
+  },
+  "optionalDependencies": {
+    "bufferutil": ">= 1.2.1",
+    "utf-8-validate": ">= 1.2.1"
+  },
+  "devDependencies": {
+    "browserify": ">= 13.1.1",
+    "nodeunit": ">= 0.10.2"
+  },
+  "browser": {
+    "ws": false,
+    "lib/transport/rawsocket.js": false
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/crossbario/autobahn-js.git"
+  },
+  "keywords": [
+    "WAMP",
+    "WebSocket",
+    "RPC",
+    "PubSub"
+  ],
+  "author": "Crossbar.io Technologies GmbH",
+  "license": "MIT"
 }

test/test.js

@@ -13,6 +13,8 @@
 
 // this works via https://github.com/caolan/nodeunit
 
+var sync = require('./test_basic_sync.js');
+var async = require('./test_basic_async.js');
 var connect = require('./test_connect.js');
 var msgpack_serialization = require('./test_msgpack_serialization.js');
 var rpc_complex = require('./test_rpc_complex.js');
@@ -32,6 +34,8 @@ var pubsub_prefix_sub = require('./test_pubsub_prefix_sub.js');
 var pubsub_wildcard_sub = require('./test_pubsub_wildcard_sub.js');
 
 
+exports.testSync = sync.testSync;
+exports.testAsync = async.testAsync;
 exports.testConnect = connect.testConnect;
 exports.testMsgpackSerialization = msgpack_serialization.testMsgpackSerialization;
 exports.testRpcArguments = rpc_arguments.testRpcArguments;
@@ -46,6 +50,7 @@ exports.testPubsubComplex = pubsub_complex.testPubsubComplex;
 exports.testPubsubOptions = pubsub_options.testPubsubOptions;
 exports.testPubsubExcludeMe = pubsub_excludme.testPubsubExcludeMe;
 exports.testPubsubExclude = pubsub_exclude.testPubsubExclude;
+exports.testPubsubEligible = pubsub_eligible.testPubsubEligible;
 exports.testPubsubPrefixSub = pubsub_prefix_sub.testPubsubPrefixSub;
 exports.testPubsubWildcardSub = pubsub_wildcard_sub.testPubsubWildcardSub;
 

test/test_basic_async.js

@@ -0,0 +1,41 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  AutobahnJS - http://autobahn.ws, http://wamp.ws
+//
+//  A JavaScript library for WAMP ("The Web Application Messaging Protocol").
+//
+//  Copyright (c) Crossbar.io Technologies GmbH and contributors
+//
+//  Licensed under the MIT License.
+//  http://www.opensource.org/licenses/mit-license.php
+//
+///////////////////////////////////////////////////////////////////////////////
+
+var autobahn = require('./../index.js');
+var testutil = require('./testutil.js');
+
+exports.testAsync = function (testcase) {
+
+   testcase.expect(1);
+
+   var test = new testutil.Testlog("test/test_basic_async.txt");
+
+   var d1 = autobahn.when.defer();
+   var d2 = autobahn.when.defer();
+
+   var df = autobahn.when.all([d1.promise, d2.promise]).then(
+      function (res) {
+         test.log(res);
+         var chk = test.check();
+         testcase.ok(!chk, chk);
+         testcase.done();
+      },
+      function (err) {
+         test.log(err);
+         testcase.done();
+      }
+   );
+
+   d1.resolve(23);
+   d2.resolve(42);
+}

test/test_basic_async.txt

@@ -0,0 +1 @@
+0 [23,42]

test/test_basic_sync.js

@@ -0,0 +1,27 @@
+///////////////////////////////////////////////////////////////////////////////
+//
+//  AutobahnJS - http://autobahn.ws, http://wamp.ws
+//
+//  A JavaScript library for WAMP ("The Web Application Messaging Protocol").
+//
+//  Copyright (c) Crossbar.io Technologies GmbH and contributors
+//
+//  Licensed under the MIT License.
+//  http://www.opensource.org/licenses/mit-license.php
+//
+///////////////////////////////////////////////////////////////////////////////
+
+var autobahn = require('./../index.js');
+var testutil = require('./testutil.js');
+
+exports.testSync = function (testcase) {
+
+   testcase.expect(1);
+
+   var test = new testutil.Testlog("test/test_basic_sync.txt");
+
+   test.log(true);
+   var chk = test.check();
+   testcase.ok(!chk, chk);
+   testcase.done();
+}

test/test_basic_sync.txt

@@ -0,0 +1 @@
+0 true

test/test_connect.js

@@ -14,7 +14,6 @@
 var autobahn = require('./../index.js');
 var testutil = require('./testutil.js');
 
-
 exports.testConnect = function (testcase) {
 
    testcase.expect(1);
@@ -35,12 +34,13 @@ exports.testConnect = function (testcase) {
             res[i].leave();
          }
 
-         var chk = test.check()
+         var chk = test.check();
          testcase.ok(!chk, chk);
          testcase.done();
       },
       function (err) {
          test.log(err);
+         testcase.done();
       }
    );
 }

test/testutil.js

@@ -45,6 +45,10 @@ function connect_n(n) {
             d.resolve(session);
          };
 
+         connection.onclose = function (reason, details) {
+            console.log('CLOSE', reason, details);
+         }
+
          connection.open();
 
          dl.push(d.promise);
@@ -60,6 +64,7 @@ var Testlog = function (filename) {
 
    self._filename = filename;
    self._log = [];
+//   self._log = [["AutobahnJS " + autobahn.version]];
 };