@ancon/wildcat-utils 1.34.1 → 1.34.2

package/hangfire/createHangfirePoller.d.ts

@@ -30,9 +30,10 @@ declare class HangfirePoller {
     private startTimer;
     private executeWorkerRequest;
     private deleteWorker;
-    createWorker(groupId: string, { workerId, url, }: {
+    createWorker(groupId: string, { workerId, url, headers, }: {
         workerId: string;
         url: string;
+        headers: APIHeaders;
     }): Promise<unknown>;
     triggerWorker(workerId: string): void;
     /** May be called either before or after `createWorker()` */

package/hangfire/createHangfirePoller.js

@@ -1 +1 @@
-"use strict";var g=Object.defineProperty;var f=(t,e,r)=>e in t?g(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r;var i=(t,e,r)=>(f(t,typeof e!="symbol"?e+"":e,r),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const p=require("axios"),n=require("@ancon/wildcat-types"),a=require("../error/createCodedError.js"),b=require("../api/isNoContentResponse.js");class c{constructor(e){i(this,"busyWorkers",new Set);i(this,"enabledGroups",new Set);i(this,"groups",new Map);i(this,"workerByIdMap",new Map);i(this,"timer",null);i(this,"config",{maxGroupsSize:50,maxWorkersSize:20,getIsNetworkOnline(){return!0},async getRequestHeaders(){return{}},debug(...e){console.log(...e)}});this.config={...this.config,...e??null}}stopTimer(){this.timer!=null&&(this.config.debug("*stop timer*"),clearInterval(this.timer),this.timer=null)}startTimer(){if(this.timer!=null)throw a(new Error("Timer already started"),n.ErrorCode.GenericUnexpectedHangfireError);this.config.debug("*start timer*"),this.timer=setInterval(()=>{this.config.debug("*tick*",{busyWorkers:this.busyWorkers.size,enabledGroups:this.enabledGroups.size,groups:this.groups}),this.enabledGroups.forEach(e=>{const r=this.groups.get(e);r&&r.forEach(s=>this.executeWorkerRequest(s))}),this.groups.size<1&&this.stopTimer()},5e3)}async executeWorkerRequest(e){const r=this.config.getIsNetworkOnline();!this.busyWorkers.has(e.workerId)&&r&&(this.busyWorkers.add(e.workerId),p({url:e.url,method:"get",headers:await this.config.getRequestHeaders()}).then(s=>{s&&!b(s)?(e.resolve(s),this.deleteWorker(e.groupId,e.workerId)):this.busyWorkers.delete(e.workerId)}).catch(s=>{e.reject(s),this.deleteWorker(e.groupId,e.workerId)}))}deleteWorker(e,r){const s=this.groups.get(e);s&&(this.config.debug("*delete worker*",s.size,s),s.delete(r),this.workerByIdMap.delete(r),this.busyWorkers.delete(r),s.size<1&&(this.groups.delete(e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()))}createWorker(e,{workerId:r,url:s}){if(!this.groups.has(e)){if(this.groups.size>=this.config.maxGroupsSize){const u=a(new Error("Max number of Hangfire groups exceeded"),n.ErrorCode.GenericUnexpectedHangfireError,{count:this.groups.size});throw this.destroy(),u}this.groups.set(e,new Map)}const o=this.groups.get(e);return new Promise((u,h)=>{if(o.has(r))throw a(new Error("Duplicate Hangfire worker ID"),n.ErrorCode.GenericUnexpectedHangfireError);if(o.size>=this.config.maxWorkersSize){const d=a(new Error("Max number of Hangfire workers in group exceeded"),n.ErrorCode.GenericUnexpectedHangfireError,{groupId:e,count:o.size});throw h(d),this.destroy(),d}const l={workerId:r,groupId:e,url:s,resolve:u,reject:h};o.set(r,l),this.workerByIdMap.set(r,l),this.enabledGroups.has(e)||this.enabledGroups.add(e),this.timer==null&&this.enabledGroups.size>0&&this.startTimer()})}triggerWorker(e){this.config.debug("*triggerWorker*");const r=this.workerByIdMap.get(e);r&&this.executeWorkerRequest(r)}enableWorkers(e){this.config.debug("*enable*",e),this.enabledGroups.add(e),this.groups.has(e)&&this.timer==null&&this.startTimer()}disableWorkers(e){this.config.debug("*disable*",e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()}destroy(){this.config.debug("*destroy*"),this.groups.clear(),this.stopTimer()}}function m(t){return new c(t)}exports.HangfirePoller=c;exports.default=m;
+"use strict";var f=Object.defineProperty;var p=(t,e,r)=>e in t?f(t,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):t[e]=r;var i=(t,e,r)=>(p(t,typeof e!="symbol"?e+"":e,r),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("axios"),n=require("@ancon/wildcat-types"),a=require("../error/createCodedError.js"),m=require("../api/isNoContentResponse.js");class c{constructor(e){i(this,"busyWorkers",new Set);i(this,"enabledGroups",new Set);i(this,"groups",new Map);i(this,"workerByIdMap",new Map);i(this,"timer",null);i(this,"config",{maxGroupsSize:50,maxWorkersSize:20,getIsNetworkOnline(){return!0},async getRequestHeaders(){return{}},debug(...e){console.log(...e)}});this.config={...this.config,...e??null}}stopTimer(){this.timer!=null&&(this.config.debug("*stop timer*"),clearInterval(this.timer),this.timer=null)}startTimer(){if(this.timer!=null)throw a(new Error("Timer already started"),n.ErrorCode.GenericUnexpectedHangfireError);this.config.debug("*start timer*"),this.timer=setInterval(()=>{this.config.debug("*tick*",{busyWorkers:this.busyWorkers.size,enabledGroups:this.enabledGroups.size,groups:this.groups}),this.enabledGroups.forEach(e=>{const r=this.groups.get(e);r&&r.forEach(s=>this.executeWorkerRequest(s))}),this.groups.size<1&&this.stopTimer()},5e3)}async executeWorkerRequest(e){const r=this.config.getIsNetworkOnline();!this.busyWorkers.has(e.workerId)&&r&&(this.busyWorkers.add(e.workerId),b({url:e.url,method:"get",headers:{...await this.config.getRequestHeaders(),...e.headers}}).then(s=>{s&&!m(s)?(e.resolve(s),this.deleteWorker(e.groupId,e.workerId)):this.busyWorkers.delete(e.workerId)}).catch(s=>{e.reject(s),this.deleteWorker(e.groupId,e.workerId)}))}deleteWorker(e,r){const s=this.groups.get(e);s&&(this.config.debug("*delete worker*",s.size,s),s.delete(r),this.workerByIdMap.delete(r),this.busyWorkers.delete(r),s.size<1&&(this.groups.delete(e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()))}createWorker(e,{workerId:r,url:s,headers:g}){if(!this.groups.has(e)){if(this.groups.size>=this.config.maxGroupsSize){const u=a(new Error("Max number of Hangfire groups exceeded"),n.ErrorCode.GenericUnexpectedHangfireError,{count:this.groups.size});throw this.destroy(),u}this.groups.set(e,new Map)}const o=this.groups.get(e);return new Promise((u,h)=>{if(o.has(r))throw a(new Error("Duplicate Hangfire worker ID"),n.ErrorCode.GenericUnexpectedHangfireError);if(o.size>=this.config.maxWorkersSize){const d=a(new Error("Max number of Hangfire workers in group exceeded"),n.ErrorCode.GenericUnexpectedHangfireError,{groupId:e,count:o.size});throw h(d),this.destroy(),d}const l={workerId:r,groupId:e,url:s,resolve:u,reject:h,headers:g};o.set(r,l),this.workerByIdMap.set(r,l),this.enabledGroups.has(e)||this.enabledGroups.add(e),this.timer==null&&this.enabledGroups.size>0&&this.startTimer()})}triggerWorker(e){this.config.debug("*triggerWorker*");const r=this.workerByIdMap.get(e);r&&this.executeWorkerRequest(r)}enableWorkers(e){this.config.debug("*enable*",e),this.enabledGroups.add(e),this.groups.has(e)&&this.timer==null&&this.startTimer()}disableWorkers(e){this.config.debug("*disable*",e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()}destroy(){this.config.debug("*destroy*"),this.groups.clear(),this.stopTimer()}}function k(t){return new c(t)}exports.HangfirePoller=c;exports.default=k;

package/hangfire/createHangfirePoller.mjs

@@ -1,11 +1,11 @@
-var g = Object.defineProperty;
-var c = (t, e, r) => e in t ? g(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var i = (t, e, r) => (c(t, typeof e != "symbol" ? e + "" : e, r), r);
-import f from "axios";
+var c = Object.defineProperty;
+var f = (t, e, r) => e in t ? c(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var i = (t, e, r) => (f(t, typeof e != "symbol" ? e + "" : e, r), r);
+import p from "axios";
 import { ErrorCode as n } from "@ancon/wildcat-types";
 import h from "../error/createCodedError.mjs";
-import p from "../api/isNoContentResponse.mjs";
-class m {
+import m from "../api/isNoContentResponse.mjs";
+class b {
   constructor(e) {
     /** Workers currently executing a request */
     i(this, "busyWorkers", /* @__PURE__ */ new Set());
@@ -56,12 +56,15 @@ class m {
   }
   async executeWorkerRequest(e) {
     const r = this.config.getIsNetworkOnline();
-    !this.busyWorkers.has(e.workerId) && r && (this.busyWorkers.add(e.workerId), f({
+    !this.busyWorkers.has(e.workerId) && r && (this.busyWorkers.add(e.workerId), p({
       url: e.url,
       method: "get",
-      headers: await this.config.getRequestHeaders()
+      headers: {
+        ...await this.config.getRequestHeaders(),
+        ...e.headers
+      }
     }).then((s) => {
-      s && !p(s) ? (e.resolve(s), this.deleteWorker(e.groupId, e.workerId)) : this.busyWorkers.delete(e.workerId);
+      s && !m(s) ? (e.resolve(s), this.deleteWorker(e.groupId, e.workerId)) : this.busyWorkers.delete(e.workerId);
     }).catch((s) => {
       e.reject(s), this.deleteWorker(e.groupId, e.workerId);
     }));
@@ -72,7 +75,8 @@ class m {
   }
   createWorker(e, {
     workerId: r,
-    url: s
+    url: s,
+    headers: g
   }) {
     if (!this.groups.has(e)) {
       if (this.groups.size >= this.config.maxGroupsSize) {
@@ -105,7 +109,8 @@ class m {
         groupId: e,
         url: s,
         resolve: a,
-        reject: u
+        reject: u,
+        headers: g
       };
       o.set(r, l), this.workerByIdMap.set(r, l), this.enabledGroups.has(e) || this.enabledGroups.add(e), this.timer == null && this.enabledGroups.size > 0 && this.startTimer();
     });
@@ -126,10 +131,10 @@ class m {
     this.config.debug("*destroy*"), this.groups.clear(), this.stopTimer();
   }
 }
-function G(t) {
-  return new m(t);
+function x(t) {
+  return new b(t);
 }
 export {
-  m as HangfirePoller,
-  G as default
+  b as HangfirePoller,
+  x as default
 };

package/hangfire/createMakeHangfireRequest.d.ts

@@ -1,4 +1,4 @@
-import type { APIParams, APIPostRequest, APIPutRequest } from '@ancon/wildcat-types';
+import type { APIHeaders, APIParams, APIPostRequest, APIPutRequest } from '@ancon/wildcat-types';
 import type { AxiosResponse } from 'axios';
 import { HangfirePoller } from './createHangfirePoller';
 /**
@@ -6,5 +6,5 @@ import { HangfirePoller } from './createHangfirePoller';
  * @param hangfirePoller `HangfirePoller` instance from `createHangfirePoller()`
  * @returns `makeHangfireRequest()` callback function
  */
-declare function createMakeHangfireRequest(hangfirePoller: HangfirePoller): <TData extends Record<string, any>, TParams extends APIParams>(request: APIPostRequest<unknown, TData, TParams> | APIPutRequest<unknown, TData, TParams>, data: TData, params: TParams, groupId: string) => Promise<AxiosResponse>;
+declare function createMakeHangfireRequest(hangfirePoller: HangfirePoller): <TData extends Record<string, any>, TParams extends APIParams>(request: APIPostRequest<unknown, TData, TParams> | APIPutRequest<unknown, TData, TParams>, data: TData, params: TParams, groupId: string, headers?: APIHeaders) => Promise<AxiosResponse>;
 export default createMakeHangfireRequest;

package/hangfire/createMakeHangfireRequest.js

@@ -1 +1 @@
-"use strict";const o=require("./isHangfireResponse.js");require("../api/isAcceptedResponse.js");function c(e,t){return`${e.config.baseURL??""}/${e.config.url??""}/status/${t}`}function f(e){return async function(i,a,s,u){const r=await i(a,s);if(o(r)){const n=r.data.id;return e.createWorker(u,{workerId:n,url:c(r,n)})}return r}}module.exports=f;
+"use strict";const c=require("./isHangfireResponse.js");require("../api/isAcceptedResponse.js");function f(e,t){return`${e.config.baseURL??""}/${e.config.url??""}/status/${t}`}function g(e){return async function(u,a,s,o,n={}){const r=await u(a,s,n);if(c(r)){const i=r.data.id;return e.createWorker(o,{workerId:i,url:f(r,i),headers:n})}return r}}module.exports=g;

package/hangfire/createMakeHangfireRequest.mjs

@@ -1,21 +1,22 @@
 import s from "./isHangfireResponse.mjs";
 import "../api/isAcceptedResponse.mjs";
-function f(e, t) {
-  return `${e.config.baseURL ?? ""}/${e.config.url ?? ""}/status/${t}`;
+function c(r, t) {
+  return `${r.config.baseURL ?? ""}/${r.config.url ?? ""}/status/${t}`;
 }
-function k(e) {
-  return async function(a, o, i, u) {
-    const r = await a(o, i);
-    if (s(r)) {
-      const n = r.data.id;
-      return e.createWorker(u, {
-        workerId: n,
-        url: f(r, n)
+function l(r) {
+  return async function(o, i, u, f, n = {}) {
+    const e = await o(i, u, n);
+    if (s(e)) {
+      const a = e.data.id;
+      return r.createWorker(f, {
+        workerId: a,
+        url: c(e, a),
+        headers: n
       });
     }
-    return r;
+    return e;
   };
 }
 export {
-  k as default
+  l as default
 };

package/package.json

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