dsh-calendar 0.13.2 → 0.13.4

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 [历史英文记录](docs/CHANGELOG.en.md)
 
+## 0.13.4 (2026-10-29)
+
+- 同步仓库与 npm 的简明介绍、中英文 README 和反馈入口；本次为文档与包元数据更新。
+- Sync npm descriptions and both README guides with the repository, including issue and pull-request links.
+
+## 0.13.3 (2026-10-27)
+
+- 修复分批更新时的新旧更新控件混用：保留原页面、草稿与安装保护，空闲后接管旧控制器，兼容旧入口。
+
 ## 0.13.2 (2026-10-27)
 
 - 更新控件移至原有工作台或原生插件详情页底部；更新记录与选项原地展开，移除独立更新菜单与页面。

package/README.en.md

@@ -4,16 +4,13 @@
 
 ![dsh-calendar whale girl plugin cover](https://raw.githubusercontent.com/STARDUSTLC666/dsh-calendar/main/assets/cover-whale-girl.png)
 
-View, create and reschedule CalDAV events from DSH.
+Connect CalDAV in the DSH calendar workbench to view, create and reschedule events. Use month, week or agenda views, and preview ICS files before choosing what to import.
 
 [![npm](https://img.shields.io/npm/v/dsh-calendar)](https://www.npmjs.com/package/dsh-calendar) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-calendar-downloads.svg)](https://www.npmjs.com/package/dsh-calendar)
 
 Feedback and contributions are welcome: report [issues](https://github.com/STARDUSTLC666/dsh-calendar/issues) or submit [pull requests](https://github.com/STARDUSTLC666/dsh-calendar/pulls).
 
-
-See the [0.10.4 validation record](docs/validation/0.10.4.md) for DSH `0.2.1-alpha.5` browser checks and the remaining limits.
-
-Open the new native sidebar workbench after updating and restarting DSH. Settings remains available. See the [workbench guide and validation boundaries](docs/WORKBENCH.md).
+Open the workbench from the native DSH sidebar. See the [workbench guide](docs/WORKBENCH.md) for configuration and operating boundaries.
 
 ## What it does
 

package/README.md

@@ -4,16 +4,13 @@
 
 ![dsh-calendar 鲸鱼娘插件封面](https://raw.githubusercontent.com/STARDUSTLC666/dsh-calendar/main/assets/cover-whale-girl.png)
 
-连接 CalDAV 日历，在 DSH 中查看、创建和调整日程。
+在 DSH 日历工作台连接 CalDAV，查看、创建和调整日程。支持月历、周视图与议程，以及先预览再选择导入的 ICS 日历文件。
 
 [![npm](https://img.shields.io/npm/v/dsh-calendar)](https://www.npmjs.com/package/dsh-calendar) [![downloads](https://raw.githubusercontent.com/STARDUSTLC666/dsh-suite/npm-downloads/assets/dsh-calendar-downloads.svg)](https://www.npmjs.com/package/dsh-calendar)
 
 欢迎使用，遇到问题或有改进建议，请提交 [issues](https://github.com/STARDUSTLC666/dsh-calendar/issues) 和 [PR](https://github.com/STARDUSTLC666/dsh-calendar/pulls)。
 
-
-DSH `0.2.1-alpha.5` 的本轮检查与未验收范围见 [0.10.4 验收记录](docs/validation/0.10.4.md)。
-
-更新并重启 DSH 后，可从原生侧栏打开新版工作台，原设置入口继续保留。详见[工作台说明与验收范围](docs/WORKBENCH.md)。
+从 DSH 原生侧栏打开工作台；配置与操作边界见[工作台说明](docs/WORKBENCH.md)。
 
 ## 功能
 

package/lib/client.js

@@ -176,7 +176,7 @@ function __stardustUpdatesGuard(React, name, { dirty = false, busy = false, reta
 function __StardustPluginUpdatesFooter({ React, name }) {
   const [, render] = React.useState(0), pool = __stardustUpdatesGuards();
   React.useEffect(() => { const fn = () => render(value => value + 1); pool.viewListeners.add(fn); return () => pool.viewListeners.delete(fn); }, []);
-  const client = [...pool.clients].find(client => client.has(name));
+  const client = [...pool.clients].find(client => typeof client.Footer === 'function' && client.has(name));
   if (!client) return null;
   return React.createElement(client.Footer, { name });
 }
@@ -238,14 +238,22 @@ function __stardustUpdatesJoin(host, React, require, participant) {
   if (typeof root.plugin !== 'function') return;
   let record = pools.get(root);
   if (!record) {
-    record = { refs: new Map(), timer: null, version: participant.version, alive: true, hold: false };
+    record = { refs: new Map(), timer: null, version: participant.version, alive: true, hold: false, uiRevision: 2 };
     pools.set(root, record);
+    __stardustUpdatesActivate(record, pools, root, React, require);
+  } else if (record.uiRevision !== 2 && !record.migration) {
+    // The first loaded participant may still own a pre-footer client. Keep
+    // its references and draft guards, wait for any admitted install, then
+    // replace that one client fiber instead of running two window heartbeats.
     const shared = record;
-    record.fiber = root.plugin({ name: 'stardustlc-plugin-updates-client', inject: ['slots', 'locale', 'remote', 'remote.pluginManager'], apply(ctx) {
-      const client = __stardustUpdatesClient(ctx, React, require, shared);
-      ctx.effect(() => () => { shared.alive = false; client.dispose(); if (pools.get(root) === shared) pools.delete(root); });
-    } });
-    Promise.resolve(record.fiber).catch(() => { shared.alive = false; if (pools.get(root) === shared) pools.delete(root); });
+    record.migration = Promise.resolve().then(async () => {
+      while (shared.alive && shared.hold) await new Promise(resolve => setTimeout(resolve, 500));
+      if (!shared.alive || !shared.refs.size) return;
+      await shared.fiber?.dispose?.();
+      if (!shared.refs.size) return;
+      shared.alive = true; shared.uiRevision = 2; pools.set(root, shared);
+      __stardustUpdatesActivate(shared, pools, root, React, require);
+    }).catch(() => { /* The original page remains usable if host disposal fails. */ });
   }
   clearTimeout(record.timer);
   const ref = {}; record.refs.set(ref, participant);
@@ -259,10 +267,17 @@ function __stardustUpdatesJoin(host, React, require, participant) {
     if (!record.refs.size) record.timer = setTimeout(stop, 1000);
   });
 }
+function __stardustUpdatesActivate(shared, pools, root, React, require) {
+  shared.fiber = root.plugin({ name: 'stardustlc-plugin-updates-client', inject: ['slots', 'locale', 'remote', 'remote.pluginManager'], apply(ctx) {
+    const client = __stardustUpdatesClient(ctx, React, require, shared);
+    ctx.effect(() => () => { shared.alive = false; client.dispose(); if (pools.get(root) === shared) pools.delete(root); });
+  } });
+  Promise.resolve(shared.fiber).catch(() => { shared.alive = false; if (pools.get(root) === shared) pools.delete(root); });
+}
 function __stardustUpdatesClient(ctx, React, require, shared) {
   const h = React.createElement, W = createWorkbenchUI(React), route = new URL('api/stardustlc/plugin-updates', document.baseURI);
   const { useState, useEffect } = React, id = crypto.randomUUID(), listeners = new Set(), pool = __stardustUpdatesGuards(), requests = new Set(), notified = new Set(), knownRows = new Map();
-  let alive = true, registered = false, state = null, lastInteraction = Date.now(), inPoll = false, manualOperation = false;
+  let alive = true, registered = false, state = null, lastInteraction = Date.now(), inPoll = false, manualOperation = false, legacyHint = null;
   const language = () => String(ctx.locale?.getSnapshot?.().active || '').startsWith('en') ? 'en' : 'zh';
   const t = (zh, en) => language() === 'en' ? en : zh;
   const preferences = name => state?.preferences.packages[name] || { checkEnabled: true, autoInstall: false, deferredUntil: 0, ignoredVersion: null };
@@ -387,11 +402,11 @@ function __stardustUpdatesClient(ctx, React, require, shared) {
   function Reminder() {
     useSnapshot();
     const row = state?.rows.find(row => { const prefs = preferences(row.name); return row.available && !row.updating && !row.bundledBy && prefs.checkEnabled && prefs.deferredUntil <= Date.now() && prefs.ignoredVersion !== row.release.version && !notified.has(row.name + '@' + row.release.version); });
-    if (!row) return null;
+    if (!row && !legacyHint) return null;
     let Toast; try { Toast = require('@deepseek-ai/dsh-client-ui-primitives').Toast; } catch { return null; }
     if (!Toast) return null;
-    const key = row.name + '@' + row.release.version;
-    return h(Toast, { key, text: (language() === 'en' ? row.labelEn : row.label) + t('有新版本，可在页面底部查看。', ' has an update. Review it at the bottom of its page.'), icon: h(W.Icon, { name: 'refresh', size: 18 }), holdMs: 7000, onDone: () => { notified.add(key); notify(); } });
+    const hint = legacyHint, key = hint ? 'legacy-' + hint : row.name + '@' + row.release.version;
+    return h(Toast, { key, text: hint ? hint + t('：请打开「插件」中的此插件详情页，在底部管理更新。', ': open its details in Plugins to manage updates at the bottom.') : (language() === 'en' ? row.labelEn : row.label) + t('有新版本，可在页面底部查看。', ' has an update. Review it at the bottom of its page.'), icon: h(W.Icon, { name: 'refresh', size: 18 }), holdMs: 7000, onDone: () => { if (hint) legacyHint = null; else notified.add(key); notify(); } });
   }
   function register() {
     if (!alive) return;
@@ -410,7 +425,7 @@ function __stardustUpdatesClient(ctx, React, require, shared) {
     finally { inPoll = false; }
   }
   const timer = setInterval(() => { void poll(); }, 15000), first = setTimeout(() => { void poll(); }, 100);
-  const client = { t, Footer: Panel, has: name => registered && !!originalRow(name), row: rowFor, dispose() {
+  const client = { t, Footer: Panel, Button: W.Button, open(name) { const footer = [...document.querySelectorAll('[data-plugin-update-footer]')].find(node => node.getAttribute('data-plugin-update-footer') === name); if (footer) footer.scrollIntoView({ block: 'end', behavior: 'smooth' }); else { legacyHint = name; notify(); } }, has: name => registered && !!originalRow(name), row: rowFor, dispose() {
     close(); alive = false; clearTimeout(first); clearInterval(timer); pool.clients.delete(client);
     pool.listeners.delete(guardChanged); listeners.clear();
     for (const event of ['pointerdown', 'keydown', 'input']) document.removeEventListener(event, interaction, true);
@@ -3047,7 +3062,7 @@ calendarHostContext=ctx;W.register(ctx,{id:'dsh-calendar.workbench',label:()=>t(
         exports.apply = apply;
         exports.inject = inject;
         return module.exports;
-    } },{"name":"dsh-calendar","version":"0.1.0","hasWorkbench":true,"packageVersion":"0.13.2","label":"日历","labelEn":"Calendar","suiteComponent":true}));
+    } },{"name":"dsh-calendar","version":"0.1.0","hasWorkbench":true,"packageVersion":"0.13.4","label":"日历","labelEn":"Calendar","suiteComponent":true}));
 
 })();
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-calendar",
-  "version": "0.13.2",
-  "description": "连接 CalDAV 日历，在 DSH 中查看、创建和调整日程。",
+  "version": "0.13.4",
+  "description": "DSH 日历工作台：CalDAV 日程管理、月 / 周 / 议程视图与 ICS 预览导入。欢迎提交 issues 和 PR。",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -64,7 +64,7 @@
     "tsdav": "^2.3.1",
     "undici": "^8.11.2",
     "yaml": "^2.9.1",
-    "@stardustlc/dsh-updates": "0.1.2"
+    "@stardustlc/dsh-updates": "0.1.3"
   },
   "devDependencies": {
     "@types/node": "^24.0.0",