@velor/remote-mouse 6.4.10 → 6.5.0

package/.env.example

@@ -76,9 +76,6 @@ UPDATE_CHECK_COMMAND=
 # Maximum timeout for the update check command (seconds)
 UPDATE_CHECK_TIMEOUT_SEC=20
 
-# Update check interval (minutes)
-UPDATE_CHECK_INTERVAL_MIN=360
-
 # npm package to check (leave empty to use the local package name)
 UPDATE_CHECK_PACKAGE=
 

package/README.md

@@ -305,6 +305,7 @@ 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

package/package.json

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

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,8 +122,7 @@ 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();
@@ -145,5 +160,6 @@ export function createServerInfoRouter(services) {
 
 export const __testables = {
   buildTokenEntries,
+  buildConfigSnapshots,
   redactSecrets,
 };

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/config/configPaths.js

@@ -31,6 +31,7 @@ export const CONFIG_PATHS = [
     'samsungTv.pcInputSequence',
     'samsungTv.powerOffKey',
     'updateCheck.enabled',
+    'updateCheck.intervalMin',
     'qrOverlay.enabled',
     'qrOverlay.size',
     'qrOverlay.margin',

package/server/services/config/configSchema.js

@@ -198,6 +198,13 @@ export const CONFIG_SCHEMA = {
         label: 'Activer la verification',
         type: 'boolean',
       },
+      intervalMin: {
+        label: 'Intervalle verification (min)',
+        type: 'integer',
+        min: 1,
+        max: 10080,
+        step: 1,
+      },
     },
   },
   qrOverlay: {

package/server/services/config/defaultConfig.js

@@ -60,7 +60,6 @@ export const DEFAULT_SYSTEM_CONFIG = {
     updateCheck: {
         checkCommand: '',
         checkTimeoutSec: 20,
-        intervalMin: 360,
         packageName: String(packageJson.name || '').trim(),
         currentVersion: String(packageJson.version || '').trim(),
         installCommand: '',
@@ -123,6 +122,7 @@ export const DEFAULT_PERSISTED_CONFIG = {
     },
     updateCheck: {
         enabled: false,
+        intervalMin: 360,
     },
     qrOverlay: {
         enabled: true,

package/server/services/config/envConfig.js

@@ -32,7 +32,6 @@ export function getEnvConfig() {
         updateCheck: {
             checkCommand: readOptionalString('UPDATE_CHECK_COMMAND'),
             checkTimeoutSec: readOptionalNumber('UPDATE_CHECK_TIMEOUT_SEC'),
-            intervalMin: readOptionalNumber('UPDATE_CHECK_INTERVAL_MIN'),
             packageName: readOptionalString('UPDATE_CHECK_PACKAGE'),
             currentVersion: readOptionalString('UPDATE_CHECK_CURRENT_VERSION'),
             installCommand: readOptionalString('UPDATE_INSTALL_COMMAND'),

package/server/services/task-manager/createTaskManager.js

@@ -37,7 +37,7 @@ export function createTaskManager(services) {
 
     getTaskRunner().run(
       wrapTask(() => services.getUpdateManager().check()),
-      () => getFixedDelayMs(services.getSystemConfig().updateCheck?.intervalMin || 1),
+      () => getFixedDelayMs(services.getConfig().updateCheck?.intervalMin || 1),
       {name: 'update-check'},
     );
 

package/server/services/update-manager/chooseUpdateCheckSource.js

@@ -5,16 +5,23 @@ import {createLogger} from '../../application/logger.js';
 export function chooseUpdateCheckSource({getSystemConfig}) {
   const updateConfig = getSystemConfig().updateCheck || {};
   const checkCommand = String(updateConfig.checkCommand || '').trim();
+  const logger = createLogger('update-check');
   const commandSource = new CommandUpdateSource({
     checkCommand,
     timeoutSec: updateConfig.checkTimeoutSec,
-    logger: createLogger('update-check'),
+    logger,
   });
   const npmSource = new NpmUpdateSource({
     packageName: updateConfig.packageName,
     currentVersion: updateConfig.currentVersion,
   });
   const checkSource = checkCommand ? commandSource : npmSource;
+  logger.debug({
+    source: checkCommand ? 'command' : 'npm',
+    hasCheckCommand: Boolean(checkCommand),
+    packageName: updateConfig.packageName || '',
+    currentVersion: updateConfig.currentVersion || '',
+  }, 'Update check: source selected');
 
   return () => checkSource.check();
 }

package/server/services/update-manager/createUpdateManager.js

@@ -24,7 +24,11 @@ export function createUpdateManager(services) {
     }
 
     async function check() {
-        if (!services.getConfig().updateCheck?.enabled) {
+        const updateCheckEnabled = Boolean(services.getConfig().updateCheck?.enabled);
+        log.debug({ enabled: updateCheckEnabled, lastKey }, 'Update check: start');
+
+        if (!updateCheckEnabled) {
+            log.debug('Update check: skipped because disabled');
             lastResult = {
                 checked: true,
                 hasUpdate: false,
@@ -39,10 +43,17 @@ export function createUpdateManager(services) {
         }
 
         try {
-            const result = await chooseUpdateCheckSource(services)();
+            const runCheck = chooseUpdateCheckSource(services);
+            log.debug('Update check: source resolved');
+            const result = await runCheck();
+            log.debug({ result }, 'Update check: source returned');
 
             if (!result?.hasUpdate || !result.key || result.key === lastKey) {
-                log.debug('Update check: no update');
+                log.debug({
+                    hasUpdate: Boolean(result?.hasUpdate),
+                    key: result?.key || '',
+                    duplicateKey: Boolean(result?.key && result.key === lastKey),
+                }, 'Update check: no update');
                 lastResult = {
                     checked: true,
                     hasUpdate: false,
@@ -56,6 +67,7 @@ export function createUpdateManager(services) {
             }
 
             lastKey = result.key;
+            log.debug({ key: lastKey, ttlMs: result.ttlMs || 8000 }, 'Update check: update detected');
             lastResult = {
                 checked: true,
                 hasUpdate: true,
@@ -90,8 +102,10 @@ export function createUpdateManager(services) {
     async function update() {
         const install = chooseUpdateInstallSource(services);
         lastInstallCommand = String(install.command || '');
+        log.debug({ installCommand: lastInstallCommand }, 'Install update: source resolved');
         log.info({installCommand: lastInstallCommand}, 'Exécution commande install update');
         const result = await install();
+        log.debug({ result }, 'Install update: source returned');
         if (result.ok) {
             log.info('Install update terminée avec succès');
             return result;

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: {}};
     })

package/server/term/cli/runCliCmd.js

@@ -18,7 +18,12 @@ 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');
@@ -28,6 +33,7 @@ export async function runCliCmd(args) {
         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,23 @@
 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 samsung-detect',
+      'remote-mouse tokens',
+      'remote-mouse open-qr',
+      'remote-mouse qr',
+    ].join('\n'),
   };
 }

package/server/term/srv/executeCliCommand.js

@@ -15,6 +15,7 @@ const commandHandlers = {
   qr: executeOpenQrCommand,
   config: executeConfigCommand,
   'sys-config': executeSystemConfigCommand,
+  'system-config': executeSystemConfigCommand,
   info: executeInfoCommand,
   'system-info': executeInfoCommand,
   service: executeServiceCommand,