Merge dev into fix/log-analytics-adjustments

server/private/routers/remoteExitNode/createRemoteExitNode.ts

@@ -36,9 +36,9 @@ export const paramsSchema = z.object({
 });
 
 const bodySchema = z.strictObject({
-        remoteExitNodeId: z.string().length(15),
-        secret: z.string().length(48)
-    });
+    remoteExitNodeId: z.string().length(15),
+    secret: z.string().length(48)
+});
 
 export type CreateRemoteExitNodeBody = z.infer<typeof bodySchema>;
 

server/private/routers/remoteExitNode/deleteRemoteExitNode.ts

@@ -25,9 +25,9 @@ import { usageService } from "@server/lib/billing/usageService";
 import { FeatureId } from "@server/lib/billing";
 
 const paramsSchema = z.strictObject({
-        orgId: z.string().min(1),
-        remoteExitNodeId: z.string().min(1)
-    });
+    orgId: z.string().min(1),
+    remoteExitNodeId: z.string().min(1)
+});
 
 export async function deleteRemoteExitNode(
     req: Request,

server/private/routers/remoteExitNode/getRemoteExitNode.ts

@@ -24,9 +24,9 @@ import { fromError } from "zod-validation-error";
 import { GetRemoteExitNodeResponse } from "@server/routers/remoteExitNode/types";
 
 const getRemoteExitNodeSchema = z.strictObject({
-        orgId: z.string().min(1),
-        remoteExitNodeId: z.string().min(1)
-    });
+    orgId: z.string().min(1),
+    remoteExitNodeId: z.string().min(1)
+});
 
 async function query(remoteExitNodeId: string) {
     const [remoteExitNode] = await db

server/private/routers/remoteExitNode/getRemoteExitNodeToken.ts

@@ -55,7 +55,8 @@ export async function getRemoteExitNodeToken(
 
     try {
         if (token) {
-            const { session, remoteExitNode } = await validateRemoteExitNodeSessionToken(token);
+            const { session, remoteExitNode } =
+                await validateRemoteExitNodeSessionToken(token);
             if (session) {
                 if (config.getRawConfig().app.log_failed_attempts) {
                     logger.info(
@@ -103,7 +104,10 @@ export async function getRemoteExitNodeToken(
         }
 
         const resToken = generateSessionToken();
-        await createRemoteExitNodeSession(resToken, existingRemoteExitNode.remoteExitNodeId);
+        await createRemoteExitNodeSession(
+            resToken,
+            existingRemoteExitNode.remoteExitNodeId
+        );
 
         // logger.debug(`Created RemoteExitNode token response: ${JSON.stringify(resToken)}`);
 

server/private/routers/remoteExitNode/handleRemoteExitNodePingMessage.ts

@@ -33,7 +33,9 @@ export const startRemoteExitNodeOfflineChecker = (): void => {
 
     offlineCheckerInterval = setInterval(async () => {
         try {
-            const twoMinutesAgo = Math.floor((Date.now() - OFFLINE_THRESHOLD_MS) / 1000);
+            const twoMinutesAgo = Math.floor(
+                (Date.now() - OFFLINE_THRESHOLD_MS) / 1000
+            );
 
             // Find clients that haven't pinged in the last 2 minutes and mark them as offline
             const newlyOfflineNodes = await db
@@ -48,11 +50,13 @@ export const startRemoteExitNodeOfflineChecker = (): void => {
                             isNull(exitNodes.lastPing)
                         )
                     )
-                ).returning();
-
+                )
+                .returning();
 
             // Update the sites to offline if they have not pinged either
-            const exitNodeIds = newlyOfflineNodes.map(node => node.exitNodeId);
+            const exitNodeIds = newlyOfflineNodes.map(
+                (node) => node.exitNodeId
+            );
 
             const sitesOnNode = await db
                 .select()
@@ -77,7 +81,6 @@ export const startRemoteExitNodeOfflineChecker = (): void => {
                         .where(eq(sites.siteId, site.siteId));
                 }
             }
-
         } catch (error) {
             logger.error("Error in offline checker interval", { error });
         }
@@ -100,7 +103,9 @@ export const stopRemoteExitNodeOfflineChecker = (): void => {
 /**
  * Handles ping messages from clients and responds with pong
  */
-export const handleRemoteExitNodePingMessage: MessageHandler = async (context) => {
+export const handleRemoteExitNodePingMessage: MessageHandler = async (
+    context
+) => {
     const { message, client: c, sendToClient } = context;
     const remoteExitNode = c as RemoteExitNode;
 
@@ -120,7 +125,7 @@ export const handleRemoteExitNodePingMessage: MessageHandler = async (context) =
             .update(exitNodes)
             .set({
                 lastPing: Math.floor(Date.now() / 1000),
-                online: true,
+                online: true
             })
             .where(eq(exitNodes.exitNodeId, remoteExitNode.exitNodeId));
     } catch (error) {
@@ -131,7 +136,7 @@ export const handleRemoteExitNodePingMessage: MessageHandler = async (context) =
         message: {
             type: "pong",
             data: {
-                timestamp: new Date().toISOString(),
+                timestamp: new Date().toISOString()
             }
         },
         broadcast: false,

server/private/routers/remoteExitNode/handleRemoteExitNodeRegisterMessage.ts

@@ -29,7 +29,8 @@ export const handleRemoteExitNodeRegisterMessage: MessageHandler = async (
         return;
     }
 
-    const { remoteExitNodeVersion, remoteExitNodeSecondaryVersion } = message.data;
+    const { remoteExitNodeVersion, remoteExitNodeSecondaryVersion } =
+        message.data;
 
     if (!remoteExitNodeVersion) {
         logger.warn("Remote exit node version not found");
@@ -39,7 +40,10 @@ export const handleRemoteExitNodeRegisterMessage: MessageHandler = async (
     // update the version
     await db
         .update(remoteExitNodes)
-        .set({ version: remoteExitNodeVersion, secondaryVersion: remoteExitNodeSecondaryVersion })
+        .set({
+            version: remoteExitNodeVersion,
+            secondaryVersion: remoteExitNodeSecondaryVersion
+        })
         .where(
             eq(
                 remoteExitNodes.remoteExitNodeId,

server/private/routers/remoteExitNode/listRemoteExitNodes.ts

@@ -24,8 +24,8 @@ import { fromError } from "zod-validation-error";
 import { ListRemoteExitNodesResponse } from "@server/routers/remoteExitNode/types";
 
 const listRemoteExitNodesParamsSchema = z.strictObject({
-        orgId: z.string()
-    });
+    orgId: z.string()
+});
 
 const listRemoteExitNodesSchema = z.object({
     limit: z

server/private/routers/remoteExitNode/pickRemoteExitNodeDefaults.ts

@@ -22,8 +22,8 @@ import { z } from "zod";
 import { PickRemoteExitNodeDefaultsResponse } from "@server/routers/remoteExitNode/types";
 
 const paramsSchema = z.strictObject({
-        orgId: z.string()
-    });
+    orgId: z.string()
+});
 
 export async function pickRemoteExitNodeDefaults(
     req: Request,

server/private/routers/remoteExitNode/quickStartRemoteExitNode.ts

@@ -38,7 +38,9 @@ export async function quickStartRemoteExitNode(
     next: NextFunction
 ): Promise<any> {
     try {
-        const parsedBody = quickStartRemoteExitNodeBodySchema.safeParse(req.body);
+        const parsedBody = quickStartRemoteExitNodeBodySchema.safeParse(
+            req.body
+        );
         if (!parsedBody.success) {
             return next(
                 createHttpError(