Replace runAtSpecificTimeOfDay with UTC logic (#44)

* Replace runAtSpecificTimeOfDay with UTC logic

* Update restrictedHours to use UTC times

* Directly increment next Date to avoid looping

Author: MattIPv4

src/config/config.js

@@ -17,7 +17,7 @@ const pauseCloudSceneChange = false;
 const announceChatSceneChange = false;
 //UTC TIME
 const notifyHours = {start:14,end:23};
-const restrictedHours = {start:9,end:18};
+const restrictedHours = {start:14,end:23};
 const globalMusicSource = "Music Playlist Global";
 
 const userRanks = {

src/modules/legacy.js

@@ -1,6 +1,6 @@
-const UtilsModule = require("../utils/utilsModule");
 const config = require("../config/config");
 const helper = require("../utils/helper");
+const schedule = require("../utils/schedule");
 const Logger = require("../utils/logger");
 
 const logger = new Logger("modules/legacy");
@@ -41,7 +41,7 @@ const main = async controller => {
 		setPTZRoamMode(controller, currentScene);
 	}
 
-	runAtSpecificTimeOfDay(config.restrictedHours.start - 1, 55, () => {
+	schedule(config.restrictedHours.start - 1, 55, () => {
 		try {
 			let now = new Date();
 			let minutes = now.getUTCMinutes();
@@ -2780,40 +2780,4 @@ async function setPTZRoamMode(controller, scene) {
 	roamTimeout = setTimeout(setPTZRoamMode, length * 1000, controller, scene);
 }
 
-// function runAtSpecificTimeOfDay(hour, minutes, func) {
-// 	const twentyFourHours = 86400000;
-// 	const now = new Date();
-// 	let eta_ms = new Date(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), hour, minutes, 0, 0).getTime() - now;
-// 	if (eta_ms < 0) {
-// 		eta_ms += twentyFourHours;
-// 	}
-// 	let nowMin = now.getUTCMinutes();
-// 	let nowHour = now.getUTCHours();
-// 	logger.log("check time: ",now,nowHour,nowMin,config);
-// 	logger.log("setup !livecam Timer for: ",eta_ms);
-// 	setTimeout(function () {
-// 		//run once
-// 		func();
-// 		// run every 24 hours from now on
-// 		setInterval(func, twentyFourHours);
-// 	}, eta_ms);
-// }
-
-function runAtSpecificTimeOfDay(hour, minutes, func) {
-	const twentyFourHours = 86400000;
-	const now = new Date();
-	let next = new Date(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate(), hour, minutes, 0, 0).getTime();
-	if (next < Date.now()) {
-	  next += twentyFourHours;
-	}
-  
-	setInterval(function () {
-	  if (next < Date.now()) {
-		func();
-		next += twentyFourHours;
-	  }
-	}, 60_000);
-  }
-
 module.exports = Object.assign(main, { onTwitchMessage });
-

src/utils/schedule.js

@@ -0,0 +1,40 @@
+/**
+ * Run a function at a specific Date
+ *  
+ * @param {Date} date Date to run at
+ * @param {Function} callback Function to run
+ */
+const runAtDate = (date, callback) => {
+    setTimeout(callback,  date - new Date());
+};
+
+
+/**
+ * Run a function at a specific UTC time
+ *  
+ * @param {number} hour UTC hour
+ * @param {number} minute UTC minute
+ * @param {Function} callback Function to run
+ * @param {boolean} [loop] Whether to run the function every day at the specified time
+ */
+const runAtTime = (hour, minute, callback, loop = true) => {
+    // Determine our initial next run time
+    const next = new Date();
+    next.setUTCHours(hour);
+    next.setUTCMinutes(minute);
+    next.setUTCSeconds(0);
+    if (next < new Date()) next.setDate(next.getDate() + 1);
+
+    // Invoke the callback and increment the next run time each day
+    const callbackLoop = () => {
+        callback();
+
+        if (loop) {
+            next.setDate(next.getDate() + 1);
+            runAtDate(next, callbackLoop);
+        }
+    };
+    runAtDate(next, callbackLoop);
+};
+
+module.exports = runAtTime;