tests: fix TestMutateRow_Generic_CloseClient and a few related things

Author: feywind

src/index.ts

@@ -492,6 +492,7 @@ export class Bigtable {
   static Cluster: Cluster;
   _metricsConfigManager: ClientSideMetricsConfigManager;
   admin: admin.BigtableAdmin;
+  closed = false;
 
   constructor(options: BigtableOptions = {}) {
     // Determine what scopes are needed.
@@ -909,6 +910,17 @@ export class Bigtable {
     let gaxStream: gax.CancellableStream;
     let stream: AbortableDuplex;
 
+    if (this.closed) {
+      callback?.({
+        name: 'Closed',
+        message: 'Bigtable internal client is closed',
+        code: grpc.status.ABORTED,
+        details: 'Bigtable internal client is closed',
+        metadata: new grpc.Metadata(),
+      });
+      return;
+    }
+
     const prepareGaxRequest = (
       callback: (err: Error | null, fn?: Function) => void,
     ) => {
@@ -1026,11 +1038,22 @@ export class Bigtable {
    * Close all bigtable clients. New requests will be rejected but it will not
    * kill connections with pending requests.
    */
-  close(): Promise<void[]> {
+  async close(): Promise<void[]> {
+    // Close all of the clients.
     const combined = Object.keys(this.api).map(clientType =>
       this.api[clientType].close(),
     );
-    return Promise.all(combined);
+    const results = await Promise.all(combined);
+
+    // Clear them out of our cache.
+    Object.keys(this.api).forEach(clientType => {
+      delete this.api[clientType];
+    });
+
+    // Mark as closed.
+    this.closed = true;
+
+    return results;
   }
 
   /**

testproxy/services/close-client.ts

@@ -14,9 +14,12 @@
 
 import {google} from '../protos/protos';
 import {ClientImplMaker, normalizeCallback} from './utils';
+import {closeBigtableClient} from './utils/bigtable-client';
 type ICloseClientRequest = google.bigtable.testproxy.ICloseClientRequest;
 type ICloseClientResponse = google.bigtable.testproxy.ICloseClientResponse;
 
+import {log} from './utils/log';
+
 export const closeClient: ClientImplMaker<
   ICloseClientRequest,
   ICloseClientResponse
@@ -26,8 +29,12 @@ export const closeClient: ClientImplMaker<
     const {clientId} = request;
     const bigtable = clientMap.get(clientId!);
 
+    log.info('close client %s (%s)', clientId, bigtable ? 'exists' : "doesn't exist");
+
     if (bigtable) {
+      await closeBigtableClient(bigtable);
       await bigtable.close();
+      log.info('client %s closed', clientId);
     }
     return {};
   });

testproxy/services/create-client.ts

@@ -18,6 +18,7 @@ import {google} from '../protos/protos';
 import * as grpc from '@grpc/grpc-js';
 import {Bigtable} from '../../src';
 import {createBigtableClient} from './utils/bigtable-client';
+import {log} from './utils/log';
 
 function durationToMilliseconds(
   duration: google.protobuf.Duration | google.protobuf.IDuration,
@@ -68,6 +69,8 @@ export const createClient: ClientImplMaker<
       );
     }
 
+    log.info('create client %s (%s)', clientId, clientMap.has(clientId) ? 'exists' : "doesn't exist");
+
     if (clientMap.has(clientId)) {
       throw Object.assign(new Error(`Client ${clientId} already exists`), {
         code: grpc.status.ALREADY_EXISTS,
@@ -99,6 +102,7 @@ export const createClient: ClientImplMaker<
       appProfileId: appProfileId!,
       clientConfig,
     });
+    log.info('created bigtable client %s', clientId);
     createBigtableClient(bigtable);
     clientMap.set(clientId!, bigtable);
     return {};

testproxy/services/utils/bigtable-client.ts

@@ -37,17 +37,24 @@ export function createBigtableClient(bigtable: Bigtable) {
   bigtableAny[v2] = new BigtableClient(bigtable.options.BigtableClient);
 }
 
-export function getBigtableClient(bigtable: Bigtable) {
+export function getBigtableClient(bigtable: Bigtable): BigtableClient {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return (bigtable as any)[v2];
 }
 
-export async function deleteBigtableClient(bigtable: Bigtable) {
+export async function closeBigtableClient(bigtable: Bigtable) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const bigtableAny = bigtable as any;
 
-  const bigtableClient = bigtableAny[v2];
+  const bigtableClient = bigtableAny[v2] as BigtableClient;
   await bigtableClient.close();
+}
+
+export async function deleteBigtableClient(bigtable: Bigtable) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const bigtableAny = bigtable as any;
+
+  await closeBigtableClient(bigtable);
 
   delete bigtableAny[v2];
 }

testproxy/services/utils/log.ts

@@ -0,0 +1,18 @@
+// Copyright 2025-2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import {loggingUtils as logging} from 'google-gax';
+
+// Debug logger to use with the testproxy.
+export const log = logging.log('cbt-testproxy');