busroot-sdk 0.0.8-dev.2920350130 → 0.0.8-dev.2920950808

package/build/index.js

@@ -38,6 +38,7 @@ var require_time = __commonJS({
     exports2.Crons = exports2.TimeIntervals = exports2.TimeRange = void 0;
     exports2.getTimeIntervalFromString = getTimeIntervalFromString;
     exports2.getTimeIntervalKeyFromMs = getTimeIntervalKeyFromMs;
+    exports2.nominalDurationMs = nominalDurationMs;
     exports2.millisToSec = millisToSec;
     var zod_1 = require("zod");
     exports2.TimeRange = zod_1.z.object({
@@ -95,6 +96,15 @@ var require_time = __commonJS({
       }
       return void 0;
     }
+    var MAX_CLOCK_CHANGE_MS = exports2.TimeIntervals["1h"].ms;
+    function nominalDurationMs(durationMs) {
+      const dayMs = exports2.TimeIntervals["1d"].ms;
+      const wholeDays = Math.round(durationMs / dayMs);
+      if (wholeDays >= 1 && Math.abs(durationMs - wholeDays * dayMs) <= MAX_CLOCK_CHANGE_MS) {
+        return wholeDays * dayMs;
+      }
+      return durationMs;
+    }
     function millisToSec(millis) {
       return millis / 1e3;
     }
@@ -554,6 +564,7 @@ var require_times = __commonJS({
     exports2.fromSpecificHourString = fromSpecificHourString;
     exports2.plantWeekNumber = plantWeekNumber;
     exports2.plantWeekStart = plantWeekStart;
+    exports2.addPlantDays = addPlantDays;
     exports2.getTimeRangeFromRangeCode = getTimeRangeFromRangeCode;
     exports2.getCoverage = getCoverage;
     exports2.getWindowAtTime = getWindowAtTime;
@@ -568,6 +579,7 @@ var require_times = __commonJS({
     exports2.getDayRangeCode = getDayRangeCode;
     exports2.getCurrentWeekRangeCode = getCurrentWeekRangeCode;
     exports2.generateTimeWindows = generateTimeWindows;
+    exports2.generatePlantDayWindows = generatePlantDayWindows;
     exports2.BusrootDateTimeParse = BusrootDateTimeParse;
     exports2.decimalHoursToTime = decimalHoursToTime;
     var moment_timezone_1 = __importStar(require("moment-timezone"));
@@ -744,7 +756,8 @@ var require_times = __commonJS({
       }
     ];
     function getAllowedAggregationWindowsForDuration(durationMs) {
-      const allowedAggregationWindows = AllowedAggregationWindows.find((a) => durationMs <= a.durationMs)?.allowedAggregationWindows;
+      const nominalMs = (0, time_1.nominalDurationMs)(durationMs);
+      const allowedAggregationWindows = AllowedAggregationWindows.find((a) => nominalMs <= a.durationMs)?.allowedAggregationWindows;
       return allowedAggregationWindows;
     }
     function getTimestampFromString(timeString) {
@@ -978,6 +991,15 @@ var require_times = __commonJS({
       }
       return start;
     }
+    var DAYS_PER_WEEK = 7;
+    function plantDayRange(date, days, dayStartHour) {
+      const from = date.clone().add(dayStartHour, "hour").valueOf();
+      const to = date.clone().add(days, "days").add(dayStartHour, "hour").valueOf();
+      return timestampsToTimeRange({ from, to });
+    }
+    function addPlantDays(instant, days, timezone) {
+      return (0, moment_timezone_1.default)(instant).tz(timezone).add(days, "days").valueOf();
+    }
     function floorToPlantWeekStart(instant, plant) {
       const weekStartDay = plant.weekStartDay ?? 0;
       return (0, moment_timezone_1.default)(instant).tz(plant.timezone).subtract(weekStartDay, "days").subtract(plant.dayStartHour, "hours").startOf("isoWeek").add(weekStartDay, "days").add(plant.dayStartHour, "hours").valueOf();
@@ -1037,36 +1059,33 @@ var require_times = __commonJS({
           day.utc();
           return timestampsToTimeRange({ from: day.valueOf(), to: day.add(1, "hours").valueOf() });
         },
+        // Every range below ends where the next one of its kind starts, built on the plant's local calendar
+        // (add whole days/months, then dayStartHour) and only then read as UTC. Adding a fixed n×24h instead
+        // would make a range that contains a daylight-saving change an hour too long or short, leaving gaps
+        // and overlaps between consecutive ranges.
+        //
         // TODAY/YESTERDAY: subtract dayStartHour before startOf("day") to find the
         // correct production day boundary, then re-add it. This handles the case where
         // e.g. it's 02:00 but the production day started at 06:00 the previous calendar day.
         today: () => {
-          const day = (0, moment_timezone_1.default)(now).tz(plant.timezone).add(-plant.dayStartHour, "hour").startOf("day").add(plant.dayStartHour, "hour");
-          day.utc();
-          return timestampsToTimeRange({ from: day.valueOf(), to: day.add(24, "hours").valueOf() });
+          const date = (0, moment_timezone_1.default)(now).tz(plant.timezone).add(-plant.dayStartHour, "hour").startOf("day");
+          return plantDayRange(date, 1, plant.dayStartHour);
         },
         yesterday: () => {
-          const day = (0, moment_timezone_1.default)(now).tz(plant.timezone).add(-plant.dayStartHour, "hour").startOf("day").add(-1, "day").add(plant.dayStartHour, "hour");
-          day.utc();
-          return timestampsToTimeRange({ from: day.valueOf(), to: day.add(24, "hours").valueOf() });
+          const date = (0, moment_timezone_1.default)(now).tz(plant.timezone).add(-plant.dayStartHour, "hour").startOf("day").add(-1, "day");
+          return plantDayRange(date, 1, plant.dayStartHour);
         },
         day: () => {
-          const day = moment_timezone_1.default.tz(`${parseInt(parts[1])}_${parseInt(parts[2])}_${parseInt(parts[3])}`, "YYYY_MM_DD", plant.timezone);
-          day.add(plant.dayStartHour, "hour");
-          day.utc();
-          return timestampsToTimeRange({ from: day.valueOf(), to: day.add(24, "hours").valueOf() });
+          const date = moment_timezone_1.default.tz(`${parseInt(parts[1])}_${parseInt(parts[2])}_${parseInt(parts[3])}`, "YYYY_MM_DD", plant.timezone);
+          return plantDayRange(date, 1, plant.dayStartHour);
         },
         week: () => {
           const week = plantWeekStart(parseInt(parts[1]), parseInt(parts[2]), plant.weekStartDay ?? 0, plant.timezone);
-          week.add(plant.dayStartHour, "hour");
-          week.utc();
-          return timestampsToTimeRange({ from: week.valueOf(), to: week.add(24 * 7, "hours").valueOf() });
+          return plantDayRange(week, DAYS_PER_WEEK, plant.dayStartHour);
         },
         month: () => {
           const month = moment_timezone_1.default.tz(`${parseInt(parts[1])}_${parseInt(parts[2])}}`, "YYYY_MM", plant.timezone).startOf("month");
-          month.add(plant.dayStartHour, "hour");
-          month.utc();
-          return timestampsToTimeRange({ from: month.valueOf(), to: month.add(month.daysInMonth() * 24, "hours").valueOf() });
+          return plantDayRange(month, month.daysInMonth(), plant.dayStartHour);
         },
         // QUARTER: 13 ISO weeks (14 for Q4 in 53-week years). Start at the first ISO week of the quarter,
         // then apply the plant's weekStartDay and dayStartHour offsets exactly like the week handler.
@@ -1076,18 +1095,14 @@ var require_times = __commonJS({
           const weeks = getWeeksInQuarter(year, quarter);
           const firstWeek = weeks[0];
           const start = plantWeekStart(year, firstWeek, plant.weekStartDay ?? 0, plant.timezone);
-          start.add(plant.dayStartHour, "hour");
-          start.utc();
-          return timestampsToTimeRange({ from: start.valueOf(), to: start.add(weeks.length * 7 * 24, "hours").valueOf() });
+          return plantDayRange(start, weeks.length * DAYS_PER_WEEK, plant.dayStartHour);
         },
         // YEAR: full ISO week year (52 or 53 weeks). Start at ISO week 1, apply plant offsets like the week handler.
         year: () => {
           const year = parseInt(parts[1]);
           const weeksInYear = isoWeeksInIsoWeekYear(year);
           const start = plantWeekStart(year, 1, plant.weekStartDay ?? 0, plant.timezone);
-          start.add(plant.dayStartHour, "hour");
-          start.utc();
-          return timestampsToTimeRange({ from: start.valueOf(), to: start.add(weeksInYear * 7 * 24, "hours").valueOf() });
+          return plantDayRange(start, weeksInYear * DAYS_PER_WEEK, plant.dayStartHour);
         },
         custom: () => timestampsToTimeRange({ from: 0, to: 0 }),
         // Already handled above
@@ -1383,6 +1398,25 @@ var require_times = __commonJS({
         endAt: (0, moment_timezone_1.default)(endAtTimestamp).toISOString()
       };
     }
+    function generatePlantDayWindows(startAt, days, until, timezone) {
+      const windows = [];
+      let endAtTimestamp = 0;
+      for (let i = 0; ; i++) {
+        const windowStartAtTimestamp = addPlantDays(startAt, days * i, timezone);
+        const windowEndAtTimestamp = addPlantDays(startAt, days * (i + 1), timezone);
+        if (windowEndAtTimestamp > until) {
+          break;
+        }
+        endAtTimestamp = windowEndAtTimestamp;
+        windows.push({
+          windowStartAtTimestamp,
+          windowEndAtTimestamp,
+          windowStartAt: (0, moment_timezone_1.default)(windowStartAtTimestamp).toISOString(),
+          windowEndAt: (0, moment_timezone_1.default)(windowEndAtTimestamp).toISOString()
+        });
+      }
+      return { windows, endAtTimestamp };
+    }
     function BusrootDateTimeParse(obj, now = moment_timezone_1.default.utc().valueOf()) {
       const fields = ["plannedStartAt", "plannedEndAt", "actualStartAt", "actualEndAt"];
       for (const field of fields) {
@@ -9907,11 +9941,11 @@ var require_station_windows = __commonJS({
       if (windows.length === 0) {
         throw new Error("Must be at least 1 window.");
       }
-      const windowDuration = windows[0].totalMs;
+      const windowDuration = (0, time_1.nominalDurationMs)(windows[0].totalMs);
       const window2 = windows.reduce((a, b, i) => {
         const isFirstWindow = i === 0;
         const isConsecutive = a.windowEndAt === b.windowStartAt;
-        const isSameDuration = b.totalMs === windowDuration;
+        const isSameDuration = (0, time_1.nominalDurationMs)(b.totalMs) === windowDuration;
         if (!isFirstWindow && !skipConsecutiveCheck) {
           if (!isConsecutive) {
             throw new Error("Windows are not consecutive.");
@@ -10190,7 +10224,7 @@ var require_station_windows = __commonJS({
       const batch = [];
       for (let i = 0; i < windows.length; i++) {
         const thisWindow = windows[i];
-        const thisWindowDuration = thisWindow.windowEndAtTimestamp - thisWindow.windowStartAtTimestamp;
+        const thisWindowDuration = (0, time_1.nominalDurationMs)(thisWindow.windowEndAtTimestamp - thisWindow.windowStartAtTimestamp);
         if (thisWindowDuration > aggregateWindowInMs) {
           throw new Error("Windows being aggregated must be less than or equal to the aggregate window. " + windows[i].totalMs + " " + aggregateWindowInMinutes);
         }
@@ -10202,7 +10236,7 @@ var require_station_windows = __commonJS({
           }
         }
         batch.push(windows[i]);
-        const durationOfBatch = batch.reduce((a, b) => a + b.totalMs, 0);
+        const durationOfBatch = batch.reduce((a, b) => a + (0, time_1.nominalDurationMs)(b.totalMs), 0);
         if (durationOfBatch >= aggregateWindowInMs) {
           aggregatedWindows.push(combineStationWindows(batch, inShiftAverages));
           batch.length = 0;
@@ -10213,8 +10247,8 @@ var require_station_windows = __commonJS({
         const lastAggregatedWindowEndAtTimestamp = aggregatedWindows[aggregatedWindows.length - 1]?.windowEndAtTimestamp;
         const lastWindowEndAtTimestamp = lastAggregatedWindowEndAtTimestamp ?? windows[windows.length - 1].windowEndAtTimestamp;
         const futureWindowsStartAt = lastAggregatedWindowEndAtTimestamp == null && aggregateWindowInMinutes < time_1.TimeIntervals["1h"].min ? lastWindowEndAtTimestamp - lastWindowEndAtTimestamp % windowDurationMs : lastWindowEndAtTimestamp;
-        const requiredFutureWindowsCount = Math.floor((includeFutureWindowsUntil - futureWindowsStartAt) / windowDurationMs);
-        const { windows: futureTimeWindows, endAtTimestamp } = (0, times_1.generateTimeWindows)(futureWindowsStartAt, windowDurationMs, requiredFutureWindowsCount, void 0, false);
+        const windowDays = windowDurationMs / time_1.TimeIntervals["1d"].ms;
+        const { windows: futureTimeWindows, endAtTimestamp } = Number.isInteger(windowDays) ? (0, times_1.generatePlantDayWindows)(futureWindowsStartAt, windowDays, includeFutureWindowsUntil, station.timezone) : (0, times_1.generateTimeWindows)(futureWindowsStartAt, windowDurationMs, Math.floor((includeFutureWindowsUntil - futureWindowsStartAt) / windowDurationMs), void 0, false);
         const futureWindows = futureTimeWindows.map((x) => {
           const isInShift = shiftUtils.isTimeInShifts({
             time: x.windowStartAtTimestamp,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "busroot-sdk",
-  "version": "0.0.8-dev.2920350130",
+  "version": "0.0.8-dev.2920950808",
   "description": "An SDK for accessing Busroot from output.industries",
   "homepage": "https://www.output.industries",
   "main": "./build/index.js",