@goodandready/dsh-messenger-gateway 0.4.7 → 0.4.9

package/lib/config.js

@@ -7,8 +7,8 @@ const HomeEntry = z.object({
 })
 
 export const PluginConfig = z.object({
-  enabled: z.boolean().default(true),
-  internalBaseURL: z.string().default('http://127.0.0.1:3080'),
+  enabled: z.boolean().volatile().default(true),
+  internalBaseURL: z.string().volatile().default('http://127.0.0.1:3080'),
   telegram: z.object({
     enabled: z.boolean().default(false),
     botToken: z.string().role('secret').default(''),
@@ -102,3 +102,13 @@ export const PluginConfig = z.object({
 })
 
 export const Config = PluginConfig
+
+// Unwrap Volatile boxes before any caller reads a value. The Loader mutates the
+// boxes in place and re-announces them with loader/volatile-update, so this must
+// read the entry config lazily rather than caching the parsed result.
+export function plainConfig(value) {
+  if (value === null || typeof value !== 'object') return value
+  if (Array.isArray(value)) return value.map(plainConfig)
+  if (typeof value.get === 'function') return plainConfig(value.get())
+  return Object.fromEntries(Object.entries(value).map(([k, v]) => [k, plainConfig(v)]))
+}

package/lib/index.js

@@ -10,7 +10,8 @@ import {
   messengerApiSchema, parseMessengerBody,
 } from './messenger-api.js'
 import { listHomes } from './homes.js'
-import { Config } from './config.js'
+export { plainConfig } from './config.js'
+import { Config, plainConfig } from './config.js'
 import { setupSettings } from './settings-bridge.js'
 
 export const name = '@goodandready/dsh-messenger-gateway'
@@ -20,7 +21,9 @@ export const SETTINGS_NAMESPACE = 'dsh-messenger-gateway'
 export { Config }
 
 function resolveConfig(raw) {
-  const cfg = Config(raw)
+  // Unwrap once here: everything downstream reads plain values.
+  const plain = plainConfig(raw)
+  const cfg = plainConfig(Config(plain))
   const home = process.env.DSH_HOME || join(homedir(), '.dsh')
   if (!cfg.media.cacheDir) {
     cfg.media = { ...cfg.media, cacheDir: join(home, 'messenger-gateway', 'cache') }
@@ -139,7 +142,7 @@ function isExcludedSession(sessionId, prefixes) {
 }
 
 export function apply(ctx, config) {
-  const entry = resolveConfig(structuredClone(config || {}))
+  const entry = resolveConfig(structuredClone(plainConfig(config || {})))
   let gateway
   let source = () => entry
   let settingsApi

package/lib/settings-bridge.js

@@ -1,6 +1,30 @@
 export function setupSettings(ctx, { namespace, Config, resolveConfig, baseConfig, sync, logger }) {
   let settingsApi
-  let source = () => resolveConfig(baseConfig ?? {})
+  let currentConfig = resolveConfig(ctx.fiber?.config ?? baseConfig ?? {})
+  let source = () => currentConfig
+  const watchers = new Set()
+  let readLive = () => null
+
+  const applyLiveConfig = (nextRaw) => {
+    const live = nextRaw ?? readLive() ?? ctx.fiber?.config ?? baseConfig
+    if (live) {
+      currentConfig = resolveConfig(live)
+      sync()
+      for (const cb of watchers) {
+        try { cb(currentConfig) } catch (err) { logger?.debug?.(`${namespace}: watcher error:`, err?.message || err) }
+      }
+    }
+  }
+
+  const unbinds = []
+  if (typeof ctx?.on === 'function') {
+    const u1 = ctx.on('loader/volatile-update', () => applyLiveConfig())
+    if (typeof u1 === 'function') unbinds.push(u1)
+    const u2 = ctx.on('internal/update', (cfg) => applyLiveConfig(cfg))
+    if (typeof u2 === 'function') unbinds.push(u2)
+    const u3 = ctx.on('app-boot/config-reload', () => applyLiveConfig())
+    if (typeof u3 === 'function') unbinds.push(u3)
+  }
 
   const mountSettings = (sctx) => {
     const service = sctx?.settings || (typeof sctx?.get === 'function' ? sctx.get('settings') : null)
@@ -26,7 +50,8 @@ export function setupSettings(ctx, { namespace, Config, resolveConfig, baseConfi
     const getRevision = () => {
       try {
         return service.describe?.()?.find?.((row) => row.ns === namespace)?.revision
-      } catch {
+      } catch (err) {
+        logger?.debug?.(`${namespace}: getRevision failed:`, err?.message || err)
         return undefined
       }
     }
@@ -47,8 +72,9 @@ export function setupSettings(ctx, { namespace, Config, resolveConfig, baseConfi
       return null
     }
 
+    readLive = readLiveSettings
     const liveVal = readLiveSettings()
-    let currentConfig = resolveConfig(liveVal ?? baseConfig ?? {})
+    if (liveVal) currentConfig = resolveConfig(liveVal)
     source = () => currentConfig
 
     const persist = async (next) => {
@@ -64,6 +90,9 @@ export function setupSettings(ctx, { namespace, Config, resolveConfig, baseConfi
       }
       currentConfig = resolveConfig(payload)
       sync()
+      for (const cb of watchers) {
+        try { cb(currentConfig) } catch (err) { logger?.debug?.(`${namespace}: watcher error:`, err?.message || err) }
+      }
       return currentConfig
     }
 
@@ -72,27 +101,28 @@ export function setupSettings(ctx, { namespace, Config, resolveConfig, baseConfi
       replace: async (next) => persist(next),
       update: async (patch) => persist({ ...source(), ...patch }),
       watch: (cb) => {
-        if (typeof service.watch === 'function') return service.watch(cb)
-        return () => {}
+        if (typeof cb === 'function') watchers.add(cb)
+        const unwatchService = typeof service.watch === 'function' ? service.watch(cb) : null
+        return () => {
+          watchers.delete(cb)
+          if (typeof unwatchService === 'function') unwatchService()
+        }
       },
     }
 
     const onFn = typeof sctx?.on === 'function' ? sctx.on.bind(sctx) : (typeof ctx?.on === 'function' ? ctx.on.bind(ctx) : null)
-    const disposeDocUpdated = onFn
-      ? onFn('settings/document-updated', (updatedNs) => {
-          if (updatedNs === namespace) {
-            const nextVal = readLiveSettings()
-            if (nextVal) {
-              currentConfig = resolveConfig(nextVal)
-              sync()
-            }
-          }
-        })
-      : null
+    if (onFn) {
+      const d1 = onFn('settings/document-updated', (updatedNs) => {
+        if (updatedNs === namespace) applyLiveConfig()
+      })
+      if (typeof d1 === 'function') unbinds.push(d1)
+    }
 
     if (effect) {
       effect(() => () => {
-        if (typeof disposeDocUpdated === 'function') disposeDocUpdated()
+        for (const unbind of unbinds) {
+          try { unbind() } catch (err) { logger?.debug?.(`${namespace}: unbind error:`, err?.message || err) }
+        }
         settingsApi = undefined
       }, `${namespace}: settings`)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-messenger-gateway",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "Telegram messenger bridge for DeepSeek Harness: sessions, steer, homes, inline asks, notify bridge, and optional TTS voice notes.",
   "license": "MIT",
   "type": "module",