@ancon/wildcat-utils 1.43.1 → 1.43.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.43.1",
+  "version": "1.43.2",
   "private": false,
   "main": "index.js",
   "module": "index.mjs",

package/signalr/SignalR.d.ts

@@ -10,6 +10,7 @@ declare class SignalR {
     private logger;
     private backoff;
     private reconnectAttempt;
+    private shouldReconnect;
     groups: string[];
     constructor(options: SignalRConfig);
     info: (message: string, data?: any) => void;

package/signalr/SignalR.js

@@ -1 +1 @@
-"use strict";var l=Object.defineProperty;var d=(r,e,t)=>e in r?l(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"),f=require("../shared/wait.js"),u=require("../api/generateBackoffWithEqualJitter.js");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,"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()=>{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 f(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 f(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.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(),this.buildInitialListeners()}}module.exports=g;
+"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("../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(),this.buildInitialListeners()}}module.exports=g;

package/signalr/SignalR.mjs

@@ -1,10 +1,10 @@
 var f = Object.defineProperty;
 var l = (r, t, e) => t in r ? f(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
 var n = (r, t, e) => (l(r, typeof t != "symbol" ? t + "" : t, e), e);
-import { HubConnectionBuilder as d, LogLevel as g } from "@microsoft/signalr";
+import { HubConnectionBuilder as d, LogLevel as u } from "@microsoft/signalr";
 import { SignalRMethodName as h } from "@ancon/wildcat-types";
 import a from "../shared/wait.mjs";
-import u from "../api/generateBackoffWithEqualJitter.mjs";
+import g from "../api/generateBackoffWithEqualJitter.mjs";
 import "../number/randomIntFromInterval.mjs";
 class L {
   constructor(t) {
@@ -15,36 +15,38 @@ class L {
     n(this, "logger");
     n(this, "backoff", []);
     n(this, "reconnectAttempt", 0);
+    n(this, "shouldReconnect", !0);
     n(this, "groups");
     n(this, "info", (t, e) => {
       var i;
       (i = this.logger) == null || i.info(t, e);
     });
     n(this, "generateBackoff", () => {
-      this.backoff = u(50, 500, 5e3), this.info("Generated new backoff");
+      this.backoff = g(50, 500, 5e3), this.info("Generated new backoff");
     });
     n(this, "reconnect", async () => {
-      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 e = this.backoff[this.reconnectAttempt];
-          if (e != null)
-            await a(e);
-          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 e = this.backoff[this.reconnectAttempt];
-          if (e != null)
-            await a(e);
-          else
-            throw new Error("Could not resolve ms from backoff");
+      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 e = this.backoff[this.reconnectAttempt];
+            if (e != null)
+              await a(e);
+            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 e = this.backoff[this.reconnectAttempt];
+            if (e != null)
+              await a(e);
+            else
+              throw new Error("Could not resolve ms from backoff");
+          }
+          this.reconnectAttempt += 1, await this.reconnect();
         }
-        this.reconnectAttempt += 1, await this.reconnect();
-      }
     });
     n(this, "buildInitialListeners", () => {
       this.hubConnection.onclose(() => {
@@ -84,7 +86,7 @@ class L {
     });
     n(this, "disconnect", async () => {
       try {
-        this.info("Disconnecting..."), await this.hubConnection.stop(), this.info("Disconnected"), this.emitEvent("disconnected");
+        this.shouldReconnect = !1, this.info("Disconnecting..."), await this.hubConnection.stop(), this.info("Disconnected"), this.emitEvent("disconnected");
       } catch {
         this.info("Failed to disconnect");
       }
@@ -172,7 +174,7 @@ class L {
       await Promise.all(t), this.info("Left all groups");
     });
     n(this, "getHubConnectionId", () => this.hubConnection.connectionId);
-    this.internalEvents = /* @__PURE__ */ new Map(), this.signalREvents = /* @__PURE__ */ new Map(), this.groups = [], t.enableLogging && (this.logger = t.logger), this.hubConnection = new d().withUrl(`${t.signalRApiUrl}/${t.hub}`).configureLogging(g.None).build(), this.buildInitialListeners();
+    this.internalEvents = /* @__PURE__ */ new Map(), this.signalREvents = /* @__PURE__ */ new Map(), this.groups = [], t.enableLogging && (this.logger = t.logger), this.hubConnection = new d().withUrl(`${t.signalRApiUrl}/${t.hub}`).configureLogging(u.None).build(), this.buildInitialListeners();
   }
 }
 export {

package/signalr/createUseSignalRHook.js

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

package/signalr/createUseSignalRHook.mjs

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