tripstorekrabi-shared 1.25.6 → 1.25.8

package/availability.js

@@ -13,14 +13,15 @@ dayjs.extend(isSameOrAfter);
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
-const WEEKDAYS = new Array(7);
-WEEKDAYS[0] = "Sunday";
-WEEKDAYS[1] = "Monday";
-WEEKDAYS[2] = "Tuesday";
-WEEKDAYS[3] = "Wednesday";
-WEEKDAYS[4] = "Thursday";
-WEEKDAYS[5] = "Friday";
-WEEKDAYS[6] = "Saturday";
+const WEEKDAYS = [
+  "Sunday",
+  "Monday",
+  "Tuesday",
+  "Wednesday",
+  "Thursday",
+  "Friday",
+  "Saturday"
+];
 
 export const INACTIVE = "inactive";
 export const SINGLE_DATES = "singleDates";
@@ -28,9 +29,9 @@ export const BLOCKOUT = "blockout";
 export const SCHEDULE_MODES = [INACTIVE, SINGLE_DATES, BLOCKOUT];
 
 export function isAvailable(availability, date, schedule, options = {}) {
-  let available = availability.available;
+  let available = Boolean(availability?.available);
 
-  if (available && options.viatorApi === true && (!availability.br?.connectedToApi || !availability.br?.available)) {
+  if (available && options.viatorApi === true && (availability.viatorConnections ?? []).length === 0) {
     return false;
   }
 
@@ -40,7 +41,7 @@ export function isAvailable(availability, date, schedule, options = {}) {
 
   if (available) {
     if (schedule) {
-      let scheduleObject = findSchedule(availability, schedule);
+      const scheduleObject = findSchedule(availability, schedule);
       if (scheduleObject) {
         available = checkAvailability(date, scheduleObject);
       } else {
@@ -48,33 +49,33 @@ export function isAvailable(availability, date, schedule, options = {}) {
       }
     } else if (availability.schedules) {
       available = Object.values(availability.schedules).every(
-        (schedule) => checkAvailability(date, schedule)
+        (sched) => checkAvailability(date, sched)
       );
     } else if (availability.openingHours) {
       available = Object.values(availability.openingHours).every(
-        (schedule) => checkAvailability(date, schedule)
+        (sched) => checkAvailability(date, sched)
       );
     }
   }
 
   if (available) {
-    date = dayjs(date, "DD.MM.YYYY");
-    let today = dayjs().startOf('day');
-    available = date.isSameOrAfter(today);
+    const checkDate = dayjs(date, "DD.MM.YYYY");
+    const today = dayjs().startOf('day');
+    available = checkDate.isSameOrAfter(today);
   }
 
   return available;
 }
 
 function checkAvailability(date, schedule) {
-  let mode = schedule.mode;
+  const mode = schedule?.mode;
 
   switch (mode) {
     case INACTIVE: {
       return false;
     }
     case SINGLE_DATES: {
-      return schedule.singleDates.includes(date);
+      return Array.isArray(schedule.singleDates) && schedule.singleDates.includes(date);
     }
     case BLOCKOUT: {
       let available = true;
@@ -83,17 +84,17 @@ function checkAvailability(date, schedule) {
         available = !schedule.blockoutDates.includes(date);
       }
       if (available && schedule.blockoutPeriods) {
-        let day = dayjs(date, "DD.MM.YYYY");
-        let year = day.year();
+        const day = dayjs(date, "DD.MM.YYYY");
+        const year = day.year();
         available = !schedule.blockoutPeriods.some((period) => {
-          let start = dayjs(`${period.start}.${year}`, "DD.MM.YYYY");
-          let end = dayjs(`${period.end}.${year}`, "DD.MM.YYYY");
+          const start = dayjs(`${period.start}.${year}`, "DD.MM.YYYY");
+          const end = dayjs(`${period.end}.${year}`, "DD.MM.YYYY");
           return day.isBetween(start, end, 'day', '[]');
         });
       }
 
       if (available && schedule.weekDays) {
-        let weekDay = WEEKDAYS[dayjs(date, "DD.MM.YYYY").day()];
+        const weekDay = WEEKDAYS[dayjs(date, "DD.MM.YYYY").day()];
         available = schedule.weekDays.includes(weekDay);
       }
 
@@ -106,9 +107,9 @@ function checkAvailability(date, schedule) {
 }
 
 export function getSchedules(availability) {
-  if (availability.schedules) {
+  if (availability?.schedules) {
     return Object.keys(availability.schedules).sort();
-  } else if (availability.openingHours) {
+  } else if (availability?.openingHours) {
     return Object.keys(availability.openingHours).sort();
   } else {
     return [];
@@ -116,64 +117,68 @@ export function getSchedules(availability) {
 }
 
 export function findSchedule(availability, schedule) {
-  if (availability.schedules) {
-    return availability.schedules[schedule] ?? Object.entries(availability.schedules)[0];
-  } else if (availability.openingHours) {
-    return availability.openingHours[schedule] ?? Object.entries(availability.openingHours)[0];
+  if (availability?.schedules) {
+    return availability.schedules[schedule] ?? Object.entries(availability.schedules)[0]?.[1];
+  } else if (availability?.openingHours) {
+    return availability.openingHours[schedule] ?? Object.entries(availability.openingHours)[0]?.[1];
   }
 }
 
 export function getAvailabilityLabel(availability, schedule) {
-  if (!availability.available) {
+  if (!availability?.available) {
     return "Not available";
-  } else {
-    let scheduleObject = findSchedule(availability, schedule);
-
-    if (scheduleObject.mode === INACTIVE) {
-      return "Not available";
-    } else if (scheduleObject.mode === SINGLE_DATES) {
-      return "Available on selected dates";
-    } else if (scheduleObject.mode === BLOCKOUT) {
-      if (scheduleObject.blockoutPeriods && scheduleObject.blockoutPeriods.length > 0) {
-        let starts = [];
-        let ends = [];
-        let startPeriod = scheduleObject.blockoutPeriods[0];
-        let year = dayjs().year();
-        scheduleObject.blockoutPeriods.forEach((period, i) => {
-          starts.push(dayjs(`${period.end}.${year}`, "DD.MM.YYYY").add(1, 'day'));
-          if (i + 1 < scheduleObject.blockoutPeriods.length) {
-            ends.push(dayjs(`${scheduleObject.blockoutPeriods[i + 1].start}.${year}`, "DD.MM.YYYY").subtract(1, 'day'));
-          }
-        });
-        ends.push(dayjs(`${startPeriod.start}.${year + 1}`, "DD.MM.YYYY").subtract(1, 'day'));
+  }
 
-        let availability = [];
-        starts.forEach((start, i) => {
-          if (ends[i].diff(start, "month") > 1) {
-            availability.push(start.format("MMM") + " - " + ends[i].format("MMM"));
-          }
-        });
+  const scheduleObject = findSchedule(availability, schedule);
 
-        return availability.join(", ");
-      } else if (scheduleObject.weekDays) {
-        return scheduleObject.weekDays.map((item) => item.substring(0, 3)).join(", ");
-      } else {
-        return "Daily";
-      }
+  if (!scheduleObject || scheduleObject.mode === INACTIVE) {
+    return "Not available";
+  } else if (scheduleObject.mode === SINGLE_DATES) {
+    return "Available on selected dates";
+  } else if (scheduleObject.mode === BLOCKOUT) {
+    if (scheduleObject.blockoutPeriods && scheduleObject.blockoutPeriods.length > 0) {
+      const starts = [];
+      const ends = [];
+      const startPeriod = scheduleObject.blockoutPeriods[0];
+      const year = dayjs().year();
+
+      scheduleObject.blockoutPeriods.forEach((period, i) => {
+        starts.push(dayjs(`${period.end}.${year}`, "DD.MM.YYYY").add(1, 'day'));
+        if (i + 1 < scheduleObject.blockoutPeriods.length) {
+          ends.push(dayjs(`${scheduleObject.blockoutPeriods[i + 1].start}.${year}`, "DD.MM.YYYY").subtract(1, 'day'));
+        }
+      });
+      ends.push(dayjs(`${startPeriod.start}.${year + 1}`, "DD.MM.YYYY").subtract(1, 'day'));
+
+      const availabilityLabels = [];
+      starts.forEach((start, i) => {
+        if (ends[i].diff(start, "month") > 1) {
+          availabilityLabels.push(start.format("MMM") + " - " + ends[i].format("MMM"));
+        }
+      });
+
+      return availabilityLabels.join(", ");
+    } else if (scheduleObject.weekDays) {
+      return scheduleObject.weekDays.map((item) => item.substring(0, 3)).join(", ");
+    } else {
+      return "Daily";
     }
   }
+
+  return "Available";
 }
 
 export function isLastMinuteDate(dateValue, cutoffTime) {
-  let date = dayjs(dateValue, "DD.MM.YYYY").tz("Asia/Bangkok");
-  let now = dayjs().tz("Asia/Bangkok");
+  const date = dayjs(dateValue, "DD.MM.YYYY").tz("Asia/Bangkok");
+  const now = dayjs().tz("Asia/Bangkok");
 
   return now.add(cutoffTime, "hour").isSameOrAfter(date, "day");
 }
 
 export function isPastDate(dateValue, schedule) {
-  let date = dayjs(dateValue + " " + schedule, "DD.MM.YYYY HH:mm").tz("Asia/Bangkok");
-  let now = dayjs().tz("Asia/Bangkok");
+  const startTime = (schedule || "00:00").split(" - ")[0].slice(0, 5);
+  const date = dayjs(`${dateValue} ${startTime}`, "DD.MM.YYYY HH:mm").tz("Asia/Bangkok");
+  const now = dayjs().tz("Asia/Bangkok");
 
   return date.isSameOrBefore(now);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.25.6",
+  "version": "1.25.8",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {
@@ -17,10 +17,10 @@
     "./telegram": "./telegram.js"
   },
   "dependencies": {
-    "dayjs": "^1.11.21",
-    "libphonenumber-js": "^1.13.10",
+    "dayjs": "^1.11.23",
+    "libphonenumber-js": "^1.13.14",
     "nanoid": "^6.0.1",
-    "firebase-admin": "^14.2.0"
+    "firebase-admin": "^14.5.0"
   },
   "scripts": {
     "deploy": "npm publish"

package/telegram.js

@@ -1,5 +1,7 @@
-const ENV_BOT_TOKEN = process.env.TELEGRAM_API_TOKEN;
-const ENV_CHAT_ID = process.env.TELEGRAM_CHAT_ID;
+const getEnv = (key) => typeof process !== 'undefined' && process.env ? process.env[key] : undefined;
+
+const ENV_BOT_TOKEN = getEnv('TELEGRAM_API_TOKEN') || getEnv('PUBLIC_TELEGRAM_API_TOKEN');
+const ENV_CHAT_ID = getEnv('TELEGRAM_CHAT_ID');
 const TELEGRAM_MAX_CHARS = 4096;
 
 export async function sendTelegramMessage(message, options = {}) {
@@ -8,14 +10,18 @@ export async function sendTelegramMessage(message, options = {}) {
     chatId,
     parseMode = 'HTML',
     prefix = '',
-    truncate = true
+    truncate = true,
+    maxRetries = 3,
+    throwOnError = true
   } = options;
 
   const BOT_TOKEN = botToken || ENV_BOT_TOKEN;
   const CHAT_ID = chatId || ENV_CHAT_ID;
 
   if (!BOT_TOKEN || !CHAT_ID) {
-    console.error("FATAL: Telegram secrets are not configured in options or the environment.");
+    const errorMsg = "FATAL: Telegram secrets are not configured in options or the environment.";
+    console.error(errorMsg);
+    if (throwOnError) throw new Error(errorMsg);
     return false;
   }
 
@@ -28,33 +34,72 @@ export async function sendTelegramMessage(message, options = {}) {
     console.warn(`Message truncated from ${message.length} to ${TELEGRAM_MAX_CHARS} characters.`);
   }
 
-  try {
-    const telegramApiUrl = `https://api.telegram.org/bot${BOT_TOKEN}/sendMessage`;
-    const body = {
+  const telegramApiUrl = `https://api.telegram.org/bot${BOT_TOKEN}/sendMessage`;
+  const fetchOptions = {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({
       chat_id: CHAT_ID,
       text: finalMessage,
       parse_mode: parseMode.toUpperCase(),
-    };
-
-    const res = await fetch(telegramApiUrl, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify(body)
-    });
-
-    if (!res.ok) {
-      const errorBody = await res.text();
-      console.error(`Failed to send Telegram message: HTTP Status ${res.status} ${res.statusText}`);
-      console.error('Telegram API Detailed Error:', errorBody);
-      return false;
-    } else {
-      console.log('Telegram message sent successfully.');
-      return true;
+    })
+  };
+
+  for (let attempt = 0; attempt < maxRetries; attempt++) {
+    try {
+      const res = await fetch(telegramApiUrl, fetchOptions);
+
+      if (res.ok) {
+        return true;
+      }
+
+      const json = await res.json().catch(() => null);
+
+      if (res.status === 429 && json?.parameters?.retry_after) {
+        const retryAfterSeconds = json.parameters.retry_after;
+        const waitTimeMs = (retryAfterSeconds + 1) * 1000;
+
+        console.warn(`Telegram Rate Limit hit. Retrying after ${retryAfterSeconds}s...`);
+        await new Promise((resolve) => setTimeout(resolve, waitTimeMs));
+        continue;
+      }
+
+      let errorMessage = 'Telegram API request failed';
+      if (json?.description) {
+        errorMessage = json.description;
+      } else if (typeof json?.error === 'string') {
+        errorMessage = json.error;
+      } else if (json?.error?.message) {
+        errorMessage = json.error.message;
+      } else {
+        errorMessage = `HTTP ${res.status}: ${res.statusText || 'Unknown Error'}`;
+      }
+
+      throw new Error(`An error occurred while communicating with Telegram:\n${errorMessage}`);
+    } catch (err) {
+      const safeError = err instanceof Error ? err : new Error(String(err));
+      const msg = safeError.message || '';
+
+      if (msg.includes('communicating with Telegram') && !msg.includes('429')) {
+        if (throwOnError) throw safeError;
+        console.error(safeError);
+        return false;
+      }
+
+      if (attempt === maxRetries - 1) {
+        if (throwOnError) throw safeError;
+        console.error(safeError);
+        return false;
+      }
+
+      await new Promise((resolve) => setTimeout(resolve, 1000 * (attempt + 1)));
     }
-  } catch (e) {
-    console.error('An error occurred while trying to send a Telegram message:', e);
-    return false;
   }
+
+  const timeoutError = new Error('Telegram request failed: Exceeded maximum retries.');
+  if (throwOnError) throw timeoutError;
+  console.error(timeoutError);
+  return false;
 }