@google-cloud/pubsub 3.4.1 → 3.5.1

package/build/src/message-stream.js

@@ -22,6 +22,9 @@ const isStreamEnded = require("is-stream-ended");
 const stream_1 = require("stream");
 const pull_retry_1 = require("./pull-retry");
 const default_options_1 = require("./default-options");
+const temporal_1 = require("./temporal");
+const exponential_retry_1 = require("./exponential-retry");
+const debug_1 = require("./debug");
 /*!
  * Frequency to ping streams.
  */
@@ -37,6 +40,8 @@ const DEFAULT_OPTIONS = {
     highWaterMark: 0,
     maxStreams: default_options_1.defaultOptions.subscription.maxStreams,
     timeout: 300000,
+    retryMinBackoff: temporal_1.Duration.from({ millis: 100 }),
+    retryMaxBackoff: temporal_1.Duration.from({ seconds: 60 }),
 };
 /**
  * Error wrapper for gRPC status objects.
@@ -72,15 +77,6 @@ class ChannelError extends Error {
     }
 }
 exports.ChannelError = ChannelError;
-/**
- * @typedef {object} MessageStreamOptions
- * @property {number} [highWaterMark=0] Configures the Buffer level for all
- *     underlying streams. See
- *     {@link https://nodejs.org/en/docs/guides/backpressuring-in-streams/} for
- *     more details.
- * @property {number} [maxStreams=5] Number of streaming connections to make.
- * @property {number} [timeout=300000] Timeout for establishing a connection.
- */
 /**
  * Streaming class used to manage multiple StreamingPull requests.
  *
@@ -95,10 +91,22 @@ class MessageStream extends stream_1.PassThrough {
         options = Object.assign({}, DEFAULT_OPTIONS, options);
         super({ objectMode: true, highWaterMark: options.highWaterMark });
         this._options = options;
-        this._retrier = new pull_retry_1.PullRetry();
-        this._streams = new Map();
+        this._retrier = new exponential_retry_1.ExponentialRetry(options.retryMinBackoff, // Filled by DEFAULT_OPTIONS
+        options.retryMaxBackoff);
+        this._streams = [];
+        for (let i = 0; i < options.maxStreams; i++) {
+            this._streams.push({});
+        }
         this._subscriber = sub;
-        this._fillStreamPool();
+    }
+    /**
+     * Actually starts the stream setup and subscription pulls.
+     * This is separated so that others can properly wait on the promise.
+     *
+     * @private
+     */
+    async start() {
+        await this._fillStreamPool();
         this._keepAliveHandle = setInterval(() => this._keepAlive(), KEEP_ALIVE_INTERVAL);
         this._keepAliveHandle.unref();
     }
@@ -111,9 +119,11 @@ class MessageStream extends stream_1.PassThrough {
         const request = {
             streamAckDeadlineSeconds: deadline.totalOf('second'),
         };
-        for (const stream of this._streams.keys()) {
+        for (const tracker of this._streams) {
             // We don't need a callback on this one, it's advisory.
-            stream.write(request);
+            if (tracker.stream) {
+                tracker.stream.write(request);
+            }
         }
     }
     /**
@@ -124,10 +134,15 @@ class MessageStream extends stream_1.PassThrough {
      * @private
      */
     _destroy(error, callback) {
-        clearInterval(this._keepAliveHandle);
-        for (const stream of this._streams.keys()) {
-            this._removeStream(stream);
-            stream.cancel();
+        if (this._keepAliveHandle) {
+            clearInterval(this._keepAliveHandle);
+        }
+        this._retrier.close();
+        for (let i = 0; i < this._streams.length; i++) {
+            const tracker = this._streams[i];
+            if (tracker.stream) {
+                this._removeStream(i);
+            }
         }
         callback(error);
     }
@@ -138,13 +153,22 @@ class MessageStream extends stream_1.PassThrough {
      *
      * @param {stream} stream The StreamingPull stream.
      */
-    _addStream(stream) {
+    _replaceStream(index, stream) {
+        this._removeStream(index);
         this._setHighWaterMark(stream);
-        this._streams.set(stream, false);
+        const tracker = this._streams[index];
+        tracker.stream = stream;
+        tracker.receivedStatus = false;
         stream
-            .on('error', err => this._onError(stream, err))
-            .once('status', status => this._onStatus(stream, status))
-            .pipe(this, { end: false });
+            .on('error', err => this._onError(index, err))
+            .once('status', status => this._onStatus(index, status))
+            .on('data', (data) => this._onData(index, data));
+    }
+    _onData(index, data) {
+        // Mark this stream as alive again. (reset backoff)
+        const tracker = this._streams[index];
+        this._retrier.reset(tracker);
+        this.emit('data', data);
     }
     /**
      * Attempts to create and cache the desired number of StreamingPull requests.
@@ -157,6 +181,9 @@ class MessageStream extends stream_1.PassThrough {
      * @returns {Promise}
      */
     async _fillStreamPool() {
+        if (this.destroyed) {
+            return;
+        }
         let client;
         try {
             client = await this._getClient();
@@ -165,9 +192,37 @@ class MessageStream extends stream_1.PassThrough {
             const err = e;
             this.destroy(err);
         }
+        const all = [];
+        for (let i = 0; i < this._streams.length; i++) {
+            all.push(this._fillOne(i, client));
+        }
+        await Promise.all(all);
+        try {
+            await this._waitForClientReady(client);
+        }
+        catch (e) {
+            const err = e;
+            this.destroy(err);
+        }
+    }
+    async _fillOne(index, client) {
         if (this.destroyed) {
             return;
         }
+        const tracker = this._streams[index];
+        if (tracker.stream) {
+            return;
+        }
+        if (!client) {
+            try {
+                client = await this._getClient();
+            }
+            catch (e) {
+                const err = e;
+                this.destroy(err);
+                return;
+            }
+        }
         const deadline = Date.now() + PULL_TIMEOUT;
         const request = {
             subscription: this._subscriber.name,
@@ -179,19 +234,9 @@ class MessageStream extends stream_1.PassThrough {
                 ? 0
                 : this._subscriber.maxBytes,
         };
-        delete this._fillHandle;
-        for (let i = this._streams.size; i < this._options.maxStreams; i++) {
-            const stream = client.streamingPull({ deadline });
-            this._addStream(stream);
-            stream.write(request);
-        }
-        try {
-            await this._waitForClientReady(client);
-        }
-        catch (e) {
-            const err = e;
-            this.destroy(err);
-        }
+        const stream = client.streamingPull({ deadline });
+        this._replaceStream(index, stream);
+        stream.write(request);
     }
     /**
      * It is critical that we keep as few `PullResponse` objects in memory as
@@ -215,34 +260,42 @@ class MessageStream extends stream_1.PassThrough {
      * @private
      */
     _keepAlive() {
-        this._streams.forEach((receivedStatus, stream) => {
-            // its possible that a status event fires off (signaling the rpc being
-            // closed) but the stream hasn't drained yet, writing to this stream will
-            // result in a `write after end` error
-            if (!receivedStatus) {
-                stream.write({});
+        this._streams.forEach(tracker => {
+            // It's possible that a status event fires off (signaling the rpc being
+            // closed) but the stream hasn't drained yet. Writing to such a stream will
+            // result in a `write after end` error.
+            if (!tracker.receivedStatus && tracker.stream) {
+                tracker.stream.write({});
             }
         });
     }
+    // Returns the number of tracked streams that contain an actual stream (good or not).
+    _activeStreams() {
+        return this._streams.reduce((p, t) => (t.stream ? 1 : 0) + p, 0);
+    }
     /**
      * Once the stream has nothing left to read, we'll remove it and attempt to
      * refill our stream pool if needed.
      *
      * @private
      *
-     * @param {Duplex} stream The ended stream.
+     * @param {number} index The ended stream.
      * @param {object} status The stream status.
      */
-    _onEnd(stream, status) {
-        this._removeStream(stream);
-        if (this._fillHandle) {
-            return;
-        }
-        if (this._retrier.retry(status)) {
-            const delay = this._retrier.createTimeout();
-            this._fillHandle = setTimeout(() => this._fillStreamPool(), delay);
+    _onEnd(index, status) {
+        this._removeStream(index);
+        if (pull_retry_1.PullRetry.retry(status)) {
+            this.emit('debug', new debug_1.DebugMessage(`Subscriber stream ${index} has ended with status ${status.code}; will be retried.`));
+            if (pull_retry_1.PullRetry.resetFailures(status)) {
+                this._retrier.reset(this._streams[index]);
+            }
+            this._retrier.retryLater(this._streams[index], () => {
+                this._fillOne(index);
+            });
         }
-        else if (!this._streams.size) {
+        else if (this._activeStreams() === 0) {
+            this.emit('debug', new debug_1.DebugMessage(`Subscriber stream ${index} has ended with status ${status.code}; will not be retried.`));
+            // No streams left, and nothing to retry.
             this.destroy(new StatusError(status));
         }
     }
@@ -253,13 +306,14 @@ class MessageStream extends stream_1.PassThrough {
      *
      * @private
      *
-     * @param {stream} stream The stream that errored.
+     * @param {number} index The stream that errored.
      * @param {Error} err The error.
      */
-    async _onError(stream, err) {
-        await (0, promisify_1.promisify)(setImmediate)();
+    async _onError(index, err) {
+        await (0, promisify_1.promisify)(process.nextTick)();
         const code = err.code;
-        const receivedStatus = this._streams.get(stream) !== false;
+        const tracker = this._streams[index];
+        const receivedStatus = !tracker.stream || (tracker.stream && !tracker.receivedStatus);
         if (typeof code !== 'number' || !receivedStatus) {
             this.emit('error', err);
         }
@@ -274,17 +328,22 @@ class MessageStream extends stream_1.PassThrough {
      * @param {stream} stream The stream that was closed.
      * @param {object} status The status message stating why it was closed.
      */
-    _onStatus(stream, status) {
+    _onStatus(index, status) {
         if (this.destroyed) {
             return;
         }
-        this._streams.set(stream, true);
-        if (isStreamEnded(stream)) {
-            this._onEnd(stream, status);
+        const tracker = this._streams[index];
+        tracker.receivedStatus = true;
+        if (!tracker.stream) {
+            // This shouldn't really happen, but in case wires get crossed.
+            return;
+        }
+        if (isStreamEnded(tracker.stream)) {
+            this._onEnd(index, status);
         }
         else {
-            stream.once('end', () => this._onEnd(stream, status));
-            stream.push(null);
+            tracker.stream.once('end', () => this._onEnd(index, status));
+            tracker.stream.push(null);
         }
     }
     /**
@@ -292,14 +351,19 @@ class MessageStream extends stream_1.PassThrough {
      *
      * @private
      *
-     * @param {stream} stream The stream to remove.
+     * @param {number} index The stream to remove.
      */
-    _removeStream(stream) {
-        stream.unpipe(this);
-        this._streams.delete(stream);
+    _removeStream(index) {
+        const tracker = this._streams[index];
+        if (tracker.stream) {
+            tracker.stream.unpipe(this);
+            tracker.stream.cancel();
+            tracker.stream = undefined;
+            tracker.receivedStatus = undefined;
+        }
     }
     /**
-     * Neither gRPC or gax allow for the highWaterMark option to be specified.
+     * Neither gRPC nor gax allow for the highWaterMark option to be specified.
      * However using the default value (16) it is possible to end up with a lot of
      * PullResponse objects stored in internal buffers. If this were to happen
      * and the client were slow to process messages, we could potentially see a
@@ -315,7 +379,7 @@ class MessageStream extends stream_1.PassThrough {
         stream._readableState.highWaterMark = this._options.highWaterMark;
     }
     /**
-     * Promisified version of gRPCs Client#waitForReady function.
+     * Promisified version of gRPC's Client#waitForReady function.
      *
      * @private
      *

package/build/src/message-stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-stream.js","sourceRoot":"","sources":["../../src/message-stream.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"message-stream.js","sourceRoot":"","sources":["../../src/message-stream.ts"],"names":[],"mappings":"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"}

package/build/src/pull-retry.d.ts

@@ -26,16 +26,6 @@ export declare const RETRY_CODES: grpc.status[];
  * @private
  */
 export declare class PullRetry {
-    private failures;
-    /**
-     * Generates a timeout that can be used for applying a backoff based on the
-     * current number of failed requests.
-     *
-     * @see {@link https://cloud.google.com/iot/docs/how-tos/exponential-backoff}
-     * @private
-     * @returns {number}
-     */
-    createTimeout(): number;
     /**
      * Determines if a request grpc.status should be retried.
      *
@@ -49,5 +39,6 @@ export declare class PullRetry {
      * @param {object} grpc.status The request grpc.status.
      * @returns {boolean}
      */
-    retry(err: grpc.StatusObject): boolean;
+    static retry(err: grpc.StatusObject): boolean;
+    static resetFailures(err: grpc.StatusObject): boolean;
 }

package/build/src/pull-retry.js

@@ -36,23 +36,6 @@ exports.RETRY_CODES = [
  * @private
  */
 class PullRetry {
-    constructor() {
-        this.failures = 0;
-    }
-    /**
-     * Generates a timeout that can be used for applying a backoff based on the
-     * current number of failed requests.
-     *
-     * @see {@link https://cloud.google.com/iot/docs/how-tos/exponential-backoff}
-     * @private
-     * @returns {number}
-     */
-    createTimeout() {
-        if (this.failures === 0) {
-            return 0;
-        }
-        return Math.pow(2, this.failures) * 1000 + Math.floor(Math.random() * 1000);
-    }
     /**
      * Determines if a request grpc.status should be retried.
      *
@@ -66,14 +49,7 @@ class PullRetry {
      * @param {object} grpc.status The request grpc.status.
      * @returns {boolean}
      */
-    retry(err) {
-        if (err.code === google_gax_1.grpc.status.OK ||
-            err.code === google_gax_1.grpc.status.DEADLINE_EXCEEDED) {
-            this.failures = 0;
-        }
-        else {
-            this.failures += 1;
-        }
+    static retry(err) {
         if (err.code === google_gax_1.grpc.status.UNAVAILABLE &&
             err.details &&
             err.details.match(/Server shutdownNow invoked/)) {
@@ -81,6 +57,9 @@ class PullRetry {
         }
         return exports.RETRY_CODES.includes(err.code);
     }
+    static resetFailures(err) {
+        return (err.code === google_gax_1.grpc.status.OK || err.code === google_gax_1.grpc.status.DEADLINE_EXCEEDED);
+    }
 }
 exports.PullRetry = PullRetry;
 //# sourceMappingURL=pull-retry.js.map

package/build/src/pull-retry.js.map

@@ -1 +1 @@
-{"version":3,"file":"pull-retry.js","sourceRoot":"","sources":["../../src/pull-retry.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,2CAAgC;AAEhC;;GAEG;AACU,QAAA,WAAW,GAAkB;IACxC,iBAAI,CAAC,MAAM,CAAC,iBAAiB;IAC7B,iBAAI,CAAC,MAAM,CAAC,kBAAkB;IAC9B,iBAAI,CAAC,MAAM,CAAC,OAAO;IACnB,iBAAI,CAAC,MAAM,CAAC,QAAQ;IACpB,iBAAI,CAAC,MAAM,CAAC,WAAW;IACvB,iBAAI,CAAC,MAAM,CAAC,SAAS;CACtB,CAAC;AAEF;;;;;;GAMG;AACH,MAAa,SAAS;IAAtB;QACU,aAAQ,GAAG,CAAC,CAAC;IAgDvB,CAAC;IA/CC;;;;;;;OAOG;IACH,aAAa;QACX,IAAI,IAAI,CAAC,QAAQ,KAAK,CAAC,EAAE;YACvB,OAAO,CAAC,CAAC;SACV;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9E,CAAC;IACD;;;;;;;;;;;;OAYG;IACH,KAAK,CAAC,GAAsB;QAC1B,IACE,GAAG,CAAC,IAAI,KAAK,iBAAI,CAAC,MAAM,CAAC,EAAE;YAC3B,GAAG,CAAC,IAAI,KAAK,iBAAI,CAAC,MAAM,CAAC,iBAAiB,EAC1C;YACA,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;SACnB;aAAM;YACL,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;SACpB;QAED,IACE,GAAG,CAAC,IAAI,KAAK,iBAAI,CAAC,MAAM,CAAC,WAAW;YACpC,GAAG,CAAC,OAAO;YACX,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,EAC/C;YACA,OAAO,IAAI,CAAC;SACb;QAED,OAAO,mBAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACF;AAjDD,8BAiDC"}
+{"version":3,"file":"pull-retry.js","sourceRoot":"","sources":["../../src/pull-retry.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;GAcG;AACH,2CAAgC;AAEhC;;GAEG;AACU,QAAA,WAAW,GAAkB;IACxC,iBAAI,CAAC,MAAM,CAAC,iBAAiB;IAC7B,iBAAI,CAAC,MAAM,CAAC,kBAAkB;IAC9B,iBAAI,CAAC,MAAM,CAAC,OAAO;IACnB,iBAAI,CAAC,MAAM,CAAC,QAAQ;IACpB,iBAAI,CAAC,MAAM,CAAC,WAAW;IACvB,iBAAI,CAAC,MAAM,CAAC,SAAS;CACtB,CAAC;AAEF;;;;;;GAMG;AACH,MAAa,SAAS;IACpB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,KAAK,CAAC,GAAsB;QACjC,IACE,GAAG,CAAC,IAAI,KAAK,iBAAI,CAAC,MAAM,CAAC,WAAW;YACpC,GAAG,CAAC,OAAO;YACX,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,EAC/C;YACA,OAAO,IAAI,CAAC;SACb;QAED,OAAO,mBAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAsB;QACzC,OAAO,CACL,GAAG,CAAC,IAAI,KAAK,iBAAI,CAAC,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,KAAK,iBAAI,CAAC,MAAM,CAAC,iBAAiB,CAC1E,CAAC;IACJ,CAAC;CACF;AA/BD,8BA+BC"}

package/build/src/subscriber.d.ts

@@ -85,6 +85,7 @@ export declare class Message {
     private _handled;
     private _length;
     private _subscriber;
+    private _ackFailed?;
     /**
      * @hideconstructor
      *
@@ -98,6 +99,13 @@ export declare class Message {
      * @type {number}
      */
     get length(): number;
+    /**
+     * Sets this message's exactly once delivery acks to permanent failure. This is
+     * meant for internal library use only.
+     *
+     * @private
+     */
+    ackFailed(error: AckError): void;
     /**
      * Acknowledges the message.
      *
@@ -367,6 +375,7 @@ export declare class Subscriber extends EventEmitter {
      * @private
      */
     private _onData;
+    private _discardMessage;
     /**
      * Returns a promise that will resolve once all pending requests have settled.
      *

package/build/src/subscriber.js

@@ -165,6 +165,15 @@ class Message {
     get length() {
         return this._length;
     }
+    /**
+     * Sets this message's exactly once delivery acks to permanent failure. This is
+     * meant for internal library use only.
+     *
+     * @private
+     */
+    ackFailed(error) {
+        this._ackFailed = error;
+    }
     /**
      * Acknowledges the message.
      *
@@ -197,9 +206,18 @@ class Message {
             this.ack();
             return exports.AckResponses.Success;
         }
+        if (this._ackFailed) {
+            throw this._ackFailed;
+        }
         if (!this._handled) {
             this._handled = true;
-            return await this._subscriber.ackWithResponse(this);
+            try {
+                return await this._subscriber.ackWithResponse(this);
+            }
+            catch (e) {
+                this.ackFailed(e);
+                throw e;
+            }
         }
         else {
             return exports.AckResponses.Invalid;
@@ -228,8 +246,17 @@ class Message {
             this.modAck(deadline);
             return exports.AckResponses.Success;
         }
+        if (this._ackFailed) {
+            throw this._ackFailed;
+        }
         if (!this._handled) {
-            return await this._subscriber.modAckWithResponse(this, deadline);
+            try {
+                return await this._subscriber.modAckWithResponse(this, deadline);
+            }
+            catch (e) {
+                this.ackFailed(e);
+                throw e;
+            }
         }
         else {
             return exports.AckResponses.Invalid;
@@ -268,9 +295,18 @@ class Message {
             this.nack();
             return exports.AckResponses.Success;
         }
+        if (this._ackFailed) {
+            throw this._ackFailed;
+        }
         if (!this._handled) {
             this._handled = true;
-            return await this._subscriber.nackWithResponse(this);
+            try {
+                return await this._subscriber.nackWithResponse(this);
+            }
+            catch (e) {
+                this.ackFailed(e);
+                throw e;
+            }
         }
         else {
             return exports.AckResponses.Invalid;
@@ -541,12 +577,16 @@ class Subscriber extends events_1.EventEmitter {
         this._stream = new message_stream_1.MessageStream(this, streamingOptions);
         this._stream
             .on('error', err => this.emit('error', err))
-            .on('debug', err => this.emit('debug', err))
+            .on('debug', msg => this.emit('debug', msg))
             .on('data', (data) => this._onData(data))
             .once('close', () => this.close());
         this._inventory
             .on('full', () => this._stream.pause())
             .on('free', () => this._stream.resume());
+        this._stream.start().catch(err => {
+            this.emit('error', err);
+            this.close();
+        });
         this.isOpen = true;
     }
     /**
@@ -655,8 +695,24 @@ class Subscriber extends events_1.EventEmitter {
             const message = new Message(this, data);
             const span = this._constructSpan(message);
             if (this.isOpen) {
-                message.modAck(this.ackDeadline);
-                this._inventory.add(message);
+                if (this.isExactlyOnceDelivery) {
+                    // For exactly-once delivery, we must validate that we got a valid
+                    // lease on the message before actually leasing it.
+                    message
+                        .modAckWithResponse(this.ackDeadline)
+                        .then(() => {
+                        this._inventory.add(message);
+                    })
+                        .catch(() => {
+                        // Temporary failures will retry, so if an error reaches us
+                        // here, that means a permanent failure. Silently drop these.
+                        this._discardMessage(message);
+                    });
+                }
+                else {
+                    message.modAck(this.ackDeadline);
+                    this._inventory.add(message);
+                }
             }
             else {
                 message.nack();
@@ -666,6 +722,10 @@ class Subscriber extends events_1.EventEmitter {
             }
         }
     }
+    // Internal: This is here to provide a hook for unit testing, at least for now.
+    _discardMessage(message) {
+        message;
+    }
     /**
      * Returns a promise that will resolve once all pending requests have settled.
      *