@ancon/wildcat-utils 1.40.12 → 1.40.13

package/package.json

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

package/signalr/createUseSignalRHook.d.ts

@@ -1,6 +1,5 @@
 import { SignalRHubName, SignalRSignalName } from '@ancon/wildcat-types';
-import { SignalRConfig, SignalREventListener } from './types';
-declare type SignalRConfigArg = Omit<SignalRConfig, 'hub'>;
+import { SignalRHookConfig, SignalREventListener } from './types';
 declare type ReduxSelectorsArg<RootState = unknown> = Partial<{
     clientIdSelector: (state: RootState) => string | null;
     isSignalROnlineSelector: (state: RootState) => boolean;
@@ -17,12 +16,15 @@ declare type ReduxHooksArg = Partial<{
     };
     useAppSelector: <T extends (...args: any[]) => any>(selector: T) => ReturnType<T>;
 }>;
-declare function createUseSignalRHook<RootState = unknown>(signalRConfig: SignalRConfigArg, selectors?: ReduxSelectorsArg<RootState>, actions?: ReduxActionsArg, hooks?: ReduxHooksArg): (hub: SignalRHubName) => {
-    isHubConnected: boolean;
-    join: (group: string) => Promise<void>;
-    leave: (group: string) => Promise<void>;
-    subscribe: (signal: SignalRSignalName, listener: SignalREventListener, shouldSkipOwnClient?: boolean) => (() => void);
-    unsubscribe: (signal: SignalRSignalName, listener: SignalREventListener) => void;
-    getHubConnectionId: () => string | null;
+declare function createUseSignalRHook<RootState = unknown>(signalRConfig: SignalRHookConfig, selectors?: ReduxSelectorsArg<RootState>, actions?: ReduxActionsArg, hooks?: ReduxHooksArg): {
+    useSignalR: (hub: SignalRHubName) => {
+        isHubConnected: boolean;
+        join: (group: string) => Promise<void>;
+        leave: (group: string) => Promise<void>;
+        subscribe: (signal: SignalRSignalName, listener: SignalREventListener, shouldSkipOwnClient?: boolean) => (() => void);
+        unsubscribe: (signal: SignalRSignalName, listener: SignalREventListener) => void;
+        getHubConnectionId: () => string | null;
+    };
+    setUrl(url: string): void;
 };
 export default createUseSignalRHook;

package/signalr/createUseSignalRHook.js

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

package/signalr/createUseSignalRHook.mjs

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

package/signalr/types.d.ts

@@ -11,3 +11,4 @@ export declare type SignalRConfig = {
     /** @default false */
     enableLogging?: boolean;
 };
+export declare type SignalRHookConfig = Omit<SignalRConfig, 'hub'>;