@happychef/algorithm 1.2.24 → 1.2.26

package/getAvailableTimeblocks.js

@@ -3,6 +3,42 @@
 const { timeblocksAvailable } = require('./processing/timeblocksAvailable');
 const { parseTime, getMealTypeByTime } = require('./tableHelpers');
 
+/**
+ * Gets the current date/time components in the specified timezone.
+ * Uses Intl.DateTimeFormat for reliable cross-browser timezone conversion.
+ * @param {Date} date - The date to convert.
+ * @param {string} timeZone - The IANA timezone identifier.
+ * @returns {Object} Object with year, month, day, hour, minute, second components.
+ */
+function getDatePartsInTimeZone(date, timeZone) {
+  const formatter = new Intl.DateTimeFormat('en-US', {
+    timeZone,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hourCycle: 'h23', // Use 'h23' instead of hour12:false for consistent 0-23 range
+  });
+  const parts = formatter.formatToParts(date);
+  const values = {};
+  for (const part of parts) {
+    values[part.type] = part.value;
+  }
+  // Handle edge case: Chrome may return "24" for midnight with some hourCycle settings
+  let hour = parseInt(values.hour, 10);
+  if (hour === 24) hour = 0;
+  return {
+    year: parseInt(values.year, 10),
+    month: parseInt(values.month, 10),
+    day: parseInt(values.day, 10),
+    hour: hour,
+    minute: parseInt(values.minute, 10),
+    second: parseInt(values.second, 10),
+  };
+}
+
 /**
  * Parses a time string in "HH:MM" format into a Date object on a specific date.
  * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
@@ -54,10 +90,13 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
   // Time zone for CEST/CET (Europe/Amsterdam)
   const timeZone = 'Europe/Amsterdam';
 
-  // Current date/time in local timezone (system time)
-  // Note: We assume the server is running in the correct timezone
+  // Get current time in target timezone using reliable cross-browser method
   const now = new Date();
-  const currentTimeInTimeZone = now;
+  const nowParts = getDatePartsInTimeZone(now, timeZone);
+  const currentTimeInTimeZone = new Date(
+    nowParts.year, nowParts.month - 1, nowParts.day,
+    nowParts.hour, nowParts.minute, nowParts.second
+  );
 
   // Calculate the maximum allowed date
   const maxAllowedDate = new Date(currentTimeInTimeZone.getTime());
@@ -75,8 +114,9 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
   }
 
   // Check if the target date is today in the specified time zone
+  // Compare year, month, day components to determine if it's today
   const isToday =
-    currentTimeInTimeZone.toDateString() === targetDateInTimeZone.toDateString();
+    nowParts.year === year && nowParts.month === month && nowParts.day === day;
 
   // Get available time blocks or shifts
   const availableTimeblocks = timeblocksAvailable(data, dateStr, reservations, guests, blockedSlots, giftcard, isAdmin, duration);
@@ -115,11 +155,14 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
         timeZone: 'Europe/Brussels',
         hour: '2-digit',
         minute: '2-digit',
-        hour12: false,
+        hourCycle: 'h23', // Use 'h23' for consistent 0-23 hour range across browsers
       });
       const parts = formatter.formatToParts(now);
       const timeParts = Object.fromEntries(parts.map(p => [p.type, p.value]));
-      const currentTimeMinutes = parseInt(timeParts.hour, 10) * 60 + parseInt(timeParts.minute, 10);
+      // Handle edge case: some browsers may return "24" for midnight
+      let hourValue = parseInt(timeParts.hour, 10);
+      if (hourValue === 24) hourValue = 0;
+      const currentTimeMinutes = hourValue * 60 + parseInt(timeParts.minute, 10);
 
       // Check if current time has passed any stop times
       const breakfastStopMinutes = breakfastStop ? parseTime(breakfastStop) : null;

package/isDateAvailable.js

@@ -12,6 +12,42 @@ function parseTime(timeStr) {
   return hours * 60 + minutes;
 }
 
+/**
+ * Gets the current date/time components in the specified timezone.
+ * Uses Intl.DateTimeFormat for reliable cross-browser timezone conversion.
+ * @param {Date} date - The date to convert.
+ * @param {string} timeZone - The IANA timezone identifier.
+ * @returns {Object} Object with year, month, day, hour, minute, second components.
+ */
+function getDatePartsInTimeZone(date, timeZone) {
+  const formatter = new Intl.DateTimeFormat('en-US', {
+    timeZone,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hourCycle: 'h23', // Use 'h23' instead of hour12:false for consistent 0-23 range
+  });
+  const parts = formatter.formatToParts(date);
+  const values = {};
+  for (const part of parts) {
+    values[part.type] = part.value;
+  }
+  // Handle edge case: Chrome may return "24" for midnight with some hourCycle settings
+  let hour = parseInt(values.hour, 10);
+  if (hour === 24) hour = 0;
+  return {
+    year: parseInt(values.year, 10),
+    month: parseInt(values.month, 10),
+    day: parseInt(values.day, 10),
+    hour: hour,
+    minute: parseInt(values.minute, 10),
+    second: parseInt(values.second, 10),
+  };
+}
+
 /**
  * Checks if a date is within the allowed future range defined by dagenInToekomst.
  * @param {Object} data - The main data object (to access general settings).
@@ -31,20 +67,21 @@ function isDateWithinAllowedRange(data, dateStr) {
 
   const timeZone = 'Europe/Amsterdam';
 
+  // Get current time in the target timezone using reliable cross-browser method
   const now = new Date();
+  const nowParts = getDatePartsInTimeZone(now, timeZone);
   const currentTimeInTimeZone = new Date(
-    now.toLocaleString('en-US', { timeZone: timeZone })
+    nowParts.year, nowParts.month - 1, nowParts.day,
+    nowParts.hour, nowParts.minute, nowParts.second
   );
 
   const maxAllowedDate = new Date(currentTimeInTimeZone.getTime());
   maxAllowedDate.setDate(maxAllowedDate.getDate() + dagenInToekomst);
   maxAllowedDate.setHours(23, 59, 59, 999);
 
+  // Parse target date - already in local date format, no timezone conversion needed
   const [year, month, day] = dateStr.split('-').map(Number);
-  const targetDate = new Date(Date.UTC(year, month - 1, day));
-  const targetDateInTimeZone = new Date(
-    targetDate.toLocaleString('en-US', { timeZone: timeZone })
-  );
+  const targetDateInTimeZone = new Date(year, month - 1, day);
 
   return targetDateInTimeZone <= maxAllowedDate;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happychef/algorithm",
-  "version": "1.2.24",
+  "version": "1.2.26",
   "description": "Restaurant and reservation algorithm utilities",
   "main": "index.js",
   "scripts": {