@ancon/wildcat-utils 1.50.22 → 1.50.24

package/package.json

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

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("../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;
+"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(),e.serverTimeoutInMilliseconds&&(this.hubConnection.serverTimeoutInMilliseconds=e.serverTimeoutInMilliseconds),this.buildInitialListeners()}}module.exports=g;

package/signalr/SignalR.mjs

@@ -1,13 +1,13 @@
 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);
+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";
 import { SignalRMethodName as h } from "@ancon/wildcat-types";
 import a from "../shared/wait.mjs";
 import g from "../api/generateBackoffWithEqualJitter.mjs";
 import "../number/randomIntFromInterval.mjs";
 class L {
-  constructor(t) {
+  constructor(e) {
     n(this, "internalEvents");
     n(this, "signalREvents");
     n(this, "hubConnection");
@@ -17,9 +17,9 @@ class L {
     n(this, "reconnectAttempt", 0);
     n(this, "shouldReconnect", !0);
     n(this, "groups");
-    n(this, "info", (t, e) => {
+    n(this, "info", (e, t) => {
       var i;
-      (i = this.logger) == null || i.info(t, e);
+      (i = this.logger) == null || i.info(e, t);
     });
     n(this, "generateBackoff", () => {
       this.backoff = g(50, 500, 5e3), this.info("Generated new backoff");
@@ -32,16 +32,16 @@ class L {
           }), 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);
+            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 e = this.backoff[this.reconnectAttempt];
-            if (e != null)
-              await a(e);
+            const t = this.backoff[this.reconnectAttempt];
+            if (t != null)
+              await a(t);
             else
               throw new Error("Could not resolve ms from backoff");
           }
@@ -58,30 +58,30 @@ class L {
      * @param event Event to emit
      * @param args Arguments to send to the listeners
      */
-    n(this, "emitEvent", (t, ...e) => {
-      if (this.internalEvents.has(t)) {
-        this.info(`Emitting event "${t}"`);
-        const i = this.internalEvents.get(t);
-        i && i.forEach((s) => s(...e));
+    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 "${t}". There were no listeners.`);
+        this.info(`Failed to emit event "${e}". There were no listeners.`);
     });
-    n(this, "skipSignal", (t, e) => {
-      this.info(`Skipped signal "${t}"`, e);
+    n(this, "skipSignal", (e, t) => {
+      this.info(`Skipped signal "${e}"`, t);
     });
-    n(this, "enhanceListener", (t, e, i) => (s) => {
+    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 "${t}"`, s), c ? this.skipSignal(t, s) : e(o);
+      return c || this.info(`Received signal "${e}"`, s), c ? this.skipSignal(e, s) : t(o);
     });
-    n(this, "setClientId", (t) => {
-      this.clientId = t;
+    n(this, "setClientId", (e) => {
+      this.clientId = e;
     });
-    n(this, "connect", async (t = !1) => {
+    n(this, "connect", async (e = !1) => {
       try {
         this.info("Connecting..."), await this.hubConnection.start(), this.info("Connected"), this.emitEvent("connected");
-      } catch (e) {
-        if (this.info("Failed to connect"), t)
-          throw e;
+      } catch (t) {
+        if (this.info("Failed to connect"), e)
+          throw t;
       }
     });
     n(this, "disconnect", async () => {
@@ -96,26 +96,26 @@ class L {
      * @param event Event to listen on
      * @param listener Event listener function
      */
-    n(this, "addEventListener", (t, e) => {
-      this.internalEvents.has(t) || this.internalEvents.set(t, []);
-      const i = this.internalEvents.get(t);
-      return i && i.push(e), () => this.removeEventListener(t, e);
+    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);
     });
     /**
      * Remove internal event listener
      * @param event Event to stop listening to
      * @param listener Event listener function
      */
-    n(this, "removeEventListener", (t, e) => {
+    n(this, "removeEventListener", (e, t) => {
       var i;
-      if (this.internalEvents.has(t)) {
-        const s = this.internalEvents.get(t), o = ((i = s == null ? void 0 : s.indexOf) == null ? void 0 : i.call(s, e)) ?? -1;
-        o >= 0 ? (s.splice(o, 1), this.info(`Removed event listener for event "${t}"`)) : this.info(
-          `Failed to remove event listener for event "${t}". Specified listener was not found.`
+      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 "${t}". Event doesn't have any listeners.`
+          `Failed to remove event listener for event "${e}". Event doesn't have any listeners.`
         );
     });
     /**
@@ -123,58 +123,58 @@ class L {
      * @param signal Signal name
      * @param listener Signal listener function
      */
-    n(this, "addSignalListener", (t, e, i = !0) => {
-      this.signalREvents.has(t) || this.signalREvents.set(t, []);
-      const s = this.signalREvents.get(t), o = this.enhanceListener(
-        t,
+    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(t, o), this.info(`Added signal listener for signal "${t}"`), () => this.removeSignalListener(t, o);
+      return s && s.push(o), this.hubConnection.on(e, o), this.info(`Added signal listener for signal "${e}"`), () => this.removeSignalListener(e, o);
     });
     /**
      * Remove signal listener
      * @param signal Signal name
      * @param listener Signal listener function
      */
-    n(this, "removeSignalListener", (t, e) => {
+    n(this, "removeSignalListener", (e, t) => {
       var i;
-      if (this.signalREvents.has(t)) {
-        const s = this.signalREvents.get(t), o = ((i = s == null ? void 0 : s.indexOf) == null ? void 0 : i.call(s, e)) ?? -1;
-        o >= 0 ? (this.hubConnection.off(t, e), s.splice(o, 1), this.info(`Removed signal listener for signal "${t}"`)) : this.info(
-          `Failed to remove signal listener for signal "${t}". Specified listener was not found.`
+      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 "${t}". Signal doesn't have any listeners.`
+          `Failed to remove signal listener for signal "${e}". Signal doesn't have any listeners.`
         );
     });
-    n(this, "joinGroup", async (t) => {
-      this.info(`Joining group "${t}"...`);
-      const e = this.groups.push(t) - 1;
+    n(this, "joinGroup", async (e) => {
+      this.info(`Joining group "${e}"...`);
+      const t = this.groups.push(e) - 1;
       try {
-        await this.hubConnection.invoke(h.JoinGroup, t), this.info(`Joined group "${t}"`);
+        await this.hubConnection.invoke(h.JoinGroup, e), this.info(`Joined group "${e}"`);
       } catch (i) {
-        this.info(`Failed to join group "${t}"`, i), e >= 0 && this.groups.splice(e, 1);
+        this.info(`Failed to join group "${e}"`, i), t >= 0 && this.groups.splice(t, 1);
       }
     });
-    n(this, "leaveGroup", async (t) => {
-      this.info(`Leaving group "${t}"...`);
-      const e = this.groups.indexOf(t);
-      e >= 0 && this.groups.splice(e, 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(h.LeaveGroup, t), this.info(`Left group "${t}"`);
+        await this.hubConnection.invoke(h.LeaveGroup, e), this.info(`Left group "${e}"`);
       } catch (i) {
-        this.groups.indexOf(t) < 0 && this.groups.push(t), this.info(`Failed to leave group "${t}"`, 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 t = [...this.groups].map((e) => this.leaveGroup(e));
-      await Promise.all(t), this.info("Left all 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 = /* @__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();
+    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();
   }
 }
 export {

package/signalr/types.d.ts

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