livedesk 0.1.488 → 0.1.490

package/hub/src/settings/settings-store.js

@@ -1,77 +1,82 @@
-import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
-import path from 'node:path';
-import { DEFAULT_LIVEDESK_SETTINGS, defaultSettingsPath, normalizeLiveDeskSettings, publicSettings } from './settings-schema.js';
-
-export class SettingsConflictError extends Error {
-  constructor(settings) {
-    super('Settings changed in another session. Reload before saving again.');
-    this.name = 'SettingsConflictError';
-    this.code = 'settings-revision-conflict';
-    this.status = 409;
-    this.settings = settings;
-  }
-}
-
-async function writeJsonAtomic(filePath, value) {
-  await mkdir(path.dirname(filePath), { recursive: true });
-  const temporaryPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
-  await writeFile(temporaryPath, `${JSON.stringify(value, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 });
-  await rename(temporaryPath, filePath);
-}
-
-export class LiveDeskSettingsStore {
-  constructor({ dataDir } = {}) {
-    this.filePath = defaultSettingsPath(dataDir);
-    this.record = null;
-  }
-
-  async getRecord() {
-    if (this.record) return structuredClone(this.record);
-    try {
-      const raw = JSON.parse(await readFile(this.filePath, 'utf8'));
-      this.record = {
-        revision: Math.max(0, Number(raw?.revision) || 0),
-        updatedAt: String(raw?.updatedAt || ''),
-        settings: normalizeLiveDeskSettings(raw?.settings || raw)
-      };
-    } catch {
-      this.record = { revision: 0, updatedAt: '', settings: normalizeLiveDeskSettings(DEFAULT_LIVEDESK_SETTINGS) };
-    }
-    return structuredClone(this.record);
-  }
-
-  getCached() {
-    if (!this.record) return DEFAULT_LIVEDESK_SETTINGS;
-    return { ...this.record.settings, revision: this.record.revision };
-  }
-
-  async get() {
-    return publicSettings((await this.getRecord()).settings);
-  }
-
-  async update(patch = {}, expectedRevision = undefined) {
-    const current = await this.getRecord();
-    if (expectedRevision !== undefined && Number(expectedRevision) !== current.revision) {
-      throw new SettingsConflictError({ revision: current.revision, updatedAt: current.updatedAt, settings: publicSettings(current.settings) });
-    }
-    const source = patch && typeof patch === 'object' && !Array.isArray(patch) ? patch : {};
-    const merged = {};
-    for (const section of Object.keys(current.settings)) {
-      if (section === 'settingsSchemaVersion') continue;
-      merged[section] = { ...current.settings[section], ...(source[section] && typeof source[section] === 'object' ? source[section] : {}) };
-    }
-    const next = {
-      revision: current.revision + 1,
-      updatedAt: new Date().toISOString(),
-      settings: normalizeLiveDeskSettings(merged)
-    };
-    await writeJsonAtomic(this.filePath, next);
-    this.record = next;
-    return structuredClone(next);
-  }
-
-  async reset() {
-    const current = await this.getRecord();
-    return this.update(normalizeLiveDeskSettings(DEFAULT_LIVEDESK_SETTINGS), current.revision);
-  }
-}
+import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { DEFAULT_LIVEDESK_SETTINGS, SETTINGS_SCHEMA_VERSION, defaultSettingsPath, migrateLiveDeskSettings, normalizeLiveDeskSettings, publicSettings } from './settings-schema.js';
+
+export class SettingsConflictError extends Error {
+  constructor(settings) {
+    super('Settings changed in another session. Reload before saving again.');
+    this.name = 'SettingsConflictError';
+    this.code = 'settings-revision-conflict';
+    this.status = 409;
+    this.settings = settings;
+  }
+}
+
+async function writeJsonAtomic(filePath, value) {
+  await mkdir(path.dirname(filePath), { recursive: true });
+  const temporaryPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
+  await writeFile(temporaryPath, `${JSON.stringify(value, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 });
+  await rename(temporaryPath, filePath);
+}
+
+export class LiveDeskSettingsStore {
+  constructor({ dataDir } = {}) {
+    this.filePath = defaultSettingsPath(dataDir);
+    this.record = null;
+  }
+
+  async getRecord() {
+    if (this.record) return structuredClone(this.record);
+    try {
+      const raw = JSON.parse(await readFile(this.filePath, 'utf8'));
+      const sourceSettings = raw?.settings || raw;
+      const sourceSchemaVersion = Math.max(0, Number(sourceSettings?.settingsSchemaVersion) || 0);
+      this.record = {
+        revision: Math.max(0, Number(raw?.revision) || 0),
+        updatedAt: String(raw?.updatedAt || ''),
+        settings: migrateLiveDeskSettings(sourceSettings)
+      };
+      if (sourceSchemaVersion < SETTINGS_SCHEMA_VERSION) {
+        await writeJsonAtomic(this.filePath, this.record);
+      }
+    } catch {
+      this.record = { revision: 0, updatedAt: '', settings: normalizeLiveDeskSettings(DEFAULT_LIVEDESK_SETTINGS) };
+    }
+    return structuredClone(this.record);
+  }
+
+  getCached() {
+    if (!this.record) return DEFAULT_LIVEDESK_SETTINGS;
+    return { ...this.record.settings, revision: this.record.revision };
+  }
+
+  async get() {
+    return publicSettings((await this.getRecord()).settings);
+  }
+
+  async update(patch = {}, expectedRevision = undefined) {
+    const current = await this.getRecord();
+    if (expectedRevision !== undefined && Number(expectedRevision) !== current.revision) {
+      throw new SettingsConflictError({ revision: current.revision, updatedAt: current.updatedAt, settings: publicSettings(current.settings) });
+    }
+    const source = patch && typeof patch === 'object' && !Array.isArray(patch) ? patch : {};
+    const merged = {};
+    for (const section of Object.keys(current.settings)) {
+      if (section === 'settingsSchemaVersion') continue;
+      merged[section] = { ...current.settings[section], ...(source[section] && typeof source[section] === 'object' ? source[section] : {}) };
+    }
+    const next = {
+      revision: current.revision + 1,
+      updatedAt: new Date().toISOString(),
+      settings: normalizeLiveDeskSettings(merged)
+    };
+    await writeJsonAtomic(this.filePath, next);
+    this.record = next;
+    return structuredClone(next);
+  }
+
+  async reset() {
+    const current = await this.getRecord();
+    return this.update(normalizeLiveDeskSettings(DEFAULT_LIVEDESK_SETTINGS), current.revision);
+  }
+}

package/hub/src/transport/secure-direct-acceptor.js

@@ -180,7 +180,7 @@ export function createSecureDirectAcceptor({
       remoteAddress: ip
     });
     try { rawSocket.write(`${JSON.stringify({ type: 'secure.error', protocol: SECURE_SESSION_PROTOCOL, error: code })}\n`); } catch {}
-    logWarn('security', `Secure Direct handshake rejected reason=${code}`);
+    logWarn('security', `Secure Direct handshake rejected reason=${code} remote=${ip || 'unknown'}`);
     rawSocket.destroy();
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livedesk",
-  "version": "0.1.488",
-  "livedeskClientVersion": "0.1.232",
+  "version": "0.1.490",
+  "livedeskClientVersion": "0.1.233",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",