@digipair/skill-cron 0.63.1 → 0.64.1

package/index.cjs.js

@@ -9,6 +9,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 
+var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
+
 var dist = {};
 
 var time = {};
@@ -8908,7 +8910,7 @@ var constants = {};
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.RE_RANGE = exports.RE_WILDCARDS = exports.PRESETS = exports.TIME_UNITS_LEN = exports.TIME_UNITS = exports.TIME_UNITS_MAP = exports.ALIASES = exports.PARSE_DEFAULTS = exports.MONTH_CONSTRAINTS = exports.CONSTRAINTS = void 0;
+exports.RE_RANGE = exports.RE_WILDCARDS = exports.PRESETS = exports.TIME_UNITS_LEN = exports.TIME_UNITS = exports.TIME_UNITS_MAP = exports.ALIASES = exports.PARSE_DEFAULTS = exports.CONSTRAINTS = void 0;
 exports.CONSTRAINTS = Object.freeze({
     second: [
         0,
@@ -8935,20 +8937,6 @@ exports.CONSTRAINTS = Object.freeze({
         7
     ]
 });
-exports.MONTH_CONSTRAINTS = Object.freeze({
-    1: 31,
-    2: 29,
-    3: 31,
-    4: 30,
-    5: 31,
-    6: 30,
-    7: 31,
-    8: 31,
-    9: 30,
-    10: 31,
-    11: 30,
-    12: 31
-});
 exports.PARSE_DEFAULTS = Object.freeze({
     second: "0",
     minute: "*",
@@ -9147,17 +9135,6 @@ var ExclusiveParametersError = /*#__PURE__*/ function(CronError) {
 }(CronError);
 errors.ExclusiveParametersError = ExclusiveParametersError;
 
-var utils = {};
-
-Object.defineProperty(utils, "__esModule", {
-    value: true
-});
-utils.getRecordKeys = void 0;
-var getRecordKeys = function(record) {
-    return Object.keys(record);
-};
-utils.getRecordKeys = getRecordKeys;
-
 function _array_like_to_array$1(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -9249,7 +9226,6 @@ time.CronTime = void 0;
 var luxon_1 = luxon;
 var constants_1 = constants;
 var errors_1$1 = errors;
-var utils_1 = utils;
 var CronTime = /*#__PURE__*/ function() {
     function CronTime(source, timeZone, utcOffset) {
         _class_call_check$1(this, CronTime);
@@ -9281,7 +9257,6 @@ var CronTime = /*#__PURE__*/ function() {
         } else {
             this.source = source;
             this._parse(this.source);
-            this._verifyParse();
         }
     }
     _create_class$1(CronTime, [
@@ -9291,88 +9266,6 @@ var CronTime = /*#__PURE__*/ function() {
                 return date.weekday === 7 ? 0 : date.weekday;
             }
         },
-        {
-            key: "_verifyParse",
-            value: function _verifyParse() {
-                var months = (0, utils_1.getRecordKeys)(this.month);
-                var daysOfMonth = (0, utils_1.getRecordKeys)(this.dayOfMonth);
-                var isOk = false;
-                var lastWrongMonth = null;
-                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                try {
-                    for(var _iterator = months[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                        var m = _step.value;
-                        var con = constants_1.MONTH_CONSTRAINTS[m];
-                        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
-                        try {
-                            for(var _iterator1 = daysOfMonth[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-                                var day = _step1.value;
-                                if (day <= con) {
-                                    isOk = true;
-                                }
-                            }
-                        } catch (err) {
-                            _didIteratorError1 = true;
-                            _iteratorError1 = err;
-                        } finally{
-                            try {
-                                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                                    _iterator1.return();
-                                }
-                            } finally{
-                                if (_didIteratorError1) {
-                                    throw _iteratorError1;
-                                }
-                            }
-                        }
-                        if (!isOk) {
-                            lastWrongMonth = m;
-                            console.warn("Month '".concat(m, "' is limited to '").concat(con, "' days."));
-                        }
-                    }
-                } catch (err) {
-                    _didIteratorError = true;
-                    _iteratorError = err;
-                } finally{
-                    try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                            _iterator.return();
-                        }
-                    } finally{
-                        if (_didIteratorError) {
-                            throw _iteratorError;
-                        }
-                    }
-                }
-                if (!isOk && lastWrongMonth !== null) {
-                    var notOkCon = constants_1.MONTH_CONSTRAINTS[lastWrongMonth];
-                    var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = undefined;
-                    try {
-                        for(var _iterator2 = daysOfMonth[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true){
-                            var notOkDay = _step2.value;
-                            if (notOkDay > notOkCon) {
-                                delete this.dayOfMonth[notOkDay];
-                                var fixedDay = notOkDay % notOkCon;
-                                this.dayOfMonth[fixedDay] = true;
-                            }
-                        }
-                    } catch (err) {
-                        _didIteratorError2 = true;
-                        _iteratorError2 = err;
-                    } finally{
-                        try {
-                            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-                                _iterator2.return();
-                            }
-                        } finally{
-                            if (_didIteratorError2) {
-                                throw _iteratorError2;
-                            }
-                        }
-                    }
-                }
-            }
-        },
         {
             key: "sendAt",
             value: function sendAt(i) {
@@ -9610,7 +9503,7 @@ var CronTime = /*#__PURE__*/ function() {
                 var beforeJumpingPoint = afterJumpingPoint.minus({
                     second: 1
                 });
-                if (date.month + 1 in this.month && date.day in this.dayOfMonth && this._getWeekDay(date) in this.dayOfWeek) {
+                if (date.month in this.month && date.day in this.dayOfMonth && this._getWeekDay(date) in this.dayOfWeek) {
                     return [
                         this._checkTimeInSkippedRange(beforeJumpingPoint, afterJumpingPoint),
                         afterJumpingPoint
@@ -9922,6 +9815,128 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
+function _ts_generator(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+var __awaiter = commonjsGlobal && commonjsGlobal.__awaiter || function(thisArg, _arguments, P, generator) {
+    function adopt(value) {
+        return _instanceof(value, P) ? value : new P(function(resolve) {
+            resolve(value);
+        });
+    }
+    return new (P || (P = Promise))(function(resolve, reject) {
+        function fulfilled(value) {
+            try {
+                step(generator.next(value));
+            } catch (e) {
+                reject(e);
+            }
+        }
+        function rejected(value) {
+            try {
+                step(generator["throw"](value));
+            } catch (e) {
+                reject(e);
+            }
+        }
+        function step(result) {
+            result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+        }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(job, "__esModule", {
     value: true
 });
@@ -9930,14 +9945,18 @@ var child_process_1 = require$$0__default["default"];
 var errors_1 = errors;
 var time_1 = time;
 var CronJob = /*#__PURE__*/ function() {
-    function CronJob(cronTime, onTick, onComplete, start, timeZone, context, runOnInit, utcOffset, unrefTimeout) {
+    function CronJob(cronTime, onTick, onComplete, start, timeZone, context, runOnInit, utcOffset, unrefTimeout, waitForCompletion, errorHandler) {
         _class_call_check(this, CronJob);
         this.running = false;
         this.unrefTimeout = false;
         this.lastExecution = null;
         this.runOnce = false;
+        this.waitForCompletion = false;
+        this._isCallbackRunning = false;
         this._callbacks = [];
         this.context = context !== null && context !== void 0 ? context : this;
+        this.waitForCompletion = Boolean(waitForCompletion);
+        this.errorHandler = errorHandler;
         if (timeZone != null && utcOffset != null) {
             throw new errors_1.ExclusiveParametersError("timeZone", "utcOffset");
         }
@@ -9960,11 +9979,17 @@ var CronJob = /*#__PURE__*/ function() {
         this.addCallback(this._fnWrap(onTick));
         if (runOnInit) {
             this.lastExecution = new Date();
-            this.fireOnTick();
+            void this.fireOnTick();
         }
         if (start) this.start();
     }
     _create_class(CronJob, [
+        {
+            key: "isCallbackRunning",
+            get: function get() {
+                return this._isCallbackRunning;
+            }
+        },
         {
             key: "_fnWrap",
             value: function _fnWrap(cmd) {
@@ -10016,26 +10041,109 @@ var CronJob = /*#__PURE__*/ function() {
         {
             key: "fireOnTick",
             value: function fireOnTick() {
-                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                try {
-                    for(var _iterator = this._callbacks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                        var callback = _step.value;
-                        void callback.call(this.context, this.onComplete);
-                    }
-                } catch (err) {
-                    _didIteratorError = true;
-                    _iteratorError = err;
-                } finally{
-                    try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                            _iterator.return();
-                        }
-                    } finally{
-                        if (_didIteratorError) {
-                            throw _iteratorError;
+                return __awaiter(this, void 0, void 0, function() {
+                    var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, callback, result, err, error;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (this.waitForCompletion && this._isCallbackRunning) return [
+                                    2
+                                ];
+                                this._isCallbackRunning = true;
+                                _state.label = 1;
+                            case 1:
+                                _state.trys.push([
+                                    1,
+                                    10,
+                                    11,
+                                    12
+                                ]);
+                                _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                _state.label = 2;
+                            case 2:
+                                _state.trys.push([
+                                    2,
+                                    7,
+                                    8,
+                                    9
+                                ]);
+                                _iterator = this._callbacks[Symbol.iterator]();
+                                _state.label = 3;
+                            case 3:
+                                if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
+                                    3,
+                                    6
+                                ];
+                                callback = _step.value;
+                                result = callback.call(this.context, this.onComplete);
+                                if (!this.waitForCompletion) return [
+                                    3,
+                                    5
+                                ];
+                                return [
+                                    4,
+                                    result
+                                ];
+                            case 4:
+                                _state.sent();
+                                _state.label = 5;
+                            case 5:
+                                _iteratorNormalCompletion = true;
+                                return [
+                                    3,
+                                    3
+                                ];
+                            case 6:
+                                return [
+                                    3,
+                                    9
+                                ];
+                            case 7:
+                                err = _state.sent();
+                                _didIteratorError = true;
+                                _iteratorError = err;
+                                return [
+                                    3,
+                                    9
+                                ];
+                            case 8:
+                                try {
+                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                        _iterator.return();
+                                    }
+                                } finally{
+                                    if (_didIteratorError) {
+                                        throw _iteratorError;
+                                    }
+                                }
+                                return [
+                                    7
+                                ];
+                            case 9:
+                                return [
+                                    3,
+                                    12
+                                ];
+                            case 10:
+                                error = _state.sent();
+                                if (this.errorHandler != null) this.errorHandler(error);
+                                else console.error("[Cron] error in callback", error);
+                                return [
+                                    3,
+                                    12
+                                ];
+                            case 11:
+                                this._isCallbackRunning = false;
+                                return [
+                                    7
+                                ];
+                            case 12:
+                                return [
+                                    2
+                                ];
                         }
-                    }
-                }
+                    });
+                });
             }
         },
         {
@@ -10048,9 +10156,7 @@ var CronJob = /*#__PURE__*/ function() {
             key: "start",
             value: function start() {
                 var _this = this;
-                if (this.running) {
-                    return;
-                }
+                if (this.running) return;
                 var MAXDELAY = 2147483647;
                 var timeout = this.cronTime.getTimeout();
                 var remaining = 0;
@@ -10083,10 +10189,8 @@ var CronJob = /*#__PURE__*/ function() {
                     } else {
                         _this.lastExecution = new Date();
                         _this.running = false;
-                        if (!_this.runOnce) {
-                            _this.start();
-                        }
-                        _this.fireOnTick();
+                        if (!_this.runOnce) _this.start();
+                        void _this.fireOnTick();
                     }
                 };
                 if (timeout >= 0) {
@@ -10107,14 +10211,117 @@ var CronJob = /*#__PURE__*/ function() {
                 return this.lastExecution;
             }
         },
+        {
+            key: "_executeOnComplete",
+            value: function _executeOnComplete() {
+                return __awaiter(this, void 0, void 0, function() {
+                    var error;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (typeof this.onComplete !== "function") return [
+                                    2
+                                ];
+                                _state.label = 1;
+                            case 1:
+                                _state.trys.push([
+                                    1,
+                                    3,
+                                    ,
+                                    4
+                                ]);
+                                return [
+                                    4,
+                                    this.onComplete.call(this.context)
+                                ];
+                            case 2:
+                                _state.sent();
+                                return [
+                                    3,
+                                    4
+                                ];
+                            case 3:
+                                error = _state.sent();
+                                console.error("[Cron] error in onComplete callback:", error);
+                                return [
+                                    3,
+                                    4
+                                ];
+                            case 4:
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                });
+            }
+        },
+        {
+            key: "_waitForJobCompletion",
+            value: function _waitForJobCompletion() {
+                return __awaiter(this, void 0, void 0, function() {
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (!this._isCallbackRunning) return [
+                                    3,
+                                    2
+                                ];
+                                return [
+                                    4,
+                                    new Promise(function(resolve) {
+                                        return setTimeout(resolve, 100);
+                                    })
+                                ];
+                            case 1:
+                                _state.sent();
+                                return [
+                                    3,
+                                    0
+                                ];
+                            case 2:
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                });
+            }
+        },
         {
             key: "stop",
             value: function stop() {
+                var _this = this;
                 if (this._timeout) clearTimeout(this._timeout);
                 this.running = false;
-                if (typeof this.onComplete === "function") {
-                    void this.onComplete.call(this.context);
+                if (!this.waitForCompletion) {
+                    void this._executeOnComplete();
+                    return;
                 }
+                void Promise.resolve().then(function() {
+                    return __awaiter(_this, void 0, void 0, function() {
+                        return _ts_generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    return [
+                                        4,
+                                        this._waitForJobCompletion()
+                                    ];
+                                case 1:
+                                    _state.sent();
+                                    return [
+                                        4,
+                                        this._executeOnComplete()
+                                    ];
+                                case 2:
+                                    _state.sent();
+                                    return [
+                                        2
+                                    ];
+                            }
+                        });
+                    });
+                });
             }
         }
     ], [
@@ -10125,11 +10332,11 @@ var CronJob = /*#__PURE__*/ function() {
                     throw new errors_1.ExclusiveParametersError("timeZone", "utcOffset");
                 }
                 if (params.timeZone != null) {
-                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
+                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout, params.waitForCompletion, params.errorHandler);
                 } else if (params.utcOffset != null) {
-                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, null, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
+                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, null, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout, params.waitForCompletion, params.errorHandler);
                 } else {
-                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
+                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout, params.waitForCompletion, params.errorHandler);
                 }
             }
         }

package/index.esm.js

@@ -1,6 +1,8 @@
 import { promises } from 'fs';
 import require$$0 from 'child_process';
 
+var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
+
 var dist = {};
 
 var time = {};
@@ -8900,7 +8902,7 @@ var constants = {};
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-exports.RE_RANGE = exports.RE_WILDCARDS = exports.PRESETS = exports.TIME_UNITS_LEN = exports.TIME_UNITS = exports.TIME_UNITS_MAP = exports.ALIASES = exports.PARSE_DEFAULTS = exports.MONTH_CONSTRAINTS = exports.CONSTRAINTS = void 0;
+exports.RE_RANGE = exports.RE_WILDCARDS = exports.PRESETS = exports.TIME_UNITS_LEN = exports.TIME_UNITS = exports.TIME_UNITS_MAP = exports.ALIASES = exports.PARSE_DEFAULTS = exports.CONSTRAINTS = void 0;
 exports.CONSTRAINTS = Object.freeze({
     second: [
         0,
@@ -8927,20 +8929,6 @@ exports.CONSTRAINTS = Object.freeze({
         7
     ]
 });
-exports.MONTH_CONSTRAINTS = Object.freeze({
-    1: 31,
-    2: 29,
-    3: 31,
-    4: 30,
-    5: 31,
-    6: 30,
-    7: 31,
-    8: 31,
-    9: 30,
-    10: 31,
-    11: 30,
-    12: 31
-});
 exports.PARSE_DEFAULTS = Object.freeze({
     second: "0",
     minute: "*",
@@ -9139,17 +9127,6 @@ var ExclusiveParametersError = /*#__PURE__*/ function(CronError) {
 }(CronError);
 errors.ExclusiveParametersError = ExclusiveParametersError;
 
-var utils = {};
-
-Object.defineProperty(utils, "__esModule", {
-    value: true
-});
-utils.getRecordKeys = void 0;
-var getRecordKeys = function(record) {
-    return Object.keys(record);
-};
-utils.getRecordKeys = getRecordKeys;
-
 function _array_like_to_array$1(arr, len) {
     if (len == null || len > arr.length) len = arr.length;
     for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -9241,7 +9218,6 @@ time.CronTime = void 0;
 var luxon_1 = luxon;
 var constants_1 = constants;
 var errors_1$1 = errors;
-var utils_1 = utils;
 var CronTime = /*#__PURE__*/ function() {
     function CronTime(source, timeZone, utcOffset) {
         _class_call_check$1(this, CronTime);
@@ -9273,7 +9249,6 @@ var CronTime = /*#__PURE__*/ function() {
         } else {
             this.source = source;
             this._parse(this.source);
-            this._verifyParse();
         }
     }
     _create_class$1(CronTime, [
@@ -9283,88 +9258,6 @@ var CronTime = /*#__PURE__*/ function() {
                 return date.weekday === 7 ? 0 : date.weekday;
             }
         },
-        {
-            key: "_verifyParse",
-            value: function _verifyParse() {
-                var months = (0, utils_1.getRecordKeys)(this.month);
-                var daysOfMonth = (0, utils_1.getRecordKeys)(this.dayOfMonth);
-                var isOk = false;
-                var lastWrongMonth = null;
-                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                try {
-                    for(var _iterator = months[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                        var m = _step.value;
-                        var con = constants_1.MONTH_CONSTRAINTS[m];
-                        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = undefined;
-                        try {
-                            for(var _iterator1 = daysOfMonth[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-                                var day = _step1.value;
-                                if (day <= con) {
-                                    isOk = true;
-                                }
-                            }
-                        } catch (err) {
-                            _didIteratorError1 = true;
-                            _iteratorError1 = err;
-                        } finally{
-                            try {
-                                if (!_iteratorNormalCompletion1 && _iterator1.return != null) {
-                                    _iterator1.return();
-                                }
-                            } finally{
-                                if (_didIteratorError1) {
-                                    throw _iteratorError1;
-                                }
-                            }
-                        }
-                        if (!isOk) {
-                            lastWrongMonth = m;
-                            console.warn("Month '".concat(m, "' is limited to '").concat(con, "' days."));
-                        }
-                    }
-                } catch (err) {
-                    _didIteratorError = true;
-                    _iteratorError = err;
-                } finally{
-                    try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                            _iterator.return();
-                        }
-                    } finally{
-                        if (_didIteratorError) {
-                            throw _iteratorError;
-                        }
-                    }
-                }
-                if (!isOk && lastWrongMonth !== null) {
-                    var notOkCon = constants_1.MONTH_CONSTRAINTS[lastWrongMonth];
-                    var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = undefined;
-                    try {
-                        for(var _iterator2 = daysOfMonth[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true){
-                            var notOkDay = _step2.value;
-                            if (notOkDay > notOkCon) {
-                                delete this.dayOfMonth[notOkDay];
-                                var fixedDay = notOkDay % notOkCon;
-                                this.dayOfMonth[fixedDay] = true;
-                            }
-                        }
-                    } catch (err) {
-                        _didIteratorError2 = true;
-                        _iteratorError2 = err;
-                    } finally{
-                        try {
-                            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-                                _iterator2.return();
-                            }
-                        } finally{
-                            if (_didIteratorError2) {
-                                throw _iteratorError2;
-                            }
-                        }
-                    }
-                }
-            }
-        },
         {
             key: "sendAt",
             value: function sendAt(i) {
@@ -9602,7 +9495,7 @@ var CronTime = /*#__PURE__*/ function() {
                 var beforeJumpingPoint = afterJumpingPoint.minus({
                     second: 1
                 });
-                if (date.month + 1 in this.month && date.day in this.dayOfMonth && this._getWeekDay(date) in this.dayOfWeek) {
+                if (date.month in this.month && date.day in this.dayOfMonth && this._getWeekDay(date) in this.dayOfWeek) {
                     return [
                         this._checkTimeInSkippedRange(beforeJumpingPoint, afterJumpingPoint),
                         afterJumpingPoint
@@ -9914,6 +9807,128 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
+function _ts_generator(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+var __awaiter = commonjsGlobal && commonjsGlobal.__awaiter || function(thisArg, _arguments, P, generator) {
+    function adopt(value) {
+        return _instanceof(value, P) ? value : new P(function(resolve) {
+            resolve(value);
+        });
+    }
+    return new (P || (P = Promise))(function(resolve, reject) {
+        function fulfilled(value) {
+            try {
+                step(generator.next(value));
+            } catch (e) {
+                reject(e);
+            }
+        }
+        function rejected(value) {
+            try {
+                step(generator["throw"](value));
+            } catch (e) {
+                reject(e);
+            }
+        }
+        function step(result) {
+            result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+        }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(job, "__esModule", {
     value: true
 });
@@ -9922,14 +9937,18 @@ var child_process_1 = require$$0;
 var errors_1 = errors;
 var time_1 = time;
 var CronJob = /*#__PURE__*/ function() {
-    function CronJob(cronTime, onTick, onComplete, start, timeZone, context, runOnInit, utcOffset, unrefTimeout) {
+    function CronJob(cronTime, onTick, onComplete, start, timeZone, context, runOnInit, utcOffset, unrefTimeout, waitForCompletion, errorHandler) {
         _class_call_check(this, CronJob);
         this.running = false;
         this.unrefTimeout = false;
         this.lastExecution = null;
         this.runOnce = false;
+        this.waitForCompletion = false;
+        this._isCallbackRunning = false;
         this._callbacks = [];
         this.context = context !== null && context !== void 0 ? context : this;
+        this.waitForCompletion = Boolean(waitForCompletion);
+        this.errorHandler = errorHandler;
         if (timeZone != null && utcOffset != null) {
             throw new errors_1.ExclusiveParametersError("timeZone", "utcOffset");
         }
@@ -9952,11 +9971,17 @@ var CronJob = /*#__PURE__*/ function() {
         this.addCallback(this._fnWrap(onTick));
         if (runOnInit) {
             this.lastExecution = new Date();
-            this.fireOnTick();
+            void this.fireOnTick();
         }
         if (start) this.start();
     }
     _create_class(CronJob, [
+        {
+            key: "isCallbackRunning",
+            get: function get() {
+                return this._isCallbackRunning;
+            }
+        },
         {
             key: "_fnWrap",
             value: function _fnWrap(cmd) {
@@ -10008,26 +10033,109 @@ var CronJob = /*#__PURE__*/ function() {
         {
             key: "fireOnTick",
             value: function fireOnTick() {
-                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
-                try {
-                    for(var _iterator = this._callbacks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                        var callback = _step.value;
-                        void callback.call(this.context, this.onComplete);
-                    }
-                } catch (err) {
-                    _didIteratorError = true;
-                    _iteratorError = err;
-                } finally{
-                    try {
-                        if (!_iteratorNormalCompletion && _iterator.return != null) {
-                            _iterator.return();
-                        }
-                    } finally{
-                        if (_didIteratorError) {
-                            throw _iteratorError;
+                return __awaiter(this, void 0, void 0, function() {
+                    var _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, callback, result, err, error;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (this.waitForCompletion && this._isCallbackRunning) return [
+                                    2
+                                ];
+                                this._isCallbackRunning = true;
+                                _state.label = 1;
+                            case 1:
+                                _state.trys.push([
+                                    1,
+                                    10,
+                                    11,
+                                    12
+                                ]);
+                                _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                                _state.label = 2;
+                            case 2:
+                                _state.trys.push([
+                                    2,
+                                    7,
+                                    8,
+                                    9
+                                ]);
+                                _iterator = this._callbacks[Symbol.iterator]();
+                                _state.label = 3;
+                            case 3:
+                                if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done)) return [
+                                    3,
+                                    6
+                                ];
+                                callback = _step.value;
+                                result = callback.call(this.context, this.onComplete);
+                                if (!this.waitForCompletion) return [
+                                    3,
+                                    5
+                                ];
+                                return [
+                                    4,
+                                    result
+                                ];
+                            case 4:
+                                _state.sent();
+                                _state.label = 5;
+                            case 5:
+                                _iteratorNormalCompletion = true;
+                                return [
+                                    3,
+                                    3
+                                ];
+                            case 6:
+                                return [
+                                    3,
+                                    9
+                                ];
+                            case 7:
+                                err = _state.sent();
+                                _didIteratorError = true;
+                                _iteratorError = err;
+                                return [
+                                    3,
+                                    9
+                                ];
+                            case 8:
+                                try {
+                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                        _iterator.return();
+                                    }
+                                } finally{
+                                    if (_didIteratorError) {
+                                        throw _iteratorError;
+                                    }
+                                }
+                                return [
+                                    7
+                                ];
+                            case 9:
+                                return [
+                                    3,
+                                    12
+                                ];
+                            case 10:
+                                error = _state.sent();
+                                if (this.errorHandler != null) this.errorHandler(error);
+                                else console.error("[Cron] error in callback", error);
+                                return [
+                                    3,
+                                    12
+                                ];
+                            case 11:
+                                this._isCallbackRunning = false;
+                                return [
+                                    7
+                                ];
+                            case 12:
+                                return [
+                                    2
+                                ];
                         }
-                    }
-                }
+                    });
+                });
             }
         },
         {
@@ -10040,9 +10148,7 @@ var CronJob = /*#__PURE__*/ function() {
             key: "start",
             value: function start() {
                 var _this = this;
-                if (this.running) {
-                    return;
-                }
+                if (this.running) return;
                 var MAXDELAY = 2147483647;
                 var timeout = this.cronTime.getTimeout();
                 var remaining = 0;
@@ -10075,10 +10181,8 @@ var CronJob = /*#__PURE__*/ function() {
                     } else {
                         _this.lastExecution = new Date();
                         _this.running = false;
-                        if (!_this.runOnce) {
-                            _this.start();
-                        }
-                        _this.fireOnTick();
+                        if (!_this.runOnce) _this.start();
+                        void _this.fireOnTick();
                     }
                 };
                 if (timeout >= 0) {
@@ -10099,14 +10203,117 @@ var CronJob = /*#__PURE__*/ function() {
                 return this.lastExecution;
             }
         },
+        {
+            key: "_executeOnComplete",
+            value: function _executeOnComplete() {
+                return __awaiter(this, void 0, void 0, function() {
+                    var error;
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (typeof this.onComplete !== "function") return [
+                                    2
+                                ];
+                                _state.label = 1;
+                            case 1:
+                                _state.trys.push([
+                                    1,
+                                    3,
+                                    ,
+                                    4
+                                ]);
+                                return [
+                                    4,
+                                    this.onComplete.call(this.context)
+                                ];
+                            case 2:
+                                _state.sent();
+                                return [
+                                    3,
+                                    4
+                                ];
+                            case 3:
+                                error = _state.sent();
+                                console.error("[Cron] error in onComplete callback:", error);
+                                return [
+                                    3,
+                                    4
+                                ];
+                            case 4:
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                });
+            }
+        },
+        {
+            key: "_waitForJobCompletion",
+            value: function _waitForJobCompletion() {
+                return __awaiter(this, void 0, void 0, function() {
+                    return _ts_generator(this, function(_state) {
+                        switch(_state.label){
+                            case 0:
+                                if (!this._isCallbackRunning) return [
+                                    3,
+                                    2
+                                ];
+                                return [
+                                    4,
+                                    new Promise(function(resolve) {
+                                        return setTimeout(resolve, 100);
+                                    })
+                                ];
+                            case 1:
+                                _state.sent();
+                                return [
+                                    3,
+                                    0
+                                ];
+                            case 2:
+                                return [
+                                    2
+                                ];
+                        }
+                    });
+                });
+            }
+        },
         {
             key: "stop",
             value: function stop() {
+                var _this = this;
                 if (this._timeout) clearTimeout(this._timeout);
                 this.running = false;
-                if (typeof this.onComplete === "function") {
-                    void this.onComplete.call(this.context);
+                if (!this.waitForCompletion) {
+                    void this._executeOnComplete();
+                    return;
                 }
+                void Promise.resolve().then(function() {
+                    return __awaiter(_this, void 0, void 0, function() {
+                        return _ts_generator(this, function(_state) {
+                            switch(_state.label){
+                                case 0:
+                                    return [
+                                        4,
+                                        this._waitForJobCompletion()
+                                    ];
+                                case 1:
+                                    _state.sent();
+                                    return [
+                                        4,
+                                        this._executeOnComplete()
+                                    ];
+                                case 2:
+                                    _state.sent();
+                                    return [
+                                        2
+                                    ];
+                            }
+                        });
+                    });
+                });
             }
         }
     ], [
@@ -10117,11 +10324,11 @@ var CronJob = /*#__PURE__*/ function() {
                     throw new errors_1.ExclusiveParametersError("timeZone", "utcOffset");
                 }
                 if (params.timeZone != null) {
-                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
+                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout, params.waitForCompletion, params.errorHandler);
                 } else if (params.utcOffset != null) {
-                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, null, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
+                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, null, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout, params.waitForCompletion, params.errorHandler);
                 } else {
-                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout);
+                    return new CronJob(params.cronTime, params.onTick, params.onComplete, params.start, params.timeZone, params.context, params.runOnInit, params.utcOffset, params.unrefTimeout, params.waitForCompletion, params.errorHandler);
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/skill-cron",
-  "version": "0.63.1",
+  "version": "0.64.1",
   "dependencies": {
     "cron": "^3.1.7"
   },