mirror of
https://github.com/fosrl/pangolin.git
synced 2025-08-09 04:15:07 +02:00
Add receive endpoint for megabytes transfered
This commit is contained in:
parent
0d91966609
commit
5a3e1444d1
7 changed files with 82 additions and 6 deletions
|
@ -26,6 +26,8 @@ export const sites = sqliteTable("sites", {
|
||||||
subdomain: text("subdomain"),
|
subdomain: text("subdomain"),
|
||||||
pubKey: text("pubKey"),
|
pubKey: text("pubKey"),
|
||||||
subnet: text("subnet"),
|
subnet: text("subnet"),
|
||||||
|
megabytesIn: integer("bytesIn"),
|
||||||
|
megabytesOut: integer("bytesOut")
|
||||||
});
|
});
|
||||||
|
|
||||||
// Resources table
|
// Resources table
|
||||||
|
|
|
@ -35,6 +35,8 @@ CREATE TABLE `sites` (
|
||||||
`subdomain` text,
|
`subdomain` text,
|
||||||
`pubKey` text,
|
`pubKey` text,
|
||||||
`subnet` text,
|
`subnet` text,
|
||||||
|
`bytesIn` integer,
|
||||||
|
`bytesOut` integer,
|
||||||
FOREIGN KEY (`orgId`) REFERENCES `orgs`(`orgId`) ON UPDATE no action ON DELETE cascade,
|
FOREIGN KEY (`orgId`) REFERENCES `orgs`(`orgId`) ON UPDATE no action ON DELETE cascade,
|
||||||
FOREIGN KEY (`exitNode`) REFERENCES `exitNodes`(`exitNodeId`) ON UPDATE no action ON DELETE set null
|
FOREIGN KEY (`exitNode`) REFERENCES `exitNodes`(`exitNodeId`) ON UPDATE no action ON DELETE set null
|
||||||
);
|
);
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"version": "6",
|
"version": "6",
|
||||||
"dialect": "sqlite",
|
"dialect": "sqlite",
|
||||||
"id": "379ca2f9-068a-4289-8a23-001e7dc269b1",
|
"id": "8f8a2cda-fb58-438b-bc67-e5c34eda0580",
|
||||||
"prevId": "00000000-0000-0000-0000-000000000000",
|
"prevId": "00000000-0000-0000-0000-000000000000",
|
||||||
"tables": {
|
"tables": {
|
||||||
"exitNodes": {
|
"exitNodes": {
|
||||||
|
@ -224,6 +224,20 @@
|
||||||
"primaryKey": false,
|
"primaryKey": false,
|
||||||
"notNull": false,
|
"notNull": false,
|
||||||
"autoincrement": false
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"bytesIn": {
|
||||||
|
"name": "bytesIn",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false,
|
||||||
|
"autoincrement": false
|
||||||
|
},
|
||||||
|
"bytesOut": {
|
||||||
|
"name": "bytesOut",
|
||||||
|
"type": "integer",
|
||||||
|
"primaryKey": false,
|
||||||
|
"notNull": false,
|
||||||
|
"autoincrement": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"indexes": {},
|
"indexes": {},
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
{
|
{
|
||||||
"idx": 0,
|
"idx": 0,
|
||||||
"version": "6",
|
"version": "6",
|
||||||
"when": 1727557783608,
|
"when": 1727577233301,
|
||||||
"tag": "0000_wealthy_captain_midlands",
|
"tag": "0000_flimsy_shotgun",
|
||||||
"breakpoints": true
|
"breakpoints": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import { Router } from "express";
|
import { Router } from "express";
|
||||||
import { getConfig } from "./getConfig";
|
import { getConfig } from "./getConfig";
|
||||||
|
import { receiveBandwidth } from "./receiveBandwidth";
|
||||||
|
|
||||||
const badger = Router();
|
const badger = Router();
|
||||||
|
|
||||||
|
@ -8,5 +9,6 @@ badger.get("/", (_, res) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
badger.get("/getConfig", getConfig);
|
badger.get("/getConfig", getConfig);
|
||||||
|
badger.post("/receiveBandwidth", receiveBandwidth);
|
||||||
|
|
||||||
export default badger;
|
export default badger;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { Request, Response, NextFunction } from 'express';
|
import { Request, Response, NextFunction } from 'express';
|
||||||
import { DrizzleError, eq } from 'drizzle-orm';
|
import { DrizzleError, eq } from 'drizzle-orm';
|
||||||
import { sites, resources, targets, exitNodes } from '../../db/schema';
|
import { sites, resources, targets, exitNodes } from '@server/db/schema';
|
||||||
import db from '../../db';
|
import db from '@server/db';
|
||||||
|
|
||||||
export const getConfig = async (req: Request, res: Response, next: NextFunction): Promise<void> => {
|
export const getConfig = async (req: Request, res: Response, next: NextFunction): Promise<void> => {
|
||||||
try {
|
try {
|
||||||
|
@ -51,7 +51,6 @@ export const getConfig = async (req: Request, res: Response, next: NextFunction)
|
||||||
peers,
|
peers,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
res.json(config);
|
res.json(config);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error querying database:', error);
|
console.error('Error querying database:', error);
|
||||||
|
|
57
server/routers/badger/receiveBandwidth.ts
Normal file
57
server/routers/badger/receiveBandwidth.ts
Normal file
|
@ -0,0 +1,57 @@
|
||||||
|
import { Request, Response, NextFunction } from 'express';
|
||||||
|
import { DrizzleError, eq } from 'drizzle-orm';
|
||||||
|
import { sites, resources, targets, exitNodes } from '@server/db/schema';
|
||||||
|
import db from '@server/db';
|
||||||
|
import logger from '@server/logger';
|
||||||
|
|
||||||
|
interface PeerBandwidth {
|
||||||
|
publicKey: string;
|
||||||
|
bytesIn: number;
|
||||||
|
bytesOut: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const receiveBandwidth = async (req: Request, res: Response, next: NextFunction): Promise<void> => {
|
||||||
|
try {
|
||||||
|
const bandwidthData: PeerBandwidth[] = req.body;
|
||||||
|
|
||||||
|
if (!Array.isArray(bandwidthData)) {
|
||||||
|
throw new Error('Invalid bandwidth data');
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const peer of bandwidthData) {
|
||||||
|
const { publicKey, bytesIn, bytesOut } = peer;
|
||||||
|
|
||||||
|
// Find the site by public key
|
||||||
|
const site = await db.query.sites.findFirst({
|
||||||
|
where: eq(sites.pubKey, publicKey),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!site) {
|
||||||
|
console.warn(`Site not found for public key: ${publicKey}`);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update the site's bandwidth usage
|
||||||
|
await db.update(sites)
|
||||||
|
.set({
|
||||||
|
megabytesIn: (site.megabytesIn || 0) + bytesIn,
|
||||||
|
megabytesOut: (site.megabytesOut || 0) + bytesOut,
|
||||||
|
})
|
||||||
|
.where(eq(sites.siteId, site.siteId));
|
||||||
|
|
||||||
|
logger.debug(`Updated bandwidth for site: ${site.siteId}: megabytesIn: ${(site.megabytesIn || 0) + bytesIn}, megabytesOut: ${(site.megabytesOut || 0) + bytesOut}`);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
res.status(200).json({ message: 'Bandwidth data updated successfully' });
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Error updating bandwidth data:', error);
|
||||||
|
res.status(500).json({ error: 'Internal server error' });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
function calculateSubnet(index: number): string {
|
||||||
|
const baseIp = 10 << 24;
|
||||||
|
const subnetSize = 16;
|
||||||
|
return `${(baseIp | (index * subnetSize)).toString()}/28`;
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue