From e5f4da9a99698f94be56a0bb3c0550c5fce2f4e9 Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 5 Oct 2025 15:22:54 -0700 Subject: [PATCH] Fix lint errors --- server/db/countries.ts | 2 +- server/db/private/redis.ts | 2 +- server/lib/blueprints/proxyResources.ts | 4 ++-- server/lib/private/billing/usageService.ts | 2 +- server/lib/private/readConfigFile.ts | 2 +- server/lib/private/resend.ts | 2 +- server/lib/traefik/middleware.ts | 2 +- server/routers/auth/privateQuickStart.ts | 6 ++---- server/routers/newt/handleNewtRegisterMessage.ts | 4 ++-- server/routers/newt/targets.ts | 2 +- server/routers/private/billing/getOrgUsage.ts | 12 ++++++------ server/routers/private/hybrid.ts | 2 +- server/routers/ws/privateWs.ts | 4 ++-- src/components/PermissionsSelectBox.tsx | 2 +- 14 files changed, 23 insertions(+), 25 deletions(-) diff --git a/server/db/countries.ts b/server/db/countries.ts index 52eb2b4b..2907fd69 100644 --- a/server/db/countries.ts +++ b/server/db/countries.ts @@ -1011,4 +1011,4 @@ export const COUNTRIES = [ "name": "Åland Islands", "code": "AX" } -] \ No newline at end of file +]; \ No newline at end of file diff --git a/server/db/private/redis.ts b/server/db/private/redis.ts index b1f01a49..d6e67262 100644 --- a/server/db/private/redis.ts +++ b/server/db/private/redis.ts @@ -44,7 +44,7 @@ class RedisManager { constructor() { if (build == "oss") { this.isEnabled = false; - return + return; } this.isEnabled = config.getRawPrivateConfig().flags?.enable_redis || false; if (this.isEnabled) { diff --git a/server/lib/blueprints/proxyResources.ts b/server/lib/blueprints/proxyResources.ts index e6525191..adeb320f 100644 --- a/server/lib/blueprints/proxyResources.ts +++ b/server/lib/blueprints/proxyResources.ts @@ -47,8 +47,8 @@ export async function updateProxyResources( for (const [resourceNiceId, resourceData] of Object.entries( config["proxy-resources"] )) { - let targetsToUpdate: Target[] = []; - let healthchecksToUpdate: TargetHealthCheck[] = []; + const targetsToUpdate: Target[] = []; + const healthchecksToUpdate: TargetHealthCheck[] = []; let resource: Resource; async function createTarget( // reusable function to create a target diff --git a/server/lib/private/billing/usageService.ts b/server/lib/private/billing/usageService.ts index 76099956..f18542d2 100644 --- a/server/lib/private/billing/usageService.ts +++ b/server/lib/private/billing/usageService.ts @@ -651,7 +651,7 @@ export class UsageService { } } - return result + return result; } catch (error) { logger.error( `Failed to get usage for ${orgId}/${featureId}:`, diff --git a/server/lib/private/readConfigFile.ts b/server/lib/private/readConfigFile.ts index ce2abcf4..ddc9ee82 100644 --- a/server/lib/private/readConfigFile.ts +++ b/server/lib/private/readConfigFile.ts @@ -155,7 +155,7 @@ export const privateConfigSchema = z localFilePath: z.string() }) .optional(), - }) + }); export function readPrivateConfigFile() { if (build == "oss") { diff --git a/server/lib/private/resend.ts b/server/lib/private/resend.ts index a502e98c..26c3f4a6 100644 --- a/server/lib/private/resend.ts +++ b/server/lib/private/resend.ts @@ -59,7 +59,7 @@ export async function moveEmailToAudience( if (data) { logger.debug( `Added email ${email} to audience ${audienceId} with contact ID ${data.id}` - ) + ); } const otherAudiences = Object.values(AudienceIds).filter( diff --git a/server/lib/traefik/middleware.ts b/server/lib/traefik/middleware.ts index e6660776..e4055976 100644 --- a/server/lib/traefik/middleware.ts +++ b/server/lib/traefik/middleware.ts @@ -24,7 +24,7 @@ export default function createPathRewriteMiddleware( switch (rewritePathType) { case "exact": // Replace the path with the exact rewrite path - let exactPattern = `^${escapeRegex(path)}$`; + const exactPattern = `^${escapeRegex(path)}$`; middlewares[middlewareName] = { replacePathRegex: { regex: exactPattern, diff --git a/server/routers/auth/privateQuickStart.ts b/server/routers/auth/privateQuickStart.ts index bdb95e5b..683c24a8 100644 --- a/server/routers/auth/privateQuickStart.ts +++ b/server/routers/auth/privateQuickStart.ts @@ -183,7 +183,6 @@ export async function quickStart( let secret: string; let fullDomain: string; let resource: Resource; - let orgId: string; let completeSignUpLink: string; await db.transaction(async (trx) => { @@ -216,7 +215,7 @@ export async function quickStart( throw new Error("Failed to create user account and organization"); } - orgId = org.orgId; + const orgId = org.orgId; await db.transaction(async (trx) => { const token = generateRandomString( @@ -251,7 +250,6 @@ export async function quickStart( // Create the sandbox site const siteNiceId = await getUniqueSiteName(orgId); const siteName = `First Site`; - let siteId: number | undefined; // pick a random exit node const exitNodesList = await listExitNodes(orgId); @@ -277,7 +275,7 @@ export async function quickStart( }) .returning(); - siteId = newSite.siteId; + const siteId = newSite.siteId; const adminRole = await trx .select() diff --git a/server/routers/newt/handleNewtRegisterMessage.ts b/server/routers/newt/handleNewtRegisterMessage.ts index 51a1ab05..021527ad 100644 --- a/server/routers/newt/handleNewtRegisterMessage.ts +++ b/server/routers/newt/handleNewtRegisterMessage.ts @@ -28,7 +28,7 @@ export type ExitNodePingResult = { wasPreviouslyConnected: boolean; }; -let numTimesLimitExceededForId: Record = {}; +const numTimesLimitExceededForId: Record = {}; export const handleNewtRegisterMessage: MessageHandler = async (context) => { const { message, client, sendToClient } = context; @@ -323,7 +323,7 @@ export const handleNewtRegisterMessage: MessageHandler = async (context) => { const hcHeadersParse = target.hcHeaders ? JSON.parse(target.hcHeaders) : null; - let hcHeadersSend: { [key: string]: string } = {}; + const hcHeadersSend: { [key: string]: string } = {}; if (hcHeadersParse) { hcHeadersParse.forEach( (header: { name: string; value: string }) => { diff --git a/server/routers/newt/targets.ts b/server/routers/newt/targets.ts index c05a64a1..a886b00b 100644 --- a/server/routers/newt/targets.ts +++ b/server/routers/newt/targets.ts @@ -102,7 +102,7 @@ export async function removeTargets( }); const healthCheckTargets = targets.map((target) => { - return target.targetId + return target.targetId; }); await sendToClient(newtId, { diff --git a/server/routers/private/billing/getOrgUsage.ts b/server/routers/private/billing/getOrgUsage.ts index b387fd52..e1544e06 100644 --- a/server/routers/private/billing/getOrgUsage.ts +++ b/server/routers/private/billing/getOrgUsage.ts @@ -82,13 +82,13 @@ export async function getOrgUsage( } // Get usage for org - let usageData = []; + const usageData = []; - const siteUptime = await usageService.getUsage(orgId, FeatureId.SITE_UPTIME) - const users = await usageService.getUsageDaily(orgId, FeatureId.USERS) - const domains = await usageService.getUsageDaily(orgId, FeatureId.DOMAINS) - const remoteExitNodes = await usageService.getUsageDaily(orgId, FeatureId.REMOTE_EXIT_NODES) - const egressData = await usageService.getUsage(orgId, FeatureId.EGRESS_DATA_MB) + const siteUptime = await usageService.getUsage(orgId, FeatureId.SITE_UPTIME); + const users = await usageService.getUsageDaily(orgId, FeatureId.USERS); + const domains = await usageService.getUsageDaily(orgId, FeatureId.DOMAINS); + const remoteExitNodes = await usageService.getUsageDaily(orgId, FeatureId.REMOTE_EXIT_NODES); + const egressData = await usageService.getUsage(orgId, FeatureId.EGRESS_DATA_MB); if (siteUptime) { usageData.push(siteUptime); diff --git a/server/routers/private/hybrid.ts b/server/routers/private/hybrid.ts index c8b0960d..dc55bc0d 100644 --- a/server/routers/private/hybrid.ts +++ b/server/routers/private/hybrid.ts @@ -53,7 +53,7 @@ import { NextFunction, Request, Response } from "express"; import createHttpError from "http-errors"; import { z } from "zod"; import { fromError } from "zod-validation-error"; -import { getTraefikConfig } from "../../lib/traefik" +import { getTraefikConfig } from "../../lib/traefik"; import { generateGerbilConfig, generateRelayMappings, diff --git a/server/routers/ws/privateWs.ts b/server/routers/ws/privateWs.ts index 52bb94d8..d94ccf5e 100644 --- a/server/routers/ws/privateWs.ts +++ b/server/routers/ws/privateWs.ts @@ -198,7 +198,7 @@ const processPendingMessages = async ( `Processing ${ws.pendingMessages.length} pending messages for ${clientType.toUpperCase()} ID: ${clientId}` ); - let jobs = []; + const jobs = []; for (const messageData of ws.pendingMessages) { jobs.push(processMessage(ws, messageData, clientId, clientType)); } @@ -216,7 +216,7 @@ const NODE_ID = uuidv4(); const REDIS_CHANNEL = "websocket_messages"; // Client tracking map (local to this node) -let connectedClients: Map = new Map(); +const connectedClients: Map = new Map(); // Recovery tracking let isRedisRecoveryInProgress = false; diff --git a/src/components/PermissionsSelectBox.tsx b/src/components/PermissionsSelectBox.tsx index 048c21eb..38723613 100644 --- a/src/components/PermissionsSelectBox.tsx +++ b/src/components/PermissionsSelectBox.tsx @@ -149,7 +149,7 @@ function getActionsCategories(root: boolean) { if (build == "saas") { actionsByCategory["SAAS"] = { ["Send Usage Notification Email"]: "sendUsageNotification", - } + }; } }