@ancon/wildcat-utils 1.44.0-terminal-refactor.4 → 1.44.0-terminal-refactor.6

package/hangfire/createHangfirePoller.d.ts

@@ -38,10 +38,11 @@ declare class HangfirePoller {
     private waitForNetworkOnline;
     private executeWorkerRequest;
     private deleteWorker;
-    createWorker(groupId: string, { workerId, url, headers, }: {
+    createWorker(groupId: string, { workerId, url, headers, onResolved, }: {
         workerId: string;
         url: string;
-        headers: APIHeaders;
+        headers?: APIHeaders;
+        onResolved?: (forced: boolean) => void | Promise<void>;
     }): Promise<unknown>;
     /** Trigger a worker to execute immediately, ignoring busy state */
     triggerWorker(workerId: string): void;

package/hangfire/createHangfirePoller.js

@@ -1 +1 @@
-"use strict";var f=Object.defineProperty;var p=(i,e,r)=>e in i?f(i,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):i[e]=r;var o=(i,e,r)=>(p(i,typeof e!="symbol"?e+"":e,r),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const b=require("axios"),u=require("@ancon/wildcat-types"),a=require("../error/createCodedError.js"),k=require("../error/isNotFoundError.js"),w=require("../error/serializeError.js"),W=require("../error/isErrorWithStatusCode.js"),m=require("../api/isNoContentResponse.js"),x=require("../shared/wait.js");require("../error/isCodedError.js");require("../error/isAPIError.js");class g{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=b.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 a(new Error("Timer already started"),u.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(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 x(1e3)}async executeWorkerRequest(e,r=!1){const t=r!==!0&&this.busyWorkers.has(e.workerId);this.config.debug("*executeWorkerRequest*",{workerId:e.workerId,isBusy:t,force:r}),t?this.config.debug("*executeWorkerRequest* worker is busy",e.workerId):(this.busyWorkers.add(e.workerId),await this.waitForNetworkOnline(),this.config.debug("*executeWorkerRequest* request",{isNetworkOnline:this.config.getIsNetworkOnline()}),this.axiosInstance({url:e.url,method:"get",timeout:this.config.pollerInterval,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=>{if(W(s)){if(k(s)){this.config.debug("*executeWorkerRequest* worker is expired or invalid",e.workerId);const n=w(a(new Error("The Hangfire worker is expired or invalid"),u.ErrorCode.HangfireWorkerExpiredOrInvalid));e.reject(n)}else e.reject(s);this.deleteWorker(e.groupId,e.workerId)}else this.config.debug("*executeWorkerRequest* not an api error"),this.busyWorkers.delete(e.workerId)}))}deleteWorker(e,r){const t=this.groups.get(e);t&&(this.config.debug("*delete worker*",t.size,t),t.delete(r),this.workerByIdMap.delete(r),this.busyWorkers.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:s}){if(!this.groups.has(e)){if(this.groups.size>=this.config.maxGroupsSize){const c=a(new Error("Max number of Hangfire groups exceeded"),u.ErrorCode.GenericUnexpectedHangfireError,{count:this.groups.size});throw this.destroy(),c}this.groups.set(e,new Map)}const n=this.groups.get(e);return new Promise((c,h)=>{if(n.has(r))throw a(new Error("Duplicate Hangfire worker ID"),u.ErrorCode.GenericUnexpectedHangfireError);if(n.size>=this.config.maxWorkersSize){const d=a(new Error("Max number of Hangfire workers in group exceeded"),u.ErrorCode.GenericUnexpectedHangfireError,{groupId:e,count:n.size});throw h(d),this.destroy(),d}const l={workerId:r,groupId:e,url:t,resolve:c,reject:h,headers:s};n.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,!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){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 y(i){return new g(i)}exports.HangfirePoller=g;exports.default=y;
+"use strict";var p=Object.defineProperty;var b=(i,e,r)=>e in i?p(i,e,{enumerable:!0,configurable:!0,writable:!0,value:r}):i[e]=r;var o=(i,e,r)=>(b(i,typeof e!="symbol"?e+"":e,r),r);Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const k=require("axios"),u=require("@ancon/wildcat-types"),a=require("../error/createCodedError.js"),W=require("../error/isNotFoundError.js"),m=require("../error/serializeError.js"),w=require("../error/isErrorWithStatusCode.js"),x=require("../api/isNoContentResponse.js"),y=require("../shared/wait.js");require("../error/isCodedError.js");require("../error/isAPIError.js");class f{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=k.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 a(new Error("Timer already started"),u.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(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 y(1e3)}async executeWorkerRequest(e,r=!1){const t=r!==!0&&this.busyWorkers.has(e.workerId);this.config.debug("*executeWorkerRequest*",{workerId:e.workerId,isBusy:t,force:r}),t?this.config.debug("*executeWorkerRequest* worker is busy",e.workerId):(this.busyWorkers.add(e.workerId),await this.waitForNetworkOnline(),this.config.debug("*executeWorkerRequest* request",{isNetworkOnline:this.config.getIsNetworkOnline()}),this.axiosInstance({url:e.url,method:"get",timeout:this.config.pollerInterval,headers:{...await this.config.getRequestHeaders(),...e.headers}}).then(s=>{var n;s&&!x(s)?(e.resolve(s),(n=e.onResolved)==null||n.call(e,r),this.deleteWorker(e.groupId,e.workerId)):this.busyWorkers.delete(e.workerId)}).catch(s=>{if(w(s)){if(W(s)){this.config.debug("*executeWorkerRequest* worker is expired or invalid",e.workerId);const n=m(a(new Error("The Hangfire worker is expired or invalid"),u.ErrorCode.HangfireWorkerExpiredOrInvalid));e.reject(n)}else e.reject(s);this.deleteWorker(e.groupId,e.workerId)}else this.config.debug("*executeWorkerRequest* not an api error"),this.busyWorkers.delete(e.workerId)}))}deleteWorker(e,r){const t=this.groups.get(e);t&&(this.config.debug("*delete worker*",t.size,t),t.delete(r),this.workerByIdMap.delete(r),this.busyWorkers.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:s,onResolved:n}){if(!this.groups.has(e)){if(this.groups.size>=this.config.maxGroupsSize){const h=a(new Error("Max number of Hangfire groups exceeded"),u.ErrorCode.GenericUnexpectedHangfireError,{count:this.groups.size});throw this.destroy(),h}this.groups.set(e,new Map)}const c=this.groups.get(e);return new Promise((h,l)=>{if(c.has(r))throw a(new Error("Duplicate Hangfire worker ID"),u.ErrorCode.GenericUnexpectedHangfireError);if(c.size>=this.config.maxWorkersSize){const g=a(new Error("Max number of Hangfire workers in group exceeded"),u.ErrorCode.GenericUnexpectedHangfireError,{groupId:e,count:c.size});throw l(g),this.destroy(),g}const d={workerId:r,groupId:e,url:t,resolve:h,reject:l,headers:s,onResolved:n};c.set(r,d),this.workerByIdMap.set(r,d),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){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 E(i){return new f(i)}exports.HangfirePoller=f;exports.default=E;

package/hangfire/createHangfirePoller.mjs

@@ -1,17 +1,17 @@
-var d = Object.defineProperty;
-var f = (i, e, r) => e in i ? d(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r;
-var o = (i, e, r) => (f(i, typeof e != "symbol" ? e + "" : e, r), r);
-import p from "axios";
+var f = Object.defineProperty;
+var p = (i, e, r) => e in i ? f(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r;
+var o = (i, e, r) => (p(i, typeof e != "symbol" ? e + "" : e, r), r);
+import m from "axios";
 import { ErrorCode as a } from "@ancon/wildcat-types";
 import h from "../error/createCodedError.mjs";
-import m from "../error/isNotFoundError.mjs";
-import b from "../error/serializeError.mjs";
-import k from "../error/isErrorWithStatusCode.mjs";
-import w from "../api/isNoContentResponse.mjs";
-import W from "../shared/wait.mjs";
+import b from "../error/isNotFoundError.mjs";
+import k from "../error/serializeError.mjs";
+import W from "../error/isErrorWithStatusCode.mjs";
+import x from "../api/isNoContentResponse.mjs";
+import w from "../shared/wait.mjs";
 import "../error/isCodedError.mjs";
 import "../error/isAPIError.mjs";
-class x {
+class y {
   constructor(e) {
     /** Workers currently executing a request */
     o(this, "busyWorkers", /* @__PURE__ */ new Set());
@@ -42,7 +42,7 @@ class x {
     this.config = {
       ...this.config,
       ...e ?? null
-    }, this.axiosInstance = p.create(), (this.config.responseInterceptor || this.config.responseRejectionInterceptor) && this.axiosInstance.interceptors.response.use(
+    }, this.axiosInstance = m.create(), (this.config.responseInterceptor || this.config.responseRejectionInterceptor) && this.axiosInstance.interceptors.response.use(
       this.config.responseInterceptor,
       this.config.responseRejectionInterceptor
     );
@@ -70,7 +70,7 @@ class x {
   async waitForNetworkOnline(e = 5) {
     let r = 0;
     for (; !this.config.getIsNetworkOnline() && r < e + 1; )
-      r += 1, await W(1e3);
+      r += 1, await w(1e3);
   }
   async executeWorkerRequest(e, r = !1) {
     const t = r !== !0 && this.busyWorkers.has(e.workerId);
@@ -92,15 +92,16 @@ class x {
         ...e.headers
       }
     }).then((s) => {
-      s && !w(s) ? (e.resolve(s), this.deleteWorker(e.groupId, e.workerId)) : this.busyWorkers.delete(e.workerId);
+      var n;
+      s && !x(s) ? (e.resolve(s), (n = e.onResolved) == null || n.call(e, r), this.deleteWorker(e.groupId, e.workerId)) : this.busyWorkers.delete(e.workerId);
     }).catch((s) => {
-      if (k(s)) {
-        if (m(s)) {
+      if (W(s)) {
+        if (b(s)) {
           this.config.debug(
             "*executeWorkerRequest* worker is expired or invalid",
             e.workerId
           );
-          const n = b(
+          const n = k(
             h(
               new Error("The Hangfire worker is expired or invalid"),
               a.HangfireWorkerExpiredOrInvalid
@@ -121,43 +122,45 @@ class x {
   createWorker(e, {
     workerId: r,
     url: t,
-    headers: s
+    headers: s,
+    onResolved: n
   }) {
     if (!this.groups.has(e)) {
       if (this.groups.size >= this.config.maxGroupsSize) {
-        const u = h(
+        const c = h(
           new Error("Max number of Hangfire groups exceeded"),
           a.GenericUnexpectedHangfireError,
           { count: this.groups.size }
         );
-        throw this.destroy(), u;
+        throw this.destroy(), c;
       }
       this.groups.set(e, /* @__PURE__ */ new Map());
     }
-    const n = this.groups.get(e);
-    return new Promise((u, c) => {
-      if (n.has(r))
+    const u = this.groups.get(e);
+    return new Promise((c, l) => {
+      if (u.has(r))
         throw h(
           new Error("Duplicate Hangfire worker ID"),
           a.GenericUnexpectedHangfireError
         );
-      if (n.size >= this.config.maxWorkersSize) {
-        const g = h(
+      if (u.size >= this.config.maxWorkersSize) {
+        const d = h(
           new Error("Max number of Hangfire workers in group exceeded"),
           a.GenericUnexpectedHangfireError,
-          { groupId: e, count: n.size }
+          { groupId: e, count: u.size }
         );
-        throw c(g), this.destroy(), g;
+        throw l(d), this.destroy(), d;
       }
-      const l = {
+      const g = {
         workerId: r,
         groupId: e,
         url: t,
-        resolve: u,
-        reject: c,
-        headers: s
+        resolve: c,
+        reject: l,
+        headers: s,
+        onResolved: n
       };
-      n.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();
+      u.set(r, g), this.workerByIdMap.set(r, g), 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 */
@@ -183,10 +186,10 @@ class x {
     this.config.debug("*destroy*"), this.groups.clear(), this.stopTimer();
   }
 }
-function N(i) {
-  return new x(i);
+function O(i) {
+  return new y(i);
 }
 export {
-  x as HangfirePoller,
-  N as default
+  y as HangfirePoller,
+  O as default
 };

package/hangfire/createMakeHangfireRequest.d.ts

@@ -1,10 +1,22 @@
 import type { APIHeaders, APIParams, APIPostRequest, APIPutRequest } from '@ancon/wildcat-types';
 import type { AxiosResponse } from 'axios';
 import { HangfirePoller } from './createHangfirePoller';
+declare type MakeHangfireRequestWorkerOptions = {
+    headers?: APIHeaders;
+    /**
+     * @param forced Forced indicates it was triggered by an event rather than via polling
+     */
+    onWorkerResolved?: (forced: boolean) => void | Promise<void>;
+};
+declare type MakeHangfireRequestOptions = {
+    /** Optional callback on successful init response */
+    onInitResponse?: () => void | Promise<void>;
+    workerOptions?: MakeHangfireRequestWorkerOptions;
+};
 /**
  *
  * @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, headers?: APIHeaders, onResponse?: () => void | Promise<void>) => 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, options?: MakeHangfireRequestOptions) => Promise<AxiosResponse>;
 export default createMakeHangfireRequest;

package/hangfire/createMakeHangfireRequest.js

@@ -1 +1 @@
-"use strict";const s=require("./isHangfireResponse.js");require("../api/isAcceptedResponse.js");function k(r,i){return`${r.config.baseURL??""}/${r.config.url??""}/status/${i}`}function o(r){return async function(n,c,f,g,a={},e){const t=await n(c,f,a);if(await(e==null?void 0:e()),s(t)){const u=t.data.id;return r.createWorker(g,{workerId:u,url:k(t,u),headers:a})}return t}}module.exports=o;
+"use strict";const h=require("./isHangfireResponse.js");require("../api/isAcceptedResponse.js");function q(r,u){return`${r.config.baseURL??""}/${r.config.url??""}/status/${u}`}function t(r){return async function(R,n,w,l,e){var c,f,k,d;const a=await R(n,w,(c=e==null?void 0:e.workerOptions)==null?void 0:c.headers);if(await((f=e==null?void 0:e.onInitResponse)==null?void 0:f.call(e)),h(a)){const g=a.data.id;return r.createWorker(l,{workerId:g,url:q(a,g),headers:(k=e==null?void 0:e.workerOptions)==null?void 0:k.headers,onResolved:(d=e==null?void 0:e.workerOptions)==null?void 0:d.onWorkerResolved})}return a}}module.exports=t;

package/hangfire/createMakeHangfireRequest.mjs

@@ -1,22 +1,24 @@
-import g from "./isHangfireResponse.mjs";
+import n from "./isHangfireResponse.mjs";
 import "../api/isAcceptedResponse.mjs";
-function k(r, e) {
-  return `${r.config.baseURL ?? ""}/${r.config.url ?? ""}/status/${e}`;
+function t(r, u) {
+  return `${r.config.baseURL ?? ""}/${r.config.url ?? ""}/status/${u}`;
 }
-function d(r) {
-  return async function(f, n, c, o, i = {}, a) {
-    const t = await f(n, c, i);
-    if (await (a == null ? void 0 : a()), g(t)) {
-      const u = t.data.id;
-      return r.createWorker(o, {
-        workerId: u,
-        url: k(t, u),
-        headers: i
+function O(r) {
+  return async function(g, l, w, m, e) {
+    var f, c, d, k;
+    const a = await g(l, w, (f = e == null ? void 0 : e.workerOptions) == null ? void 0 : f.headers);
+    if (await ((c = e == null ? void 0 : e.onInitResponse) == null ? void 0 : c.call(e)), n(a)) {
+      const R = a.data.id;
+      return r.createWorker(m, {
+        workerId: R,
+        url: t(a, R),
+        headers: (d = e == null ? void 0 : e.workerOptions) == null ? void 0 : d.headers,
+        onResolved: (k = e == null ? void 0 : e.workerOptions) == null ? void 0 : k.onWorkerResolved
       });
     }
-    return t;
+    return a;
   };
 }
 export {
-  d as default
+  O as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ancon/wildcat-utils",
-  "version": "1.44.0-terminal-refactor.4",
+  "version": "1.44.0-terminal-refactor.6",
   "private": false,
   "main": "index.js",
   "module": "index.mjs",