Migrate from JSON to PostgreSQL, update SLA to 99.5%
- Replace JSON file storage with PostgreSQL (pg package) - Add db.ts service for connection pool and schema init - Rewrite keys.ts, verification.ts, usage.ts for async PostgreSQL - Update all routes for async function signatures - Add migration script (scripts/migrate-to-postgres.mjs) - Update docker-compose.yml with DATABASE_* env vars - Change SLA from 99.9% to 99.5% in landing page
This commit is contained in:
parent
bb1881af61
commit
e9d16bf2a3
13 changed files with 395 additions and 198 deletions
|
|
@ -1,48 +1,43 @@
|
|||
import { isProKey } from "../services/keys.js";
|
||||
import fs from "fs/promises";
|
||||
import path from "path";
|
||||
import pool from "../services/db.js";
|
||||
|
||||
const USAGE_FILE = "/app/data/usage.json";
|
||||
let usage = new Map<string, { count: number; monthKey: string }>();
|
||||
const FREE_TIER_LIMIT = 100;
|
||||
|
||||
// In-memory cache, periodically synced to PostgreSQL
|
||||
let usage = new Map<string, { count: number; monthKey: string }>();
|
||||
|
||||
function getMonthKey(): string {
|
||||
const d = new Date();
|
||||
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}`;
|
||||
}
|
||||
|
||||
async function loadUsageData(): Promise<void> {
|
||||
export async function loadUsageData(): Promise<void> {
|
||||
try {
|
||||
const data = await fs.readFile(USAGE_FILE, "utf8");
|
||||
const usageObj = JSON.parse(data);
|
||||
const result = await pool.query("SELECT key, count, month_key FROM usage");
|
||||
usage = new Map();
|
||||
for (const [key, record] of Object.entries(usageObj)) {
|
||||
usage.set(key, record as { count: number; monthKey: string });
|
||||
for (const row of result.rows) {
|
||||
usage.set(row.key, { count: row.count, monthKey: row.month_key });
|
||||
}
|
||||
console.log(`Loaded usage data for ${usage.size} keys`);
|
||||
console.log(`Loaded usage data for ${usage.size} keys from PostgreSQL`);
|
||||
} catch (error) {
|
||||
console.log("No existing usage data found, starting fresh");
|
||||
usage = new Map();
|
||||
}
|
||||
}
|
||||
|
||||
async function saveUsageData(): Promise<void> {
|
||||
async function saveUsageEntry(key: string, record: { count: number; monthKey: string }): Promise<void> {
|
||||
try {
|
||||
const usageObj: Record<string, { count: number; monthKey: string }> = {};
|
||||
for (const [key, record] of usage) {
|
||||
usageObj[key] = record;
|
||||
}
|
||||
await fs.mkdir(path.dirname(USAGE_FILE), { recursive: true });
|
||||
await fs.writeFile(USAGE_FILE, JSON.stringify(usageObj, null, 2));
|
||||
await pool.query(
|
||||
`INSERT INTO usage (key, count, month_key) VALUES ($1, $2, $3)
|
||||
ON CONFLICT (key) DO UPDATE SET count = $2, month_key = $3`,
|
||||
[key, record.count, record.monthKey]
|
||||
);
|
||||
} catch (error) {
|
||||
console.error("Failed to save usage data:", error);
|
||||
}
|
||||
}
|
||||
|
||||
loadUsageData().catch(console.error);
|
||||
|
||||
export function usageMiddleware(req: any, res: any, next: any): void {
|
||||
// Use apiKeyInfo attached by auth middleware (works for both Bearer and X-API-Key)
|
||||
const keyInfo = req.apiKeyInfo;
|
||||
const key = keyInfo?.key || "unknown";
|
||||
const monthKey = getMonthKey();
|
||||
|
|
@ -71,11 +66,13 @@ export function usageMiddleware(req: any, res: any, next: any): void {
|
|||
function trackUsage(key: string, monthKey: string): void {
|
||||
const record = usage.get(key);
|
||||
if (!record || record.monthKey !== monthKey) {
|
||||
usage.set(key, { count: 1, monthKey });
|
||||
const newRecord = { count: 1, monthKey };
|
||||
usage.set(key, newRecord);
|
||||
saveUsageEntry(key, newRecord).catch(console.error);
|
||||
} else {
|
||||
record.count++;
|
||||
saveUsageEntry(key, record).catch(console.error);
|
||||
}
|
||||
saveUsageData().catch(console.error);
|
||||
}
|
||||
|
||||
export function getUsageStats(): Record<string, { count: number; month: string }> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue