Merge branch 'master' of github.com:mcollina/mosca

lib/server.js

@@ -231,7 +231,7 @@ function Server(opts, callback) {
     }
   ], function(err, results){
     if(err) {
-      callback(err)
+      callback(err);
     }
   });
 
@@ -308,6 +308,18 @@ Server.prototype.toString = function() {
   return 'mosca.Server';
 };
 
+/**
+ * Subscribes to a topic on the MQTT broker.
+ *
+ * @api public
+ * @param {String} topic The MQTT topic
+ * @param {Function} callback The callback with (topic, payload) arguments
+ * @param {Function} done The subscription result
+ */
+Server.prototype.subscribe = function subscribe(topic, callback, done) {
+  this.ascoltatore.subscribe(topic, callback, done);
+};
+
 /**
  * Publishes a packet on the MQTT broker.
  *

test/server.js

@@ -187,6 +187,26 @@ describe("mosca.Server", function() {
     });
   });
 
+  it("should support subscribing via server.subscribe", function(done) {
+    var that = this;
+    buildAndConnect(done, this.instance, buildOpts(), function(client) {
+
+      that.instance.subscribe('a/+', function(topic, payload){
+        expect(topic).to.be.equal('a/b');
+        expect(payload.toString()).to.be.equal('some data');
+        client.disconnect();
+      }, function(){
+        var messageId = Math.floor(65535 * Math.random());
+        client.publish({
+          topic: "a/b",
+          payload: "some data",
+          messageId: messageId,
+          qos: 1
+        });
+      });
+    });
+  });
+
   describe("timers", function() {
     var clock;