From fe8e7eb098298475be759979e8d0c5cabc41d3bd Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Sat, 20 Dec 2025 18:30:40 +0100
Subject: [PATCH] display time left to node expiry on active nodes

---
 src/components/GatheringNode.vue | 42 ++++++++++++++++++++++++++------
 src/entities/Node.ts             | 22 +++++++++++++++++
 src/entities/TimeRange.ts        | 13 ++++++++++
 3 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/src/components/GatheringNode.vue b/src/components/GatheringNode.vue
index 5dfbdbf..202b015 100644
--- a/src/components/GatheringNode.vue
+++ b/src/components/GatheringNode.vue
@@ -3,10 +3,26 @@
     class="node"
     :class="{active: gatheringNode.isActive(eorzeaTime)}"
   >
-    <div class="timer">
-      {{
-        gatheringNode.isActive(eorzeaTime) ? 'Active' : prettyTimer(gatheringNode.getSecondsToNextActiveTime(eorzeaTime))
-      }}
+    <div
+      v-if="!gatheringNode.isActive(eorzeaTime)"
+    >
+      <div class="timer">
+        {{
+          prettyTimer(gatheringNode.getSecondsToNextActiveTime(eorzeaTime))
+        }}
+      </div>
+    </div>
+    <div
+      v-else
+    >
+      <div class="timer">
+        Active
+        <div class="countdown">
+          {{
+            prettyTimer(gatheringNode.getSecondsToNextInactiveTime(eorzeaTime))
+          }}
+        </div>
+      </div>
     </div>
     <div class="job">
       <div class="icon">
@@ -29,7 +45,9 @@
       <div class="info">
         <span>{{ zones[gatheringNode.nearestAetheryte.position.zone]?.name?.en }}</span>
         <span>{{ gatheringNode.nearestAetheryte.name.en }}</span>
-        <span>{{ gatheringNode.nearestAetheryte.position.x.toFixed(1) }}, {{ gatheringNode.nearestAetheryte.position.y.toFixed(1) }}</span>
+        <span>{{
+          gatheringNode.nearestAetheryte.position.x.toFixed(1)
+        }}, {{ gatheringNode.nearestAetheryte.position.y.toFixed(1) }}</span>
       </div>
     </div>
     <div class="items">
@@ -78,9 +96,15 @@ export default defineComponent({
 <style scoped lang="scss">
 
 @keyframes pulsing {
-  0% {background-color: rgba(255,255,255, 0.05);}
-  50% {background-color: rgba(255,255,255, 0.075);}
-  100% {background-color: rgba(255,255,255, 0.05);}
+  0% {
+    background-color: rgba(255, 255, 255, 0.05);
+  }
+  50% {
+    background-color: rgba(255, 255, 255, 0.075);
+  }
+  100% {
+    background-color: rgba(255, 255, 255, 0.05);
+  }
 }
 
 .node {
@@ -102,6 +126,8 @@ export default defineComponent({
     min-width: 7rem;
     font-size: 2rem;
     display: flex;
+    height: 100%;
+    flex-direction: column;
     justify-content: center;
     align-items: center;
   }
diff --git a/src/entities/Node.ts b/src/entities/Node.ts
index c4b25db..6862ba2 100644
--- a/src/entities/Node.ts
+++ b/src/entities/Node.ts
@@ -47,6 +47,15 @@ export default class Node {
     return countdown;
   }
 
+  getCountdownToInactive(eorzeaTime: EorzeaTime): number {
+    let countdown: number = Infinity;
+    for (const timeRange of this.times) {
+      const endTimeFrame: number = timeRange.getEndTimeFrame(eorzeaTime);
+      if (endTimeFrame < countdown) countdown = endTimeFrame;
+    }
+    return countdown;
+  }
+
   getNextActiveTime(eorzeaTime: EorzeaTime): EorzeaTime {
     let countdownTimeStamp: number = Infinity;
     for (const timeRange of this.times) {
@@ -56,8 +65,21 @@ export default class Node {
     return EorzeaTime.fromEorzeaTime(new Date(this.getCountdownToActive(eorzeaTime)));
   }
 
+  getNextInactiveTime(eorzeaTime: EorzeaTime): EorzeaTime {
+    let countdownTimeStamp: number = Infinity;
+    for (const timeRange of this.times) {
+        const endTimeFrame: number = timeRange.getEndTimeFrame(eorzeaTime);
+        if (endTimeFrame < countdownTimeStamp) countdownTimeStamp = endTimeFrame;
+    }
+    return EorzeaTime.fromEorzeaTime(new Date(this.getCountdownToInactive(eorzeaTime)));
+  }
+
   getSecondsToNextActiveTime(eorzeaTime: EorzeaTime): number {
     return Math.floor((this.getNextActiveTime(eorzeaTime).realDate.getTime() - eorzeaTime.realDate.getTime()) / 1000);
   }
 
+  getSecondsToNextInactiveTime(eorzeaTime: EorzeaTime): number {
+    return Math.floor((this.getNextInactiveTime(eorzeaTime).realDate.getTime() - eorzeaTime.realDate.getTime()) / 1000);
+  }
+
 }
diff --git a/src/entities/TimeRange.ts b/src/entities/TimeRange.ts
index 0b7e96f..f21cdfe 100644
--- a/src/entities/TimeRange.ts
+++ b/src/entities/TimeRange.ts
@@ -29,4 +29,17 @@ export default class TimeRange {
     return targetDate.getTime();
   }
 
+    /**
+     * Returns the timestamp when the current time range will end
+     * @param eorzeaTimeFrom
+     */
+  public getEndTimeFrame(eorzeaTimeFrom: EorzeaTime): number {
+    const targetDate = new Date(eorzeaTimeFrom.eorzeaDate.getTime());
+    targetDate.setUTCHours(this.to[0], 0, 0, 0);
+    if (eorzeaTimeFrom.getHours() >= this.to[0]) {
+      targetDate.setUTCHours(this.to[0] + 24);
+    }
+    return targetDate.getTime();
+  }
+
 }