Fix garbled order of hourly forecast items.

Author: kshetline

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {
@@ -21,8 +21,8 @@
     "js-cookie": "^2.2.1",
     "ks-astronomy": "^1.0.6",
     "ks-date-time-zone": "^1.6.6",
-    "ks-math": "^1.1.6",
-    "ks-util": "^1.8.0",
+    "ks-math": "^1.2.0",
+    "ks-util": "^1.9.0",
     "rxjs": "^6.5.4"
   },
   "devDependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-server",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "private": true,
@@ -21,8 +21,8 @@
     "express": "~4.17.1",
     "http-errors": "~1.7.3",
     "ks-date-time-zone": "^1.6.6",
-    "ks-math": "^1.1.6",
-    "ks-util": "^1.8.0",
+    "ks-math": "^1.2.0",
+    "ks-util": "^1.9.0",
     "morgan": "~1.9.1",
     "promise-ftp": "^1.3.5",
     "request": "^2.88.2"

server/package-lock.json

@@ -1,9 +1,10 @@
 import { requestText } from 'by-request';
 import { getDateFromDayNumber_SGC, getDayNumber_SGC, getISOFormatDate, parseISODate } from 'ks-date-time-zone';
-import { interpolate } from 'ks-math';
+import { interpolate, irandom } from 'ks-math';
 import PromiseFtp from 'promise-ftp';
 import { CurrentDelta } from './time-types';
 import { URL } from 'url';
+import { last } from 'ks-util';
 
 export interface LeapSecond {
   ntp: number;
@@ -79,7 +80,7 @@ export class TaiUtc {
         pendingLeapDate: getISOFormatDate(getDateFromDayNumber_SGC(Math.floor((this.leapSeconds[nextIndex].utc - 1) / 86400)))
       };
 
-    return { delta: this.leapSeconds[this.leapSeconds.length - 1].delta, dut1, pendingLeap: 0, pendingLeapDate: null };
+    return { delta: last(this.leapSeconds).delta, dut1, pendingLeap: 0, pendingLeapDate: null };
   }
 
   async getLeapSecondHistory(): Promise<LeapSecond[]> {
@@ -109,7 +110,7 @@ export class TaiUtc {
 
     await new Promise<void>(resolve => {
       // Randomly delay polling so that multiple TaiUtc instances don't all poll at the same time every day.
-      const delay = (this.firstLeapSecondPoll ? 0 : Math.floor(Math.random() * MAX_RANDOM_LEAP_SECOND_POLL_DELAY));
+      const delay = (this.firstLeapSecondPoll ? 0 : irandom(MAX_RANDOM_LEAP_SECOND_POLL_DELAY));
       setTimeout(() => resolve(), delay);
     });
 

server/package.json

@@ -22,7 +22,7 @@
 import { AppService } from './app.service';
 import * as $ from 'jquery';
 import { DateAndTime, getDayOfWeek, getLastDateInMonthGregorian, KsDateTime, KsTimeZone } from 'ks-date-time-zone';
-import { cos_deg, floor, interpolate, max, min, sin_deg } from 'ks-math';
+import { cos_deg, floor, interpolate, irandom, max, min, sin_deg } from 'ks-math';
 import { getCssValue, isIE, isRaspbian, padLeft } from 'ks-util';
 import { CurrentDelta } from '../server/src/time-types';
 
@@ -454,6 +454,6 @@ export class Clock {
         }, LEAP_SECOND_RETRY_DELAY)
       });
       // Randomly delay polling so that multiple clock instances don't all poll at the same time every day.
-    }, this.firstLeapSecondPoll ? 0 : floor(Math.random() * MAX_RANDOM_LEAP_SECOND_POLL_DELAY));
+    }, this.firstLeapSecondPoll ? 0 : irandom(MAX_RANDOM_LEAP_SECOND_POLL_DELAY));
   }
 }

server/src/tai-utc.ts

@@ -21,7 +21,7 @@ import { AppService } from './app.service';
 import { CurrentTemperatureHumidity } from './current-temp-manager';
 import * as $ from 'jquery';
 import { KsDateTime, KsTimeZone } from 'ks-date-time-zone';
-import { doesCharacterGlyphExist, getTextWidth, isEdge, isIE } from 'ks-util';
+import { doesCharacterGlyphExist, getTextWidth, isEdge, isIE, last } from 'ks-util';
 import { reflow } from './svg-flow';
 import { convertTemp, formatHour, htmlEncode, setSvgHref } from './util';
 import { ForecastData, HourlyConditions } from '../server/src/weather-types';
@@ -288,21 +288,19 @@ export class Forecast {
 
   private updateHourlyCache(forecastData: ForecastData): void {
     const now = this.appService.getCurrentTime() / 1000;
-    let earliestNew = forecastData.hourly[0]?.time ?? 0;
+    let earliestNew = forecastData.hourly[0]?.time ?? Number.MAX_SAFE_INTEGER;
     let inserted = 0;
 
-    this.cachedHourly = this.cachedHourly.filter(hour => hour.time > now - 7200 && hour.time < now);
+    this.cachedHourly = this.cachedHourly.filter(hour => hour.time >= now - 7200 && hour.time <= now);
 
     if (now < earliestNew) {
       this.cachedHourly.forEach(hour => {
-        if (hour.time < earliestNew) {
-          forecastData.hourly.splice(0, 0, hour);
-          ++inserted;
-        }
+        if (hour.time < earliestNew)
+          forecastData.hourly.splice(inserted++, 0, hour);
       });
     }
 
-    earliestNew = forecastData.hourly[0]?.time ?? 0;
+    earliestNew = forecastData.hourly[0]?.time ?? Number.MAX_SAFE_INTEGER;
 
     // Still nothing to cover the current hour? Fake it from current conditions.
     if (now < earliestNew && forecastData?.currently)
@@ -314,7 +312,9 @@ export class Forecast {
       });
 
     for (let i = inserted; i < forecastData.hourly.length; ++i) {
-      if (forecastData.hourly[i].time < now + 7200)
+      const t = forecastData.hourly[i].time;
+
+      if (t <= now + 7200 && (this.cachedHourly.length === 0 || t > last(this.cachedHourly).time))
         this.cachedHourly.push(forecastData.hourly[i]);
       else
         break;

src/clock.ts

@@ -266,7 +266,7 @@
           </div>
         </div>
         <div class="dialog-buttons">
-          <span class="version-number">2.3.2</span>
+          <span class="version-number">2.3.3</span>
           <button id="settings-reload">Reload</button>
           <span>&bull;</span>
           <button id="settings-cancel">Cancel</button>

src/forecast.ts

@@ -24,6 +24,7 @@ import { AppService, DEV_URL } from './app.service';
 import { CurrentTemperatureHumidity, CurrentTempManager } from './current-temp-manager';
 import { Forecast } from './forecast';
 import { KsDateTime, KsTimeZone } from 'ks-date-time-zone';
+import { irandom } from 'ks-math';
 import { setFullScreen } from 'ks-util';
 import { runningDev, Settings } from './settings';
 import { SettingsDialog } from './settings-dialog';
@@ -69,8 +70,8 @@ class AwClockApp implements AppService {
 
   // Make sure most clients stagger their polling so that the weather server isn't likely
   // to get lots of simultaneous requests.
-  private readonly pollingMinute = Math.floor(Math.random() * 15);
-  private readonly pollingMillis = Math.floor(Math.random() * 60_000);
+  private readonly pollingMinute = irandom(0, 14);
+  private readonly pollingMillis = irandom(0, 59_999);
 
   private lastCursorMove = 0;
   private lastForecast = 0;

src/index.html

@@ -20,7 +20,7 @@
 import * as $ from 'jquery';
 import { KsDateTime } from 'ks-date-time-zone';
 import { cos_deg, Point, sin_deg } from 'ks-math';
-import { isEdge, isSafari, padLeft } from 'ks-util';
+import { isEdge, isSafari, last, padLeft } from 'ks-util';
 
 export type KeyListener = (event: KeyboardEvent) => void;
 
@@ -36,7 +36,7 @@ export function popKeydownListener(): void {
 
 window.addEventListener('keydown', (event: KeyboardEvent) => {
   if (keydownListeners.length > 0)
-    keydownListeners[keydownListeners.length - 1](event);
+    last(keydownListeners)(event);
 });
 
 $.fn.extend({