dsh-niuma 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-niuma",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "牛马加速器 — DSH 工资换算实时计数器：按实收月薪、上下班时间、午休（可设是否算工时）、法定节假日自动折算秒/分/时/日/周/月工资，工资每秒滚动增长。Community salary ticker plugin for DeepSeek Harness.",
   "type": "module",
   "main": "lib/index.js",

package/src/client/index.js

@@ -123,6 +123,12 @@ const zh = {
   'configFailed': '设置读取失败，使用默认值',
   'retry': '重试',
   'settings': '设置',
+  'decimalsLabel': '小数',
+  'decimalsUnit': '位',
+  'turboLabel': '加速',
+  'refreshRate': '刷新频率',
+  'rateSecond': '按秒（1s）',
+  'rateFrame': '刷新率（≈16ms）',
   'settingsHint': '改完点「保存」生效；格式不对会在下方红字提示，不影响计时。',
   'salaryField': '实收月薪',
   'groupSalary': '工资',
@@ -223,6 +229,12 @@ const en = {
   'configFailed': 'Failed to load settings, using defaults',
   'retry': 'Retry',
   'settings': 'Settings',
+  'decimalsLabel': 'Decimals',
+  'decimalsUnit': 'dp',
+  'turboLabel': 'Turbo',
+  'refreshRate': 'Refresh rate',
+  'rateSecond': 'Per second (1s)',
+  'rateFrame': 'Display rate (~16ms)',
   'settingsHint': 'Click Save to apply. Invalid input is shown in red below; the ticker keeps running.',
   'salaryField': 'Net monthly salary',
   'groupSalary': 'Salary',
@@ -312,6 +324,7 @@ function formFromConfig(config) {
     lunchStart: String(config.lunchStart == null ? '' : config.lunchStart),
     lunchEnd: String(config.lunchEnd == null ? '' : config.lunchEnd),
     lunchPaid: config.lunchPaid === true,
+    updateMs: String(config.updateMs == null ? 1000 : config.updateMs),
   };
 }
 
@@ -326,6 +339,7 @@ function patchFromForm(form) {
     lunchStart: String(form.lunchStart || '').trim(),
     lunchEnd: String(form.lunchEnd || '').trim(),
     lunchPaid: Boolean(form.lunchPaid),
+    updateMs: Number(form.updateMs),
   };
 }
 
@@ -371,19 +385,26 @@ function useRemoteConfig() {
   return { ...state, refresh };
 }
 
-/** 当前时间：每 250ms 检查一次，只有整秒变化才 setState（每秒重算一次）。 */
-function useSecondClock() {
+/**
+ * 当前时间：按配置的刷新间隔更新。
+ * - updateMs >= 50：setInterval（按秒 / 200ms / 100ms）
+ * - updateMs <= 16：requestAnimationFrame（跟随屏幕刷新率连续滚动）
+ */
+function useClock(updateMs) {
   const [now, setNow] = React.useState(() => new Date());
   React.useEffect(() => {
-    let lastSecond = -1;
-    const timer = setInterval(() => {
-      const second = Math.floor(Date.now() / 1000);
-      if (second === lastSecond) return;
-      lastSecond = second;
-      setNow(new Date());
-    }, 250);
+    if (updateMs <= 16) {
+      let raf = 0;
+      const loop = () => {
+        setNow(new Date());
+        raf = requestAnimationFrame(loop);
+      };
+      raf = requestAnimationFrame(loop);
+      return () => cancelAnimationFrame(raf);
+    }
+    const timer = setInterval(() => setNow(new Date()), updateMs);
     return () => clearInterval(timer);
-  }, []);
+  }, [updateMs]);
   return now;
 }
 
@@ -471,10 +492,103 @@ function SectionTitle(props) {
 }
 
 /** 今日已赚主卡：渐变底 + 超大金额 + 进度条（视觉焦点只有这一处）。 */
+/* ------------------------------------------------------------------ *
+ * 滚动金额：连续的「机械里程表」
+ *   每一位不是等金额变了才跳一格，而是按位权连续转动：
+ *   最后一位小数转得飞快（0-9 循环），前一位慢 10 倍，整数位几乎不动。
+ *   加速模式下每帧（rAF）更新 wheel 位置，看起来就是数字在持续往上滚。
+ * ------------------------------------------------------------------ */
+const ROLL_BLOCKS = Array.from({ length: 11 }, (_, i) => String(i % 10));
+
+/** 单个数字轮：`position` 是连续位置（单位=1 个数字格，小数部分=滚到一半）。 */
+function RollingDigit(props) {
+  const heightEm = 1.22;
+  const widthEm = 0.62;
+  const pos = Number.isFinite(props.position) ? props.position : 0;
+  const wheel = ((pos % 10) + 10) % 10;
+  return React.createElement('span', {
+    'aria-hidden': 'true',
+    style: {
+      display: 'inline-block', position: 'relative', overflow: 'hidden',
+      width: `${widthEm}em`, height: `${heightEm}em`, verticalAlign: 'baseline',
+    },
+  }, [
+    React.createElement('span', {
+      key: 'ghost',
+      style: { visibility: 'hidden', display: 'block', height: `${heightEm}em`, lineHeight: `${heightEm}em` },
+    }, '0'),
+    React.createElement('span', {
+      key: 'strip',
+      style: {
+        position: 'absolute', left: 0, top: 0, display: 'flex', flexDirection: 'column',
+        transform: `translateY(${-(wheel * heightEm)}em)`,
+        willChange: 'transform',
+      },
+    }, ROLL_BLOCKS.map((value, i) => React.createElement('span', {
+      key: i,
+      style: { display: 'block', height: `${heightEm}em`, lineHeight: `${heightEm}em` },
+    }, value))),
+  ]);
+}
+
+/**
+ * 金额 → 连续滚轮。`value` 是原始金额，`decimals` 决定小数位。
+ * 每一位的轮位 = value * 10^decimals / 10^(该位右侧数字个数)，因此低位快、高位慢。
+ */
+function RollingMoney(props) {
+  const decimals = Math.max(0, Math.min(6, Number.isInteger(props.decimals) ? props.decimals : 4));
+  const text = formatMoney(props.value, decimals);
+  const scale = 10 ** decimals;
+  // 从右往左数「该位右侧还有几个数字」，得到每位位权
+  const chars = text.split('');
+  const significances = new Array(chars.length).fill(-1);
+  let seen = 0;
+  for (let i = chars.length - 1; i >= 0; i -= 1) {
+    if (/[0-9]/.test(chars[i])) {
+      significances[i] = seen;
+      seen += 1;
+    }
+  }
+  return React.createElement('span', {
+    style: {
+      display: 'inline-flex', alignItems: 'baseline', letterSpacing: 0, position: 'relative',
+      // 等宽字体保证每个数字轮宽度稳定（不裁字、不抖动）
+      fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Consolas, monospace',
+      ...(props.style || {}),
+    },
+  }, [
+    React.createElement('span', {
+      key: 'sr',
+      style: {
+        position: 'absolute', width: 1, height: 1, padding: 0, margin: -1,
+        overflow: 'hidden', clip: 'rect(0,0,0,0)', whiteSpace: 'nowrap', border: 0,
+      },
+    }, text),
+    React.createElement('span', {
+      key: 'visual',
+      'aria-hidden': 'true',
+      style: { display: 'inline-flex', alignItems: 'baseline' },
+    }, chars.map((char, i) => {
+      if (!/[0-9]/.test(char)) {
+        return React.createElement('span', {
+          key: `s${i}`,
+          style: { display: 'inline-block', lineHeight: '1.22em' },
+        }, char);
+      }
+      const position = (Number(props.value) || 0) * scale / 10 ** significances[i];
+      return React.createElement(RollingDigit, { key: `d${i}`, position });
+    })),
+  ]);
+}
+
 function HeroCard(props) {
   const t = props.t;
   const snap = props.snap;
   const rates = snap.rates;
+  const decimals = Number.isInteger(props.decimals) ? props.decimals : 4;
+  const onDecimalsChange = props.onDecimalsChange;
+  const turbo = props.turbo === true;
+  const onTurboChange = props.onTurboChange;
   const progress = Math.max(0, Math.min(1, Number(snap.todayProgress) || 0));
   const percentText = `${(progress * 100).toFixed(1)}%`;
   const live = snap.status === 'working';
@@ -528,19 +642,61 @@ function HeroCard(props) {
       key: 'amt',
       style: { display: 'flex', alignItems: 'baseline', gap: 7, marginTop: 4, flexWrap: 'wrap' },
     }, [
-      React.createElement('span', {
+      React.createElement(RollingMoney, {
         key: 'val',
+        value: snap.todayEarned,
+        decimals,
         style: {
-          fontSize: 46, lineHeight: 1.12, fontWeight: 800, letterSpacing: '-1.2px',
+          fontSize: 46, lineHeight: 1.12, fontWeight: 800,
           ...GOLD,
           ...NUM,
           ...(rest ? { opacity: 0.62 } : {}),
         },
-      }, formatMoney(snap.todayEarned, 4)),
+      }),
       React.createElement('span', {
         key: 'unit',
         style: { fontSize: 18, fontWeight: 700, color: C.label2, ...NUM },
       }, '元'),
+      React.createElement('label', {
+        key: 'dec',
+        title: t('decimalsLabel'),
+        style: {
+          marginLeft: 'auto', display: 'inline-flex', alignItems: 'center', gap: 3,
+          fontSize: 10, color: C.label3, ...NUM,
+        },
+      }, [
+        React.createElement('span', { key: 'l' }, t('decimalsLabel')),
+        React.createElement('select', {
+          key: 's',
+          value: String(decimals),
+          'aria-label': t('decimalsLabel'),
+          onChange: (event) => onDecimalsChange && onDecimalsChange(Number(event.target.value)),
+          style: {
+            height: 22, padding: '0 2px', borderRadius: 6,
+            border: `1px solid ${C.border1}`, background: C.layer2, color: C.label2,
+            fontSize: 10.5, fontVariantNumeric: 'tabular-nums', outline: 'none', cursor: 'pointer',
+          },
+        }, [0, 1, 2, 3, 4, 5, 6].map((n) => React.createElement('option', { key: n, value: String(n) }, String(n)))),
+        React.createElement('span', { key: 'u' }, t('decimalsUnit')),
+      ]),
+      React.createElement('label', {
+        key: 'turbo',
+        title: t('turboLabel'),
+        style: {
+          display: 'inline-flex', alignItems: 'center', gap: 3,
+          fontSize: 10, padding: '1px 6px', borderRadius: 999,
+          border: `1px solid ${turbo ? `color-mix(in srgb, ${GOLD_TINT} 60%, ${C.border1})` : C.border1}`,
+          background: turbo ? `color-mix(in srgb, ${GOLD_TINT} 16%, transparent)` : 'transparent',
+          color: turbo ? C.label2 : C.label3, cursor: 'pointer', ...NUM,
+        },
+      }, [
+        React.createElement('input', {
+          key: 'i', type: 'checkbox', checked: turbo,
+          onChange: (event) => onTurboChange && onTurboChange(event.target.checked),
+          style: { accentColor: GOLD_TINT, width: 12, height: 12, margin: 0, cursor: 'inherit' },
+        }),
+        React.createElement('span', { key: 'l' }, t('turboLabel')),
+      ]),
     ]),
     React.createElement('div', {
       key: 'chips',
@@ -949,6 +1105,13 @@ function SettingsSection(props) {
   ]);
 
   const lunchDisabled = !form.lunchEnabled;
+  const RATE_OPTIONS = [
+    ['1000', t('rateSecond')],
+    ['250', '250 ms'],
+    ['100', '100 ms'],
+    ['50', '50 ms'],
+    ['16', t('rateFrame')],
+  ];
 
   return React.createElement('details', {
     open: true,
@@ -975,6 +1138,14 @@ function SettingsSection(props) {
         toggle('lunchEnabled', 'lunchEnabledShort', false),
         toggle('lunchPaid', 'lunchPaidShort', lunchDisabled),
       ]),
+      row('refresh', t('refreshRate'), [
+        React.createElement('select', {
+          key: 'r',
+          value: String(form.updateMs),
+          onChange: (event) => setField('updateMs', event.target.value),
+          style: { ...selectStyle, width: 128, padding: '4px 6px' },
+        }, RATE_OPTIONS.map(([value, label]) => React.createElement('option', { key: value, value }, label))),
+      ]),
     ]),
     React.createElement('div', {
       key: 'actions',
@@ -1022,7 +1193,6 @@ function NiumaPanel(props) {
   const t = props && typeof props.t === 'function' ? props.t : fallbackTranslate;
 
   const remote = useRemoteConfig();
-  const now = useSecondClock();
 
   // 服务端配置 -> 规范化配置；坏数据/缺字段一律退回 DEFAULTS（计算不会抛）。
   const cfg = React.useMemo(() => {
@@ -1036,7 +1206,11 @@ function NiumaPanel(props) {
     }
   }, [remote.data]);
 
-  // 每秒重算（core 是纯函数，重算代价极小；已下班/休息日会稳定在日工资或 0）。
+  // 刷新频率：1000=按秒；16≈屏幕刷新率（连续滚动）；中间值为毫秒级
+  const updateMs = cfg.turbo === true ? 16 : (Number.isInteger(cfg.updateMs) ? cfg.updateMs : 1000);
+  const now = useClock(updateMs);
+
+  // 每次刷新重算（core 是纯函数，重算代价极小；已下班/休息日会稳定在日工资或 0）。
   const snap = React.useMemo(() => earnedToday(cfg, now), [cfg, now]);
   const rates = snap && snap.rates ? snap.rates : computeRates(cfg, snap && snap.dateKey);
   const baseForm = React.useMemo(() => formFromConfig(cfg), [cfg]);
@@ -1157,6 +1331,28 @@ function NiumaPanel(props) {
       });
   };
 
+  // 快速保存：主金额小数位这种即时偏好，不走设置表单的「保存」流程
+  const [quickError, setQuickError] = React.useState('');
+  const postConfig = React.useCallback((patch) => {
+    if (typeof fetch !== 'function') return;
+    fetch(`${ROUTE_BASE}/settings`, {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      credentials: 'same-origin',
+      body: JSON.stringify(patch),
+    })
+      .then(async (response) => {
+        let body = null;
+        try { body = await response.json(); } catch (error) { body = null; }
+        if (!response.ok || !body || body.ok !== true) throw new Error((body && body.error) || `HTTP ${response.status}`);
+        setQuickError('');
+        remote.refresh();
+      })
+      .catch((error) => setQuickError(String((error && error.message) || error)));
+  }, [remote.refresh]);
+  const onDecimalsChange = (value) => postConfig({ decimals: value });
+  const onTurboChange = (checked) => postConfig({ turbo: Boolean(checked) });
+
   const holidaySource = (remote.data && remote.data.holidaySource) || HOLIDAY_SOURCE;
   const banner = remote.status === 'failed'
     ? {
@@ -1255,7 +1451,7 @@ function NiumaPanel(props) {
       ])
       : null,
 
-    React.createElement(HeroCard, { key: 'hero', t, snap }),
+    React.createElement(HeroCard, { key: 'hero', t, snap, decimals: cfg.decimals, onDecimalsChange, turbo: cfg.turbo, onTurboChange }),
     React.createElement(CountdownRow, { key: 'countdown', t, snap }),
     React.createElement('div', {
       key: 'ratesHead',

package/src/core.mjs

@@ -27,6 +27,12 @@ export const DEFAULTS = Object.freeze({
   lunchPaid: false,
   holidays: DEFAULT_HOLIDAYS,
   extraWorkdays: DEFAULT_EXTRA_WORKDAYS,
+  /** 主金额小数位（0-6） */
+  decimals: 4,
+  /** 面板刷新间隔 ms：1000=按秒；16≈屏幕刷新率（连续滚动）；中间值为毫秒级 */
+  updateMs: 1000,
+  /** 加速（滚动模式）：true 时强制毫秒级刷新（≈屏幕刷新率），数字连续滚动 */
+  turbo: false,
 });
 
 const SALARY_MAX = 10_000_000;
@@ -159,6 +165,23 @@ export function normalizeConfig(patch) {
   merged.lunchEnabled = merged.lunchEnabled !== false;
   merged.lunchPaid = merged.lunchPaid === true;
 
+  // 展示/刷新偏好：主金额小数位 0-6；刷新间隔 16-1000ms（16 ≈ 屏幕刷新率）；加速开关
+  merged.turbo = merged.turbo === true;
+  const decimals = Number(merged.decimals);
+  if (!Number.isInteger(decimals) || decimals < 0 || decimals > 6) {
+    errors.push('小数位数需要是 0~6 的整数');
+    merged.decimals = Number.isInteger(decimals) ? decimals : DEFAULTS.decimals;
+  } else {
+    merged.decimals = decimals;
+  }
+  const updateMs = Number(merged.updateMs);
+  if (!Number.isInteger(updateMs) || updateMs < 16 || updateMs > 1000) {
+    errors.push('刷新间隔需要是 16~1000ms 的整数');
+    merged.updateMs = Number.isInteger(updateMs) ? updateMs : DEFAULTS.updateMs;
+  } else {
+    merged.updateMs = updateMs;
+  }
+
   // 日期列表
   const holidays = normalizeDateList(merged.holidays);
   const extraWorkdays = normalizeDateList(merged.extraWorkdays);