node-red-contrib-eskomsepush 0.0.10 → 0.0.12

package/README.md

@@ -53,6 +53,18 @@ Then you need to fill out which status to follow. This can be either _National_
 
 If the _test_ checkbox has been selected, test data for the specified area will be fetched instead of the actual schedule. This is useful when debugging.
 
+### Inputs
+
+The input side is not needed in most cases. The node will output its status every ten minutes and won't update the information it gets from the API more often. The input node however can be used to overrule this behaviour. When inserting a timestamp, the node will output the latest information it got and re-calculate all fields.
+
+There are also special strings that can be injected as payload to force updates:
+
+- `allowance` - for retrieving the latest API count values
+- `stage` - for retrieving the latest active load shedding stage
+- `area` - for retrieving the latest schedule information
+
+So usually there is no reason to connect anything to the input. It is only needed if you want to have more control over the node.
+
 ### Outputs
 
 The note has two outputs. In most cases, the first (upper) output will be used.
@@ -61,46 +73,34 @@ The first output of the node outputs a boolean value and some related data. When
 
 ```
 {
-  "payload":false,
-  "LoadShedding":{
-    "schedule":{
-       "next":{
-         "start":1683561600000,
-         "end":1683570600000,
-         "type":"schedule"
-       },
-       "active":false
-    },
-    "event":{
-      "next":{
-        "start":1683561600000,
-        "end":1683570600000
-      },
-      "active":false
-    },
-    "checked":"13:35",
-    "next":{
-      "start":1683561600000,
-      "end":1683570600000,
-      "type":"schedule"
-    },
-    "active":false
+  "payload": false,
+  "stage": "0",
+  "statusselect": "capetown",
+  "api": {
+    "count": 30,
+    "limit": 50
   },
-  "stage":"5",
-  "statusselect":"capetown",
-  "api":{
-    "count":12,
-    "limit":50,
-    "lastStatusUpdate":"Mon May 08 2023 13:34:30 GMT+0200 (Central European Summer Time)",
-    "lastScheduleUpdate":"Mon May 08 2023 13:34:30 GMT+0200 (Central European Summer Time)"
+  "calc": {
+    "sleeptime": "58",
+    "stage": "0",
+    "active": false,
+    "type": "event",
+    "next": {
+      "type": "schedule",
+      "start": 1686830400000,
+      "end": 1686839400000,
+      "duration": 9000,
+      "islong": false
+    },
+    "secondstostatechange": 84912
   },
-  "\_msgid":"6e77b593b7f9eda4"
+  "_msgid": "9fa5d503c47f083e"
 }
 ```
 
-The start and end objects contain the time of next load shedding period as unix timestamps in the Javascript format (milliseconds after the epoch).
+The _start_ and _end_ objects contain the time as unix timestamp in the Javascript format (milliseconds after the epoch), while the duration is in seconds. The `msg.calc.next.islong` value is boolean and will be _true_ if the shedding lasts 4 hours or longer.
 
-The second output shows `msg.stage` and `msg.schedule`, containing the latest information as retrieved from the API. This output is mainly useful when writing your own functions and logic.
+The second output shows `msg.stage` and `msg.schedule`, containing the latest information as retrieved from the API, with the lastUpdate field added. This output is mainly useful when debugging or writing your own functions and logic.
 
 ### Status
 
@@ -108,7 +108,7 @@ The status will show the situation regarding the API calls and when the next
 shedding wil start or end.  It also shows the count of API calls that have been
 done and how many are left. This updates every 10 minutes.
 
-The red color status can be either filled (dot) or not (ring). In case of a dot,
+The yellow color status can be either filled (dot) or not (ring). In case of a dot,
 the load schedding is because of an _event_. When it is a ring, it is caused by
 a matching _schedule_.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-eskomsepush",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Node-RED interface for the Eskomsepush API",
   "main": "index.js",
   "scripts": {

package/src/nodes/eskomsepush.html

@@ -39,7 +39,7 @@
             test: { value: false },
             verbose: {value: false}
         },
-        inputs:0,
+        inputs:1,
         outputs:2,
         icon: "eskomsepush.svg",
         label: function() {
@@ -126,7 +126,7 @@
         <ul id="list-areas"></ul>
 
         <p>
-            Queries left: <span id="api_info">unknown/unknown</span><br />
+            Queries used: <span id="api_info">unknown/unknown</span><br />
         <input type="text" id="searchAreaText" placeholder="Area" disabled />
         <button id="searchAreaId">Search</button><br />
     </p>
@@ -159,60 +159,65 @@ see how many queries you have left.</p>
 <p>Next you need to insert the correct area. Once a valid license is filled out, the API can be used for searching the correct area id. Do note that this will cost some of the daily queries. If you don&#39;t want that and you already know the id of the area, fill out the area id manually.</p>
 <p>Then you need to fill out which status to follow. This can be either <em>National</em> (eskom) or <em>Capetown</em>.</p>
 <p>If the <em>test</em> checkbox has been selected, test data for the area will be fetched instead of the actual schedule. This is useful when debugging.</p>
+<p>The <em>verbose</em> checkbox will give some additional <tt>node.warn()</tt> messages, appearing in the debug tab. This is also useful when debugging.</p>
+
+<h3 id=""inputs">Inputs</h3>
+
+<p>
+    The input side is not needed in most cases. The node will output its status every ten minutes and won't update the information it gets from the API more 
+    often. The input node however can be used to overrule this behaviour. When inserting a timestamp, the node will output the latest information it got and
+    re-calculate all fields.
+</p>
+
+<p>There are also special strings that can be injected as payload to force updates:
+    <ul>
+        <li><code>allowance</code> - for retrieving the latest API count values</li>
+        <li><code>stage</code> - for retrieving the latest active load shedding stage</li>
+        <li><code>area</code> - for retrieving the latest schedule information</li>
+    </ul>
+</p>
+
+<p>
+    So usually there is no reason to connect anything to the input. It is only needed if you want to have more control over the node.
+</p>
 
 <h3 id="outputs">Outputs</h3>
 
 <p>The first output of the node outputs a boolean value. When load shedding is active, the <code>msg.payload</code> will be <em>true</em>, otherwise it will be <em>false</em>. It also outputs some extra values:</p>
 
 <pre>
-{
-    "payload": false,
-    "LoadShedding": {
-        "schedule": {
-        "next": {
-            "start": 1684267200000,
-            "end": 1684276200000,
+    {
+        "payload": false,
+        "stage": "0",
+        "statusselect": "capetown",
+        "api": {
+          "count": 30,
+          "limit": 50
+        },
+        "calc": {
+          "sleeptime": "58",
+          "stage": "0",
+          "active": false,
+          "type": "event",
+          "next": {
             "type": "schedule",
+            "start": 1686830400000,
+            "end": 1686839400000,
             "duration": 9000,
             "islong": false
+          },
+          "secondstostatechange": 84912
         },
-        "active": false
-        },
-        "event": {
-        "next": {
-            "start": 1684267200000,
-            "end": 1684276200000
-        },
-        "active": false
-        },
-        "checked": "15:38",
-        "next": {
-        "start": 1684267200000,
-        "end": 1684276200000,
-        "type": "schedule",
-        "duration": 9000,
-        "islong": false
-        },
-        "active": false
-    },
-    "stage": "3",
-    "statusselect": "capetown",
-    "api": {
-        "count": 45,
-        "limit": 50,
-        "lastStatusUpdate": "Tue May 16 2023 15:38:15 GMT+0200 (Central European Summer Time)",
-        "lastScheduleUpdate": "Tue May 16 2023 15:38:15 GMT+0200 (Central European Summer Time)"
-    },
-    "_msgid": "dfa429a93a16472d"
-    }
+        "_msgid": "9fa5d503c47f083e"
+      }
 </pre>
 
 <p>The <tt>start</tt> and <tt>end</tt> objects contain the time as unix timestamp in the Javascript format (milliseconds after the epoch),
-    while the <tt>duration</tt> is in seconds. The <code>msg.LoadShedding.next.islong</code> value is boolean and will be <em>true</em> if the
+    while the <tt>duration</tt> is in seconds. The <code>msg.calc.next.islong</code> value is boolean and will be <em>true</em> if the
     shedding lasts 4 hours or longer.</p>
 
-<p>The second output shows <code>msg.stage</code> and <code>msg.schedule</code>, containing the latest information as retrieved from the API.
-This output is mainly useful when debugging or writing your own functions and logic.</p>
+<p>The second output shows <code>msg.stage</code> and <code>msg.schedule</code>, containing the latest information as retrieved from the API,
+    with the <tt>lastUpdate</tt> field added. This output is mainly useful when debugging or writing your own functions and logic.</p>
 
 <h3 id="status">Status</h3>
 

package/src/nodes/eskomsepush.js

@@ -2,45 +2,32 @@ module.exports = function (RED) {
   'use strict'
 
   const axios = require('axios')
-  let EskomSePushAPI = null
-  let Stage = null
-  let Schedule = null
-  let LoadShedding = null
-  let lastStatusUpdate = new Date()
-  let lastStageUpdate = new Date()
-  let lastScheduleUpdate = new Date()
-
-  function updateStatus (node) {
-    let fill = 'green'
-    let shape = 'ring'
-    let statusText = ''
+  const EskomSePushInfo = {
+    api: {
+      lastUpdate: null,
+      info: {}
+    },
+    status: {
+      lastUpdate: null,
+      info: {}
+    },
+    area: {
+      lastUpdate: null,
+      info: {}
+    },
+    calc: {}
+  }
 
-    if (node.config.verbose === true) {
-      node.warn('Running function updateStatus')
-    }
-    if (Stage && Stage.status && Stage.status[node.config.statusselect].stage) {
-      statusText += 'Stage ' + (Stage.active || Stage.status[node.config.statusselect].stage)
-    }
-    if (LoadShedding && LoadShedding.active && LoadShedding.next && LoadShedding.next.end) {
-      statusText += ' - ' + new Date(LoadShedding.next.end).toLocaleTimeString()
-      fill = 'yellow'
-      if (LoadShedding.type === 'event') {
-        shape = 'dot'
-      }
-    } else {
-      if (LoadShedding && LoadShedding.next && LoadShedding.next.start) {
-        statusText += ' - ' + new Date(LoadShedding.next.start).toLocaleTimeString()
-      }
-    }
-    if (EskomSePushAPI) {
-      statusText += ` (API: ${EskomSePushAPI.allowance.count}/${EskomSePushAPI.allowance.limit})`
-      if (EskomSePushAPI.allowance.count >= EskomSePushAPI.allowance.limit) {
-        fill = 'red'
-      }
+  function getMinutesToAPIReset () {
+    const now = new Date()
+    const targetTime = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 2, 0, 0);
+    if (now > targetTime) {
+      targetTime.setDate(targetTime.getDate() + 1);
     }
-    node.status({
-      fill, shape, text: statusText
-    })
+    const timeDiff = targetTime - now;
+    const minutesLeft = Math.floor(timeDiff / (1000 * 60))
+
+    return minutesLeft
   }
 
   function checkAllowance (node) {
@@ -52,8 +39,12 @@ module.exports = function (RED) {
     }
     axios.get('https://developer.sepush.co.za/business/2.0/api_allowance',
       { params: options, headers }).then(function (response) {
-      EskomSePushAPI = response.data
-      updateStatus(node)
+      EskomSePushInfo.api.info = response.data
+      if (EskomSePushInfo.api.lastUpdate === null) {
+        EskomSePushInfo.api.lastUpdate = new Date()
+        updateSheddingStatus(node)
+      }
+      EskomSePushInfo.api.lastUpdate = new Date()
     })
       .catch(error => {
         node.warn({ error: error.message })
@@ -65,11 +56,19 @@ module.exports = function (RED) {
     const headers = { token: node.config.licensekey }
 
     if (node.config.verbose === true) {
-      node.warn('Running function checkStage')
+      let warnstring = 'Running function checkStage'
+      if (EskomSePushInfo.status.lastUpdate === null) {
+        warnstring += ' - initial run'
+      } else {
+        warnstring += ' after ' + ((new Date() - EskomSePushInfo.status.lastUpdate) / 60000).toFixed(0) + ' minutes'
+      }
+      node.warn(warnstring)
     }
     axios.get('https://developer.sepush.co.za/business/2.0/status',
       { params: options, headers }).then(function (response) {
-      Stage = response.data
+      EskomSePushInfo.status.info = response.data
+      EskomSePushInfo.status.lastUpdate = new Date()
+      // Call updateSheddingStatus again now we have new data
       updateSheddingStatus(node)
     })
       .catch(error => {
@@ -77,21 +76,28 @@ module.exports = function (RED) {
       })
   }
 
-  function checkSchedule (node) {
+  function checkArea (node) {
     const options = { id: node.config.area }
     const headers = { token: node.config.licensekey }
     const url = 'https://developer.sepush.co.za/business/2.0/area'
 
     if (node.config.verbose === true) {
-      node.warn('Running function checkSchedule')
+      let warnstring = 'Running function checkArea'
+      if (EskomSePushInfo.area.lastUpdate === null) {
+        warnstring += ' - initial run'
+      } else {
+        warnstring += ' after ' + ((new Date() - EskomSePushInfo.area.lastUpdate) / 60000).toFixed(0) + ' minutes'
+      }
+      node.warn(warnstring)
     }
     if (node.config.test) {
       options.test = 'current'
     }
     axios.get(url,
       { params: options, headers }).then(function (response) {
-      Schedule = response.data
-      Schedule.info.area = node.config.area
+      EskomSePushInfo.area.info = response.data
+      EskomSePushInfo.area.lastUpdate = new Date()
+      // Call updateSheddingStatus again now we have new data
       updateSheddingStatus(node)
     })
       .catch(error => {
@@ -99,156 +105,168 @@ module.exports = function (RED) {
       })
   }
 
-  function updateSheddingStatus (node) {
+  function updateSheddingStatus (node, msg) {
     const now = new Date()
 
-    if (node.config.verbose === true) {
-      node.warn('Running function updateSheddingStatus')
-    }
-    if (EskomSePushAPI === null || (now.getTime() - lastStatusUpdate.getTime()) > 600000) {
+    // Check allowance every ten minutes
+    if ((msg && msg.payload === 'allowance' ) || EskomSePushInfo.api.lastUpdate === null || (now.getTime() - EskomSePushInfo.api.lastUpdate.getTime()) > 600000) {
       checkAllowance(node)
-      lastStatusUpdate = now
     }
 
-    if (Schedule && Schedule.info.area !== node.config.area) {
-      Schedule = null
+    // If we don't have API info, we just return
+    if (Object.entries(EskomSePushInfo.api.info).length === 0) {
+      node.warn('No API info (yet), refusing to continue')
+      return
     }
 
-    if (EskomSePushAPI && EskomSePushAPI.allowance.count >= EskomSePushAPI.allowance.limit) {
-      updateStatus(node)
+    // The same is true if we have no API calls left
+    if (EskomSePushInfo.api.info.allowance.count >= EskomSePushInfo.api.info.allowance.limit) {
+      node.warn('No API calls left, not checking status/schedule')
       return
     }
 
-    if (Stage === null || (now.getTime() - lastStageUpdate.getTime()) > 3600000) {
+    // Fetching actual information takes 2 calls, so calculate how long until the next API count
+    // reset and divide the calls over the day. Wait at least 10 minutes between calls
+    if ((EskomSePushInfo.api.info.allowance.limit - EskomSePushInfo.api.info.allowance.count) > 0) {
+      EskomSePushInfo.calc.sleeptime = (getMinutesToAPIReset() / ((EskomSePushInfo.api.info.allowance.limit - EskomSePushInfo.api.info.allowance.count) / 2)).toFixed(0)
+      if (EskomSePushInfo.calc.sleeptime < 10) { EskomSePushInfo.calc.sleeptime = 10 }
+    } else {
+      EskomSePushInfo.calc.sleeptime = 30
+    }
+
+    if (( msg && msg.payload === 'stage' ) || EskomSePushInfo.status.lastUpdate === null || (now.getTime() - EskomSePushInfo.status.lastUpdate) > (EskomSePushInfo.calc.sleeptime * 60000)) {
       checkStage(node)
-      lastStageUpdate = now
     }
 
-    if (Schedule === null || (now.getTime() - lastScheduleUpdate.getTime()) > 3600000) {
-      checkSchedule(node)
-      lastScheduleUpdate = now
+    if (( msg && msg.payload === 'area' ) || EskomSePushInfo.area.lastUpdate === null || (now.getTime() - EskomSePushInfo.area.lastUpdate) > (EskomSePushInfo.calc.sleeptime * 60000)) {
+      checkArea(node)
     }
 
-    if (Stage && Schedule && EskomSePushAPI) {
-      let stage = Stage.status[node.config.statusselect].stage
-      const nowtime = now.toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit' })
-      LoadShedding = {
-        schedule: {
-          next: {},
-          active: false
-        },
-        event: {
-          next: {},
-          active: false
-        },
-        checked: nowtime
-      }
+    // Now we have all info to continue. Just making sure that all update values are non null.
+    if (EskomSePushInfo.api.lastUpdate === null ||
+        EskomSePushInfo.status.lastUpdate === null ||
+        EskomSePushInfo.area.lastUpdate === null) {
+      (node.config.verbose === true) && node.warn('Not enough info to continue.')
+      return
+    }
 
-      if (!Array.isArray(Schedule.schedule.days[0].stages[stage])) {
-        node.warn(`No schedule defined for stage ${stage}`)
-        return
+    // Determine the current stage
+    EskomSePushInfo.calc.stage = EskomSePushInfo.status.info.status[node.config.statusselect].stage
+
+    if (node.config.verbose === true) {
+      node.warn('API call status: ' + EskomSePushInfo.api.info.allowance.count + '/' + EskomSePushInfo.api.info.allowance.limit)
+      node.warn(EskomSePushInfo)
+    }
+
+    // Default to false, overrule of loadshedding is active
+    EskomSePushInfo.calc.active = false
+
+    // Are there any events going on?
+    if (Object.entries(EskomSePushInfo.area.info.events).length > 0) {
+      EskomSePushInfo.calc.type = 'event'
+      const EventStart = Date.parse(EskomSePushInfo.area.info.events[0].start)
+      const EventEnd = Date.parse(EskomSePushInfo.area.info.events[0].end)
+      if (now >= EventStart && now < EventEnd) {
+        EskomSePushInfo.calc.active = true
+        if (EskomSePushInfo.area.info.events[0].note.match(/Stage (\d+)/i)) {
+          EskomSePushInfo.calc.stage = EskomSePushInfo.area.info.events[0].note.match(/Stage (\d+)/i)[1]
+        }
+      } else {
+        EskomSePushInfo.calc.next = {
+          type: 'event',
+          start: EventStart,
+          end: EventEnd,
+          stage: EskomSePushInfo.area.info.events[0].note.match(/Stage (\d+)/i)[1]
+        }
       }
+    }
 
-      for (const schedule of Schedule.schedule.days[0].stages[stage]) {
-        if (nowtime >= schedule.split('-')[0] && nowtime <= schedule.split('-')[1]) {
-          LoadShedding.schedule = {
-            active: true
-          }
-          if (schedule.split('-')[0] < schedule.split('-')[1]) {
-            LoadShedding.schedule.next = {
-              start: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[0]),
-              end: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[1])
-            }
-          } else {
-            LoadShedding.schedule.next = {
-              start: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[0]),
-              end: Date.parse(Schedule.schedule.days[1].date + ' ' + schedule.split('-')[1])
-            }
-          }
+    // Scheduled downtime has the thing that the time is in locatime
+    // So not just like events, where they are in UTC with an offset
+    let BreakLoop = false
+    for (const dates of EskomSePushInfo.area.info.schedule.days) {
+      for (const schedule of dates.stages[EskomSePushInfo.calc.stage]) {
+        const ScheduleStart = Date.parse(dates.date + ' ' + schedule.split('-')[0])
+        let ScheduleEnd = Date.parse(dates.date + ' ' + schedule.split('-')[1])
+        if (ScheduleEnd < ScheduleStart) {
+          ScheduleEnd += (24 * 60 * 60 * 1000)
         }
-        if (nowtime < schedule.split('-')[0]) {
-          if (schedule.split('-')[0] < schedule.split('-')[1]) {
-            LoadShedding.schedule.next = {
-              start: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[0]),
-              end: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[1])
-            }
+        if (now < ScheduleEnd) {
+          BreakLoop = true
+          // This schedule is either active or will be next
+          if (now >= ScheduleStart) {
+            EskomSePushInfo.calc.active = true
+            EskomSePushInfo.calc.type = 'schedule'
+            EskomSePushInfo.calc.start = ScheduleStart
+            EskomSePushInfo.calc.end = ScheduleEnd
           } else {
-            LoadShedding.schedule.next = {
-              start: Date.parse(Schedule.schedule.days[0].date + ' ' + schedule.split('-')[0]),
-              end: Date.parse(Schedule.schedule.days[1].date + ' ' + schedule.split('-')[1])
+            EskomSePushInfo.calc.next = {
+              type: 'schedule',
+              start: ScheduleStart,
+              end: ScheduleEnd
             }
           }
         }
+        if (BreakLoop) { break }
       }
-      if (!LoadShedding.schedule.active && Object.keys(LoadShedding.schedule.next).length === 0) {
-        const s = Schedule.schedule.days[1].stages[stage - 1][0]
-        LoadShedding.schedule.next = {
-          start: Date.parse(Schedule.schedule.days[1].date + ' ' + s.split('-')[0]),
-          end: Date.parse(Schedule.schedule.days[1].date + ' ' + s.split('-')[1])
-        }
-      }
-      LoadShedding.event.next = {
-        start: Date.parse(Schedule.events[0].start),
-        end: Date.parse(Schedule.events[0].end)
-      }
-      if (now >= LoadShedding.event.next.start && now < LoadShedding.event.next.end) {
-        LoadShedding.event.active = true
-        if (Schedule.events[0].note.match(/Stage (\d+)/i)) {
-          stage = Schedule.events[0].note.match(/Stage (\d+)/i)[1]
-          Stage.active = stage
-        }
-      } else {
-        Stage.active = stage
-      }
+      if (BreakLoop) { break }
+    }
 
-      if (!LoadShedding.schedule | !LoadShedding.schedule.next ||
-         !LoadShedding.event || !LoadShedding.event.next ||
-         !LoadShedding.schedule.next.start || !LoadShedding.event.next.start) {
-        node.warn('Unable to find next scheduled event and/or schedule')
-        node.warn(LoadShedding)
-        return
-      }
-      if (LoadShedding.schedule.next.start <= LoadShedding.event.next.start) {
-        LoadShedding.next = LoadShedding.schedule.next
-        LoadShedding.next.type = 'schedule'
-      } else {
-        LoadShedding.next = LoadShedding.event.next
-        LoadShedding.next.type = 'event'
-      }
+    if (EskomSePushInfo.calc.next) {
+      EskomSePushInfo.calc.next.duration = (EskomSePushInfo.calc.next.end - EskomSePushInfo.calc.next.start) / 1000
+      EskomSePushInfo.calc.next.islong = EskomSePushInfo.calc.next.duration >= (4 * 3600)
+      EskomSePushInfo.calc.secondstostatechange = parseInt((EskomSePushInfo.calc.next.start - now) / 1000)
+    }
+
+    if (EskomSePushInfo.calc.active) {
+      EskomSePushInfo.calc.duration = (EskomSePushInfo.calc.end - EskomSePushInfo.calc.start) / 1000
+      EskomSePushInfo.calc.islong = EskomSePushInfo.calc.duration >= (4 * 3600)
+      EskomSePushInfo.calc.secondstostatechange = parseInt((EskomSePushInfo.calc.end - now) / 1000)
+    }
+
+    if (node.config.verbose === true) {
+      node.warn(EskomSePushInfo.calc)
+    }
 
-      LoadShedding.next.duration = (LoadShedding.next.end - LoadShedding.next.start) / 1000
-      LoadShedding.next.islong = LoadShedding.next.duration >= (4 * 3600)
+    // Send output
+    node.send([{
+      payload: EskomSePushInfo.calc.active,
+      stage: EskomSePushInfo.calc.stage,
+      statusselect: node.config.statusselect,
+      api: {
+        count: EskomSePushInfo.api.info.allowance.count,
+        limit: EskomSePushInfo.api.info.allowance.limit
+      },
+      calc: EskomSePushInfo.calc
+    }, {
+      stage: EskomSePushInfo.status,
+      schedule: EskomSePushInfo.area
+    }])
 
-      LoadShedding.active = (LoadShedding.schedule.active || LoadShedding.event.active)
-      if (LoadShedding.schedule.active) {
-        LoadShedding.type = 'schedule'
-        LoadShedding.start = LoadShedding.schedule.next.start
-        LoadShedding.end = LoadShedding.schedule.next.end
+    // And update the status
+    let fill = 'green'
+    let shape = 'ring'
+    let statusText = 'Stage ' + EskomSePushInfo.calc.stage + ': '
+
+    if (EskomSePushInfo.calc.active) {
+      fill = 'yellow'
+      if (EskomSePushInfo.calc.type === 'event') {
+        shape = 'dot'
       }
-      if (LoadShedding.event.active) {
-        LoadShedding.type = 'event'
-        LoadShedding.start = LoadShedding.event.next.start
-        LoadShedding.end = LoadShedding.event.next.end
+      statusText += new Date(EskomSePushInfo.calc.start).toLocaleTimeString([], {timeStyle: 'short'})
+      statusText += ' - ' + new Date(EskomSePushInfo.calc.end).toLocaleTimeString([], {timeStyle: 'short'})
+    } else {
+      if (new Date(EskomSePushInfo.calc.next.start).getUTCDay() !==  now.getUTCDate) {
+        statusText += new Date(EskomSePushInfo.calc.next.start).toLocaleString([], {weekday: 'short'}) + ' '
       }
-
-      node.send([{
-        payload: LoadShedding.active,
-        LoadShedding,
-        stage,
-        statusselect: node.config.statusselect,
-        api: {
-          count: EskomSePushAPI.allowance.count,
-          limit: EskomSePushAPI.allowance.limit,
-          lastStatusUpdate: lastStatusUpdate.toString(),
-          lastScheduleUpdate: lastScheduleUpdate.toString()
-        }
-      }, {
-        stage: Stage,
-        schedule: Schedule
-      }])
+      statusText += new Date(EskomSePushInfo.calc.next.start).toLocaleTimeString([], {timeStyle: 'short'})
+      statusText += ' - ' + new Date(EskomSePushInfo.calc.next.end).toLocaleTimeString([], {timeStyle: 'short'})
     }
 
-    updateStatus(node)
+    statusText += ' (API: ' + EskomSePushInfo.api.info.allowance.count + '/' + EskomSePushInfo.api.info.allowance.limit + ')'
+    node.status({
+      fill, shape, text: statusText
+    })
   }
 
   function EskomSePush (config) {
@@ -262,6 +280,10 @@ module.exports = function (RED) {
       updateSheddingStatus(node)
     }, 60000)
 
+    node.on('input', function(msg) {
+      updateSheddingStatus(node, msg)
+    })
+
     node.on('close', function () {
       clearInterval(intervalId)
     })

package/test/three-anchor-bay.js

@@ -0,0 +1,26 @@
+const EskomSePushInfo = { stage: { lastUpdate: '2023-06-16T07:18:37.847Z', info: { status: { capetown: { name: 'Cape Town', next_stages: [{ stage: '1', stage_start_timestamp: '2023-06-16T16:00:00+02:00' }, { stage: '0', stage_start_timestamp: '2023-06-17T00:00:00+02:00' }, { stage: '1', stage_start_timestamp: '2023-06-17T16:00:00+02:00' }, { stage: '0', stage_start_timestamp: '2023-06-18T00:00:00+02:00' }, { stage: '1', stage_start_timestamp: '2023-06-18T16:00:00+02:00' }], stage: '0', stage_updated: '2023-06-16T00:00:00.742510+02:00' }, eskom: { name: 'Eskom', next_stages: [{ stage: '3', stage_start_timestamp: '2023-06-16T16:00:00+02:00' }, { stage: '0', stage_start_timestamp: '2023-06-17T00:00:00+02:00' }, { stage: '3', stage_start_timestamp: '2023-06-17T16:00:00+02:00' }, { stage: '0', stage_start_timestamp: '2023-06-18T00:00:00+02:00' }, { stage: '3', stage_start_timestamp: '2023-06-18T16:00:00+02:00' }], stage: '0', stage_updated: '2023-06-16T00:00:00.742510+02:00' } } } }, schedule: { lastUpdate: '2023-06-16T07:18:38.957Z', info: { events: [{ end: '2023-06-17T00:30:00+02:00', note: 'Stage 1', start: '2023-06-16T22:00:00+02:00' }], info: { name: 'Helderberg Village (3)', region: 'City of Cape Town' }, schedule: { days: [{ date: '2023-06-16', name: 'Friday', stages: [['22:00-00:30'], ['06:00-08:30', '22:00-00:30'], ['06:00-08:30', '22:00-00:30'], ['06:00-08:30', '14:00-16:30', '22:00-00:30'], ['06:00-08:30', '14:00-16:30', '22:00-00:30'], ['06:00-08:30', '12:00-16:30', '22:00-00:30'], ['04:00-08:30', '12:00-16:30', '22:00-00:30'], ['04:00-08:30', '12:00-16:30', '20:00-00:30']] }, { date: '2023-06-17', name: 'Saturday', stages: [['04:00-06:30'], ['04:00-06:30', '20:00-22:30'], ['04:00-06:30', '12:00-14:30', '20:00-22:30'], ['04:00-06:30', '12:00-14:30', '20:00-22:30'], ['02:00-06:30', '12:00-14:30', '20:00-22:30'], ['02:00-06:30', '12:00-14:30', '18:00-22:30'], ['02:00-06:30', '10:00-14:30', '18:00-22:30'], ['02:00-06:30', '10:00-14:30', '18:00-22:30']] }, { date: '2023-06-18', name: 'Sunday', stages: [['12:00-14:30'], ['12:00-14:30'], ['12:00-14:30', '20:00-22:30'], ['04:00-06:30', '12:00-14:30', '20:00-22:30'], ['04:00-06:30', '10:00-14:30', '20:00-22:30'], ['04:00-06:30', '10:00-14:30', '20:00-22:30'], ['04:00-06:30', '10:00-14:30', '18:00-22:30'], ['02:00-06:30', '10:00-14:30', '18:00-22:30']] }, { date: '2023-06-19', name: 'Monday', stages: [['20:00-22:30'], ['04:00-06:30', '20:00-22:30'], ['04:00-06:30', '20:00-22:30'], ['04:00-06:30', '12:00-14:30', '20:00-22:30'], ['04:00-06:30', '12:00-14:30', '18:00-22:30'], ['02:00-06:30', '12:00-14:30', '18:00-22:30'], ['02:00-06:30', '12:00-14:30', '18:00-22:30'], ['02:00-06:30', '10:00-14:30', '18:00-22:30']] }, { date: '2023-06-20', name: 'Tuesday', stages: [[], ['12:00-14:30'], ['04:00-06:30', '12:00-14:30'], ['04:00-06:30', '12:00-14:30', '20:00-22:30'], ['04:00-06:30', '12:00-14:30', '20:00-22:30'], ['04:00-06:30', '10:00-14:30', '20:00-22:30'], ['02:00-06:30', '10:00-14:30', '20:00-22:30'], ['02:00-06:30', '10:00-14:30', '18:00-22:30']] }, { date: '2023-06-21', name: 'Wednesday', stages: [['02:00-04:30'], ['02:00-04:30', '18:00-20:30'], ['02:00-04:30', '10:00-12:30', '18:00-20:30'], ['02:00-04:30', '10:00-12:30', '18:00-20:30'], ['00:00-04:30', '10:00-12:30', '18:00-20:30'], ['00:00-04:30', '10:00-12:30', '16:00-20:30'], ['00:00-04:30', '08:00-12:30', '16:00-20:30'], ['00:00-04:30', '08:00-12:30', '16:00-20:30']] }, { date: '2023-06-22', name: 'Thursday', stages: [['10:00-12:30'], ['10:00-12:30'], ['10:00-12:30', '18:00-20:30'], ['02:00-04:30', '10:00-12:30', '18:00-20:30'], ['02:00-04:30', '08:00-12:30', '18:00-20:30'], ['02:00-04:30', '08:00-12:30', '18:00-20:30'], ['02:00-04:30', '08:00-12:30', '16:00-20:30'], ['00:00-04:30', '08:00-12:30', '16:00-20:30']] }], source: 'https://www.capetown.gov.za/loadshedding/' } } }, _msgid: 'e5eceed861704158' }
+
+const now = new Date()
+let BreakLoop = false
+for (const dates of EskomSePushInfo.schedule.info.schedule.days) {
+  for (const schedule of dates.stages['0']) {
+    const ScheduleStart = Date.parse(dates.date + ' ' + schedule.split('-')[0])
+    let ScheduleEnd = Date.parse(dates.date + ' ' + schedule.split('-')[1])
+    if (ScheduleEnd < ScheduleStart) {
+      ScheduleEnd += (24 * 60 * 60 * 1000)
+    }
+    console.log('check: ' + new Date(ScheduleEnd))
+    if (now < new Date(ScheduleEnd)) {
+      BreakLoop = true
+      // This schedule is either active or will be next
+      if (now >= ScheduleStart) {
+        console.log('match')
+      } else {
+        console.log('next found')
+        console.log(new Date(ScheduleStart).toLocaleString())
+      }
+    }
+    if (BreakLoop) { break }
+  }
+  if (BreakLoop) { break }
+}