mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-08-20 01:08:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add log incoming middleware

Browse source
This commit is contained in:
Milo Schwartz 2024-10-26 17:19:10 -04:00
parent be144fe15d
commit 6cee5703b5
No known key found for this signature in database
5 changed files with 124 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config.example.yml
View file

@ -1,5 +1,4 @@
app: app:
name: Pangolin
base_url: http://localhost:3000 base_url: http://localhost:3000
log_level: warning log_level: warning
save_logs: false save_logs: false

196
package.json
View file

@ -1,100 +1,100 @@
{ {
"name": "@fossorial/pangolin", "name": "@fossorial/pangolin",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "ENVIRONMENT=dev tsx watch server/index.ts", "dev": "ENVIRONMENT=dev tsx watch server/index.ts",
"db:generate": "drizzle-kit generate", "db:generate": "drizzle-kit generate",
"db:push": "npx tsx server/db/migrate.ts", "db:push": "npx tsx server/db/migrate.ts",
"db:hydrate": "npx tsx scripts/hydrate.ts", "db:hydrate": "npx tsx scripts/hydrate.ts",
"db:studio": "drizzle-kit studio", "db:studio": "drizzle-kit studio",
"build": "mkdir -p dist && next build && node scripts/esbuild.mjs -e server/index.ts -o dist/server.mjs", "build": "mkdir -p dist && next build && node scripts/esbuild.mjs -e server/index.ts -o dist/server.mjs",
"start": "ENVIRONMENT=prod node dist/server.mjs", "start": "ENVIRONMENT=prod node dist/server.mjs",
"email": "email dev --dir server/emails/templates --port 3002" "email": "email dev --dir server/emails/templates --port 3002"
}, },
"dependencies": { "dependencies": {
"@esbuild-plugins/tsconfig-paths": "0.1.2", "@hookform/resolvers": "3.9.0",
"@hookform/resolvers": "3.9.0", "@node-rs/argon2": "1.8.3",
"@node-rs/argon2": "1.8.3", "@oslojs/crypto": "1.0.1",
"@oslojs/crypto": "1.0.1", "@oslojs/encoding": "1.1.0",
"@oslojs/encoding": "1.1.0", "@radix-ui/react-avatar": "1.1.1",
"@radix-ui/react-avatar": "1.1.1", "@radix-ui/react-checkbox": "1.1.2",
"@radix-ui/react-checkbox": "1.1.2", "@radix-ui/react-dialog": "1.1.2",
"@radix-ui/react-dialog": "1.1.2", "@radix-ui/react-dropdown-menu": "2.1.2",
"@radix-ui/react-dropdown-menu": "2.1.2", "@radix-ui/react-icons": "1.3.0",
"@radix-ui/react-icons": "1.3.0", "@radix-ui/react-label": "2.1.0",
"@radix-ui/react-label": "2.1.0", "@radix-ui/react-popover": "1.1.2",
"@radix-ui/react-popover": "1.1.2", "@radix-ui/react-radio-group": "1.2.1",
"@radix-ui/react-radio-group": "1.2.1", "@radix-ui/react-select": "2.1.2",
"@radix-ui/react-select": "2.1.2", "@radix-ui/react-separator": "1.1.0",
"@radix-ui/react-separator": "1.1.0", "@radix-ui/react-slot": "1.1.0",
"@radix-ui/react-slot": "1.1.0", "@radix-ui/react-switch": "1.1.1",
"@radix-ui/react-switch": "1.1.1", "@radix-ui/react-toast": "1.2.2",
"@radix-ui/react-toast": "1.2.2", "@react-email/components": "0.0.25",
"@react-email/components": "0.0.25", "@react-email/tailwind": "0.1.0",
"@react-email/tailwind": "0.1.0", "@tanstack/react-table": "8.20.5",
"@tanstack/react-table": "8.20.5", "axios": "1.7.7",
"axios": "1.7.7", "better-sqlite3": "11.3.0",
"better-sqlite3": "11.3.0", "class-variance-authority": "0.7.0",
"class-variance-authority": "0.7.0", "clsx": "2.1.1",
"clsx": "2.1.1", "cmdk": "1.0.0",
"cmdk": "1.0.0", "cookie-parser": "1.4.6",
"cookie-parser": "1.4.6", "cors": "2.8.5",
"cors": "2.8.5", "drizzle-orm": "0.33.0",
"drizzle-orm": "0.33.0", "express": "4.21.0",
"esbuild": "0.20.1", "express-rate-limit": "7.4.0",
"esbuild-node-externals": "1.13.0", "glob": "11.0.0",
"express": "4.21.0", "helmet": "7.1.0",
"express-rate-limit": "7.4.0", "http-errors": "2.0.0",
"glob": "11.0.0", "input-otp": "1.2.4",
"helmet": "7.1.0", "js-yaml": "4.1.0",
"http-errors": "2.0.0", "lucide-react": "0.447.0",
"input-otp": "1.2.4", "moment": "2.30.1",
"js-yaml": "4.1.0", "next": "15.0.1",
"lucide-react": "0.447.0", "next-themes": "0.3.0",
"moment": "2.30.1", "node-fetch": "3.3.2",
"next": "15.0.1", "nodemailer": "6.9.15",
"next-themes": "0.3.0", "oslo": "1.2.1",
"node-fetch": "3.3.2", "react": "19.0.0-rc-69d4b800-20241021",
"nodemailer": "6.9.15", "react-dom": "19.0.0-rc-69d4b800-20241021",
"oslo": "1.2.1", "react-hook-form": "7.53.0",
"react": "19.0.0-rc-69d4b800-20241021", "rebuild": "0.1.2",
"react-dom": "19.0.0-rc-69d4b800-20241021", "tailwind-merge": "2.5.3",
"react-hook-form": "7.53.0", "tailwindcss-animate": "1.0.7",
"rebuild": "0.1.2", "winston": "3.14.2",
"tailwind-merge": "2.5.3", "winston-daily-rotate-file": "5.0.0",
"tailwindcss-animate": "1.0.7", "zod": "3.23.8",
"winston": "3.14.2", "zod-validation-error": "3.4.0"
"winston-daily-rotate-file": "5.0.0", },
"yargs": "17.7.2", "devDependencies": {
"zod": "3.23.8", "esbuild": "0.20.1",
"zod-validation-error": "3.4.0" "esbuild-node-externals": "1.13.0",
}, "yargs": "17.7.2",
"devDependencies": { "@esbuild-plugins/tsconfig-paths": "0.1.2",
"@dotenvx/dotenvx": "1.14.2", "@dotenvx/dotenvx": "1.14.2",
"@types/better-sqlite3": "7.6.11", "@types/better-sqlite3": "7.6.11",
"@types/cookie-parser": "1.4.7", "@types/cookie-parser": "1.4.7",
"@types/cors": "2.8.17", "@types/cors": "2.8.17",
"@types/express": "5.0.0", "@types/express": "5.0.0",
"@types/js-yaml": "4.0.9", "@types/js-yaml": "4.0.9",
"@types/node": "^20", "@types/node": "^20",
"@types/nodemailer": "6.4.16", "@types/nodemailer": "6.4.16",
"@types/react": "npm:types-react@19.0.0-rc.1", "@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1", "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
"@types/yargs": "17.0.33", "@types/yargs": "17.0.33",
"drizzle-kit": "0.24.2", "drizzle-kit": "0.24.2",
"eslint": "^8", "eslint": "^8",
"eslint-config-next": "15.0.1", "eslint-config-next": "15.0.1",
"postcss": "^8", "postcss": "^8",
"react-email": "3.0.1", "react-email": "3.0.1",
"tailwindcss": "^3.4.1", "tailwindcss": "^3.4.1",
"tsc-alias": "1.8.10", "tsc-alias": "1.8.10",
"tsx": "4.19.1", "tsx": "4.19.1",
"typescript": "^5" "typescript": "^5"
}, },
"overrides": { "overrides": {
"@types/react": "npm:types-react@19.0.0-rc.1", "@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1" "@types/react-dom": "npm:types-react-dom@19.0.0-rc.1"
} }
} }

18
server/index.ts
View file

@ -15,6 +15,7 @@ import { authenticated, unauthenticated } from "@server/routers/external";
import cookieParser from "cookie-parser"; import cookieParser from "cookie-parser";
import { User } from "@server/db/schema"; import { User } from "@server/db/schema";
import { ensureActions } from "./db/ensureActions"; import { ensureActions } from "./db/ensureActions";
import { logIncomingMiddleware } from "./middlewares/logIncoming";
const dev = process.env.ENVIRONMENT !== "prod"; const dev = process.env.ENVIRONMENT !== "prod";
@ -25,7 +26,6 @@ const externalPort = config.server.external_port;
const internalPort = config.server.internal_port; const internalPort = config.server.internal_port;
app.prepare().then(() => { app.prepare().then(() => {
ensureActions(); // This loads the actions into the database ensureActions(); // This loads the actions into the database
// External server // External server
@ -42,15 +42,18 @@ app.prepare().then(() => {
windowMin: config.rate_limit.window_minutes, windowMin: config.rate_limit.window_minutes,
max: config.rate_limit.max_requests, max: config.rate_limit.max_requests,
type: "IP_ONLY", type: "IP_ONLY",
}), })
); );
} }
const prefix = `/api/v1`; const prefix = `/api/v1`;
if (dev) {
externalServer.use(logIncomingMiddleware);
}
externalServer.use(prefix, unauthenticated); externalServer.use(prefix, unauthenticated);
externalServer.use(prefix, authenticated); externalServer.use(prefix, authenticated);
externalServer.use(notFoundMiddleware) externalServer.use(notFoundMiddleware);
// We are using NEXT from here on // We are using NEXT from here on
externalServer.all("*", (req: Request, res: Response) => { externalServer.all("*", (req: Request, res: Response) => {
@ -61,7 +64,7 @@ app.prepare().then(() => {
externalServer.listen(externalPort, (err?: any) => { externalServer.listen(externalPort, (err?: any) => {
if (err) throw err; if (err) throw err;
logger.info( logger.info(
`Main server is running on http://localhost:${externalPort}`, `Main server is running on http://localhost:${externalPort}`
); );
}); });
@ -80,15 +83,16 @@ app.prepare().then(() => {
internalServer.listen(internalPort, (err?: any) => { internalServer.listen(internalPort, (err?: any) => {
if (err) throw err; if (err) throw err;
logger.info( logger.info(
`Internal server is running on http://localhost:${internalPort}`, `Internal server is running on http://localhost:${internalPort}`
); );
}); });
internalServer.use(notFoundMiddleware) internalServer.use(notFoundMiddleware);
internalServer.use(errorHandlerMiddleware); internalServer.use(errorHandlerMiddleware);
}); });
declare global { // TODO: eventually make seperate types that extend express.Request declare global {
// TODO: eventually make seperate types that extend express.Request
namespace Express { namespace Express {
interface Request { interface Request {
user?: User; user?: User;

14
server/middlewares/logIncoming.ts Normal file
View file

@ -0,0 +1,14 @@
import logger from "@server/logger";
import { NextFunction, Request, Response } from "express";
export function logIncomingMiddleware(
req: Request,
res: Response,
next: NextFunction
) {
const { method, url, headers, body } = req;
if (url.includes("/api/v1")) {
logger.debug(`${method} ${url}`);
}
next();
}

2
server/routers/resource/listResources.ts
View file

@ -91,8 +91,6 @@ export async function listResources(
next: NextFunction, next: NextFunction,
): Promise<any> { ): Promise<any> {
try { try {
logger.info(JSON.stringify(req.query, null, 2));
logger.info(JSON.stringify(req.params, null, 2));
const parsedQuery = listResourcesSchema.safeParse(req.query); const parsedQuery = listResourcesSchema.safeParse(req.query);
if (!parsedQuery.success) { if (!parsedQuery.success) {
return next( return next(