@ancon/wildcat-utils 1.53.0 → 1.53.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.53.0",
+  "version": "1.53.1",
   "main": "index.js",
   "module": "index.mjs",
   "types": "index.d.ts",

package/signalr/SignalR.d.ts

@@ -11,10 +11,17 @@ declare class SignalR {
     private backoff;
     private reconnectAttempt;
     private shouldReconnect;
+    private isReconnecting;
+    private pendingJoins;
     groups: string[];
     constructor(options: SignalRConfig);
     info: (message: string, data?: any) => void;
     private generateBackoff;
+    private getNextBackoffMs;
+    /**
+     * Keep trying to connect, with backoff, until connected or `disconnect()` is called.
+     * Only one reconnect loop runs at a time.
+     */
     private reconnect;
     private buildInitialListeners;
     /**
@@ -26,6 +33,14 @@ declare class SignalR {
     private skipSignal;
     private enhanceListener;
     setClientId: (clientId: string | undefined) => void;
+    /**
+     * Start the hub connection.
+     *
+     * @param throwError Rethrow a failed start and do nothing else.
+     * Without it, a failed start emits `disconnected` and keeps retrying with backoff
+     * until it connects or `disconnect()` is called; the returned promise settles
+     * when that happens.
+     */
     connect: (throwError?: boolean) => Promise<void>;
     disconnect: () => Promise<void>;
     /**
@@ -52,7 +67,12 @@ declare class SignalR {
      * @param listener Signal listener function
      */
     removeSignalListener: (signal: SignalRSignalName, listener: SignalREventListener) => void;
-    joinGroup: (group: string) => Promise<void>;
+    /**
+     * Join a group. A group that is already joined, or being joined, is not joined again.
+     * @returns Whether the group is joined
+     */
+    joinGroup: (group: string) => Promise<boolean>;
+    private invokeJoinGroup;
     leaveGroup: (group: string) => Promise<void>;
     leaveAllGroups: () => Promise<void>;
     getHubConnectionId: () => string | null;

package/signalr/SignalR.js

@@ -1 +1 @@
-"use strict";var f=Object.defineProperty;var d=(r,e,t)=>e in r?f(r,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):r[e]=t;var n=(r,e,t)=>(d(r,typeof e!="symbol"?e+"":e,t),t);const h=require("@microsoft/signalr"),a=require("@ancon/wildcat-types"),l=require("../shared/wait.js"),u=require("../api/generateBackoffWithEqualJitter.js");require("axios");require("../number/randomIntFromInterval.js");class g{constructor(e){n(this,"internalEvents");n(this,"signalREvents");n(this,"hubConnection");n(this,"clientId");n(this,"logger");n(this,"backoff",[]);n(this,"reconnectAttempt",0);n(this,"shouldReconnect",!0);n(this,"groups");n(this,"info",(e,t)=>{var i;(i=this.logger)==null||i.info(e,t)});n(this,"generateBackoff",()=>{this.backoff=u(50,500,5e3),this.info("Generated new backoff")});n(this,"reconnect",async()=>{if(this.shouldReconnect)try{this.info("Attempting to reconnect...",{attempt:this.reconnectAttempt+1}),await this.connect(!0),this.info("Reconnected"),this.reconnectAttempt=0}catch{if(this.backoff[this.reconnectAttempt]!=null){const t=this.backoff[this.reconnectAttempt];if(t!=null)await l(t);else throw new Error("Could not resolve ms from backoff")}else{this.reconnectAttempt>0&&this.info("Ran out of backoff intervals, restarting backoff..."),this.reconnectAttempt=0,this.generateBackoff();const t=this.backoff[this.reconnectAttempt];if(t!=null)await l(t);else throw new Error("Could not resolve ms from backoff")}this.reconnectAttempt+=1,await this.reconnect()}});n(this,"buildInitialListeners",()=>{this.hubConnection.onclose(()=>{this.groups=[],this.info("Hub connection closed"),this.emitEvent("disconnected"),this.reconnect()}),this.hubConnection.onreconnected(()=>this.emitEvent("reconnected"))});n(this,"emitEvent",(e,...t)=>{if(this.internalEvents.has(e)){this.info(`Emitting event "${e}"`);const i=this.internalEvents.get(e);i&&i.forEach(s=>s(...t))}else this.info(`Failed to emit event "${e}". There were no listeners.`)});n(this,"skipSignal",(e,t)=>{this.info(`Skipped signal "${e}"`,t)});n(this,"enhanceListener",(e,t,i)=>s=>{const o=JSON.parse(s),c=i&&o.clientId&&o.clientId===this.clientId;return c||this.info(`Received signal "${e}"`,s),c?this.skipSignal(e,s):t(o)});n(this,"setClientId",e=>{this.clientId=e});n(this,"connect",async(e=!1)=>{try{this.info("Connecting..."),await this.hubConnection.start(),this.info("Connected"),this.emitEvent("connected")}catch(t){if(this.info("Failed to connect"),e)throw t}});n(this,"disconnect",async()=>{try{this.shouldReconnect=!1,this.info("Disconnecting..."),await this.hubConnection.stop(),this.info("Disconnected"),this.emitEvent("disconnected")}catch{this.info("Failed to disconnect")}});n(this,"addEventListener",(e,t)=>{this.internalEvents.has(e)||this.internalEvents.set(e,[]);const i=this.internalEvents.get(e);return i&&i.push(t),()=>this.removeEventListener(e,t)});n(this,"removeEventListener",(e,t)=>{var i;if(this.internalEvents.has(e)){const s=this.internalEvents.get(e),o=((i=s==null?void 0:s.indexOf)==null?void 0:i.call(s,t))??-1;o>=0?(s.splice(o,1),this.info(`Removed event listener for event "${e}"`)):this.info(`Failed to remove event listener for event "${e}". Specified listener was not found.`)}else this.info(`Failed to remove event listener for event "${e}". Event doesn't have any listeners.`)});n(this,"addSignalListener",(e,t,i=!0)=>{this.signalREvents.has(e)||this.signalREvents.set(e,[]);const s=this.signalREvents.get(e),o=this.enhanceListener(e,t,i);return s&&s.push(o),this.hubConnection.on(e,o),this.info(`Added signal listener for signal "${e}"`),()=>this.removeSignalListener(e,o)});n(this,"removeSignalListener",(e,t)=>{var i;if(this.signalREvents.has(e)){const s=this.signalREvents.get(e),o=((i=s==null?void 0:s.indexOf)==null?void 0:i.call(s,t))??-1;o>=0?(this.hubConnection.off(e,t),s.splice(o,1),this.info(`Removed signal listener for signal "${e}"`)):this.info(`Failed to remove signal listener for signal "${e}". Specified listener was not found.`)}else this.info(`Failed to remove signal listener for signal "${e}". Signal doesn't have any listeners.`)});n(this,"joinGroup",async e=>{this.info(`Joining group "${e}"...`);const t=this.groups.push(e)-1;try{await this.hubConnection.invoke(a.SignalRMethodName.JoinGroup,e),this.info(`Joined group "${e}"`)}catch(i){this.info(`Failed to join group "${e}"`,i),t>=0&&this.groups.splice(t,1)}});n(this,"leaveGroup",async e=>{this.info(`Leaving group "${e}"...`);const t=this.groups.indexOf(e);t>=0&&this.groups.splice(t,1);try{await this.hubConnection.invoke(a.SignalRMethodName.LeaveGroup,e),this.info(`Left group "${e}"`)}catch(i){this.groups.indexOf(e)<0&&this.groups.push(e),this.info(`Failed to leave group "${e}"`,i)}});n(this,"leaveAllGroups",async()=>{this.info(`Leaving all (${this.groups.length}) groups...`);const e=[...this.groups].map(t=>this.leaveGroup(t));await Promise.all(e),this.info("Left all groups")});n(this,"getHubConnectionId",()=>this.hubConnection.connectionId);this.internalEvents=new Map,this.signalREvents=new Map,this.groups=[],e.enableLogging&&(this.logger=e.logger),this.hubConnection=new h.HubConnectionBuilder().withUrl(`${e.signalRApiUrl}/${e.hub}`).configureLogging(h.LogLevel.None).build(),e.serverTimeoutInMilliseconds&&(this.hubConnection.serverTimeoutInMilliseconds=e.serverTimeoutInMilliseconds),this.buildInitialListeners()}}module.exports=g;
+"use strict";var l=Object.defineProperty;var f=(r,e,n)=>e in r?l(r,e,{enumerable:!0,configurable:!0,writable:!0,value:n}):r[e]=n;var t=(r,e,n)=>(f(r,typeof e!="symbol"?e+"":e,n),n);const h=require("@microsoft/signalr"),a=require("@ancon/wildcat-types"),d=require("../shared/wait.js"),u=require("../api/generateBackoffWithEqualJitter.js");require("axios");require("../number/randomIntFromInterval.js");class g{constructor(e){t(this,"internalEvents");t(this,"signalREvents");t(this,"hubConnection");t(this,"clientId");t(this,"logger");t(this,"backoff",[]);t(this,"reconnectAttempt",0);t(this,"shouldReconnect",!0);t(this,"isReconnecting",!1);t(this,"pendingJoins",new Map);t(this,"groups");t(this,"info",(e,n)=>{var i;(i=this.logger)==null||i.info(e,n)});t(this,"generateBackoff",()=>{this.backoff=u(50,500,5e3),this.info("Generated new backoff")});t(this,"getNextBackoffMs",()=>{this.backoff[this.reconnectAttempt]==null&&(this.reconnectAttempt>0&&this.info("Ran out of backoff intervals, restarting backoff..."),this.reconnectAttempt=0,this.generateBackoff());const e=this.backoff[this.reconnectAttempt];if(e==null)throw new Error("Could not resolve ms from backoff");return e});t(this,"reconnect",async()=>{if(!this.isReconnecting){this.isReconnecting=!0;try{for(;this.shouldReconnect;)try{this.info("Attempting to reconnect...",{attempt:this.reconnectAttempt+1}),await this.connect(!0),this.info("Reconnected"),this.reconnectAttempt=0;return}catch{if(!this.shouldReconnect)break;await d(this.getNextBackoffMs()),this.reconnectAttempt+=1}}finally{this.isReconnecting=!1}}});t(this,"buildInitialListeners",()=>{this.hubConnection.onclose(()=>{this.groups=[],this.info("Hub connection closed"),this.emitEvent("disconnected"),this.reconnect()}),this.hubConnection.onreconnected(()=>this.emitEvent("reconnected"))});t(this,"emitEvent",(e,...n)=>{if(this.internalEvents.has(e)){this.info(`Emitting event "${e}"`);const i=this.internalEvents.get(e);i&&i.forEach(s=>s(...n))}else this.info(`Failed to emit event "${e}". There were no listeners.`)});t(this,"skipSignal",(e,n)=>{this.info(`Skipped signal "${e}"`,n)});t(this,"enhanceListener",(e,n,i)=>s=>{const o=JSON.parse(s),c=i&&o.clientId&&o.clientId===this.clientId;return c||this.info(`Received signal "${e}"`,s),c?this.skipSignal(e,s):n(o)});t(this,"setClientId",e=>{this.clientId=e});t(this,"connect",async(e=!1)=>{try{this.info("Connecting..."),await this.hubConnection.start(),this.info("Connected"),this.emitEvent("connected")}catch(n){if(this.info("Failed to connect"),e)throw n;this.shouldReconnect&&(this.emitEvent("disconnected"),await this.reconnect())}});t(this,"disconnect",async()=>{try{this.shouldReconnect=!1,this.info("Disconnecting..."),await this.hubConnection.stop(),this.info("Disconnected"),this.emitEvent("disconnected")}catch{this.info("Failed to disconnect")}});t(this,"addEventListener",(e,n)=>{this.internalEvents.has(e)||this.internalEvents.set(e,[]);const i=this.internalEvents.get(e);return i&&i.push(n),()=>this.removeEventListener(e,n)});t(this,"removeEventListener",(e,n)=>{var i;if(this.internalEvents.has(e)){const s=this.internalEvents.get(e),o=((i=s==null?void 0:s.indexOf)==null?void 0:i.call(s,n))??-1;o>=0?(s.splice(o,1),this.info(`Removed event listener for event "${e}"`)):this.info(`Failed to remove event listener for event "${e}". Specified listener was not found.`)}else this.info(`Failed to remove event listener for event "${e}". Event doesn't have any listeners.`)});t(this,"addSignalListener",(e,n,i=!0)=>{this.signalREvents.has(e)||this.signalREvents.set(e,[]);const s=this.signalREvents.get(e),o=this.enhanceListener(e,n,i);return s&&s.push(o),this.hubConnection.on(e,o),this.info(`Added signal listener for signal "${e}"`),()=>this.removeSignalListener(e,o)});t(this,"removeSignalListener",(e,n)=>{var i;if(this.signalREvents.has(e)){const s=this.signalREvents.get(e),o=((i=s==null?void 0:s.indexOf)==null?void 0:i.call(s,n))??-1;o>=0?(this.hubConnection.off(e,n),s.splice(o,1),this.info(`Removed signal listener for signal "${e}"`)):this.info(`Failed to remove signal listener for signal "${e}". Specified listener was not found.`)}else this.info(`Failed to remove signal listener for signal "${e}". Signal doesn't have any listeners.`)});t(this,"joinGroup",async e=>{const n=this.pendingJoins.get(e);if(n)return n;if(this.groups.includes(e))return!0;const i=this.invokeJoinGroup(e).finally(()=>{this.pendingJoins.delete(e)});return this.pendingJoins.set(e,i),i});t(this,"invokeJoinGroup",async e=>{this.info(`Joining group "${e}"...`),this.groups.push(e);try{return await this.hubConnection.invoke(a.SignalRMethodName.JoinGroup,e),this.info(`Joined group "${e}"`),!0}catch(n){this.info(`Failed to join group "${e}"`,n);const i=this.groups.indexOf(e);return i>=0&&this.groups.splice(i,1),!1}});t(this,"leaveGroup",async e=>{this.info(`Leaving group "${e}"...`);const n=this.groups.indexOf(e);n>=0&&this.groups.splice(n,1);try{await this.hubConnection.invoke(a.SignalRMethodName.LeaveGroup,e),this.info(`Left group "${e}"`)}catch(i){this.groups.indexOf(e)<0&&this.groups.push(e),this.info(`Failed to leave group "${e}"`,i)}});t(this,"leaveAllGroups",async()=>{this.info(`Leaving all (${this.groups.length}) groups...`);const e=[...this.groups].map(n=>this.leaveGroup(n));await Promise.all(e),this.info("Left all groups")});t(this,"getHubConnectionId",()=>this.hubConnection.connectionId);this.internalEvents=new Map,this.signalREvents=new Map,this.groups=[],e.enableLogging&&(this.logger=e.logger),this.hubConnection=new h.HubConnectionBuilder().withUrl(`${e.signalRApiUrl}/${e.hub}`).configureLogging(h.LogLevel.None).build(),e.serverTimeoutInMilliseconds!=null&&(this.hubConnection.serverTimeoutInMilliseconds=e.serverTimeoutInMilliseconds),e.keepAliveIntervalInMilliseconds!=null&&(this.hubConnection.keepAliveIntervalInMilliseconds=e.keepAliveIntervalInMilliseconds),this.buildInitialListeners()}}module.exports=g;

package/signalr/SignalR.mjs

@@ -1,55 +1,64 @@
-var f = Object.defineProperty;
-var l = (r, e, t) => e in r ? f(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
-var n = (r, e, t) => (l(r, typeof e != "symbol" ? e + "" : e, t), t);
-import { HubConnectionBuilder as d, LogLevel as u } from "@microsoft/signalr";
+var l = Object.defineProperty;
+var a = (r, e, n) => e in r ? l(r, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : r[e] = n;
+var t = (r, e, n) => (a(r, typeof e != "symbol" ? e + "" : e, n), n);
+import { HubConnectionBuilder as f, LogLevel as d } from "@microsoft/signalr";
 import { SignalRMethodName as h } from "@ancon/wildcat-types";
-import a from "../shared/wait.mjs";
+import u from "../shared/wait.mjs";
 import g from "../api/generateBackoffWithEqualJitter.mjs";
 import "axios";
 import "../number/randomIntFromInterval.mjs";
-class $ {
+class w {
   constructor(e) {
-    n(this, "internalEvents");
-    n(this, "signalREvents");
-    n(this, "hubConnection");
-    n(this, "clientId");
-    n(this, "logger");
-    n(this, "backoff", []);
-    n(this, "reconnectAttempt", 0);
-    n(this, "shouldReconnect", !0);
-    n(this, "groups");
-    n(this, "info", (e, t) => {
+    t(this, "internalEvents");
+    t(this, "signalREvents");
+    t(this, "hubConnection");
+    t(this, "clientId");
+    t(this, "logger");
+    t(this, "backoff", []);
+    t(this, "reconnectAttempt", 0);
+    t(this, "shouldReconnect", !0);
+    t(this, "isReconnecting", !1);
+    t(this, "pendingJoins", /* @__PURE__ */ new Map());
+    t(this, "groups");
+    t(this, "info", (e, n) => {
       var i;
-      (i = this.logger) == null || i.info(e, t);
+      (i = this.logger) == null || i.info(e, n);
     });
-    n(this, "generateBackoff", () => {
+    t(this, "generateBackoff", () => {
       this.backoff = g(50, 500, 5e3), this.info("Generated new backoff");
     });
-    n(this, "reconnect", async () => {
-      if (this.shouldReconnect)
+    t(this, "getNextBackoffMs", () => {
+      this.backoff[this.reconnectAttempt] == null && (this.reconnectAttempt > 0 && this.info("Ran out of backoff intervals, restarting backoff..."), this.reconnectAttempt = 0, this.generateBackoff());
+      const e = this.backoff[this.reconnectAttempt];
+      if (e == null)
+        throw new Error("Could not resolve ms from backoff");
+      return e;
+    });
+    /**
+     * Keep trying to connect, with backoff, until connected or `disconnect()` is called.
+     * Only one reconnect loop runs at a time.
+     */
+    t(this, "reconnect", async () => {
+      if (!this.isReconnecting) {
+        this.isReconnecting = !0;
         try {
-          this.info("Attempting to reconnect...", {
-            attempt: this.reconnectAttempt + 1
-          }), await this.connect(!0), this.info("Reconnected"), this.reconnectAttempt = 0;
-        } catch {
-          if (this.backoff[this.reconnectAttempt] != null) {
-            const t = this.backoff[this.reconnectAttempt];
-            if (t != null)
-              await a(t);
-            else
-              throw new Error("Could not resolve ms from backoff");
-          } else {
-            this.reconnectAttempt > 0 && this.info("Ran out of backoff intervals, restarting backoff..."), this.reconnectAttempt = 0, this.generateBackoff();
-            const t = this.backoff[this.reconnectAttempt];
-            if (t != null)
-              await a(t);
-            else
-              throw new Error("Could not resolve ms from backoff");
-          }
-          this.reconnectAttempt += 1, await this.reconnect();
+          for (; this.shouldReconnect; )
+            try {
+              this.info("Attempting to reconnect...", {
+                attempt: this.reconnectAttempt + 1
+              }), await this.connect(!0), this.info("Reconnected"), this.reconnectAttempt = 0;
+              return;
+            } catch {
+              if (!this.shouldReconnect)
+                break;
+              await u(this.getNextBackoffMs()), this.reconnectAttempt += 1;
+            }
+        } finally {
+          this.isReconnecting = !1;
         }
+      }
     });
-    n(this, "buildInitialListeners", () => {
+    t(this, "buildInitialListeners", () => {
       this.hubConnection.onclose(() => {
         this.groups = [], this.info("Hub connection closed"), this.emitEvent("disconnected"), this.reconnect();
       }), this.hubConnection.onreconnected(() => this.emitEvent("reconnected"));
@@ -59,33 +68,42 @@ class $ {
      * @param event Event to emit
      * @param args Arguments to send to the listeners
      */
-    n(this, "emitEvent", (e, ...t) => {
+    t(this, "emitEvent", (e, ...n) => {
       if (this.internalEvents.has(e)) {
         this.info(`Emitting event "${e}"`);
         const i = this.internalEvents.get(e);
-        i && i.forEach((s) => s(...t));
+        i && i.forEach((s) => s(...n));
       } else
         this.info(`Failed to emit event "${e}". There were no listeners.`);
     });
-    n(this, "skipSignal", (e, t) => {
-      this.info(`Skipped signal "${e}"`, t);
+    t(this, "skipSignal", (e, n) => {
+      this.info(`Skipped signal "${e}"`, n);
     });
-    n(this, "enhanceListener", (e, t, i) => (s) => {
+    t(this, "enhanceListener", (e, n, i) => (s) => {
       const o = JSON.parse(s), c = i && o.clientId && o.clientId === this.clientId;
-      return c || this.info(`Received signal "${e}"`, s), c ? this.skipSignal(e, s) : t(o);
+      return c || this.info(`Received signal "${e}"`, s), c ? this.skipSignal(e, s) : n(o);
     });
-    n(this, "setClientId", (e) => {
+    t(this, "setClientId", (e) => {
       this.clientId = e;
     });
-    n(this, "connect", async (e = !1) => {
+    /**
+     * Start the hub connection.
+     *
+     * @param throwError Rethrow a failed start and do nothing else.
+     * Without it, a failed start emits `disconnected` and keeps retrying with backoff
+     * until it connects or `disconnect()` is called; the returned promise settles
+     * when that happens.
+     */
+    t(this, "connect", async (e = !1) => {
       try {
         this.info("Connecting..."), await this.hubConnection.start(), this.info("Connected"), this.emitEvent("connected");
-      } catch (t) {
+      } catch (n) {
         if (this.info("Failed to connect"), e)
-          throw t;
+          throw n;
+        this.shouldReconnect && (this.emitEvent("disconnected"), await this.reconnect());
       }
     });
-    n(this, "disconnect", async () => {
+    t(this, "disconnect", async () => {
       try {
         this.shouldReconnect = !1, this.info("Disconnecting..."), await this.hubConnection.stop(), this.info("Disconnected"), this.emitEvent("disconnected");
       } catch {
@@ -97,20 +115,20 @@ class $ {
      * @param event Event to listen on
      * @param listener Event listener function
      */
-    n(this, "addEventListener", (e, t) => {
+    t(this, "addEventListener", (e, n) => {
       this.internalEvents.has(e) || this.internalEvents.set(e, []);
       const i = this.internalEvents.get(e);
-      return i && i.push(t), () => this.removeEventListener(e, t);
+      return i && i.push(n), () => this.removeEventListener(e, n);
     });
     /**
      * Remove internal event listener
      * @param event Event to stop listening to
      * @param listener Event listener function
      */
-    n(this, "removeEventListener", (e, t) => {
+    t(this, "removeEventListener", (e, n) => {
       var i;
       if (this.internalEvents.has(e)) {
-        const s = this.internalEvents.get(e), o = ((i = s == null ? void 0 : s.indexOf) == null ? void 0 : i.call(s, t)) ?? -1;
+        const s = this.internalEvents.get(e), o = ((i = s == null ? void 0 : s.indexOf) == null ? void 0 : i.call(s, n)) ?? -1;
         o >= 0 ? (s.splice(o, 1), this.info(`Removed event listener for event "${e}"`)) : this.info(
           `Failed to remove event listener for event "${e}". Specified listener was not found.`
         );
@@ -124,11 +142,11 @@ class $ {
      * @param signal Signal name
      * @param listener Signal listener function
      */
-    n(this, "addSignalListener", (e, t, i = !0) => {
+    t(this, "addSignalListener", (e, n, i = !0) => {
       this.signalREvents.has(e) || this.signalREvents.set(e, []);
       const s = this.signalREvents.get(e), o = this.enhanceListener(
         e,
-        t,
+        n,
         i
       );
       return s && s.push(o), this.hubConnection.on(e, o), this.info(`Added signal listener for signal "${e}"`), () => this.removeSignalListener(e, o);
@@ -138,11 +156,11 @@ class $ {
      * @param signal Signal name
      * @param listener Signal listener function
      */
-    n(this, "removeSignalListener", (e, t) => {
+    t(this, "removeSignalListener", (e, n) => {
       var i;
       if (this.signalREvents.has(e)) {
-        const s = this.signalREvents.get(e), o = ((i = s == null ? void 0 : s.indexOf) == null ? void 0 : i.call(s, t)) ?? -1;
-        o >= 0 ? (this.hubConnection.off(e, t), s.splice(o, 1), this.info(`Removed signal listener for signal "${e}"`)) : this.info(
+        const s = this.signalREvents.get(e), o = ((i = s == null ? void 0 : s.indexOf) == null ? void 0 : i.call(s, n)) ?? -1;
+        o >= 0 ? (this.hubConnection.off(e, n), s.splice(o, 1), this.info(`Removed signal listener for signal "${e}"`)) : this.info(
           `Failed to remove signal listener for signal "${e}". Specified listener was not found.`
         );
       } else
@@ -150,34 +168,50 @@ class $ {
           `Failed to remove signal listener for signal "${e}". Signal doesn't have any listeners.`
         );
     });
-    n(this, "joinGroup", async (e) => {
-      this.info(`Joining group "${e}"...`);
-      const t = this.groups.push(e) - 1;
+    /**
+     * Join a group. A group that is already joined, or being joined, is not joined again.
+     * @returns Whether the group is joined
+     */
+    t(this, "joinGroup", async (e) => {
+      const n = this.pendingJoins.get(e);
+      if (n)
+        return n;
+      if (this.groups.includes(e))
+        return !0;
+      const i = this.invokeJoinGroup(e).finally(() => {
+        this.pendingJoins.delete(e);
+      });
+      return this.pendingJoins.set(e, i), i;
+    });
+    t(this, "invokeJoinGroup", async (e) => {
+      this.info(`Joining group "${e}"...`), this.groups.push(e);
       try {
-        await this.hubConnection.invoke(h.JoinGroup, e), this.info(`Joined group "${e}"`);
-      } catch (i) {
-        this.info(`Failed to join group "${e}"`, i), t >= 0 && this.groups.splice(t, 1);
+        return await this.hubConnection.invoke(h.JoinGroup, e), this.info(`Joined group "${e}"`), !0;
+      } catch (n) {
+        this.info(`Failed to join group "${e}"`, n);
+        const i = this.groups.indexOf(e);
+        return i >= 0 && this.groups.splice(i, 1), !1;
       }
     });
-    n(this, "leaveGroup", async (e) => {
+    t(this, "leaveGroup", async (e) => {
       this.info(`Leaving group "${e}"...`);
-      const t = this.groups.indexOf(e);
-      t >= 0 && this.groups.splice(t, 1);
+      const n = this.groups.indexOf(e);
+      n >= 0 && this.groups.splice(n, 1);
       try {
         await this.hubConnection.invoke(h.LeaveGroup, e), this.info(`Left group "${e}"`);
       } catch (i) {
         this.groups.indexOf(e) < 0 && this.groups.push(e), this.info(`Failed to leave group "${e}"`, i);
       }
     });
-    n(this, "leaveAllGroups", async () => {
+    t(this, "leaveAllGroups", async () => {
       this.info(`Leaving all (${this.groups.length}) groups...`);
-      const e = [...this.groups].map((t) => this.leaveGroup(t));
+      const e = [...this.groups].map((n) => this.leaveGroup(n));
       await Promise.all(e), this.info("Left all groups");
     });
-    n(this, "getHubConnectionId", () => this.hubConnection.connectionId);
-    this.internalEvents = /* @__PURE__ */ new Map(), this.signalREvents = /* @__PURE__ */ new Map(), this.groups = [], e.enableLogging && (this.logger = e.logger), this.hubConnection = new d().withUrl(`${e.signalRApiUrl}/${e.hub}`).configureLogging(u.None).build(), e.serverTimeoutInMilliseconds && (this.hubConnection.serverTimeoutInMilliseconds = e.serverTimeoutInMilliseconds), this.buildInitialListeners();
+    t(this, "getHubConnectionId", () => this.hubConnection.connectionId);
+    this.internalEvents = /* @__PURE__ */ new Map(), this.signalREvents = /* @__PURE__ */ new Map(), this.groups = [], e.enableLogging && (this.logger = e.logger), this.hubConnection = new f().withUrl(`${e.signalRApiUrl}/${e.hub}`).configureLogging(d.None).build(), e.serverTimeoutInMilliseconds != null && (this.hubConnection.serverTimeoutInMilliseconds = e.serverTimeoutInMilliseconds), e.keepAliveIntervalInMilliseconds != null && (this.hubConnection.keepAliveIntervalInMilliseconds = e.keepAliveIntervalInMilliseconds), this.buildInitialListeners();
   }
 }
 export {
-  $ as default
+  w as default
 };

package/signalr/createUseSignalRHook.d.ts

@@ -19,7 +19,7 @@ declare type ReduxHooksArg = Partial<{
 declare function createUseSignalRHook<RootState = unknown>(signalRConfig: SignalRHookConfig, selectors?: ReduxSelectorsArg<RootState>, actions?: ReduxActionsArg, hooks?: ReduxHooksArg): {
     useSignalR: (hub: SignalRHubName) => {
         isHubConnected: boolean;
-        join: (group: string) => Promise<void>;
+        join: (group: string) => Promise<boolean>;
         leave: (group: string) => Promise<void>;
         subscribe: (signal: SignalRSignalName, listener: SignalREventListener, shouldSkipOwnClient?: boolean) => (() => void);
         unsubscribe: (signal: SignalRSignalName, listener: SignalREventListener) => void;

package/signalr/createUseSignalRHook.js

@@ -1 +1 @@
-"use strict";const n=require("react"),h=require("react-redux"),C=require("../noop-7ea3b37b.js"),B=a=>Object.freeze(Object.defineProperty({__proto__:null,default:a},Symbol.toStringTag,{value:"Module"}));function F(a,_,g,j){const{logger:q,enableLogging:x}=a;let{signalRApiUrl:I}=a;const{clientIdSelector:D,isSignalROnlineSelector:s}=_??{},{setIsSignalROnlineAction:l}=g??{},{useAppStore:G=h.useStore,useAppDispatch:m=h.useDispatch,useAppSelector:M=h.useSelector}=j??{},b=new Set;function P(o){const[f,z]=n.useState(I),[e,N]=n.useState(null),d=G(),p=m(),E=M(D??(()=>{})),[u,T]=n.useState(!1),[r,v]=n.useState(!1),O=n.useRef(u),S=n.useCallback(()=>{(s==null?void 0:s(d.getState()))===!1&&l&&p(l({isSignalROnline:!0})),r||v(!0)},[p,r,d]),k=S,H=n.useCallback(()=>{(s==null?void 0:s(d.getState()))===!0&&l&&p(l({isSignalROnline:!1})),r&&v(!1)},[p,r,d]),y=n.useCallback(async t=>{e&&e.groups.indexOf(t)<0&&await(e==null?void 0:e.joinGroup(t))},[e]),A=n.useCallback(async t=>{e&&e.groups.indexOf(t)>=0&&await(e==null?void 0:e.leaveGroup(t))},[e]),L=n.useCallback((t,c,i)=>e?e==null?void 0:e.addSignalListener(t,c,i):C.noop,[e]),U=n.useCallback((t,c)=>{e&&e.removeSignalListener(t,c)},[e]),w=n.useCallback(()=>e?e.getHubConnectionId():null,[e]);return n.useEffect(()=>{let t=!1;return Promise.resolve().then(()=>B(require("./SignalR.js"))).then(({default:c})=>{t||N(new c({signalRApiUrl:f,hub:o,logger:q,enableLogging:x}))}),()=>{t=!0}},[o,f]),n.useEffect(()=>{function t(c){z(c)}return b.add(t),()=>{b.delete(t)}},[]),n.useEffect(()=>{O.current=u},[u]),n.useEffect(()=>{const t=e==null?void 0:e.addEventListener("connected",S),c=e==null?void 0:e.addEventListener("reconnected",k),i=e==null?void 0:e.addEventListener("disconnected",H);return e&&!O.current&&T(!0),()=>{t==null||t(),c==null||c(),i==null||i()}},[e,S,H,k]),n.useEffect(()=>{e==null||e.setClientId(E||void 0)},[e,E]),n.useEffect(()=>{async function t(){await(e==null?void 0:e.connect())}u&&t()},[e,u]),n.useEffect(()=>()=>{e==null||e.leaveAllGroups().then(()=>{e==null||e.disconnect()}).catch(C.noop).finally(()=>{e==null||e.disconnect().catch(C.noop)})},[e]),n.useMemo(()=>({isHubConnected:r,join:y,leave:A,subscribe:L,unsubscribe:U,getHubConnectionId:w}),[r,y,A,L,U,w])}return{useSignalR:P,setUrl(o){I=o,b.forEach(f=>{f(o)})}}}module.exports=F;
+"use strict";const n=require("react"),I=require("react-redux"),h=require("../noop-7ea3b37b.js"),J=l=>Object.freeze(Object.defineProperty({__proto__:null,default:l},Symbol.toStringTag,{value:"Module"}));function K(l,_,j,q){const{logger:w,enableLogging:D,serverTimeoutInMilliseconds:M,keepAliveIntervalInMilliseconds:m}=l;let{signalRApiUrl:v}=l;const{clientIdSelector:x,isSignalROnlineSelector:c}=_??{},{setIsSignalROnlineAction:a}=j??{},{useAppStore:G=I.useStore,useAppDispatch:P=I.useDispatch,useAppSelector:T=I.useSelector}=q??{},b=new Set;function z(o){const[f,N]=n.useState(v),[e,B]=n.useState(null),d=G(),p=P(),C=T(x??(()=>{})),[u,F]=n.useState(!1),[r,E]=n.useState(!1),k=n.useRef(u),S=n.useCallback(()=>{(c==null?void 0:c(d.getState()))===!1&&a&&p(a({isSignalROnline:!0})),r||E(!0)},[p,r,d]),A=S,H=n.useCallback(()=>{(c==null?void 0:c(d.getState()))===!0&&a&&p(a({isSignalROnline:!1})),r&&E(!1)},[p,r,d]),O=n.useCallback(async t=>e?e.joinGroup(t):!1,[e]),y=n.useCallback(async t=>{e&&e.groups.indexOf(t)>=0&&await(e==null?void 0:e.leaveGroup(t))},[e]),L=n.useCallback((t,s,i)=>e?e==null?void 0:e.addSignalListener(t,s,i):h.noop,[e]),U=n.useCallback((t,s)=>{e&&e.removeSignalListener(t,s)},[e]),g=n.useCallback(()=>e?e.getHubConnectionId():null,[e]);return n.useEffect(()=>{let t=!1;return Promise.resolve().then(()=>J(require("./SignalR.js"))).then(({default:s})=>{t||B(new s({signalRApiUrl:f,hub:o,logger:w,enableLogging:D,serverTimeoutInMilliseconds:M,keepAliveIntervalInMilliseconds:m}))}),()=>{t=!0}},[o,f]),n.useEffect(()=>{function t(s){N(s)}return b.add(t),()=>{b.delete(t)}},[]),n.useEffect(()=>{k.current=u},[u]),n.useEffect(()=>{const t=e==null?void 0:e.addEventListener("connected",S),s=e==null?void 0:e.addEventListener("reconnected",A),i=e==null?void 0:e.addEventListener("disconnected",H);return e&&!k.current&&F(!0),()=>{t==null||t(),s==null||s(),i==null||i()}},[e,S,H,A]),n.useEffect(()=>{e==null||e.setClientId(C||void 0)},[e,C]),n.useEffect(()=>{async function t(){await(e==null?void 0:e.connect())}u&&t()},[e,u]),n.useEffect(()=>()=>{e==null||e.leaveAllGroups().then(()=>{e==null||e.disconnect()}).catch(h.noop).finally(()=>{e==null||e.disconnect().catch(h.noop)})},[e]),n.useMemo(()=>({isHubConnected:r,join:O,leave:y,subscribe:L,unsubscribe:U,getHubConnectionId:g}),[r,O,y,L,U,g])}return{useSignalR:z,setUrl(o){v=o,b.forEach(f=>{f(o)})}}}module.exports=K;

package/signalr/createUseSignalRHook.mjs

@@ -1,122 +1,127 @@
-import { useState as S, useRef as P, useCallback as c, useEffect as r, useMemo as Q } from "react";
-import { useStore as T, useDispatch as V, useSelector as W } from "react-redux";
-import { n as I } from "../noop-378485d5.mjs";
-function $(v, D, G, g) {
-  const { logger: j, enableLogging: k } = v;
-  let { signalRApiUrl: H } = v;
-  const { clientIdSelector: M, isSignalROnlineSelector: s } = D ?? {}, { setIsSignalROnlineAction: a } = G ?? {}, {
-    useAppStore: q = T,
-    useAppDispatch: z = V,
-    useAppSelector: B = W
-  } = g ?? {}, b = /* @__PURE__ */ new Set();
-  function F(i) {
-    const [l, J] = S(H), [e, K] = S(null), f = q(), p = z(), A = B(M ?? (() => {
-    })), [u, N] = S(!1), [o, L] = S(!1), U = P(u), h = c(() => {
-      (s == null ? void 0 : s(f.getState())) === !1 && a && p(a({ isSignalROnline: !0 })), o || L(!0);
-    }, [p, o, f]), m = h, C = c(() => {
-      (s == null ? void 0 : s(f.getState())) === !0 && a && p(a({ isSignalROnline: !1 })), o && L(!1);
-    }, [p, o, f]), O = c(
-      async (t) => {
-        e && e.groups.indexOf(t) < 0 && await (e == null ? void 0 : e.joinGroup(t));
-      },
+import { useState as I, useRef as Q, useCallback as r, useEffect as s, useMemo as V } from "react";
+import { useStore as W, useDispatch as X, useSelector as Y } from "react-redux";
+import { n as h } from "../noop-378485d5.mjs";
+function ee(v, k, D, G) {
+  const {
+    logger: M,
+    enableLogging: j,
+    serverTimeoutInMilliseconds: x,
+    keepAliveIntervalInMilliseconds: T
+  } = v;
+  let { signalRApiUrl: A } = v;
+  const { clientIdSelector: q, isSignalROnlineSelector: c } = k ?? {}, { setIsSignalROnlineAction: a } = D ?? {}, {
+    useAppStore: z = W,
+    useAppDispatch: B = X,
+    useAppSelector: F = Y
+  } = G ?? {}, S = /* @__PURE__ */ new Set();
+  function J(i) {
+    const [d, K] = I(A), [e, N] = I(null), f = z(), p = B(), H = F(q ?? (() => {
+    })), [u, P] = I(!1), [o, m] = I(!1), L = Q(u), b = r(() => {
+      (c == null ? void 0 : c(f.getState())) === !1 && a && p(a({ isSignalROnline: !0 })), o || m(!0);
+    }, [p, o, f]), U = b, C = r(() => {
+      (c == null ? void 0 : c(f.getState())) === !0 && a && p(a({ isSignalROnline: !1 })), o && m(!1);
+    }, [p, o, f]), E = r(
+      async (t) => e ? e.joinGroup(t) : !1,
       [e]
-    ), w = c(
+    ), O = r(
       async (t) => {
         e && e.groups.indexOf(t) >= 0 && await (e == null ? void 0 : e.leaveGroup(t));
       },
       [e]
-    ), E = c(
-      (t, n, d) => e ? e == null ? void 0 : e.addSignalListener(
+    ), g = r(
+      (t, n, l) => e ? e == null ? void 0 : e.addSignalListener(
         t,
         n,
-        d
-      ) : I,
+        l
+      ) : h,
       [e]
-    ), y = c(
+    ), w = r(
       (t, n) => {
         e && e.removeSignalListener(t, n);
       },
       [e]
-    ), x = c(() => e ? e.getHubConnectionId() : null, [e]);
-    return r(() => {
+    ), y = r(() => e ? e.getHubConnectionId() : null, [e]);
+    return s(() => {
       let t = !1;
       return import("./SignalR.mjs").then(({ default: n }) => {
-        t || K(
+        t || N(
           new n({
-            signalRApiUrl: l,
+            signalRApiUrl: d,
             hub: i,
-            logger: j,
-            enableLogging: k
+            logger: M,
+            enableLogging: j,
+            serverTimeoutInMilliseconds: x,
+            keepAliveIntervalInMilliseconds: T
           })
         );
       }), () => {
         t = !0;
       };
-    }, [i, l]), r(() => {
+    }, [i, d]), s(() => {
       function t(n) {
-        J(n);
+        K(n);
       }
-      return b.add(t), () => {
-        b.delete(t);
+      return S.add(t), () => {
+        S.delete(t);
       };
-    }, []), r(() => {
-      U.current = u;
-    }, [u]), r(() => {
+    }, []), s(() => {
+      L.current = u;
+    }, [u]), s(() => {
       const t = e == null ? void 0 : e.addEventListener(
         "connected",
-        h
+        b
       ), n = e == null ? void 0 : e.addEventListener(
         "reconnected",
-        m
-      ), d = e == null ? void 0 : e.addEventListener(
+        U
+      ), l = e == null ? void 0 : e.addEventListener(
         "disconnected",
         C
       );
-      return e && !U.current && N(!0), () => {
-        t == null || t(), n == null || n(), d == null || d();
+      return e && !L.current && P(!0), () => {
+        t == null || t(), n == null || n(), l == null || l();
       };
     }, [
       e,
-      h,
+      b,
       C,
-      m
-    ]), r(() => {
-      e == null || e.setClientId(A || void 0);
-    }, [e, A]), r(() => {
+      U
+    ]), s(() => {
+      e == null || e.setClientId(H || void 0);
+    }, [e, H]), s(() => {
       async function t() {
         await (e == null ? void 0 : e.connect());
       }
       u && t();
-    }, [e, u]), r(
+    }, [e, u]), s(
       () => () => {
         e == null || e.leaveAllGroups().then(() => {
           e == null || e.disconnect();
-        }).catch(I).finally(() => {
-          e == null || e.disconnect().catch(I);
+        }).catch(h).finally(() => {
+          e == null || e.disconnect().catch(h);
         });
       },
       [e]
-    ), Q(
+    ), V(
       () => ({
         isHubConnected: o,
-        join: O,
-        leave: w,
-        subscribe: E,
-        unsubscribe: y,
-        getHubConnectionId: x
+        join: E,
+        leave: O,
+        subscribe: g,
+        unsubscribe: w,
+        getHubConnectionId: y
       }),
-      [o, O, w, E, y, x]
+      [o, E, O, g, w, y]
     );
   }
   return {
-    useSignalR: F,
+    useSignalR: J,
     setUrl(i) {
-      H = i, b.forEach((l) => {
-        l(i);
+      A = i, S.forEach((d) => {
+        d(i);
       });
     }
   };
 }
 export {
-  $ as default
+  ee as default
 };

package/signalr/types.d.ts

@@ -12,5 +12,7 @@ export declare type SignalRConfig = {
     enableLogging?: boolean;
     /** @default 30000 */
     serverTimeoutInMilliseconds?: number;
+    /** @default 15000 */
+    keepAliveIntervalInMilliseconds?: number;
 };
 export declare type SignalRHookConfig = Omit<SignalRConfig, 'hub'>;