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

Initial hp working?

Browse source
This commit is contained in:
Owen 2025-02-22 11:20:56 -05:00
parent a9a9391b39
commit e4c5be4350
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
6 changed files with 49 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
server/routers/newt/handleGetConfigMessage.ts
View file

@ -21,7 +21,6 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
logger.debug(JSON.stringify(message.data));
logger.debug("Handling Newt get config message!");
if (!newt) {
@ -67,7 +66,7 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
.update(sites)
.set({
publicKey,
endpoint,
// endpoint,
address,
listenPort
})
@ -82,8 +81,8 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
const [siteRes] = await db
.update(sites)
.set({
publicKey,
endpoint
publicKey
// endpoint
})
.where(eq(sites.siteId, siteId))
.returning();
@ -101,13 +100,22 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
.from(clients)
.where(eq(clients.siteId, siteId));
const now = new Date().getTime() / 1000;
const peers = await Promise.all(
clientsRes.map(async (client) => {
return {
publicKey: client.pubKey,
allowedIps: [client.subnet]
};
})
clientsRes
.filter((client) => {
if (client.lastHolePunch && now - client.lastHolePunch > 6) {
logger.warn("Client last hole punch is too old");
return;
}
})
.map(async (client) => {
return {
publicKey: client.pubKey,
allowedIps: [client.subnet],
endpoint: client.endpoint
};
})
);
const configResponse = {
@ -162,9 +170,11 @@ async function getNextAvailableSubnet(): Promise<string> {
async function getNextAvailablePort(): Promise<number> {
// Get all existing ports from exitNodes table
const existingPorts = await db.select({
listenPort: sites.listenPort,
}).from(sites);
const existingPorts = await db
.select({
listenPort: sites.listenPort
})
.from(sites);
// Find the first available port between 1024 and 65535
let nextPort = config.getRawConfig().newt.start_port;
@ -174,7 +184,7 @@ async function getNextAvailablePort(): Promise<number> {
}
nextPort++;
if (nextPort > 65535) {
throw new Error('No available ports remaining in space');
throw new Error("No available ports remaining in space");
}
}