Skip to content
This repository was archived by the owner on Mar 17, 2026. It is now read-only.

revert!: remove pullTimeout subscriber option #618

Merged
callmehiphop merged 2 commits into from
May 20, 2019
Merged

revert!: remove pullTimeout subscriber option #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5818eb8
revert!: remove pullTimeout subscriber option
callmehiphop May 20, 2019
3a3f783
Merge branch 'master' into revert-556
JustinBeckwith May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions src/message-stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const PULL_TIMEOUT = require('./v1/subscriber_client_config.json').interfaces[
const DEFAULT_OPTIONS: MessageStreamOptions = {
highWaterMark: 0,
maxStreams: 5,
pullTimeout: PULL_TIMEOUT,
timeout: 300000,
};

Expand Down Expand Up @@ -103,15 +102,11 @@ export class ChannelError extends Error implements ServiceError {
* {@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} [pullTimeout=900000] Timeout to be applied to each
* underlying stream. Essentially this just closes a `StreamingPull` request
* after the specified time.
* @property {number} [timeout=300000] Timeout for establishing a connection.
*/
export interface MessageStreamOptions {
highWaterMark?: number;
maxStreams?: number;
pullTimeout?: number;
timeout?: number;
}

Expand Down Expand Up @@ -223,7 +218,7 @@ export class MessageStream extends PassThrough {
return;
}

const deadline = Date.now() + this._options.pullTimeout!;
const deadline = Date.now() + PULL_TIMEOUT;
const request: StreamingPullRequest = {
subscription: this._subscriber.name,
streamAckDeadlineSeconds: this._subscriber.ackDeadline,
Expand Down
15 changes: 0 additions & 15 deletions test/message-stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,21 +270,6 @@ describe('MessageStream', () => {
});
});

it('should respect the pullTimeout option', done => {
const pullTimeout = 1234;
const expectedDeadline = now + pullTimeout;

messageStream = new MessageStream(subscriber, {pullTimeout});

setImmediate(() => {
client.streams.forEach(stream => {
const deadline = stream.options.deadline;
assert.strictEqual(deadline, expectedDeadline);
});
done();
});
});

it('should respect the timeout option', done => {
const timeout = 12345;
const expectedDeadline = now + timeout;
Expand Down