@hotmeshio/hotmesh 0.14.8 → 0.14.9

package/build/modules/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrayToHash = exports.isStreamMessage = exports.parseStreamMessage = exports.normalizeRetryPolicy = exports.s = exports.isValidCron = exports.restoreHierarchy = exports.getValueByPath = exports.getIndexedHash = exports.getSymVal = exports.getSymKey = exports.formatISODate = exports.getTimeSeries = exports.getSubscriptionTopic = exports.findSubscriptionForTrigger = exports.findTopKey = exports.matchesStatus = exports.matchesStatusCode = exports.polyfill = exports.identifyProvider = exports.XSleepFor = exports.sleepImmediate = exports.sleepFor = exports.guid = exports.deterministicRandom = exports.deepCopy = exports.getSystemHealth = exports.hashOptions = void 0;
 const os_1 = __importDefault(require("os"));
 const crypto_1 = require("crypto");
+const cron_parser_1 = require("cron-parser");
 const nanoid_1 = require("nanoid");
 const ms_1 = __importDefault(require("ms"));
 const logger_1 = require("../services/logger");
@@ -276,8 +277,13 @@ exports.restoreHierarchy = restoreHierarchy;
  * @private
  */
 function isValidCron(cronExpression) {
-    const cronRegex = /^(\*|([0-5]?\d)) (\*|([01]?\d|2[0-3])) (\*|([12]?\d|3[01])) (\*|([1-9]|1[0-2])) (\*|([0-6](?:-[0-6])?(?:,[0-6])?))$/;
-    return cronRegex.test(cronExpression);
+    try {
+        (0, cron_parser_1.parseExpression)(cronExpression);
+        return true;
+    }
+    catch {
+        return false;
+    }
 }
 exports.isValidCron = isValidCron;
 /**

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hotmeshio/hotmesh",
-    "version": "0.14.8",
+    "version": "0.14.9",
     "description": "Durable Workflow",
     "main": "./build/index.js",
     "types": "./build/index.d.ts",

package/build/services/pipe/functions/cron.d.ts

@@ -1,4 +1,3 @@
-import { ILogger } from '../../../types/logger';
 /**
  * Provides cron-related utility functions based on the
  * [cron](https://en.wikipedia.org/wiki/Cron) format for use
@@ -8,16 +7,14 @@ import { ILogger } from '../../../types/logger';
  * Invoked in mapping rules using `{@cron.<method>}` syntax.
  */
 declare class CronHandler {
-    static logger: ILogger;
     /**
-     * Safely calculates the delay in seconds until the next execution
-     * of a cron job. Calculates the next date and time (per the system
-     * clock) that satisfies the cron expression, then returns the value
-     * in seconds from now. Fails silently and returns `-1` if the cron
-     * expression is invalid or the next execution time is in the past.
+     * Calculates the delay in seconds until the next execution
+     * of a cron job. Throws on invalid expressions rather than
+     * degrading silently.
      *
      * @param {string} cronExpression - The cron expression to parse (e.g. `'0 0 * * *'`)
-     * @returns {number} The delay in seconds until the next cron job execution (minimum `HMSH_FIDELITY_SECONDS`), or `-1` on error
+     * @returns {number} The delay in seconds until the next cron job execution (minimum `HMSH_FIDELITY_SECONDS`)
+     * @throws {Error} If the cron expression is invalid
      * @example
      * ```yaml
      * cron_next_result:

package/build/services/pipe/functions/cron.js

@@ -4,7 +4,6 @@ exports.CronHandler = void 0;
 const cron_parser_1 = require("cron-parser");
 const enums_1 = require("../../../modules/enums");
 const utils_1 = require("../../../modules/utils");
-const logger_1 = require("../../logger");
 /**
  * Provides cron-related utility functions based on the
  * [cron](https://en.wikipedia.org/wiki/Cron) format for use
@@ -15,14 +14,13 @@ const logger_1 = require("../../logger");
  */
 class CronHandler {
     /**
-     * Safely calculates the delay in seconds until the next execution
-     * of a cron job. Calculates the next date and time (per the system
-     * clock) that satisfies the cron expression, then returns the value
-     * in seconds from now. Fails silently and returns `-1` if the cron
-     * expression is invalid or the next execution time is in the past.
+     * Calculates the delay in seconds until the next execution
+     * of a cron job. Throws on invalid expressions rather than
+     * degrading silently.
      *
      * @param {string} cronExpression - The cron expression to parse (e.g. `'0 0 * * *'`)
-     * @returns {number} The delay in seconds until the next cron job execution (minimum `HMSH_FIDELITY_SECONDS`), or `-1` on error
+     * @returns {number} The delay in seconds until the next cron job execution (minimum `HMSH_FIDELITY_SECONDS`)
+     * @throws {Error} If the cron expression is invalid
      * @example
      * ```yaml
      * cron_next_result:
@@ -32,28 +30,17 @@ class CronHandler {
      * ```
      */
     nextDelay(cronExpression) {
-        try {
-            if (!(0, utils_1.isValidCron)(cronExpression)) {
-                return -1;
-            }
-            const interval = (0, cron_parser_1.parseExpression)(cronExpression, { utc: true });
-            const nextDate = interval.next().toDate();
-            const now = new Date();
-            const delay = (nextDate.getTime() - now.getTime()) / 1000;
-            if (delay <= 0) {
-                return -1;
-            }
-            if (delay < enums_1.HMSH_FIDELITY_SECONDS) {
-                return enums_1.HMSH_FIDELITY_SECONDS;
-            }
-            const iDelay = Math.round(delay);
-            return iDelay;
+        if (!(0, utils_1.isValidCron)(cronExpression)) {
+            throw new Error(`Invalid cron expression: ${cronExpression}`);
         }
-        catch (error) {
-            CronHandler.logger.error('Error calculating next cron job execution  delay:', { error });
-            return -1;
+        const interval = (0, cron_parser_1.parseExpression)(cronExpression, { utc: true });
+        const nextDate = interval.next().toDate();
+        const now = new Date();
+        const delay = (nextDate.getTime() - now.getTime()) / 1000;
+        if (delay <= 0) {
+            return enums_1.HMSH_FIDELITY_SECONDS;
         }
+        return Math.max(Math.round(delay), enums_1.HMSH_FIDELITY_SECONDS);
     }
 }
 exports.CronHandler = CronHandler;
-CronHandler.logger = new logger_1.LoggerService('hotmesh', 'cron');

package/build/services/virtual/index.js

@@ -320,11 +320,13 @@ class Virtual {
         if ((0, utils_1.isValidCron)(params.options.interval)) {
             //cron syntax
             cron = params.options.interval;
-            const nextDelay = new cron_1.CronHandler().nextDelay(cron);
-            delay = nextDelay > 0 ? nextDelay : undefined;
+            delay = new cron_1.CronHandler().nextDelay(cron);
         }
         else {
             const seconds = (0, utils_1.s)(params.options.interval);
+            if (isNaN(seconds)) {
+                throw new Error(`Invalid cron/interval expression: ${params.options.interval}`);
+            }
             interval = Math.max(seconds, enums_1.HMSH_FIDELITY_SECONDS);
             delay = params.options.delay ? (0, utils_1.s)(params.options.delay) : undefined;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hotmeshio/hotmesh",
-  "version": "0.14.8",
+  "version": "0.14.9",
   "description": "Durable Workflow",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",