gramps/cAIc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: scroll-fighting, 401 errors, session timeout 90->3600s

Browse Source 
- scrollToTop() now respects user scroll position (100px threshold)
- resetScrollLock() called on new messages
- SESSION_TIMEOUT_SECONDS 90 -> 3600 (1 hour) to prevent mid-use expiry
- wrap 10 unprotected authFetch calls in try/catch to kill unhandled rejections
This commit is contained in:
gramps
2026-07-13 15:39:44 -07:00
parent e9700137df
commit b8713a516b
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.py
+1 -1
View File
@@ -35,7 +35,7 @@ def get_amqp_url() -> str:
return f"amqp://caic:{pw}@localhost:5672/caic" return f"amqp://caic:{pw}@localhost:5672/caic"
# --- Auth --- # --- Auth ---
SESSION_TIMEOUT_SECONDS = 90 SESSION_TIMEOUT_SECONDS = 3600
MAX_PIN_ATTEMPTS = 5 MAX_PIN_ATTEMPTS = 5
PIN_LOCKOUT_SECONDS = 300 PIN_LOCKOUT_SECONDS = 300
ALLOW_DEFAULT_PIN = os.getenv("CAIC_ALLOW_DEFAULT_PIN", "false").lower() == "true" ALLOW_DEFAULT_PIN = os.getenv("CAIC_ALLOW_DEFAULT_PIN", "false").lower() == "true"
templates/index.html
+23 -12
View File
@@ -703,7 +703,7 @@ async function loadMemoryStats() {
async function deleteMemory(rowid) { async function deleteMemory(rowid) {
if (currentRole !== 'admin') { requireAdminNotice(); return; } if (currentRole !== 'admin') { requireAdminNotice(); return; }
if (!confirm('Delete this memory?')) return; if (!confirm('Delete this memory?')) return;
await authFetch(`/api/memories/${rowid}`, { method: 'DELETE' }); try { await authFetch(`/api/memories/${rowid}`, { method: 'DELETE' }); } catch(e) { return; }
await loadMemoryStats(); await loadMemoryStats();
} }
@@ -830,13 +830,13 @@ async function loadSettings() {
async function saveSettings() { async function saveSettings() {
if (currentRole !== 'admin') { requireAdminNotice(); return; } if (currentRole !== 'admin') { requireAdminNotice(); return; }
await authFetch('/api/settings', { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ profile_enabled: profileEnabled ? 'true' : 'false', search_enabled: searchEnabled ? 'true' : 'false', memory_enabled: memoryEnabled ? 'true' : 'false', skills_enabled: skillsEnabled ? 'true' : 'false' }) }); try { await authFetch('/api/settings', { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ profile_enabled: profileEnabled ? 'true' : 'false', search_enabled: searchEnabled ? 'true' : 'false', memory_enabled: memoryEnabled ? 'true' : 'false', skills_enabled: skillsEnabled ? 'true' : 'false' }) }); } catch(e) {}
} }
async function saveDefaultModel() { async function saveDefaultModel() {
if (currentRole !== 'admin') { requireAdminNotice(); return; } if (currentRole !== 'admin') { requireAdminNotice(); return; }
const model = document.getElementById('defaultModelSetting').value; const model = document.getElementById('defaultModelSetting').value;
await authFetch('/api/settings', { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ default_model: model }) }); try { await authFetch('/api/settings', { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ default_model: model }) }); } catch(e) {}
} }
async function loadProfile() { async function loadProfile() {
@@ -852,7 +852,7 @@ async function loadProfile() {
async function saveProfile() { async function saveProfile() {
if (currentRole !== 'admin') { requireAdminNotice(); return; } if (currentRole !== 'admin') { requireAdminNotice(); return; }
const content = document.getElementById('profileEditor').value; const content = document.getElementById('profileEditor').value;
await authFetch('/api/profile', { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ content: content }) }); try { await authFetch('/api/profile', { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({ content: content }) }); } catch(e) { return; }
cachedProfile = content; cachedProfile = content;
updateTokenCount(); updateTokenCount();
const btn = document.getElementById('saveProfileBtn'); const btn = document.getElementById('saveProfileBtn');
@@ -976,11 +976,11 @@ async function toggleSkill(skillKey) {
if (!skill) return; if (!skill) return;
const nextEnabled = !skill.enabled; const nextEnabled = !skill.enabled;
await authFetch(`/api/skills/${encodeURIComponent(skillKey)}`, { try { await authFetch(`/api/skills/${encodeURIComponent(skillKey)}`, {
method: 'PUT', method: 'PUT',
headers: {'Content-Type': 'application/json'}, headers: {'Content-Type': 'application/json'},
body: JSON.stringify({ enabled: nextEnabled }) body: JSON.stringify({ enabled: nextEnabled })
}); }); } catch(e) { return; }
skill.enabled = nextEnabled; skill.enabled = nextEnabled;
renderSkills(); renderSkills();
} }
@@ -1024,7 +1024,7 @@ async function addPreset() {
if (!name) return; if (!name) return;
const p = prompt('System prompt text:'); const p = prompt('System prompt text:');
if (!p) return; if (!p) return;
await authFetch('/api/presets', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({name, prompt: p}) }); try { await authFetch('/api/presets', { method: 'POST', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({name, prompt: p}) }); } catch(e) { return; }
await loadPresets(); await loadPresets();
} }
@@ -1036,14 +1036,14 @@ async function editPreset(id) {
if (!name) return; if (!name) return;
const p = prompt('System prompt:', preset.prompt); const p = prompt('System prompt:', preset.prompt);
if (p === null) return; if (p === null) return;
await authFetch(`/api/presets/${id}`, { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({name, prompt: p}) }); try { await authFetch(`/api/presets/${id}`, { method: 'PUT', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({name, prompt: p}) }); } catch(e) { return; }
await loadPresets(); await loadPresets();
} }
async function deletePreset(id) { async function deletePreset(id) {
if (currentRole !== 'admin') { requireAdminNotice(); return; } if (currentRole !== 'admin') { requireAdminNotice(); return; }
if (!confirm('Delete this preset?')) return; if (!confirm('Delete this preset?')) return;
await authFetch(`/api/presets/${id}`, { method: 'DELETE' }); try { await authFetch(`/api/presets/${id}`, { method: 'DELETE' }); } catch(e) { return; }
await loadPresets(); await loadPresets();
} }
@@ -1094,7 +1094,7 @@ async function loadConversation(convId) {
async function deleteConversation(convId) { async function deleteConversation(convId) {
if (currentRole !== 'admin') { requireAdminNotice(); return; } if (currentRole !== 'admin') { requireAdminNotice(); return; }
if (!confirm('Delete this conversation?')) return; if (!confirm('Delete this conversation?')) return;
await authFetch(`/api/conversations/${convId}`, { method: 'DELETE' }); try { await authFetch(`/api/conversations/${convId}`, { method: 'DELETE' }); } catch(e) { return; }
if (currentConvId === convId) { currentConvId = null; showWelcome(); } if (currentConvId === convId) { currentConvId = null; showWelcome(); }
await loadConversations(); await loadConversations();
} }
@@ -1102,7 +1102,7 @@ async function deleteConversation(convId) {
async function deleteAllConversations() { async function deleteAllConversations() {
if (currentRole !== 'admin') { requireAdminNotice(); return; } if (currentRole !== 'admin') { requireAdminNotice(); return; }
if (!confirm('Delete ALL conversations? This cannot be undone.')) return; if (!confirm('Delete ALL conversations? This cannot be undone.')) return;
await authFetch('/api/conversations', { method: 'DELETE' }); try { await authFetch('/api/conversations', { method: 'DELETE' }); } catch(e) { return; }
currentConvId = null; currentConvId = null;
conversationHistory = []; conversationHistory = [];
showWelcome(); showWelcome();
@@ -1122,6 +1122,7 @@ function showWelcome() {
} }
async function sendSearch() { async function sendSearch() {
resetScrollLock();
const input = document.getElementById('userInput'); const input = document.getElementById('userInput');
const query = input.value.trim(); const query = input.value.trim();
if (!query || isStreaming) return; if (!query || isStreaming) return;
@@ -1290,6 +1291,7 @@ async function deleteGalleryItem(contextId) {
} catch(e) {} } catch(e) {}
} }
async function sendMessage() { async function sendMessage() {
resetScrollLock();
const input = document.getElementById('userInput'); const input = document.getElementById('userInput');
const message = input.value.trim(); const message = input.value.trim();
if (!message || isStreaming) return; if (!message || isStreaming) return;
@@ -1556,8 +1558,17 @@ function addMessageToolbar(msgDiv) {
} }
function escapeHtml(t) { const d = document.createElement('div'); d.textContent = t; return d.innerHTML; } function escapeHtml(t) { const d = document.createElement('div'); d.textContent = t; return d.innerHTML; }
let _userScrolledAway = false;
document.getElementById('chatContainer')?.addEventListener('scroll', function() {
_userScrolledAway = this.scrollTop > 100;
}, { passive: true });
function scrollToBottom() { const c = document.getElementById('chatContainer'); c.scrollTop = c.scrollHeight; } function scrollToBottom() { const c = document.getElementById('chatContainer'); c.scrollTop = c.scrollHeight; }
function scrollToTop() { const c = document.getElementById('chatContainer'); c.scrollTop = 0; } function scrollToTop() {
if (_userScrolledAway) return;
const c = document.getElementById('chatContainer');
if (c) c.scrollTop = 0;
}
function resetScrollLock() { _userScrolledAway = false; }
function fallbackCopy(text, btn) { function fallbackCopy(text, btn) {
const ta = document.createElement('textarea'); const ta = document.createElement('textarea');
ta.value = text; ta.value = text;