Improved forecast swipe gesture (#72)

Improved touch/swipe interface for daily forecast.

Author: kshetline

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.1
+
+* Improved touch/swipe interface for daily forecast.
+
 ## 3.1.0
 
 * Allow users to add their own alarm tones.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {

package.json

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

sass/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-server",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "private": true,

sass/package.json

@@ -28,7 +28,7 @@ import { router as forecastRouter } from './forecast-router';
 import fs from 'fs';
 import * as http from 'http';
 import os from 'os';
-import { asLines, htmlEscape, isString, noop, push, toBoolean, toNumber } from '@tubular/util';
+import { asLines, htmlEscape, isString, noop, processMillis, push, toBoolean, toNumber } from '@tubular/util';
 import logger from 'morgan';
 import * as path from 'path';
 import * as requestIp from 'request-ip';
@@ -93,11 +93,12 @@ if (process.env.AWC_WIRED_TH_GPIO || process.env.AWC_ALT_DEV_SERVER) {
 }
 
 // Poll for software updates
-const UPDATE_POLL_INTERVAL = 10800000; // 3 hours
+const UPDATE_POLL_INTERVAL = 7200000; // 2 hours
 const UPDATE_POLL_RETRY_TIME = 60_000; // 10 minutes
 let updatePollTimer: any;
 let latestVersion = process.env.AWC_FAKE_UPDATE_VERSION ?? AWC_VERSION;
 let latestVersionInfo = '';
+let lastUpdateCheck = Number.MIN_SAFE_INTEGER;
 
 async function checkForUpdate(): Promise<void> {
   updatePollTimer = undefined;
@@ -143,6 +144,7 @@ async function checkForUpdate(): Promise<void> {
       console.error('%s: Update info request failed: %s', timeStamp(), e.message ?? e.toString());
   }
 
+  lastUpdateCheck = processMillis();
   updatePollTimer = unref(setTimeout(checkForUpdate, delay));
 }
 
@@ -393,6 +395,9 @@ function getApp(): Express {
   theApp.get('/defaults', async (req, res) => {
     noCache(res);
 
+    if (lastUpdateCheck < processMillis() - UPDATE_POLL_RETRY_TIME)
+      await checkForUpdate();
+
     const ip = requestIp.getClientIp(req);
     const defaults: AwcDefaults = {
       allowAdmin: allowAdmin && /^(::1|::ffff:127\.0\.0\.1|127\.0\.0\.1|0\.0\.0\.0|localhost)$/i.test(ip),

server/package-lock.json

@@ -29,6 +29,7 @@ export class Gps extends TimePoller {
   private gpsData: GpsData = { fix: 0, signalQuality: 0 };
   private googleAccessDenied = false;
   private googleKey: string;
+  private gpsHighDelay = false;
   private gpspipe: ChildProcess;
   private lastGpsInfo = 0;
   private leapSecond = 0;
@@ -114,7 +115,7 @@ export class Gps extends TimePoller {
           if ((this.gpsData.fix || 0) === 0)
             this.gpsData.signalQuality = 0;
           else {
-            this.gpsData.signalQuality = (this.gpsData.fix === 1 ? 75 : 100);
+            this.gpsData.signalQuality = (this.gpsData.fix === 1 ? 75 : 100) * (this.gpsHighDelay ? 0.667 : 1);
 
             if (!this.gpsData.pps)
               this.gpsData.signalQuality /= 2;
@@ -171,23 +172,22 @@ export class Gps extends TimePoller {
 
   private async checkSystemTime(): Promise<void> {
     const ntpInfo = asLines(await monitorProcess(spawn('ntpq', ['-p']), null, ErrorMode.NO_ERRORS));
-    let gpsFound = false;
-    let ntpFallback = false;
+
+    this.systemTimeIsGps = false;
+    this.gpsData.ntpFallback = false;
 
     for (const line of ntpInfo) {
       const $ = /^\*SHM\b.+\.PPS\.\s+0\s+l\s+.+?\s([-+]?[.\d]+)\s+[.\d]+\s*$/.exec(line);
 
-      if ($ && abs(toNumber($[1])) <= 1) {
-        gpsFound = true;
+      if ($) {
+        this.systemTimeIsGps = true;
+        this.gpsHighDelay = (abs(toNumber($[1])) > 1);
         break;
       }
       else if (line.startsWith('*'))
-        ntpFallback = true;
+        this.gpsData.ntpFallback = true;
     }
 
-    this.systemTimeIsGps = gpsFound;
-    this.gpsData.ntpFallback = ntpFallback;
-
     const cd = await this.taiUtc.getCurrentDelta();
 
     if (cd.pendingLeapDate) {

server/package.json

@@ -2,7 +2,7 @@ import $ from 'jquery';
 import { DateTime, Timezone } from '@tubular/time';
 import { cos_deg, floor, mod, Point, sin_deg } from '@tubular/math';
 import {
-  asLines, htmlEscape, isEdge, isFunction, isSafari, isString, last, padLeft, parseColor,
+  asLines, htmlEscape, isEdge, isFunction, isObject, isSafari, isString, last, padLeft, parseColor,
   processMillis, toNumber
 } from '@tubular/util';
 import compareVersions, { CompareOperator } from 'compare-versions';
@@ -147,21 +147,34 @@ export function domAlert(message: string, callback?: () => void): void {
 
 type OkCallback = (isOk: boolean) => void;
 
+interface ConfirmOptions {
+  cancelText?: string;
+  okText?: string;
+  optionalHtml?: string;
+}
+
 export function domConfirm(message: string, callback: OkCallback): void;
-export function domConfirm(message: string, optionsHtml: string, callback: OkCallback): void;
-export function domConfirm(message: string, callbackOrOptions: OkCallback | string, callback?: OkCallback): void {
+export function domConfirm(message: string, optionsHtml: string | ConfirmOptions, callback: OkCallback): void;
+export function domConfirm(message: string, callbackOrOptions: OkCallback | string | ConfirmOptions, callback?: OkCallback): void {
+  let cancelText = '';
+  let okText = '';
   let optionalHtml: string;
 
-  if (isString(callbackOrOptions))
-    optionalHtml = callbackOrOptions;
-  else if (!isFunction(callback))
+  if (isFunction(callbackOrOptions))
     callback = callbackOrOptions;
+  else if (isObject(callbackOrOptions))
+    ({ cancelText, okText, optionalHtml } = callbackOrOptions);
+  else if (isString(callbackOrOptions))
+    optionalHtml = callbackOrOptions;
 
   const confirmDialog = $('#confirm-dialog');
   const confirmOk = $('#confirm-ok');
   const confirmCancel = $('#confirm-cancel');
   const confirmOptions = $('#confirm-options');
 
+  confirmCancel.text(cancelText || 'Cancel');
+  confirmOk.text(okText || 'OK');
+
   if (optionalHtml) {
     confirmOptions.css('display', 'block');
     confirmOptions.html(optionalHtml);