@google-cloud/pubsub 4.11.0 → 5.1.0

package/build/src/v1/subscriber_client.js

@@ -20,6 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscriberClient = void 0;
 const stream_1 = require("stream");
 const jsonProtos = require("../../protos/protos.json");
+const google_gax_1 = require("google-gax");
 /**
  * Client JSON configuration object, loaded from
  * `src/v1/subscriber_client_config.json`.
@@ -35,6 +36,28 @@ const version = require('../../../package.json').version;
  * @memberof v1
  */
 class SubscriberClient {
+    _terminated = false;
+    _opts;
+    _providedCustomServicePath;
+    _gaxModule;
+    _gaxGrpc;
+    _protos;
+    _defaults;
+    _universeDomain;
+    _servicePath;
+    _log = google_gax_1.loggingUtils.log('pubsub');
+    auth;
+    descriptors = {
+        page: {},
+        stream: {},
+        longrunning: {},
+        batching: {},
+    };
+    warn;
+    innerApiCalls;
+    iamClient;
+    pathTemplates;
+    subscriberStub;
     /**
      * Construct an instance of SubscriberClient.
      *
@@ -57,7 +80,7 @@ class SubscriberClient {
      *     Developer's Console, e.g. 'grape-spaceship-123'. We will also check
      *     the environment variable GCLOUD_PROJECT for your project ID. If your
      *     app is running in an environment which supports
-     *     {@link https://developers.google.com/identity/protocols/application-default-credentials Application Default Credentials},
+     *     {@link https://cloud.google.com/docs/authentication/application-default-credentials Application Default Credentials},
      *     your project ID will be detected automatically.
      * @param {string} [options.apiEndpoint] - The domain name of the
      *     API remote host.
@@ -75,32 +98,28 @@ class SubscriberClient {
      *     ```
      */
     constructor(opts, gaxInstance) {
-        var _a, _b, _c, _d, _e;
-        this._terminated = false;
-        this.descriptors = {
-            page: {},
-            stream: {},
-            longrunning: {},
-            batching: {},
-        };
         // Ensure that options include all the required fields.
         const staticMembers = this.constructor;
-        if ((opts === null || opts === void 0 ? void 0 : opts.universe_domain) &&
-            (opts === null || opts === void 0 ? void 0 : opts.universeDomain) &&
-            (opts === null || opts === void 0 ? void 0 : opts.universe_domain) !== (opts === null || opts === void 0 ? void 0 : opts.universeDomain)) {
+        if (opts?.universe_domain &&
+            opts?.universeDomain &&
+            opts?.universe_domain !== opts?.universeDomain) {
             throw new Error('Please set either universe_domain or universeDomain, but not both.');
         }
         const universeDomainEnvVar = typeof process === 'object' && typeof process.env === 'object'
             ? process.env['GOOGLE_CLOUD_UNIVERSE_DOMAIN']
             : undefined;
         this._universeDomain =
-            (_c = (_b = (_a = opts === null || opts === void 0 ? void 0 : opts.universeDomain) !== null && _a !== void 0 ? _a : opts === null || opts === void 0 ? void 0 : opts.universe_domain) !== null && _b !== void 0 ? _b : universeDomainEnvVar) !== null && _c !== void 0 ? _c : 'googleapis.com';
+            opts?.universeDomain ??
+                opts?.universe_domain ??
+                universeDomainEnvVar ??
+                'googleapis.com';
         this._servicePath = 'pubsub.' + this._universeDomain;
-        const servicePath = (opts === null || opts === void 0 ? void 0 : opts.servicePath) || (opts === null || opts === void 0 ? void 0 : opts.apiEndpoint) || this._servicePath;
-        this._providedCustomServicePath = !!((opts === null || opts === void 0 ? void 0 : opts.servicePath) || (opts === null || opts === void 0 ? void 0 : opts.apiEndpoint));
-        const port = (opts === null || opts === void 0 ? void 0 : opts.port) || staticMembers.port;
-        const clientConfig = (_d = opts === null || opts === void 0 ? void 0 : opts.clientConfig) !== null && _d !== void 0 ? _d : {};
-        const fallback = (_e = opts === null || opts === void 0 ? void 0 : opts.fallback) !== null && _e !== void 0 ? _e : (typeof window !== 'undefined' && typeof (window === null || window === void 0 ? void 0 : window.fetch) === 'function');
+        const servicePath = opts?.servicePath || opts?.apiEndpoint || this._servicePath;
+        this._providedCustomServicePath = !!(opts?.servicePath || opts?.apiEndpoint);
+        const port = opts?.port || staticMembers.port;
+        const clientConfig = opts?.clientConfig ?? {};
+        const fallback = opts?.fallback ??
+            (typeof window !== 'undefined' && typeof window?.fetch === 'function');
         opts = Object.assign({ servicePath, port, clientConfig, fallback }, opts);
         // Request numeric enum values if REST transport is used.
         opts.numericEnums = true;
@@ -225,7 +244,7 @@ class SubscriberClient {
             const callPromise = this.subscriberStub.then(stub => (...args) => {
                 if (this._terminated) {
                     if (methodName in this.descriptors.stream) {
-                        const stream = new stream_1.PassThrough();
+                        const stream = new stream_1.PassThrough({ objectMode: true });
                         setImmediate(() => {
                             stream.emit('error', new this._gaxModule.GoogleError('The client has already been closed.'));
                         });
@@ -310,7 +329,6 @@ class SubscriberClient {
         return this.auth.getProjectId();
     }
     createSubscription(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -325,13 +343,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                name: (_a = request.name) !== null && _a !== void 0 ? _a : '',
+                name: request.name ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.createSubscription(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('createSubscription request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('createSubscription response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .createSubscription(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('createSubscription response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     getSubscription(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -346,13 +377,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                subscription: (_a = request.subscription) !== null && _a !== void 0 ? _a : '',
+                subscription: request.subscription ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.getSubscription(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('getSubscription request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('getSubscription response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .getSubscription(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('getSubscription response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     updateSubscription(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -367,13 +411,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                'subscription.name': (_a = request.subscription.name) !== null && _a !== void 0 ? _a : '',
+                'subscription.name': request.subscription.name ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.updateSubscription(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('updateSubscription request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('updateSubscription response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .updateSubscription(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('updateSubscription response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     deleteSubscription(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -388,13 +445,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                subscription: (_a = request.subscription) !== null && _a !== void 0 ? _a : '',
+                subscription: request.subscription ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.deleteSubscription(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('deleteSubscription request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('deleteSubscription response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .deleteSubscription(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('deleteSubscription response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     modifyAckDeadline(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -409,13 +479,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                subscription: (_a = request.subscription) !== null && _a !== void 0 ? _a : '',
+                subscription: request.subscription ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.modifyAckDeadline(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('modifyAckDeadline request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('modifyAckDeadline response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .modifyAckDeadline(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('modifyAckDeadline response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     acknowledge(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -430,13 +513,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                subscription: (_a = request.subscription) !== null && _a !== void 0 ? _a : '',
+                subscription: request.subscription ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.acknowledge(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('acknowledge request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('acknowledge response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .acknowledge(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('acknowledge response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     pull(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -451,13 +547,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                subscription: (_a = request.subscription) !== null && _a !== void 0 ? _a : '',
+                subscription: request.subscription ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.pull(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('pull request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('pull response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .pull(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('pull response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     modifyPushConfig(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -472,13 +581,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                subscription: (_a = request.subscription) !== null && _a !== void 0 ? _a : '',
+                subscription: request.subscription ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.modifyPushConfig(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('modifyPushConfig request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('modifyPushConfig response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .modifyPushConfig(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('modifyPushConfig response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     getSnapshot(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -493,13 +615,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                snapshot: (_a = request.snapshot) !== null && _a !== void 0 ? _a : '',
+                snapshot: request.snapshot ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.getSnapshot(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('getSnapshot request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('getSnapshot response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .getSnapshot(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('getSnapshot response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     createSnapshot(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -514,13 +649,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                name: (_a = request.name) !== null && _a !== void 0 ? _a : '',
+                name: request.name ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.createSnapshot(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('createSnapshot request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('createSnapshot response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .createSnapshot(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('createSnapshot response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     updateSnapshot(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -535,13 +683,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                'snapshot.name': (_a = request.snapshot.name) !== null && _a !== void 0 ? _a : '',
+                'snapshot.name': request.snapshot.name ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.updateSnapshot(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('updateSnapshot request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('updateSnapshot response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .updateSnapshot(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('updateSnapshot response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     deleteSnapshot(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -556,13 +717,26 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                snapshot: (_a = request.snapshot) !== null && _a !== void 0 ? _a : '',
+                snapshot: request.snapshot ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.deleteSnapshot(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('deleteSnapshot request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('deleteSnapshot response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .deleteSnapshot(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('deleteSnapshot response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     seek(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -577,14 +751,28 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                subscription: (_a = request.subscription) !== null && _a !== void 0 ? _a : '',
+                subscription: request.subscription ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.seek(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('seek request %j', request);
+        const wrappedCallback = callback
+            ? (error, response, options, rawResponse) => {
+                this._log.info('seek response %j', response);
+                callback(error, response, options, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        return this.innerApiCalls
+            .seek(request, options, wrappedCallback)
+            ?.then(([response, options, rawResponse]) => {
+            this._log.info('seek response %j', response);
+            return [response, options, rawResponse];
+        });
     }
     /**
      * Establishes a stream with the server, which sends messages down to the
-     * client. The client streams acknowledgements and ack deadline modifications
+     * client. The client streams acknowledgments and ack deadline modifications
      * back to the server. The server will close the stream and return the status
      * on any error. The server may close the stream with status `UNAVAILABLE` to
      * reassign server-side resources, in which case, the client should
@@ -601,11 +789,13 @@ class SubscriberClient {
      *   for more details and examples.
      */
     streamingPull(options) {
-        this.initialize();
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('streamingPull stream %j', options);
         return this.innerApiCalls.streamingPull(null, options);
     }
     listSubscriptions(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -620,13 +810,27 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                project: (_a = request.project) !== null && _a !== void 0 ? _a : '',
+                project: request.project ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.listSubscriptions(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        const wrappedCallback = callback
+            ? (error, values, nextPageRequest, rawResponse) => {
+                this._log.info('listSubscriptions values %j', values);
+                callback(error, values, nextPageRequest, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        this._log.info('listSubscriptions request %j', request);
+        return this.innerApiCalls
+            .listSubscriptions(request, options, wrappedCallback)
+            ?.then(([response, input, output]) => {
+            this._log.info('listSubscriptions values %j', response);
+            return [response, input, output];
+        });
     }
     /**
-     * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object.
+     * Equivalent to `listSubscriptions`, but returns a NodeJS Stream object.
      * @param {Object} request
      *   The request object that will be sent.
      * @param {string} request.project
@@ -650,18 +854,20 @@ class SubscriberClient {
      *   for more details and examples.
      */
     listSubscriptionsStream(request, options) {
-        var _a;
         request = request || {};
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                project: (_a = request.project) !== null && _a !== void 0 ? _a : '',
+                project: request.project ?? '',
             });
         const defaultCallSettings = this._defaults['listSubscriptions'];
         const callSettings = defaultCallSettings.merge(options);
-        this.initialize();
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('listSubscriptions stream %j', request);
         return this.descriptors.page.listSubscriptions.createStream(this.innerApiCalls.listSubscriptions, request, callSettings);
     }
     /**
@@ -690,22 +896,23 @@ class SubscriberClient {
      *   for more details and examples.
      */
     listSubscriptionsAsync(request, options) {
-        var _a;
         request = request || {};
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                project: (_a = request.project) !== null && _a !== void 0 ? _a : '',
+                project: request.project ?? '',
             });
         const defaultCallSettings = this._defaults['listSubscriptions'];
         const callSettings = defaultCallSettings.merge(options);
-        this.initialize();
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('listSubscriptions iterate %j', request);
         return this.descriptors.page.listSubscriptions.asyncIterate(this.innerApiCalls['listSubscriptions'], request, callSettings);
     }
     listSnapshots(request, optionsOrCallback, callback) {
-        var _a;
         request = request || {};
         let options;
         if (typeof optionsOrCallback === 'function' && callback === undefined) {
@@ -720,13 +927,27 @@ class SubscriberClient {
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                project: (_a = request.project) !== null && _a !== void 0 ? _a : '',
+                project: request.project ?? '',
             });
-        this.initialize();
-        return this.innerApiCalls.listSnapshots(request, options, callback);
+        this.initialize().catch(err => {
+            throw err;
+        });
+        const wrappedCallback = callback
+            ? (error, values, nextPageRequest, rawResponse) => {
+                this._log.info('listSnapshots values %j', values);
+                callback(error, values, nextPageRequest, rawResponse); // We verified callback above.
+            }
+            : undefined;
+        this._log.info('listSnapshots request %j', request);
+        return this.innerApiCalls
+            .listSnapshots(request, options, wrappedCallback)
+            ?.then(([response, input, output]) => {
+            this._log.info('listSnapshots values %j', response);
+            return [response, input, output];
+        });
     }
     /**
-     * Equivalent to `method.name.toCamelCase()`, but returns a NodeJS Stream object.
+     * Equivalent to `listSnapshots`, but returns a NodeJS Stream object.
      * @param {Object} request
      *   The request object that will be sent.
      * @param {string} request.project
@@ -750,18 +971,20 @@ class SubscriberClient {
      *   for more details and examples.
      */
     listSnapshotsStream(request, options) {
-        var _a;
         request = request || {};
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                project: (_a = request.project) !== null && _a !== void 0 ? _a : '',
+                project: request.project ?? '',
             });
         const defaultCallSettings = this._defaults['listSnapshots'];
         const callSettings = defaultCallSettings.merge(options);
-        this.initialize();
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('listSnapshots stream %j', request);
         return this.descriptors.page.listSnapshots.createStream(this.innerApiCalls.listSnapshots, request, callSettings);
     }
     /**
@@ -790,18 +1013,20 @@ class SubscriberClient {
      *   for more details and examples.
      */
     listSnapshotsAsync(request, options) {
-        var _a;
         request = request || {};
         options = options || {};
         options.otherArgs = options.otherArgs || {};
         options.otherArgs.headers = options.otherArgs.headers || {};
         options.otherArgs.headers['x-goog-request-params'] =
             this._gaxModule.routingHeader.fromParams({
-                project: (_a = request.project) !== null && _a !== void 0 ? _a : '',
+                project: request.project ?? '',
             });
         const defaultCallSettings = this._defaults['listSnapshots'];
         const callSettings = defaultCallSettings.merge(options);
-        this.initialize();
+        this.initialize().catch(err => {
+            throw err;
+        });
+        this._log.info('listSnapshots iterate %j', request);
         return this.descriptors.page.listSnapshots.asyncIterate(this.innerApiCalls['listSnapshots'], request, callSettings);
     }
     /**
@@ -1066,9 +1291,12 @@ class SubscriberClient {
     close() {
         if (this.subscriberStub && !this._terminated) {
             return this.subscriberStub.then(stub => {
+                this._log.info('ending gRPC channel');
                 this._terminated = true;
                 stub.close();
-                this.iamClient.close();
+                this.iamClient.close().catch(err => {
+                    throw err;
+                });
             });
         }
         return Promise.resolve();