jsgar 4.0.2 → 4.0.4

package/dist/gar.umd.js

@@ -39,9 +39,10 @@
          * @param {boolean} [allowSelfSignedCertificate=false] - Allow self-signed certificates
          * @param {string} [logLevel='INFO'] - Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
          * @param {boolean} [uniqueKeyAndRecordUpdates=false] - Only one update per key/record
+         * @param {string} [token=null] - Token for authenticated connections (appended as ?token= query param)
          */
-        constructor(wsEndpoint, user, working_namespace = null, heartbeatTimeoutInterval = 4000, allowSelfSignedCertificate = false, logLevel = 'INFO', uniqueKeyAndRecordUpdates = false) {
-            this.wsEndpoint = wsEndpoint;
+        constructor(wsEndpoint, user, working_namespace = null, heartbeatTimeoutInterval = 4000, allowSelfSignedCertificate = false, logLevel = 'INFO', uniqueKeyAndRecordUpdates = false, token = null) {
+            this.wsEndpoint = token ? `${wsEndpoint}${wsEndpoint.includes('?') ? '&' : '?'}token=${token}` : wsEndpoint;
             this.websocket = null;
             this.messageQueue = [];
             this.connected = false;
@@ -218,9 +219,18 @@
                     this._receiveMessages();
 
                 } catch (e) {
-                    this.log('ERROR', `WebSocket connection failed: ${e.message}. Reconnecting in ${this.reconnectDelay / 1000} seconds...`);
                     this.connected = false;
                     this.websocket = null;
+                    // 401 is a permanent auth rejection — retrying won't help
+                    if (e.message && e.message.includes('401')) {
+                        this.log('ERROR', `WebSocket connection rejected (401 Unauthorized)`);
+                        this.running = false;
+                        if (this._firstHeartbeatReject) {
+                            this._firstHeartbeatReject(new Error('Connection rejected (401 Unauthorized)'));
+                        }
+                        break;
+                    }
+                    this.log('ERROR', `WebSocket connection failed: ${e.message}. Reconnecting in ${this.reconnectDelay / 1000} seconds...`);
                     await new Promise(resolve => setTimeout(resolve, this.reconnectDelay));
                 }
             }
@@ -582,13 +592,13 @@
             if (typeof globalThis !== 'undefined' && globalThis.WebSocket) {
                 return globalThis.WebSocket;
             }
-            // Node.js: resolve 'ws' at runtime without using dynamic import (avoids rollup code-splitting)
+            // Node.js: resolve 'ws' at runtime
             const isNode = typeof process !== 'undefined' && process.versions && process.versions.node;
             if (isNode) {
                 try {
-                    const req = (typeof module !== 'undefined' && module.require)
-                        ? module.require.bind(module)
-                        : (typeof require !== 'undefined' ? require : Function('return require')());
+                    // createRequire works in both ESM and CJS; resolves from cwd
+                    const { createRequire } = await import('node:module');
+                    const req = createRequire(process.cwd() + '/');
                     const mod = req('ws');
                     const WS = mod.default || mod.WebSocket || mod;
                     globalThis.WebSocket = WS;
@@ -679,13 +689,13 @@
          * @private
          */
         _resetFirstHeartbeatLatch() {
-            let resolved = false;
-            this._firstHeartbeatPromise = new Promise((resolve) => {
+            let settled = false;
+            this._firstHeartbeatPromise = new Promise((resolve, reject) => {
                 this._firstHeartbeatResolve = (value) => {
-                    if (!resolved) {
-                        resolved = true;
-                        resolve(value);
-                    }
+                    if (!settled) { settled = true; resolve(value); }
+                };
+                this._firstHeartbeatReject = (err) => {
+                    if (!settled) { settled = true; reject(err); }
                 };
             });
         }

package/gar.js

@@ -33,9 +33,10 @@ class GARClient {
      * @param {boolean} [allowSelfSignedCertificate=false] - Allow self-signed certificates
      * @param {string} [logLevel='INFO'] - Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
      * @param {boolean} [uniqueKeyAndRecordUpdates=false] - Only one update per key/record
+     * @param {string} [token=null] - Token for authenticated connections (appended as ?token= query param)
      */
-    constructor(wsEndpoint, user, working_namespace = null, heartbeatTimeoutInterval = 4000, allowSelfSignedCertificate = false, logLevel = 'INFO', uniqueKeyAndRecordUpdates = false) {
-        this.wsEndpoint = wsEndpoint;
+    constructor(wsEndpoint, user, working_namespace = null, heartbeatTimeoutInterval = 4000, allowSelfSignedCertificate = false, logLevel = 'INFO', uniqueKeyAndRecordUpdates = false, token = null) {
+        this.wsEndpoint = token ? `${wsEndpoint}${wsEndpoint.includes('?') ? '&' : '?'}token=${token}` : wsEndpoint;
         this.websocket = null;
         this.messageQueue = [];
         this.connected = false;
@@ -212,9 +213,18 @@ class GARClient {
                 this._receiveMessages();
 
             } catch (e) {
-                this.log('ERROR', `WebSocket connection failed: ${e.message}. Reconnecting in ${this.reconnectDelay / 1000} seconds...`);
                 this.connected = false;
                 this.websocket = null;
+                // 401 is a permanent auth rejection — retrying won't help
+                if (e.message && e.message.includes('401')) {
+                    this.log('ERROR', `WebSocket connection rejected (401 Unauthorized)`);
+                    this.running = false;
+                    if (this._firstHeartbeatReject) {
+                        this._firstHeartbeatReject(new Error('Connection rejected (401 Unauthorized)'));
+                    }
+                    break;
+                }
+                this.log('ERROR', `WebSocket connection failed: ${e.message}. Reconnecting in ${this.reconnectDelay / 1000} seconds...`);
                 await new Promise(resolve => setTimeout(resolve, this.reconnectDelay));
             }
         }
@@ -576,13 +586,13 @@ class GARClient {
         if (typeof globalThis !== 'undefined' && globalThis.WebSocket) {
             return globalThis.WebSocket;
         }
-        // Node.js: resolve 'ws' at runtime without using dynamic import (avoids rollup code-splitting)
+        // Node.js: resolve 'ws' at runtime
         const isNode = typeof process !== 'undefined' && process.versions && process.versions.node;
         if (isNode) {
             try {
-                const req = (typeof module !== 'undefined' && module.require)
-                    ? module.require.bind(module)
-                    : (typeof require !== 'undefined' ? require : Function('return require')());
+                // createRequire works in both ESM and CJS; resolves from cwd
+                const { createRequire } = await import('node:module');
+                const req = createRequire(process.cwd() + '/');
                 const mod = req('ws');
                 const WS = mod.default || mod.WebSocket || mod;
                 globalThis.WebSocket = WS;
@@ -673,13 +683,13 @@ class GARClient {
      * @private
      */
     _resetFirstHeartbeatLatch() {
-        let resolved = false;
-        this._firstHeartbeatPromise = new Promise((resolve) => {
+        let settled = false;
+        this._firstHeartbeatPromise = new Promise((resolve, reject) => {
             this._firstHeartbeatResolve = (value) => {
-                if (!resolved) {
-                    resolved = true;
-                    resolve(value);
-                }
+                if (!settled) { settled = true; resolve(value); }
+            };
+            this._firstHeartbeatReject = (err) => {
+                if (!settled) { settled = true; reject(err); }
             };
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsgar",
-  "version": "4.0.2",
+  "version": "4.0.4",
   "description": "A Javascript client for the GAR protocol",
   "type": "module",
   "main": "dist/gar.umd.js",