Refactored to make the dev presence stuff

matt-aitken · matt-aitken · commit cd8bc95f2d39 · 2025-03-27T21:06:15.000Z
diff --git a/apps/webapp/app/components/DevPresence.tsx b/apps/webapp/app/components/DevPresence.tsx
@@ -45,9 +45,8 @@ export function DevPresenceProvider({ children, enabled = true }: DevPresencePro
 
     try {
       const data = JSON.parse(streamedEvents) as any;
-      if ("lastSeen" in data && data.lastSeen) {
+      if ("isConnected" in data && data.isConnected) {
         try {
-          const lastSeenDate = new Date(data.lastSeen);
           setIsConnected(true);
         } catch (error) {
           console.log("DevPresence: Failed to parse lastSeen timestamp", { error });
diff --git a/apps/webapp/app/presenters/v3/DevPresence.server.ts b/apps/webapp/app/presenters/v3/DevPresence.server.ts
@@ -0,0 +1,36 @@
+import Redis, { type RedisOptions } from "ioredis";
+import { env } from "~/env.server";
+
+const PRESENCE_KEY_PREFIX = "dev-presence:connection:";
+
+export class DevPresence {
+  private redis: Redis;
+
+  constructor(options: RedisOptions) {
+    this.redis = new Redis(options);
+  }
+
+  async isConnected(environmentId: string) {
+    const presenceKey = this.getPresenceKey(environmentId);
+    const presenceValue = await this.redis.get(presenceKey);
+    return !!presenceValue;
+  }
+
+  async setConnected(environmentId: string, ttl: number) {
+    const presenceKey = this.getPresenceKey(environmentId);
+    await this.redis.setex(presenceKey, ttl, new Date().toISOString());
+  }
+
+  private getPresenceKey(environmentId: string) {
+    return `${PRESENCE_KEY_PREFIX}${environmentId}`;
+  }
+}
+
+export const devPresence = new DevPresence({
+  port: env.RUN_ENGINE_DEV_PRESENCE_REDIS_PORT ?? undefined,
+  host: env.RUN_ENGINE_DEV_PRESENCE_REDIS_HOST ?? undefined,
+  username: env.RUN_ENGINE_DEV_PRESENCE_REDIS_USERNAME ?? undefined,
+  password: env.RUN_ENGINE_DEV_PRESENCE_REDIS_PASSWORD ?? undefined,
+  enableAutoPipelining: true,
+  ...(env.RUN_ENGINE_DEV_PRESENCE_REDIS_TLS_DISABLED === "true" ? {} : { tls: {} }),
+});
diff --git a/apps/webapp/app/presenters/v3/DevPresenceStream.server.ts b/apps/webapp/app/presenters/v3/DevPresenceStream.server.ts
diff --git a/apps/webapp/app/routes/engine.v1.dev.presence.ts b/apps/webapp/app/routes/engine.v1.dev.presence.ts
@@ -1,20 +1,10 @@
 import { json } from "@remix-run/server-runtime";
-import { Redis } from "ioredis";
 import { env } from "~/env.server";
-import { DevPresenceStream } from "~/presenters/v3/DevPresenceStream.server";
+import { devPresence } from "~/presenters/v3/DevPresence.server";
 import { authenticateApiRequestWithFailure } from "~/services/apiAuth.server";
 import { logger } from "~/services/logger.server";
 import { createSSELoader } from "~/utils/sse";
 
-const redis = new Redis({
-  port: env.RUN_ENGINE_DEV_PRESENCE_REDIS_PORT ?? undefined,
-  host: env.RUN_ENGINE_DEV_PRESENCE_REDIS_HOST ?? undefined,
-  username: env.RUN_ENGINE_DEV_PRESENCE_REDIS_USERNAME ?? undefined,
-  password: env.RUN_ENGINE_DEV_PRESENCE_REDIS_PASSWORD ?? undefined,
-  enableAutoPipelining: true,
-  ...(env.RUN_ENGINE_DEV_PRESENCE_REDIS_TLS_DISABLED === "true" ? {} : { tls: {} }),
-});
-
 export const loader = createSSELoader({
   timeout: env.DEV_PRESENCE_SSE_TIMEOUT,
   interval: env.DEV_PRESENCE_TTL_MS * 0.8,
@@ -27,25 +17,21 @@ export const loader = createSSELoader({
     }
 
     const environmentId = authentication.environment.id;
-
-    const presenceKey = DevPresenceStream.getPresenceKey(environmentId);
-
     const ttl = env.DEV_PRESENCE_TTL_MS / 1000;
 
     return {
       beforeStream: async () => {
         logger.debug("Start dev presence SSE session", {
           environmentId,
-          presenceKey,
         });
       },
       initStream: async ({ send }) => {
         // Set initial presence with more context
-        await redis.setex(presenceKey, ttl, new Date().toISOString());
+        await devPresence.setConnected(environmentId, ttl);
         send({ event: "start", data: `Started ${id}` });
       },
       iterator: async ({ send, date }) => {
-        await redis.setex(presenceKey, ttl, date.toISOString());
+        await devPresence.setConnected(environmentId, ttl);
         send({ event: "time", data: new Date().toISOString() });
       },
       cleanup: async () => {},
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dev.presence.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dev.presence.tsx
@@ -1,11 +1,10 @@
 import { $replica } from "~/db.server";
-import { requireUserId } from "~/services/session.server";
-import { EnvironmentParamSchema } from "~/utils/pathBuilder";
 import { env } from "~/env.server";
-import { DevPresenceStream } from "~/presenters/v3/DevPresenceStream.server";
+import { devPresence } from "~/presenters/v3/DevPresence.server";
 import { logger } from "~/services/logger.server";
+import { requireUserId } from "~/services/session.server";
+import { EnvironmentParamSchema } from "~/utils/pathBuilder";
 import { createSSELoader, type SendFunction } from "~/utils/sse";
-import Redis from "ioredis";
 
 export const loader = createSSELoader({
   timeout: env.DEV_PRESENCE_SSE_TIMEOUT,
@@ -32,44 +31,17 @@ export const loader = createSSELoader({
       throw new Response("Not Found", { status: 404 });
     }
 
-    const presenceKey = DevPresenceStream.getPresenceKey(environment.id);
-
-    const cmdRedis = new Redis({
-      port: env.RUN_ENGINE_DEV_PRESENCE_REDIS_PORT ?? undefined,
-      host: env.RUN_ENGINE_DEV_PRESENCE_REDIS_HOST ?? undefined,
-      username: env.RUN_ENGINE_DEV_PRESENCE_REDIS_USERNAME ?? undefined,
-      password: env.RUN_ENGINE_DEV_PRESENCE_REDIS_PASSWORD ?? undefined,
-      enableAutoPipelining: true,
-      ...(env.RUN_ENGINE_DEV_PRESENCE_REDIS_TLS_DISABLED === "true" ? {} : { tls: {} }),
-    });
-
     const checkAndSendPresence = async (send: SendFunction) => {
       try {
         // Use the command client for the GET operation
-        const currentPresenceValue = await cmdRedis.get(presenceKey);
-        const isConnected = !!currentPresenceValue;
-
-        // Format lastSeen as ISO string if it exists
-        let lastSeen = null;
-        if (currentPresenceValue) {
-          try {
-            lastSeen = new Date(currentPresenceValue).toISOString();
-          } catch (e) {
-            // If parsing fails, use current time as fallback
-            lastSeen = new Date().toISOString();
-            logger.warn("Failed to parse lastSeen value, using current time", {
-              originalValue: currentPresenceValue,
-            });
-          }
-        }
+        const isConnected = await devPresence.isConnected(environment.id);
 
         send({
           event: "presence",
           data: JSON.stringify({
-            type: isConnected ? "connected" : "disconnected",
+            isConnected,
             environmentId: environment.id,
-            timestamp: new Date().toISOString(), // Also standardize this to ISO
-            lastSeen: lastSeen,
+            timestamp: new Date().toISOString(),
           }),
         });
 
@@ -85,7 +57,6 @@ export const loader = createSSELoader({
       beforeStream: async () => {
         logger.debug("Start dev presence listening SSE session", {
           environmentId: environment.id,
-          presenceKey,
         });
       },
       initStream: async ({ send }) => {
@@ -98,7 +69,6 @@ export const loader = createSSELoader({
       },
       cleanup: async ({ send }) => {
         await checkAndSendPresence(send);
-        await cmdRedis.quit();
       },
     };
   },
diff --git a/apps/webapp/app/v3/services/triggerScheduledTask.server.ts b/apps/webapp/app/v3/services/triggerScheduledTask.server.ts
@@ -9,7 +9,7 @@ import { findCurrentWorkerDeployment } from "../models/workerDeployment.server";
 import { logger } from "~/services/logger.server";
 import { env } from "~/env.server";
 import Redis from "ioredis";
-import { DevPresenceStream } from "~/presenters/v3/DevPresenceStream.server";
+import { devPresence, DevPresence } from "~/presenters/v3/DevPresence.server";
 
 const redis = new Redis({
   port: env.RUN_ENGINE_DEV_PRESENCE_REDIS_PORT ?? undefined,
@@ -75,10 +75,9 @@ export class TriggerScheduledTaskService extends BaseService {
           !instance.environment.currentSession ||
           instance.environment.currentSession.disconnectedAt;
         //v4
-        const presenceKey = DevPresenceStream.getPresenceKey(instance.environment.id);
-        const v4Disconnected = await redis.get(presenceKey);
+        const v4Connected = await devPresence.isConnected(instance.environment.id);
 
-        if (v3Disconnected && v4Disconnected) {
+        if (v3Disconnected && !v4Connected) {
           shouldTrigger = false;
         }
       }
