@ancon/wildcat-utils 1.21.0 → 1.21.1

package/package.json

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

package/signalr/createUseSignalRHook.d.ts

@@ -1,15 +1,15 @@
 import { SignalRHubName, SignalRSignalName } from '@ancon/wildcat-types';
 import { SignalRConfig, SignalREventListener } from './types';
 declare type SignalRConfigArg = Omit<SignalRConfig, 'hub'>;
-declare type ReduxSelectorsArg<RootState = unknown> = {
+declare type ReduxSelectorsArg<RootState = unknown> = Partial<{
     clientIdSelector: (state: RootState) => string | null;
     isSignalROnlineSelector: (state: RootState) => boolean;
-};
-declare type ReduxActionsArg = {
+}>;
+declare type ReduxActionsArg = Partial<{
     setIsSignalROnlineAction: (payload: {
         isSignalROnline: boolean;
     }) => unknown;
-};
+}>;
 declare type ReduxHooksArg = Partial<{
     useAppDispatch: () => (action: unknown) => unknown;
     useAppStore: <T = {}>() => {
@@ -17,7 +17,7 @@ declare type ReduxHooksArg = Partial<{
     };
     useAppSelector: <T extends (...args: any[]) => any>(selector: T) => ReturnType<T>;
 }>;
-declare function createUseSignalRHook(signalRConfig: SignalRConfigArg, selectors: ReduxSelectorsArg, actions: ReduxActionsArg, hooks?: ReduxHooksArg): (hub: SignalRHubName) => {
+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>;

package/signalr/createUseSignalRHook.js

@@ -1 +1 @@
-"use strict";const e=require("react"),l=require("react-redux"),U=require("./SignalR.js");require("@microsoft/signalr");require("@ancon/wildcat-types");require("../shared/wait.js");require("../api/generateBackoffWithEqualJitter.js");require("../number/randomIntFromInterval.js");function M(O,k,q,H){const{signalRApiUrl:h,logger:A,enableLogging:m}=O,{clientIdSelector:D,isSignalROnlineSelector:d}=k,{setIsSignalROnlineAction:f}=q,{useAppStore:w=l.useStore,useAppDispatch:x=l.useDispatch,useAppSelector:y=l.useSelector}=H??{};return function(G){const n=e.useRef(new U({signalRApiUrl:h,hub:G,logger:A,enableLogging:m})),i=w(),u=x(),g=y(D),[c,j]=e.useState(!1),[s,S]=e.useState(!1),R=e.useRef(c),o=e.useCallback(()=>{d(i.getState())||u(f({isSignalROnline:!0})),s||S(!0)},[u,s,i]),b=o,v=e.useCallback(()=>{d(i.getState())&&u(f({isSignalROnline:!1})),s&&S(!1)},[u,s,i]),p=e.useCallback(async t=>{n.current.groups.indexOf(t)<0&&await n.current.joinGroup(t)},[]),C=e.useCallback(async t=>{n.current.groups.indexOf(t)>=0&&await n.current.leaveGroup(t)},[]),E=e.useCallback((t,r,a)=>n.current.addSignalListener(t,r,a),[]),L=e.useCallback((t,r)=>n.current.removeSignalListener(t,r),[]),I=e.useCallback(()=>n.current.getHubConnectionId(),[]);return e.useEffect(()=>{R.current=c},[c]),e.useEffect(()=>{const t=n.current.addEventListener("connected",o),r=n.current.addEventListener("reconnected",b),a=n.current.addEventListener("disconnected",v);return R.current||j(!0),()=>{t(),r(),a()}},[o,v,b]),e.useEffect(()=>{n.current.setClientId(g||void 0)},[g]),e.useEffect(()=>{async function t(){await n.current.connect()}c&&t()},[c]),e.useEffect(()=>()=>{n.current.leaveAllGroups().then(()=>{n.current.disconnect()})},[n]),e.useMemo(()=>({isHubConnected:s,join:p,leave:C,subscribe:E,unsubscribe:L,getHubConnectionId:I}),[s,p,C,E,L,I])}}module.exports=M;
+"use strict";const e=require("react"),f=require("react-redux"),U=require("./SignalR.js");require("@microsoft/signalr");require("@ancon/wildcat-types");require("../shared/wait.js");require("../api/generateBackoffWithEqualJitter.js");require("../number/randomIntFromInterval.js");function M(k,q,H,h){const{signalRApiUrl:A,logger:O,enableLogging:m}=k,{clientIdSelector:D,isSignalROnlineSelector:s}=q??{},{setIsSignalROnlineAction:u}=H??{},{useAppStore:w=f.useStore,useAppDispatch:x=f.useDispatch,useAppSelector:y=f.useSelector}=h??{};return function(G){const n=e.useRef(new U({signalRApiUrl:A,hub:G,logger:O,enableLogging:m})),o=w(),a=x(),g=y(D??(()=>{})),[r,j]=e.useState(!1),[c,v]=e.useState(!1),b=e.useRef(r),l=e.useCallback(()=>{(s==null?void 0:s(o.getState()))===!1&&u&&a(u({isSignalROnline:!0})),c||v(!0)},[a,c,o]),R=l,S=e.useCallback(()=>{(s==null?void 0:s(o.getState()))===!0&&u&&a(u({isSignalROnline:!1})),c&&v(!1)},[a,c,o]),p=e.useCallback(async t=>{n.current.groups.indexOf(t)<0&&await n.current.joinGroup(t)},[]),C=e.useCallback(async t=>{n.current.groups.indexOf(t)>=0&&await n.current.leaveGroup(t)},[]),E=e.useCallback((t,i,d)=>n.current.addSignalListener(t,i,d),[]),L=e.useCallback((t,i)=>n.current.removeSignalListener(t,i),[]),I=e.useCallback(()=>n.current.getHubConnectionId(),[]);return e.useEffect(()=>{b.current=r},[r]),e.useEffect(()=>{const t=n.current.addEventListener("connected",l),i=n.current.addEventListener("reconnected",R),d=n.current.addEventListener("disconnected",S);return b.current||j(!0),()=>{t(),i(),d()}},[l,S,R]),e.useEffect(()=>{n.current.setClientId(g||void 0)},[g]),e.useEffect(()=>{async function t(){await n.current.connect()}r&&t()},[r]),e.useEffect(()=>()=>{n.current.leaveAllGroups().then(()=>{n.current.disconnect()})},[n]),e.useMemo(()=>({isHubConnected:c,join:p,leave:C,subscribe:E,unsubscribe:L,getHubConnectionId:I}),[c,p,C,E,L,I])}}module.exports=M;

package/signalr/createUseSignalRHook.mjs

@@ -1,4 +1,4 @@
-import { useRef as O, useState as C, useCallback as t, useEffect as i, useMemo as z } from "react";
+import { useRef as C, useState as H, useCallback as t, useEffect as o, useMemo as z } from "react";
 import { useStore as B, useDispatch as F, useSelector as J } from "react-redux";
 import K from "./SignalR.mjs";
 import "@microsoft/signalr";
@@ -6,70 +6,71 @@ import "@ancon/wildcat-types";
 import "../shared/wait.mjs";
 import "../api/generateBackoffWithEqualJitter.mjs";
 import "../number/randomIntFromInterval.mjs";
-function $(H, h, A, D) {
-  const { signalRApiUrl: w, logger: x, enableLogging: y } = H, { clientIdSelector: G, isSignalROnlineSelector: d } = h, { setIsSignalROnlineAction: g } = A, {
+function $(h, A, O, D) {
+  const { signalRApiUrl: w, logger: x, enableLogging: y } = h, { clientIdSelector: G, isSignalROnlineSelector: r } = A ?? {}, { setIsSignalROnlineAction: u } = O ?? {}, {
     useAppStore: j = B,
     useAppDispatch: k = F,
     useAppSelector: U = J
   } = D ?? {};
   return function(M) {
-    const e = O(
+    const e = C(
       new K({
         signalRApiUrl: w,
         hub: M,
         logger: x,
         enableLogging: y
       })
-    ), o = j(), u = k(), f = U(G), [s, q] = C(!1), [r, p] = C(!1), S = O(s), a = t(() => {
-      d(o.getState()) || u(g({ isSignalROnline: !0 })), r || p(!0);
-    }, [u, r, o]), R = a, v = t(() => {
-      d(o.getState()) && u(g({ isSignalROnline: !1 })), r && p(!1);
-    }, [u, r, o]), m = t(async (n) => {
+    ), a = j(), d = k(), g = U(G ?? (() => {
+    })), [c, q] = H(!1), [s, p] = H(!1), v = C(c), l = t(() => {
+      (r == null ? void 0 : r(a.getState())) === !1 && u && d(u({ isSignalROnline: !0 })), s || p(!0);
+    }, [d, s, a]), m = l, R = t(() => {
+      (r == null ? void 0 : r(a.getState())) === !0 && u && d(u({ isSignalROnline: !1 })), s && p(!1);
+    }, [d, s, a]), S = t(async (n) => {
       e.current.groups.indexOf(n) < 0 && await e.current.joinGroup(n);
     }, []), b = t(async (n) => {
       e.current.groups.indexOf(n) >= 0 && await e.current.leaveGroup(n);
     }, []), L = t(
-      (n, c, l) => e.current.addSignalListener(
+      (n, i, f) => e.current.addSignalListener(
         n,
-        c,
-        l
+        i,
+        f
       ),
       []
     ), I = t(
-      (n, c) => e.current.removeSignalListener(n, c),
+      (n, i) => e.current.removeSignalListener(n, i),
       []
     ), E = t(
       () => e.current.getHubConnectionId(),
       []
     );
-    return i(() => {
-      S.current = s;
-    }, [s]), i(() => {
+    return o(() => {
+      v.current = c;
+    }, [c]), o(() => {
       const n = e.current.addEventListener(
         "connected",
-        a
-      ), c = e.current.addEventListener(
+        l
+      ), i = e.current.addEventListener(
         "reconnected",
-        R
-      ), l = e.current.addEventListener(
+        m
+      ), f = e.current.addEventListener(
         "disconnected",
-        v
+        R
       );
-      return S.current || q(!0), () => {
-        n(), c(), l();
+      return v.current || q(!0), () => {
+        n(), i(), f();
       };
     }, [
-      a,
-      v,
-      R
-    ]), i(() => {
-      e.current.setClientId(f || void 0);
-    }, [f]), i(() => {
+      l,
+      R,
+      m
+    ]), o(() => {
+      e.current.setClientId(g || void 0);
+    }, [g]), o(() => {
       async function n() {
         await e.current.connect();
       }
-      s && n();
-    }, [s]), i(
+      c && n();
+    }, [c]), o(
       () => () => {
         e.current.leaveAllGroups().then(() => {
           e.current.disconnect();
@@ -78,14 +79,14 @@ function $(H, h, A, D) {
       [e]
     ), z(
       () => ({
-        isHubConnected: r,
-        join: m,
+        isHubConnected: s,
+        join: S,
         leave: b,
         subscribe: L,
         unsubscribe: I,
         getHubConnectionId: E
       }),
-      [r, m, b, L, I, E]
+      [s, S, b, L, I, E]
     );
   };
 }