@epiphytic/claudecodeui 1.0.0 → 1.1.0

package/server/orchestrator/client.js

@@ -277,7 +277,8 @@ export class OrchestratorClient extends EventEmitter {
     // Set timeout for pong response
     this.heartbeatTimeoutTimer = setTimeout(() => {
       console.warn("[ORCHESTRATOR] Heartbeat timeout, reconnecting...");
-      this.ws?.terminate();
+      // Force close without waiting - terminate() can block if socket is dead
+      this.forceReconnect();
     }, DEFAULTS.heartbeatTimeout);
   }
 
@@ -879,6 +880,41 @@ export class OrchestratorClient extends EventEmitter {
     return result;
   }
 
+  /**
+   * Force reconnect without waiting for socket close
+   * This handles the case where the socket is dead (e.g., after macOS sleep)
+   * and terminate() would block indefinitely
+   */
+  forceReconnect() {
+    console.log("[ORCHESTRATOR] Force reconnecting...");
+
+    // Mark as disconnected immediately
+    this.isConnected = false;
+    this.isRegistered = false;
+    this.stopHeartbeat();
+
+    // Try to close the socket, but don't wait for it
+    if (this.ws) {
+      try {
+        // Destroy the underlying socket directly to avoid blocking
+        if (this.ws._socket) {
+          this.ws._socket.destroy();
+        }
+        this.ws.terminate();
+      } catch (e) {
+        // Ignore errors - socket may already be dead
+      }
+      this.ws = null;
+    }
+
+    this.emit("disconnected", { code: 1006, reason: "Force reconnect" });
+
+    // Schedule reconnect
+    if (this.shouldReconnect) {
+      this.scheduleReconnect();
+    }
+  }
+
   /**
    * Starts the heartbeat interval
    */

package/server/projects-cache.js

@@ -0,0 +1,196 @@
+/**
+ * PROJECTS CACHE MODULE
+ * =====================
+ *
+ * In-memory cache for projects data with ETag support.
+ * Updated by the chokidar watcher when project files change.
+ * Mirrors the sessions-cache.js pattern for consistency.
+ */
+
+import crypto from "crypto";
+
+// Cache state
+let cachedProjects = [];
+let cacheVersion = 0;
+let cacheTimestamp = null;
+
+/**
+ * Timeframe definitions in milliseconds
+ * (Same as sessions-cache.js for consistency)
+ */
+const TIMEFRAME_MS = {
+  "1h": 60 * 60 * 1000,
+  "8h": 8 * 60 * 60 * 1000,
+  "1d": 24 * 60 * 60 * 1000,
+  "1w": 7 * 24 * 60 * 60 * 1000,
+  "2w": 14 * 24 * 60 * 60 * 1000,
+  "1m": 30 * 24 * 60 * 60 * 1000,
+  all: Infinity,
+};
+
+/**
+ * Calculate last activity timestamp for a project
+ * Based on the most recent session across all providers
+ */
+function calculateLastActivity(project) {
+  let lastActivity = null;
+
+  // Check Claude sessions
+  if (project.sessions && project.sessions.length > 0) {
+    for (const session of project.sessions) {
+      const sessionDate = new Date(session.lastActivity);
+      if (!lastActivity || sessionDate > lastActivity) {
+        lastActivity = sessionDate;
+      }
+    }
+  }
+
+  // Check Cursor sessions
+  if (project.cursorSessions && project.cursorSessions.length > 0) {
+    for (const session of project.cursorSessions) {
+      const sessionDate = new Date(session.createdAt || session.lastActivity);
+      if (!lastActivity || sessionDate > lastActivity) {
+        lastActivity = sessionDate;
+      }
+    }
+  }
+
+  // Check Codex sessions
+  if (project.codexSessions && project.codexSessions.length > 0) {
+    for (const session of project.codexSessions) {
+      const sessionDate = new Date(session.lastActivity || session.createdAt);
+      if (!lastActivity || sessionDate > lastActivity) {
+        lastActivity = sessionDate;
+      }
+    }
+  }
+
+  return lastActivity ? lastActivity.toISOString() : null;
+}
+
+/**
+ * Transform full project data to slim format
+ */
+function toSlimProject(project) {
+  const claudeCount = project.sessions?.length || 0;
+  const cursorCount = project.cursorSessions?.length || 0;
+  const codexCount = project.codexSessions?.length || 0;
+
+  return {
+    name: project.name,
+    displayName: project.displayName,
+    fullPath: project.fullPath || project.path,
+    sessionCount: claudeCount + cursorCount + codexCount,
+    lastActivity: calculateLastActivity(project),
+    hasClaudeSessions: claudeCount > 0,
+    hasCursorSessions: cursorCount > 0,
+    hasCodexSessions: codexCount > 0,
+    hasTaskmaster: project.taskmaster?.hasTaskmaster || false,
+    sessionMeta: project.sessionMeta,
+    isManuallyAdded: project.isManuallyAdded || false,
+    isCustomName: project.isCustomName || false,
+  };
+}
+
+/**
+ * Update the projects cache from full projects data
+ * Called after getProjects() completes
+ */
+function updateProjectsCache(projects) {
+  // Transform to slim format
+  cachedProjects = projects.map(toSlimProject);
+
+  // Sort by lastActivity descending (most recent first)
+  cachedProjects.sort((a, b) => {
+    const dateA = a.lastActivity ? new Date(a.lastActivity) : new Date(0);
+    const dateB = b.lastActivity ? new Date(b.lastActivity) : new Date(0);
+    return dateB - dateA;
+  });
+
+  cacheVersion++;
+  cacheTimestamp = new Date().toISOString();
+}
+
+/**
+ * Get projects filtered by timeframe
+ * Projects are included if their lastActivity is within the timeframe
+ */
+function getProjectsByTimeframe(timeframe = "1w") {
+  const now = Date.now();
+  const cutoffMs = TIMEFRAME_MS[timeframe] || TIMEFRAME_MS["1w"];
+
+  if (cutoffMs === Infinity) {
+    return {
+      projects: cachedProjects,
+      totalCount: cachedProjects.length,
+      filteredCount: cachedProjects.length,
+    };
+  }
+
+  const cutoffTime = now - cutoffMs;
+  const filteredProjects = cachedProjects.filter((project) => {
+    if (!project.lastActivity) {
+      return false; // Exclude projects with no sessions
+    }
+    const projectTime = new Date(project.lastActivity).getTime();
+    return projectTime >= cutoffTime;
+  });
+
+  return {
+    projects: filteredProjects,
+    totalCount: cachedProjects.length,
+    filteredCount: filteredProjects.length,
+  };
+}
+
+/**
+ * Generate ETag for current cache state + timeframe
+ */
+function generateETag(timeframe = "1w") {
+  const hash = crypto.createHash("md5");
+  hash.update(`projects-${cacheVersion}-${cacheTimestamp}-${timeframe}`);
+  return `"${hash.digest("hex")}"`;
+}
+
+/**
+ * Get cache metadata
+ */
+function getCacheMeta() {
+  return {
+    version: cacheVersion,
+    timestamp: cacheTimestamp,
+    projectCount: cachedProjects.length,
+  };
+}
+
+/**
+ * Check if cache is initialized
+ */
+function isCacheInitialized() {
+  return cacheTimestamp !== null;
+}
+
+/**
+ * Get the raw cached projects (for initial load)
+ */
+function getCachedProjects() {
+  return cachedProjects;
+}
+
+/**
+ * Get a single project from cache by name
+ */
+function getProjectFromCache(projectName) {
+  return cachedProjects.find((p) => p.name === projectName) || null;
+}
+
+export {
+  updateProjectsCache,
+  getProjectsByTimeframe,
+  generateETag,
+  getCacheMeta,
+  isCacheInitialized,
+  getCachedProjects,
+  getProjectFromCache,
+  TIMEFRAME_MS,
+};