dsh-server-connector 0.2.3 → 0.3.0

package/lib/routes.js

@@ -32,6 +32,7 @@
 import { stat } from 'node:fs/promises'
 
 import { AuditError } from './audit.js'
+import { readConfig } from './config.js'
 import { PendingError } from './pending.js'
 import { PoolError } from './pool.js'
 import { MAX_CUSTOM_RULES, RULES, RULES_BY_ID, RuleError, check as checkPolicy, effectiveDecision, validateCustomRule } from './policy.js'
@@ -478,7 +479,17 @@ export function createApi(options) {
   const config = options.config ?? {}
   const onChange = typeof options.onChange === 'function' ? options.onChange : null
   const getCredentials = typeof options.getCredentials === 'function' ? options.getCredentials : () => null
-  const probeTimeoutMs = Math.min(Number(config.commandTimeoutMs ?? 60000), 15000)
+
+  /**
+   * The current §10 values. Read per request: a volatile settings edit lands in
+   * `options.config` without remounting, so a value captured once here would go
+   * stale the first time someone opened the settings form.
+   * @returns {import('./index.js').PluginConfig}
+   */
+  const settings = () => readConfig(config)
+
+  /** The probe budget is the command timeout, capped so "Test" stays interactive. */
+  const probeTimeoutMs = () => Math.min(Number(settings().commandTimeoutMs), 15000)
 
   /**
    * Report one non-fatal failure without changing the request outcome.
@@ -664,17 +675,7 @@ export function createApi(options) {
       body: {
         servers: present,
         rules: ruleCatalog(),
-        config: {
-          connectTimeoutMs: config.connectTimeoutMs ?? 15000,
-          commandTimeoutMs: config.commandTimeoutMs ?? 60000,
-          syncTimeoutMs: config.syncTimeoutMs ?? 20000,
-          maxOutputChars: config.maxOutputChars ?? 200000,
-          idleTimeoutMs: config.idleTimeoutMs ?? 600000,
-          auditEnabled: config.auditEnabled ?? true,
-          auditMaxBytes: config.auditMaxBytes ?? 0,
-          pendingTtlHours: config.pendingTtlHours ?? 24,
-          maxListedServers: config.maxListedServers ?? 8,
-        },
+        config: settings(),
         hostKeyModes: [...HOST_KEY_MODES],
         decisions: [...DECISION_VALUES],
         pendingCount: Array.isArray(queued) ? queued.length : 0,
@@ -1112,7 +1113,7 @@ export function createApi(options) {
   const probe = async (server) => {
     const startedAt = Date.now()
     await pool.connect(server)
-    const result = await pool.exec(server, { command: CONNECT_PROBE, timeoutMs: probeTimeoutMs })
+    const result = await pool.exec(server, { command: CONNECT_PROBE, timeoutMs: probeTimeoutMs() })
     return { ...parseProbe(String(result.stdout ?? '')), durationMs: Date.now() - startedAt }
   }