feat: Don't show image, when nothing happen + show how much time waiting

Author: patrick11514

src/lib/server/nina.ts

@@ -1,3 +1,4 @@
+import sharp from 'sharp';
 import { NINA_BASE_URL, UPDATE_THRESHOLD_COUNT } from './variables';
 
 interface NinaResponse<T> {
@@ -27,13 +28,16 @@ interface SequenceItem {
   Items?: SequenceItem[];
   Name?: string;
   Triggers?: SequenceItem[];
+  TargetTime?: string;
+  Delay?: number;
 }
 
 export type LiveStatus = {
   active: boolean;
   imageInfo?: ImageHistoryItem;
   mountInfo?: MountInfo;
   currentAction?: string;
+  showImage?: boolean;
 };
 
 function isNetworkError(e: unknown, code: string): boolean {
@@ -77,7 +81,8 @@ export class NinaClient {
     }
   }
 
-  private mapRunningAction(name: string): string {
+  private mapRunningAction(item: SequenceItem): string {
+    const name = item.Name || '';
     const map: Record<string, string> = {
       'Meridian Flip_Trigger': 'Meridian flip',
       'Smart Exposure': 'Exposing',
@@ -88,31 +93,44 @@ export class NinaClient {
       'AF After HFR Increase_Trigger': 'Focusing',
       'Cool Camera': 'Cooling Camera',
       'Wait for Time': 'Waiting',
-      'Wait for Time Span': 'Waiting'
+      'Wait for Time Span': 'Waiting',
+      'Warm Camera': 'Warming Camera'
     };
 
-    return map[name] || name;
+    let action = map[name] || name;
+
+    if (name === 'Wait for Time' && item.TargetTime) {
+      const target = new Date(item.TargetTime).getTime();
+      const diff = Math.ceil((target - Date.now()) / 1000);
+      if (diff > 0) {
+        action += ` (${diff}s)`;
+      }
+    } else if (name === 'Wait for Time Span' && item.Delay) {
+      action += ` for ${item.Delay}s`;
+    }
+
+    return action;
   }
 
   // Helper to actually implement the recursive search properly aligned with logic
-  private getDeepestRunningName(items: SequenceItem[]): string | undefined {
+  private getDeepestRunningItem(items: SequenceItem[]): SequenceItem | undefined {
     for (const item of items) {
       // Check if this item is RUNNING
       if (item.Status === 'RUNNING') {
         // 1. Check Triggers for this item
         if (item.Triggers && Array.isArray(item.Triggers)) {
           const runningTrigger = item.Triggers.find((t) => t.Status === 'RUNNING');
-          if (runningTrigger) return runningTrigger.Name;
+          if (runningTrigger) return runningTrigger;
         }
 
         // 2. Check Children Items
         if (item.Items && item.Items.length > 0) {
-          const deepName = this.getDeepestRunningName(item.Items);
-          if (deepName) return deepName;
+          const deepItem = this.getDeepestRunningItem(item.Items);
+          if (deepItem) return deepItem;
         }
 
         // 3. If no children/triggers running, this is the deepest running item
-        return item.Name;
+        return item;
       }
     }
     return undefined;
@@ -136,11 +154,11 @@ export class NinaClient {
     const sequenceData =
       await this.fetch<NinaResponse<SequenceItem[]>>('api/sequence/json');
 
-    const deepestName =
+    const deepestItem =
       sequenceData?.Success && sequenceData.Response
-        ? this.getDeepestRunningName(sequenceData.Response)
+        ? this.getDeepestRunningItem(sequenceData.Response)
         : undefined;
-    const isRunning = !!deepestName;
+    const isRunning = !!deepestItem;
 
     if (!isRunning) {
       this.cachedLiveStatus = { active: false };
@@ -177,11 +195,31 @@ export class NinaClient {
       this.lastUpdate = now;
     }
 
+    const currentAction = this.mapRunningAction(deepestItem!);
+    const hiddenActions = [
+      'Meridian flip',
+      'Waiting',
+      'Cooling Camera',
+      'Warming Camera'
+    ];
+
+    let showImage = !hiddenActions.some((hidden) => currentAction.startsWith(hidden));
+
+    // Check if the last image is older than 10 minutes (600,000 ms)
+    if (imageInfo?.Date && Date.now() - new Date(imageInfo.Date).getTime() > 600000) {
+      showImage = false;
+    }
+
+    if (!this.cachedLiveImage) {
+      showImage = false;
+    }
+
     this.cachedLiveStatus = {
       active: true,
       mountInfo: mountData?.Response,
       imageInfo,
-      currentAction: this.mapRunningAction(deepestName!)
+      currentAction,
+      showImage
     };
 
     return this.cachedLiveStatus;
@@ -191,7 +229,11 @@ export class NinaClient {
     try {
       const res = await fetch(`${this.baseUrl}/v2/api/prepared-image`);
       if (!res.ok) return;
-      this.cachedLiveImage = Buffer.from(await res.arrayBuffer());
+      const buffer = Buffer.from(await res.arrayBuffer());
+
+      this.cachedLiveImage = await sharp(buffer)
+        .jpeg({ quality: 80, mozjpeg: true })
+        .toBuffer();
     } catch (e) {
       if (isNetworkError(e, 'ECONNREFUSED') || isNetworkError(e, 'EHOSTUNREACH')) {
         // Host unreachable, likely Nina is offline => don't spam errors

src/routes/[[lang=lang]]/live-photo/+page.svelte

@@ -46,7 +46,7 @@
 
   <div class="mt-8 grid grid-cols-1 gap-6 px-2 lg:grid-cols-3">
     <div class="lg:col-span-2">
-      {#if liveData?.active}
+      {#if liveData?.active && liveData?.showImage}
         <img
           src={`/api/live-image?t=${now}`}
           alt="Live view"
@@ -56,7 +56,9 @@
         <div
           class="flex aspect-video w-full items-center justify-center rounded-lg bg-black text-xl text-white shadow-lg"
         >
-          {appState.lang.live_photo.inactive}
+          {liveData?.active
+            ? liveData?.currentAction || appState.lang.live_photo.inactive
+            : appState.lang.live_photo.inactive}
         </div>
       {/if}
     </div>