@mzzsfy/dsh-turn-notify 0.12.0 → 0.12.1

package/README.md

@@ -192,4 +192,4 @@ node scripts/dev-link.mjs dsh-turn-notify   # 仓库根执行:归一 profile 依
 
 ## dsh 版本兼容
 
-三版本全部通过:通知开关与播报形态、激活 live。0.1.6 控件数 13→19 属宿主演进,不构成不兼容。
+三版本(0.1.2-rc.1 / 0.1.5-rc.3 / 0.1.7-rc.1)全部通过:通知开关与播报形态(四 tab 计数、事件开关、音效卡试听、IM 自洽)、激活 live。0.1.6 控件数 13→19 属宿主演进,不构成不兼容。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-turn-notify",
   "description": "消息通知:六类回合事件送达声音、系统弹窗、页内提示、webhook、IM 与宿主桌面通知;内置八种合成音色,自定义音效,按事件分类指定;多窗口只响一次",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "type": "module",
   "main": "src/index.js",
   "exports": {

package/src/index.js

@@ -103,9 +103,51 @@ const SETTINGS_SCHEMA = z.object({
 })
 
 // 读侧归一交由 core 的 resolvedConfig:字段类型异常回退默认值,与写路径校验宽松度一致
-const readSettings = (ctx) => {
+const readSettings = (ctx, config) => {
   const settings = ctx.get('settings')
-  return resolvedConfig(settings ? settings.get(NAMESPACE) : undefined)
+  // 双形读(maintain 同构):legacy settings 命名空间 get;0.1.7+ apply 入参
+  // config 整节解包。方法面守卫兼防:服务在但缺 get 时回落默认配置,防路由 handler 抛错
+  return resolvedConfig(settings && typeof settings.get === 'function' ? settings.get(NAMESPACE) : unwrapVolatile(config))
+}
+
+// volatile ref 动态解包(get 协议):0.1.7 下 apply 入参 config 为整节单 ref;
+// legacy 宿主 config 为普通对象原样透传
+function unwrapVolatile(value) {
+  return typeof value?.get === 'function' ? value.get() : value
+}
+
+// 0.1.7 宿主以静态 Config 导出生成设置节表单(maintain 同构)。根级 volatile
+// 包装:整节 live 表单,节写经 loader 原地热更;旧宿主 schemastery 无 volatile
+// 方法,特性检测原样返回
+export const Config = typeof SETTINGS_SCHEMA.volatile === 'function' ? SETTINGS_SCHEMA.volatile() : SETTINGS_SCHEMA
+
+// 0.1.7 写路径:configEditor.edit 落 profile 条目(fiber.entry,与命名空间解耦)。
+// 嵌套补丁(enabled.{category}/soundMapping.{category})须深合并:浅展开会把未提交
+// 的兄弟分类键抹成 undefined;null 值原样落盘(清除语义,读侧 resolvedConfig 过滤)
+async function persistPatch(ctx, patch) {
+  const settings = ctx.get('settings')
+  // legacy 方法面以 register 为准(0.1.7 的 settings.update 名义在场但按命名
+  // 空间找条目必败,不可作判据)
+  if (typeof settings?.register === 'function' && typeof settings?.update === 'function') {
+    await settings.update(NAMESPACE, patch)
+    return
+  }
+  const editor = ctx.get('configEditor')
+  const entry = ctx.fiber?.entry
+  if (!editor || typeof editor.edit !== 'function' || !entry) throw new Error('settings 服务不可用')
+  await editor.edit(entry, (current) => deepMerge(current, patch))
+}
+
+function deepMerge(under, over) {
+  const out = { ...under }
+  for (const key of Object.keys(over)) {
+    const next = over[key]
+    const underValue = out[key]
+    const bothPlain = (next !== null && typeof next === 'object' && !Array.isArray(next))
+      && (underValue !== null && typeof underValue === 'object' && !Array.isArray(underValue))
+    out[key] = bothPlain ? deepMerge(underValue, next) : next
+  }
+  return out
 }
 
 function sendJson(res, status, payload) {
@@ -187,7 +229,7 @@ async function readSoundIndex() {
 const writeSoundIndex = (index) => writeFile(soundIndexPath, JSON.stringify(index))
 
 /** @param {import('@deepseek-ai/cordis').Context} ctx */
-export function apply(ctx) {
+export function apply(ctx, config) {
   const projection = createProjection({})
   // 打开回合:按会话 id 记回合序号与起始时间,回合结束即清;序号严格递增,
   // 供子代理注册归属判定,同毫秒内多回合不受时钟精度歧义影响
@@ -241,7 +283,7 @@ export function apply(ctx) {
 
   // durationMs 与 wakeTurn / awaitingChildren 由调用方在清理状态前读取后传入,防先删后读
   function notifyUnit({ category, kind, reasonKind, session, durationMs = null, wakeTurn = false, awaitingChildren = false }) {
-    const settings = readSettings(ctx)
+    const settings = readSettings(ctx, config)
     const header = session.header || {}
     const sessionId = String(session.id ?? '')
     if (!shouldNotify({ category, kind, durationMs, settings, header, wakeTurn, awaitingChildren })) return
@@ -419,6 +461,14 @@ export function apply(ctx) {
   ))
 
   ctx.inject(['settings'], (settingsCtx) => {
+    // 方法面守卫:settings 服务缺 register 面(0.1.7 已移除)即走新形态分支;
+    // 0.1.7 关闭原生自动设置页,设置面由本包自带分区承担(maintain 同构)
+    if (typeof settingsCtx.settings.register !== 'function') {
+      if (typeof settingsCtx.settings?.configure === 'function') {
+        settingsCtx.effect(() => settingsCtx.settings.configure({ auto: false }, ctx.fiber))
+      }
+      return
+    }
     settingsCtx.settings.register(NAMESPACE, SETTINGS_SCHEMA)
   })
 
@@ -471,7 +521,7 @@ export function apply(ctx) {
           if (query.has('cursor') && projection.version() === cursor) {
             await projection.wait(cursor, LONG_POLL_WAIT_MS)
           }
-          const settings = readSettings(ctx)
+          const settings = readSettings(ctx, config)
           sendJson(res, 200, { units: projection.list(), soundMapping: settings.soundMapping, version: projection.version() })
         } finally {
           if (releaseBrowserPoll !== null) releaseBrowserPoll()
@@ -602,15 +652,14 @@ export function apply(ctx) {
         await writeSoundIndex(index)
       }
       // 被引用即回落:深合并语义下引用置 null 清除,resolveSound 兜底回内置默认
-      const settings = ctx.get('settings')
-      if (settings) {
-        const current = readSettings(ctx)
+      if (ctx.get('settings')) {
+        const current = readSettings(ctx, config)
         const patch = {}
         for (const key of Object.keys(current.soundMapping)) {
           if (current.soundMapping[key] === id) patch[key] = null
         }
         if (Object.keys(patch).length > 0) {
-          await settings.update(NAMESPACE, { soundMapping: patch })
+          await persistPatch(ctx, { soundMapping: patch })
           projection.bump()
         }
       }
@@ -636,15 +685,15 @@ export function apply(ctx) {
           return
         }
         // 校验到写回整段入互斥域:防与 DELETE 清引用并发时把已删音效的 id 写回映射;
-        // settings.update 深合并无法删键,清除以 null 表达,读侧 resolvedConfig 过滤
+        // 深合并无法删键,清除以 null 表达,读侧 resolvedConfig 过滤
         await serializedSoundWrite(async () => {
           if (!validateMappingId(id, (await listSounds()).map((sound) => sound.id))) {
             sendJson(res, 400, { error: '未知音效: ' + id })
             return
           }
-          await settings.update(NAMESPACE, { soundMapping: { [category]: id.length === 0 ? null : id } })
+          await persistPatch(ctx, { soundMapping: { [category]: id.length === 0 ? null : id } })
           projection.bump()
-          sendJson(res, 200, { ok: true, soundMapping: readSettings(ctx).soundMapping })
+          sendJson(res, 200, { ok: true, soundMapping: readSettings(ctx, config).soundMapping })
         })
       }),
     }), 'turn-notify mapping route')
@@ -657,7 +706,7 @@ export function apply(ctx) {
       handler: async (req, res) => {
         // imAvailable 不进 core 纯函数,config 响应处合流;实时判定,无装载时序假设
         if (req.method === 'GET') {
-          sendJson(res, 200, { ...publicConfig(readSettings(ctx)), imAvailable: imReady() })
+          sendJson(res, 200, { ...publicConfig(readSettings(ctx, config)), imAvailable: imReady() })
           return
         }
         if (req.method !== 'POST') {
@@ -671,14 +720,9 @@ export function apply(ctx) {
             sendJson(res, 400, { error: verdict.reason })
             return
           }
-          const settings = ctx.get('settings')
-          if (!settings) {
-            sendJson(res, 500, { error: 'settings 服务不可用' })
-            return
-          }
-          await settings.update(NAMESPACE, verdict.patch)
+          await persistPatch(ctx, verdict.patch)
           projection.bump()
-          sendJson(res, 200, { ...publicConfig(readSettings(ctx)), imAvailable: imReady() })
+          sendJson(res, 200, { ...publicConfig(readSettings(ctx, config)), imAvailable: imReady() })
         } catch (error) {
           sendError(res, error)
         }
@@ -691,7 +735,7 @@ export function apply(ctx) {
       path: '/api/turn-notify/test-webhook',
       handler: route('POST', { crossOrigin: true }, async (req, res) => {
         // 等待投递完成,真实结果随响应返回,测试按钮不再谎报
-        const result = await sendWebhook({ url: readSettings(ctx).webhookUrl, payload: buildWebhookPayload(buildTestUnit()) })
+        const result = await sendWebhook({ url: readSettings(ctx, config).webhookUrl, payload: buildWebhookPayload(buildTestUnit()) })
         sendJson(res, 200, result)
       }),
     }), 'turn-notify test-webhook route')
@@ -755,7 +799,7 @@ export function apply(ctx) {
           sendJson(res, 200, { ok: false, detail: 'dsh-im 未安装' })
           return
         }
-        const targets = normalizeImTargets(readSettings(ctx).imTargets)
+        const targets = normalizeImTargets(readSettings(ctx, config).imTargets)
         if (targets.length === 0) {
           sendJson(res, 200, { ok: false, detail: '未配置投递目标' })
           return

package/test/route.test.mjs

@@ -413,3 +413,141 @@ test('test-webhook 已配置时送达并返回真实结果', async () => {
     assert.ok(String(calls[0].body.text).startsWith('[dsh]'), 'webhook payload 缺少 text')
   } finally { globalThis.fetch = original }
 })
+
+// --- 0.1.7 settings 面双形适配(maintain a913c2c 同构) ---
+
+test('Config 导出契约:根级 volatile 包装,validate 产整节单 ref,默认值对拍', async () => {
+  const mod = await import('../src/index.js')
+  assert.ok(mod.Config, 'Config 导出必须在场')
+  const resolved = mod.Config['~standard'].validate({})
+  assert.equal(resolved.issues, undefined)
+  const section = resolved.value.get()
+  assert.equal(section.webhookUrl, '')
+  assert.equal(section.rootsOnly, true)
+  assert.equal(section.imEnabled, true)
+  assert.ok(section.enabled && typeof section.enabled === 'object')
+})
+
+// 0.1.7 形态装配:settings 无 register/get(宿主已移除),config 为整节单 ref 桩,
+// configEditor 桩经深合并后原样写回
+function makeRc17Ctx({ configStore = {}, configEditorAvailable = true } = {}) {
+  const routes = new Map()
+  const editCalls = []
+  const config = { get: () => ({ ...configStore }) }
+  const settingsService = {}
+  const configEditor = {
+    async edit(entry, change) {
+      editCalls.push(entry)
+      const merge = (under, over) => {
+        const out = { ...under }
+        for (const key of Object.keys(over)) {
+          const next = over[key]
+          const underValue = out[key]
+          const bothPlain = (next !== null && typeof next === 'object' && !Array.isArray(next))
+            && (underValue !== null && typeof underValue === 'object' && !Array.isArray(underValue))
+          out[key] = bothPlain ? merge(underValue, next) : next
+        }
+        return out
+      }
+      const next = merge({ ...configStore }, change({}, {}))
+      for (const key of Object.keys(next)) configStore[key] = next[key]
+    },
+  }
+  const configureCalls = []
+  const ctx = {
+    on() {},
+    fiber: { entry: { options: { id: 'turn-notify', name: '@mzzsfy/dsh-turn-notify' } } },
+    get(key) {
+      if (key === 'settings') return settingsService
+      if (key === 'configEditor') return configEditorAvailable ? configEditor : undefined
+      return undefined
+    },
+    inject(deps, fn) {
+      if (deps[0] === 'settings') {
+        fn({
+          settings: settingsService,
+          effect(stubEffect) {
+            const disposer = stubEffect()
+            if (typeof disposer === 'function') configureCalls.push(disposer)
+          },
+        })
+      }
+    },
+    effect(thunk) { thunk() },
+    webServer: { register(route) { routes.set(route.path, route.handler) } },
+  }
+  return { ctx, routes, config, configStore, editCalls, configureCalls }
+}
+
+test('0.1.7 形态:config GET 读 config ref 节值,POST 经 configEditor.edit 深合并', async () => {
+  // Given config ref 携带用户值 + configEditor 桩
+  const { ctx, routes, config, configStore, editCalls } = makeRc17Ctx({
+    configStore: { enabled: { completed: false }, webhookUrl: 'https://hook.example' },
+  })
+  apply(ctx, config)
+  // When GET config
+  const read = makeRes()
+  await routes.get('/api/turn-notify/config')(makeReq('GET'), read)
+  // Then 返回 config 节值
+  assert.equal(read.body.enabled.completed, false)
+  assert.equal(read.body.webhookUrl, 'https://hook.example')
+  // When POST 嵌套补丁(仅关一个分类 + 改时长)
+  const saved = makeRes()
+  await routes.get('/api/turn-notify/config')(makeReq('POST', { enabled: { error: false }, minTurnDurationMs: 1234 }, JSON_HEADERS), saved)
+  // Then 深合并落盘:未提交的兄弟分类保留,新键写入
+  assert.equal(saved.status, 200)
+  assert.equal(editCalls.length, 1)
+  assert.equal(editCalls[0].options.id, 'turn-notify')
+  assert.equal(configStore.enabled.completed, false, '既有分类开关保留')
+  assert.equal(configStore.enabled.error, false, '新分类开关写入')
+  assert.equal(configStore.minTurnDurationMs, 1234)
+  // When 重读
+  const reread = makeRes()
+  await routes.get('/api/turn-notify/config')(makeReq('GET'), reread)
+  // Then 回显合并后节值
+  assert.equal(reread.body.enabled.error, false)
+  assert.equal(reread.body.enabled.completed, false)
+})
+
+test('0.1.7 形态:soundMapping 单分类写经 configEditor.edit 深合并,null 清除保留', async () => {
+  // Given 既有映射两个分类
+  const { ctx, routes, config, configStore } = makeRc17Ctx({
+    configStore: { soundMapping: { completed: 'ding', 'max-tokens': 'buzz' } },
+  })
+  apply(ctx, config)
+  // When POST 单分类改映射
+  const saved = makeRes()
+  await routes.get('/api/turn-notify/mapping')(makeReq('POST', { category: 'completed', id: 'bell' }, JSON_HEADERS), saved)
+  // Then 兄弟分类保留,目标分类更新
+  assert.equal(saved.status, 200)
+  assert.equal(configStore.soundMapping.completed, 'bell')
+  assert.equal(configStore.soundMapping['max-tokens'], 'buzz')
+  // When POST 空 id(清除语义,null 落盘)
+  await routes.get('/api/turn-notify/mapping')(makeReq('POST', { category: 'max-tokens', id: '' }, JSON_HEADERS), makeRes())
+  // Then null 原样落盘(读侧过滤)
+  assert.equal(configStore.soundMapping['max-tokens'], null)
+})
+
+test('0.1.7 形态:configEditor 缺失即 500 拒写,不崩溃', async () => {
+  // Given configEditor 服务缺席
+  const { ctx, routes, config } = makeRc17Ctx({ configEditorAvailable: false })
+  apply(ctx, config)
+  // When POST 写配置
+  const denied = makeRes()
+  await routes.get('/api/turn-notify/config')(makeReq('POST', { rootsOnly: false }, JSON_HEADERS), denied)
+  // Then 400 错误响应(sendError 归一,settings 服务不可用非 fs 错误),进程存活
+  assert.equal(denied.status, 400)
+  assert.ok(denied.body.error)
+})
+
+test('0.1.7 形态:settings.configure 在场即关闭原生自动页,register 缺失不抛错', () => {
+  // Given settingsForms 带 configure 无 register
+  const configureCalls = []
+  const { ctx, config } = makeRc17Ctx()
+  ctx.get('settings').configure = (presentation, owner) => { configureCalls.push({ presentation, owner }); return () => {} }
+  // When apply
+  apply(ctx, config)
+  // Then 关闭自动页且 owner 为本插件 fiber
+  assert.equal(configureCalls.length, 1)
+  assert.deepEqual(configureCalls[0].presentation, { auto: false })
+})