From 946f77d7b59f469f87556d2b5e21e2d1da76a1f3 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Mon, 5 Dec 2022 18:06:17 +0100
Subject: [PATCH 1/3] sleepphasealarm

Support javascript command to execute as defined in scheduler 'js' configuration
---
 apps/sleepphasealarm/ChangeLog     | 1 +
 apps/sleepphasealarm/app.js        | 3 +++
 apps/sleepphasealarm/metadata.json | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/sleepphasealarm/ChangeLog b/apps/sleepphasealarm/ChangeLog
index 80b2e554b..795c62fa2 100644
--- a/apps/sleepphasealarm/ChangeLog
+++ b/apps/sleepphasealarm/ChangeLog
@@ -12,3 +12,4 @@
       Add setting to disable scheduler alarm
 0.10: Fix: Do not wake when falling asleep
 0.11: Minor tweaks
+0.12: Support javascript command to execute as defined in scheduler 'js' configuration
diff --git a/apps/sleepphasealarm/app.js b/apps/sleepphasealarm/app.js
index a5193b244..90cd32c7e 100644
--- a/apps/sleepphasealarm/app.js
+++ b/apps/sleepphasealarm/app.js
@@ -173,6 +173,9 @@ if (nextAlarmDate !== undefined) {
         setTimeout(load, 1000);
       } else if (measure && now >= minAlarm && swest === false) {
         addLog(now, "alarm");
+        if (nextAlarmConfig.js) {
+          eval(nextAlarmConfig.js); // run nextAlarmConfig.js if set
+        }
         buzz();
         measure = false;
         if (config.settings.disableAlarm) {
diff --git a/apps/sleepphasealarm/metadata.json b/apps/sleepphasealarm/metadata.json
index fd3366812..ced99062f 100644
--- a/apps/sleepphasealarm/metadata.json
+++ b/apps/sleepphasealarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "sleepphasealarm",
   "name": "SleepPhaseAlarm",
   "shortName": "SleepPhaseAlarm",
-  "version": "0.11",
+  "version": "0.12",
   "description": "Uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments (ESS, see https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en). This app will read the next alarm from the alarm application and will wake you up to 30 minutes early at the best guessed time when you are almost already awake.",
   "icon": "app.png",
   "tags": "alarm",

From cee04a21bf06522f0cd03760f3d966d412ceb740 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 6 Dec 2022 11:45:50 +0100
Subject: [PATCH 2/3] sleepphasealarm: Do not run buzz() when 'js' is set

---
 apps/sleepphasealarm/app.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/apps/sleepphasealarm/app.js b/apps/sleepphasealarm/app.js
index 90cd32c7e..bcb6ddac8 100644
--- a/apps/sleepphasealarm/app.js
+++ b/apps/sleepphasealarm/app.js
@@ -173,16 +173,17 @@ if (nextAlarmDate !== undefined) {
         setTimeout(load, 1000);
       } else if (measure && now >= minAlarm && swest === false) {
         addLog(now, "alarm");
+        measure = false;
         if (nextAlarmConfig.js) {
           eval(nextAlarmConfig.js); // run nextAlarmConfig.js if set
-        }
-        buzz();
-        measure = false;
-        if (config.settings.disableAlarm) {
-          // disable alarm for scheduler
-          nextAlarmConfig.last = now.getDate();
-          require("Storage").writeJSON("sched.json", alarms);
-        }
+        } else {
+          buzz();
+          if (config.settings.disableAlarm) {
+            // disable alarm for scheduler
+            nextAlarmConfig.last = now.getDate();
+            require('Storage').writeJSON('sched.json', alarms);
+          }
+	}
       }
     });
   };

From 224b4560cbf6ee73b4b7ebae7e2934542a609d81 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 6 Dec 2022 11:48:02 +0100
Subject: [PATCH 3/3] sleepphasealarm: format

---
 apps/sleepphasealarm/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/sleepphasealarm/app.js b/apps/sleepphasealarm/app.js
index bcb6ddac8..ba8bff9b2 100644
--- a/apps/sleepphasealarm/app.js
+++ b/apps/sleepphasealarm/app.js
@@ -183,7 +183,7 @@ if (nextAlarmDate !== undefined) {
             nextAlarmConfig.last = now.getDate();
             require('Storage').writeJSON('sched.json', alarms);
           }
-	}
+        }
       }
     });
   };