node-red-contrib-eskomsepush 0.0.12 → 0.0.14

package/package.json

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

package/src/nodes/eskomsepush.js

@@ -163,14 +163,16 @@ module.exports = function (RED) {
 
     // 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.type = 'event'
         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]
         }
+        EskomSePushInfo.calc.start = EventStart
+        EskomSePushInfo.calc.end = EventEnd
       } else {
         EskomSePushInfo.calc.next = {
           type: 'event',
@@ -185,7 +187,7 @@ module.exports = function (RED) {
     // 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]) {
+      for (const schedule of dates.stages[EskomSePushInfo.calc.stage-1]) {
         const ScheduleStart = Date.parse(dates.date + ' ' + schedule.split('-')[0])
         let ScheduleEnd = Date.parse(dates.date + ' ' + schedule.split('-')[1])
         if (ScheduleEnd < ScheduleStart) {
@@ -203,7 +205,8 @@ module.exports = function (RED) {
             EskomSePushInfo.calc.next = {
               type: 'schedule',
               start: ScheduleStart,
-              end: ScheduleEnd
+              end: ScheduleEnd,
+              stage: EskomSePushInfo.calc.stage
             }
           }
         }
@@ -216,6 +219,7 @@ module.exports = function (RED) {
       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)
+      EskomSePushInfo.calc.next.isHigherStage = EskomSePushInfo.calc.next.stage > EskomSePushInfo.calc.next.stage
     }
 
     if (EskomSePushInfo.calc.active) {
@@ -253,8 +257,10 @@ module.exports = function (RED) {
       if (EskomSePushInfo.calc.type === 'event') {
         shape = 'dot'
       }
-      statusText += new Date(EskomSePushInfo.calc.start).toLocaleTimeString([], {timeStyle: 'short'})
-      statusText += ' - ' + new Date(EskomSePushInfo.calc.end).toLocaleTimeString([], {timeStyle: 'short'})
+      if ( EskomSePushInfo.calc.start ) {
+        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'}) + ' '

package/test/three-anchor-bay.js

@@ -1,26 +0,0 @@
-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 }
-}