@google-cloud/pubsub 2.1.0 → 2.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +50 -0
- package/README.md +8 -0
- package/build/protos/google/pubsub/v1/pubsub.proto +85 -77
- package/build/protos/protos.d.ts +19 -1
- package/build/protos/protos.js +210 -32
- package/build/protos/protos.json +12 -0
- package/build/src/default-options.js +1 -0
- package/build/src/default-options.js.map +1 -1
- package/build/src/histogram.js +1 -0
- package/build/src/histogram.js.map +1 -1
- package/build/src/iam.js +1 -0
- package/build/src/iam.js.map +1 -1
- package/build/src/index.d.ts +1 -1
- package/build/src/index.js +7 -6
- package/build/src/index.js.map +1 -1
- package/build/src/lease-manager.d.ts +2 -2
- package/build/src/lease-manager.js +1 -0
- package/build/src/lease-manager.js.map +1 -1
- package/build/src/message-queues.d.ts +1 -1
- package/build/src/message-queues.js +1 -0
- package/build/src/message-queues.js.map +1 -1
- package/build/src/message-stream.js +3 -0
- package/build/src/message-stream.js.map +1 -1
- package/build/src/opentelemetry-tracing.d.ts +30 -0
- package/build/src/opentelemetry-tracing.js +41 -0
- package/build/src/opentelemetry-tracing.js.map +1 -0
- package/build/src/publisher/index.d.ts +23 -0
- package/build/src/publisher/index.js +57 -2
- package/build/src/publisher/index.js.map +1 -1
- package/build/src/publisher/message-batch.d.ts +3 -3
- package/build/src/publisher/message-batch.js +4 -3
- package/build/src/publisher/message-batch.js.map +1 -1
- package/build/src/publisher/message-queues.d.ts +1 -1
- package/build/src/publisher/message-queues.js +1 -0
- package/build/src/publisher/message-queues.js.map +1 -1
- package/build/src/publisher/publish-error.js +1 -0
- package/build/src/publisher/publish-error.js.map +1 -1
- package/build/src/pubsub.d.ts +20 -7
- package/build/src/pubsub.js +96 -15
- package/build/src/pubsub.js.map +1 -1
- package/build/src/pull-retry.js +1 -0
- package/build/src/pull-retry.js.map +1 -1
- package/build/src/snapshot.js +1 -0
- package/build/src/snapshot.js.map +1 -1
- package/build/src/subscriber.d.ts +15 -4
- package/build/src/subscriber.js +51 -7
- package/build/src/subscriber.js.map +1 -1
- package/build/src/subscription.d.ts +7 -3
- package/build/src/subscription.js +42 -0
- package/build/src/subscription.js.map +1 -1
- package/build/src/topic.js +1 -0
- package/build/src/topic.js.map +1 -1
- package/build/src/util.js +1 -0
- package/build/src/util.js.map +1 -1
- package/build/src/v1/index.js +2 -2
- package/build/src/v1/index.js.map +1 -1
- package/build/src/v1/publisher_client.d.ts +4 -4
- package/build/src/v1/publisher_client.js +25 -22
- package/build/src/v1/publisher_client.js.map +1 -1
- package/build/src/v1/subscriber_client.d.ts +4 -4
- package/build/src/v1/subscriber_client.js +55 -61
- package/build/src/v1/subscriber_client.js.map +1 -1
- package/package.json +16 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lease-manager.js","sourceRoot":"","sources":["../../src/lease-manager.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"lease-manager.js","sourceRoot":"","sources":["../../src/lease-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.ModAckQueue = exports.AckQueue = exports.MessageQueue = exports.BatchError = void 0;
|
|
18
19
|
const defer = require("p-defer");
|
|
19
20
|
/**
|
|
20
21
|
* Error class used to signal a batch failure.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-queues.js","sourceRoot":"","sources":["../../src/message-queues.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"message-queues.js","sourceRoot":"","sources":["../../src/message-queues.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.MessageStream = exports.ChannelError = exports.StatusError = void 0;
|
|
18
19
|
const promisify_1 = require("@google-cloud/promisify");
|
|
19
20
|
const google_gax_1 = require("google-gax");
|
|
20
21
|
const isStreamEnded = require("is-stream-ended");
|
|
@@ -168,6 +169,8 @@ class MessageStream extends stream_1.PassThrough {
|
|
|
168
169
|
const request = {
|
|
169
170
|
subscription: this._subscriber.name,
|
|
170
171
|
streamAckDeadlineSeconds: this._subscriber.ackDeadline,
|
|
172
|
+
maxOutstandingMessages: this._subscriber.maxMessages,
|
|
173
|
+
maxOutstandingBytes: this._subscriber.maxBytes,
|
|
171
174
|
};
|
|
172
175
|
delete this._fillHandle;
|
|
173
176
|
for (let i = this._streams.size; i < this._options.maxStreams; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-stream.js","sourceRoot":"","sources":["../../src/message-stream.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"message-stream.js","sourceRoot":"","sources":["../../src/message-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/*!
|
|
2
|
+
* Copyright 2020 Google LLC
|
|
3
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
* you may not use this file except in compliance with the License.
|
|
5
|
+
* You may obtain a copy of the License at
|
|
6
|
+
*
|
|
7
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
8
|
+
*
|
|
9
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
10
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
+
* See the License for the specific language governing permissions and
|
|
13
|
+
* limitations under the License.
|
|
14
|
+
*/
|
|
15
|
+
import { Attributes, SpanContext, Span } from '@opentelemetry/api';
|
|
16
|
+
/**
|
|
17
|
+
* Wrapper for creating OpenTelemetry Spans
|
|
18
|
+
*
|
|
19
|
+
* @class
|
|
20
|
+
*/
|
|
21
|
+
export declare class OpenTelemetryTracer {
|
|
22
|
+
/**
|
|
23
|
+
* Creates a new span with the given properties
|
|
24
|
+
*
|
|
25
|
+
* @param {string} spanName the name for the span
|
|
26
|
+
* @param {Attributes?} attributes an object containing the attributes to be set for the span
|
|
27
|
+
* @param {SpanContext?} parent the context of the parent span to link to the span
|
|
28
|
+
*/
|
|
29
|
+
createSpan(spanName: string, attributes?: Attributes, parent?: SpanContext): Span;
|
|
30
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*!
|
|
3
|
+
* Copyright 2020 Google LLC
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
+
* you may not use this file except in compliance with the License.
|
|
6
|
+
* You may obtain a copy of the License at
|
|
7
|
+
*
|
|
8
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
+
*
|
|
10
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
11
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
+
* See the License for the specific language governing permissions and
|
|
14
|
+
* limitations under the License.
|
|
15
|
+
*/
|
|
16
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
exports.OpenTelemetryTracer = void 0;
|
|
18
|
+
const api_1 = require("@opentelemetry/api");
|
|
19
|
+
/**
|
|
20
|
+
* Wrapper for creating OpenTelemetry Spans
|
|
21
|
+
*
|
|
22
|
+
* @class
|
|
23
|
+
*/
|
|
24
|
+
class OpenTelemetryTracer {
|
|
25
|
+
/**
|
|
26
|
+
* Creates a new span with the given properties
|
|
27
|
+
*
|
|
28
|
+
* @param {string} spanName the name for the span
|
|
29
|
+
* @param {Attributes?} attributes an object containing the attributes to be set for the span
|
|
30
|
+
* @param {SpanContext?} parent the context of the parent span to link to the span
|
|
31
|
+
*/
|
|
32
|
+
createSpan(spanName, attributes, parent) {
|
|
33
|
+
const tracerProvider = api_1.trace.getTracer('default');
|
|
34
|
+
return tracerProvider.startSpan(spanName, {
|
|
35
|
+
parent: parent,
|
|
36
|
+
attributes: attributes,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
exports.OpenTelemetryTracer = OpenTelemetryTracer;
|
|
41
|
+
//# sourceMappingURL=opentelemetry-tracing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opentelemetry-tracing.js","sourceRoot":"","sources":["../../src/opentelemetry-tracing.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;GAaG;;;AAEH,4CAAwE;AAGxE;;;;GAIG;AACH,MAAa,mBAAmB;IAC9B;;;;;;OAMG;IACH,UAAU,CACR,QAAgB,EAChB,UAAuB,EACvB,MAAoB;QAEpB,MAAM,cAAc,GAAW,WAAK,CAAC,SAAS,CAAC,SAAS,CAAW,CAAC;QACpE,OAAO,cAAc,CAAC,SAAS,CAAC,QAAQ,EAAE;YACxC,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;IACL,CAAC;CACF;AAnBD,kDAmBC"}
|
|
@@ -15,11 +15,13 @@
|
|
|
15
15
|
*/
|
|
16
16
|
/// <reference types="node" />
|
|
17
17
|
import { CallOptions } from 'google-gax';
|
|
18
|
+
import { Span } from '@opentelemetry/api';
|
|
18
19
|
import { BatchPublishOptions } from './message-batch';
|
|
19
20
|
import { Queue, OrderedQueue } from './message-queues';
|
|
20
21
|
import { Topic } from '../topic';
|
|
21
22
|
import { RequestCallback, EmptyCallback } from '../pubsub';
|
|
22
23
|
import { google } from '../../protos/protos';
|
|
24
|
+
import { OpenTelemetryTracer } from '../opentelemetry-tracing';
|
|
23
25
|
export declare type PubsubMessage = google.pubsub.v1.IPubsubMessage;
|
|
24
26
|
export interface Attributes {
|
|
25
27
|
[key: string]: string;
|
|
@@ -29,7 +31,19 @@ export interface PublishOptions {
|
|
|
29
31
|
batching?: BatchPublishOptions;
|
|
30
32
|
gaxOpts?: CallOptions;
|
|
31
33
|
messageOrdering?: boolean;
|
|
34
|
+
enableOpenTelemetryTracing?: boolean;
|
|
32
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* @typedef PublishOptions
|
|
38
|
+
* @property {BatchPublishOptions} [batching] The maximum number of bytes to
|
|
39
|
+
* buffer before sending a payload.
|
|
40
|
+
* @property {object} [gaxOpts] Request configuration options, outlined
|
|
41
|
+
* {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html|here.}
|
|
42
|
+
* @property {boolean} [messageOrdering] If true, messages published with the
|
|
43
|
+
* same order key in Message will be delivered to the subscribers in the order in which they
|
|
44
|
+
* are received by the Pub/Sub system. Otherwise, they may be delivered in
|
|
45
|
+
* any order.
|
|
46
|
+
*/
|
|
33
47
|
export declare const BATCH_LIMITS: BatchPublishOptions;
|
|
34
48
|
/**
|
|
35
49
|
* A Publisher object allows you to publish messages to a specific topic.
|
|
@@ -47,6 +61,7 @@ export declare class Publisher {
|
|
|
47
61
|
settings: PublishOptions;
|
|
48
62
|
queue: Queue;
|
|
49
63
|
orderedQueues: Map<string, OrderedQueue>;
|
|
64
|
+
tracing: OpenTelemetryTracer | undefined;
|
|
50
65
|
constructor(topic: Topic, options?: PublishOptions);
|
|
51
66
|
flush(): Promise<void>;
|
|
52
67
|
flush(callback: EmptyCallback): void;
|
|
@@ -82,4 +97,12 @@ export declare class Publisher {
|
|
|
82
97
|
* @param {PublishOptions} options The publisher options.
|
|
83
98
|
*/
|
|
84
99
|
setOptions(options?: PublishOptions): void;
|
|
100
|
+
/**
|
|
101
|
+
* Constructs an OpenTelemetry span
|
|
102
|
+
*
|
|
103
|
+
* @private
|
|
104
|
+
*
|
|
105
|
+
* @param {PubsubMessage} message The message to create a span for
|
|
106
|
+
*/
|
|
107
|
+
constructSpan(message: PubsubMessage): Span | undefined;
|
|
85
108
|
}
|
|
@@ -15,10 +15,23 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.Publisher = exports.BATCH_LIMITS = void 0;
|
|
18
19
|
const promisify_1 = require("@google-cloud/promisify");
|
|
19
20
|
const extend = require("extend");
|
|
20
21
|
const message_queues_1 = require("./message-queues");
|
|
21
22
|
const default_options_1 = require("../default-options");
|
|
23
|
+
const opentelemetry_tracing_1 = require("../opentelemetry-tracing");
|
|
24
|
+
/**
|
|
25
|
+
* @typedef PublishOptions
|
|
26
|
+
* @property {BatchPublishOptions} [batching] The maximum number of bytes to
|
|
27
|
+
* buffer before sending a payload.
|
|
28
|
+
* @property {object} [gaxOpts] Request configuration options, outlined
|
|
29
|
+
* {@link https://googleapis.github.io/gax-nodejs/interfaces/CallOptions.html|here.}
|
|
30
|
+
* @property {boolean} [messageOrdering] If true, messages published with the
|
|
31
|
+
* same order key in Message will be delivered to the subscribers in the order in which they
|
|
32
|
+
* are received by the Pub/Sub system. Otherwise, they may be delivered in
|
|
33
|
+
* any order.
|
|
34
|
+
*/
|
|
22
35
|
exports.BATCH_LIMITS = {
|
|
23
36
|
maxBytes: Math.pow(1024, 2) * 9,
|
|
24
37
|
maxMessages: 1000,
|
|
@@ -40,6 +53,10 @@ class Publisher {
|
|
|
40
53
|
this.topic = topic;
|
|
41
54
|
this.queue = new message_queues_1.Queue(this);
|
|
42
55
|
this.orderedQueues = new Map();
|
|
56
|
+
this.tracing =
|
|
57
|
+
this.settings && this.settings.enableOpenTelemetryTracing
|
|
58
|
+
? new opentelemetry_tracing_1.OpenTelemetryTracer()
|
|
59
|
+
: undefined;
|
|
43
60
|
}
|
|
44
61
|
/**
|
|
45
62
|
* Immediately sends all remaining queued data. This is mostly useful
|
|
@@ -104,8 +121,12 @@ class Publisher {
|
|
|
104
121
|
\nInvalid value of type "${typeof value}" provided for "${key}".`);
|
|
105
122
|
}
|
|
106
123
|
}
|
|
124
|
+
const span = this.constructSpan(message);
|
|
107
125
|
if (!message.orderingKey) {
|
|
108
126
|
this.queue.add(message, callback);
|
|
127
|
+
if (span) {
|
|
128
|
+
span.end();
|
|
129
|
+
}
|
|
109
130
|
return;
|
|
110
131
|
}
|
|
111
132
|
const key = message.orderingKey;
|
|
@@ -116,6 +137,9 @@ class Publisher {
|
|
|
116
137
|
}
|
|
117
138
|
const queue = this.orderedQueues.get(key);
|
|
118
139
|
queue.add(message, callback);
|
|
140
|
+
if (span) {
|
|
141
|
+
span.end();
|
|
142
|
+
}
|
|
119
143
|
}
|
|
120
144
|
/**
|
|
121
145
|
* Indicates to the publisher that it is safe to continue publishing for the
|
|
@@ -149,8 +173,12 @@ class Publisher {
|
|
|
149
173
|
gaxOpts: {
|
|
150
174
|
isBundling: false,
|
|
151
175
|
},
|
|
176
|
+
enableOpenTelemetryTracing: false,
|
|
152
177
|
};
|
|
153
|
-
const { batching, gaxOpts, messageOrdering } = extend(true, defaults, options);
|
|
178
|
+
const { batching, gaxOpts, messageOrdering, enableOpenTelemetryTracing, } = extend(true, defaults, options);
|
|
179
|
+
this.tracing = enableOpenTelemetryTracing
|
|
180
|
+
? new opentelemetry_tracing_1.OpenTelemetryTracer()
|
|
181
|
+
: undefined;
|
|
154
182
|
this.settings = {
|
|
155
183
|
batching: {
|
|
156
184
|
maxBytes: Math.min(batching.maxBytes, exports.BATCH_LIMITS.maxBytes),
|
|
@@ -159,12 +187,39 @@ class Publisher {
|
|
|
159
187
|
},
|
|
160
188
|
gaxOpts,
|
|
161
189
|
messageOrdering,
|
|
190
|
+
enableOpenTelemetryTracing,
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
/**
|
|
194
|
+
* Constructs an OpenTelemetry span
|
|
195
|
+
*
|
|
196
|
+
* @private
|
|
197
|
+
*
|
|
198
|
+
* @param {PubsubMessage} message The message to create a span for
|
|
199
|
+
*/
|
|
200
|
+
constructSpan(message) {
|
|
201
|
+
const spanAttributes = {
|
|
202
|
+
data: message.data,
|
|
162
203
|
};
|
|
204
|
+
const span = this.tracing
|
|
205
|
+
? this.tracing.createSpan(`${this.topic.name} publisher`, spanAttributes)
|
|
206
|
+
: undefined;
|
|
207
|
+
if (span) {
|
|
208
|
+
if (message.attributes &&
|
|
209
|
+
message.attributes['googclient_OpenTelemetrySpanContext']) {
|
|
210
|
+
console.warn('googclient_OpenTelemetrySpanContext key set as message attribute, but will be overridden.');
|
|
211
|
+
}
|
|
212
|
+
if (!message.attributes) {
|
|
213
|
+
message.attributes = {};
|
|
214
|
+
}
|
|
215
|
+
message.attributes['googclient_OpenTelemetrySpanContext'] = JSON.stringify(span.context());
|
|
216
|
+
}
|
|
217
|
+
return span;
|
|
163
218
|
}
|
|
164
219
|
}
|
|
165
220
|
exports.Publisher = Publisher;
|
|
166
221
|
promisify_1.promisifyAll(Publisher, {
|
|
167
222
|
singular: true,
|
|
168
|
-
exclude: ['publish', 'setOptions'],
|
|
223
|
+
exclude: ['publish', 'setOptions', 'constructSpan'],
|
|
169
224
|
});
|
|
170
225
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/publisher/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/publisher/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,11 +21,11 @@ export interface BatchPublishOptions {
|
|
|
21
21
|
}
|
|
22
22
|
/**
|
|
23
23
|
* @typedef BatchPublishOptions
|
|
24
|
-
* @property {number} [maxBytes=1024
|
|
24
|
+
* @property {number} [maxBytes=1 * 1024 * 1024] The maximum number of bytes to
|
|
25
25
|
* buffer before sending a payload.
|
|
26
|
-
* @property {number} [maxMessages=
|
|
26
|
+
* @property {number} [maxMessages=100] The maximum number of messages to
|
|
27
27
|
* buffer before sending a payload.
|
|
28
|
-
* @property {number} [maxMilliseconds=
|
|
28
|
+
* @property {number} [maxMilliseconds=10] The maximum duration to wait before
|
|
29
29
|
* sending a payload.
|
|
30
30
|
*/
|
|
31
31
|
/**
|
|
@@ -15,14 +15,15 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.MessageBatch = void 0;
|
|
18
19
|
const _1 = require("./");
|
|
19
20
|
/**
|
|
20
21
|
* @typedef BatchPublishOptions
|
|
21
|
-
* @property {number} [maxBytes=1024
|
|
22
|
+
* @property {number} [maxBytes=1 * 1024 * 1024] The maximum number of bytes to
|
|
22
23
|
* buffer before sending a payload.
|
|
23
|
-
* @property {number} [maxMessages=
|
|
24
|
+
* @property {number} [maxMessages=100] The maximum number of messages to
|
|
24
25
|
* buffer before sending a payload.
|
|
25
|
-
* @property {number} [maxMilliseconds=
|
|
26
|
+
* @property {number} [maxMilliseconds=10] The maximum duration to wait before
|
|
26
27
|
* sending a payload.
|
|
27
28
|
*/
|
|
28
29
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-batch.js","sourceRoot":"","sources":["../../../src/publisher/message-batch.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"message-batch.js","sourceRoot":"","sources":["../../../src/publisher/message-batch.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAEH,yBAAgE;AAQhE;;;;;;;;GAQG;AACH;;;;;;GAMG;AACH,MAAa,YAAY;IAMvB,YAAY,OAA4B;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACjB,CAAC;IACD;;;;;OAKG;IACH,GAAG,CAAC,OAAsB,EAAE,QAAyB;QACnD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK,IAAI,OAAO,CAAC,IAAK,CAAC,MAAM,CAAC;IACrC,CAAC;IACD;;;;;OAKG;IACH,MAAM,CAAC,EAAC,IAAI,EAAgB;QAC1B,MAAM,EAAC,WAAW,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7C,OAAO,CACL,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,WAAY;YACnC,IAAI,CAAC,KAAK,GAAG,IAAK,CAAC,MAAM,IAAI,QAAS,CACvC,CAAC;IACJ,CAAC;IACD;;;;;;OAMG;IACH,OAAO;QACL,MAAM,EAAC,WAAW,EAAE,QAAQ,EAAC,GAAG,eAAY,CAAC;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,WAAY,IAAI,IAAI,CAAC,KAAK,IAAI,QAAS,CAAC;IACzE,CAAC;IACD;;;;OAIG;IACH,MAAM;QACJ,MAAM,EAAC,WAAW,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,WAAY,IAAI,IAAI,CAAC,KAAK,IAAI,QAAS,CAAC;IACzE,CAAC;CACF;AAzDD,oCAyDC"}
|
|
@@ -102,7 +102,7 @@ export declare class OrderedQueue extends MessageQueue {
|
|
|
102
102
|
* Reference to the batch we're currently filling.
|
|
103
103
|
* @returns {MessageBatch}
|
|
104
104
|
*/
|
|
105
|
-
|
|
105
|
+
get currentBatch(): MessageBatch;
|
|
106
106
|
/**
|
|
107
107
|
* Adds a message to a batch, creating a new batch if need be.
|
|
108
108
|
*
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.OrderedQueue = exports.Queue = exports.MessageQueue = void 0;
|
|
18
19
|
const events_1 = require("events");
|
|
19
20
|
const message_batch_1 = require("./message-batch");
|
|
20
21
|
const publish_error_1 = require("./publish-error");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-queues.js","sourceRoot":"","sources":["../../../src/publisher/message-queues.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"message-queues.js","sourceRoot":"","sources":["../../../src/publisher/message-queues.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-error.js","sourceRoot":"","sources":["../../../src/publisher/publish-error.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"publish-error.js","sourceRoot":"","sources":["../../../src/publisher/publish-error.ts"],"names":[],"mappings":";;;AAiBA;;;;;GAKG;AACH,MAAa,YAAa,SAAQ,KAAK;IAMrC,YAAY,GAAW,EAAE,GAAsB;QAC7C,KAAK,CAAC,8BAA8B,GAAG,cAAc,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAEpE;;;;;WAKG;QACH,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QAErB;;;;;WAKG;QACH,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAE3B;;;;;WAKG;QACH,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAE7B;;;;;WAKG;QACH,IAAI,CAAC,WAAW,GAAG,GAAG,CAAC;QAEvB;;;;;WAKG;QACH,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;IACnB,CAAC;CACF;AAjDD,oCAiDC"}
|
package/build/src/pubsub.d.ts
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { GoogleAuth } from 'google-auth-library';
|
|
18
18
|
import * as gax from 'google-gax';
|
|
19
19
|
import { Snapshot } from './snapshot';
|
|
20
|
-
import { Subscription, SubscriptionOptions, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse } from './subscription';
|
|
20
|
+
import { Subscription, SubscriptionOptions, CreateSubscriptionOptions, CreateSubscriptionCallback, CreateSubscriptionResponse, DetachSubscriptionCallback, DetachSubscriptionResponse } from './subscription';
|
|
21
21
|
import { Topic, GetTopicSubscriptionsCallback, GetTopicSubscriptionsResponse, CreateTopicCallback, CreateTopicResponse } from './topic';
|
|
22
22
|
import { PublishOptions } from './publisher';
|
|
23
23
|
import { CallOptions } from 'google-gax';
|
|
@@ -51,6 +51,8 @@ export declare type EmptyCallback = RequestCallback<google.protobuf.IEmpty>;
|
|
|
51
51
|
export declare type EmptyResponse = [google.protobuf.IEmpty];
|
|
52
52
|
export declare type ExistsCallback = RequestCallback<boolean>;
|
|
53
53
|
export declare type ExistsResponse = [boolean];
|
|
54
|
+
export declare type DetachedCallback = RequestCallback<boolean>;
|
|
55
|
+
export declare type DetachedResponse = [boolean];
|
|
54
56
|
export interface GetClientConfig {
|
|
55
57
|
client: 'PublisherClient' | 'SubscriberClient';
|
|
56
58
|
}
|
|
@@ -95,9 +97,11 @@ interface GetClientCallback {
|
|
|
95
97
|
* JSON file, the `projectId` option above is not necessary. NOTE: .pem and
|
|
96
98
|
* .p12 require you to specify the `email` option as well.
|
|
97
99
|
* @property {string} [apiEndpoint] The `apiEndpoint` from options will set the
|
|
98
|
-
* host. If not set, the `PUBSUB_EMULATOR_HOST` environment variable from
|
|
99
|
-
*
|
|
100
|
-
* used
|
|
100
|
+
* host. If not set, the `PUBSUB_EMULATOR_HOST` environment variable from the
|
|
101
|
+
* gcloud SDK is honored. We also check the `CLOUD_API_ENDPOINT_OVERRIDES_PUBSUB`
|
|
102
|
+
* environment variable used by `gcloud alpha pubsub`. Otherwise the actual API
|
|
103
|
+
* endpoint will be used. Note that if the URL doesn't end in '.googleapis.com',
|
|
104
|
+
* we will assume that it's an emulator and disable strict SSL checks.
|
|
101
105
|
* @property {string} [email] Account email address. Required when using a .pem
|
|
102
106
|
* or .p12 keyFilename.
|
|
103
107
|
* @property {object} [credentials] Credentials object.
|
|
@@ -160,11 +164,19 @@ export declare class PubSub {
|
|
|
160
164
|
createTopic(name: string, gaxOpts?: CallOptions): Promise<CreateTopicResponse>;
|
|
161
165
|
createTopic(name: string, callback: CreateTopicCallback): void;
|
|
162
166
|
createTopic(name: string, gaxOpts: CallOptions, callback: CreateTopicCallback): void;
|
|
167
|
+
detachSubscription(name: string, gaxOpts?: CallOptions): Promise<DetachSubscriptionResponse>;
|
|
168
|
+
detachSubscription(name: string, callback: DetachSubscriptionCallback): void;
|
|
169
|
+
detachSubscription(name: string, gaxOpts: CallOptions, callback: DetachSubscriptionCallback): void;
|
|
163
170
|
/**
|
|
164
171
|
* Determine the appropriate endpoint to use for API requests, first trying
|
|
165
|
-
* the
|
|
166
|
-
*
|
|
167
|
-
*
|
|
172
|
+
* the `apiEndpoint` parameter. If that isn't set, we try the Pub/Sub emulator
|
|
173
|
+
* environment variable (PUBSUB_EMULATOR_HOST). If that is also null, we try
|
|
174
|
+
* the standard `gcloud alpha pubsub` environment variable
|
|
175
|
+
* (CLOUDSDK_API_ENDPOINT_OVERRIDES_PUBSUB). Otherwise the default production
|
|
176
|
+
* API is used.
|
|
177
|
+
*
|
|
178
|
+
* Note that if the URL doesn't end in '.googleapis.com', we will assume that
|
|
179
|
+
* it's an emulator and disable strict SSL checks.
|
|
168
180
|
*
|
|
169
181
|
* @private
|
|
170
182
|
*/
|
|
@@ -281,6 +293,7 @@ export declare class PubSub {
|
|
|
281
293
|
* @throws {Error} If a name is not provided.
|
|
282
294
|
*
|
|
283
295
|
* @param {string} name The name of the topic.
|
|
296
|
+
* @param {PublishOptions} [options] Publisher configuration object.
|
|
284
297
|
* @returns {Topic} A {@link Topic} instance.
|
|
285
298
|
*
|
|
286
299
|
* @example
|