diff --git a/server/routers/olm/peers.ts b/server/routers/olm/peers.ts index 2ef7a772..2708647b 100644 --- a/server/routers/olm/peers.ts +++ b/server/routers/olm/peers.ts @@ -1,8 +1,7 @@ -import { db } from "@server/db"; -import { clients, olms, newts, sites } from "@server/db"; -import { eq } from "drizzle-orm"; import { sendToClient } from "#dynamic/routers/ws"; +import { db, olms } from "@server/db"; import logger from "@server/logger"; +import { eq } from "drizzle-orm"; import { Alias } from "yaml"; export async function addPeer( @@ -102,7 +101,7 @@ export async function updatePeer( .where(eq(olms.clientId, clientId)) .limit(1); if (!olm) { - return + return; } olmId = olm.olmId; } @@ -162,5 +161,7 @@ export async function initPeerAddHandshake( logger.warn(`Error sending message:`, error); }); - logger.info(`Initiated peer add handshake for site ${peer.siteId} to olm ${olmId}`); + logger.info( + `Initiated peer add handshake for site ${peer.siteId} to olm ${olmId}` + ); } diff --git a/server/routers/siteResource/createSiteResource.ts b/server/routers/siteResource/createSiteResource.ts index 27280f7a..0d440896 100644 --- a/server/routers/siteResource/createSiteResource.ts +++ b/server/routers/siteResource/createSiteResource.ts @@ -1,24 +1,26 @@ -import { Request, Response, NextFunction } from "express"; -import { z } from "zod"; import { clientSiteResources, db, newts, roles, roleSiteResources, + SiteResource, + siteResources, + sites, userSiteResources } from "@server/db"; -import { siteResources, sites, SiteResource } from "@server/db"; +import { getUniqueSiteResourceName } from "@server/db/names"; +import { getNextAvailableAliasAddress } from "@server/lib/ip"; +import { rebuildClientAssociationsFromSiteResource } from "@server/lib/rebuildClientAssociations"; import response from "@server/lib/response"; -import HttpCode from "@server/types/HttpCode"; -import createHttpError from "http-errors"; -import { eq, and, is } from "drizzle-orm"; -import { fromError } from "zod-validation-error"; import logger from "@server/logger"; import { OpenAPITags, registry } from "@server/openApi"; -import { getUniqueSiteResourceName } from "@server/db/names"; -import { rebuildClientAssociationsFromSiteResource } from "@server/lib/rebuildClientAssociations"; -import { getNextAvailableAliasAddress } from "@server/lib/ip"; +import HttpCode from "@server/types/HttpCode"; +import { and, eq } from "drizzle-orm"; +import { NextFunction, Request, Response } from "express"; +import createHttpError from "http-errors"; +import { z } from "zod"; +import { fromError } from "zod-validation-error"; const createSiteResourceParamsSchema = z.strictObject({ siteId: z.string().transform(Number).pipe(z.int().positive()), @@ -55,7 +57,7 @@ const createSiteResourceSchema = z .safeParse(data.destination).success; if (isValidIP) { - return true + return true; } // Check if it's a valid domain (hostname pattern, TLD not required) @@ -64,7 +66,7 @@ const createSiteResourceSchema = z const isValidDomain = domainRegex.test(data.destination); const isValidAlias = data.alias && domainRegex.test(data.alias); - return isValidDomain && isValidAlias; // require the alias to be set in the case of domain + return isValidDomain && isValidAlias; // require the alias to be set in the case of domain } return true; },