Wayland fixes for auto-update. (#119)

kshetline · web-flow · commit 326c4c6f3bb6 · 2025-02-22T14:34:46.000-05:00
Wayland fixes for auto-update.
diff --git a/.idea/dictionaries/default_user.xml b/.idea/dictionaries/default_user.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,13 @@
+## 3.7.3
+
+* Fixed auto-update process to work properly with Wayland.
+
+Note> You may need to manually update to this version by pulling the latest updates into your aw-clock repo and then running `sudo ./build.sh -i` or `sudo ./build.sh --ddev --reboot`.
+
 ## 3.7.2
 
 * Added autostart support for Wayland with Labwc.
-* Fix problems starting service under any admin user other than `pi`.
+* Fixed problems starting service under any admin user other than `pi`.
 
 ## 3.7.1-do
 
diff --git a/build.js b/build.js
diff --git a/build.ts b/build.ts
@@ -1151,8 +1151,8 @@ async function doServiceDeployment(): Promise<void> {
   await monitorProcess(spawn('chmod', ['+x', serviceDst], { shell: true }), spin, ErrorMode.ANY_ERROR);
 
   const settingsText =
-    `# If you edit AWC_PORT below, be sure to update\n#   ${userHome}/${autostartDst}/autostart` +
-    (existsSync(wayfireIniPath) ? ` and\n#   ${wayfireIniPath}` : '') + ' accordingly.\n' +
+    `# If you edit AWC_PORT below, be sure to update\n#     ${userHome}/${autostartDst}/autostart_extra.sh` +
+    '\n# accordingly.\n' +
     Object.keys(settings).sort().map(key => key + '=' + settings[key]).join('\n') + '\n';
 
   fs.writeFileSync(settingsPath, settingsText);
diff --git a/build_node_check.sh b/build_node_check.sh
@@ -100,7 +100,7 @@ if (( version > absMaxVersion )) && [ ! -s "$NVM_DIR/nvm.sh" ]; then
   install_nvm
 fi
 
-if [ "$version" -ne "$maxVersion" ] && [ -s "$NVM_DIR/nvm.sh" ]; then
+if (( version < maxVersion )) && [ -s "$NVM_DIR/nvm.sh" ] && [ $(nvm version-remote $maxVersion) != "N/A" ]; then
   if [ "$(nvm use "v$maxVersion")" ]; then
     nvm use "v$maxVersion"
     nvm alias default "$maxVersion"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aw-clock",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "scripts": {
diff --git a/raspberry_pi_setup/weatherService b/raspberry_pi_setup/weatherService
@@ -23,16 +23,17 @@ LOGFILE="/var/log/weatherService.log"
 MIN_UPTIME="5000"
 SPIN_SLEEP_TIME="2000"
 
-# Define AWC_DARK_SKY_API_KEY, AWC_WIRED_TH_GPIO, AWC_NTP_SERVER, etc., in the file below:
+# Define AWC_WEATHERBIT_API_KEY, AWC_WIRED_TH_GPIO, AWC_NTP_SERVER, etc., in the file below:
 [ -f /etc/default/weatherService ] && . /etc/default/weatherService
 
 PATH=$NODE_BIN_DIR:$PATH
 export NODE_PATH=$NODE_PATH
 export AWC_ALLOW_ADMIN=$AWC_ALLOW_ADMIN
 export AWC_ALLOW_CORS=$AWC_ALLOW_CORS
+export AWC_ALT_DEV_SERVER=$AWC_ALT_DEV_SERVER
 export AWC_DARK_SKY_API_KEY=$AWC_DARK_SKY_API_KEY
 export AWC_DAYTIME_SERVER=$AWC_DAYTIME_SERVER
-export AWC_ALT_DEV_SERVER=$AWC_ALT_DEV_SERVER
+export AWC_FAKE_UPDATE=$AWC_FAKE_UPDATE
 export AWC_FREQUENT_ID=$AWC_FREQUENT_ID
 export AWC_GIT_REPO_PATH=$AWC_GIT_REPO_PATH
 export AWC_GOOGLE_API_KEY=$AWC_GOOGLE_API_KEY
diff --git a/sass/package-lock.json b/sass/package-lock.json
diff --git a/sass/package.json b/sass/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-sass",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "description": "SASS builder for aw-clock",
   "keywords": [
     "sass"
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aw-clock-server",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "license": "MIT",
   "author": "Kerry Shetline <kerry@shetline.com>",
   "private": true,
diff --git a/server/src/admin-router.ts b/server/src/admin-router.ts
@@ -1,16 +1,28 @@
 import { exec } from 'child_process';
 import { Request, Response, Router } from 'express';
 import fs from 'fs';
-import { asLines, toNumber, toBoolean } from '@tubular/util';
+import { asLines, toInt, toBoolean } from '@tubular/util';
 import { noCache } from './awcs-util';
 import { monitorProcess, spawn } from './process-util';
 
 export const router = Router();
 
+async function assureGitSafeDirectory(path: string): Promise<void> {
+  const lines = asLines(await monitorProcess(spawn('git', ['config', '--system', '--list'])));
+
+  for (const line of lines) {
+    if (line === 'safe.directory=' + path)
+      return;
+  }
+
+  await monitorProcess(spawn('git', ['config', '--system', '--add', 'safe.directory', path]));
+}
+
 router.post('/*name', async (req: Request, res: Response) => {
   noCache(res);
 
   const command = req.url.replace(/^\//, '').replace(/\?.*$/, '');
+  const repo = process.env.AWC_GIT_REPO_PATH;
   let cmd = command;
   let args: string[] = [];
   let options: any;
@@ -34,14 +46,15 @@ router.post('/*name', async (req: Request, res: Response) => {
       break;
 
     case 'update':
-      if (!fs.existsSync(process.env.AWC_GIT_REPO_PATH) && !fs.lstatSync(process.env.AWC_GIT_REPO_PATH).isDirectory()) {
+      if (!fs.existsSync(repo) && !fs.lstatSync(repo).isDirectory()) {
         res.status(400).send("Can't find Git repository. Invalid AWC_GIT_REPO_PATH");
         return;
       }
 
+      await assureGitSafeDirectory(repo);
       cmd = 'git';
       args = ['status', '--porcelain', '-b'];
-      options = { cwd: process.env.AWC_GIT_REPO_PATH };
+      options = { cwd: repo };
       break;
 
     default:
@@ -67,6 +80,32 @@ router.post('/*name', async (req: Request, res: Response) => {
   res.send('OK');
 });
 
+async function getDisplayUser(env: NodeJS.ProcessEnv): Promise<number> {
+  let userId = -1;
+
+  // Get the current display user.
+  try {
+    const lines = asLines(await monitorProcess(spawn('loginctl', [], { env })));
+
+    for (const line of lines) {
+      const $ = /^\s*(\d+)\s+(\d+)/.exec(line);
+
+      if ($) {
+        const sessionType = (await monitorProcess(spawn('loginctl', ['show-session', '-p', 'Type', $[1]], { env })))
+          .trim().substring(5);
+
+        if (/^(wayland|x11\b.*)$/.test(sessionType)) {
+          userId = toInt($[2]);
+          break;
+        }
+      }
+    }
+  }
+  catch {}
+
+  return userId;
+}
+
 async function performUpdate(req: Request, res: Response, gitStatus: string): Promise<void> {
   const test = toBoolean(req.query.ut, false, true);
   const interactive = toBoolean(req.query.ia, false, true);
@@ -92,34 +131,11 @@ async function performUpdate(req: Request, res: Response, gitStatus: string): Pr
     return;
   }
 
-  let userId = -1;
   const env = Object.assign({}, process.env);
 
   env.DISPLAY = ':0';
 
-  // Get the current display user. Probably "pi", but let's make sure.
-  try {
-    const users = (await monitorProcess(spawn('users'))).split(/\s+/);
-
-    for (const user of users) {
-      const id = toNumber((/uid=(\d+)/.exec(await monitorProcess(spawn('id', [user]))) ?? [])[1], -1);
-
-      if (id >= 0) {
-        try {
-          const lines = asLines(await monitorProcess(spawn('xhost', [], { env, uid: id })));
-
-          for (const line of lines) {
-            if (new RegExp(`\\blocaluser:${user}\\b`).test(line)) {
-              userId = id;
-              break;
-            }
-          }
-        }
-        catch {}
-      }
-    }
-  }
-  catch {}
+  const userId = await getDisplayUser(env);
 
   if (userId < 0) {
     res.status(500).send('Unable to perform update: display user could not be determined');
@@ -136,9 +152,28 @@ async function performUpdate(req: Request, res: Response, gitStatus: string): Pr
     }
   }
 
-  spawn('pkill', ['-o', 'chromium'], { uid: userId });
-  exec(`lxterminal -e bash -c "cd ${path} && git pull && sudo ./build.sh ${args}; bash"`,
-    { cwd: path, env, uid: userId });
+  env.XDG_RUNTIME_DIR = '/run/user/' + userId;
+
+  try {
+    await new Promise<void>((resolve, reject) => {
+      let error = false;
+
+      monitorProcess(exec(`lxterminal -e bash -c "cd ${path} && git pull && sudo ./build.sh ${args}; bash"`,
+        { cwd: path, env, uid: userId })).catch(err => {
+          error = true;
+          reject(err);
+        });
+
+      setTimeout(() => !error && resolve(), 3000);
+    });
+
+    spawn('pkill', ['-o', 'chromium'], { uid: userId });
+    spawn('pkill', ['-o', 'firefox'], { uid: userId });
+  }
+  catch (e) {
+    res.status(500).send('Failed to start terminal session for update:' + e.message);
+    return;
+  }
 
   res.send('OK');
 }
diff --git a/server/src/app.ts b/server/src/app.ts
@@ -415,6 +415,7 @@ function getApp(): Express {
       await checkForUpdate();
 
     const ip = requestIp.getClientIp(req);
+    const fakeUpdate = toBoolean(process.env.AWC_FAKE_UPDATE);
     const defaults: AwcDefaults = {
       allowAdmin: allowAdmin && /^(::1|::ffff:127\.0\.0\.1|127\.0\.0\.1|0\.0\.0\.0|localhost)$/i.test(ip),
       currentVersion: AWC_VERSION,
@@ -424,7 +425,7 @@ function getApp(): Express {
       latestVersionInfo,
       outdoorOption: (process.env.AWC_WIRELESS_TH_GPIO || process.env.AWC_ALT_DEV_SERVER ? defaultOutdoorChannel : 'F'),
       services: 'wu' + (process.env.AWC_WEATHERBIT_API_KEY ? ',we' : '') + (process.env.AWC_VISUAL_CROSSING_API_KEY ? ',vc' : ''),
-      updateAvailable: /^\d+\.\d+\.\d+$/.test(latestVersion) && safeCompareVersions(latestVersion, AWC_VERSION, '>', false)
+      updateAvailable: fakeUpdate || /^\d+\.\d+\.\d+$/.test(latestVersion) && safeCompareVersions(latestVersion, AWC_VERSION, '>', false)
     };
 
     if (gps) {
diff --git a/src/settings-dialog.ts b/src/settings-dialog.ts
@@ -45,7 +45,7 @@ interface SearchResults {
 }
 
 // noinspection JSUnusedGlobalSymbols
-enum Tab { OPTIONS, LOCATION, ALARMS, UPDATE }
+enum Tab { OPTIONS, LOCATION, ALARMS, ALERT_FILTERS, UPDATE }
 
 async function callSearchApi(query: string): Promise<SearchResults> {
   // Note: The API below is not meant for high traffic use. Use of this API for looking up geographic locations

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aw-clock",`
`3`		`- "version": "3.7.2",`
	`3`	`+ "version": "3.7.3",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"author": "Kerry Shetline <kerry@shetline.com>",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aw-clock-sass",`
`3`		`- "version": "3.7.2",`
	`3`	`+ "version": "3.7.3",`
`4`	`4`	`"description": "SASS builder for aw-clock",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"sass"`