Weatherbit.io, etc. update (#20)

* Added support for Weatherbit.io forecasts.
* Added hourly probability of precipitation, triggered by tap/click on hourly icons or temperatures.
* Weatherbit.io can now be used in place of, or in addition to, the Google geocoding API to translate GPS latitude/longitude into place names.
* Fixed bug with pop-up weather details for Weather Underground forecast.
* Prevented onscreen keyboard from covering alert dialogs.
* Make sure when running in kiosk mode that clicking on a weather service logo doesn't lead to the main display being blocked.
* Added automatic phase-out of Dark Sky API in December 2021.
* Various small tweaks and bug fixes.

Author: kshetline

.eslintrc.json

@@ -48,6 +48,7 @@
       2,
       {
         "ArrayExpression": "first",
+        "FunctionDeclaration": { "parameters": "off" },
         "ignoredNodes": [
           "IfStatement > :expression *",
           "WhileStatement > :expression *"

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "server/src/aw-clock-private"]
+	path = server/src/aw-clock-private
+	url = https://github.com/kshetline/aw-clock-private.git

.sasslintrc

@@ -1,5 +1,6 @@
 {
   "rules": {
+    "force-attribute-nesting": 0,
     "force-element-nesting": 0,
     "force-pseudo-nesting": 0,
     "hex-notation": [
@@ -9,6 +10,12 @@
       }
     ],
     "leading-zero": 0,
+    "nesting-depth": [
+      1,
+      {
+        "max-depth": 4
+      }
+    ],
     "no-color-keywords": 0,
     "no-color-literals": 0,
     "no-duplicate-properties": [
@@ -20,6 +27,7 @@
     "no-ids": 0,
     "no-important": 0,
     "no-vendor-prefixes": 0,
+    "no-qualifying-elements": 0,
     "no-trailing-zero": 0,
     "one-declaration-per-line": 0,
     "property-sort-order": 0,

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.5.0
+
+* Add support for Weatherbit.io forecasts.
+* Add hourly probability of precipitation, triggered by tap/click on hourly icons or temperatures.
+* Weatherbit.io can now be used in place of, or in addition to, the Google geocoding API to translate GPS latitude/longitude into place names.
+* Fixed bug with pop-up weather details for Weather Underground forecast.
+* Prevented onscreen keyboard from covering alert dialogs.
+* Make sure when running in kiosk mode that clicking on a weather service logo doesn't lead to the main display being blocked.
+* Added automatic phase-out of Dark Sky API in December 2021.
+
 ## 2.4.0
 
 * Touchscreen support. This includes:
@@ -11,7 +21,7 @@
 * Notifications for software updates.
 * Optional onscreen administrative functions, provided through the Settings dialog. These include:
   * Reboot
-  * Shutdown 
+  * Shutdown
   * Quit browser
   * Initiate software update.
 * User customizable background and clock face colors.  
@@ -113,7 +123,7 @@
 
 * Updated README.md.
 
-##1.0.1
+## 1.0.1
 
 * Fix gear.svg image so it's compatible with IE. Add MIT license to individual files.
 

README.md

@@ -16,10 +16,10 @@ fi
 
 echo "Checking installation pre-requisites..."
 
-if [ ! `which node` ]; then
+if [ ! "$(command -v node)" ]; then
   version=0
 else
-  version=`node --version`
+  version=$(node --version)
   pattern='v?([0-9]+)'
   [[ $version =~ $pattern ]]
   version="${BASH_REMATCH[1]}"
@@ -45,4 +45,5 @@ if [ ! -f ".first-time-install" ]; then
 fi
 
 echo "Starting main installer..."
+# shellcheck disable=SC2048,SC2086 # this should become separate items with spaces in between, not one quoted thing
 npm run build -- --bash $*

build.sh

@@ -281,7 +281,7 @@ function stepDone(): void {
 }
 
 async function isInstalled(command: string): Promise<boolean> {
-  return !!(await monitorProcess(spawn('which', [command]), null, ErrorMode.ANY_ERROR)).trim();
+  return !!(await monitorProcess(spawn('command', ['-v', command], { shell: true }), null, ErrorMode.ANY_ERROR))?.trim();
 }
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -480,19 +480,34 @@ function ntpValidate(s: string): boolean {
   return false;
 }
 
+const NO_MORE_DARK_SKY = (Date.now() > Date.parse('2021-11-30'));
+
+if (NO_MORE_DARK_SKY && process.env.AWC_PREFERRED_WS === 'darksky')
+  process.env.AWC_PREFERRED_WS = 'wunderground';
+
 function wsValidate(s: string): boolean | string {
-  if (/^w/i.test(s))
+  if (/^w[-b]*$/i.test(s))
     return 'wunderground';
-  else if (/^d/i.test(s))
+  else if (/b/i.test(s))
+    return 'weatherbit';
+  else if (!NO_MORE_DARK_SKY && /^d/i.test(s))
     return 'darksky';
 
-  console.log(chalk.redBright('Weather service must be either (w)underground or (d)arksky'));
+  if (NO_MORE_DARK_SKY)
+    console.log(chalk.redBright('Weather service must be either (w)underground, weather(b)it, or (d)arksky'));
+  else
+    console.log(chalk.redBright('Weather service must be either (w)underground, or weather(b)it'));
+
   return false;
 }
 
 function wsAfter(s: string): void {
-  if (/^w/i.test(s)) {
-    console.log(chalk.paleBlue('    Weather Underground chosen, but Dark Sky can be used'));
+  if (/^w[-b]*$/i.test(s)) {
+    console.log(chalk.paleBlue(`    Weather Underground chosen, but Weatherbit.io${NO_MORE_DARK_SKY ? '' : 'or Dark Sky'} can be used`));
+    console.log(chalk.paleBlue('    as fallback weather services.'));
+  }
+  else if (/b/i.test(s)) {
+    console.log(chalk.paleBlue('    Weatherbit.io chosen, but Weather Underground will be used'));
     console.log(chalk.paleBlue('    as a fallback weather service.'));
   }
   else if (/^d/i.test(s)) {
@@ -563,19 +578,31 @@ const finalOptions = '(l/r/n/)'.replace(finalAction.toLowerCase(), finalAction);
 
 const questions = [
   { prompt: 'Perform initial update/upgrade?', ask: true, yn: true, deflt: doUpdateUpgrade ? 'Y' : 'N', validate: upgradeValidate },
-  { name: 'AWC_PORT', prompt: 'HTTP server port', ask: true, validate: portValidate },
+  { name: 'AWC_PORT', prompt: 'HTTP server port.', ask: true, validate: portValidate },
   { prompt: 'Allow user to reboot, shutdown, update, etc.?', ask: true, yn: true, deflt: doAdmin ? 'Y' : 'N', validate: adminValidate },
   { name: 'AWC_NTP_SERVER', prompt: 'time server', ask: true, validate: ntpValidate },
   {
     name: 'AWC_GOOGLE_API_KEY',
-    prompt: 'Google Geocoding API key (optional, for city names from GPS coordinates)' +
+    prompt: 'Optional Google geocoding API key (for city names from\n      GPS coordinates).' +
       (settings.AWC_GOOGLE_API_KEY ? '\n    Enter - (dash) to remove old API key' : ''),
     ask: true
   },
-  { name: 'AWC_PREFERRED_WS', prompt: 'preferred weather service, (w)underground or (d)arksky)', ask: true, validate: wsValidate, after: wsAfter },
+  { // #5
+    name: 'AWC_PREFERRED_WS',
+    prompt: 'preferred weather service, (w)underground, weather(b)it,\n      or (d)arksky).',
+    ask: true,
+    validate: wsValidate,
+    after: wsAfter
+  },
   {
+    name: 'AWC_WEATHERBIT_API_KEY',
+    prompt: 'Optional Weatherbit.io (via RapidAPI) key, for\n      weather and geocoding.' +
+      (settings.AWC_WEATHERBIT_API_KEY ? '\n    Enter - (dash) to remove old API key' : ''),
+    ask: true
+  },
+  { // #7
     name: 'AWC_DARK_SKY_API_KEY',
-    prompt: 'Dark Sky API key (uses "wunderground" if left blank)' +
+    prompt: 'Optional Dark Sky weather API key.' +
       (settings.AWC_DARK_SKY_API_KEY ? '\n    Enter - (dash) to remove old API key' : ''),
     ask: true
   },
@@ -586,6 +613,11 @@ const questions = [
   { prompt: `When finished, (l)aunch A/W clock, (r)eboot, or (n)o action ${finalOptions}?`, ask: true, deflt: finalAction, validate: finalActionValidate }
 ];
 
+if (NO_MORE_DARK_SKY) {
+  questions[5].prompt = 'preferred weather service, (w)underground, or weather(b)it';
+  questions.splice(7, 1);
+}
+
 async function promptForConfiguration(): Promise<void> {
   console.log(chalk.cyan('- Configuration -'));