lib/client.js

@@ -263,7 +263,7 @@ class Client extends EventEmitter {
    */
   get(url, data, callback) {
     if (!url) {
-      return Promise.reject(new Error('url is required'));
+      throw new Error('url is required');
     }
 
     if (typeof data === 'function') {
@@ -277,8 +277,10 @@ class Client extends EventEmitter {
     }
 
     if (!this.authed) {
-      // If not connected, do auth to get updated versions first
-      return this.getPendingAuth(url, data, callback);
+      return new Promise((resolve) => {
+        // If not connected, do auth to get updated versions first
+        this.getPendingAuth(url, data, callback, resolve);
+      });
     }
 
     // Indicates whether to check the request cache or not
@@ -299,33 +301,22 @@ class Client extends EventEmitter {
     return this.request('get', url, data, callback);
   }
 
-  getPendingAuth(url, data, callback) {
-    return new Promise((resolve, reject) => {
-      if (this.requestsPendingAuth) {
-        this.requestsPendingAuth.push({ url, data, callback, resolve });
-        return;
-      }
-
-      this.requestsPendingAuth = [];
-
-      this.authWithKey(() => {
-        this.get(url, data, (err, result, headers) => {
-          if (typeof callback === 'function') {
-            callback(err, result, headers);
-          }
+  getPendingAuth(url, data, callback, resolve) {
+    if (this.requestsPendingAuth) {
+      this.requestsPendingAuth.push({ url, data, callback, resolve });
+      return;
+    }
 
-          if (err) {
-            reject(err);
-            return;
-          }
+    this.requestsPendingAuth = [];
 
-          resolve(result);
-        })
-        .catch((err) => {
-          reject(err.message);
-        });
+    this.authWithKey(() => {
+      this.get(url, data, (_err, result, headers) => {
+        if (callback) {
+          callback(null, result, headers);
+        }
+        resolve(result);
       });
-    }).then(() => {
+
       this.flushRequestsPendingAuth();
     });
   }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swell-node",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "Swell API library for NodeJS",
   "engines": {
     "node": ">=14.19.1",