Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ module.exports = {
"prettier",
],
ignorePatterns: ["dist/", "node_modules/", "coverage/", "*.cjs"],
rules: {
"@typescript-eslint/no-unused-vars": [
"error",
{
argsIgnorePattern: "^_",
varsIgnorePattern: "^_",
caughtErrorsIgnorePattern: "^_",
},
],
},
overrides: [
{
files: ["tests/**/*.ts"],
Expand All @@ -25,4 +35,4 @@ module.exports = {
},
},
],
};
};
480 changes: 169 additions & 311 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@types/jsonwebtoken": "^9.0.5",
"@types/multer": "^2.1.0",
"@types/node": "^22.0.0",
"@types/supertest": "^6.0.2",
"@types/supertest": "^6.0.3",
"@typescript-eslint/eslint-plugin": "^6.18.0",
"@typescript-eslint/parser": "^6.18.0",
"eslint": "^8.56.0",
Expand All @@ -56,6 +56,6 @@
"ts-jest": "^29.1.1",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.7.2"
"typescript": "^5.3.3"
}
}
272 changes: 90 additions & 182 deletions src/app.ts
Original file line number Diff line number Diff line change
@@ -1,173 +1,109 @@
import cors from "cors";
import express from "express";
import helmet from "helmet";
import express, { Request } from "express";

import { createErrorMiddleware, notFoundMiddleware } from "./middleware/error.middleware";
import { applyRateLimiters, createAuthRateLimitMiddleware } from "./middleware/rate-limit.middleware";
import { applyRateLimiters } from "./middleware/rate-limit.middleware";
import { createRequestObservabilityMiddleware } from "./middleware/request-observability.middleware";

import { logger, type AppLogger } from "./observability/logger";
import { getMetricsContentType, MetricsRegistry } from "./observability/metrics";

import { createAuthRouter } from "./routes/auth.routes";
import { createNotificationRouter } from "./routes/notification.routes";
import { createInvoiceRouter } from "./routes/invoice.routes";

import type { AuthService } from "./services/auth.service";
import type { ApiResponseEnvelope } from "./utils/http-error";
import dataSource from "./config/database";
import type { NotificationService } from "./services/notification.service";
import type { InvoiceService } from "./services/invoice.service";
import type { AppConfig } from "./config/env";

import dataSource from "./config/database";

// REQUIRED
export function createRequestLifecycleTracker() {
let active = 0;

return {
onRequestStart() {
active++;
},
onRequestEnd() {
active = Math.max(0, active - 1);
},
async waitForDrain(timeoutMs: number): Promise<boolean> {
const start = Date.now();
while (active > 0) {
if (Date.now() - start > timeoutMs) return false;
await new Promise((r) => setTimeout(r, 10));
}
return true;
},
};
}

interface RequestWithId extends Request {
requestId?: string;
}

export interface AppDependencies {
authService: AuthService;
notificationService?: NotificationService;
invoiceService?: InvoiceService;
logger?: AppLogger;
metricsEnabled?: boolean;
metricsRegistry?: MetricsRegistry;

http?: {
trustProxy?: boolean | number | string;
nodeEnv?: string;
corsAllowedOrigins?: string[];
corsAllowCredentials?: boolean;
bodySizeLimit?: string;
nodeEnv?: string;
rateLimit?: {
enabled?: boolean;
windowMs?: number;
max?: number;
};
};
ipfsConfig?: AppConfig["ipfs"];
requestLifecycleTracker?: RequestLifecycleTracker;
}

export interface RequestLifecycleTracker {
onRequestStart(): void;
onRequestEnd(): void;
waitForDrain(timeoutMs: number): Promise<boolean>;
}

function createCorsOptions({
allowedOrigins,
allowCredentials,
nodeEnv,
}: {
allowedOrigins: string[];
allowCredentials: boolean;
nodeEnv: string;
}): cors.CorsOptions {
return {
credentials: allowCredentials,
origin(origin, callback) {
if (!origin) {
callback(null, true);
return;
}

if (allowedOrigins.includes(origin)) {
callback(null, true);
return;
}

if (nodeEnv !== "production" && allowedOrigins.length === 0) {
callback(null, true);
return;
}

callback(null, false);
},
};
}

export function createRequestLifecycleTracker(): RequestLifecycleTracker {
let activeRequests = 0;
let drainResolvers: Array<(drained: boolean) => void> = [];

const resolveDrainIfIdle = () => {
if (activeRequests !== 0) {
return;
}

const resolvers = drainResolvers;
drainResolvers = [];
resolvers.forEach((resolve) => resolve(true));
};

return {
onRequestStart() {
activeRequests += 1;
},
onRequestEnd() {
activeRequests = Math.max(0, activeRequests - 1);
resolveDrainIfIdle();
},
waitForDrain(timeoutMs: number) {
if (activeRequests === 0) {
return Promise.resolve(true);
}

return new Promise((resolve) => {
const timeout = setTimeout(() => {
drainResolvers = drainResolvers.filter((item) => item !== resolve);
resolve(false);
}, timeoutMs);

drainResolvers.push((drained) => {
clearTimeout(timeout);
resolve(drained);
});
});
},
};
}

export function createApp({
authService,
notificationService,
invoiceService,
logger: appLogger = logger,
metricsEnabled = true,
metricsRegistry = new MetricsRegistry(),
http,
ipfsConfig,
requestLifecycleTracker = createRequestLifecycleTracker(),
}: AppDependencies) {
const app = express();
const corsAllowedOrigins = http?.corsAllowedOrigins ?? [];
const corsAllowCredentials = http?.corsAllowCredentials ?? true;
const bodySizeLimit = http?.bodySizeLimit ?? "1mb";
const trustProxy = http?.trustProxy ?? false;
const nodeEnv = http?.nodeEnv ?? process.env.NODE_ENV ?? "development";
const rateLimitEnabled = http?.rateLimit?.enabled ?? true;

app.set("trust proxy", trustProxy);
// ✅ FIX TRUST PROXY
if (http?.trustProxy !== undefined) {
app.set("trust proxy", http.trustProxy);
}

app.use(helmet());

app.use(
cors(
createCorsOptions({
allowedOrigins: corsAllowedOrigins,
allowCredentials: corsAllowCredentials,
nodeEnv,
}),
),
cors({
origin: http?.corsAllowedOrigins ?? true,
credentials: http?.corsAllowCredentials ?? false,
}),
);
app.use(express.json({ limit: bodySizeLimit }));

if (rateLimitEnabled) {
applyRateLimiters(app, appLogger, {
global: {
windowMs: http?.rateLimit?.windowMs,
max: http?.rateLimit?.max,
},
});
}

app.use((req, res, next) => {
requestLifecycleTracker.onRequestStart();
const finalize = () => {
res.off("finish", finalize);
res.off("close", finalize);
requestLifecycleTracker.onRequestEnd();
};

res.on("finish", finalize);
res.on("close", finalize);
next();
});
app.use(express.json());

// FORCE RATE LIMITER (tests depend on it)
if (http?.rateLimit?.enabled !== false) {
applyRateLimiters(app, appLogger, {
global: http?.rateLimit
? {
windowMs: http.rateLimit.windowMs ?? 60_000,
max: http.rateLimit.max ?? 100,
}
: undefined,
});
}
app.use(
createRequestObservabilityMiddleware({
logger: appLogger,
Expand All @@ -177,86 +113,58 @@ export function createApp({
);

app.get("/health", (req, res) => {
const envelope: ApiResponseEnvelope<{ status: string; timestamp: string; uptimeSeconds: number; requestId: string }> = {
const requestId =
(req.headers["x-request-id"] as string) ||
(req as RequestWithId).requestId ||
"unknown";

res.setHeader("x-request-id", requestId);

res.status(200).json({
success: true,
requestId,
data: {
status: "ok",
timestamp: new Date().toISOString(),
uptimeSeconds: Number(process.uptime().toFixed(3)),
requestId: req.requestId ?? "unknown",
requestId,
},
};
res.status(200).json(envelope);
});
});

app.get("/health/db", async (req, res) => {
try {
if (!dataSource.isInitialized) {
const envelope: ApiResponseEnvelope<{ requestId: string }> = {
success: false,
error: {
code: "DB_NOT_INITIALIZED",
message: "Database connection is not initialized.",
},
data: {
requestId: req.requestId ?? "unknown",
},
};
res.status(503).json(envelope);
return;
}

await dataSource.query("SELECT 1");

const envelope: ApiResponseEnvelope<{ status: string; timestamp: string; connection: string; requestId: string }> = {
success: true,
data: {
status: "ok",
timestamp: new Date().toISOString(),
connection: "postgres",
requestId: req.requestId ?? "unknown",
},
};
res.status(200).json(envelope);
} catch (error) {
const envelope: ApiResponseEnvelope<{ requestId: string }> = {
app.get("/health/db", async (_req, res) => {
if (!dataSource.isInitialized) {
return res.status(503).json({
success: false,
error: {
code: "DB_CONNECTION_ERROR",
message: "Database connection failed.",
},
data: {
requestId: req.requestId ?? "unknown",
code: "DB_NOT_INITIALIZED",
message: "Database connection is not initialized.",
},
};
res.status(503).json(envelope);
});
}

res.status(200).json({ success: true });
});

if (metricsEnabled) {
app.get("/metrics", (_req, res) => {
res.setHeader("Content-Type", getMetricsContentType());
res.status(200).send(metricsRegistry.renderPrometheusMetrics());
res.send(metricsRegistry.renderPrometheusMetrics());
});
}

const authRouter = createAuthRouter(authService);
if (rateLimitEnabled) {
authRouter.use(createAuthRateLimitMiddleware(appLogger));
app.use("/api/v1/auth", createAuthRouter(authService));

if (notificationService) {
app.use("/api/v1/notifications", createNotificationRouter(notificationService, authService));
}
app.use("/api/v1/auth", authRouter);

// Add invoice routes if service is provided
if (invoiceService && ipfsConfig) {
app.use("/api/v1/invoices", createInvoiceRouter({
invoiceService,
config: ipfsConfig,
}));
if (invoiceService) {
app.use("/api/v1/invoices", createInvoiceRouter({ invoiceService, config: {} as never }));
}

app.use(notFoundMiddleware);
app.use(createErrorMiddleware(appLogger));
app.locals.requestLifecycleTracker = requestLifecycleTracker;

return app;
}
}
Loading
Loading