Fix a Daylight Saving Time bug that caused the displayed time for an upcoming alarm the day after a clock change to be off by an hour. (#87)

Author: kshetline

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.4.1
+
+* Fix a Daylight Saving Time bug that caused the displayed time for an upcoming alarm the day after a clock change to be off by an hour. (This self-corrected after midnight, and did not affect when the alarm actually went off.)
+
 ## 3.4.0
 
 * Use local storage instead of cookies to save user settings.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {
@@ -18,9 +18,9 @@
   },
   "private": true,
   "dependencies": {
-    "@tubular/astronomy": "^3.3.2",
-    "@tubular/math": "^3.1.0",
-    "@tubular/time": "^3.8.7",
+    "@tubular/astronomy": "^3.5.0",
+    "@tubular/math": "^3.3.1",
+    "@tubular/time": "^3.8.8",
     "@tubular/util": "^4.13.1",
     "compare-versions": "^4.1.3",
     "jquery": "^3.6.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-sass",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "SASS builder for aw-clock",
   "keywords": [
     "sass"

sass/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-server",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "private": true,
@@ -16,8 +16,8 @@
     "build-win": "webpack"
   },
   "dependencies": {
-    "@tubular/math": "^3.1.0",
-    "@tubular/time": "^3.8.7",
+    "@tubular/math": "^3.3.1",
+    "@tubular/time": "^3.8.8",
     "@tubular/util": "^4.13.1",
     "by-request": "^1.3.3",
     "compare-versions": "^4.1.3",

sass/package.json

@@ -8,7 +8,6 @@ import { domAlert } from './awc-util';
 import { TimeFormat } from './shared-types';
 
 const FALLBACK_AUDIO = 'Beep-beep-beep-beep.mp3';
-const MINUTES_PER_DAY = 1440;
 const NOTHING_PENDING = Number.MAX_SAFE_INTEGER;
 
 export class AlarmMonitor {
@@ -56,6 +55,9 @@ export class AlarmMonitor {
   checkAlarms(alarmCheckTime: number, alarms: AlarmInfo[]): AlarmInfo[] {
     let updatePrefs = false;
     const now = new DateTime(alarmCheckTime, this.appService.timezone);
+    const minutesInDay = now.getMinutesInDay();
+    const wt = now.wallTime;
+    const midnight = new DateTime([wt.y, wt.m, wt.d, 0, 0, 0], this.appService.timezone);
     const nowMinutes = floor(now.utcSeconds / 60);
     const newActiveAlarms = [];
     let sound = '';
@@ -77,8 +79,7 @@ export class AlarmMonitor {
       if (snoozed)
         alarmTime = snoozed.restartAt;
       else if (isDaily)
-        alarmTime = floor(new DateTime([now.wallTime.y, now.wallTime.m, now.wallTime.d], this.appService.timezone).utcSeconds / 60) +
-          alarmTime;
+        alarmTime = floor(midnight.utcSeconds / 60) + alarmTime;
       else
         alarmTime -= floor(now.utcOffsetSeconds / 60);
 
@@ -94,16 +95,16 @@ export class AlarmMonitor {
           const tomorrow = now.clone().add('day', 1).format('dd', 'en').toUpperCase();
 
           if (alarm.days?.includes(tomorrow) && alarmTime < nowMinutes)
-            next24Hours = min(alarmTime + MINUTES_PER_DAY, next24Hours);
+            next24Hours = min(alarmTime + minutesInDay, next24Hours);
 
           const today = now.format('dd', 'en').toUpperCase();
 
           if (!alarm.days?.includes(today))
             continue;
-          else if (alarmTime > nowMinutes && alarmTime < nowMinutes + MINUTES_PER_DAY)
+          else if (alarmTime > nowMinutes && alarmTime < nowMinutes + minutesInDay)
             next24Hours = min(alarmTime, next24Hours);
         }
-        else if (alarmTime > nowMinutes && alarmTime < nowMinutes + MINUTES_PER_DAY)
+        else if (alarmTime > nowMinutes && alarmTime < nowMinutes + minutesInDay)
           next24Hours = min(alarmTime, next24Hours);
       }