@goodandready/dsh-model-sync 0.5.13 → 0.5.15

package/lib/client.js

@@ -528,6 +528,25 @@ window.__ModuleLoader__.load({
     }
 
 
+    async function safeJson(r) {
+      const text = await r.text()
+      if (!text || !text.trim()) {
+        if (!r.ok) throw new Error(`HTTP ${r.status}${r.statusText ? ': ' + r.statusText : ''}`)
+        return {}
+      }
+      let parsed
+      try {
+        parsed = JSON.parse(text)
+      } catch {
+        if (!r.ok) throw new Error(`HTTP ${r.status}${text ? ': ' + text.slice(0, 120) : ''}`)
+        throw new Error(`Invalid JSON response (HTTP ${r.status})`)
+      }
+      if (!r.ok) {
+        throw new Error(parsed?.error?.message ?? parsed?.message ?? `HTTP ${r.status}`)
+      }
+      return parsed
+    }
+
     function UpdaterSection({ t, api }) {
       const [updaterStatus, setUpdaterStatus] = React.useState(null)
       const [updaterChecking, setUpdaterChecking] = React.useState(false)
@@ -541,8 +560,7 @@ window.__ModuleLoader__.load({
         setUpdaterNotice('')
         fetch(`${api}/update?fresh=1`)
           .then((res) => {
-            if (!res.ok) throw new Error(`HTTP ${res.status}`)
-            return res.json()
+            return safeJson(res)
           })
           .then((data) => {
             setUpdaterStatus(data)
@@ -563,7 +581,7 @@ window.__ModuleLoader__.load({
           method: 'POST',
           headers: { 'x-dsh-plugin-update': '1', 'content-type': 'application/json' },
         })
-          .then((res) => res.json())
+          .then(safeJson)
           .then((resData) => {
             if (resData.error) throw new Error(resData.error.message || resData.error)
             const cur = resData.updatedVersion || (updaterStatus && updaterStatus.latestVersion) || ''
@@ -759,7 +777,7 @@ window.__ModuleLoader__.load({
               secretRef: webhookDraft.diffWebhookSecretRef || webhookDraft.diffWebhookSecret || '',
             }),
           })
-          const body = await res.json()
+          const body = await safeJson(res)
           if (res.ok && body.ok) {
             setWebhookMsg(t.webhookSuccess)
           } else {
@@ -893,7 +911,7 @@ window.__ModuleLoader__.load({
         const key = `${targetProvider}:${targetModel}`
         setTryState((current) => ({ ...current, [key]: { loading: true } }))
         fetch(`${API}/try`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ provider: targetProvider, model: targetModel }) })
-          .then(async (r) => { const b = await r.json(); return { ok: r.ok && b.ok !== false, latency: b.latencyMs, status: b.status, error: b.error } })
+          .then(async (r) => { const b = await safeJson(r); return { ok: r.ok && b.ok !== false, latency: b.latencyMs, status: b.status, error: b.error } })
           .then((res) => { setTryState((current) => ({ ...current, [key]: { loading: false, ok: res.ok, latency: res.latency, status: res.status, error: res.error } })) })
           .catch((err) => { setTryState((current) => ({ ...current, [key]: { loading: false, ok: false, error: String(err?.message ?? err) } })) })
       }
@@ -908,9 +926,7 @@ window.__ModuleLoader__.load({
           body: JSON.stringify({ provider: selectionProvider, models: selectionDraft }),
         })
           .then(async (r) => {
-            const data = await r.json()
-            if (!r.ok || data.error) throw new Error(data?.error?.message ?? `HTTP ${r.status}`)
-            return data
+            return safeJson(r)
           })
           .then((data) => {
             const next = { ...tryState }
@@ -964,9 +980,7 @@ window.__ModuleLoader__.load({
             body: JSON.stringify(parsed),
           })
             .then(async (r) => {
-              const res = await r.json()
-              if (!r.ok) throw new Error(res.error?.message ?? `HTTP ${r.status}`)
-              return res
+              return safeJson(r)
             })
             .then(() => {
               setImportMsg(t.importSuccess)
@@ -991,9 +1005,7 @@ window.__ModuleLoader__.load({
           body: JSON.stringify({ alias: aliasDraft.alias.trim(), provider: aliasDraft.provider, model: aliasDraft.model.trim() }),
         })
           .then(async (r) => {
-            const res = await r.json()
-            if (!r.ok) throw new Error(res.error?.message ?? `HTTP ${r.status}`)
-            return res
+            return safeJson(r)
           })
           .then(() => {
             setAliasDraft({ alias: '', provider: '', model: '' })
@@ -1012,9 +1024,7 @@ window.__ModuleLoader__.load({
           body: JSON.stringify({ alias: aliasName, action: 'delete' }),
         })
           .then(async (r) => {
-            const res = await r.json()
-            if (!r.ok) throw new Error(res.error?.message ?? `HTTP ${r.status}`)
-            return res
+            return safeJson(r)
           })
           .then(() => load())
           .catch((e) => setError(String(e?.message ?? e)))
@@ -1024,9 +1034,8 @@ window.__ModuleLoader__.load({
       const resolveSmartAlias = (aliasName) => {
         setResolvingKey(aliasName)
         fetch(`${API}/aliases/resolve?alias=${encodeURIComponent(aliasName)}`)
-          .then(async (r) => {
-            const res = await r.json()
-            if (!r.ok) throw new Error(res.error?.message ?? `HTTP ${r.status}`)
+          .then(safeJson)
+          .then((res) => {
             setResolvedAliases((prev) => ({ ...prev, [aliasName]: res }))
           })
           .catch((e) => {
@@ -1039,7 +1048,7 @@ window.__ModuleLoader__.load({
         if (typeof document !== 'undefined' && document.hidden) return
         setError('')
         fetch(`${API}/status`)
-          .then((r) => r.json())
+          .then(safeJson)
           .then(setStatus)
           .catch((e) => setError(String(e?.message ?? e)))
         loadCredentials()
@@ -1047,7 +1056,7 @@ window.__ModuleLoader__.load({
 
       const loadCredentials = () => {
         fetch(`${API}/credentials`)
-          .then((r) => r.json())
+          .then(safeJson)
           .then(setCredentialStatus)
           .catch(() => {})
       }
@@ -1058,7 +1067,7 @@ window.__ModuleLoader__.load({
         const effectiveDryRun = options.dryRun !== undefined ? options.dryRun : dryRun
         setBusy(true); setError(''); setPreview(null)
         fetch(`${API}/run`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ provider: targetProvider, dryRun: effectiveDryRun, removeMissing }) })
-          .then(async (r) => { const body = await r.json(); if (!r.ok) throw new Error(body?.error?.message ?? `HTTP ${r.status}`); return body })
+          .then(safeJson)
           .then((body) => {
             setStatus(body)
             if (effectiveDryRun && body.results) setPreview(body.results)
@@ -1074,7 +1083,7 @@ window.__ModuleLoader__.load({
       const checkHealth = (targetProvider) => {
         setBusy(true); setError('')
         fetch(`${API}/health`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ provider: targetProvider }) })
-          .then(async (r) => { const body = await r.json(); if (!r.ok) throw new Error(body?.error?.message ?? `HTTP ${r.status}`); return body })
+          .then(safeJson)
           .then(setStatus)
           .catch((e) => setError(String(e?.message ?? e)))
           .finally(() => setBusy(false))
@@ -1083,7 +1092,7 @@ window.__ModuleLoader__.load({
       const checkCredentials = (targetProvider) => {
         setBusy(true); setError('')
         fetch(`${API}/credentials/check`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ provider: targetProvider }) })
-          .then(async (r) => { const body = await r.json(); if (!r.ok) throw new Error(body?.error?.message ?? `HTTP ${r.status}`); return body })
+          .then(safeJson)
           .then((body) => { if (body.credentials) setCredentialStatus(body.credentials); load() })
           .catch((e) => setError(String(e?.message ?? e)))
           .finally(() => setBusy(false))
@@ -1092,7 +1101,7 @@ window.__ModuleLoader__.load({
       const updateNotification = (id, action) => {
         setBusy(true); setError('')
         fetch(`${API}/notifications/${action}`, { method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify({ id }) })
-          .then(async (r) => { const body = await r.json(); if (!r.ok) throw new Error(body?.error?.message ?? `HTTP ${r.status}`); return body })
+          .then(safeJson)
           .then(() => load())
           .catch((e) => setError(String(e?.message ?? e)))
           .finally(() => setBusy(false))
@@ -1187,7 +1196,7 @@ window.__ModuleLoader__.load({
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify(payload),
         })
-          .then(async (r) => { const body = await r.json(); if (!r.ok) throw new Error(body?.error?.message ?? `HTTP ${r.status}`); return body })
+          .then(safeJson)
           .then(() => { closePolicy(); return load() })
           .catch((e) => setError(String(e?.message ?? e)))
           .finally(() => setBusy(false))
@@ -1204,7 +1213,7 @@ window.__ModuleLoader__.load({
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({ provider: selectionProvider, models }),
         })
-          .then(async (r) => { const body = await r.json(); if (!r.ok) throw new Error(body?.error?.message ?? `HTTP ${r.status}`); return body })
+          .then(safeJson)
           .then((body) => { setStatus(body); closeSelection() })
           .catch((e) => setError(String(e?.message ?? e)))
           .finally(() => setBusy(false))
@@ -1218,7 +1227,7 @@ window.__ModuleLoader__.load({
           headers: { 'content-type': 'application/json' },
           body: JSON.stringify({ historyId: entry.id, provider: targetProvider }),
         })
-          .then(async (r) => { const body = await r.json(); if (!r.ok) throw new Error(body?.error?.message ?? `HTTP ${r.status}`); return body })
+          .then(safeJson)
           .then(() => load())
           .catch((e) => setError(String(e?.message ?? e)))
           .finally(() => setBusy(false))
@@ -1807,7 +1816,7 @@ window.__ModuleLoader__.load({
         ensureStyles()
         const load = () => {
           if (typeof document !== 'undefined' && document.hidden) return
-          fetch(`${API}/status`).then((r) => r.json()).then(setCardStatus).catch(() => {})
+          fetch(`${API}/status`).then(safeJson).then(setCardStatus).catch(() => {})
         }
         load()
         if (open) return

package/lib/diff-notifier.js

@@ -1,3 +1,15 @@
+function getOptionalService(ctx, name) {
+  try {
+    return ctx?.[name] ?? ctx?.reflect?.get?.(name) ?? (typeof ctx?.get === 'function' ? ctx.get(name) : undefined)
+  } catch {
+    try {
+      return ctx?.reflect?.get?.(name) ?? (typeof ctx?.get === 'function' ? ctx.get(name) : undefined)
+    } catch {
+      return undefined
+    }
+  }
+}
+
 import { createHmac } from "node:crypto"
 
 export function extractDiffEvents(results, options = {}) {
@@ -220,9 +232,10 @@ export async function dispatchDiffNotifications(ctx, config, results, { fetchImp
   }
 
   try {
-    if (typeof ctx?.pluginNotify?.send === "function") {
+    const pluginNotify = getOptionalService(ctx, 'pluginNotify')
+    if (typeof pluginNotify?.send === "function") {
       const summary = `Model Sync: +${events.counts.added} added, -${events.counts.deprecated} deprecated, ~${events.counts.priceChanged} price changed`
-      await ctx.pluginNotify.send({
+      await pluginNotify.send({
         source: "dsh-model-sync",
         title: "Model Sync Catalog Changes",
         message: summary,

package/lib/http.js

@@ -1,3 +1,15 @@
+function getOptionalService(ctx, name) {
+  try {
+    return ctx?.[name] ?? ctx?.reflect?.get?.(name) ?? (typeof ctx?.get === 'function' ? ctx.get(name) : undefined)
+  } catch {
+    try {
+      return ctx?.reflect?.get?.(name) ?? (typeof ctx?.get === 'function' ? ctx.get(name) : undefined)
+    } catch {
+      return undefined
+    }
+  }
+}
+
 import { isForbiddenWebhookHost, isLoopbackHost } from './diff-notifier.js'
 import crypto from 'node:crypto'
 import { validateAliasName } from './alias-resolver.js'
@@ -43,7 +55,7 @@ export function isLoopbackAddress(ip) {
 
 export function trusted(req, { requireLoopback = false, ctx = null } = {}) {
   // 1. Core connection rejection check (#237)
-  const conn = ctx?.connection || ctx?.get?.('connection') || req?.connection
+  const conn = getOptionalService(ctx, 'connection') || req?.connection
   if (conn && typeof conn.requestRejection === 'function') {
     const rejection = conn.requestRejection(req)
     if (rejection !== undefined) return false
@@ -272,8 +284,9 @@ export function registerHttpApi(ctx, synchronizer, { getSchedulerStatus = () =>
     return []
   }
   const makeHandler = (route) => async (req, res) => {
-    // 1. Core connection check on all routes (#237)
-    const conn = ctx?.connection || ctx?.get?.('connection') || req?.connection
+    try {
+      // 1. Core connection check on all routes (#237)
+    const conn = getOptionalService(ctx, 'connection') || req?.connection
     if (conn && typeof conn.requestRejection === 'function') {
       const rejection = conn.requestRejection(req)
       if (rejection !== undefined) {
@@ -382,6 +395,12 @@ export function registerHttpApi(ctx, synchronizer, { getSchedulerStatus = () =>
       const code = error?.code === 'SETTINGS_CONFLICT' ? 409 : error?.code === 'SETTINGS_UNAVAILABLE' || error?.code === 'CONFIG_UNAVAILABLE' ? 503 : error?.code === 'PROVIDER_NOT_CONFIGURED' || error?.code === 'UNKNOWN_MODEL' || error?.code === 'INVALID_POLICY' || error?.code === 'INVALID_HISTORY' || error?.code === 'HISTORY_NOT_FOUND' || error?.code === 'INVALID_NOTIFICATION' || error?.code === 'NOTIFICATION_NOT_FOUND' || error?.code === 'INVALID_ALIAS' || error?.code === 'INVALID_CONFIG' ? 400 : 500
       return json(res, code, { error: { code: error?.code ?? 'run-failed', message: error instanceof Error ? error.message : String(error) } })
     }
+    } catch (unhandledError) {
+      if (typeof ctx?.logger?.error === 'function') {
+        ctx.logger.error('[dsh-model-sync] unhandled HTTP error on route ' + route + ':', unhandledError)
+      }
+      return json(res, 500, { error: { code: 'internal_error', message: unhandledError instanceof Error ? unhandledError.message : String(unhandledError) } })
+    }
   }
   return [
     ctx.webServer.register({ kind: 'exact', path: `${BASE}/status`, handler: makeHandler('status') }),

package/lib/index.js

@@ -6,7 +6,7 @@ import { registerHttpApi } from './http.js'
 import { registerPluginUpdater } from './updater.js'
 
 export const name = '@goodandready/dsh-model-sync'
-export const inject = ['llm', 'webServer', 'credentials']
+export const inject = ['llm', 'webServer', 'credentials', 'settings']
 
 const NS = 'dsh-model-sync'
 

package/lib/provider-service.js

@@ -3,18 +3,18 @@ import { listApiKeyProviders } from './inventory.js'
 export function createProviderService(ctx) {
   const readSettings = () => {
     try {
-      return (typeof ctx.get === 'function' ? (ctx.get('settings') ?? ctx.settings) : ctx.settings)
+      return ctx?.settings ?? ctx?.reflect?.get?.('settings') ?? (typeof ctx?.get === 'function' ? ctx.get('settings') : undefined)
     } catch {
-      return ctx.settings
+      return undefined
     }
   }
 
   const readLlm = () => {
     try {
-      const llm = typeof ctx.get === 'function' ? ctx.get('llm') : null
-      return (llm && typeof llm === 'object' && (llm.listConfigurableProviders || llm.listProviders)) ? llm : ctx.llm
+      const llm = ctx?.llm ?? ctx?.reflect?.get?.('llm') ?? (typeof ctx?.get === 'function' ? ctx.get('llm') : null)
+      return (llm && typeof llm === 'object' && (llm.listConfigurableProviders || llm.listProviders)) ? llm : undefined
     } catch {
-      return ctx.llm
+      return undefined
     }
   }
 

package/lib/synchronizer-helpers.js

@@ -38,16 +38,32 @@ export function reliabilityOptions(config, options) {
   }
 }
 
+export function getOptionalService(ctx, name) {
+  try {
+    return ctx?.[name] ?? ctx?.reflect?.get?.(name) ?? (typeof ctx?.get === 'function' ? ctx.get(name) : undefined)
+  } catch {
+    try {
+      return ctx?.reflect?.get?.(name) ?? (typeof ctx?.get === 'function' ? ctx.get(name) : undefined)
+    } catch {
+      return undefined
+    }
+  }
+}
+
 export function settingsOf(ctx) {
-  try { return (typeof ctx.get === 'function' ? (ctx.get('settings') ?? ctx.settings) : ctx.settings) } catch { return ctx.settings }
+  try {
+    return ctx?.settings ?? ctx?.reflect?.get?.('settings') ?? (typeof ctx?.get === 'function' ? ctx.get('settings') : undefined)
+  } catch {
+    return undefined
+  }
 }
 
 export function llmOf(ctx) {
   try {
-    const llm = typeof ctx.get === 'function' ? ctx.get('llm') : null
-    return (llm && typeof llm === 'object' && (llm.listConfigurableProviders || llm.listProviders)) ? llm : ctx.llm
+    const llm = ctx?.llm ?? ctx?.reflect?.get?.('llm') ?? (typeof ctx?.get === 'function' ? ctx.get('llm') : null)
+    return (llm && typeof llm === 'object' && (llm.listConfigurableProviders || llm.listProviders)) ? llm : undefined
   } catch {
-    return ctx.llm
+    return undefined
   }
 }
 

package/lib/updater.js

@@ -1,3 +1,15 @@
+function getOptionalService(ctx, name) {
+  try {
+    return ctx?.[name] ?? ctx?.reflect?.get?.(name) ?? (typeof ctx?.get === 'function' ? ctx.get(name) : undefined)
+  } catch {
+    try {
+      return ctx?.reflect?.get?.(name) ?? (typeof ctx?.get === 'function' ? ctx.get(name) : undefined)
+    } catch {
+      return undefined
+    }
+  }
+}
+
 import { spawn } from 'node:child_process'
 import { existsSync, readFileSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
@@ -315,7 +327,7 @@ export function registerPluginUpdater(ctx, options = {}) {
   const handler = async (request, response) => {
     try {
       // 1. Core connection rejection check on all updater routes (#237)
-      const conn = ctx?.connection || ctx?.get?.('connection') || request?.connection
+      const conn = getOptionalService(ctx, 'connection') || request?.connection
       if (conn && typeof conn.requestRejection === 'function') {
         const rejection = conn.requestRejection(request)
         if (rejection !== undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-model-sync",
-  "version": "0.5.13",
+  "version": "0.5.15",
   "description": "Automatic model catalog synchronization for API-key DeepSeek Harness providers.",
   "keywords": [
     "deepseek-harness",