@ottttto/dsh-scheduled-send 0.3.5 → 0.3.7

package/lib/client.js

@@ -74,12 +74,15 @@ function formatCountdown(sendAt, now) {
   const ms = sendAt - now;
   if (ms <= 0) return '即将发送';
   const totalSec = Math.floor(ms / 1000);
-  const h = Math.floor(totalSec / 3600);
+  const d = Math.floor(totalSec / 86400);
+  const h = Math.floor((totalSec % 86400) / 3600);
   const m = Math.floor((totalSec % 3600) / 60);
   const s = totalSec % 60;
-  if (h > 0) return `${h}小时${m}分后`;
-  if (m > 0) return `${m}分${s}秒后`;
-  return `${s}秒后`;
+  // no trailing 后 — callers append their own verb (后发送 / 后重置 …)
+  if (d > 0) return `${d}天${h}小时`;
+  if (h > 0) return `${h}小时${m}分`;
+  if (m > 0) return `${m}分${s}秒`;
+  return `${s}秒`;
 }
 
 /** Default confirmation time = now + 5 minutes. */
@@ -237,9 +240,13 @@ function createScheduledClientState({ fetchState, postSchedule, cancelSchedule,
 
     /** Cancel a pending task: DELETE on the host + drop locally. */
     async cancelTask(id) {
-      if (cancelSchedule) await cancelSchedule(id);
+      // optimistic: drop locally FIRST so the row disappears instantly; the
+      // DELETE then persists it. onChanged lets the sibling instance (dock ↔
+      // sidebar panel) refresh immediately instead of waiting for its poll.
       tasks = tasks.filter((t) => t.id !== id);
       recentAdds.delete(id);
+      if (typeof this.onChanged === 'function') this.onChanged();
+      if (cancelSchedule) await cancelSchedule(id);
     },
 
     start(intervalMs = 4_000) {
@@ -487,7 +494,7 @@ function createClientPluginBody(React) {
           h("div", { key: "src", style: srcStyle }, t.content),
           h("div", { key: "meta", style: metaStyle }, [
             h("span", { key: "at" }, formatLocalTime(t.sendAt)),
-            h("span", { key: "cd" }, formatCountdown(t.sendAt, Date.now())),
+            h("span", { key: "cd" }, formatCountdown(t.sendAt, Date.now()) + "后发送"),
             h("span", { key: "sp", style: { marginLeft: "auto" } }, cancelBtn(t.id)),
           ]),
         ])),
@@ -626,11 +633,14 @@ function createClientPluginBody(React) {
           }, [
             h("div", { key: "c", style: { whiteSpace: "pre-wrap", fontFamily: "monospace" } },
               summarizeContent(t.content) || "(空内容)"),
-            h("div", { key: "m", style: { display: "flex", alignItems: "center", gap: 8, color: "rgba(128,128,128,1)", flexWrap: "wrap" } }, [
-              h("span", { key: "s", style: { maxWidth: "60%", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } },
+            h("div", { key: "m", style: { display: "flex", alignItems: "center", gap: 8, color: "rgba(128,128,128,1)" } }, [
+              h("span", { key: "s", style: { flex: 1, minWidth: 0, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } },
                 t.sessionExists ? t.sessionTitle : "会话不存在"),
               h("span", { key: "at" }, formatLocalTime(t.sendAt)),
-              h("span", { key: "cd" }, formatCountdown(t.sendAt, Date.now())),
+            ]),
+            h("div", { key: "act", style: { display: "flex", alignItems: "center", gap: 8 } }, [
+              h("span", { key: "cd", style: { color: "#3b82f6", fontWeight: 600 } },
+                "⏳ " + formatCountdown(t.sendAt, Date.now()) + "后发送"),
               h("span", { key: "sp", style: { marginLeft: "auto" } }, cancelBtn(t)),
             ]),
           ])),
@@ -675,6 +685,10 @@ function createClientPluginBody(React) {
     const panelCore = createScheduledClientState({
       fetchState: async () => {
         const res = await doFetch(stateRoutePath, { headers: { accept: "application/json" } });
+    // cross-instance sync: a cancel/create in either surface refreshes the
+    // other immediately (no 4s poll lag)
+    core.onChanged = () => { void panelCore.refresh(); };
+    panelCore.onChanged = () => { void core.refresh(); };
         if (!res.ok) throw new Error("state HTTP " + res.status);
         return res.json();
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ottttto/dsh-scheduled-send",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "description": "DSH plugin: scheduled sending (⏰ composer button, dock list of pending tasks, sidebar 定时任务 panel with cross-session cancel, due-time delivery as a normal user bubble)",
   "type": "module",
   "main": "./src/index.js",

package/src/client-core.js

@@ -65,12 +65,15 @@ export function formatCountdown(sendAt, now) {
   const ms = sendAt - now;
   if (ms <= 0) return '即将发送';
   const totalSec = Math.floor(ms / 1000);
-  const h = Math.floor(totalSec / 3600);
+  const d = Math.floor(totalSec / 86400);
+  const h = Math.floor((totalSec % 86400) / 3600);
   const m = Math.floor((totalSec % 3600) / 60);
   const s = totalSec % 60;
-  if (h > 0) return `${h}小时${m}分后`;
-  if (m > 0) return `${m}分${s}秒后`;
-  return `${s}秒后`;
+  // no trailing 后 — callers append their own verb (后发送 / 后重置 …)
+  if (d > 0) return `${d}天${h}小时`;
+  if (h > 0) return `${h}小时${m}分`;
+  if (m > 0) return `${m}分${s}秒`;
+  return `${s}秒`;
 }
 
 /** Default confirmation time = now + 5 minutes. */
@@ -228,9 +231,13 @@ export function createScheduledClientState({ fetchState, postSchedule, cancelSch
 
     /** Cancel a pending task: DELETE on the host + drop locally. */
     async cancelTask(id) {
-      if (cancelSchedule) await cancelSchedule(id);
+      // optimistic: drop locally FIRST so the row disappears instantly; the
+      // DELETE then persists it. onChanged lets the sibling instance (dock ↔
+      // sidebar panel) refresh immediately instead of waiting for its poll.
       tasks = tasks.filter((t) => t.id !== id);
       recentAdds.delete(id);
+      if (typeof this.onChanged === 'function') this.onChanged();
+      if (cancelSchedule) await cancelSchedule(id);
     },
 
     start(intervalMs = 4_000) {

package/src/client-view.js

@@ -223,7 +223,7 @@ function createClientPluginBody(React) {
           h("div", { key: "src", style: srcStyle }, t.content),
           h("div", { key: "meta", style: metaStyle }, [
             h("span", { key: "at" }, formatLocalTime(t.sendAt)),
-            h("span", { key: "cd" }, formatCountdown(t.sendAt, Date.now())),
+            h("span", { key: "cd" }, formatCountdown(t.sendAt, Date.now()) + "后发送"),
             h("span", { key: "sp", style: { marginLeft: "auto" } }, cancelBtn(t.id)),
           ]),
         ])),
@@ -362,11 +362,14 @@ function createClientPluginBody(React) {
           }, [
             h("div", { key: "c", style: { whiteSpace: "pre-wrap", fontFamily: "monospace" } },
               summarizeContent(t.content) || "(空内容)"),
-            h("div", { key: "m", style: { display: "flex", alignItems: "center", gap: 8, color: "rgba(128,128,128,1)", flexWrap: "wrap" } }, [
-              h("span", { key: "s", style: { maxWidth: "60%", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } },
+            h("div", { key: "m", style: { display: "flex", alignItems: "center", gap: 8, color: "rgba(128,128,128,1)" } }, [
+              h("span", { key: "s", style: { flex: 1, minWidth: 0, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" } },
                 t.sessionExists ? t.sessionTitle : "会话不存在"),
               h("span", { key: "at" }, formatLocalTime(t.sendAt)),
-              h("span", { key: "cd" }, formatCountdown(t.sendAt, Date.now())),
+            ]),
+            h("div", { key: "act", style: { display: "flex", alignItems: "center", gap: 8 } }, [
+              h("span", { key: "cd", style: { color: "#3b82f6", fontWeight: 600 } },
+                "⏳ " + formatCountdown(t.sendAt, Date.now()) + "后发送"),
               h("span", { key: "sp", style: { marginLeft: "auto" } }, cancelBtn(t)),
             ]),
           ])),
@@ -411,6 +414,10 @@ function createClientPluginBody(React) {
     const panelCore = createScheduledClientState({
       fetchState: async () => {
         const res = await doFetch(stateRoutePath, { headers: { accept: "application/json" } });
+    // cross-instance sync: a cancel/create in either surface refreshes the
+    // other immediately (no 4s poll lag)
+    core.onChanged = () => { void panelCore.refresh(); };
+    panelCore.onChanged = () => { void core.refresh(); };
         if (!res.ok) throw new Error("state HTTP " + res.status);
         return res.json();
       },