feat: improve backup management, settings UI, and Twilio webhooks
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -13,6 +13,9 @@
|
||||
"license": "ISC",
|
||||
"type": "commonjs",
|
||||
"dependencies": {
|
||||
"@google/generative-ai": "^0.24.1",
|
||||
"@langchain/google-genai": "^2.1.30",
|
||||
"@langchain/langgraph": "^1.2.9",
|
||||
"archiver": "^7.0.1",
|
||||
"axios": "^1.9.0",
|
||||
"bcrypt": "^5.1.1",
|
||||
|
||||
@@ -11,12 +11,31 @@ const LOCAL_BACKUP_DIR = path.resolve(process.cwd(), "backups");
|
||||
// Name of the USB backup subfolder the user creates on their drive
|
||||
const USB_BACKUP_FOLDER_NAME = "USB Backup";
|
||||
|
||||
const MAX_BACKUPS = 30;
|
||||
|
||||
function ensureLocalBackupDir() {
|
||||
if (!fs.existsSync(LOCAL_BACKUP_DIR)) {
|
||||
fs.mkdirSync(LOCAL_BACKUP_DIR, { recursive: true });
|
||||
}
|
||||
}
|
||||
|
||||
function pruneOldBackups(dir: string) {
|
||||
try {
|
||||
const files = fs.readdirSync(dir)
|
||||
.filter((f) => f.endsWith(".sql") || f.endsWith(".zip"))
|
||||
.map((f) => ({ name: f, mtime: fs.statSync(path.join(dir, f)).mtimeMs }))
|
||||
.sort((a, b) => b.mtime - a.mtime);
|
||||
|
||||
const toDelete = files.slice(MAX_BACKUPS);
|
||||
for (const file of toDelete) {
|
||||
fs.unlinkSync(path.join(dir, file.name));
|
||||
console.log(`🗑️ Pruned old backup: ${file.name}`);
|
||||
}
|
||||
} catch (err) {
|
||||
console.warn("Failed to prune old backups:", err);
|
||||
}
|
||||
}
|
||||
|
||||
async function getAdminUser() {
|
||||
const batchSize = 100;
|
||||
let offset = 0;
|
||||
@@ -49,6 +68,7 @@ export const startBackupCron = () => {
|
||||
const startedAt = new Date();
|
||||
const log = await cronJobLogStorage.createJobLog("local-backup", startedAt);
|
||||
await cronJobLogStorage.completeJobLog(log.id, "skipped", new Date());
|
||||
await storage.deleteNotificationsByType(admin.id, "BACKUP");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -58,6 +78,7 @@ export const startBackupCron = () => {
|
||||
try {
|
||||
const filename = `dental_backup_${Date.now()}.sql`;
|
||||
await backupDatabaseToPath({ destinationPath: LOCAL_BACKUP_DIR, filename });
|
||||
pruneOldBackups(LOCAL_BACKUP_DIR);
|
||||
await storage.createBackup(admin.id);
|
||||
await storage.deleteNotificationsByType(admin.id, "BACKUP");
|
||||
await cronJobLogStorage.completeJobLog(log.id, "success", new Date());
|
||||
@@ -93,6 +114,7 @@ export const startBackupCron = () => {
|
||||
const startedAt = new Date();
|
||||
const log = await cronJobLogStorage.createJobLog("usb-backup", startedAt);
|
||||
await cronJobLogStorage.completeJobLog(log.id, "skipped", new Date());
|
||||
await storage.deleteNotificationsByType(admin.id, "BACKUP");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -131,6 +153,7 @@ export const startBackupCron = () => {
|
||||
try {
|
||||
const filename = `dental_backup_usb_${Date.now()}.sql`;
|
||||
await backupDatabaseToPath({ destinationPath: usbBackupPath, filename });
|
||||
pruneOldBackups(usbBackupPath);
|
||||
await storage.createBackup(admin.id);
|
||||
await storage.deleteNotificationsByType(admin.id, "BACKUP");
|
||||
await cronJobLogStorage.completeJobLog(log.id, "success", new Date());
|
||||
|
||||
@@ -12,8 +12,9 @@ const restoreUpload = multer({
|
||||
storage: multer.memoryStorage(),
|
||||
limits: { fileSize: 500 * 1024 * 1024 }, // 500 MB
|
||||
fileFilter: (_req, file, cb) => {
|
||||
if (file.originalname.toLowerCase().endsWith(".sql")) cb(null, true);
|
||||
else cb(new Error("Only .sql files are allowed"));
|
||||
const name = file.originalname.toLowerCase();
|
||||
if (name.endsWith(".sql") || name.endsWith(".zip")) cb(null, true);
|
||||
else cb(new Error("Only .sql or .zip files are allowed"));
|
||||
},
|
||||
});
|
||||
|
||||
@@ -339,13 +340,21 @@ router.post("/restore", restoreUpload.single("file"), async (req: Request, res:
|
||||
|
||||
if (!req.file) return res.status(400).json({ error: "No file provided" });
|
||||
|
||||
const isZip = req.file.originalname.toLowerCase().endsWith(".zip");
|
||||
|
||||
// For zip files, write to a temp file so unzip can read it
|
||||
let tmpZipPath: string | null = null;
|
||||
if (isZip) {
|
||||
tmpZipPath = path.join(os.tmpdir(), `restore_${Date.now()}.zip`);
|
||||
fs.writeFileSync(tmpZipPath, req.file.buffer);
|
||||
}
|
||||
|
||||
// Drop and recreate the public schema so existing tables don't block the restore.
|
||||
// pg_dump without --clean produces no DROP statements, so restoring into an
|
||||
// existing schema would silently skip CREATE TABLE / fail on duplicate inserts.
|
||||
try {
|
||||
await prisma.$executeRawUnsafe(`DROP SCHEMA public CASCADE`);
|
||||
await prisma.$executeRawUnsafe(`CREATE SCHEMA public`);
|
||||
} catch (err: any) {
|
||||
if (tmpZipPath) try { fs.unlinkSync(tmpZipPath); } catch {}
|
||||
console.error("Failed to reset schema before restore:", err);
|
||||
return res.status(500).json({ error: "Failed to reset database schema", details: err.message });
|
||||
}
|
||||
@@ -366,30 +375,41 @@ router.post("/restore", restoreUpload.single("file"), async (req: Request, res:
|
||||
psql.stderr.on("data", (d) => (stderr += d.toString()));
|
||||
|
||||
psql.on("error", (err) => {
|
||||
if (tmpZipPath) try { fs.unlinkSync(tmpZipPath); } catch {}
|
||||
console.error("Failed to start psql:", err);
|
||||
if (!res.headersSent)
|
||||
res.status(500).json({ error: "Failed to run psql", details: err.message });
|
||||
});
|
||||
|
||||
psql.on("close", async (code) => {
|
||||
if (tmpZipPath) try { fs.unlinkSync(tmpZipPath); } catch {}
|
||||
if (code !== 0) {
|
||||
console.error("psql restore failed:", stderr);
|
||||
return res.status(500).json({ error: "Restore failed", details: stderr });
|
||||
}
|
||||
|
||||
// Disconnect so Prisma drops its pooled connections and reconnects fresh
|
||||
// on the next request, avoiding stale prepared statements against the old schema.
|
||||
try {
|
||||
await prisma.$disconnect();
|
||||
} catch (_) {
|
||||
// non-fatal — the restore succeeded
|
||||
}
|
||||
} catch (_) {}
|
||||
|
||||
res.json({ success: true });
|
||||
});
|
||||
|
||||
psql.stdin.write(req.file.buffer);
|
||||
psql.stdin.end();
|
||||
if (isZip && tmpZipPath) {
|
||||
// Pipe the first .sql entry from the zip directly into psql stdin
|
||||
const unzip = spawn("unzip", ["-p", tmpZipPath, "*.sql"]);
|
||||
let unzipErr = "";
|
||||
unzip.stderr.on("data", (d) => (unzipErr += d.toString()));
|
||||
unzip.on("error", (err) => {
|
||||
if (tmpZipPath) try { fs.unlinkSync(tmpZipPath); } catch {}
|
||||
if (!res.headersSent)
|
||||
res.status(500).json({ error: "Failed to extract zip", details: err.message });
|
||||
});
|
||||
unzip.stdout.pipe(psql.stdin);
|
||||
} else {
|
||||
psql.stdin.write(req.file.buffer);
|
||||
psql.stdin.end();
|
||||
}
|
||||
});
|
||||
|
||||
export default router;
|
||||
|
||||
@@ -25,6 +25,7 @@ import paymentsReportsRoutes from "./payments-reports";
|
||||
import exportPaymentsReportsRoutes from "./export-payments-reports";
|
||||
import jobMonitorRoutes from "./job-monitor";
|
||||
import twilioRoutes from "./twilio";
|
||||
import aiSettingsRoutes from "./ai-settings";
|
||||
|
||||
const router = Router();
|
||||
|
||||
@@ -54,5 +55,6 @@ router.use("/payments-reports", paymentsReportsRoutes);
|
||||
router.use("/export-payments-reports", exportPaymentsReportsRoutes);
|
||||
router.use("/job-monitor", jobMonitorRoutes);
|
||||
router.use("/twilio", twilioRoutes);
|
||||
router.use("/ai", aiSettingsRoutes);
|
||||
|
||||
export default router;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import express, { Request, Response } from "express";
|
||||
import { storage } from "../storage";
|
||||
import { prisma as db } from "@repo/db/client";
|
||||
import { runReminderGraph } from "../ai/reminder-graph";
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
@@ -10,12 +11,13 @@ router.post("/webhook/sms", async (req: Request, res: Response): Promise<any> =>
|
||||
const { From, Body, MessageSid } = req.body;
|
||||
|
||||
const normalizedFrom = (From || "").replace(/\D/g, "");
|
||||
const allPatients = await db.patient.findMany({ select: { id: true, phone: true } });
|
||||
const allPatients = await db.patient.findMany({ select: { id: true, phone: true, userId: true } });
|
||||
const patient = allPatients.find(
|
||||
(p: { id: number; phone: string | null }) => p.phone && p.phone.replace(/\D/g, "") === normalizedFrom
|
||||
(p: { id: number; phone: string | null; userId: number }) => p.phone && p.phone.replace(/\D/g, "") === normalizedFrom
|
||||
);
|
||||
|
||||
if (patient) {
|
||||
// Save the inbound message
|
||||
await storage.createCommunication({
|
||||
patientId: patient.id,
|
||||
channel: "sms",
|
||||
@@ -24,6 +26,28 @@ router.post("/webhook/sms", async (req: Request, res: Response): Promise<any> =>
|
||||
body: Body,
|
||||
twilioSid: MessageSid,
|
||||
});
|
||||
|
||||
// Run AI graph if API key is configured
|
||||
const aiSettings = await storage.getAiSettings(patient.userId);
|
||||
if (aiSettings?.apiKey) {
|
||||
const { reply, intent } = await runReminderGraph(Body, aiSettings.apiKey);
|
||||
|
||||
if (reply) {
|
||||
// Save the AI outbound reply
|
||||
await storage.createCommunication({
|
||||
patientId: patient.id,
|
||||
channel: "sms",
|
||||
direction: "outbound",
|
||||
status: "sent",
|
||||
body: reply,
|
||||
});
|
||||
|
||||
res.set("Content-Type", "text/xml");
|
||||
return res.send(
|
||||
`<?xml version="1.0" encoding="UTF-8"?><Response><Message>${escapeXml(reply)}</Message></Response>`
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
res.set("Content-Type", "text/xml");
|
||||
@@ -104,4 +128,13 @@ router.post("/webhook/voice-recording", async (req: Request, res: Response): Pro
|
||||
}
|
||||
});
|
||||
|
||||
function escapeXml(text: string): string {
|
||||
return text
|
||||
.replace(/&/g, "&")
|
||||
.replace(/</g, "<")
|
||||
.replace(/>/g, ">")
|
||||
.replace(/"/g, """)
|
||||
.replace(/'/g, "'");
|
||||
}
|
||||
|
||||
export default router;
|
||||
|
||||
@@ -1,54 +1,73 @@
|
||||
import { spawn } from "child_process";
|
||||
import fs from "fs";
|
||||
import path from "path";
|
||||
import archiver from "archiver";
|
||||
|
||||
interface BackupToPathParams {
|
||||
destinationPath: string;
|
||||
filename: string;
|
||||
filename: string; // should end in .zip
|
||||
}
|
||||
|
||||
export async function backupDatabaseToPath({
|
||||
destinationPath,
|
||||
filename,
|
||||
}: BackupToPathParams): Promise<void> {
|
||||
const path = await import("path");
|
||||
const fs = await import("fs");
|
||||
// Verify write access before spawning pg_dump
|
||||
try {
|
||||
fs.accessSync(destinationPath, fs.constants.W_OK);
|
||||
} catch {
|
||||
throw new Error(
|
||||
`No write permission to "${destinationPath}". Try running: sudo chmod a+w "${destinationPath}"`
|
||||
);
|
||||
}
|
||||
|
||||
const outputFile = path.join(destinationPath, filename);
|
||||
const zipFile = path.join(destinationPath, filename);
|
||||
const sqlName = filename.replace(/\.zip$/, ".sql");
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const output = fs.createWriteStream(zipFile);
|
||||
const archive = archiver("zip", { zlib: { level: 6 } });
|
||||
|
||||
output.on("close", () => resolve());
|
||||
archive.on("error", (err) => {
|
||||
try { if (fs.existsSync(zipFile)) fs.unlinkSync(zipFile); } catch {}
|
||||
reject(err);
|
||||
});
|
||||
|
||||
archive.pipe(output);
|
||||
|
||||
const pgDump = spawn(
|
||||
"pg_dump",
|
||||
[
|
||||
"--no-acl",
|
||||
"--no-owner",
|
||||
"-h",
|
||||
process.env.DB_HOST || "localhost",
|
||||
"-U",
|
||||
process.env.DB_USER || "postgres",
|
||||
"-f",
|
||||
outputFile,
|
||||
"-h", process.env.DB_HOST || "localhost",
|
||||
"-U", process.env.DB_USER || "postgres",
|
||||
process.env.DB_NAME || "dental_db",
|
||||
],
|
||||
{
|
||||
env: {
|
||||
...process.env,
|
||||
PGPASSWORD: process.env.DB_PASSWORD,
|
||||
},
|
||||
env: { ...process.env, PGPASSWORD: process.env.DB_PASSWORD },
|
||||
}
|
||||
);
|
||||
|
||||
let pgError = "";
|
||||
|
||||
pgDump.stderr.on("data", (d) => (pgError += d.toString()));
|
||||
|
||||
pgDump.on("error", (err) => {
|
||||
try { if (fs.existsSync(zipFile)) fs.unlinkSync(zipFile); } catch {}
|
||||
reject(new Error(`Failed to start pg_dump: ${err.message}. Make sure postgresql-client is installed.`));
|
||||
});
|
||||
|
||||
pgDump.on("close", (code) => {
|
||||
if (code !== 0) {
|
||||
// clean up partial file if it was created
|
||||
try {
|
||||
if (fs.existsSync(outputFile)) fs.unlinkSync(outputFile);
|
||||
} catch {}
|
||||
return reject(new Error(pgError || "pg_dump failed"));
|
||||
try { if (fs.existsSync(zipFile)) fs.unlinkSync(zipFile); } catch {}
|
||||
reject(new Error(pgError.trim() || `pg_dump exited with code ${code}`));
|
||||
return;
|
||||
}
|
||||
resolve();
|
||||
archive.finalize();
|
||||
});
|
||||
|
||||
// Stream pg_dump stdout directly into the zip as a .sql entry
|
||||
archive.append(pgDump.stdout, { name: sqlName });
|
||||
});
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ import { patientDocumentsStorage } from './patientDocuments-storage';
|
||||
import * as exportPaymentsReportsStorage from "./export-payments-reports-storage";
|
||||
import { cronJobLogStorage } from "./cron-job-log-storage";
|
||||
import { twilioStorage } from "./twilio-storage";
|
||||
import { aiSettingsStorage } from "./ai-settings-storage";
|
||||
|
||||
|
||||
export const storage = {
|
||||
@@ -39,6 +40,7 @@ export const storage = {
|
||||
...exportPaymentsReportsStorage,
|
||||
...cronJobLogStorage,
|
||||
...twilioStorage,
|
||||
...aiSettingsStorage,
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user