ciphera-net/pulse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 15 Wiki Activity

refactor: enhance session ID caching logic to handle legacy string format and improve expiration checks

Browse Source
This commit is contained in:
Usman Baig
2026-02-11 15:52:30 +01:00
parent 069f5a606b
commit 4a8f627a5c
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
public/script.js
View File

@@ -133,14 +133,22 @@
try { try {
const parsed = JSON.parse(raw); const parsed = JSON.parse(raw);
if (parsed && typeof parsed.id === 'string') { if (parsed && typeof parsed.id === 'string') {
const expired = ttlMs > 0 && typeof parsed.created === 'number' && (Date.now() - parsed.created > ttlMs); const hasValidCreated = typeof parsed.created === 'number';
const expired = ttlMs > 0 && (!hasValidCreated || (Date.now() - parsed.created > ttlMs));
if (!expired) { if (!expired) {
cachedSessionId = parsed.id; cachedSessionId = parsed.id;
return cachedSessionId; return cachedSessionId;
} }
} }
} catch (e) { } catch (e) {
// * Invalid JSON or old string format: treat as expired and regenerate // * Invalid JSON: migrate legacy plain-string ID to { id, created } format
if (typeof raw === 'string' && raw.trim().length > 0) {
cachedSessionId = raw.trim();
try {
localStorage.setItem(key, JSON.stringify({ id: cachedSessionId, created: Date.now() }));
} catch (e2) {}
return cachedSessionId;
}
} }
} }
cachedSessionId = generateId(); cachedSessionId = generateId();
@@ -150,13 +158,19 @@
try { try {
var parsedAgain = JSON.parse(rawAgain); var parsedAgain = JSON.parse(rawAgain);
if (parsedAgain && typeof parsedAgain.id === 'string') { if (parsedAgain && typeof parsedAgain.id === 'string') {
var expiredAgain = ttlMs > 0 && typeof parsedAgain.created === 'number' && (Date.now() - parsedAgain.created > ttlMs); var hasValidCreatedAgain = typeof parsedAgain.created === 'number';
var expiredAgain = ttlMs > 0 && (!hasValidCreatedAgain || (Date.now() - parsedAgain.created > ttlMs));
if (!expiredAgain) { if (!expiredAgain) {
cachedSessionId = parsedAgain.id; cachedSessionId = parsedAgain.id;
return cachedSessionId; return cachedSessionId;
} }
} }
} catch (e2) {} } catch (e2) {
if (typeof rawAgain === 'string' && rawAgain.trim().length > 0) {
cachedSessionId = rawAgain.trim();
return cachedSessionId;
}
}
} }
// * Final re-read immediately before write to avoid overwriting a fresher ID from another tab // * Final re-read immediately before write to avoid overwriting a fresher ID from another tab
var rawBeforeWrite = localStorage.getItem(key); var rawBeforeWrite = localStorage.getItem(key);
@@ -164,13 +178,19 @@
try { try {
var parsedBefore = JSON.parse(rawBeforeWrite); var parsedBefore = JSON.parse(rawBeforeWrite);
if (parsedBefore && typeof parsedBefore.id === 'string') { if (parsedBefore && typeof parsedBefore.id === 'string') {
var expBefore = ttlMs > 0 && typeof parsedBefore.created === 'number' && (Date.now() - parsedBefore.created > ttlMs); var hasValidCreatedBefore = typeof parsedBefore.created === 'number';
var expBefore = ttlMs > 0 && (!hasValidCreatedBefore || (Date.now() - parsedBefore.created > ttlMs));
if (!expBefore) { if (!expBefore) {
cachedSessionId = parsedBefore.id; cachedSessionId = parsedBefore.id;
return cachedSessionId; return cachedSessionId;
} }
} }
} catch (e3) {} } catch (e3) {
if (typeof rawBeforeWrite === 'string' && rawBeforeWrite.trim().length > 0) {
cachedSessionId = rawBeforeWrite.trim();
return cachedSessionId;
}
}
} }
// * Best-effort only: another tab could write between here and setItem; without locks perfect sync is not achievable // * Best-effort only: another tab could write between here and setItem; without locks perfect sync is not achievable
localStorage.setItem(key, JSON.stringify({ id: cachedSessionId, created: Date.now() })); localStorage.setItem(key, JSON.stringify({ id: cachedSessionId, created: Date.now() }));