mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-07-30 07:35:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Working on new exit node picking

Browse source
This commit is contained in:
Owen 2025-06-11 09:13:38 -04:00
parent 0537992603
commit 9a2022a4fe
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
3 changed files with 66 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
server/routers/newt/handleNewtRegisterMessage.ts
View file

@ -1,16 +1,10 @@
import { db } from "@server/db";
import { MessageHandler } from "../ws";
import {
exitNodes,
Newt,
resources,
sites,
Target,
targets
} from "@server/db";
import { exitNodes, Newt, resources, sites, Target, targets } from "@server/db";
import { eq, and, sql, inArray } from "drizzle-orm";
import { addPeer, deletePeer } from "../gerbil/peers";
import logger from "@server/logger";
import { exit } from "process";
export const handleNewtRegisterMessage: MessageHandler = async (context) => {
const { message, client, sendToClient } = context;
@ -30,7 +24,7 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => {
const siteId = newt.siteId;
const { publicKey } = message.data;
const { publicKey, exitNodeId } = message.data;
if (!publicKey) {
logger.warn("Public key not provided");
return;
@ -47,18 +41,31 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => {
return;
}
await db
.update(sites)
.set({
pubKey: publicKey
})
.where(eq(sites.siteId, siteId))
.returning();
let exitNodeIdToQuery = site.exitNodeId;
if (exitNodeId && site.exitNodeId !== exitNodeId) { // This effectively moves the exit node to the new one
exitNodeIdToQuery = exitNodeId; // Use the provided exitNodeId if it differs from the site's exitNodeId
await db
.update(sites)
.set({
pubKey: publicKey,
exitNodeId: exitNodeId
})
.where(eq(sites.siteId, siteId))
.returning();
} else {
await db
.update(sites)
.set({
pubKey: publicKey
})
.where(eq(sites.siteId, siteId))
.returning();
}
const [exitNode] = await db
.select()
.from(exitNodes)
.where(eq(exitNodes.exitNodeId, site.exitNodeId))
.where(eq(exitNodes.exitNodeId, exitNodeIdToQuery))
.limit(1);
if (site.pubKey && site.pubKey !== publicKey) {