@ancon/wildcat-utils 1.54.0-check-optimizations.1 → 1.54.0-check-optimizations.2

package/hangfire/createHangfirePoller.d.ts

@@ -4,6 +4,13 @@ import type { Logger } from '../logger';
 declare type HangfirePollerConfig = {
     /** Poller interval in milliseconds */
     pollerInterval: number;
+    /**
+     * Timeout in milliseconds of a single status request. Kept separate from
+     * `pollerInterval` so that a final response that takes longer than one poll
+     * interval to arrive is not aborted and re-requested forever.
+     * Defaults to 15 s, and is never lower than `pollerInterval`.
+     */
+    requestTimeout?: number;
     /** Max number of simultaneous groups */
     maxGroupsSize: number;
     /** Max number of simultaneous workers per group */
@@ -31,8 +38,10 @@ declare type HangfirePollerConfig = {
     logger?: Logger;
 };
 declare class HangfirePoller {
-    /** Workers currently executing a request */
-    private busyWorkers;
+    /** Number of status requests in flight, by worker ID */
+    private activeRequests;
+    /** Workers with a force-triggered request in flight */
+    private forcedRequests;
     /** Groups with enabled workers */
     private enabledGroups;
     /** Workers are grouped by entity ID (check ID or order ID) */
@@ -46,6 +55,19 @@ declare class HangfirePoller {
     private stopTimer;
     private startTimer;
     private waitForNetworkOnline;
+    private isWorkerExpired;
+    private logCallbackError;
+    /**
+     * Resolve or reject a worker exactly once, call its `onFinished` callback
+     * and remove it from the poller
+     */
+    private settleWorker;
+    private rejectExpiredWorker;
+    /**
+     * Request the worker status. Never throws: every failure either settles the
+     * worker or is logged, and the worker is polled again later.
+     */
+    private requestWorkerStatus;
     private executeWorkerRequest;
     private deleteWorker;
     createWorker<TPartialContent = unknown>(groupId: string, { workerId, url, headers, onFinished, onPartialContent, maxLifeTimeMillis, }: {
@@ -59,11 +81,23 @@ declare class HangfirePoller {
     }): Promise<unknown>;
     /** Trigger a worker to execute immediately, ignoring busy state */
     triggerWorker(workerId: string): void;
-    /** Trigger all workers to execute immediately */
-    triggerAllWorkers(): void;
+    /**
+     * Trigger all workers to execute immediately.
+     * Without `force`, workers with a request in flight are skipped. With
+     * `force` (e.g. after a reconnect or when the app returns to the
+     * foreground), each worker gets one extra request even if another one is
+     * still in flight, for example stuck in a retry backoff.
+     */
+    triggerAllWorkers(options?: {
+        force?: boolean;
+    }): void;
     /** May be called either before or after `createWorker()` */
     enableWorkers(groupId: string): void;
     disableWorkers(groupId: string): void;
+    /**
+     * Stop polling and reject every pending worker, so that callers awaiting a
+     * worker get an error instead of waiting forever.
+     */
     destroy(): void;
 }
 declare function createHangfirePoller(options?: Partial<HangfirePollerConfig>): HangfirePoller;

package/hangfire/createHangfirePoller.js

@@ -1 +1 @@
-"use strict";var I=Object.defineProperty;var k=(s,e,r)=>e in s?I(s,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):s[e]=r;var o=(s,e,r)=>(k(s,typeof e!="symbol"?e+"":e,r),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const q=require("axios"),h=require("@ancon/wildcat-types"),g=require("../error/createCodedError.js"),G=require("../error/isNotFoundError.js"),x=require("../error/serializeError.js"),z=require("../error/isErrorWithStatusCode.js"),R=require("../api/isNoContentResponse.js"),M=require("../api/isPartialContentResponse.js"),E=require("../shared/wait.js");require("../error/isCodedError.js");require("../error/isAPIError.js");class y{constructor(e){o(this,"busyWorkers",new Set);o(this,"enabledGroups",new Set);o(this,"groups",new Map);o(this,"workerByIdMap",new Map);o(this,"timer",null);o(this,"config",{pollerInterval:5e3,maxGroupsSize:50,maxWorkersSize:20,responseInterceptor:void 0,responseRejectionInterceptor:void 0,getIsNetworkOnline(){return!0},async getRequestHeaders(){return{}},debug(...e){console.log(...e)}});o(this,"axiosInstance");this.config={...this.config,...e??null},this.axiosInstance=q.create(),(this.config.responseInterceptor||this.config.responseRejectionInterceptor)&&this.axiosInstance.interceptors.response.use(this.config.responseInterceptor,this.config.responseRejectionInterceptor)}stopTimer(){this.timer!=null&&(this.config.debug("*stop timer*"),clearInterval(this.timer),this.timer=null)}startTimer(){if(this.timer!=null)throw g(new Error("Timer already started"),h.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(i=>this.executeWorkerRequest(i))}),this.groups.forEach((e,r)=>{this.enabledGroups.has(r)||e.forEach(i=>{i.maxLifeTimeMillis!=null&&Date.now()-i.createdAt>i.maxLifeTimeMillis&&this.executeWorkerRequest(i)})}),this.groups.size<1&&this.stopTimer()},this.config.pollerInterval)}async waitForNetworkOnline(e=5){let r=0;for(;!this.config.getIsNetworkOnline()&&r<e+1;)r+=1,await E(1e3)}async executeWorkerRequest(e,r=!1){var u,d,f,p,b,W;const i=e.maxLifeTimeMillis!=null&&Date.now()-e.createdAt>e.maxLifeTimeMillis,n=!r&&!i&&this.busyWorkers.has(e.workerId);if(this.config.debug("*executeWorkerRequest*",{workerId:e.workerId,isBusy:n,force:r}),n){this.config.debug("*executeWorkerRequest* worker is busy",e.workerId);return}this.busyWorkers.add(e.workerId),await this.waitForNetworkOnline(),this.config.debug("*executeWorkerRequest* request",{isNetworkOnline:this.config.getIsNetworkOnline()});const c={...await this.config.getRequestHeaders(),...e.headers},a=2;let l=0;for(;l<=a;)try{const t=await this.axiosInstance({url:e.url,method:"get",timeout:this.config.pollerInterval,headers:c});if(!R(t))M(t)?(await((u=e.onPartialContent)==null?void 0:u.call(e,t)),this.busyWorkers.delete(e.workerId)):(e.resolve(t),(d=e.onFinished)==null||d.call(e,r),this.deleteWorker(e.groupId,e.workerId));else if(i){this.config.debug("*executeWorkerRequest* worker lifetime exceeded, forcing exit",e.workerId);const m=x(g(new Error("The Hangfire worker lifetime has been exceeded"),h.ErrorCode.GenericUnexpectedHangfireError));e.reject(m),(f=e.onFinished)==null||f.call(e,!0),this.deleteWorker(e.groupId,e.workerId)}else this.busyWorkers.delete(e.workerId);break}catch(t){if(z(t)){if(G(t)){this.config.debug("*executeWorkerRequest* worker is expired or invalid",e.workerId);const m=x(g(new Error("The Hangfire worker is expired or invalid"),h.ErrorCode.HangfireWorkerExpiredOrInvalid));e.reject(m),(p=e.onFinished)==null||p.call(e,r)}else e.reject(t),(b=e.onFinished)==null||b.call(e,r);this.deleteWorker(e.groupId,e.workerId);break}else if(this.config.debug("*executeWorkerRequest* not an api error"),(W=this.config.logger)==null||W.warn(`Hangfire worker request error: ${JSON.stringify({attempt:l,groupId:e.groupId,workerId:e.workerId,error:x(t)})}`,{CorrelationId:c["x-correlation-id"]}),r&&l<a)l+=1,this.config.debug(`*executeWorkerRequest* retrying non-API error (attempt ${l})`),await E(500);else{this.busyWorkers.delete(e.workerId);break}}}deleteWorker(e,r){const i=this.groups.get(e);i&&(this.config.debug("*delete worker*",i.size,i),i.delete(r),this.workerByIdMap.delete(r),this.busyWorkers.delete(r),i.size<1&&(this.groups.delete(e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()))}createWorker(e,{workerId:r,url:i,headers:n,onFinished:c,onPartialContent:a,maxLifeTimeMillis:l}){if(!this.groups.has(e)){if(this.groups.size>=this.config.maxGroupsSize){const d=g(new Error("Max number of Hangfire groups exceeded"),h.ErrorCode.GenericUnexpectedHangfireError,{count:this.groups.size});throw this.destroy(),d}this.groups.set(e,new Map)}const u=this.groups.get(e);return new Promise((d,f)=>{if(u.has(r))throw g(new Error("Duplicate Hangfire worker ID"),h.ErrorCode.GenericUnexpectedHangfireError);if(u.size>=this.config.maxWorkersSize){const b=g(new Error("Max number of Hangfire workers in group exceeded"),h.ErrorCode.GenericUnexpectedHangfireError,{groupId:e,count:u.size});throw f(b),this.destroy(),b}const p={workerId:r,groupId:e,url:i,resolve:d,reject:f,headers:n,onFinished:c,onPartialContent:a,createdAt:Date.now(),maxLifeTimeMillis:l};u.set(r,p),this.workerByIdMap.set(r,p),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,!0):this.config.debug("*triggerWorker* worker not found",e)}triggerAllWorkers(){this.config.debug("*triggerAllWorkers*");for(const e of this.workerByIdMap.values())this.executeWorkerRequest(e)}enableWorkers(e){this.config.debug("*enable*",e),this.enabledGroups.add(e),this.groups.has(e)&&this.timer==null&&this.startTimer()}disableWorkers(e){if(this.config.debug("*disable*",e),this.config.maxParallelWorkers!=null){const i=[...this.enabledGroups].reduce((n,c)=>{var a;return n+(((a=this.groups.get(c))==null?void 0:a.size)??0)},0);if(i<=this.config.maxParallelWorkers){this.config.debug("*disable* skipped, parallel workers within limit",{totalEnabledWorkers:i,maxParallelWorkers:this.config.maxParallelWorkers});return}}this.enabledGroups.delete(e);const r=this.groups.size>0&&[...this.workerByIdMap.values()].some(i=>i.maxLifeTimeMillis!=null);this.enabledGroups.size<1&&!r&&this.stopTimer()}destroy(){this.config.debug("*destroy*"),this.groups.clear(),this.stopTimer()}}function T(s){return new y(s)}exports.HangfirePoller=y;exports.default=T;
+"use strict";var k=Object.defineProperty;var W=(c,e,r)=>e in c?k(c,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):c[e]=r;var l=(c,e,r)=>(W(c,typeof e!="symbol"?e+"":e,r),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const E=require("axios"),u=require("@ancon/wildcat-types"),d=require("../error/createCodedError.js"),R=require("../error/isNotFoundError.js"),g=require("../error/serializeError.js"),w=require("../error/isErrorWithStatusCode.js"),y=require("../api/isNoContentResponse.js"),I=require("../api/isPartialContentResponse.js"),m=require("../shared/wait.js");require("../error/isCodedError.js");require("../error/isAPIError.js");const v=15e3,M=500,b=2;class q{constructor(e){l(this,"activeRequests",new Map);l(this,"forcedRequests",new Set);l(this,"enabledGroups",new Set);l(this,"groups",new Map);l(this,"workerByIdMap",new Map);l(this,"timer",null);l(this,"config",{pollerInterval:5e3,maxGroupsSize:50,maxWorkersSize:20,responseInterceptor:void 0,responseRejectionInterceptor:void 0,getIsNetworkOnline(){return!0},async getRequestHeaders(){return{}},debug(...e){console.log(...e)}});l(this,"axiosInstance");this.config={...this.config,...e??null},this.config.requestTimeout=Math.max(this.config.requestTimeout??v,this.config.pollerInterval),this.axiosInstance=E.create(),(this.config.responseInterceptor||this.config.responseRejectionInterceptor)&&this.axiosInstance.interceptors.response.use(this.config.responseInterceptor,this.config.responseRejectionInterceptor)}stopTimer(){this.timer!=null&&(this.config.debug("*stop timer*"),clearInterval(this.timer),this.timer=null)}startTimer(){if(this.timer!=null)throw d(new Error("Timer already started"),u.ErrorCode.GenericUnexpectedHangfireError);this.config.debug("*start timer*"),this.timer=setInterval(()=>{this.config.debug("*tick*",{activeRequests:this.activeRequests.size,enabledGroups:this.enabledGroups.size,groups:this.groups}),this.enabledGroups.forEach(e=>{const r=this.groups.get(e);r&&r.forEach(t=>{this.executeWorkerRequest(t)})}),this.groups.forEach((e,r)=>{this.enabledGroups.has(r)||e.forEach(t=>{this.isWorkerExpired(t)&&this.executeWorkerRequest(t)})}),this.groups.size<1&&this.stopTimer()},this.config.pollerInterval)}async waitForNetworkOnline(e=5){let r=0;for(;!this.config.getIsNetworkOnline()&&r<e+1;)r+=1,await m(1e3)}isWorkerExpired(e){return e.maxLifeTimeMillis!=null&&Date.now()-e.createdAt>e.maxLifeTimeMillis}logCallbackError(e,r){var t,i;(i=this.config.logger)==null||i.warn(`Hangfire worker onFinished callback error: ${JSON.stringify({groupId:e.groupId,workerId:e.workerId,error:g(r)})}`,{CorrelationId:(t=e.headers)==null?void 0:t["x-correlation-id"]})}settleWorker(e,r,t,i){var o;if(!e.isSettled){e.isSettled=!0,r==="resolve"?e.resolve(t):e.reject(t);try{const s=(o=e.onFinished)==null?void 0:o.call(e,i);s instanceof Promise&&s.catch(h=>this.logCallbackError(e,h))}catch(s){this.logCallbackError(e,s)}this.deleteWorker(e.groupId,e.workerId)}}rejectExpiredWorker(e){var t,i;this.config.debug("*executeWorkerRequest* worker lifetime exceeded, forcing exit",e.workerId),(i=this.config.logger)==null||i.warn(`Hangfire worker lifetime exceeded: ${JSON.stringify({groupId:e.groupId,workerId:e.workerId,maxLifeTimeMillis:e.maxLifeTimeMillis})}`,{CorrelationId:(t=e.headers)==null?void 0:t["x-correlation-id"]});const r=g(d(new Error("The Hangfire worker lifetime has been exceeded"),u.ErrorCode.GenericUnexpectedHangfireError));this.settleWorker(e,"reject",r,!0)}async requestWorkerStatus(e,r){var i,o,s;let t=0;for(;t<=b;){let h=(i=e.headers)==null?void 0:i["x-correlation-id"];try{await this.waitForNetworkOnline(),this.config.debug("*executeWorkerRequest* request",{isNetworkOnline:this.config.getIsNetworkOnline()});const n={...await this.config.getRequestHeaders(),...e.headers};h=n["x-correlation-id"];const a=await this.axiosInstance({url:e.url,method:"get",timeout:this.config.requestTimeout,headers:n});if(e.isSettled)return;y(a)?this.isWorkerExpired(e)&&this.rejectExpiredWorker(e):I(a)?await((o=e.onPartialContent)==null?void 0:o.call(e,a)):this.settleWorker(e,"resolve",a,r);return}catch(n){if(e.isSettled)return;if(w(n)){if(R(n)){this.config.debug("*executeWorkerRequest* worker is expired or invalid",e.workerId);const a=g(d(new Error("The Hangfire worker is expired or invalid"),u.ErrorCode.HangfireWorkerExpiredOrInvalid));this.settleWorker(e,"reject",a,r)}else this.settleWorker(e,"reject",n,r);return}if(this.config.debug("*executeWorkerRequest* not an api error"),(s=this.config.logger)==null||s.warn(`Hangfire worker request error: ${JSON.stringify({attempt:t,groupId:e.groupId,workerId:e.workerId,error:g(n)})}`,{CorrelationId:h}),r&&t<b)t+=1,this.config.debug(`*executeWorkerRequest* retrying non-API error (attempt ${t})`),await m(M);else{this.isWorkerExpired(e)&&this.rejectExpiredWorker(e);return}}}}async executeWorkerRequest(e,r=!1){const{workerId:t}=e;if(e.isSettled)return;const i=this.activeRequests.get(t)??0,o=i>0&&(!r||this.forcedRequests.has(t));if(this.config.debug("*executeWorkerRequest*",{workerId:t,isBusy:o,force:r}),o){this.config.debug("*executeWorkerRequest* worker is busy",t);return}this.activeRequests.set(t,i+1),r&&this.forcedRequests.add(t);try{await this.requestWorkerStatus(e,r)}finally{const s=(this.activeRequests.get(t)??1)-1;s>0?this.activeRequests.set(t,s):this.activeRequests.delete(t),r&&this.forcedRequests.delete(t)}}deleteWorker(e,r){this.workerByIdMap.delete(r),this.activeRequests.delete(r),this.forcedRequests.delete(r);const t=this.groups.get(e);t&&(this.config.debug("*delete worker*",t.size,t),t.delete(r),t.size<1&&(this.groups.delete(e),this.enabledGroups.delete(e),this.enabledGroups.size<1&&this.stopTimer()))}createWorker(e,{workerId:r,url:t,headers:i,onFinished:o,onPartialContent:s,maxLifeTimeMillis:h}){if(!this.groups.has(e)){if(this.groups.size>=this.config.maxGroupsSize){const a=d(new Error("Max number of Hangfire groups exceeded"),u.ErrorCode.GenericUnexpectedHangfireError,{count:this.groups.size});throw this.destroy(),a}this.groups.set(e,new Map)}const n=this.groups.get(e);return new Promise((a,f)=>{if(n.has(r))throw d(new Error("Duplicate Hangfire worker ID"),u.ErrorCode.GenericUnexpectedHangfireError);if(n.size>=this.config.maxWorkersSize){const x=d(new Error("Max number of Hangfire workers in group exceeded"),u.ErrorCode.GenericUnexpectedHangfireError,{groupId:e,count:n.size});throw f(x),this.destroy(),x}const p={workerId:r,groupId:e,url:t,resolve:a,reject:f,headers:i,onFinished:o,onPartialContent:s,createdAt:Date.now(),maxLifeTimeMillis:h};n.set(r,p),this.workerByIdMap.set(r,p),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,!0):this.config.debug("*triggerWorker* worker not found",e)}triggerAllWorkers(e){const r=(e==null?void 0:e.force)??!1;this.config.debug("*triggerAllWorkers*",{force:r});for(const t of this.workerByIdMap.values())this.executeWorkerRequest(t,r)}enableWorkers(e){this.config.debug("*enable*",e),this.enabledGroups.add(e),this.groups.has(e)&&this.timer==null&&this.startTimer()}disableWorkers(e){if(this.config.debug("*disable*",e),this.config.maxParallelWorkers!=null){const t=[...this.enabledGroups].reduce((i,o)=>{var s;return i+(((s=this.groups.get(o))==null?void 0:s.size)??0)},0);if(t<=this.config.maxParallelWorkers){this.config.debug("*disable* skipped, parallel workers within limit",{totalEnabledWorkers:t,maxParallelWorkers:this.config.maxParallelWorkers});return}}this.enabledGroups.delete(e);const r=this.groups.size>0&&[...this.workerByIdMap.values()].some(t=>t.maxLifeTimeMillis!=null);this.enabledGroups.size<1&&!r&&this.stopTimer()}destroy(){var r;this.config.debug("*destroy*");const e=[...this.workerByIdMap.values()];this.groups.clear(),this.workerByIdMap.clear(),this.enabledGroups.clear(),this.activeRequests.clear(),this.forcedRequests.clear(),this.stopTimer(),e.length>0&&((r=this.config.logger)==null||r.warn(`Hangfire poller destroyed with pending workers: ${JSON.stringify({workerIds:e.map(t=>t.workerId)})}`)),e.forEach(t=>{this.settleWorker(t,"reject",g(d(new Error("The Hangfire poller was destroyed"),u.ErrorCode.HangfireWorkerExpiredOrInvalid)),!0)})}}function T(c){return new q(c)}exports.HangfirePoller=q;exports.default=T;

package/hangfire/createHangfirePoller.mjs

@@ -1,29 +1,32 @@
 var k = Object.defineProperty;
-var E = (s, e, i) => e in s ? k(s, e, { enumerable: !0, configurable: !0, writable: !0, value: i }) : s[e] = i;
-var o = (s, e, i) => (E(s, typeof e != "symbol" ? e + "" : e, i), i);
-import y from "axios";
-import { ErrorCode as d } from "@ancon/wildcat-types";
-import g from "../error/createCodedError.mjs";
-import G from "../error/isNotFoundError.mjs";
-import x from "../error/serializeError.mjs";
-import z from "../error/isErrorWithStatusCode.mjs";
-import R from "../api/isNoContentResponse.mjs";
-import q from "../api/isPartialContentResponse.mjs";
-import I from "../shared/wait.mjs";
+var W = (c, e, r) => e in c ? k(c, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : c[e] = r;
+var l = (c, e, r) => (W(c, typeof e != "symbol" ? e + "" : e, r), r);
+import E from "axios";
+import { ErrorCode as h } from "@ancon/wildcat-types";
+import u from "../error/createCodedError.mjs";
+import q from "../error/isNotFoundError.mjs";
+import g from "../error/serializeError.mjs";
+import R from "../error/isErrorWithStatusCode.mjs";
+import I from "../api/isNoContentResponse.mjs";
+import w from "../api/isPartialContentResponse.mjs";
+import x from "../shared/wait.mjs";
 import "../error/isCodedError.mjs";
 import "../error/isAPIError.mjs";
-class w {
+const y = 15e3, v = 500, b = 2;
+class G {
   constructor(e) {
-    /** Workers currently executing a request */
-    o(this, "busyWorkers", /* @__PURE__ */ new Set());
+    /** Number of status requests in flight, by worker ID */
+    l(this, "activeRequests", /* @__PURE__ */ new Map());
+    /** Workers with a force-triggered request in flight */
+    l(this, "forcedRequests", /* @__PURE__ */ new Set());
     /** Groups with enabled workers */
-    o(this, "enabledGroups", /* @__PURE__ */ new Set());
+    l(this, "enabledGroups", /* @__PURE__ */ new Set());
     /** Workers are grouped by entity ID (check ID or order ID) */
-    o(this, "groups", /* @__PURE__ */ new Map());
+    l(this, "groups", /* @__PURE__ */ new Map());
     /** Workers mapped by worker ID */
-    o(this, "workerByIdMap", /* @__PURE__ */ new Map());
-    o(this, "timer", null);
-    o(this, "config", {
+    l(this, "workerByIdMap", /* @__PURE__ */ new Map());
+    l(this, "timer", null);
+    l(this, "config", {
       pollerInterval: 5e3,
       maxGroupsSize: 50,
       maxWorkersSize: 20,
@@ -39,11 +42,14 @@ class w {
         console.log(...e);
       }
     });
-    o(this, "axiosInstance");
+    l(this, "axiosInstance");
     this.config = {
       ...this.config,
       ...e ?? null
-    }, this.axiosInstance = y.create(), (this.config.responseInterceptor || this.config.responseRejectionInterceptor) && this.axiosInstance.interceptors.response.use(
+    }, this.config.requestTimeout = Math.max(
+      this.config.requestTimeout ?? y,
+      this.config.pollerInterval
+    ), this.axiosInstance = E.create(), (this.config.responseInterceptor || this.config.responseRejectionInterceptor) && this.axiosInstance.interceptors.response.use(
       this.config.responseInterceptor,
       this.config.responseRejectionInterceptor
     );
@@ -53,179 +59,250 @@ class w {
   }
   startTimer() {
     if (this.timer != null)
-      throw g(
+      throw u(
         new Error("Timer already started"),
-        d.GenericUnexpectedHangfireError
+        h.GenericUnexpectedHangfireError
       );
     this.config.debug("*start timer*"), this.timer = setInterval(() => {
       this.config.debug("*tick*", {
-        busyWorkers: this.busyWorkers.size,
+        activeRequests: this.activeRequests.size,
         enabledGroups: this.enabledGroups.size,
         groups: this.groups
       }), this.enabledGroups.forEach((e) => {
-        const i = this.groups.get(e);
-        i && i.forEach((t) => this.executeWorkerRequest(t));
-      }), this.groups.forEach((e, i) => {
-        this.enabledGroups.has(i) || e.forEach((t) => {
-          t.maxLifeTimeMillis != null && Date.now() - t.createdAt > t.maxLifeTimeMillis && this.executeWorkerRequest(t);
+        const r = this.groups.get(e);
+        r && r.forEach((t) => {
+          this.executeWorkerRequest(t);
+        });
+      }), this.groups.forEach((e, r) => {
+        this.enabledGroups.has(r) || e.forEach((t) => {
+          this.isWorkerExpired(t) && this.executeWorkerRequest(t);
         });
       }), this.groups.size < 1 && this.stopTimer();
     }, this.config.pollerInterval);
   }
   async waitForNetworkOnline(e = 5) {
-    let i = 0;
-    for (; !this.config.getIsNetworkOnline() && i < e + 1; )
-      i += 1, await I(1e3);
+    let r = 0;
+    for (; !this.config.getIsNetworkOnline() && r < e + 1; )
+      r += 1, await x(1e3);
   }
-  async executeWorkerRequest(e, i = !1) {
-    var h, c, f, p, m, W;
-    const t = e.maxLifeTimeMillis != null && Date.now() - e.createdAt > e.maxLifeTimeMillis, n = !i && !t && this.busyWorkers.has(e.workerId);
-    if (this.config.debug("*executeWorkerRequest*", {
-      workerId: e.workerId,
-      isBusy: n,
-      force: i
-    }), n) {
-      this.config.debug(
-        "*executeWorkerRequest* worker is busy",
-        e.workerId
-      );
-      return;
+  isWorkerExpired(e) {
+    return e.maxLifeTimeMillis != null && Date.now() - e.createdAt > e.maxLifeTimeMillis;
+  }
+  logCallbackError(e, r) {
+    var t, i;
+    (i = this.config.logger) == null || i.warn(
+      `Hangfire worker onFinished callback error: ${JSON.stringify({
+        groupId: e.groupId,
+        workerId: e.workerId,
+        error: g(r)
+      })}`,
+      {
+        CorrelationId: (t = e.headers) == null ? void 0 : t["x-correlation-id"]
+      }
+    );
+  }
+  /**
+   * Resolve or reject a worker exactly once, call its `onFinished` callback
+   * and remove it from the poller
+   */
+  settleWorker(e, r, t, i) {
+    var o;
+    if (!e.isSettled) {
+      e.isSettled = !0, r === "resolve" ? e.resolve(t) : e.reject(t);
+      try {
+        const s = (o = e.onFinished) == null ? void 0 : o.call(e, i);
+        s instanceof Promise && s.catch((d) => this.logCallbackError(e, d));
+      } catch (s) {
+        this.logCallbackError(e, s);
+      }
+      this.deleteWorker(e.groupId, e.workerId);
     }
-    this.busyWorkers.add(e.workerId), await this.waitForNetworkOnline(), this.config.debug("*executeWorkerRequest* request", {
-      isNetworkOnline: this.config.getIsNetworkOnline()
-    });
-    const u = {
-      ...await this.config.getRequestHeaders(),
-      ...e.headers
-    }, a = 2;
-    let l = 0;
-    for (; l <= a; )
+  }
+  rejectExpiredWorker(e) {
+    var t, i;
+    this.config.debug(
+      "*executeWorkerRequest* worker lifetime exceeded, forcing exit",
+      e.workerId
+    ), (i = this.config.logger) == null || i.warn(
+      `Hangfire worker lifetime exceeded: ${JSON.stringify({
+        groupId: e.groupId,
+        workerId: e.workerId,
+        maxLifeTimeMillis: e.maxLifeTimeMillis
+      })}`,
+      {
+        CorrelationId: (t = e.headers) == null ? void 0 : t["x-correlation-id"]
+      }
+    );
+    const r = g(
+      u(
+        new Error("The Hangfire worker lifetime has been exceeded"),
+        h.GenericUnexpectedHangfireError
+      )
+    );
+    this.settleWorker(e, "reject", r, !0);
+  }
+  /**
+   * Request the worker status. Never throws: every failure either settles the
+   * worker or is logged, and the worker is polled again later.
+   */
+  async requestWorkerStatus(e, r) {
+    var i, o, s;
+    let t = 0;
+    for (; t <= b; ) {
+      let d = (i = e.headers) == null ? void 0 : i["x-correlation-id"];
       try {
-        const r = await this.axiosInstance({
+        await this.waitForNetworkOnline(), this.config.debug("*executeWorkerRequest* request", {
+          isNetworkOnline: this.config.getIsNetworkOnline()
+        });
+        const n = {
+          ...await this.config.getRequestHeaders(),
+          ...e.headers
+        };
+        d = n["x-correlation-id"];
+        const a = await this.axiosInstance({
           url: e.url,
           method: "get",
-          timeout: this.config.pollerInterval,
-          headers: u
+          timeout: this.config.requestTimeout,
+          headers: n
         });
-        if (!R(r))
-          q(r) ? (await ((h = e.onPartialContent) == null ? void 0 : h.call(e, r)), this.busyWorkers.delete(e.workerId)) : (e.resolve(r), (c = e.onFinished) == null || c.call(e, i), this.deleteWorker(e.groupId, e.workerId));
-        else if (t) {
-          this.config.debug(
-            "*executeWorkerRequest* worker lifetime exceeded, forcing exit",
-            e.workerId
-          );
-          const b = x(
-            g(
-              new Error("The Hangfire worker lifetime has been exceeded"),
-              d.GenericUnexpectedHangfireError
-            )
-          );
-          e.reject(b), (f = e.onFinished) == null || f.call(e, !0), this.deleteWorker(e.groupId, e.workerId);
-        } else
-          this.busyWorkers.delete(e.workerId);
-        break;
-      } catch (r) {
-        if (z(r)) {
-          if (G(r)) {
+        if (e.isSettled)
+          return;
+        I(a) ? this.isWorkerExpired(e) && this.rejectExpiredWorker(e) : w(a) ? await ((o = e.onPartialContent) == null ? void 0 : o.call(e, a)) : this.settleWorker(e, "resolve", a, r);
+        return;
+      } catch (n) {
+        if (e.isSettled)
+          return;
+        if (R(n)) {
+          if (q(n)) {
             this.config.debug(
               "*executeWorkerRequest* worker is expired or invalid",
               e.workerId
             );
-            const b = x(
-              g(
+            const a = g(
+              u(
                 new Error("The Hangfire worker is expired or invalid"),
-                d.HangfireWorkerExpiredOrInvalid
+                h.HangfireWorkerExpiredOrInvalid
               )
             );
-            e.reject(b), (p = e.onFinished) == null || p.call(e, i);
+            this.settleWorker(e, "reject", a, r);
           } else
-            e.reject(r), (m = e.onFinished) == null || m.call(e, i);
-          this.deleteWorker(e.groupId, e.workerId);
-          break;
-        } else if (this.config.debug("*executeWorkerRequest* not an api error"), (W = this.config.logger) == null || W.warn(
+            this.settleWorker(e, "reject", n, r);
+          return;
+        }
+        if (this.config.debug("*executeWorkerRequest* not an api error"), (s = this.config.logger) == null || s.warn(
           `Hangfire worker request error: ${JSON.stringify({
-            attempt: l,
+            attempt: t,
             groupId: e.groupId,
             workerId: e.workerId,
-            error: x(r)
+            error: g(n)
           })}`,
           {
-            CorrelationId: u["x-correlation-id"]
+            CorrelationId: d
           }
-        ), i && l < a)
-          l += 1, this.config.debug(
-            `*executeWorkerRequest* retrying non-API error (attempt ${l})`
-          ), await I(500);
+        ), r && t < b)
+          t += 1, this.config.debug(
+            `*executeWorkerRequest* retrying non-API error (attempt ${t})`
+          ), await x(v);
         else {
-          this.busyWorkers.delete(e.workerId);
-          break;
+          this.isWorkerExpired(e) && this.rejectExpiredWorker(e);
+          return;
         }
       }
+    }
+  }
+  async executeWorkerRequest(e, r = !1) {
+    const { workerId: t } = e;
+    if (e.isSettled)
+      return;
+    const i = this.activeRequests.get(t) ?? 0, o = i > 0 && (!r || this.forcedRequests.has(t));
+    if (this.config.debug("*executeWorkerRequest*", {
+      workerId: t,
+      isBusy: o,
+      force: r
+    }), o) {
+      this.config.debug("*executeWorkerRequest* worker is busy", t);
+      return;
+    }
+    this.activeRequests.set(t, i + 1), r && this.forcedRequests.add(t);
+    try {
+      await this.requestWorkerStatus(e, r);
+    } finally {
+      const s = (this.activeRequests.get(t) ?? 1) - 1;
+      s > 0 ? this.activeRequests.set(t, s) : this.activeRequests.delete(t), r && this.forcedRequests.delete(t);
+    }
   }
-  deleteWorker(e, i) {
+  deleteWorker(e, r) {
+    this.workerByIdMap.delete(r), this.activeRequests.delete(r), this.forcedRequests.delete(r);
     const t = this.groups.get(e);
-    t && (this.config.debug("*delete worker*", t.size, t), t.delete(i), this.workerByIdMap.delete(i), this.busyWorkers.delete(i), t.size < 1 && (this.groups.delete(e), this.enabledGroups.delete(e), this.enabledGroups.size < 1 && this.stopTimer()));
+    t && (this.config.debug("*delete worker*", t.size, t), t.delete(r), t.size < 1 && (this.groups.delete(e), this.enabledGroups.delete(e), this.enabledGroups.size < 1 && this.stopTimer()));
   }
   createWorker(e, {
-    workerId: i,
+    workerId: r,
     url: t,
-    headers: n,
-    onFinished: u,
-    onPartialContent: a,
-    maxLifeTimeMillis: l
+    headers: i,
+    onFinished: o,
+    onPartialContent: s,
+    maxLifeTimeMillis: d
   }) {
     if (!this.groups.has(e)) {
       if (this.groups.size >= this.config.maxGroupsSize) {
-        const c = g(
+        const a = u(
           new Error("Max number of Hangfire groups exceeded"),
-          d.GenericUnexpectedHangfireError,
+          h.GenericUnexpectedHangfireError,
           { count: this.groups.size }
         );
-        throw this.destroy(), c;
+        throw this.destroy(), a;
       }
       this.groups.set(e, /* @__PURE__ */ new Map());
     }
-    const h = this.groups.get(e);
-    return new Promise((c, f) => {
-      if (h.has(i))
-        throw g(
+    const n = this.groups.get(e);
+    return new Promise((a, f) => {
+      if (n.has(r))
+        throw u(
           new Error("Duplicate Hangfire worker ID"),
-          d.GenericUnexpectedHangfireError
+          h.GenericUnexpectedHangfireError
         );
-      if (h.size >= this.config.maxWorkersSize) {
-        const m = g(
+      if (n.size >= this.config.maxWorkersSize) {
+        const m = u(
           new Error("Max number of Hangfire workers in group exceeded"),
-          d.GenericUnexpectedHangfireError,
-          { groupId: e, count: h.size }
+          h.GenericUnexpectedHangfireError,
+          { groupId: e, count: n.size }
         );
         throw f(m), this.destroy(), m;
       }
       const p = {
-        workerId: i,
+        workerId: r,
         groupId: e,
         url: t,
-        resolve: c,
+        resolve: a,
         reject: f,
-        headers: n,
-        onFinished: u,
-        onPartialContent: a,
+        headers: i,
+        onFinished: o,
+        onPartialContent: s,
         createdAt: Date.now(),
-        maxLifeTimeMillis: l
+        maxLifeTimeMillis: d
       };
-      h.set(i, p), this.workerByIdMap.set(i, p), this.enabledGroups.has(e) || this.enabledGroups.add(e), this.timer == null && this.enabledGroups.size > 0 && this.startTimer();
+      n.set(r, p), this.workerByIdMap.set(r, p), this.enabledGroups.has(e) || this.enabledGroups.add(e), this.timer == null && this.enabledGroups.size > 0 && this.startTimer();
     });
   }
   /** Trigger a worker to execute immediately, ignoring busy state */
   triggerWorker(e) {
     this.config.debug("*triggerWorker*");
-    const i = this.workerByIdMap.get(e);
-    i ? this.executeWorkerRequest(i, !0) : this.config.debug("*triggerWorker* worker not found", e);
+    const r = this.workerByIdMap.get(e);
+    r ? this.executeWorkerRequest(r, !0) : this.config.debug("*triggerWorker* worker not found", e);
   }
-  /** Trigger all workers to execute immediately */
-  triggerAllWorkers() {
-    this.config.debug("*triggerAllWorkers*");
-    for (const e of this.workerByIdMap.values())
-      this.executeWorkerRequest(e);
+  /**
+   * Trigger all workers to execute immediately.
+   * Without `force`, workers with a request in flight are skipped. With
+   * `force` (e.g. after a reconnect or when the app returns to the
+   * foreground), each worker gets one extra request even if another one is
+   * still in flight, for example stuck in a retry backoff.
+   */
+  triggerAllWorkers(e) {
+    const r = (e == null ? void 0 : e.force) ?? !1;
+    this.config.debug("*triggerAllWorkers*", { force: r });
+    for (const t of this.workerByIdMap.values())
+      this.executeWorkerRequest(t, r);
   }
   /** May be called either before or after `createWorker()` */
   enableWorkers(e) {
@@ -234,9 +311,9 @@ class w {
   disableWorkers(e) {
     if (this.config.debug("*disable*", e), this.config.maxParallelWorkers != null) {
       const t = [...this.enabledGroups].reduce(
-        (n, u) => {
-          var a;
-          return n + (((a = this.groups.get(u)) == null ? void 0 : a.size) ?? 0);
+        (i, o) => {
+          var s;
+          return i + (((s = this.groups.get(o)) == null ? void 0 : s.size) ?? 0);
         },
         0
       );
@@ -249,17 +326,42 @@ class w {
       }
     }
     this.enabledGroups.delete(e);
-    const i = this.groups.size > 0 && [...this.workerByIdMap.values()].some((t) => t.maxLifeTimeMillis != null);
-    this.enabledGroups.size < 1 && !i && this.stopTimer();
+    const r = this.groups.size > 0 && [...this.workerByIdMap.values()].some((t) => t.maxLifeTimeMillis != null);
+    this.enabledGroups.size < 1 && !r && this.stopTimer();
   }
+  /**
+   * Stop polling and reject every pending worker, so that callers awaiting a
+   * worker get an error instead of waiting forever.
+   */
   destroy() {
-    this.config.debug("*destroy*"), this.groups.clear(), this.stopTimer();
+    var r;
+    this.config.debug("*destroy*");
+    const e = [...this.workerByIdMap.values()];
+    this.groups.clear(), this.workerByIdMap.clear(), this.enabledGroups.clear(), this.activeRequests.clear(), this.forcedRequests.clear(), this.stopTimer(), e.length > 0 && ((r = this.config.logger) == null || r.warn(
+      `Hangfire poller destroyed with pending workers: ${JSON.stringify({
+        workerIds: e.map((t) => t.workerId)
+      })}`
+    )), e.forEach((t) => {
+      this.settleWorker(
+        t,
+        "reject",
+        // Reuse the expired-worker code: callers already respond to it by fetching
+        // the actual result rather than treating the request as failed.
+        g(
+          u(
+            new Error("The Hangfire poller was destroyed"),
+            h.HangfireWorkerExpiredOrInvalid
+          )
+        ),
+        !0
+      );
+    });
   }
 }
-function j(s) {
-  return new w(s);
+function D(c) {
+  return new G(c);
 }
 export {
-  w as HangfirePoller,
-  j as default
+  G as HangfirePoller,
+  D as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.54.0-check-optimizations.1",
+  "version": "1.54.0-check-optimizations.2",
   "main": "index.js",
   "module": "index.mjs",
   "types": "index.d.ts",