Update update.sh

Author: michelroegl-brunner

src/app/_components/VersionDisplay.tsx

@@ -98,28 +98,25 @@ export function VersionDisplay() {
     }
   });
 
-  // Subscribe to update progress
-  api.version.streamUpdateProgress.useSubscription(undefined, {
+  // Poll for update logs
+  const { data: updateLogsData, refetch: refetchLogs } = api.version.getUpdateLogs.useQuery(undefined, {
     enabled: shouldSubscribe,
-    onData: (data) => {
+    refetchInterval: 1000, // Poll every second
+    refetchIntervalInBackground: true,
+  });
+
+  // Update logs when data changes
+  useEffect(() => {
+    if (updateLogsData?.success && updateLogsData.logs) {
       lastLogTimeRef.current = Date.now();
+      setUpdateLogs(updateLogsData.logs);
 
-      if (data.type === 'log') {
-        setUpdateLogs(prev => [...prev, data.message]);
-      } else if (data.type === 'complete') {
+      if (updateLogsData.isComplete) {
         setUpdateLogs(prev => [...prev, 'Update complete! Server restarting...']);
         setIsNetworkError(true);
-      } else if (data.type === 'error') {
-        setUpdateLogs(prev => [...prev, `Error: ${data.message}`]);
       }
-    },
-    onError: () => {
-      // Connection lost - likely server restarted
-      console.log('Update stream connection lost, server likely restarting');
-      setIsNetworkError(true);
-      setUpdateLogs(prev => [...prev, 'Connection lost - server restarting...']);
-    },
-  });
+    }
+  }, [updateLogsData]);
 
   // Monitor for server connection loss and auto-reload
   useEffect(() => {

src/server/api/routers/version.ts

@@ -3,8 +3,7 @@ import { readFile, writeFile } from "fs/promises";
 import { join } from "path";
 import { spawn } from "child_process";
 import { env } from "~/env";
-import { observable } from '@trpc/server/observable';
-import { existsSync, statSync, createWriteStream } from "fs";
+import { existsSync, createWriteStream } from "fs";
 
 interface GitHubRelease {
   tag_name: string;
@@ -127,52 +126,45 @@ export const versionRouter = createTRPCRouter({
       }
     }),
 
-  // Stream update progress by monitoring the log file
-  streamUpdateProgress: publicProcedure
-    .subscription(() => {
-      return observable<{ type: 'log' | 'complete' | 'error'; message: string }>((emit) => {
+  // Get update logs from the log file
+  getUpdateLogs: publicProcedure
+    .query(async () => {
+      try {
         const logPath = join(process.cwd(), 'update.log');
-        let lastSize = 0;
-
-        const checkLogFile = async () => {
-          try {
-            if (!existsSync(logPath)) {
-              return;
-            }
-
-            const stats = statSync(logPath);
-            const currentSize = stats.size;
-
-            if (currentSize > lastSize) {
-              // Read only the new content
-              const fileHandle = await readFile(logPath, 'utf-8');
-              const newContent = fileHandle.slice(lastSize);
-              lastSize = currentSize;
-
-              // Emit new log lines
-              const lines = newContent.split('\n').filter(line => line.trim());
-              for (const line of lines) {
-                emit.next({ type: 'log', message: line });
-              }
-            }
-          } catch {
-            // File might be being written to, ignore errors
-          }
-        };
-
-        // Start monitoring the log file
-        const checkInterval = setInterval(() => {
-          void checkLogFile();
-        }, 500);
+        
+        if (!existsSync(logPath)) {
+          return {
+            success: true,
+            logs: [],
+            isComplete: false
+          };
+        }
 
-        // Also check immediately
-        void checkLogFile();
+        const logs = await readFile(logPath, 'utf-8');
+        const logLines = logs.split('\n').filter(line => line.trim());
+        
+        // Check if update is complete by looking for completion indicators
+        const isComplete = logLines.some(line => 
+          line.includes('Update complete') || 
+          line.includes('Server restarting') ||
+          line.includes('npm start') ||
+          line.includes('Restarting server')
+        );
 
-        // Cleanup function
-        return () => {
-          clearInterval(checkInterval);
+        return {
+          success: true,
+          logs: logLines,
+          isComplete
         };
-      });
+      } catch (error) {
+        console.error('Error reading update logs:', error);
+        return {
+          success: false,
+          error: error instanceof Error ? error.message : 'Failed to read update logs',
+          logs: [],
+          isComplete: false
+        };
+      }
     }),
 
   // Execute update script