External/fredy
1
0
Fork 0
mirror of https://github.com/orangecoding/fredy.git synced 2026-06-16 12:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check Telegram response (#205) (#211)

Browse Source 
* Add error handling and logging to Telegram message sending

* Add debug logging for new listings
This commit is contained in:
Thomas Brockmöller
2025-10-05 17:06:57 +02:00
committed by GitHub
parent a5efd9af32
commit 035f0e9f83
2 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/FredyRuntime.js
View File

@@ -77,6 +77,7 @@ class FredyRuntime {
} }
_findNew(listings) { _findNew(listings) {
logger.debug(`Checking ${listings.length} listings for new entries (Provider: '${this._providerId}')`);
const hashes = getKnownListingHashesForJobAndProvider(this._jobKey, this._providerId) || []; const hashes = getKnownListingHashesForJobAndProvider(this._jobKey, this._providerId) || [];
const newListings = listings.filter((o) => !hashes.includes(o.id)); const newListings = listings.filter((o) => !hashes.includes(o.id));
@@ -95,6 +96,7 @@ class FredyRuntime {
} }
_save(newListings) { _save(newListings) {
logger.debug(`Storing ${newListings.length} new listings (Provider: '${this._providerId}')`);
storeListings(this._jobKey, this._providerId, newListings); storeListings(this._jobKey, this._providerId, newListings);
return newListings; return newListings;
} }
@@ -103,7 +105,9 @@ class FredyRuntime {
const filteredList = listings.filter((listing) => { const filteredList = listings.filter((listing) => {
const similar = this._similarityCache.hasSimilarEntries(listing.title, listing.address); const similar = this._similarityCache.hasSimilarEntries(listing.title, listing.address);
if (similar) { if (similar) {
logger.debug(`Filtering similar entry for title: ${listing.title} and address ${listing.address}`); logger.debug(
`Filtering similar entry for title '${listing.title}' and address '${listing.address}' (Provider: '${this._providerId}')`,
);
} }
return !similar; return !similar;
}); });
@@ -112,7 +116,11 @@ class FredyRuntime {
} }
_handleError(err) { _handleError(err) {
if (err.name !== 'NoNewListingsWarning') logger.error(err); if (err.name === 'NoNewListingsWarning') {
logger.debug(`No new listings found (Provider: '${this._providerId}').`);
} else {
logger.error(err);
}
} }
} }

34
lib/notification/adapter/telegram.js
View File

@@ -3,6 +3,7 @@ import { getJob } from '../../services/storage/jobStorage.js';
import fetch from 'node-fetch'; import fetch from 'node-fetch';
import pThrottle from 'p-throttle'; import pThrottle from 'p-throttle';
import { normalizeImageUrl } from '../../utils.js'; import { normalizeImageUrl } from '../../utils.js';
import logger from '../../services/logger.js';
const RATE_LIMIT_INTERVAL = 1000; const RATE_LIMIT_INTERVAL = 1000;
const chatThrottleMap = new Map(); const chatThrottleMap = new Map();
@@ -68,6 +69,11 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
body: JSON.stringify(body), body: JSON.stringify(body),
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
}); });
if (!res.ok) {
const errorBody = await res.text();
throw new Error(`API error for '${jobName}'. '${endpoint}' returned ${errorBody}`);
}
return res; return res;
}); });
@@ -81,23 +87,23 @@ export const send = ({ serviceName, newListings, notificationConfig, jobKey }) =
}; };
if (!img) { if (!img) {
return throttledCall('sendMessage', textPayload); return await throttledCall('sendMessage', textPayload).catch(async (e) => {
logger.error(`Error sending message to Telegram: ${e.message}`);
});
} }
try { return await throttledCall('sendPhoto', {
return await throttledCall('sendPhoto', { chat_id: chatId,
chat_id: chatId, photo: img,
photo: img, caption: buildCaption(jobName, serviceName, o),
caption: buildCaption(jobName, serviceName, o), parse_mode: 'HTML',
parse_mode: 'HTML', }).catch(async (e) => {
logger.error(`Error sending photo to Telegram and use a fallback: ${e.message}`);
return await throttledCall('sendMessage', textPayload).catch((e) => {
logger.error(`Error sending message to Telegram: ${e.message}`);
throw e;
}); });
} catch (e) { });
// If we see a timeout due to sending an image, try sending it without
if (e && (e.code === 'ETIMEDOUT' || e.errno === 'ETIMEDOUT')) {
return throttledCall('sendMessage', textPayload);
}
throw e;
}
}); });
return Promise.all(promises); return Promise.all(promises);