fix default ports in examples

README.md

@@ -1,19 +1,34 @@
-# wamp.rt: A WAMP V2 nodejs router
-##Copyright Orange 2014, All Rights Reserved
+# FOX.WAMP is a WAMP v2 message router implementation
 
-wamp.rt is a WebSocket Application Messaging Protocol [WAMP](http://wamp.ws/) V2 router implementation based on nodejs.
-
-The router is compliant with the WAMP V2 [Basic Profile](https://github.com/tavendo/WAMP/blob/master/spec/basic.md).
-
-wamp.rt implements both [Dealer](https://github.com/tavendo/WAMP/blob/master/spec/basic.md#peers-and-roles) and [Broker](https://github.com/tavendo/WAMP/blob/master/spec/basic.md#peers-and-roles) roles.
+The message router is compliant with the [WAMP V2 Basic Profile](http://wamp-proto.org/).
 
 ## Build Instructions
 
 Install using npm. Depending on what you want to do, your mileage may vary.
 
 ## Credits
 
-wamp.rt has been inspired by the following Open Source projects:
+fox.wamp has been inspired by the following Open Source projects:
+
+- [wamp.rt](https://github.com/Orange-OpenSource/wamp.rt)
+- [wamp.io](https://github.com/nicokaiser/wamp.io)
+
+
+## Changes:
+2017-05-17:
+- Concrete topic published to
+- Progressive Calls (receive_progress & progress)
+
+2017-05-07:
+- exclude_me option of publish
+
+2017-04-26:
+- integration with [StatsD](https://github.com/etsy/statsd)
 
-- [wamp.io](https://github.com/nicokaiser/wamp.io) 
+2016-04-03:
+- ticket auth support added
 
+2016-03-09:
+- internal api moved to realm
+- callrpc method has args & kwargs arguments
+- publish method does not require message id

democli/backend.js

@@ -0,0 +1,114 @@
+AUTOBAHN_DEBUG = true;
+var autobahn = require('autobahn');
+var program = require('commander');
+
+program
+    .option('-p, --port <port>', 'Server IP port', 9000)
+    .option('-i, --ip <ip>', 'Server IP address','127.0.0.1')
+    .parse(process.argv);
+
+var connectUrl = 'ws://' + program.ip + ':' + program.port;
+console.log('connectUrl:', connectUrl);
+
+var connection = new autobahn.Connection({
+    url: connectUrl,
+    realm: 'realm1'}
+);
+
+connection.onopen = function (session) {
+
+   var reg = null;
+   var reg2 = null;
+
+   function utcprogress(args, kwargs, options) {
+      console.log("Someone is calling utc function", args, kwargs, options);
+      if (options.progress) {
+          setTimeout(function () {
+              var now = new Date();
+              options.progress(now.toISOString());
+          }, 100);
+          setTimeout(function () {
+              var now = new Date();
+              options.progress(now.toISOString());
+          }, 200);
+          return new Promise((resolve, reject) => {
+              setTimeout(function () {
+                  var now = new Date();
+                  resolve(now.toISOString());
+              }, 300);
+          });
+      }
+      else {
+          var now = new Date();
+          return now.toISOString();
+      }
+   }
+
+   session.register('com.timeservice.now', utcprogress).then(
+      function (registration) {
+         console.log("Procedure registered:", registration.id);
+         reg = registration;
+      },
+      function (error) {
+         console.log("Registration failed:", error);
+      }
+   );
+
+   function echo(args,kwargs) {
+     console.log("args",args,"kwargs",kwargs);
+     return new autobahn.Result(args, kwargs);
+   }
+
+   session.register('com.echoservice.echo', echo).then(
+      function (registration) {
+         console.log("Procedure echo registered:", registration.id);
+         reg2 = registration;
+      },
+      function (error) {
+         console.log("Registration failed:", error);
+      }
+   );
+
+    // Define an event handler
+   function onEvent(publishArgs, kwargs, opts) {
+      console.log('Event', opts.topic, 'received args', publishArgs, 'kwargs ',kwargs);
+   }
+
+   // Subscribe to a topic
+   session.subscribe('com.myapp.topic1', onEvent).then(
+      function(subscription) {
+         console.log("subscription successfull", subscription);
+      },
+      function(error) {
+         console.log("subscription failed", error);
+      }
+   );
+
+   session.subscribe('wamp.session.on_join', onEvent).then(
+      function(subscription) {
+         console.log("subscription successfull", subscription);
+      },
+      function(error) {
+         console.log("subscription failed", error);
+      }
+   );
+
+   session.subscribe('wamp.session.on_leave', onEvent).then(
+      function(subscription) {
+         console.log("subscription successfull", subscription);
+      },
+      function(error) {
+         console.log("subscription failed", error);
+      }
+   );
+
+  setTimeout(function() {
+      console.log("Unregistration");
+      session.unregister(reg);
+      session.unregister(reg2);
+    },
+    20000
+  );
+};
+
+connection.open();

test/frontend.js → democli/frontend.js

@@ -3,33 +3,52 @@ var autobahn = require('autobahn');
 var program = require('commander');
 
 program
-    .option('-p, --port <port>', 'Server IP port', parseInt,9000)
+    .option('-p, --port <port>', 'Server IP port', 9000)
     .option('-i, --ip <ip>', 'Server IP address','127.0.0.1')
     .parse(process.argv);
 
-var connection = new autobahn.Connection({
-   url: 'ws://' + program.ip + ':' + program.port,
-   realm: 'realm1'}
-);
+var connectUrl = 'ws://' + program.ip + ':' + program.port + '/ws';
+console.log('connectUrl:', connectUrl);
+
+var user = "joe";
+var key = "joe-secret";
+
+// this callback is fired during authentication
+function onchallenge (session, method, extra) {
+    if (method === "ticket") {
+        return key;
+    } else {
+        throw "don't know how to authenticate using '" + method + "'";
+    }
+}
 
-var session = null;
+var connection = new autobahn.Connection({
+    url: connectUrl,
+    realm: 'realm1',
+//    authmethods: ["ticket", "wampcra"],
+    authid: user,
+    onchallenge: onchallenge
+});
 
-connection.onopen = function (new_session) {
+connection.onopen = function (session, details) {
 
-   session = new_session;
    session.log("Session open.");
 
    var starttime = Date.now();
-   session.call('com.timeservice.now').then(
+   var c1 = session.call('com.timeservice.now', [], {}, {receive_progress:true}).then(
       function (now) {
          // this method returns a plain value
          session.log("Call com.timeservice.now completed in " +
                      (Date.now() - starttime) +
                      " ms: result =", now);
       },
       function (error) {
-         console.log("Call failed:", error);
-      });
+          console.log("Call failed:", error);
+      },
+      function (progress) {
+          console.log("Call progress:", progress);
+      }
+    );
 
    session.call('com.echoservice.echo').then(
       function (res) {
@@ -90,12 +109,11 @@ connection.onopen = function (new_session) {
       }
    );
 
-   session.call('wamp.rt.foo',["test"]).then(
+   session.call('test.foo', ["test"], {foo:'bar'}).then(
       function (res) {
-         session.log("Call wamp.rt.foo completed in " +
+         session.log("Call test.foo completed in " +
             (Date.now() - starttime) +
             " ms: result =", res);
-
       },
       function (error) {
          console.log("Call failed:", error);
@@ -111,20 +129,23 @@ connection.onopen = function (new_session) {
    session.publish('com.myapp.topic1', ["Arg1", "Arg2" ], { "kwarg1": "kwarg1", "kwarg2": "kwarg2"}, { acknowledge : false });
 
 
-   session.publish('com.myapp.topic1', [ "Arg_1", "Arg_2" ], {}, { acknowledge : true }).then(
+   var p1 = session.publish('com.myapp.topic1', [ "Arg_1", "Arg_2" ], {}, { acknowledge : true }).then(
       function(publication) {
          console.log("published, publication ID is ", publication);
-         connection.close();
       },
-      function(error) {      console.log("publication error", error);
-         connection.close();
+      function(error) {
+          console.log("publication error", error);
+          return Promise.resolve(true);
       }
    );
+
+   Promise.all([c1,p1]).then(function () {
+      connection.close();
+   });
 };
 
 connection.onclose = function (reason, details) {
-   console.log("connection 1", reason, details);
+   console.log("close connection:", reason, details);
 };
 
 connection.open();
-

test/pubsub/publisher.js → democli/pubsub/publisher.js

@@ -4,12 +4,15 @@ var program = require('commander');
 var when = require('when');
 
 program
-    .option('-p, --port <port>', 'Server IP port', parseInt,9000)
+    .option('-p, --port <port>', 'Server IP port', 9000)
     .option('-i, --ip <ip>', 'Server IP address','127.0.0.1')
     .parse(process.argv);
 
+var connectUrl = 'ws://' + program.ip + ':' + program.port;
+console.log('connectUrl:', connectUrl);
+
 var connection = new autobahn.Connection({
-    url: 'ws://' + program.ip + ':' + program.port,
+    url: connectUrl,
     realm: 'realm1'}
 );
 

test/pubsub/subscriber.js → democli/pubsub/subscriber.js

@@ -3,12 +3,15 @@ var autobahn = require('autobahn');
 var program = require('commander');
 
 program
-    .option('-p, --port <port>', 'Server IP port', parseInt,9000)
+    .option('-p, --port <port>', 'Server IP port', 9000)
     .option('-i, --ip <ip>', 'Server IP address','127.0.0.1')
     .parse(process.argv);
 
+var connectUrl = 'ws://' + program.ip + ':' + program.port;
+console.log('connectUrl:', connectUrl);
+
 var connection = new autobahn.Connection({
-    url: 'ws://' + program.ip + ':' + program.port,
+    url: connectUrl,
     realm: 'realm1'}
 );
 

test/rpc/client.js → democli/rpc/client.js

@@ -4,13 +4,16 @@ var program = require('commander');
 var when = require('when');
 
 program
-    .option('-p, --port <port>', 'Server IP port', parseInt,9000)
+    .option('-p, --port <port>', 'Server IP port', 9000)
     .option('-i, --ip <ip>', 'Server IP address','127.0.0.1')
     .parse(process.argv);
 
+var connectUrl = 'ws://' + program.ip + ':' + program.port;
+console.log('connectUrl:', connectUrl);
+
 var connection = new autobahn.Connection({
-   url: 'ws://' + program.ip + ':' + program.port,
-   realm: 'realm1'}
+    url: connectUrl,
+    realm: 'realm1'}
 );
 
 connection.onopen = function (session) {

test/rpc/server.js → democli/rpc/server.js

@@ -3,13 +3,16 @@ var autobahn = require('autobahn');
 var program = require('commander');
 
 program
-    .option('-p, --port <port>', 'Server IP port', parseInt,9000)
+    .option('-p, --port <port>', 'Server IP port', 9000)
     .option('-i, --ip <ip>', 'Server IP address','127.0.0.1')
     .parse(process.argv);
 
+var connectUrl = 'ws://' + program.ip + ':' + program.port;
+console.log('connectUrl:', connectUrl);
+
 var connection = new autobahn.Connection({
-   url: 'ws://' + program.ip + ':' + program.port,
-   realm: 'realm1'}
+    url: connectUrl,
+    realm: 'realm1'}
 );
 
 connection.onopen = function (session) {