@zaclinley/dsh-mailharbor 0.5.0 → 0.5.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.5.1
+
+### Patch Changes
+
+- c12db95: - Projects now appear in the DSH Workspaces sidebar: the plugin waits for the
+  optional `workspaceRegistry` service and registers the project workspace
+  (and its starting session) instead of leaving a folder-only project.
+  - CalDAV gets a dedicated "任务与 CalDAV" card in MailHarbor settings: account
+    picker, address, username, app password, calendar path, save and "sync now",
+    plus the last sync state.
+
 ## 0.5.0
 
 ### Minor Changes

package/lib/client.js

@@ -3062,6 +3062,15 @@ function MailSettings() {
   const [pollSeconds, setPollSeconds] = (0, import_react10.useState)(60);
   const [listLimit, setListLimit] = (0, import_react10.useState)(40);
   const [projectRoot, setProjectRoot] = (0, import_react10.useState)("");
+  const [caldavAccountId, setCaldavAccountId] = (0, import_react10.useState)("");
+  const [caldavUrl, setCaldavUrl] = (0, import_react10.useState)("");
+  const [caldavUser, setCaldavUser] = (0, import_react10.useState)("");
+  const [caldavPassword, setCaldavPassword] = (0, import_react10.useState)("");
+  const [caldavHref, setCaldavHref] = (0, import_react10.useState)("");
+  const [caldavHasPassword, setCaldavHasPassword] = (0, import_react10.useState)(false);
+  const [caldavCalendar, setCaldavCalendar] = (0, import_react10.useState)(null);
+  const [caldavMessage, setCaldavMessage] = (0, import_react10.useState)("");
+  const [caldavBusy, setCaldavBusy] = (0, import_react10.useState)(false);
   const [aiEnabled, setAiEnabled] = (0, import_react10.useState)(true);
   const [aiProvider, setAiProvider] = (0, import_react10.useState)("deepseek-account");
   const [aiModel, setAiModel] = (0, import_react10.useState)("deepseek-flash");
@@ -3085,6 +3094,9 @@ function MailSettings() {
       setPollSeconds(view.read.pollSeconds);
       setListLimit(view.render.listLimit);
       setProjectRoot(view.projects.root);
+      setCaldavAccountId(
+        (current) => current || view.activeAccountId || appState.settings.activeAccountId || ""
+      );
       setAiEnabled(view.ai.enabled);
       setAiProvider(view.ai.provider);
       setAiModel(view.ai.model);
@@ -3095,6 +3107,23 @@ function MailSettings() {
       cancelled = true;
     };
   }, [tick]);
+  (0, import_react10.useEffect)(() => {
+    let cancelled = false;
+    if (caldavAccountId === "") return;
+    api.taskCaldav(caldavAccountId).then((info) => {
+      if (cancelled) return;
+      setCaldavUrl(info.caldav?.url ?? "");
+      setCaldavUser(info.caldav?.username ?? "");
+      setCaldavHref(info.caldav?.calendarHref ?? "");
+      setCaldavHasPassword(info.hasPassword);
+      setCaldavCalendar(info.calendar);
+    }).catch((caught) => {
+      if (!cancelled) setCaldavMessage(errorText6(caught));
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [caldavAccountId, tick]);
   (0, import_react10.useEffect)(() => {
     let cancelled = false;
     const accountId = settings?.activeAccountId ?? state?.activeAccountId ?? null;
@@ -3290,6 +3319,139 @@ function MailSettings() {
           )
         )
       ),
+      (0, import_react10.createElement)(
+        "div",
+        { className: "mailharbor-card" },
+        (0, import_react10.createElement)("h3", null, "\u4EFB\u52A1\u4E0E CalDAV"),
+        (0, import_react10.createElement)(
+          "p",
+          { className: "small muted" },
+          "\u4EFB\u52A1\u9762\u677F\u7684\u300C\u540C\u6B65 CalDAV\u300D\u4F7F\u7528\u8FD9\u91CC\u7684\u914D\u7F6E\u3002\u5BC6\u7801\u53EA\u5B58\u7CFB\u7EDF Keychain\uFF0C\u4E0D\u5199\u5165\u914D\u7F6E\u6587\u4EF6\u3002"
+        ),
+        (0, import_react10.createElement)(
+          "div",
+          { className: "mailharbor-grid" },
+          (0, import_react10.createElement)(
+            Field,
+            { label: "\u8D26\u53F7" },
+            (0, import_react10.createElement)(
+              "select",
+              {
+                value: caldavAccountId,
+                onChange: (event) => {
+                  setCaldavAccountId(event.target.value);
+                  setCaldavMessage("");
+                }
+              },
+              (settings?.accounts ?? []).map(
+                (item) => (0, import_react10.createElement)("option", { key: item.id, value: item.id }, `${item.label}\uFF08${item.email}\uFF09`)
+              )
+            )
+          ),
+          (0, import_react10.createElement)(
+            Field,
+            { label: "\u72B6\u6001" },
+            (0, import_react10.createElement)(
+              "span",
+              { className: "small", style: { paddingTop: "7px", color: "var(--m-text-3)" } },
+              caldavCalendar === null ? "\u672A\u540C\u6B65" : caldavCalendar.lastSync === "" ? "\u672A\u540C\u6B65" : `\u4E0A\u6B21\u540C\u6B65 ${new Date(caldavCalendar.lastSync).toLocaleString()}`,
+              caldavCalendar?.error ? ` \xB7 \u5931\u8D25\uFF1A${caldavCalendar.error}` : ""
+            )
+          )
+        ),
+        (0, import_react10.createElement)(
+          "div",
+          { className: "mailharbor-grid" },
+          (0, import_react10.createElement)(
+            Field,
+            { label: "CalDAV \u5730\u5740" },
+            (0, import_react10.createElement)("input", {
+              value: caldavUrl,
+              placeholder: "https://caldav.example.com/",
+              onChange: (event) => setCaldavUrl(event.target.value)
+            })
+          ),
+          (0, import_react10.createElement)(
+            Field,
+            { label: "\u7528\u6237\u540D" },
+            (0, import_react10.createElement)("input", {
+              value: caldavUser,
+              placeholder: "\u901A\u5E38\u662F\u90AE\u7BB1\u5730\u5740",
+              onChange: (event) => setCaldavUser(event.target.value)
+            })
+          )
+        ),
+        (0, import_react10.createElement)(
+          "div",
+          { className: "mailharbor-grid" },
+          (0, import_react10.createElement)(
+            Field,
+            { label: caldavHasPassword ? "\u5E94\u7528\u5BC6\u7801\uFF08\u7559\u7A7A\u8868\u793A\u4E0D\u4FEE\u6539\uFF09" : "\u5E94\u7528\u5BC6\u7801" },
+            (0, import_react10.createElement)("input", {
+              type: "password",
+              value: caldavPassword,
+              placeholder: caldavHasPassword ? "\u5DF2\u4FDD\u5B58" : "iCloud / Fastmail \u7B49\u5E94\u7528\u4E13\u7528\u5BC6\u7801",
+              onChange: (event) => setCaldavPassword(event.target.value)
+            })
+          ),
+          (0, import_react10.createElement)(
+            Field,
+            { label: "\u4EFB\u52A1\u65E5\u5386\u8DEF\u5F84\uFF08\u53EF\u9009\uFF09" },
+            (0, import_react10.createElement)("input", {
+              value: caldavHref,
+              placeholder: "\u7559\u7A7A\u81EA\u52A8\u53D1\u73B0",
+              onChange: (event) => setCaldavHref(event.target.value)
+            })
+          )
+        ),
+        (0, import_react10.createElement)(
+          "div",
+          { style: { display: "flex", gap: "8px", alignItems: "center", flexWrap: "wrap" } },
+          (0, import_react10.createElement)(
+            "button",
+            {
+              className: "primary small",
+              disabled: caldavBusy,
+              onClick: () => {
+                setCaldavBusy(true);
+                setCaldavMessage("\u4FDD\u5B58\u4E2D\u2026");
+                void api.saveTaskCaldav({
+                  accountId: caldavAccountId,
+                  url: caldavUrl,
+                  username: caldavUser,
+                  ...caldavPassword === "" ? {} : { password: caldavPassword },
+                  calendarHref: caldavHref
+                }).then((info) => {
+                  setCaldavHasPassword(info.hasPassword);
+                  setCaldavPassword("");
+                  setCaldavMessage(info.hasPassword ? "\u5DF2\u4FDD\u5B58" : "\u5DF2\u4FDD\u5B58\u5730\u5740\uFF0C\u4F46\u8FD8\u6CA1\u6709\u5BC6\u7801");
+                  setTick((value) => value + 1);
+                }).catch((caught) => setCaldavMessage(errorText6(caught))).finally(() => setCaldavBusy(false));
+              }
+            },
+            caldavBusy ? "\u4FDD\u5B58\u4E2D\u2026" : "\u4FDD\u5B58 CalDAV"
+          ),
+          (0, import_react10.createElement)(
+            "button",
+            {
+              className: "ghost small",
+              disabled: caldavBusy,
+              onClick: () => {
+                setCaldavBusy(true);
+                setCaldavMessage("\u540C\u6B65\u4E2D\u2026");
+                void api.syncTasks(caldavAccountId).then((result) => {
+                  setCaldavMessage(
+                    `\u540C\u6B65\u5B8C\u6210\uFF1A\u62C9\u53D6 ${String(result.result.pulled)}\uFF0C\u63A8\u9001 ${String(result.result.pushed)}`
+                  );
+                  setTick((value) => value + 1);
+                }).catch((caught) => setCaldavMessage(errorText6(caught))).finally(() => setCaldavBusy(false));
+              }
+            },
+            "\u7ACB\u5373\u540C\u6B65"
+          ),
+          (0, import_react10.createElement)("span", { className: "small muted" }, caldavMessage)
+        )
+      ),
       (0, import_react10.createElement)(
         "div",
         { className: "mailharbor-card" },
@@ -3502,27 +3664,6 @@ function AccountRow({
   const [fromName, setFromName] = (0, import_react10.useState)(account.smtp.fromName);
   const [busy, setBusy] = (0, import_react10.useState)(false);
   const [checking, setChecking] = (0, import_react10.useState)(false);
-  const [caldavUrl, setCaldavUrl] = (0, import_react10.useState)(account.caldav?.url ?? "");
-  const [caldavUser, setCaldavUser] = (0, import_react10.useState)(account.caldav?.username ?? "");
-  const [caldavHref, setCaldavHref] = (0, import_react10.useState)(account.caldav?.calendarHref ?? "");
-  const [caldavPassword, setCaldavPassword] = (0, import_react10.useState)("");
-  const [caldavStatus, setCaldavStatus] = (0, import_react10.useState)("");
-  (0, import_react10.useEffect)(() => {
-    if (!editing) return;
-    let cancelled = false;
-    api.taskCaldav(account.id).then((info) => {
-      if (cancelled) return;
-      setCaldavUrl(info.caldav?.url ?? "");
-      setCaldavUser(info.caldav?.username ?? "");
-      setCaldavHref(info.caldav?.calendarHref ?? "");
-      setCaldavStatus(info.hasPassword ? "\u5DF2\u4FDD\u5B58\u5E94\u7528\u5BC6\u7801" : "\u5C1A\u672A\u4FDD\u5B58\u5E94\u7528\u5BC6\u7801");
-    }).catch(() => {
-      if (!cancelled) setCaldavStatus("\u65E0\u6CD5\u8BFB\u53D6 CalDAV \u914D\u7F6E");
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [editing, account.id]);
   (0, import_react10.useEffect)(() => {
     setLabel(account.label);
     setUsername(account.username);
@@ -3683,75 +3824,6 @@ function AccountRow({
         )
       ),
       (0, import_react10.createElement)("hr", { style: { border: 0, borderTop: "1px solid var(--m-line)", width: "100%" } }),
-      (0, import_react10.createElement)("h4", { style: { margin: 0, fontSize: "12.5px" } }, "CalDAV \u4EFB\u52A1\u540C\u6B65"),
-      (0, import_react10.createElement)(
-        "div",
-        { className: "mailharbor-grid" },
-        (0, import_react10.createElement)(
-          Field,
-          { label: "CalDAV \u5730\u5740" },
-          (0, import_react10.createElement)("input", {
-            value: caldavUrl,
-            placeholder: "https://caldav.example.com/",
-            onChange: (event) => setCaldavUrl(event.target.value)
-          })
-        ),
-        (0, import_react10.createElement)(
-          Field,
-          { label: "\u7528\u6237\u540D" },
-          (0, import_react10.createElement)("input", {
-            value: caldavUser,
-            onChange: (event) => setCaldavUser(event.target.value)
-          })
-        )
-      ),
-      (0, import_react10.createElement)(
-        "div",
-        { className: "mailharbor-grid" },
-        (0, import_react10.createElement)(
-          Field,
-          { label: "\u5E94\u7528\u5BC6\u7801\uFF08\u7559\u7A7A\u8868\u793A\u4E0D\u4FEE\u6539\uFF09" },
-          (0, import_react10.createElement)("input", {
-            type: "password",
-            value: caldavPassword,
-            onChange: (event) => setCaldavPassword(event.target.value)
-          })
-        ),
-        (0, import_react10.createElement)(
-          Field,
-          { label: "\u4EFB\u52A1\u65E5\u5386\u8DEF\u5F84\uFF08\u53EF\u9009\uFF09" },
-          (0, import_react10.createElement)("input", {
-            value: caldavHref,
-            placeholder: "\u81EA\u52A8\u53D1\u73B0",
-            onChange: (event) => setCaldavHref(event.target.value)
-          })
-        )
-      ),
-      (0, import_react10.createElement)(
-        "div",
-        { style: { display: "flex", gap: "8px", alignItems: "center" } },
-        (0, import_react10.createElement)(
-          "button",
-          {
-            className: "ghost small",
-            onClick: () => {
-              setCaldavStatus("\u4FDD\u5B58\u4E2D\u2026");
-              void api.saveTaskCaldav({
-                accountId: account.id,
-                url: caldavUrl,
-                username: caldavUser,
-                ...caldavPassword === "" ? {} : { password: caldavPassword },
-                calendarHref: caldavHref
-              }).then((info) => {
-                setCaldavStatus(info.hasPassword ? "\u5DF2\u4FDD\u5B58" : "\u672A\u4FDD\u5B58\u5BC6\u7801");
-                setCaldavPassword("");
-              }).catch((caught) => setCaldavStatus(errorText6(caught)));
-            }
-          },
-          "\u4FDD\u5B58 CalDAV"
-        ),
-        (0, import_react10.createElement)("span", { className: "small muted" }, caldavStatus)
-      ),
       (0, import_react10.createElement)(
         Field,
         { label: "\u5BC6\u7801 / \u5E94\u7528\u4E13\u7528\u5BC6\u7801\uFF08\u4E0D\u5199\u5165\u914D\u7F6E\u6587\u4EF6\uFF09" },
@@ -4355,7 +4427,7 @@ function TaskEditor({
 }
 
 // src/client/index.tsx
-var VERSION = "0.5.0";
+var VERSION = "0.5.1";
 var inject = ["slots"];
 var PANEL_ID = "mailharbor";
 var TASKS_PANEL_ID = "mailharbor-tasks";