pubsub: add ability to pass timeout to publish (#2232)

AUTHORS

@@ -11,3 +11,6 @@ Anand Suresh
 Brett Bergmann
 Jesse Friedman
 Zach Bjornson <[email protected]>
+
+Greta.io
+Dennis Mårtensson <[email protected]>

CONTRIBUTORS

@@ -16,6 +16,7 @@ Ben Stahl <[email protected]>
 Brett Bergmann <[email protected]>
 Burcu Dogan <[email protected]>
 Cristian Almstrand <[email protected]>
+Dennis Mårtensson <[email protected]>
 Gor Martsen <[email protected]>
 Hector Rovira <[email protected]>
 Ido Shamun <[email protected]>

packages/pubsub/src/topic.js

@@ -375,6 +375,8 @@ Topic.prototype.getSubscriptionsStream = function(options) {
  * @param {object=} options - Configuration object.
  * @param {boolean} options.raw - Enable if you require setting attributes on
  *     your messages.
+ * @param {number} options.timeout - Set a maximum amount of time in
+ *     milliseconds before giving up if no response is received.
  * @param {function=} callback - The callback function.
  *
  * @example
@@ -435,6 +437,7 @@ Topic.prototype.getSubscriptionsStream = function(options) {
  *   var messageIds = data[0];
  *   var apiResponse = data[1];
  * });
+ *
  */
 Topic.prototype.publish = function(messages, options, callback) {
   messages = arrify(messages);
@@ -456,6 +459,10 @@ Topic.prototype.publish = function(messages, options, callback) {
     method: 'publish',
   };
 
+  if (is.number(options.timeout)) {
+    protoOpts.timeout = options.timeout;
+  }
+
   var reqOpts = {
     topic: this.name,
     messages: messages

packages/pubsub/test/topic.js

@@ -254,6 +254,19 @@ describe('Topic', function() {
       topic.publish(message, assert.ifError);
     });
 
+    it('should honor the timeout setting', function(done) {
+      var options = {
+        timeout: 10
+      };
+
+      topic.request = function(protoOpts) {
+        assert.strictEqual(protoOpts.timeout, options.timeout);
+        done();
+      };
+
+      topic.publish(message, options, assert.ifError);
+    });
+
     it('should send correct api request for raw message', function(done) {
       topic.request = function(protoOpts, reqOpts) {
         assert.deepEqual(reqOpts.messages, [