Set to undefined before closing

couchbaselabs · Sep 2, 2024 · c8b202d · c8b202d
1 parent 3bd30d7
commit c8b202d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/ottoman/ottoman.ts b/src/ottoman/ottoman.ts
@@ -76,7 +76,7 @@ export type OttomanEvents = 'IndexOnline';
  * Store default connection.
  */
 export let __ottoman: Ottoman;
-export let __ottomanInstances: Ottoman[] = [];
+export const __ottomanInstances: Ottoman[] = [];
 
 export class Ottoman {
   private n1qlIndexes: Record<string, { fields: string[]; modelName: string }> = {};
@@ -376,13 +376,15 @@ export class Ottoman {
    * connection.close().then(() => console.log('connection closed'));
    * ```
    */
-  async close(): Promise<void> {
+  async close() {
+    console.log('Closing: ', this.id, exports.__ottoman ? exports.__ottoman.id : '____');
     if (this.cluster) {
-      await this.cluster.close();
-      __ottomanInstances = __ottomanInstances.filter((instance) => instance.id !== this.id);
-      if (__ottoman?.id === this.id) {
-        (__ottoman as any) = undefined;
+      exports.__ottomanInstances = exports.__ottomanInstances.filter((instance) => instance.id !== this.id);
+      if (exports.__ottoman?.id === this.id) {
+        console.log(exports.__ottoman.id, '__ottoman -> undefined');
+        exports.__ottoman = undefined;
       }
+      await this.cluster.close();
     }
   }