rajch_ales/MaalFlows
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add admin presence timing settings

Browse Source
This commit is contained in:
rajchales-monito
2026-07-30 13:20:02 +02:00
parent 0adcd8d37f
commit e80d1f5f9f
4 changed files with 114 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server.js
+40 -15
View File
@@ -24,8 +24,6 @@ const TELEGRAM_WEBHOOK_SECRET = process.env.TELEGRAM_WEBHOOK_SECRET || "";
const ALLOWED_IMAGE_TYPES = new Set(["image/jpeg", "image/png", "image/webp", "image/gif", "image/avif"]);
const ALLOWED_IMAGE_EXTENSIONS = new Set([".jpg", ".jpeg", ".png", ".webp", ".gif", ".avif"]);
const MAX_ATTACHMENT_BYTES = 3_000_000;
const ACTIVE_VISITOR_SECONDS = 90;
const PRESENT_VISITOR_SECONDS = 300;
const WIDGET_COPY_FIELDS = ["title", "intro", "offlineIntro", "placeholder", "sendLabel", "dropzoneLabel", "onlineLabel", "offlineLabel", "newReplyLabel", "typingLabel", "infoTitle", "infoText", "closeLabel", "operatorReplyLabel"];
const EUROPEAN_WIDGET_LANGUAGES = new Set([
"sq", "be", "bs", "bg", "ca", "hr", "cs", "da", "nl", "en", "et", "fi", "fr", "de", "el",
@@ -362,6 +360,10 @@ function defaultSettings() {
chatId: TELEGRAM_CHAT_ID,
webhookSecret: TELEGRAM_WEBHOOK_SECRET || id("tgsec"),
operatorName: "Alex"
},
adminPresence: {
activeSeconds: 30,
offlineSeconds: 120
}
};
}
@@ -480,6 +482,7 @@ function adminBootstrap(res) {
}
function adminConversations(res) {
const presence = adminPresenceSettings();
const rows = db.prepare(`
SELECT c.*, s.site_key, vp.display_name AS visitor_display_name,
(SELECT body FROM messages WHERE conversation_id = c.id ORDER BY id DESC LIMIT 1) AS last_body,
@@ -495,12 +498,12 @@ function adminConversations(res) {
SELECT 1 FROM visitor_sessions vs
WHERE vs.site_id = c.site_id
AND vs.visitor_token = c.visitor_token
AND datetime(vs.last_seen_at) >= datetime('now', '-${PRESENT_VISITOR_SECONDS} seconds')
AND datetime(COALESCE(vs.last_activity_at, vs.last_seen_at)) >= datetime('now', '-${presence.offlineSeconds} seconds')
) AS visitor_online,
COALESCE((
SELECT CASE
WHEN datetime(vs.last_seen_at) < datetime('now', '-${PRESENT_VISITOR_SECONDS} seconds') THEN 'offline'
WHEN datetime(vs.last_activity_at) >= datetime('now', '-${ACTIVE_VISITOR_SECONDS} seconds') THEN 'active'
WHEN datetime(COALESCE(vs.last_activity_at, vs.last_seen_at)) < datetime('now', '-${presence.offlineSeconds} seconds') THEN 'offline'
WHEN datetime(vs.last_activity_at) >= datetime('now', '-${presence.activeSeconds} seconds') THEN 'active'
ELSE 'idle'
END
FROM visitor_sessions vs
@@ -1472,9 +1475,28 @@ function mergeSiteSettings(currentSettings, incomingSettings) {
delete settings.telegram.hasBotToken;
delete settings.telegram.botTokenMasked;
delete settings.telegram.webhookUrl;
settings.adminPresence = normalizeAdminPresenceSettings(settings.adminPresence || currentSettings.adminPresence || {});
return settings;
}
function normalizeAdminPresenceSettings(value = {}) {
const activeSeconds = clampNumber(value.activeSeconds, 10, 3600, 30);
const offlineSeconds = Math.max(clampNumber(value.offlineSeconds, 20, 7200, 120), activeSeconds + 10);
return { activeSeconds, offlineSeconds };
}
function adminPresenceSettings() {
const site = getDefaultSite();
const settings = parseJson(site.settings_json, defaultSettings());
return normalizeAdminPresenceSettings(settings.adminPresence || {});
}
function clampNumber(value, min, max, fallback) {
const number = Number(value);
if (!Number.isFinite(number)) return fallback;
return Math.min(max, Math.max(min, Math.round(number)));
}
function normalizeWidgetLanguageSettings(value) {
const defaults = defaultSettings().widgetLanguage;
const settings = { ...defaults, ...(value || {}) };
@@ -1795,6 +1817,7 @@ function updateVisitorContext(conversationId, body) {
}
function currentVisitors() {
const presence = adminPresenceSettings();
const rows = db.prepare(`
SELECT vs.*, s.site_key, vp.display_name AS visitor_display_name,
(SELECT c.public_id FROM conversations c WHERE c.site_id = vs.site_id AND c.visitor_token = vs.visitor_token ORDER BY datetime(c.last_message_at) DESC, c.id DESC LIMIT 1) AS last_conversation_id,
@@ -1802,19 +1825,19 @@ function currentVisitors() {
FROM visitor_sessions vs
JOIN sites s ON s.id = vs.site_id
LEFT JOIN visitor_profiles vp ON vp.site_id = vs.site_id AND vp.visitor_token = vs.visitor_token
WHERE datetime(vs.last_seen_at) >= datetime('now', '-${PRESENT_VISITOR_SECONDS} seconds')
WHERE datetime(vs.last_seen_at) >= datetime('now', '-${presence.offlineSeconds} seconds')
ORDER BY datetime(vs.last_seen_at) DESC
LIMIT 100
`).all();
return rows.map(formatVisitorSession);
return rows.map((row) => formatVisitorSession(row, presence));
}
function formatVisitorSession(row) {
function formatVisitorSession(row, thresholds = adminPresenceSettings()) {
const history = parseJson(row.browsing_history_json, []);
const device = parseJson(row.device_json, {});
const bot = botInfo(device.userAgent);
const countryCode = row.country_code || countryFromTimezone(row.timezone) || countryFromLanguage(row.language);
const presence = visitorPresence(row);
const presence = visitorPresence(row, thresholds);
return {
id: row.visitor_token,
initials: visitorInitials(row.visitor_token),
@@ -1843,11 +1866,12 @@ function formatVisitorSession(row) {
};
}
function visitorPresence(row) {
function visitorPresence(row, thresholds = adminPresenceSettings()) {
const lastSeen = parseTimestampMs(row.last_seen_at);
if (!Number.isFinite(lastSeen) || Date.now() - lastSeen > PRESENT_VISITOR_SECONDS * 1000) return "offline";
const lastActivity = parseTimestampMs(row.last_activity_at || row.last_seen_at);
return Number.isFinite(lastActivity) && Date.now() - lastActivity <= ACTIVE_VISITOR_SECONDS * 1000 ? "active" : "idle";
if (!Number.isFinite(lastSeen) || Date.now() - lastSeen > thresholds.offlineSeconds * 1000) return "offline";
if (!Number.isFinite(lastActivity) || Date.now() - lastActivity > thresholds.offlineSeconds * 1000) return "offline";
return Number.isFinite(lastActivity) && Date.now() - lastActivity <= thresholds.activeSeconds * 1000 ? "active" : "idle";
}
function conversationDetails(conversation) {
@@ -1981,6 +2005,7 @@ function getSiteById(id) {
}
function findConversation(publicId) {
const presence = adminPresenceSettings();
return db.prepare(`
SELECT c.*, s.site_key, vp.display_name AS visitor_display_name,
(SELECT body FROM messages WHERE conversation_id = c.id ORDER BY id DESC LIMIT 1) AS last_body,
@@ -1996,12 +2021,12 @@ function findConversation(publicId) {
SELECT 1 FROM visitor_sessions vs
WHERE vs.site_id = c.site_id
AND vs.visitor_token = c.visitor_token
AND datetime(vs.last_seen_at) >= datetime('now', '-${PRESENT_VISITOR_SECONDS} seconds')
AND datetime(COALESCE(vs.last_activity_at, vs.last_seen_at)) >= datetime('now', '-${presence.offlineSeconds} seconds')
) AS visitor_online,
COALESCE((
SELECT CASE
WHEN datetime(vs.last_seen_at) < datetime('now', '-${PRESENT_VISITOR_SECONDS} seconds') THEN 'offline'
WHEN datetime(vs.last_activity_at) >= datetime('now', '-${ACTIVE_VISITOR_SECONDS} seconds') THEN 'active'
WHEN datetime(COALESCE(vs.last_activity_at, vs.last_seen_at)) < datetime('now', '-${presence.offlineSeconds} seconds') THEN 'offline'
WHEN datetime(vs.last_activity_at) >= datetime('now', '-${presence.activeSeconds} seconds') THEN 'active'
ELSE 'idle'
END
FROM visitor_sessions vs