dsh-calendar 0.9.2 → 0.9.4

package/lib/client.js

@@ -152,7 +152,7 @@ const UI = {
     "state.notConfigured": "还没配置 CalDAV 账号",
     "state.notConfiguredHint": "点击“连接设置”，选择日历服务并填写账号信息，测试连接后保存即可。也可以先查看示例，了解日历的用法。",
     "state.readonly": "只读",
-    "demo.banner": "示例日历为只读，可以切换视图和查看详情。点击「退出示例」后连接自己的日历，即可创建和修改日程。",
+    "demo.banner": "示例日历为只读，可以切换视图和查看详情。点击「退出示例」后连接自己的日历，即可创建和修改日程。",
     "field.summary": "标题", "field.date": "日期", "field.start": "开始", "field.end": "结束",
     "field.allDay": "全天", "field.location": "地点", "field.description": "备注",
     "field.repeat": "重复", "field.uid": "事件 uid", "field.when": "时间", "field.duration": "时长",
@@ -194,7 +194,7 @@ const UI = {
     "conn.refreshToken": "refreshToken",
     "conn.tokenUrl": "令牌地址（可留空）",
     "conn.proxyUrl": "代理地址（可留空）",
-    "conn.keep": "已保存，留空不改",
+    "conn.keep": "已配置，留空不改",
     "conn.test": "测试连接",
     "conn.testing": "正在连接…",
     "conn.save": "保存并启用",
@@ -247,7 +247,7 @@ const UI = {
     "state.notConfigured": "No CalDAV account configured yet",
     "state.notConfiguredHint": "Open Connection settings, choose your calendar service and enter your account details, then test and save the connection. You can also explore the sample calendar first.",
     "state.readonly": "read-only",
-    "demo.banner": "This sample calendar is read-only. Switch views and open event details. Exit the sample and connect your calendar to create or edit events.",
+    "demo.banner": "This sample calendar is read-only. Switch views and open event details. Exit the sample and connect your calendar to create or edit events.",
     "field.summary": "Title", "field.date": "Date", "field.start": "Start", "field.end": "End",
     "field.allDay": "All day", "field.location": "Location", "field.description": "Notes",
     "field.repeat": "Repeats", "field.uid": "Event uid", "field.when": "When", "field.duration": "Duration",
@@ -289,7 +289,7 @@ const UI = {
     "conn.refreshToken": "refreshToken",
     "conn.tokenUrl": "Token URL (optional)",
     "conn.proxyUrl": "Proxy URL (optional)",
-    "conn.keep": "saved — leave blank to keep",
+    "conn.keep": "configured — leave blank to keep",
     "conn.test": "Test connection",
     "conn.testing": "Connecting…",
     "conn.save": "Save and enable",
@@ -1119,12 +1119,12 @@ function demoEvents() {
   const at = (offset, hour, minute) => { const d = addDays(base, offset); d.setHours(hour, minute || 0, 0, 0); return isoOf(d); };
   const dateOnly = (offset) => { const d = addDays(base, offset); return dayKey(d); };
   return [
-    { uid: "demo://allday", summary: "📦 项目上线日", start: dateOnly(0), end: dateOnly(1), allDay: true, description: "确认发布说明并完成上线检查", location: "线上", isOccurrence: false },
-    { uid: "demo://review", summary: "产品评审会", start: at(0, 10, 0), end: at(0, 11, 0), allDay: false, location: "会议室 A", description: "议程：体验反馈与本周计划", isOccurrence: false },
+    { uid: "demo://allday", summary: "📦 项目上线日", start: dateOnly(0), end: dateOnly(1), allDay: true, description: "确认发布说明并完成上线检查", location: "线上", isOccurrence: false },
+    { uid: "demo://review", summary: "产品评审会", start: at(0, 10, 0), end: at(0, 11, 0), allDay: false, location: "会议室 A", description: "议程：体验反馈与本周计划", isOccurrence: false },
     { uid: "demo://one-on-one", summary: "1:1 同步", start: at(0, 15, 0), end: at(0, 15, 30), allDay: false, location: "线上", isOccurrence: false },
     { uid: "demo://standup", summary: "每周站会", start: at(1, 9, 30), end: at(1, 9, 50), allDay: false, rrule: "FREQ=WEEKLY;COUNT=6", location: "线上", isOccurrence: false },
     { uid: "demo://standup@2", summary: "每周站会", start: at(8, 9, 30), end: at(8, 9, 50), allDay: false, location: "线上", isOccurrence: true, seriesStart: at(1, 9, 30) },
-    { uid: "demo://sync", summary: "与同事同步", start: at(2, 16, 0), end: at(2, 16, 30), allDay: false, location: "线上", description: "同步进度与下一步安排", isOccurrence: false }
+    { uid: "demo://sync", summary: "与同事同步", start: at(2, 16, 0), end: at(2, 16, 30), allDay: false, location: "线上", description: "同步进度与下一步安排", isOccurrence: false }
   ];
 }
 
@@ -1305,8 +1305,8 @@ function EventForm(props) {
 
 // ───────────────────────────── 详情抽屉 ─────────────────────────────
 
-function EventDrawer(props) {
-  const { event, onClose, onEdit, onDelete, busy, confirmDelete, setConfirmDelete, events, readOnly } = props;
+function EventDrawer(props) {
+  const { event, onClose, onEdit, onDelete, busy, confirmDelete, setConfirmDelete, events, readOnly } = props;
   const [copied, setCopied] = useState(false);
   const seriesCount = event.isOccurrence ? events.filter((e) => e.seriesStart === event.seriesStart).length : 0;
   return h("div", { className: "dshc-overlay", onMouseDown: (e) => { if (e.target === e.currentTarget) onClose(); } }, [
@@ -1333,9 +1333,9 @@ function EventDrawer(props) {
         h(Btn, { key: "copy", onClick: async () => { const ok = await copyText(event.uid); if (ok) { setCopied(true); setTimeout(() => setCopied(false), 1600); } } }, copied ? t("action.copied") : t("action.copy")),
         h("span", { className: "dshc-spacer" }),
         confirmDelete
-          ? h(Btn, { key: "confirm", variant: "primary", disabled: busy === true || readOnly === true, onClick: () => onDelete(event) }, t("action.confirmDelete"))
-          : h(Btn, { key: "delete", variant: "danger", onClick: () => setConfirmDelete(true), disabled: busy === true || readOnly === true }, t("action.delete")),
-        h(Btn, { key: "edit", variant: "outline", onClick: () => onEdit(event), disabled: busy === true || readOnly === true }, t("action.edit"))
+          ? h(Btn, { key: "confirm", variant: "primary", disabled: busy === true || readOnly === true, onClick: () => onDelete(event) }, t("action.confirmDelete"))
+          : h(Btn, { key: "delete", variant: "danger", onClick: () => setConfirmDelete(true), disabled: busy === true || readOnly === true }, t("action.delete")),
+        h(Btn, { key: "edit", variant: "outline", onClick: () => onEdit(event), disabled: busy === true || readOnly === true }, t("action.edit"))
       ]),
       confirmDelete ? h("div", { className: "dshc-sub", style: { textAlign: "right", marginTop: "6px" } }, t("confirm.delete", { name: event.summary })) : null
     ])
@@ -1410,7 +1410,10 @@ function ConnectionForm(props) {
   const [busy, setBusy] = useState("");
   const [result, setResult] = useState(null);
   const maySave = connection === null || connection.settingsAvailable !== false;
-  const patch = (fields) => setForm((prev) => Object.assign({}, prev, fields));
+  const patch = (fields) => {
+    setForm((prev) => Object.assign({}, prev, fields));
+    setResult(null);
+  };
   const visible = PROVIDER_FIELDS[form.provider] || [];
   const payload = () => {
     const out = {};
@@ -1423,6 +1426,7 @@ function ConnectionForm(props) {
     }
     if (form.provider !== "") out.provider = form.provider;
     if (form.provider === "google") out.authMethod = "oauth";
+    else if (form.provider !== "" && connection && form.provider !== connection.provider) out.authMethod = "basic";
     return out;
   };
   const test = async () => {
@@ -1756,8 +1760,8 @@ function CalendarPanel(props) {
   };
 
   /** 改期入口：重复日程先问一句（拖动会移动整个系列，这是语义雷区，不能悄悄做）。 */
-  const reschedule = (event, range) => {
-    if (demo === true) { notify(t("demo.banner")); return; }
+  const reschedule = (event, range) => {
+    if (demo === true) { notify(t("demo.banner")); return; }
     // 重复日程暂不支持拖动改期：CalDAV 里整个系列是一个对象，而 update 只能改 master 的
     // DTSTART —— 把「这次实例的目标时间」发过去等于**重锚系列起点**（早于它的实例全丢、
     // COUNT/UNTIL 语义被改，撤销也回不到原系列）。评审实测过，这里必须先挡住。
@@ -1789,8 +1793,8 @@ function CalendarPanel(props) {
   const title = view === "week" ? formatWeekTitle(anchor) : view === "agenda" ? t("view.agenda") : formatMonthTitle(anchor);
   const step = (delta) => setAnchor((current) => (view === "week" ? addDays(current, delta * 7) : addMonthShift(current, delta)));
 
-  const submit = async (form) => {
-    if (demo === true) { setFormError(t("demo.banner")); return; }
+  const submit = async (form) => {
+    if (demo === true) { setFormError(t("demo.banner")); return; }
     setBusy(true);
     setFormError(null);
     try {
@@ -1808,8 +1812,8 @@ function CalendarPanel(props) {
     }
   };
 
-  const remove = async (event) => {
-    if (demo === true) { notify(t("demo.banner")); return; }
+  const remove = async (event) => {
+    if (demo === true) { notify(t("demo.banner")); return; }
     setBusy(true);
     try {
       await api("delete", { uid: event.uid });
@@ -1839,7 +1843,7 @@ function CalendarPanel(props) {
     demo === true
       ? h(Btn, { key: "exitdemo", onClick: () => setDemo(false) }, t("action.exitDemo"))
       : h(Btn, { key: "reload", onClick: reload }, t("action.refresh")),
-    h(Btn, { key: "new", variant: "primary", disabled: demo === true, onClick: () => setDraft(draftAt(anchor)) }, t("action.new"))
+    h(Btn, { key: "new", variant: "primary", disabled: demo === true, onClick: () => setDraft(draftAt(anchor)) }, t("action.new"))
   ]);
 
   const body = () => {
@@ -1857,16 +1861,16 @@ function CalendarPanel(props) {
     if (data.loading === true && data.events.length === 0) {
       return h("div", { className: "dshc-grid" }, Array.from({ length: 14 }, (_, i) => h("div", { className: "dshc-skel", key: i })));
     }
-    if (view === "week") return h(WeekView, { anchor, events: visibleEvents, onPick: openEvent, onCreateAt: createAt, onReschedule: demo === true ? undefined : reschedule });
+    if (view === "week") return h(WeekView, { anchor, events: visibleEvents, onPick: openEvent, onCreateAt: createAt, onReschedule: demo === true ? undefined : reschedule });
     if (view === "agenda") return h(AgendaView, { events: visibleEvents, onPick: openEvent, onCreateAt: createAt });
     return h(MonthView, { anchor, events: visibleEvents, onPick: openEvent, onCreateAt: createAt });
   };
 
   const openEvent = (event) => { setConfirmDelete(false); setSelected(event); };
-  const createAt = (day, hour) => {
-    if (demo === true) { notify(t("demo.banner")); return; }
-    setDraft(draftAt(day, hour));
-  };
+  const createAt = (day, hour) => {
+    if (demo === true) { notify(t("demo.banner")); return; }
+    setDraft(draftAt(day, hour));
+  };
 
   return h("div", { ref: rootRef, className: "dshc-root" }, [
     h("div", { className: "dshc-shell" }, [
@@ -1893,8 +1897,8 @@ function CalendarPanel(props) {
       ])
     ]),
     selected !== null
-      ? h(EventDrawer, {
-          readOnly: demo === true,
+      ? h(EventDrawer, {
+          readOnly: demo === true,
           event: selected,
           events: data.events,
           busy,

package/lib/config.d.ts

@@ -44,8 +44,8 @@ export interface CalendarConfig {
     calendar?: string;
     /**
      * HTTP 代理地址，如 http://127.0.0.1:7890。
-     * 中国用户访问 Google / iCloud 需经代理：填你本地代理客户端的端口即可，
-     * 插件会把所有 CalDAV 请求路由到该代理，不影响其他插件。
+     * 当前网络无法直连时可填本地代理客户端的端口；可直连时留空即可。
+     * 插件只把本插件的请求路由到该代理，不影响其他插件。
      */
     proxyUrl?: string;
 }

package/lib/web.js

@@ -248,6 +248,8 @@ export class CalendarSettingsBackend {
             const resolved = effective[key];
             return typeof resolved === 'string' ? resolved : '';
         };
+        const env = this.options.env ?? process.env;
+        const hasCredential = (key, envKey) => text(key).trim() !== '' || (typeof env[envKey] === 'string' && env[envKey].trim() !== '');
         return {
             configured,
             ...(reason !== undefined ? { reason } : {}),
@@ -266,9 +268,9 @@ export class CalendarSettingsBackend {
             clientId: text('clientId'),
             tokenUrl: text('tokenUrl'),
             proxyUrl: text('proxyUrl'),
-            hasPassword: text('password') !== '' || (effective.password ?? '') !== '',
-            hasClientSecret: text('clientSecret') !== '' || (effective.clientSecret ?? '') !== '',
-            hasRefreshToken: text('refreshToken') !== '' || (effective.refreshToken ?? '') !== '',
+            hasPassword: hasCredential('password', 'DSH_CALENDAR_PASSWORD'),
+            hasClientSecret: hasCredential('clientSecret', 'DSH_CALENDAR_CLIENT_SECRET'),
+            hasRefreshToken: hasCredential('refreshToken', 'DSH_CALENDAR_REFRESH_TOKEN'),
         };
     }
     /** 兼容旧动作名：status 就是连接摘要。 */

package/package.json

@@ -1,80 +1,80 @@
-{
-  "name": "dsh-calendar",
-  "version": "0.9.2",
-  "description": "DSH 日历插件：可视化周/月视图、拖拽改期与 CalDAV 日程管理，支持 Google OAuth2、iCloud、Nextcloud。",
-  "type": "module",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./lib/index.d.ts",
-      "default": "./lib/index.js"
-    },
-    "./client": "./lib/client.js",
-    "./cordis.patch.yml": "./cordis.patch.yml",
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "scripts",
-    "cordis.patch.yml",
-    "README.md",
-    "README.en.md",
-    "CHANGELOG.md"
-  ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "test": "pnpm run build && node --test \"test/*.test.mjs\"",
-    "prepublishOnly": "pnpm run build"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-ui-settings"
-      ],
-      "platform": "web"
-    }
-  },
-  "keywords": [
-    "dsh",
-    "deepseek-harness",
-    "dsh-plugin",
-    "plugin",
-    "calendar",
-    "caldav",
-    "ical"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": "^22.19.0 || >=24.0.0"
-  },
-  "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.3",
-    "ical.js": "^2.1.0",
-    "schemastery": "^3.18.0",
-    "tsdav": "^2.3.1",
-    "undici": "^8.10.0",
-    "yaml": "^2.9.1"
-  },
-  "devDependencies": {
-    "@types/node": "^24.0.0",
-    "jsdom": "^30.1.0",
-    "react": "^19.3.0",
-    "react-dom": "^19.3.0",
-    "typescript": "^5.6.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/STARDUSTLC666/dsh-calendar.git"
-  },
-  "bugs": {
-    "url": "https://github.com/STARDUSTLC666/dsh-calendar/issues"
-  },
-  "homepage": "https://github.com/STARDUSTLC666/dsh-calendar#readme",
-  "author": "stardustlc",
-  "packageManager": "pnpm@11.7.0"
-}
+{
+  "name": "dsh-calendar",
+  "version": "0.9.4",
+  "description": "DSH 日历插件：可视化周/月视图、拖拽改期与 CalDAV 日程管理，支持 Google OAuth2、iCloud、Nextcloud。",
+  "type": "module",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./client": "./lib/client.js",
+    "./cordis.patch.yml": "./cordis.patch.yml",
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "scripts",
+    "cordis.patch.yml",
+    "README.md",
+    "README.en.md",
+    "CHANGELOG.md"
+  ],
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "test": "pnpm run build && node --test \"test/*.test.mjs\"",
+    "prepublishOnly": "pnpm run build"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-settings"
+      ],
+      "platform": "web"
+    }
+  },
+  "keywords": [
+    "dsh",
+    "deepseek-harness",
+    "dsh-plugin",
+    "plugin",
+    "calendar",
+    "caldav",
+    "ical"
+  ],
+  "license": "MIT",
+  "engines": {
+    "node": "^22.19.0 || >=24.0.0"
+  },
+  "dependencies": {
+    "@deepseek-ai/schemastery": "^3.18.3",
+    "ical.js": "^2.1.0",
+    "schemastery": "^3.18.0",
+    "tsdav": "^2.3.1",
+    "undici": "^8.11.2",
+    "yaml": "^2.9.1"
+  },
+  "devDependencies": {
+    "@types/node": "^24.0.0",
+    "jsdom": "^30.1.0",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
+    "typescript": "^5.6.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/STARDUSTLC666/dsh-calendar.git"
+  },
+  "bugs": {
+    "url": "https://github.com/STARDUSTLC666/dsh-calendar/issues"
+  },
+  "homepage": "https://github.com/STARDUSTLC666/dsh-calendar#readme",
+  "author": "stardustlc",
+  "packageManager": "pnpm@11.7.0"
+}