dsh-mornye 1.2.0 → 1.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/assets/app.js +65 -7
  2. package/package.json +1 -1
package/assets/app.js CHANGED
@@ -1087,6 +1087,7 @@
1087
1087
  '<div class="row vol"><span>音量</span><input class="slider" type="range" min="0" max="100" step="5" value="85" aria-label="语音音量"><span class="pct">85</span></div>',
1088
1088
  '<button class="row" data-k="restReminder"><span>休息提醒</span><span class="val sw"></span></button>',
1089
1089
  '<button class="row" data-k="chime"><span>确认提示音</span><span class="val sw"></span></button>',
1090
+ '<button class="row" data-act="chimeTest"><span>测试提示音</span><span class="val">♪</span></button>',
1090
1091
  '<div class="grp" data-grp="显示">显示<span class="gchev">▾</span></div>',
1091
1092
  '<button class="row" data-k="bubble"><span>台词气泡</span><span class="val sw"></span></button>',
1092
1093
  '<button class="row" data-k="balance"><span>余额显示</span><span class="val sw"></span></button>',
@@ -1304,7 +1305,7 @@
1304
1305
  chimeAudio = new Audio(BASE + '/asset/chime.wav')
1305
1306
  chimeAudio.preload = 'auto'
1306
1307
  }
1307
- chimeAudio.volume = Math.min(1, audioVolume() * 0.55)
1308
+ chimeAudio.volume = Math.min(1, audioVolume() * 0.3)
1308
1309
  chimeAudio.currentTime = 0
1309
1310
  const p = chimeAudio.play()
1310
1311
  if (p && p.catch) p.catch(() => {})
@@ -1314,7 +1315,7 @@
1314
1315
  function applyVolume() {
1315
1316
  try { if (clickAudio) clickAudio.volume = audioVolume() } catch {}
1316
1317
  try { if (bootAudio) bootAudio.volume = audioVolume() } catch {}
1317
- try { if (chimeAudio) chimeAudio.volume = Math.min(1, audioVolume() * 0.9) } catch {}
1318
+ try { if (chimeAudio) chimeAudio.volume = Math.min(1, audioVolume() * 0.3) } catch {}
1318
1319
  }
1319
1320
 
1320
1321
  // ---------------- 音乐播放器 ----------------
@@ -2441,6 +2442,13 @@
2441
2442
  if (hkVal) hkVal.textContent = '按下组合键…'
2442
2443
  })
2443
2444
  }
2445
+ const chimeTestRow = menu.querySelector('[data-act="chimeTest"]')
2446
+ if (chimeTestRow) {
2447
+ chimeTestRow.addEventListener('click', () => {
2448
+ lastChimeAt = 0
2449
+ playChime()
2450
+ })
2451
+ }
2444
2452
  const chatRow = menu.querySelector('[data-act="chat"]')
2445
2453
  if (chatRow) {
2446
2454
  chatRow.addEventListener('click', () => {
@@ -2670,26 +2678,76 @@
2670
2678
  applyPrefsToUI()
2671
2679
  setMode(prefs.mode === 'ball' ? 'ball' : 'full', true)
2672
2680
 
2673
- // 轮询
2681
+ // 轮询:断线后每 8 秒自动重连,最多 3 次;之后停止,点状态条可手动重试(同样 3 次)
2682
+ const RETRY_MS = 8000
2683
+ const MAX_RETRIES = 3
2674
2684
  let polling = false
2675
- async function poll() {
2685
+ let pollFailures = 0
2686
+ let retryCount = 0
2687
+ let pollTimer = 0
2688
+ async function poll(manual) {
2676
2689
  if (polling) return
2677
2690
  polling = true
2691
+ clearTimeout(pollTimer)
2692
+ let ok = false
2678
2693
  try {
2679
- const res = await fetch(BASE + '/api/state', { cache: 'no-store', credentials: 'same-origin' })
2694
+ const ctrl = new AbortController()
2695
+ const guard = setTimeout(() => { try { ctrl.abort() } catch {} }, 5000)
2696
+ const res = await fetch(BASE + '/api/state', {
2697
+ cache: 'no-store',
2698
+ credentials: 'same-origin',
2699
+ signal: ctrl.signal,
2700
+ })
2701
+ clearTimeout(guard)
2680
2702
  if (!res.ok) throw new Error('http ' + res.status)
2681
2703
  const json = await res.json()
2682
2704
  serverReady = true
2705
+ pollFailures = 0
2706
+ retryCount = 0
2683
2707
  applyState(json)
2708
+ ok = true
2684
2709
  } catch {
2710
+ pollFailures += 1
2685
2711
  setOffline()
2712
+ chipLabel.textContent = '连接中断'
2713
+ chip.title = '连接中断,点击手动重试'
2686
2714
  } finally {
2687
2715
  polling = false
2716
+ if (ok) {
2717
+ pollTimer = setTimeout(poll, 1200)
2718
+ } else if (retryCount < MAX_RETRIES) {
2719
+ retryCount += 1
2720
+ chipLabel.textContent = '连接中断 · 重连中(' + retryCount + '/' + MAX_RETRIES + ')'
2721
+ chip.title = '第 ' + retryCount + ' 次自动重连,8 秒后重试'
2722
+ pollTimer = setTimeout(poll, RETRY_MS)
2723
+ } else if (manual) {
2724
+ // 手动重试也失败,重新给 3 次自动重连
2725
+ retryCount = 0
2726
+ chipLabel.textContent = '连接中断 · 重连中(1/' + MAX_RETRIES + ')'
2727
+ chip.title = '手动重试失败,8 秒后继续自动重连'
2728
+ retryCount = 1
2729
+ pollTimer = setTimeout(poll, RETRY_MS)
2730
+ } else {
2731
+ chipLabel.textContent = '连接中断 · 点击重试'
2732
+ chip.title = '自动重连已停止,点击手动重试'
2733
+ }
2688
2734
  }
2689
2735
  }
2736
+ function reconnectNow() {
2737
+ if (polling) return
2738
+ retryCount = 0
2739
+ poll()
2740
+ }
2690
2741
  poll()
2691
- setInterval(poll, 1200)
2692
- document.addEventListener('visibilitychange', () => { if (document.visibilityState === 'visible') poll() })
2742
+ document.addEventListener('visibilitychange', () => { if (document.visibilityState === 'visible') reconnectNow() })
2743
+ window.addEventListener('online', reconnectNow)
2744
+ window.addEventListener('focus', reconnectNow)
2745
+ // 断线时点状态条:手动重连(同样是 3 次 × 8 秒)
2746
+ chip.addEventListener('click', () => {
2747
+ if (pollFailures <= 0) return
2748
+ retryCount = 0
2749
+ poll(true)
2750
+ })
2693
2751
 
2694
2752
  window.addEventListener('resize', () => {
2695
2753
  if (dragging) return
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-mornye",
3
- "version": "1.2.0",
3
+ "version": "1.2.1",
4
4
  "description": "莫宁主题综合插件(Windows 桌面版):开机 CG 启动页、DSH 界面主题化、可拖拽的莫宁动态小人挂件(余额 / 用量 / 实时状态)",
5
5
  "keywords": ["dsh", "dsh-plugin", "deepseek-harness", "theme", "widget", "mornye"],
6
6
  "author": "Dreamlands5115",