dsh-whale-widget 0.2.5 → 0.2.6

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 MeteorNOX
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -192,3 +192,7 @@ curl http://127.0.0.1:3080/dsh-whale/last-turn.json
 ## 开发与维护
 
 完整规格、视觉参数、架构结论和生成提示词见 `whale-widget-prompt.md`。修改文字位置、颜色、动画、吸附逻辑、台词组或定价表时参考该文件。
+
+## 许可证
+
+本项目基于 **MIT License** 开源，详见 [LICENSE](LICENSE)。

package/lib/index.js

@@ -336,6 +336,8 @@ gifEl.src = GIF_URL
 gifEl.alt = ''
 gifEl.draggable = false
 bubbleBox.appendChild(gifEl)
+var gifFailed = false
+gifEl.onerror = function () { gifFailed = true }
 bubbleBox.appendChild(textBox)
 bubbleBox.addEventListener('click', function (e) {
   e.stopPropagation()
@@ -436,13 +438,18 @@ function pickRandomLines() {
 function applyBubbleLines(lines) {
   if (lines && lines.gif) {
     // gif 台词组：只显示 gif，隐藏三行文字（display 必须显式覆盖 CSS 的 none）
-    if (gifFadeTimer) { clearTimeout(gifFadeTimer); gifFadeTimer = null }
-    gifEl.style.display = 'block'
-    gifEl.style.opacity = ''
-    labelEl.style.display = 'none'
-    amountEl.style.display = 'none'
-    hintEl.style.display = 'none'
-    return
+    if (gifFailed) {
+      // gif 加载失败/路由缺失：降级为文字台词，避免空白白色气泡
+      lines = singleCenter('A', pickOne(['gif 加载失败了...', '今天没有动图给你看~', '呜呜 动图不见了...']), '', true)
+    } else {
+      if (gifFadeTimer) { clearTimeout(gifFadeTimer); gifFadeTimer = null }
+      gifEl.style.display = 'block'
+      gifEl.style.opacity = ''
+      labelEl.style.display = 'none'
+      amountEl.style.display = 'none'
+      hintEl.style.display = 'none'
+      return
+    }
   }
   if (gifFadeTimer) { clearTimeout(gifFadeTimer); gifFadeTimer = null }
   gifEl.style.display = 'none'
@@ -605,6 +612,11 @@ function viewport() {
     h: window.innerHeight || document.documentElement.clientHeight || 800
   }
 }
+function rightGap() {
+  var sw = window.innerWidth - document.documentElement.clientWidth
+  if (sw < 8) sw = 10 // 悬浮滚动条测量为0时兜底
+  return sw + 2 // 滚动条宽度 + 2px
+}
 function fmt(balance, currency) {
   var num = Number(balance)
   var fixed = isFinite(num) ? num.toFixed(2) : '--'
@@ -671,17 +683,17 @@ function settle() {
   var h = root.offsetHeight || root.getBoundingClientRect().height || 0
   if (drag && drag.active) {
     // mid-drag resize: keep the pointer-follow position, just clamp into view
-    state.left = clamp(state.left, 0, Math.max(0, vp.w - w))
+    state.left = clamp(state.left, 0, Math.max(0, vp.w - w - rightGap()))
     state.top = clamp(state.top, 0, Math.max(0, vp.h - h))
     express()
     return
   }
   if (state.h === 'right') {
-    state.left = Math.max(0, vp.w - w - state.hOff)
+    state.left = Math.max(0, vp.w - w - state.hOff - rightGap())
   } else if (state.h === 'left') {
     state.left = state.hOff
   } else {
-    state.left = clamp(state.left, 0, Math.max(0, vp.w - w))
+    state.left = clamp(state.left, 0, Math.max(0, vp.w - w - rightGap()))
   }
   if (state.v === 'bottom') {
     state.top = Math.max(0, vp.h - h - state.vOff)
@@ -765,11 +777,23 @@ var peakMode = 'default'
 var bubbleOn = true
 var turnCostOn = true
 var turnCostCloseMs = 5000
-var lastCostSeq = 0
 var costBubbleActive = false
 function saveConfig() {
   try {
     fetch(SIZE_URL, { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ scale: state.scale, sound: soundOn, vol: soundVol, soundSet: soundSet, usageMode: usageMode, peakMode: peakMode, bubbleOn: bubbleOn, turnCostOn: turnCostOn, turnCostCloseMs: turnCostCloseMs }) })
+    var vp = viewport()
+    var w = root.offsetWidth || root.getBoundingClientRect().width || 0
+    var h = root.offsetHeight || root.getBoundingClientRect().height || 0
+    var leftDist = state.left
+    var rightDist = vp.w - state.left - w
+    var topDist = state.top
+    var bottomDist = vp.h - state.top - h
+    localStorage.setItem('dshw-pos', JSON.stringify({
+      hAnchor: leftDist <= rightDist ? 'left' : 'right',
+      hDist: Math.round(Math.min(leftDist, rightDist)),
+      vAnchor: topDist <= bottomDist ? 'top' : 'bottom',
+      vDist: Math.round(Math.min(topDist, bottomDist))
+    }))
   } catch (err) {}
 }
 function setUsageMode(v) {
@@ -787,7 +811,8 @@ function setBubbleOn(v) {
   bubbleOn = !!v
   bubbleToggle.checked = bubbleOn
   saveConfig()
-  if (!bubbleOn) hideBubble()
+  // 必须走 hideCostBubble：残留的 costBubbleActive 会让 render()/showBubble() 永久早退
+  if (!bubbleOn) hideCostBubble()
 }
 function setTurnCostOn(v) {
   turnCostOn = !!v
@@ -955,7 +980,7 @@ function snapCheck() {
   } else if (centerX > vp.w * 3 / 4) {
     state.h = 'right'
     state.hOff = 0
-    left = vp.w - w
+    left = vp.w - w - rightGap()
     moved = true
   } else {
     state.h = null
@@ -1009,7 +1034,9 @@ function setupHitTest() {
     var probe = new Image()
     probe.onload = function () {
       try {
-        hitCanvas.getContext('2d').drawImage(probe, 0, 0)
+        // 拉伸到 610×610 与 isWhaleHit 的坐标映射对齐；不指定尺寸会按原图大小绘制，
+        // 回退到非 610×610 素材（如 DSniang02.png）时命中区域会错位
+        hitCanvas.getContext('2d').drawImage(probe, 0, 0, 610, 610)
         hitReady = true
       } catch (err) {}
     }
@@ -1136,7 +1163,28 @@ function endDrag(e, clickAllowed) {
   state.top = top
   settle()
 }
+// 窗口尺寸变化时：自由位置的鲸鱼按相对边框锚点重算（保持离边距离，窗口恢复原状即回原位）；
+// 贴边吸附的鲸鱼走 settle()（保持贴边）
+function applyAnchorPos() {
+  try {
+    var a = JSON.parse(localStorage.getItem('dshw-pos') || 'null')
+    if (!a || (a.hAnchor !== 'left' && a.hAnchor !== 'right') || typeof a.hDist !== 'number' ||
+        (a.vAnchor !== 'top' && a.vAnchor !== 'bottom') || typeof a.vDist !== 'number') return false
+    var vp = viewport()
+    var w = root.offsetWidth || root.getBoundingClientRect().width || 0
+    var h = root.offsetHeight || root.getBoundingClientRect().height || 0
+    var l = a.hAnchor === 'left' ? a.hDist : vp.w - a.hDist - w
+    var t = a.vAnchor === 'top' ? a.vDist : vp.h - a.vDist - h
+    state.left = clamp(l, 0, Math.max(0, vp.w - w))
+    state.top = clamp(t, 0, Math.max(0, vp.h - h))
+    state.h = null
+    state.v = null
+    express()
+    return true
+  } catch (err) { return false }
+}
 window.addEventListener('resize', function () {
+  if (state.h === null && state.v === null && applyAnchorPos()) return
   settle()
 })
 
@@ -1192,6 +1240,23 @@ fetch(SIZE_URL, { cache: 'no-store' })
       turnCostCloseMs = d.turnCostCloseMs > 0 ? d.turnCostCloseMs : 0
       turnCostCloseInput.value = String(Math.round(turnCostCloseMs / 1000))
     }
+    // 相对边框恢复（localStorage 锚点）：窗口变化后保持离边距离
+    try {
+      var a = JSON.parse(localStorage.getItem('dshw-pos') || 'null')
+      if (a && (a.hAnchor === 'left' || a.hAnchor === 'right') && typeof a.hDist === 'number' &&
+          (a.vAnchor === 'top' || a.vAnchor === 'bottom') && typeof a.vDist === 'number') {
+        var vpA = viewport()
+        var wA = root.offsetWidth || root.getBoundingClientRect().width || 0
+        var hA = root.offsetHeight || root.getBoundingClientRect().height || 0
+        var lA = a.hAnchor === 'left' ? a.hDist : vpA.w - a.hDist - wA
+        var tA = a.vAnchor === 'top' ? a.vDist : vpA.h - a.vDist - hA
+        state.left = clamp(lA, 0, Math.max(0, vpA.w - wA))
+        state.top = clamp(tA, 0, Math.max(0, vpA.h - hA))
+        state.h = null // 恢复为自由位置，避免 settle() 重新吸附覆盖
+        state.v = null
+        settle()
+      }
+    } catch (err) {}
     refresh(false)
   })
   .catch(function () { refresh(false) })
@@ -1287,10 +1352,6 @@ function apply(ctx) {
 
     // 监听所有会话的追加事件；turn/end 时结算本轮
     disposers.push(ctx.on('session/event', (session, event) => {
-      // [debug] 确认事件是否到达（下个版本移除）
-      if (event && (event.type === 'turn/end' || event.type === 'assistant/message')) {
-        try { console.error('[whale-balance:event]', event.type, 'turn=' + (event.data && event.data.turn), 'usage=' + (event.data && event.data.usage ? 'yes' : 'no')) } catch (err) {}
-      }
       handleSessionEvent(event)
     }))
 
@@ -1322,6 +1383,17 @@ function apply(ctx) {
       throw new Error('whale image not found')
     }
 
+    function pickBalanceInfo(infos) {
+      if (!Array.isArray(infos) || infos.length === 0) return null
+      const num = (x) => (x && x.total_balance !== undefined ? Number(x.total_balance) : NaN)
+      return (
+        infos.find((x) => x && x.currency === 'CNY' && num(x) > 0) ||
+        infos.find((x) => num(x) > 0) ||
+        infos.find((x) => x && x.currency === 'CNY') ||
+        infos[0]
+      )
+    }
+
     async function fetchBalance() {
       let cred
       try {
@@ -1357,7 +1429,7 @@ function apply(ctx) {
         } catch (err) {
           return { ok: false, code: 'PARSE', error: '余额接口返回不是合法 JSON' }
         }
-        const info = data && Array.isArray(data.balance_infos) ? data.balance_infos[0] : null
+        const info = pickBalanceInfo(data && data.balance_infos)
         if (!info || info.total_balance === undefined) {
           return { ok: false, code: 'SHAPE', error: '余额接口返回结构异常' }
         }
@@ -1580,7 +1652,8 @@ function apply(ctx) {
       const pm = peakMode === 'liangwen' || peakMode === 'qiangqiang' ? peakMode : 'default'
       const bo = bubbleOn !== false
       const tco = turnCostOn !== false
-      const tcc = typeof turnCostCloseMs === 'number' && turnCostCloseMs > 0 ? turnCostCloseMs : 5000
+      // 0 是合法值（不自动关闭），只有缺失/非法时才回落默认 5 秒
+      const tcc = typeof turnCostCloseMs === 'number' && turnCostCloseMs >= 0 ? turnCostCloseMs : 5000
       const body = JSON.stringify({
         scale: scale,
         sound: sound !== false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-whale-widget",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "DSH Web 界面右下角的 DeepSeek 余额小鲸鱼挂件（含今日已用、峰谷定价、随机台词、音效与每轮消耗统计）",
   "keywords": [
     "dsh",