Merge pull request #310 from koush/master

bug fixes in events

lib/events.js

@@ -154,7 +154,10 @@ module.exports = function(Cam) {
 		try {
 			urlAddress = this.events.subscription.subscriptionReference.address;
 		} catch (e) {
-			throw new Error('You should create pull-point subscription first!');
+			if (callback && callback.call) {
+				callback.call(this, new Error('You should create pull-point subscription first!'));
+			}
+			return;
 		}
 
 		try {
@@ -225,7 +228,10 @@ module.exports = function(Cam) {
 		try {
 			urlAddress = this.events.subscription.subscriptionReference.address;
 		} catch (e) {
-			throw new Error('You should create pull-point subscription first!');
+			if (callback && callback.call) {
+				callback.call(this, new Error('You should create pull-point subscription first!'));
+			}
+			return;
 		}
 
 		try {
@@ -267,13 +273,16 @@ module.exports = function(Cam) {
 	 * @param {Cam~PullMessagesResponse} callback
 	 * @throws {Error} {@link Cam#events.subscription} must exists
 	 */
-	Cam.prototype.unsubscribe = function(callback) {
+	Cam.prototype.unsubscribe = function(callback, preserveListeners) {
 		let urlAddress = null;
 		let subscriptionId = null;
 		try {
 			urlAddress = this.events.subscription.subscriptionReference.address;
 		} catch (e) {
-			throw new Error('You should create pull-point subscription first!');
+			if (callback && callback.call) {
+				callback.call(this, new Error('You should create pull-point subscription first!'));
+			}
+			return;
 		}
 
 		try {
@@ -303,7 +312,9 @@ module.exports = function(Cam) {
 			body: sendXml
 		}, function(err, res, xml) {
 			if (!err) {
-				this.removeAllListeners('event'); // We can subscribe again only if there is no 'event' listener
+				if (!preserveListeners) {
+					this.removeAllListeners('event'); // We can subscribe again only if there is no 'event' listener
+				}
 				var data = linerase(res).unsubscribeResponse;
 			}
 			if (callback && callback.call) {
@@ -383,10 +394,10 @@ module.exports = function(Cam) {
 					});
 				} else {
 					// there was an error pulling the message
-					this.unsubscribe({}, function(_err,_data,_xml) {
+					this.unsubscribe(function(_err,_data,_xml) {
 						// once the unsubsribe has completed (even if it failed), go around the loop again
 						this._eventRequest();
-					});
+					}, true);
 				}
 			}.bind(this));
 		} else {