Skip to content

Commit 4fc9724

Browse files
authored
revert!: remove pullTimeout subscriber option (#618)
1 parent 1eedf0f commit 4fc9724

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

src/message-stream.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ const PULL_TIMEOUT = require('./v1/subscriber_client_config.json').interfaces[
4848
const DEFAULT_OPTIONS: MessageStreamOptions = {
4949
highWaterMark: 0,
5050
maxStreams: 5,
51-
pullTimeout: PULL_TIMEOUT,
5251
timeout: 300000,
5352
};
5453

@@ -103,15 +102,11 @@ export class ChannelError extends Error implements ServiceError {
103102
* {@link https://nodejs.org/en/docs/guides/backpressuring-in-streams/} for
104103
* more details.
105104
* @property {number} [maxStreams=5] Number of streaming connections to make.
106-
* @property {number} [pullTimeout=900000] Timeout to be applied to each
107-
* underlying stream. Essentially this just closes a `StreamingPull` request
108-
* after the specified time.
109105
* @property {number} [timeout=300000] Timeout for establishing a connection.
110106
*/
111107
export interface MessageStreamOptions {
112108
highWaterMark?: number;
113109
maxStreams?: number;
114-
pullTimeout?: number;
115110
timeout?: number;
116111
}
117112

@@ -223,7 +218,7 @@ export class MessageStream extends PassThrough {
223218
return;
224219
}
225220

226-
const deadline = Date.now() + this._options.pullTimeout!;
221+
const deadline = Date.now() + PULL_TIMEOUT;
227222
const request: StreamingPullRequest = {
228223
subscription: this._subscriber.name,
229224
streamAckDeadlineSeconds: this._subscriber.ackDeadline,

test/message-stream.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -270,21 +270,6 @@ describe('MessageStream', () => {
270270
});
271271
});
272272

273-
it('should respect the pullTimeout option', done => {
274-
const pullTimeout = 1234;
275-
const expectedDeadline = now + pullTimeout;
276-
277-
messageStream = new MessageStream(subscriber, {pullTimeout});
278-
279-
setImmediate(() => {
280-
client.streams.forEach(stream => {
281-
const deadline = stream.options.deadline;
282-
assert.strictEqual(deadline, expectedDeadline);
283-
});
284-
done();
285-
});
286-
});
287-
288273
it('should respect the timeout option', done => {
289274
const timeout = 12345;
290275
const expectedDeadline = now + timeout;

0 commit comments

Comments
 (0)