stentor-time 1.61.2 → 1.61.3

package/lib/Constants.d.ts

@@ -1,2 +1,2 @@
 /*! Copyright (c) 2019, XAPPmedia */
-export declare const SCHEDULE_DEBUG_FORMAT = "M/D/Y H:mm:ss Z";
+export declare const SCHEDULE_DEBUG_FORMAT = "M/d/yyyy H:mm:ss Z";

package/lib/Constants.js

@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SCHEDULE_DEBUG_FORMAT = void 0;
 /*! Copyright (c) 2019, XAPPmedia */
 // Simple format for communicating times in debug statements
-exports.SCHEDULE_DEBUG_FORMAT = "M/D/Y H:mm:ss Z";
+exports.SCHEDULE_DEBUG_FORMAT = "M/d/yyyy H:mm:ss Z";
 //# sourceMappingURL=Constants.js.map

package/lib/Constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../src/Constants.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,4DAA4D;AAC/C,QAAA,qBAAqB,GAAG,iBAAiB,CAAC"}
+{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../src/Constants.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,4DAA4D;AAC/C,QAAA,qBAAqB,GAAG,oBAAoB,CAAC"}

package/lib/TimeConditionalCheck.d.ts

@@ -1,7 +1,7 @@
 import { ConditionalCheck, DurationFormat } from "stentor-models";
 /**
  * Depending on the provided last active timestamp and current time, has the user
- * been active within
+ * been active within the specified duration.
  *
  * @param context - Contains the last active timestamp
  * @param amount - Duration amount
@@ -13,18 +13,17 @@ export declare function activeWithin(context: {
 /**
  * Is the current time within the provided schedule.
  *
- * @param start - Start date
+ * @param start - Start date string
  * @param startFormat - Format of the start date string
- * @param duration - Duration
+ * @param duration - Duration amount
  * @param durationFormat - Format of the duration
  * @param timeZone - Optional time zone
  */
 export declare function fitsSchedule(start: string, startFormat: string, duration: number, durationFormat: DurationFormat, timeZone?: string): boolean;
 /**
- * Generate a time conditional check for the provided
- * context with last active timestamp.
+ * Generate a time-based conditional check for the given context.
  *
- * @param context
+ * @param context - Object containing lastActiveTimestamp
  */
 export declare function TimeConditionalCheck<T extends object>(context: {
     lastActiveTimestamp: number;

package/lib/TimeConditionalCheck.js

@@ -4,28 +4,37 @@ exports.activeWithin = activeWithin;
 exports.fitsSchedule = fitsSchedule;
 exports.TimeConditionalCheck = TimeConditionalCheck;
 /*! Copyright (c) 2020, XAPPmedia */
-const Moment = require("moment");
-const moment_range_1 = require("moment-range");
 const stentor_logger_1 = require("stentor-logger");
 const stentor_guards_1 = require("stentor-guards");
+const stentor_utils_1 = require("stentor-utils");
 const findTimeContextualMatch_1 = require("./findTimeContextualMatch");
 const findSchedulableMatch_1 = require("./findSchedulableMatch");
-// Add the range plugin to moment
-const moment = (0, moment_range_1.extendMoment)(Moment);
+const normalizeLegacyFormat_1 = require("./normalizeLegacyFormat");
 /**
  * Depending on the provided last active timestamp and current time, has the user
- * been active within
+ * been active within the specified duration.
  *
  * @param context - Contains the last active timestamp
  * @param amount - Duration amount
  * @param format - Format of the duration amount
  */
 function activeWithin(context, amount, format) {
-    const now = moment();
-    const lastActive = context.lastActiveTimestamp !== undefined ? moment(context.lastActiveTimestamp) : undefined;
-    const rangeStart = moment(now).subtract(amount, format);
-    const range = moment.range(rangeStart, now);
-    if (lastActive && range.contains(lastActive)) {
+    const now = Date.now();
+    const lastActive = context.lastActiveTimestamp;
+    if (typeof amount !== "number" || isNaN(amount) || amount < 0 || typeof format !== "string") {
+        (0, stentor_logger_1.log)().warn(`Invalid activeWithin params: amount=${amount}, format=${format}`);
+        return false;
+    }
+    let durationMs;
+    try {
+        durationMs = (0, stentor_utils_1.getDurationMs)(amount, format);
+    }
+    catch (err) {
+        (0, stentor_logger_1.log)().warn(`activeWithin failed to get durationMs for ${amount} ${format}`, err);
+        return false;
+    }
+    const rangeStart = now - durationMs;
+    if (lastActive !== undefined && lastActive >= rangeStart && lastActive <= now) {
         (0, stentor_logger_1.log)().debug(`User was active within ${amount} ${format}`);
         return true;
     }
@@ -35,40 +44,41 @@ function activeWithin(context, amount, format) {
 /**
  * Is the current time within the provided schedule.
  *
- * @param start - Start date
+ * @param start - Start date string
  * @param startFormat - Format of the start date string
- * @param duration - Duration
+ * @param duration - Duration amount
  * @param durationFormat - Format of the duration
  * @param timeZone - Optional time zone
  */
 function fitsSchedule(start, startFormat, duration, durationFormat, timeZone) {
+    // Convert legacy Moment.js format to Luxon format
+    const normalizedFormat = (0, normalizeLegacyFormat_1.normalizeLegacyFormat)(startFormat);
     const schedule = {
         schedule: {
             start: {
                 time: start,
-                format: startFormat,
-                timeZone
+                format: normalizedFormat,
+                timeZone,
             },
             duration: {
                 amount: duration,
-                format: durationFormat
-            }
-        }
+                format: durationFormat,
+            },
+        },
     };
     const fitSchedule = !!(0, findSchedulableMatch_1.findSchedulableMatch)([schedule]);
     if (!fitSchedule) {
-        (0, stentor_logger_1.log)().debug(`Schedule starting ${start}, with format ${startFormat}, and running for ${duration} ${durationFormat} did NOT fit.  Current date ${new Date().toISOString()}`);
+        (0, stentor_logger_1.log)().debug(`Schedule starting ${start}, with format ${startFormat} (normalized: ${normalizedFormat}), and running for ${duration} ${durationFormat} did NOT fit. Current date ${new Date().toISOString()}`);
     }
     else {
-        (0, stentor_logger_1.log)().debug(`Schedule starting ${start}, with format ${startFormat}, and running for ${duration} ${durationFormat} fits.`);
+        (0, stentor_logger_1.log)().debug(`Schedule starting ${start}, with format ${startFormat} (normalized: ${normalizedFormat}), and running for ${duration} ${durationFormat} fits.`);
     }
     return fitSchedule;
 }
 /**
- * Generate a time conditional check for the provided
- * context with last active timestamp.
+ * Generate a time-based conditional check for the given context.
  *
- * @param context
+ * @param context - Object containing lastActiveTimestamp
  */
 function TimeConditionalCheck(context) {
     return {
@@ -76,10 +86,7 @@ function TimeConditionalCheck(context) {
         check: (obj) => {
             return !!(0, findTimeContextualMatch_1.findTimeContextualMatch)([obj], context);
         },
-        functions: [
-            activeWithin.bind(null, context),
-            fitsSchedule
-        ]
+        functions: [activeWithin.bind(null, context), fitsSchedule],
     };
 }
 //# sourceMappingURL=TimeConditionalCheck.js.map

package/lib/TimeConditionalCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"TimeConditionalCheck.js","sourceRoot":"","sources":["../src/TimeConditionalCheck.ts"],"names":[],"mappings":";;AAoBA,oCAcC;AAWD,oCAwBC;AAQD,oDAWC;AAxFD,oCAAoC;AACpC,iCAAiC;AACjC,+CAA4C;AAC5C,mDAAqC;AAErC,mDAAkD;AAClD,uEAAoE;AACpE,iEAA8D;AAE9D,iCAAiC;AACjC,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,MAAM,CAAC,CAAC;AAEpC;;;;;;;GAOG;AACH,SAAgB,YAAY,CAAC,OAAwC,EAAE,MAAc,EAAE,MAAsB;IAEzG,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE/G,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAE5C,IAAI,UAAU,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3C,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,0BAA0B,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,8BAA8B,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC;AACjB,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,YAAY,CAAC,KAAa,EAAE,WAAmB,EAAE,QAAgB,EAAE,cAA8B,EAAE,QAAiB;IAChI,MAAM,QAAQ,GAAgB;QAC1B,QAAQ,EAAE;YACN,KAAK,EAAE;gBACH,IAAI,EAAE,KAAK;gBACX,MAAM,EAAE,WAAW;gBACnB,QAAQ;aACX;YACD,QAAQ,EAAE;gBACN,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,cAAc;aACzB;SACJ;KACJ,CAAA;IAED,MAAM,WAAW,GAAG,CAAC,CAAC,IAAA,2CAAoB,EAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEvD,IAAI,CAAC,WAAW,EAAE,CAAC;QACf,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,qBAAqB,KAAK,iBAAiB,WAAW,qBAAqB,QAAQ,IAAI,cAAc,+BAA+B,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAChL,CAAC;SAAM,CAAC;QACJ,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,qBAAqB,KAAK,iBAAiB,WAAW,qBAAqB,QAAQ,IAAI,cAAc,QAAQ,CAAC,CAAC;IAC/H,CAAC;IAED,OAAO,WAAW,CAAC;AACvB,CAAC;AAED;;;;;GAKG;AACH,SAAgB,oBAAoB,CAAmB,OAAwC;IAC3F,OAAO;QACH,IAAI,EAAE,iCAAgB;QACtB,KAAK,EAAE,CAAC,GAAsB,EAAW,EAAE;YACvC,OAAO,CAAC,CAAC,IAAA,iDAAuB,EAAC,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QACrD,CAAC;QACD,SAAS,EAAE;YACP,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;YAChC,YAAY;SACf;KACJ,CAAA;AACL,CAAC"}
+{"version":3,"file":"TimeConditionalCheck.js","sourceRoot":"","sources":["../src/TimeConditionalCheck.ts"],"names":[],"mappings":";;AAkBA,oCA+BC;AAWD,oCAqCC;AAOD,oDAQC;AAhHD,oCAAoC;AACpC,mDAAqC;AAErC,mDAAkD;AAClD,iDAA8C;AAE9C,uEAAoE;AACpE,iEAA8D;AAC9D,mEAAgE;AAEhE;;;;;;;GAOG;AACH,SAAgB,YAAY,CAC1B,OAAwC,EACxC,MAAc,EACd,MAAsB;IAEtB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAE/C,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,MAAM,GAAG,CAAC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC5F,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,uCAAuC,MAAM,YAAY,MAAM,EAAE,CAAC,CAAC;QAC9E,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,UAAkB,CAAC;IAEvB,IAAI,CAAC;QACH,UAAU,GAAG,IAAA,6BAAa,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,oBAAG,GAAE,CAAC,IAAI,CAAC,6CAA6C,MAAM,IAAI,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;QACjF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,UAAU,GAAG,GAAG,GAAG,UAAU,CAAC;IAEpC,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,IAAI,UAAU,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;QAC9E,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,0BAA0B,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAA,oBAAG,GAAE,CAAC,KAAK,CAAC,8BAA8B,MAAM,IAAI,MAAM,EAAE,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,YAAY,CAC1B,KAAa,EACb,WAAmB,EACnB,QAAgB,EAChB,cAA8B,EAC9B,QAAiB;IAEjB,kDAAkD;IAClD,MAAM,gBAAgB,GAAG,IAAA,6CAAqB,EAAC,WAAW,CAAC,CAAC;IAE5D,MAAM,QAAQ,GAAgB;QAC5B,QAAQ,EAAE;YACR,KAAK,EAAE;gBACL,IAAI,EAAE,KAAK;gBACX,MAAM,EAAE,gBAAgB;gBACxB,QAAQ;aACT;YACD,QAAQ,EAAE;gBACR,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE,cAAc;aACvB;SACF;KACF,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,CAAC,IAAA,2CAAoB,EAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEvD,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,IAAA,oBAAG,GAAE,CAAC,KAAK,CACT,qBAAqB,KAAK,iBAAiB,WAAW,iBAAiB,gBAAgB,sBAAsB,QAAQ,IAAI,cAAc,8BAA8B,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAChM,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAA,oBAAG,GAAE,CAAC,KAAK,CACT,qBAAqB,KAAK,iBAAiB,WAAW,iBAAiB,gBAAgB,sBAAsB,QAAQ,IAAI,cAAc,QAAQ,CAChJ,CAAC;IACJ,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;GAIG;AACH,SAAgB,oBAAoB,CAAmB,OAAwC;IAC7F,OAAO;QACL,IAAI,EAAE,iCAAgB;QACtB,KAAK,EAAE,CAAC,GAAsB,EAAW,EAAE;YACzC,OAAO,CAAC,CAAC,IAAA,iDAAuB,EAAC,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QACnD,CAAC;QACD,SAAS,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC;KAC5D,CAAC;AACJ,CAAC"}

package/lib/findLastActiveMatch.d.ts

@@ -2,9 +2,9 @@ import { LastActive } from "stentor-models";
 /**
  * Finds the most relevant contextual match.
  *
- * @param {((T | LastActive<T>)[])} responses
- * @param {{ lastActiveTimestamp?: number }} context
- * @returns {(LastActive<T> | undefined)}
+ * @param responses
+ * @param context
+ * @returns
  */
 export declare function findLastActiveMatch<T extends object>(responses: (T | LastActive<T>)[], context: {
     lastActiveTimestamp?: number;

package/lib/findLastActiveMatch.js

@@ -1,65 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findLastActiveMatch = findLastActiveMatch;
-/*! Copyright (c) 2019, XAPPmedia */
+/*! Copyright (c) 2025, XAPP AI */
 const stentor_guards_1 = require("stentor-guards");
-const Moment = require("moment");
-const moment_range_1 = require("moment-range");
-// Add the range plugin to moment
-const moment = (0, moment_range_1.extendMoment)(Moment);
+const stentor_utils_1 = require("stentor-utils");
 /**
  * Finds the most relevant contextual match.
  *
- * @param {((T | LastActive<T>)[])} responses
- * @param {{ lastActiveTimestamp?: number }} context
- * @returns {(LastActive<T> | undefined)}
+ * @param responses
+ * @param context
+ * @returns
  */
 function findLastActiveMatch(responses, context) {
     if (!Array.isArray(responses) || !context) {
-        // Exit conditions, no array or context then bail
         return undefined;
     }
-    const now = moment();
-    const lastActive = context.lastActiveTimestamp !== undefined ? moment(context.lastActiveTimestamp) : undefined;
+    const now = Date.now();
+    const lastActive = context.lastActiveTimestamp;
     let contextualResponse;
-    let withinRange;
+    let smallestRangeMs;
     for (const response of responses) {
-        // Make sure activeWithin exists, might have gotten bad data
         if ((0, stentor_guards_1.isActiveWithin)(response)) {
-            const activeWithin = response.activeWithin;
-            // Construct the date range by starting with the current time
-            // and subtracting the activeWithin amount
-            const rangeStart = moment(now).subtract(activeWithin.amount, activeWithin.format);
-            const range = moment.range(rangeStart, now);
-            // Then see if the last time we saw them is within the range
-            if (lastActive && range.contains(lastActive)) {
-                // It is in range, see if we keep it...
-                if (!withinRange) {
-                    // If nothing previous, set it
+            const { amount, format } = response.activeWithin;
+            const durationMs = (0, stentor_utils_1.getDurationMs)(amount, format);
+            const rangeStart = now - durationMs;
+            if (lastActive !== undefined && lastActive >= rangeStart && lastActive <= now) {
+                if (contextualResponse === undefined || durationMs < smallestRangeMs) {
                     contextualResponse = response;
-                    withinRange = range;
-                }
-                else if (range < withinRange) {
-                    // If the new range is smaller than the previous
-                    contextualResponse = response;
-                    withinRange = range;
+                    smallestRangeMs = durationMs;
                 }
             }
         }
         else if ((0, stentor_guards_1.isHaveNotSeenWithin)(response)) {
-            const haveNotSeenWithin = response.haveNotSeenWithin;
-            const rangeStart = moment(now).subtract(haveNotSeenWithin.amount, haveNotSeenWithin.format);
-            const range = moment.range(rangeStart, now);
-            // Range is between now and the haveNotSeenWithin duration
-            // Make sure it is outside the range
-            if (lastActive && !range.contains(lastActive)) {
-                if (!withinRange) {
-                    contextualResponse = response;
-                    withinRange = range;
-                }
-                else if (range < withinRange) {
+            const { amount, format } = response.haveNotSeenWithin;
+            const durationMs = (0, stentor_utils_1.getDurationMs)(amount, format);
+            const rangeStart = now - durationMs;
+            if (lastActive !== undefined && (lastActive < rangeStart || lastActive > now)) {
+                if (contextualResponse === undefined || durationMs < smallestRangeMs) {
                     contextualResponse = response;
-                    withinRange = range;
+                    smallestRangeMs = durationMs;
                 }
             }
         }

package/lib/findLastActiveMatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"findLastActiveMatch.js","sourceRoot":"","sources":["../src/findLastActiveMatch.ts"],"names":[],"mappings":";;AAgBA,kDA8DC;AA9ED,oCAAoC;AACpC,mDAAkF;AAElF,iCAAiC;AACjC,+CAAuD;AAEvD,iCAAiC;AACjC,MAAM,MAAM,GAAG,IAAA,2BAAY,EAAC,MAAM,CAAC,CAAC;AAEpC;;;;;;GAMG;AACH,SAAgB,mBAAmB,CAC/B,SAAgC,EAChC,OAAyC;IAEzC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QACxC,iDAAiD;QACjD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE/G,IAAI,kBAAiC,CAAC;IACtC,IAAI,WAAsB,CAAC;IAE3B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QAC/B,4DAA4D;QAC5D,IAAI,IAAA,+BAAc,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC3B,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAC;YAC3C,6DAA6D;YAC7D,0CAA0C;YAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;YAClF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAC5C,4DAA4D;YAC5D,IAAI,UAAU,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC3C,uCAAuC;gBACvC,IAAI,CAAC,WAAW,EAAE,CAAC;oBACf,8BAA8B;oBAC9B,kBAAkB,GAAG,QAAQ,CAAC;oBAC9B,WAAW,GAAG,KAAK,CAAC;gBACxB,CAAC;qBAAM,IAAI,KAAK,GAAG,WAAW,EAAE,CAAC;oBAC7B,gDAAgD;oBAChD,kBAAkB,GAAG,QAAQ,CAAC;oBAC9B,WAAW,GAAG,KAAK,CAAC;gBACxB,CAAC;YACL,CAAC;QACL,CAAC;aAAM,IAAI,IAAA,oCAAmB,EAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,CAAC;YACrD,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC5F,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YAC5C,0DAA0D;YAC1D,oCAAoC;YACpC,IAAI,UAAU,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC5C,IAAI,CAAC,WAAW,EAAE,CAAC;oBACf,kBAAkB,GAAG,QAAQ,CAAC;oBAC9B,WAAW,GAAG,KAAK,CAAC;gBACxB,CAAC;qBAAM,IAAI,KAAK,GAAG,WAAW,EAAE,CAAC;oBAC7B,kBAAkB,GAAG,QAAQ,CAAC;oBAC9B,WAAW,GAAG,KAAK,CAAC;gBACxB,CAAC;YACL,CAAC;QACL,CAAC;aAAM,IAAI,IAAA,4BAAW,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,+CAA+C;YAC/C,qDAAqD;YACrD,oBAAoB;YACpB,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,kBAAkB,GAAG,QAAQ,CAAC;YAClC,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"findLastActiveMatch.js","sourceRoot":"","sources":["../src/findLastActiveMatch.ts"],"names":[],"mappings":";;AAYA,kDAgDC;AA5DD,kCAAkC;AAClC,mDAAkF;AAElF,iDAA8C;AAE9C;;;;;;GAMG;AACH,SAAgB,mBAAmB,CACjC,SAAgC,EAChC,OAAyC;IAEzC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC1C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAE/C,IAAI,kBAAiC,CAAC;IACtC,IAAI,eAAuB,CAAC;IAE5B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,IAAI,IAAA,+BAAc,EAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,YAAY,CAAC;YACjD,MAAM,UAAU,GAAG,IAAA,6BAAa,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,GAAG,GAAG,UAAU,CAAC;YAEpC,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,IAAI,UAAU,IAAI,UAAU,IAAI,GAAG,EAAE,CAAC;gBAC9E,IAAI,kBAAkB,KAAK,SAAS,IAAI,UAAU,GAAG,eAAe,EAAE,CAAC;oBACrE,kBAAkB,GAAG,QAAQ,CAAC;oBAC9B,eAAe,GAAG,UAAU,CAAC;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,IAAA,oCAAmB,EAAC,QAAQ,CAAC,EAAE,CAAC;YACzC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC,iBAAiB,CAAC;YACtD,MAAM,UAAU,GAAG,IAAA,6BAAa,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,GAAG,GAAG,UAAU,CAAC;YAEpC,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,UAAU,GAAG,GAAG,CAAC,EAAE,CAAC;gBAC9E,IAAI,kBAAkB,KAAK,SAAS,IAAI,UAAU,GAAG,eAAe,EAAE,CAAC;oBACrE,kBAAkB,GAAG,QAAQ,CAAC;oBAC9B,eAAe,GAAG,UAAU,CAAC;gBAC/B,CAAC;YACH,CAAC;QACH,CAAC;aAAM,IAAI,IAAA,4BAAW,EAAC,QAAQ,CAAC,EAAE,CAAC;YACjC,+CAA+C;YAC/C,qDAAqD;YACrD,oBAAoB;YACpB,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,kBAAkB,GAAG,QAAQ,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC"}

package/lib/findMostSpecificSchedulable.d.ts

@@ -7,14 +7,5 @@ export interface ScheduleFormatScores {
     [format: string]: ScheduleFormatScore;
 }
 export declare const SCHEDULE_FORMAT_SCORES: ScheduleFormatScores;
-/**
- * Determine schedule specificity score, the higher the value
- * the more specific the schedule is.
- */
 export declare function determineSpecificityScore<T extends object>(scheduled: Scheduled<T> | undefined): number;
-/**
- * Finds the most specific schedule.
- *
- * If the array does not contain any scheduled objects, undefined is returned.
- */
 export declare function findMostSpecificSchedulable<T extends object>(schedules: (T | Scheduled<T>)[] | undefined): Scheduled<T> | undefined;

package/lib/findMostSpecificSchedulable.js

@@ -3,103 +3,63 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SCHEDULE_FORMAT_SCORES = void 0;
 exports.determineSpecificityScore = determineSpecificityScore;
 exports.findMostSpecificSchedulable = findMostSpecificSchedulable;
-/*! Copyright (c) 2019, XAPPmedia */
+/*! Copyright (c) 2025, XAPP AI */
 const stentor_guards_1 = require("stentor-guards");
-const moment = require("moment-timezone");
 exports.SCHEDULE_FORMAT_SCORES = {
-    // Year, applies to both YY and YYYY
-    ["YY"]: { score: 1 },
-    // Month, applies to both M and MM
-    ["M"]: { score: 1 },
-    // Day of month, applies to both D and DD
-    ["D"]: { score: 1 },
-    // Day of year, includes information about month and day of month
-    ["DDD"]: { score: 2 },
-    // Hour (24), includes information about hours and morning vs evening
-    // applies to both H and HH
-    ["H"]: { score: 2 },
-    // Hour (12), includes information about hours
-    // applies to both h and hh
-    ["h"]: { score: 1 },
-    // am/pm, includes information about morning or evening
-    ["a"]: { score: 1 },
-    // AM/PM
-    ["A"]: { score: 1 },
-    // Minutes, applies to both m and mm
-    ["m"]: { score: 1 }
+    YYYY: { score: 1 }, // moment
+    YY: { score: 1 }, // moment
+    yyyy: { score: 1 }, // luxon
+    M: { score: 1 },
+    MM: { score: 1 },
+    D: { score: 1 },
+    DD: { score: 1 },
+    dd: { score: 1 },
+    DDD: { score: 2 },
+    H: { score: 2 },
+    HH: { score: 2 },
+    h: { score: 1 },
+    hh: { score: 1 },
+    a: { score: 1 },
+    A: { score: 1 },
+    m: { score: 1 },
+    mm: { score: 1 },
 };
-/**
- * Determine schedule specificity score, the higher the value
- * the more specific the schedule is.
- */
 function determineSpecificityScore(scheduled) {
-    // exit conditions
+    var _a, _b;
     if (!scheduled || !scheduled.schedule) {
         return 0;
     }
     const schedule = scheduled.schedule;
     const start = schedule.start;
-    let format = start.format;
-    // Format doesn't always exist
-    if (!format) {
-        // If it doesn't use the defaultFormat from moment
-        // which is what we use as the default
-        format = moment.defaultFormat;
-    }
+    const format = (_a = start.format) !== null && _a !== void 0 ? _a : "yyyy-MM-dd'T'HH:mm:ssZZ";
+    const tokenRegex = /Y{2,4}|M{1,2}|D{1,4}|H{1,2}|h{1,2}|m{1,2}|s{1,2}|a|A|Z{1,2}/g;
+    const tokens = (_b = format.match(tokenRegex)) !== null && _b !== void 0 ? _b : [];
     let score = 0;
-    // Not in the format but adds specificity
     if (start.dayOfWeek) {
         score += 1;
     }
-    // Iterate through the formats adding the score
-    Object.keys(exports.SCHEDULE_FORMAT_SCORES).forEach(key => {
-        const formatScore = exports.SCHEDULE_FORMAT_SCORES[key];
-        // If it contains it
-        if (format.includes(key)) {
-            // add the score
-            score += formatScore.score;
+    for (const token of tokens) {
+        const tokenScore = exports.SCHEDULE_FORMAT_SCORES[token];
+        if (tokenScore) {
+            score += tokenScore.score;
         }
-    });
+    }
     return score;
 }
-/**
- * Finds the most specific schedule.
- *
- * If the array does not contain any scheduled objects, undefined is returned.
- */
 function findMostSpecificSchedulable(schedules) {
-    // Fast exit conditions
-    // doesn't exist
-    if (!schedules) {
+    if (!Array.isArray(schedules) || schedules.length === 0)
         return undefined;
-    }
-    // empty array
-    if (schedules.length === 0) {
-        return undefined;
-    }
-    // only one in the array, just return it
-    if (schedules.length === 1) {
-        const firstItem = schedules[0];
-        if ((0, stentor_guards_1.isScheduled)(firstItem)) {
-            return firstItem;
-        }
-        else {
-            return undefined;
-        }
-    }
     let mostSpecific;
     let currentScore = 0;
-    schedules.forEach(scheduled => {
-        if (!(0, stentor_guards_1.isScheduled)(scheduled)) {
-            // bail if it doesn't have a schedule
-            return;
-        }
+    for (const scheduled of schedules) {
+        if (!(0, stentor_guards_1.isScheduled)(scheduled))
+            continue;
         const score = determineSpecificityScore(scheduled);
         if (score > currentScore) {
             mostSpecific = scheduled;
             currentScore = score;
         }
-    });
+    }
     return mostSpecific;
 }
 //# sourceMappingURL=findMostSpecificSchedulable.js.map

package/lib/findMostSpecificSchedulable.js.map

@@ -1 +1 @@
-{"version":3,"file":"findMostSpecificSchedulable.js","sourceRoot":"","sources":["../src/findMostSpecificSchedulable.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"findMostSpecificSchedulable.js","sourceRoot":"","sources":["../src/findMostSpecificSchedulable.ts"],"names":[],"mappings":";;;AAiCA,8DA2BC;AAED,kEAkBC;AAhFD,kCAAkC;AAClC,mDAA6C;AAYhC,QAAA,sBAAsB,GAAyB;IAC1D,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,SAAS;IAC7B,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,SAAS;IAC3B,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ;IAC5B,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACf,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IAChB,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACf,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IAChB,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IAChB,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACjB,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACf,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IAChB,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACf,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IAChB,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACf,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACf,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;IACf,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE;CACjB,CAAC;AAEF,SAAgB,yBAAyB,CAAmB,SAAmC;;IAC7F,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;QACtC,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;IACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC7B,MAAM,MAAM,GAAG,MAAA,KAAK,CAAC,MAAM,mCAAI,yBAAyB,CAAC;IAEzD,MAAM,UAAU,GAAG,8DAA8D,CAAC;IAElF,MAAM,MAAM,GAAG,MAAA,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,mCAAI,EAAE,CAAC;IAE9C,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,KAAK,IAAI,CAAC,CAAC;IACb,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,8BAAsB,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,2BAA2B,CACzC,SAA2C;IAE3C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAE1E,IAAI,YAAsC,CAAC;IAC3C,IAAI,YAAY,GAAG,CAAC,CAAC;IAErB,KAAK,MAAM,SAAS,IAAI,SAAS,EAAE,CAAC;QAClC,IAAI,CAAC,IAAA,4BAAW,EAAC,SAAS,CAAC;YAAE,SAAS;QACtC,MAAM,KAAK,GAAG,yBAAyB,CAAC,SAAS,CAAC,CAAC;QACnD,IAAI,KAAK,GAAG,YAAY,EAAE,CAAC;YACzB,YAAY,GAAG,SAAS,CAAC;YACzB,YAAY,GAAG,KAAK,CAAC;QACvB,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC"}

package/lib/findSchedulableMatch.d.ts

@@ -1,7 +1,8 @@
+/*! Copyright (c) 2025, XAPP AI */
+import { DateTime } from "luxon";
 import { Scheduled } from "stentor-models";
-import * as moment from "moment-timezone";
 /**
  * Within a list of Schedulables, find a match for the provided time
  * or current time if no time is provided.
  */
-export declare function findSchedulableMatch<T extends object>(schedules: (T | Scheduled<T>)[] | undefined, now?: moment.Moment): Scheduled<T> | undefined;
+export declare function findSchedulableMatch<T extends object>(schedules: (T | Scheduled<T>)[] | undefined, baseNowInput?: DateTime): Scheduled<T> | undefined;

package/lib/findSchedulableMatch.js

@@ -1,88 +1,149 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findSchedulableMatch = findSchedulableMatch;
-/*! Copyright (c) 2019, XAPPmedia */
+/*! Copyright (c) 2025, XAPP AI */
+const luxon_1 = require("luxon");
 const stentor_guards_1 = require("stentor-guards");
-const moment = require("moment-timezone");
 const findMostSpecificSchedulable_1 = require("./findMostSpecificSchedulable");
 const stentor_logger_1 = require("stentor-logger");
+function normalizeDurationUnit(unit) {
+    switch (unit.toLowerCase()) {
+        case "ms":
+        case "millisecond":
+        case "milliseconds":
+            return "milliseconds";
+        case "s":
+        case "second":
+        case "seconds":
+            return "seconds";
+        case "m":
+        case "minute":
+        case "minutes":
+            return "minutes";
+        case "h":
+        case "hour":
+        case "hours":
+            return "hours";
+        case "d":
+        case "day":
+        case "days":
+            return "days";
+        default:
+            throw new Error(`Invalid unit ${unit}`);
+    }
+}
 /**
  * Within a list of Schedulables, find a match for the provided time
  * or current time if no time is provided.
  */
-function findSchedulableMatch(schedules, now = moment()) {
+function findSchedulableMatch(schedules, baseNowInput = luxon_1.DateTime.now().toUTC()) {
     if (!Array.isArray(schedules)) {
-        // bail if no schedule was passed in
         return undefined;
     }
+    const baseNow = baseNowInput !== null && baseNowInput !== void 0 ? baseNowInput : luxon_1.DateTime.now().toUTC();
     const matches = [];
-    schedules.forEach(item => {
+    for (const item of schedules) {
         if (!(0, stentor_guards_1.isScheduled)(item)) {
-            // bail if it doesn't have a schedule
-            return;
+            (0, stentor_logger_1.log)().debug(`Item is not scheduled: ${JSON.stringify(item)}, skipping`);
+            continue;
         }
-        let start;
         const { time, format, timeZone, dayOfWeek } = item.schedule.start;
-        start = moment(time, format);
-        // Convert to correct timezone if available
-        if (timeZone) {
-            // Update now with the tz
-            now = now.tz(timeZone);
-            // Create the start time with the provided time, format and timezone
-            start = moment.tz(time, format, timeZone);
-            // We now may need to set the year, month, date for the current
-            // day if it wasn't provided on the format
-            // The order here is important as if you try to update the date first
-            // for a month that doesn't have that many days, it will default back to one
-            // and you will be really confused.
-            // They didn't give a year, set it.
-            if (!format.includes("Y")) {
-                const year = now.year();
-                start.year(year);
+        const now = timeZone ? baseNow.setZone(timeZone) : baseNow;
+        let start;
+        if (format) {
+            let patchedFormat = format;
+            const patchedTime = time;
+            // Legacy format handling: H:mm Z D
+            if (format === "H:mm Z D") {
+                const match = time.match(/^(\d{1,2}:\d{2}) ([+-]\d{4}) (\d)$/);
+                if (match) {
+                    const [, timePart, offset, legacyDayOfWeek] = match;
+                    // Legacy format day mapping: directly map to the target date in March 2017
+                    // The 'D' token represents day-of-month, not day-of-week
+                    const legacyDay = parseInt(legacyDayOfWeek);
+                    const targetDate = luxon_1.DateTime.fromObject({ year: 2017, month: 3, day: legacyDay, hour: 0 }, { zone: "America/New_York" });
+                    const fullDate = targetDate.toFormat("yyyy-MM-dd");
+                    const [h, m] = timePart.split(":");
+                    const normalizedTime = `${h.padStart(2, "0")}:${m}`;
+                    const fullTime = `${fullDate} ${normalizedTime} ${offset}`;
+                    const parsed = luxon_1.DateTime.fromFormat(fullTime, "yyyy-MM-dd HH:mm ZZZ", {
+                        setZone: true,
+                        locale: "en",
+                    });
+                    start = parsed;
+                }
             }
-            // Since DDD or DDDD, day of year (1-365) includes both
-            // data for day of month and month,
-            // skip these two
-            if (!format.includes("DDD")) {
-                // 1st case, they don't give month
-                if (!format.includes("M")) {
-                    const month = now.month();
-                    start.month(month);
+            else {
+                // Normal format-based parsing
+                if ((format === null || format === void 0 ? void 0 : format.includes("Z")) && /\bZ\b/.test(time)) {
+                    patchedFormat = format.replace("Z", "'Z'");
                 }
-                // 2nd case, they don't give date
-                if (!format.includes("D")) {
-                    const date = now.date();
-                    start.date(date);
+                start = luxon_1.DateTime.fromFormat(patchedTime, patchedFormat, {
+                    zone: timeZone || baseNow.zone,
+                });
+            }
+        }
+        else {
+            start = luxon_1.DateTime.fromISO(time, { zone: timeZone || baseNow.zone });
+        }
+        if (!start.isValid) {
+            (0, stentor_logger_1.log)().debug(`Invalid start date for schedule: time=${time}, format=${format}`, start.invalidReason, start.invalidExplanation);
+            continue;
+        }
+        // Patch missing date parts like moment-timezone
+        if (format) {
+            const hasYear = format.includes("y") || format.includes("Y");
+            const hasMonth = format.includes("M");
+            const hasDay = format.includes("d") || format.includes("D");
+            const hasDayOfYear = format.includes("o") || format.includes("D"); // luxon uses `o` for day-of-year
+            if (!(hasYear && hasMonth && hasDay)) {
+                if (!hasYear) {
+                    start = start.set({ year: now.year });
+                }
+                if (!hasDayOfYear) {
+                    if (!hasMonth) {
+                        start = start.set({ month: now.month });
+                    }
+                    if (!hasDay) {
+                        start = start.set({ day: now.day });
+                    }
                 }
             }
         }
-        const duration = item.schedule.duration;
-        // calculate the end time based on the duration set
-        const end = moment(start).add(duration.amount, duration.format);
+        // Compute end time
+        const durationAmount = item.schedule.duration.amount;
+        const durationFormat = item.schedule.duration.format;
+        let duration;
+        try {
+            const normalized = normalizeDurationUnit(durationFormat);
+            duration = luxon_1.Duration.fromObject({ [normalized]: durationAmount });
+        }
+        catch (err) {
+            (0, stentor_logger_1.log)().debug(`Unsupported duration format: ${durationFormat}`);
+            continue;
+        }
+        const end = start.plus(duration);
+        // Check day of week if applicable (skip for legacy format since it's already encoded in start time)
         let correctDayOfWeek = true;
-        // see if we have one.
-        if (dayOfWeek) {
-            // alright we have one, if it isn't included in the
-            // day of week string, make that a false
-            // This uses includes because dayOfWeek can be `0124` to denote multiple days of the week
-            if (!item.schedule.start.dayOfWeek.includes(now.weekday().toString())) {
+        if (dayOfWeek && format !== "H:mm Z D") {
+            const currentDow = now.weekday % 7; // 0 (Sun) – 6 (Sat)
+            if (!dayOfWeek.includes(currentDow.toString())) {
                 correctDayOfWeek = false;
             }
         }
+        // Match if now is within [start, end)
         if (correctDayOfWeek) {
-            // See if it is in between, [) means we include
-            // the start but exclude the end
-            if (now.isBetween(start, end, undefined, "[)")) {
+            if (now >= start && now < end) {
                 matches.push(item);
             }
             else {
-                (0, stentor_logger_1.log)().debug(`Schedule starting ${time}, with format ${format}, and duration ${duration.amount} ${duration.format} was NOT in-between ${start.format()} --> ${end.format()}`);
+                (0, stentor_logger_1.log)().debug(`Schedule starting ${time}, with format ${format}, and duration ${durationAmount} ${durationFormat} was NOT in-between ${start.toISO()} --> ${end.toISO()}`);
             }
         }
         else {
-            (0, stentor_logger_1.log)().debug(`Incorrect day of the week for schedule starting ${time}, with format ${format}, and duration ${duration.amount} ${duration.format}`);
+            (0, stentor_logger_1.log)().debug(`Incorrect day of the week for schedule starting ${time}, with format ${format}, and duration ${durationAmount} ${durationFormat}`);
         }
-    });
+    }
     return (0, findMostSpecificSchedulable_1.findMostSpecificSchedulable)(matches);
 }
 //# sourceMappingURL=findSchedulableMatch.js.map

package/lib/findSchedulableMatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"findSchedulableMatch.js","sourceRoot":"","sources":["../src/findSchedulableMatch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"findSchedulableMatch.js","sourceRoot":"","sources":["../src/findSchedulableMatch.ts"],"names":[],"mappings":"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"}

package/lib/normalizeLegacyFormat.d.ts

@@ -0,0 +1,7 @@
+/*! Copyright (c) 2025, XAPP AI */
+/**
+ * Normalizes legacy Moment.js format strings to Luxon format strings
+ * @param momentFormat - The Moment.js format string
+ * @returns The equivalent Luxon format string
+ */
+export declare function normalizeLegacyFormat(momentFormat: string): string;

package/lib/normalizeLegacyFormat.js

@@ -0,0 +1,135 @@
+"use strict";
+/*! Copyright (c) 2025, XAPP AI */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeLegacyFormat = normalizeLegacyFormat;
+// Helper function to escape special regex characters
+function escapeRegex(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+/**
+ * Normalizes legacy Moment.js format strings to Luxon format strings
+ * @param momentFormat - The Moment.js format string
+ * @returns The equivalent Luxon format string
+ */
+function normalizeLegacyFormat(momentFormat) {
+    // Special case: handle YYYY-MM-DDTmm:ss which appears to be a typo/legacy format
+    // where mm:ss should be HH:mm (hours:minutes not minutes:seconds)
+    if (momentFormat === "YYYY-MM-DDTmm:ss") {
+        return "yyyy-MM-dd'T'HH:mm";
+    }
+    // Quick check: if format looks like it's already Luxon-style (lowercase yyyy, dd in date context), return as-is  
+    // Use bounded matching to prevent ReDoS attacks
+    if (/yyyy[^M]{0,10}-MM-dd/.test(momentFormat) || /dd[^M]{0,10}-MM-yyyy/.test(momentFormat)) {
+        return momentFormat;
+    }
+    // For mixed formats with dd in date context, we need to be careful not to convert dd to weekday
+    // Use non-greedy, bounded matching to prevent ReDoS attacks
+    const hasMixedDateFormat = /(?:YYYY|yyyy)[^M]{0,10}-MM-dd/.test(momentFormat) || /dd[^M]{0,10}-MM-(?:YYYY|yyyy)/.test(momentFormat);
+    // Handle escaped characters in brackets first
+    // Limit content within brackets to prevent ReDoS attacks
+    const escapedChars = [];
+    let result = momentFormat.replace(/\[([^\]]{0,100})\]/g, (_, content) => {
+        const placeholder = `###ESC${escapedChars.length}###`;
+        escapedChars.push(content);
+        return placeholder;
+    });
+    // Define token replacements in order of precedence (longer patterns first)
+    // Use placeholder system to prevent re-processing of already converted tokens
+    // Use numbers to avoid character conflicts
+    const tokenReplacements = [
+        // 4-character tokens
+        { moment: /YYYY/g, luxon: "@@1@@" },
+        { moment: /MMMM/g, luxon: "@@2@@" },
+        { moment: /dddd/g, luxon: "@@3@@" },
+        { moment: /DDDD/g, luxon: "@@4@@" },
+        // 3-character tokens  
+        { moment: /MMM/g, luxon: "@@5@@" },
+        { moment: /ddd/g, luxon: "@@6@@" },
+        { moment: /DDD/g, luxon: "@@7@@" },
+        { moment: /SSS/g, luxon: "@@8@@" },
+        { moment: /ZZZ/g, luxon: "@@9@@" },
+        // 2-character tokens
+        { moment: /Do/g, luxon: "@@10@@" },
+        { moment: /DD/g, luxon: "@@11@@" }, // Day of month
+        ...(hasMixedDateFormat ? [] : [{ moment: /dd/g, luxon: "@@12@@" }]), // Skip weekday conversion in date context
+        { moment: /MM/g, luxon: "@@13@@" },
+        { moment: /YY/g, luxon: "@@14@@" },
+        { moment: /HH/g, luxon: "@@15@@" },
+        { moment: /hh/g, luxon: "@@16@@" },
+        { moment: /mm/g, luxon: "@@17@@" },
+        { moment: /ss/g, luxon: "@@18@@" },
+        { moment: /SS/g, luxon: "@@19@@" },
+        { moment: /ww/g, luxon: "@@20@@" },
+        { moment: /ZZ/g, luxon: "@@21@@" },
+        // 1-character tokens (only match when not part of words)
+        { moment: /(?<!\w)D(?!\w)/g, luxon: "@@22@@" }, // Day of month 
+        ...(hasMixedDateFormat ? [] : [{ moment: /(?<!\w)d(?!\w)/g, luxon: "@@23@@" }]), // Skip weekday conversion in date context
+        { moment: /(?<!\w)M(?!\w)/g, luxon: "@@24@@" },
+        { moment: /(?<!\w)H(?!\w)/g, luxon: "@@25@@" },
+        { moment: /(?<!\w)h(?!\w)/g, luxon: "@@26@@" },
+        { moment: /(?<!\w)m(?!\w)/g, luxon: "@@27@@" },
+        { moment: /(?<!\w)s(?!\w)/g, luxon: "@@28@@" },
+        { moment: /(?<!\w)S(?!\w)/g, luxon: "@@29@@" },
+        { moment: /(?<!\w)A(?!\w)/g, luxon: "@@30@@" },
+        { moment: /(?<!\w)a(?!\w)/g, luxon: "@@31@@" },
+        { moment: /(?<!\w)Z(?!\w)/g, luxon: "@@32@@" },
+        { moment: /(?<!\w)Q(?!\w)/g, luxon: "@@33@@" },
+        { moment: /(?<!\w)w(?!\w)/g, luxon: "@@34@@" },
+        { moment: /(?<!\w)X(?!\w)/g, luxon: "@@35@@" },
+        { moment: /(?<!\w)x(?!\w)/g, luxon: "@@36@@" },
+    ];
+    // Apply replacements in order
+    for (const replacement of tokenReplacements) {
+        result = result.replace(replacement.moment, replacement.luxon);
+    }
+    // Replace numeric placeholders with actual Luxon tokens
+    const placeholderMap = {
+        "@@1@@": "yyyy", // YYYY
+        "@@2@@": "MMMM", // MMMM
+        "@@3@@": "cccc", // dddd
+        "@@4@@": "ooo", // DDDD
+        "@@5@@": "MMM", // MMM
+        "@@6@@": "ccc", // ddd
+        "@@7@@": "o", // DDD
+        "@@8@@": "SSS", // SSS
+        "@@9@@": "ZZZZ", // ZZZ
+        "@@10@@": "Do", // Do
+        "@@11@@": "dd", // DD (day of month)
+        "@@12@@": "cc", // dd (weekday)
+        "@@13@@": "MM", // MM
+        "@@14@@": "yy", // YY
+        "@@15@@": "HH", // HH
+        "@@16@@": "hh", // hh
+        "@@17@@": "mm", // mm
+        "@@18@@": "ss", // ss
+        "@@19@@": "SS", // SS
+        "@@20@@": "WW", // ww
+        "@@21@@": "ZZZ", // ZZ
+        "@@22@@": "d", // D (day of month)
+        "@@23@@": "c", // d (weekday)
+        "@@24@@": "M", // M
+        "@@25@@": "H", // H
+        "@@26@@": "h", // h
+        "@@27@@": "m", // m
+        "@@28@@": "s", // s
+        "@@29@@": "S", // S
+        "@@30@@": "a", // A
+        "@@31@@": "a", // a
+        "@@32@@": "ZZ", // Z
+        "@@33@@": "q", // Q
+        "@@34@@": "W", // w
+        "@@35@@": "X", // X
+        "@@36@@": "x", // x
+    };
+    // Replace all placeholders
+    for (const [placeholder, luxonToken] of Object.entries(placeholderMap)) {
+        result = result.replace(new RegExp(escapeRegex(placeholder), "g"), luxonToken);
+    }
+    // Restore escaped characters (Luxon uses single quotes for literals)
+    escapedChars.forEach((content, index) => {
+        const placeholder = `###ESC${index}###`;
+        result = result.replace(placeholder, `'${content}'`);
+    });
+    return result;
+}
+//# sourceMappingURL=normalizeLegacyFormat.js.map

package/lib/normalizeLegacyFormat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeLegacyFormat.js","sourceRoot":"","sources":["../src/normalizeLegacyFormat.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -4,7 +4,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.61.2",
+  "version": "1.61.3",
   "description": "Time for 📣 stentor",
   "types": "lib/index",
   "main": "lib/index",
@@ -16,6 +16,7 @@
   },
   "devDependencies": {
     "@types/chai": "4.3.20",
+    "@types/luxon": "3.0.0",
     "@types/mocha": "10.0.10",
     "@types/sinon": "17.0.4",
     "@xapp/config": "0.2.3",
@@ -27,12 +28,10 @@
     "typescript": "5.9.2"
   },
   "dependencies": {
-    "moment": "2.30.1",
-    "moment-range": "4.0.2",
-    "moment-timezone": "0.5.48",
+    "luxon": "3.4.0",
     "stentor-guards": "1.61.2",
-    "stentor-logger": "1.61.2",
-    "stentor-utils": "1.61.2"
+    "stentor-logger": "1.61.3",
+    "stentor-utils": "1.61.3"
   },
   "peerDependencies": {
     "stentor-models": "1.x"
@@ -42,5 +41,5 @@
     "clean": "rm -rf ./lib/*",
     "test": "mocha --recursive -r ts-node/register \"./src/**/*.test.ts\""
   },
-  "gitHead": "591ba842caec4185be8aa31a4553260cd0e4bbb7"
+  "gitHead": "905a49091228ace13cc4e23082f90ac83d53c9fd"
 }