Merge pull request #13 from ATOR-Development/development

package.json

@@ -11,6 +11,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@types/cors": "^2.8.17",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.11.30",
     "@types/supertest": "^6.0.2",
@@ -24,6 +25,7 @@
     "@types/express": "^4.17.21",
     "@types/geoip-lite": "^1.4.4",
     "axios": "^1.6.8",
+    "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.1",
     "express-validator": "^7.1.0",

src/app.ts

@@ -1,5 +1,6 @@
 import express from 'express';
 import bodyParser from 'body-parser';
+import cors from 'cors';
 import { body, validationResult } from 'express-validator';
 import { VictoriaMetricsService } from './VictoriaMetricsService';
 import { OnionooService, HardwareInfo } from './OnionooService';
@@ -11,6 +12,7 @@ dotenv.config();
 
 const app = express();
 app.use(bodyParser.json());
+app.use(cors());
 const PORT = process.env.PORT ?? 3000;
 const vmService = new VictoriaMetricsService(process.env.VICTORIA_METRICS_ADDRESS as string);
 
@@ -72,7 +74,9 @@ app.get('/relays/:fingerprint', async (req, res) => {
             const relay = {
                 fingerprint: foundRelay.fingerprint,
                 running: foundRelay.running,
-                consensus_weight: foundRelay.consensus_weight
+                consensus_weight: foundRelay.consensus_weight,
+                observed_bandwidth: foundRelay.observed_bandwidth,
+                measured: foundRelay.measured
             };
             console.log('Relay:', relay);
             return res.json(relay);