🐛 Fix connect lock issues

__tests__/test.ts

@@ -213,6 +213,29 @@ test('max retries: 0', done => maxRetriesTest(0, done));
 test('max retries: 1', done => maxRetriesTest(1, done));
 test('max retries: 5', done => maxRetriesTest(5, done));
 
+test('reconnect after max retries', done => {
+    const ws = new ReconnectingWebSocket(URL, undefined, {
+        maxRetries: 1,
+        maxReconnectionDelay: 200,
+    });
+
+    let closed = false;
+    ws.addEventListener('error', () => {
+        if (ws.retryCount === 1 && !closed) {
+            const wss = new WebSocketServer({port: PORT});
+            ws.reconnect();
+            ws.addEventListener('open', () => {
+                wss.close(() => {
+                    closed = true;
+                    setTimeout(() => {
+                        done();
+                    }, 1000);
+                });
+            });
+        }
+    });
+});
+
 test('level0 event listeners are kept after reconnect', done => {
     const ws = new ReconnectingWebSocket(URL, undefined, {
         maxRetries: 4,
@@ -866,3 +889,51 @@ test('reconnect after closing', done => {
         }
     });
 });
+
+test('reconnect after closing during connection', done => {
+    const wss = new WebSocketServer({port: PORT});
+    const ws = new ReconnectingWebSocket(URL, undefined, {
+        minReconnectionDelay: 100,
+        maxReconnectionDelay: 200,
+    });
+
+    ws.close();
+    setTimeout(() => {
+        ws.reconnect();
+
+        ws.addEventListener('open', () => {
+            wss.close(() => {
+                setTimeout(() => {
+                    done();
+                }, 1000);
+            });
+        });
+    }, 1000);
+});
+
+test('rapidly toggling connection', done => {
+    const wss = new WebSocketServer({port: PORT});
+    const ws = new ReconnectingWebSocket(URL, undefined, {
+        minReconnectionDelay: 100,
+        maxReconnectionDelay: 200,
+    });
+
+    ws.close();
+    ws.reconnect();
+    ws.close();
+    ws.reconnect();
+
+    let connections = 0;
+    wss.on('connection', () => {
+        connections++;
+    });
+
+    ws.addEventListener('open', () => {
+        wss.close(() => {
+            setTimeout(() => {
+                expect(connections).toBe(1);
+                done();
+            }, 1000);
+        });
+    });
+});

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@reedsy/reconnecting-websocket",
-    "version": "4.4.0-reedsy-1.0.0",
+    "version": "4.4.0-reedsy-1.0.1",
     "description": "Reconnecting WebSocket",
     "main": "./dist/reconnecting-websocket-cjs.js",
     "module": "./dist/reconnecting-websocket-mjs.js",

reconnecting-websocket.ts

@@ -351,7 +351,6 @@ export default class ReconnectingWebSocket {
         if (this._connectLock || !this._shouldReconnect) {
             return;
         }
-        this._connectLock = true;
 
         const {
             maxRetries = DEFAULT.maxRetries,
@@ -364,6 +363,7 @@ export default class ReconnectingWebSocket {
             return;
         }
 
+        this._connectLock = true;
         this._retryCount++;
 
         this._debug('connect', this._retryCount);
@@ -376,6 +376,7 @@ export default class ReconnectingWebSocket {
             .then(url => {
                 // close could be called before creating the ws
                 if (this._closeCalled) {
+                    this._connectLock = false;
                     return;
                 }
                 this._debug('connect', {url, protocols: this._protocols});