improve node CORS proxy, general polish (#5)

- persist timer job timestamps to DB for more accurate scheduling
- retention bug fixes

Author: DankTechnologies

.github/workflows/deploy.yml

@@ -3,6 +3,14 @@ name: Release
 on:
   push:
     branches: [main]
+    paths-ignore:
+      - '.vscode/**'
+      - 'cors-proxies/**'
+      - 'README.md'
+      - '.gitignore'
+      - '.editorconfig'
+      - '**/*.md'
+      - '**/*.sh'
 
 jobs:
   release:

README.md

@@ -55,6 +55,7 @@ Podds is a [Progressive Web Application (PWA)](https://en.wikipedia.org/wiki/Pro
 - [Svelte Bottom Sheet](https://github.com/AuxiDev/svelte-bottom-sheet)
 - [Lucide Icons](https://lucide.dev/)
 - [Pattern Monster](https://pattern.monster/)
+- [text divider](https://thenounproject.com/browse/icons/term/text-divider) by iconcheese from the Noun Project
 
 ## CORS Proxies
 

cors-proxies/node/Dockerfile

@@ -1,5 +1,6 @@
 FROM node:slim
 WORKDIR /app
 COPY server.js .
-RUN npm install node-fetch
+COPY package.json .
+RUN npm install
 CMD ["node", "server.js"]

cors-proxies/node/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "cors-proxy",
+  "version": "1.0.0",
+  "type": "module",
+  "dependencies": {
+    "node-fetch": "^3.3.2",
+    "prom-client": "^15.1.0"
+  }
+} 

cors-proxies/node/server.js

@@ -2,9 +2,27 @@ import http from 'http';
 import fetch from 'node-fetch';
 import { pipeline } from 'stream';
 import { promisify } from 'util';
+import { Registry, Counter, Histogram } from 'prom-client';
 
 const streamPipeline = promisify(pipeline);
 
+// Create a registry and metrics
+const register = new Registry();
+const httpRequestsTotal = new Counter({
+	name: 'http_requests_total',
+	help: 'Total number of HTTP requests',
+	labelNames: ['method', 'status']
+});
+const httpRequestDuration = new Histogram({
+	name: 'http_request_duration_seconds',
+	help: 'HTTP request duration in seconds',
+	labelNames: ['method']
+});
+
+// Register the metrics
+register.registerMetric(httpRequestsTotal);
+register.registerMetric(httpRequestDuration);
+
 const USER_AGENT =
 	"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36";
 
@@ -21,17 +39,28 @@ const LAN_DENYLIST = [
 	/^10\./,
 	/^192\.168\./,
 	/^172\.(1[6-9]|2[0-9]|3[0-1])\./
-  ];
+];
 
 const server = http.createServer(async (req, res) => {
+	const start = process.hrtime();
+	
+	// Handle metrics endpoint
+	if (req.url === '/metrics') {
+		res.setHeader('Content-Type', register.contentType);
+		res.end(await register.metrics());
+		return;
+	}
+
 	const origin = req.headers.origin;
 	if (!ORIGIN_ALLOWLIST.includes(origin?.toLowerCase())) {
 		res.writeHead(403);
+		httpRequestsTotal.inc({ method: req.method, status: 403 });
 		return res.end('Forbidden');
 	}
 
 	if (!['GET', 'HEAD', 'OPTIONS'].includes(req.method)) {
 		res.writeHead(405);
+		httpRequestsTotal.inc({ method: req.method, status: 405 });
 		return res.end('Method Not Allowed');
 	}
 
@@ -42,13 +71,15 @@ const server = http.createServer(async (req, res) => {
 			'Access-Control-Allow-Headers': '*',
 			'Access-Control-Max-Age': '86400',
 		});
+		httpRequestsTotal.inc({ method: req.method, status: 204 });
 		return res.end();
 	}
 
 	const urlObj = new URL(req.url, `http://${req.headers.host}`);
 	const rawTarget = urlObj.searchParams.get('url');
 	if (!rawTarget) {
 		res.writeHead(400);
+		httpRequestsTotal.inc({ method: req.method, status: 400 });
 		return res.end("Missing 'url' parameter");
 	}
 
@@ -58,14 +89,16 @@ const server = http.createServer(async (req, res) => {
 		new URL(targetUrl); // validates format
 	} catch {
 		res.writeHead(400);
+		httpRequestsTotal.inc({ method: req.method, status: 400 });
 		return res.end("Invalid URL");
 	}
 
 	const targetHostname = new URL(targetUrl).hostname;
 	if (LAN_DENYLIST.some(rx => rx.test(targetHostname))) {
 		res.writeHead(403);
+		httpRequestsTotal.inc({ method: req.method, status: 403 });
 		return res.end('Forbidden');
-	  }
+	}
 
 	try {
 		// Clone headers and override necessary ones
@@ -93,14 +126,14 @@ const server = http.createServer(async (req, res) => {
 		// Convert and sanitize response headers
 		const rawHeaders = Object.fromEntries(upstream.headers.entries());
 		for (const key of Object.keys(rawHeaders)) {
-		  const lower = key.toLowerCase();
-		  if (
-			lower.startsWith('access-control-') ||
-			lower === 'content-encoding' ||
-			lower === 'transfer-encoding'
-		  ) {
-			delete rawHeaders[key];
-		  }
+			const lower = key.toLowerCase();
+			if (
+				lower.startsWith('access-control-') ||
+				lower === 'content-encoding' ||
+				lower === 'transfer-encoding'
+			) {
+				delete rawHeaders[key];
+			}
 		}
 
 		rawHeaders['Access-Control-Allow-Origin'] = origin;
@@ -114,15 +147,37 @@ const server = http.createServer(async (req, res) => {
 		}
 
 		res.writeHead(upstream.status, rawHeaders);
+		httpRequestsTotal.inc({ method: req.method, status: upstream.status });
+		
+		// Handle client disconnection
+		req.on('close', () => {
+			if (!res.writableEnded) {
+				res.destroy();
+			}
+		});
+
 		await streamPipeline(upstream.body, res);
 	} catch (e) {
 		console.error(`Fetch failed: ${e.message}`);
 		console.error(e.stack);
-		res.writeHead(500);
-		res.end(`Error: ${e.message}`);
+		
+		// Only send error response if headers haven't been sent
+		if (!res.headersSent) {
+			res.writeHead(500);
+			httpRequestsTotal.inc({ method: req.method, status: 500 });
+			res.end(`Error: ${e.message}`);
+		} else {
+			// If headers were sent, just destroy the response
+			res.destroy();
+		}
+	} finally {
+		const [seconds, nanoseconds] = process.hrtime(start);
+		const duration = seconds + nanoseconds / 1e9;
+		httpRequestDuration.observe({ method: req.method }, duration);
 	}
 });
 
 server.listen(8080, () => {
 	console.log('CORS proxy listening on http://0.0.0.0:8080');
+	console.log('Metrics available at http://0.0.0.0:8080/metrics');
 });

src/app.css

@@ -103,7 +103,9 @@
 
 	--primary-black: color-mix(in oklch, var(--primary) 90%, black);
 	--primary-grey-dark: color-mix(in oklch, var(--primary) 60%, var(--grey-900));
+	--primary-grey-darker: color-mix(in oklch, var(--primary) 10%, var(--grey-900));
 	--primary-grey-light: color-mix(in oklch, var(--primary-more) 30%, var(--grey-300));
+	--primary-grey-lighter: color-mix(in oklch, var(--primary) 3%, white);
 
 	--primary-faint: light-dark(var(--primary-200), var(--primary-dark-200));
 	--primary-less: light-dark(var(--primary-400), var(--primary-dark-400));