From 2008a3955ab6964c34ec7aecae78ae4997a8bd2a Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 27 Aug 2025 11:31:15 -0700 Subject: [PATCH] Change destructuring --- server/routers/gerbil/createExitNode.ts | 10 +++++----- server/routers/gerbil/getConfig.ts | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server/routers/gerbil/createExitNode.ts b/server/routers/gerbil/createExitNode.ts index b35913db..d4e6d43a 100644 --- a/server/routers/gerbil/createExitNode.ts +++ b/server/routers/gerbil/createExitNode.ts @@ -1,4 +1,4 @@ -import { db, exitNodes } from "@server/db"; +import { db, ExitNode, exitNodes } from "@server/db"; import { getUniqueExitNodeEndpointName } from "@server/db/names"; import config from "@server/lib/config"; import { getNextAvailableSubnet } from "@server/lib/exitNodes"; @@ -8,7 +8,7 @@ import { eq } from "drizzle-orm"; export async function createExitNode(publicKey: string, reachableAt: string | undefined) { // Fetch exit node const [exitNodeQuery] = await db.select().from(exitNodes).limit(1); - let exitNode; + let exitNode: ExitNode; if (!exitNodeQuery) { const address = await getNextAvailableSubnet(); // TODO: eventually we will want to get the next available port so that we can multiple exit nodes @@ -24,7 +24,7 @@ export async function createExitNode(publicKey: string, reachableAt: string | un `Exit Node ${publicKey.slice(0, 8)}`; // create a new exit node - exitNode = await db + [exitNode] = await db .insert(exitNodes) .values({ publicKey, @@ -38,11 +38,11 @@ export async function createExitNode(publicKey: string, reachableAt: string | un .execute(); logger.info( - `Created new exit node ${exitNode[0].name} with address ${exitNode[0].address} and port ${exitNode[0].listenPort}` + `Created new exit node ${exitNode.name} with address ${exitNode.address} and port ${exitNode.listenPort}` ); } else { // update the existing exit node - exitNode = await db + [exitNode] = await db .update(exitNodes) .set({ reachableAt, diff --git a/server/routers/gerbil/getConfig.ts b/server/routers/gerbil/getConfig.ts index 6f41b591..71d1a45e 100644 --- a/server/routers/gerbil/getConfig.ts +++ b/server/routers/gerbil/getConfig.ts @@ -14,6 +14,7 @@ import { getAllowedIps } from "../target/helpers"; import { proxyToRemote } from "@server/lib/remoteProxy"; import { getNextAvailableSubnet } from "@server/lib/exitNodes"; import { createExitNode } from "./createExitNode"; + // Define Zod schema for request validation const getConfigSchema = z.object({ publicKey: z.string(), @@ -69,13 +70,13 @@ export async function getConfig( if (config.isManagedMode()) { req.body = { ...req.body, - endpoint: exitNode[0].endpoint, - listenPort: exitNode[0].listenPort + endpoint: exitNode.endpoint, + listenPort: exitNode.listenPort }; return proxyToRemote(req, res, next, "hybrid/gerbil/get-config"); } - const configResponse = await generateGerbilConfig(exitNode[0]); + const configResponse = await generateGerbilConfig(exitNode); logger.debug("Sending config: ", configResponse);