yes
This commit is contained in:
@@ -22,8 +22,10 @@ async function connectDB() {
|
|||||||
await db.connect(`http://${CONFIG.url}/rpc`);
|
await db.connect(`http://${CONFIG.url}/rpc`);
|
||||||
await db.use({ namespace: CONFIG.ns, database: CONFIG.db });
|
await db.use({ namespace: CONFIG.ns, database: CONFIG.db });
|
||||||
await authenticateDB();
|
await authenticateDB();
|
||||||
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("Error connecting to SurrealDB:", error);
|
console.error("Error connecting to SurrealDB:", error);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,8 +33,10 @@ async function authenticateDB() {
|
|||||||
try {
|
try {
|
||||||
await db.signin({ username: CONFIG.user, password: CONFIG.pass });
|
await db.signin({ username: CONFIG.user, password: CONFIG.pass });
|
||||||
console.log("🔑 Successfully authenticated with SurrealDB");
|
console.log("🔑 Successfully authenticated with SurrealDB");
|
||||||
|
return true;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("❌ Authentication failed:", error);
|
console.error("❌ Authentication failed:", error);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,24 +44,56 @@ async function ensureAuthenticated() {
|
|||||||
try {
|
try {
|
||||||
console.log("⏳ Ensuring authentication with SurrealDB...");
|
console.log("⏳ Ensuring authentication with SurrealDB...");
|
||||||
await db.query("RETURN 1");
|
await db.query("RETURN 1");
|
||||||
} catch (error) {
|
} catch (error: any) {
|
||||||
const e = error as any;
|
if (error.status === 401) {
|
||||||
if (e.status === 401) {
|
console.warn("⚠️ Token expired. Attempting reconnection...");
|
||||||
console.warn("⚠️ Token expired. Re-authenticating...");
|
try {
|
||||||
await authenticateDB();
|
// Full reconnection instead of just re-authentication
|
||||||
|
await db.close();
|
||||||
|
const success = await connectDB();
|
||||||
|
if (success) {
|
||||||
|
console.log("✅ Successfully reconnected to database");
|
||||||
} else {
|
} else {
|
||||||
console.error("Unexpected database error:", e);
|
console.error("❌ Failed to reconnect to database");
|
||||||
|
}
|
||||||
|
} catch (reconnectError) {
|
||||||
|
console.error("❌ Reconnection failed:", reconnectError);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.error("Unexpected database error:", error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const MINS_5 = 5 * 60 * 1000;
|
// 1 minute
|
||||||
setInterval(ensureAuthenticated, MINS_5);
|
const CHECK_INTERVAL = 60 * 1000;
|
||||||
|
let intervalId: NodeJS.Timeout;
|
||||||
|
|
||||||
await connectDB();
|
async function initializeDB() {
|
||||||
|
const success = await connectDB();
|
||||||
|
if (success) {
|
||||||
|
// Only start the interval if initial connection was successful
|
||||||
|
intervalId = setInterval(ensureAuthenticated, CHECK_INTERVAL);
|
||||||
|
} else {
|
||||||
|
console.error("Failed to initialize database connection");
|
||||||
|
// Optionally implement retry logic here
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function cleanup() {
|
||||||
|
if (intervalId) {
|
||||||
|
clearInterval(intervalId);
|
||||||
|
}
|
||||||
|
return db.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
await initializeDB();
|
||||||
|
|
||||||
export const surreal = db as Surreal;
|
export const surreal = db as Surreal;
|
||||||
|
|
||||||
export function parseToRID(idStr: string) {
|
export function parseToRID(idStr: string) {
|
||||||
return new StringRecordId(idStr);
|
return new StringRecordId(idStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
process.on("SIGTERM", cleanup);
|
||||||
|
process.on("SIGINT", cleanup);
|
||||||
|
|||||||
Reference in New Issue
Block a user