tripstorekrabi-shared 1.25.6 → 1.25.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.25.6",
+  "version": "1.25.7",
   "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.12",
     "nanoid": "^6.0.1",
-    "firebase-admin": "^14.2.0"
+    "firebase-admin": "^14.3.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;
 }