@velor/remote-mouse 6.4.11 → 6.6.0

package/README.md

@@ -305,12 +305,14 @@ Useful CLI commands:
 - `config get <path>` prints one persisted configuration value
 - `config set <path> <value>` updates one persisted configuration value
 - `sys-config` prints the system configuration
+- `system-config` is an alias of `sys-config`
 - `service install` installs the local daemon/service
 - `service disable` disables the local daemon/service
 - `service uninstall` uninstalls the local daemon/service
 - `service restart` restarts the local daemon/service
 - `tasks` prints the task manager snapshot
 - `task-manager` is an alias of `tasks`
+- `update-events` prints persisted update-manager events
 - `samsung-detect` detects Samsung TVs available on the network
 - `tokens` lists persisted entry tokens
 - `open-qr` opens the QR page on the server

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velor/remote-mouse",
-  "version": "6.4.11",
+  "version": "6.6.0",
   "type": "module",
   "description": "Remote mouse and keyboard with mobile client",
   "homepage": "https://github.com/glennerichall/node-mouse#readme",

package/public/server-info.html

@@ -150,6 +150,28 @@
       </div>
     </section>
 
+    <section>
+      <h2>Update-manager events</h2>
+      <div class="table-wrap">
+        <table>
+          <thead>
+            <tr>
+              <th>ID</th>
+              <th>Type</th>
+              <th>At</th>
+              <th>Enabled</th>
+              <th>Key</th>
+              <th>Checked</th>
+              <th>Has update</th>
+              <th>Skipped</th>
+              <th>Error</th>
+            </tr>
+          </thead>
+          <tbody id="update-events-table"></tbody>
+        </table>
+      </div>
+    </section>
+
     <section>
       <h2 data-i18n="serverInfo.section.capabilities">Capabilities</h2>
       <pre id="capabilities"></pre>
@@ -192,6 +214,7 @@
     const tasksTable = document.getElementById('tasks-table');
     const tokensTable = document.getElementById('tokens-table');
     const restartsTable = document.getElementById('restarts-table');
+    const updateEventsTable = document.getElementById('update-events-table');
     const capabilitiesEl = document.getElementById('capabilities');
     const configEl = document.getElementById('config');
     const sysConfigEl = document.getElementById('sys-config');
@@ -202,10 +225,6 @@
       timeStyle: 'medium',
     });
     let logsAutoScroll = true;
-    let configStream = null;
-    let configSubscriptionId = '';
-    let pendingConfigPayload = null;
-    let applyingConfigPayload = false;
 
     function t(key, params) {
       return i18n.t(key, params);
@@ -349,6 +368,33 @@
       }
     }
 
+    function renderUpdateEvents(updateEvents) {
+      updateEventsTable.innerHTML = '';
+      if (!Array.isArray(updateEvents) || updateEvents.length === 0) {
+        const row = document.createElement('tr');
+        row.innerHTML = '<td colspan="9">No update-manager events.</td>';
+        updateEventsTable.appendChild(row);
+        return;
+      }
+
+      for (const event of updateEvents) {
+        const row = document.createElement('tr');
+        const result = event.lastResult || {};
+        row.innerHTML = `
+          <td>${event.id ?? ''}</td>
+          <td>${event.type || '-'}</td>
+          <td>${formatDateTime(event.eventAt)}</td>
+          <td>${event.enabled ? 'yes' : 'no'}</td>
+          <td>${event.lastKey || '-'}</td>
+          <td>${Object.hasOwn(result, 'checked') ? (result.checked ? 'yes' : 'no') : '-'}</td>
+          <td>${Object.hasOwn(result, 'hasUpdate') ? (result.hasUpdate ? 'yes' : 'no') : '-'}</td>
+          <td>${Object.hasOwn(result, 'skipped') ? (result.skipped ? 'yes' : 'no') : '-'}</td>
+          <td>${result.error || '-'}</td>
+        `;
+        updateEventsTable.appendChild(row);
+      }
+    }
+
     function renderLogs(logs) {
       const previousScrollTop = logsEl.scrollTop;
       const shouldAutoScroll = logsAutoScroll;
@@ -446,33 +492,6 @@
       sysConfigEl.textContent = JSON.stringify(snapshot || {}, null, 2);
     }
 
-    function flushPendingConfigPayload() {
-      if (applyingConfigPayload || !pendingConfigPayload) {
-        return;
-      }
-
-      applyingConfigPayload = true;
-      const payload = pendingConfigPayload;
-      pendingConfigPayload = null;
-
-      try {
-        renderConfigSnapshot(payload.config);
-        renderSystemConfigSnapshot(payload.sysConfig);
-      } finally {
-        applyingConfigPayload = false;
-        if (pendingConfigPayload) {
-          flushPendingConfigPayload();
-        }
-      }
-    }
-
-    function scheduleConfigPayload(payload) {
-      pendingConfigPayload = payload;
-      queueMicrotask(() => {
-        flushPendingConfigPayload();
-      });
-    }
-
     async function refresh() {
       try {
         const response = await fetch('/api/admin/server-info/data', { cache: 'no-store' });
@@ -498,77 +517,26 @@
         renderTasks(data.tasks || []);
         renderTokens(data.tokens || []);
         renderRestarts(data.restarts || []);
+        renderUpdateEvents(data.updateEvents || []);
         renderCapabilities(data.system || null);
-        scheduleConfigPayload({
-          config: data.config,
-          sysConfig: data.sysConfig,
-        });
+        renderConfigSnapshot(data.config);
+        renderSystemConfigSnapshot(data.sysConfig);
         renderLogs(data.logs || []);
       } catch (error) {
         logsEl.textContent = t('serverInfo.loadError', {message: error?.message || error});
       }
     }
 
-    async function subscribeToConfigEvents() {
-      if (typeof window.EventSource !== 'function') {
-        return;
-      }
-
-      const response = await fetch('/api/admin/subs/configs', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({scope: 'config'}),
-      });
-      if (!response.ok) {
-        throw new Error(t('serverInfo.sseCreateError'));
-      }
-
-      const payload = await response.json();
-      configSubscriptionId = String(payload.id || '');
-      if (!configSubscriptionId || !payload.eventsUrl) {
-        throw new Error(t('serverInfo.sseInvalid'));
-      }
-
-      configStream?.close();
-      configStream = new EventSource(payload.eventsUrl);
-      configStream.addEventListener('config.changed', (event) => {
-        try {
-          scheduleConfigPayload(JSON.parse(event.data || '{}'));
-        } catch (_error) {
-          // Best effort.
-        }
-      });
-    }
-
-    function unsubscribeFromConfigEvents() {
-      if (!configSubscriptionId) {
-        return;
-      }
-
-      fetch(`/api/admin/subs/${encodeURIComponent(configSubscriptionId)}`, {
-        method: 'DELETE',
-        keepalive: true,
-      }).catch(() => {});
-      configSubscriptionId = '';
-    }
-
     logsEl.addEventListener('scroll', () => {
       logsAutoScroll = isLogScrollAtBottom();
     }, { passive: true });
 
     refresh();
     setInterval(refresh, 2000);
-    subscribeToConfigEvents().catch(() => {});
     i18n.onChange(() => {
       i18n.translateRoot(document);
       refresh();
     });
-    window.addEventListener('beforeunload', () => {
-      configStream?.close();
-      unsubscribeFromConfigEvents();
-    });
   </script>
 </body>
 </html>

package/server/application/shutdown.js

@@ -44,6 +44,7 @@ export function createApplicationShutdown(services) {
       runShutdownStep('Erreur a l arret du task manager', () => taskManager.stop()),
       runShutdownStep('Erreur a l arret de l observateur de configuration', () => state.stopConfigObserver()),
       runShutdownStep('Erreur a l arret de l observateur de notifications', () => state.stopNotificationObserver()),
+      runShutdownStep('Erreur a l arret de l observateur des evenements update-manager', () => state.stopUpdateManagerLogObserver()),
       runShutdownStep('Erreur a l arret de l observateur de resolution ecran', () => state.stopDisplaySizeObserver()),
       runShutdownStep('Erreur a l arret de l observateur du QR overlay', () => state.stopQrOverlayRefreshObserver()),
       runShutdownStep('Erreur a l arret de l observateur du survol QR overlay', () => state.stopQrOverlayHoverObserver()),

package/server/application/start.js

@@ -8,6 +8,7 @@ import {startNotificationObserver} from '../init/observers/startNotificationObse
 import {startDisplaySizeObserver} from '../init/observers/startDisplaySizeObserver.js';
 import {startQrOverlayRefreshObserver} from '../init/observers/startQrOverlayRefreshObserver.js';
 import {startQrOverlayHoverObserver} from '../init/observers/startQrOverlayHoverObserver.js';
+import {startUpdateManagerLogObserver} from '../init/observers/startUpdateManagerLogObserver.js';
 import {notifyIfRestarted} from '../remotes/admin/notifyIfRestarted.js';
 import {ensureApplicationLifecycleState} from './state.js';
 import {createLogger} from './logger.js';
@@ -41,6 +42,7 @@ export function createApplicationStart(services) {
 
     state.stopConfigObserver = startConfigObserver(services);
     state.stopNotificationObserver = startNotificationObserver(services);
+    state.stopUpdateManagerLogObserver = startUpdateManagerLogObserver(services);
     state.stopDisplaySizeObserver = startDisplaySizeObserver(services);
     state.stopQrOverlayRefreshObserver = startQrOverlayRefreshObserver(services);
     state.stopQrOverlayHoverObserver = startQrOverlayHoverObserver(services);

package/server/application/state.js

@@ -8,6 +8,7 @@ export function ensureApplicationLifecycleState(services) {
       shuttingDown: false,
       stopConfigObserver: () => {},
       stopNotificationObserver: () => {},
+      stopUpdateManagerLogObserver: () => {},
       stopDisplaySizeObserver: () => {},
       stopQrOverlayRefreshObserver: () => {},
       stopQrOverlayHoverObserver: () => {},

package/server/connection/api/server-info.router.js

@@ -29,6 +29,22 @@ function redactSecrets(value, key = '') {
   return value;
 }
 
+function buildConfigSnapshots(rawConfig, rawSystemConfig) {
+  const config = redactSecrets(rawConfig);
+  const sysConfig = redactSecrets(rawSystemConfig);
+
+  return {
+    config: {
+      ...config,
+      updateCheck: {
+        ...sysConfig?.updateCheck,
+        ...config?.updateCheck,
+      },
+    },
+    sysConfig,
+  };
+}
+
 function getConnectedClients(io) {
   return Array.from(io.of('/').sockets.values()).map((socket) => ({
     id: socket.id,
@@ -106,13 +122,13 @@ export function createServerInfoRouter(services) {
     const clients = getConnectedClients(services.getServer().io);
     const rawConfig = services.getConfig();
     const rawSystemConfig = services.getSystemConfig();
-    const config = redactSecrets(rawConfig);
-    const sysConfig = redactSecrets(rawSystemConfig);
+    const {config, sysConfig} = buildConfigSnapshots(rawConfig, rawSystemConfig);
     const logs = getRecentLogs(250);
     const version = readPackageVersion(packageJsonPath);
     const tasks = services.getTaskManager().getTasksSnapshot();
     const tokenEntries = services.getPersistence().entryTokenDao.loadEntryTokens();
     const restarts = services.getPersistence().restartLogDao.listRecentRestartRecords(20);
+    const updateEvents = services.getPersistence().updateEventLogDao.listRecentEvents(20);
     const currentToken = services.getTokenManager().getToken();
     const entryPathConfig = services.getSystemConfig().entryPath;
     const daemon = await services.getApplicationDaemonService().getInfo();
@@ -135,6 +151,7 @@ export function createServerInfoRouter(services) {
       daemon,
       system,
       restarts,
+      updateEvents,
       config,
       sysConfig,
       logs,
@@ -145,5 +162,6 @@ export function createServerInfoRouter(services) {
 
 export const __testables = {
   buildTokenEntries,
+  buildConfigSnapshots,
   redactSecrets,
 };

package/server/init/observers/startUpdateManagerLogObserver.js

@@ -0,0 +1,9 @@
+import {PUBSUB_SERVICE_UPDATE_MANAGER} from '../../services/pubsub/serviceEventConstants.js';
+
+export function startUpdateManagerLogObserver(services) {
+  return services.getPubSub().subscribe((event) => {
+    services.getPersistence().updateEventLogDao.createEvent(event);
+  }, {
+    service: PUBSUB_SERVICE_UPDATE_MANAGER,
+  });
+}

package/server/services/config/bootstrapConfig.js

@@ -11,7 +11,7 @@ import fs from "node:fs";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-export const projectRoot = path.join(__dirname, '../..');
+export const projectRoot = path.join(__dirname, '../../..');
 export const packageJsonPath = path.join(projectRoot, 'package.json');
 
 export const bootstrapConfigDir = resolveConfigDir(process.env.CONFIG_DIR || '');
@@ -27,12 +27,8 @@ loadEnvFile(envFilePath);
 export const CONFIG_DIR = resolveConfigDir(readString('CONFIG_DIR', bootstrapConfigDir));
 
 export function readPackageJson() {
-    try {
-        const raw = fs.readFileSync(packageJsonPath, 'utf8');
-        return JSON.parse(raw);
-    } catch (_error) {
-        return {};
-    }
+    const raw = fs.readFileSync(packageJsonPath, 'utf8');
+    return JSON.parse(raw);
 }
 
 export const packageJson = readPackageJson();

package/server/services/persistence/createUpdateEventLogDao.js

@@ -0,0 +1,93 @@
+const UPDATE_EVENT_LOG_TABLE = 'update_manager_event_log';
+
+function normalizeRecord(row) {
+  if (!row) {
+    return null;
+  }
+
+  let lastResult = null;
+  try {
+    lastResult = JSON.parse(String(row.last_result_json || 'null'));
+  } catch (_error) {
+    lastResult = null;
+  }
+
+  return {
+    id: Number(row.id),
+    eventAt: Number(row.event_at),
+    type: String(row.event_type || ''),
+    enabled: Boolean(row.enabled),
+    lastKey: String(row.last_key || ''),
+    lastInstallCommand: String(row.last_install_command || ''),
+    lastResult,
+  };
+}
+
+export function createUpdateEventLogDao({getDatabase}) {
+  let bootstrapped = false;
+
+  function bootstrapUpdateEventLogTable() {
+    if (bootstrapped) {
+      return;
+    }
+
+    const db = getDatabase();
+    db.exec(`
+      CREATE TABLE IF NOT EXISTS ${UPDATE_EVENT_LOG_TABLE} (
+        id INTEGER PRIMARY KEY AUTOINCREMENT,
+        event_at INTEGER NOT NULL,
+        event_type TEXT NOT NULL,
+        enabled INTEGER NOT NULL DEFAULT 0,
+        last_key TEXT NOT NULL DEFAULT '',
+        last_install_command TEXT NOT NULL DEFAULT '',
+        last_result_json TEXT NOT NULL DEFAULT 'null'
+      )
+    `);
+
+    bootstrapped = true;
+  }
+
+  function createEvent(event = {}) {
+    bootstrapUpdateEventLogTable();
+    const db = getDatabase();
+    const payload = event?.payload || {};
+    const eventAtMs = Math.floor(new Date(event.at || Date.now()).getTime());
+
+    const result = db.prepare(`
+      INSERT INTO ${UPDATE_EVENT_LOG_TABLE} (
+        event_at,
+        event_type,
+        enabled,
+        last_key,
+        last_install_command,
+        last_result_json
+      )
+      VALUES (?, ?, ?, ?, ?, ?)
+    `).run(
+      Number.isFinite(eventAtMs) ? eventAtMs : Date.now(),
+      String(event.type || 'event'),
+      payload?.enabled ? 1 : 0,
+      String(payload?.lastKey || ''),
+      String(payload?.lastInstallCommand || ''),
+      JSON.stringify(payload?.lastResult ?? null),
+    );
+
+    return Number(result.lastInsertRowid);
+  }
+
+  function listRecentEvents(limit = 20) {
+    bootstrapUpdateEventLogTable();
+    const db = getDatabase();
+    return db.prepare(`
+      SELECT *
+      FROM ${UPDATE_EVENT_LOG_TABLE}
+      ORDER BY event_at DESC, id DESC
+      LIMIT ?
+    `).all(Math.max(1, Number(limit) || 20)).map(normalizeRecord);
+  }
+
+  return {
+    createEvent,
+    listRecentEvents,
+  };
+}

package/server/services/persistence/index.js

@@ -2,6 +2,7 @@ import {createConfigDao} from './createConfigDao.js';
 import {createEntryTokenDao} from './createEntryTokenDao.js';
 import {createDatabaseProvider} from './createDatabaseProvider.js';
 import {createRestartLogDao} from './createRestartLogDao.js';
+import {createUpdateEventLogDao} from './createUpdateEventLogDao.js';
 
 export function createPersistence(services) {
     const getDatabase = createDatabaseProvider({
@@ -15,5 +16,6 @@ export function createPersistence(services) {
         }),
         entryTokenDao: createEntryTokenDao({getDatabase}),
         restartLogDao: createRestartLogDao({getDatabase}),
+        updateEventLogDao: createUpdateEventLogDao({getDatabase}),
     };
 }

package/server/term/cli/parseCliArgs.js

@@ -51,6 +51,9 @@ export function parseCliArgs(args) {
     .command('sys-config', false, () => {}, () => {
       command = {name: 'sys-config', args: {}};
     })
+    .command('system-config', false, () => {}, () => {
+      command = {name: 'system-config', args: {}};
+    })
     .command('info', false, () => {}, () => {
       command = {name: 'info', args: {}};
     })
@@ -72,6 +75,9 @@ export function parseCliArgs(args) {
     .command('task-manager', false, () => {}, () => {
       command = {name: 'task-manager', args: {}};
     })
+    .command('update-events', false, () => {}, () => {
+      command = {name: 'update-events', args: {}};
+    })
     .command('samsung-detect', false, () => {}, () => {
       command = {name: 'samsung-detect', args: {}};
     })

package/server/term/cli/runCliCmd.js

@@ -18,16 +18,23 @@ export async function runCliCmd(args) {
     if (!command?.name || command.name === 'help') {
         console.log('Usage:');
         console.log('  remote-mouse              Demarre le serveur');
+        console.log('  remote-mouse help         Affiche cette aide');
         console.log('  remote-mouse config       Affiche la configuration persistée effective');
+        console.log('  remote-mouse config get <path> Affiche une valeur de configuration persistée');
+        console.log('  remote-mouse config set <path> <value> Met a jour une valeur de configuration persistée');
+        console.log('  remote-mouse sys-config   Affiche la configuration systeme');
+        console.log('  remote-mouse system-config Alias de sys-config');
         console.log('  remote-mouse service install Installe le daemon/service local');
         console.log('  remote-mouse service disable Desactive le daemon/service local');
         console.log('  remote-mouse service uninstall Desinstalle le daemon/service local');
         console.log('  remote-mouse service restart Redemarre le daemon/service local');
         console.log('  remote-mouse tasks        Affiche les informations du task manager');
         console.log('  remote-mouse task-manager Alias de tasks');
+        console.log('  remote-mouse update-events Affiche les evenements persistés du update-manager');
         console.log('  remote-mouse info --verbosity 2 Affiche les capacites serveur avec logs detailles');
         console.log('  remote-mouse system-info  Alias de info');
         console.log('  remote-mouse tokens       Liste les tokens en base');
+        console.log('  remote-mouse samsung-detect Detecte les TV Samsung sur le reseau');
         console.log('  remote-mouse open-qr      Envoie une commande au service deja demarre');
         console.log('  remote-mouse qr           Alias de open-qr');
         process.exit(0);

package/server/term/srv/commands/helpCommand.js

@@ -1,6 +1,24 @@
 export async function executeHelpCommand() {
   return {
     ok: true,
-    message: 'Utilisez remote-mouse --help pour afficher les commandes disponibles.',
+    message: [
+      'Commandes disponibles:',
+      'remote-mouse help',
+      'remote-mouse config',
+      'remote-mouse config get <path>',
+      'remote-mouse config set <path> <value>',
+      'remote-mouse sys-config',
+      'remote-mouse system-config',
+      'remote-mouse info',
+      'remote-mouse system-info',
+      'remote-mouse service <install|disable|uninstall|restart>',
+      'remote-mouse tasks',
+      'remote-mouse task-manager',
+      'remote-mouse update-events',
+      'remote-mouse samsung-detect',
+      'remote-mouse tokens',
+      'remote-mouse open-qr',
+      'remote-mouse qr',
+    ].join('\n'),
   };
 }

package/server/term/srv/commands/updateEventsCommand.js

@@ -0,0 +1,7 @@
+export async function executeUpdateEventsCommand(services) {
+  return {
+    ok: true,
+    message: 'Evenements update-manager.',
+    data: services.getPersistence().updateEventLogDao.listRecentEvents(50),
+  };
+}

package/server/term/srv/executeCliCommand.js

@@ -7,6 +7,7 @@ import {executeServiceCommand} from './commands/serviceCommand.js';
 import {executeSystemConfigCommand} from './commands/systemConfigCommand.js';
 import {executeTasksCommand} from './commands/tasksCommand.js';
 import {executeTokensCommand} from './commands/tokensCommand.js';
+import {executeUpdateEventsCommand} from './commands/updateEventsCommand.js';
 import {formatCliCommand} from '../cli/parseCliArgs.js';
 
 const commandHandlers = {
@@ -15,11 +16,13 @@ const commandHandlers = {
   qr: executeOpenQrCommand,
   config: executeConfigCommand,
   'sys-config': executeSystemConfigCommand,
+  'system-config': executeSystemConfigCommand,
   info: executeInfoCommand,
   'system-info': executeInfoCommand,
   service: executeServiceCommand,
   tasks: executeTasksCommand,
   'task-manager': executeTasksCommand,
+  'update-events': executeUpdateEventsCommand,
   'samsung-detect': executeSamsungDetectCommand,
   tokens: executeTokensCommand,
 };