mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-08-10 10:22:29 +08:00
refactor(server/session): better error management
This commit is contained in:
parent
b313b0b965
commit
43ab13e126
@ -2,34 +2,49 @@ import sql from "../services/sql.js";
|
||||
import session, { Store } from "express-session";
|
||||
import sessionSecret from "../services/session_secret.js";
|
||||
import config from "../services/config.js";
|
||||
import log from "../services/log.js";
|
||||
|
||||
class SQLiteSessionStore extends Store {
|
||||
|
||||
get(sid: string, callback: (err: any, session?: session.SessionData | null) => void): void {
|
||||
const data = sql.getValue<string>(/*sql*/`SELECT data FROM sessions WHERE id = ?`, sid);
|
||||
let session = null;
|
||||
if (data) {
|
||||
session = JSON.parse(data);
|
||||
try {
|
||||
const data = sql.getValue<string>(/*sql*/`SELECT data FROM sessions WHERE id = ?`, sid);
|
||||
let session = null;
|
||||
if (data) {
|
||||
session = JSON.parse(data);
|
||||
}
|
||||
return callback(null, session);
|
||||
} catch (e: unknown) {
|
||||
log.error(e);
|
||||
return callback(e);
|
||||
}
|
||||
return callback(null, session);
|
||||
}
|
||||
|
||||
set(id: string, session: session.SessionData, callback?: (err?: any) => void): void {
|
||||
const expires = Date.now() + 3600000; // Session expiration time (1 hour from now)
|
||||
const data = JSON.stringify(session);
|
||||
try {
|
||||
const expires = Date.now() + 3600000; // Session expiration time (1 hour from now)
|
||||
const data = JSON.stringify(session);
|
||||
|
||||
sql.upsert("sessions", "id", {
|
||||
id,
|
||||
expires,
|
||||
data
|
||||
});
|
||||
callback?.();
|
||||
sql.upsert("sessions", "id", {
|
||||
id,
|
||||
expires,
|
||||
data
|
||||
});
|
||||
callback?.();
|
||||
} catch (e) {
|
||||
log.error(e);
|
||||
return callback?.(e);
|
||||
}
|
||||
}
|
||||
|
||||
destroy(sid: string, callback?: (err?: any) => void): void {
|
||||
console.log("Destroy ", sid);
|
||||
sql.execute(/*sql*/`DELETE FROM sessions WHERE id = ?`, sid);
|
||||
callback?.();
|
||||
try {
|
||||
sql.execute(/*sql*/`DELETE FROM sessions WHERE id = ?`, sid);
|
||||
callback?.();
|
||||
} catch (e) {
|
||||
log.error(e);
|
||||
callback?.(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -69,7 +69,7 @@ function info(message: string | Error) {
|
||||
log(message);
|
||||
}
|
||||
|
||||
function error(message: string | Error) {
|
||||
function error(message: string | Error | unknown) {
|
||||
log(`ERROR: ${message}`);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user