feat: sync with 4.4.5

Author: JesusTheHun

packages/cbjs/src/authenticators.ts

@@ -28,7 +28,7 @@ export interface IPasswordAuthenticator {
   username: string;
 
   /**
-   * The password to autehnticate with.
+   * The password to authenticate with.
    */
   password: string;
 

packages/cbjs/src/cluster.ts

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { promisify } from 'node:util';
+import { inspect, promisify } from 'util';
 
 import { BucketName, CouchbaseClusterTypes, DefaultClusterTypes } from '@cbjsdev/shared';
 
@@ -389,6 +389,23 @@ export class Cluster<in out T extends CouchbaseClusterTypes = DefaultClusterType
     return this._resolveTimeout;
   }
 
+  /**
+   * @internal
+   */
+  [inspect.custom](): Record<string, any> {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { _auth, ...rest } = this;
+    return { ...rest, _auth: '***hidden***' };
+  }
+  /**
+   * @internal
+   */
+  toJSON(): Record<string, any> {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const { _auth, ...rest } = this;
+    return { ...rest, _auth: '***hidden***' };
+  }
+
   /**
   @internal
   @deprecated Use the static sdk-level {@link connect} method instead.
@@ -859,6 +876,10 @@ export class Cluster<in out T extends CouchbaseClusterTypes = DefaultClusterType
     }
   }
 
+  async waitForBuckets() {
+    await Promise.allSettled(this._openBuckets.values());
+  }
+
   /**
    * @throws AuthenticationFailureError
    * @private

packages/cbjs/src/utilities.ts

@@ -36,8 +36,6 @@ export { type Cas, CouchbaseCas };
 export type NodeCallback<T> = (...args: [null, T] | [Error, null]) => void;
 export type VoidNodeCallback = (err: Error | null) => void;
 
-class UserCallbackError extends Error {}
-
 /**
  * @internal
  */
@@ -63,21 +61,10 @@ export class PromiseHelper {
     const prom = logicFn();
 
     if (callback) {
-      prom
-        .then((res) => {
-          try {
-            callback(null, res);
-          } catch (err) {
-            throw new UserCallbackError('', { cause: err });
-          }
-        })
-        .catch((err) => {
-          if (err instanceof UserCallbackError) {
-            throw err.cause;
-          }
-
-          callback(err, null);
-        });
+      prom.then(
+        (res) => callback(null, res),
+        (err: Error) => callback(err, null)
+      );
     }
 
     return prom;
@@ -92,11 +79,11 @@ export class PromiseHelper {
   ): Promise<void>;
   static wrap<T>(
     logicFn: (callback: NodeCallback<NonVoid<T>>) => void,
-    callback?: NodeCallback<NonVoid<T>> | null
+    callback?: NodeCallback<NonVoid<NoInfer<T>>> | null
   ): Promise<T>;
   static wrap<T>(
     logicFn: (callback: (err: Error | null, res?: T | null) => void) => void,
-    callback?: ((err: Error | null, res: T | null) => T) | null
+    callback?: ((err: Error | null, res: NoInfer<T> | null) => T) | null
   ): Promise<T> {
     const prom = new Promise<T>((resolve, reject) => {
       logicFn((err, res) => {
@@ -110,21 +97,10 @@ export class PromiseHelper {
     });
 
     if (callback) {
-      prom
-        .then((res) => {
-          try {
-            callback(null, res);
-          } catch (err) {
-            throw new UserCallbackError('', { cause: err });
-          }
-        })
-        .catch((err) => {
-          if (err instanceof UserCallbackError) {
-            throw err.cause;
-          }
-
-          callback(err, null);
-        });
+      prom.then(
+        (res) => callback(null, res),
+        (err: Error) => callback(err, null)
+      );
     }
 
     return prom;

tests/cbjs/tests/cluster.spec.ts

@@ -206,4 +206,14 @@ describe.shuffle('cluster', { timeout: 10_000, repeats: 5 }, async () => {
     expect(cluster.searchTimeout).toEqual(60000);
     expect(cluster.viewTimeout).toEqual(60000);
   });
+
+  test('should not expose auth info in cluster', async ({
+    expect,
+    serverTestContext,
+  }) => {
+    const clusterStr = JSON.stringify(serverTestContext.cluster);
+    const cluster = JSON.parse(clusterStr);
+
+    expect(cluster).toHaveProperty('_auth', '***hidden***');
+  });
 });

tests/cbjs/tests/kv.lookupInAllReplicas.spec.ts

@@ -69,6 +69,7 @@ describe
       ]);
 
       expect(result).toBeInstanceOf(Array);
+      expect(result[0]).toBeInstanceOf(LookupInReplicaResult);
       expect(result[0].content).toHaveLength(4);
 
       expect(result[0].content[0].error).toBeNull();

tests/cbjs/tests/kv.lookupInAnyReplica.spec.ts

@@ -70,6 +70,7 @@ describe
       ]);
 
       expect(res.content).toBeInstanceOf(Array);
+      expect(res).toBeInstanceOf(LookupInReplicaResult);
       expect(res.content).toHaveLength(4);
 
       expect(res.content[0].error).toBeNull();