Merge pull request #31 from rakyll/master

pubsub: Auto-ack messages optionally
googleapis · Jul 23, 2014 · 5858099 · 5858099
2 parents 8533fa5 + 38bed99
commit 5858099
Showing 1 changed file with 31 additions and 13 deletions.
diff --git a/lib/pubsub/index.js b/lib/pubsub/index.js
@@ -17,11 +17,19 @@
 var conn = require('../common/connection.js'),
     util = require('../common/util.js');
 
-var PUBSUB_BASE_URL = 'https://www.googleapis.com/pubsub/v1beta1',
-    SCOPES = [
-      'https://www.googleapis.com/auth/pubsub',
-      'https://www.googleapis.com/auth/cloud-platform'
-    ];
+/**
+ * Base URL for Pub/Sub API.
+ * @type {String}
+ */
+var PUBSUB_BASE_URL = 'https://www.googleapis.com/pubsub/v1beta1';
+/**
+ * Required scopes for Pub/Sub API.
+ * @type {Array}
+ */
+var SCOPES = [
+  'https://www.googleapis.com/auth/pubsub',
+  'https://www.googleapis.com/auth/cloud-platform'
+];
 
 // TODO(jbd): Emit message and error events if in polled-mode.
 // sub.on('meessage', console.log)
@@ -48,21 +56,31 @@ Subscription.prototype.ack = function(ids, callback) {
 
 /**
  * Pulls from the subscribed topic.
- * @param  {Boolean}  returnImmediately If set, the system will respond immediately.
- *                                      Otherwise, wait until new messages are
- *                                      available. Returns if timeout is reached.
- * @param  {Boolean}  autoAck           Automatically acknowledges the
- *                                      backend after pulling. By default, true.
- * @param  {Function} callback          Callback function.
+ * @param  {Boolean}  opts.returnImmediately  If set, the system will respond immediately.
+ *                                            Otherwise, wait until new messages are
+ *                                            available. Returns if timeout is reached.
+ * @param  {Boolean}  opts.autoAck            Automatically acknowledges the
+ *                                            message once it's pulled.
+ * @param  {Function} callback                Callback function.
  */
 Subscription.prototype.pull = function(opts, callback) {
   // TODO(jbd): Make opts optional.
+  var that = this;
+  var autoAck = !!opts.autoAck;
   var body = {
     subscription: this.name,
     returnImmediately: !!opts.returnImmediately
   };
-  // TODO(jbd): Auto acknowledge.
-  this.conn.makeReq('POST', 'subscriptions/pull', null, body, callback);
+  this.conn.makeReq('POST', 'subscriptions/pull', null, body, function(err, message) {
+    if (err) { return callback(err); }
+    if (!autoAck) {
+      return callback(null, message);
+    }
+    that.ack(message.ackId, function(err) {
+      if (err) { return callback(err); }
+      callback(null, message);
+    });
+  });
 };
 
 /**