dsh-plugin/session-notify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat(client): 插件页改为三组列表与键值状态，权限带状态点

Browse Source
This commit is contained in:
pyh
2026-10-04 19:24:03 +08:00
parent 074cdccdb9
commit ec8661b317
5 changed files with 288 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client.js
+155 -88
View File
@@ -104,6 +104,7 @@ var zh = {
"config.testAny": "测试提醒",
"config.testSystem": "测试系统通知",
"config.diag.window": "窗口状态",
"config.diag.watch": "会话监听",
"config.diag.inFront": "在前台（会走轻弹窗）",
"config.diag.away": "不在前台（会走系统通知）",
"config.diag.last": "最近一次投递",
@@ -114,8 +115,9 @@ var zh = {
"config.diag.replayDelivery": "应用内轻弹窗（回到窗口时补发）",
"config.diag.popup": "应用内轻弹窗",
"config.diag.refused": "系统通知被拒绝，改用了轻弹窗",
"config.diag.replay": "等你回到窗口时补发：{count} 条",
"config.diag.replayNone": "没有待补发的提醒"
"config.diag.replay": "待补发提醒",
"config.diag.replayValue": "{count} 条",
"config.diag.replayNone": "没有"
};
// src/client/i18n/en.js
@@ -163,6 +165,7 @@ var en = {
"config.testAny": "Test alert",
"config.testSystem": "Test system notification",
"config.diag.window": "Window",
"config.diag.watch": "Session watch",
"config.diag.inFront": "in front (popup is used)",
"config.diag.away": "not in front (system notification is used)",
"config.diag.last": "Last delivery",
@@ -173,8 +176,9 @@ var en = {
"config.diag.replayDelivery": "in-app popup (replayed when you came back)",
"config.diag.popup": "in-app popup",
"config.diag.refused": "system channel refused, popup was used instead",
"config.diag.replay": "waiting for you to come back: {count}",
"config.diag.replayNone": "nothing waiting to be replayed"
"config.diag.replay": "Replay",
"config.diag.replayValue": "{count} waiting",
"config.diag.replayNone": "None"
};
// src/client/i18n/index.js
@@ -331,6 +335,9 @@ function createCopy(t) {
if (candidate.kind === "completion") {
return { kind: "completion", title: t("notification.completion"), body: t("body.completion", { title }) };
}
if (candidate.pendingKind === "plan-review") {
return { kind: "question", title: t("notification.question"), body: t("body.planReview", { title }) };
}
if (candidate.kind === "question") {
const question = candidate.detail;
return {
@@ -339,9 +346,6 @@ function createCopy(t) {
body: question === "" ? t("body.question", { title }) : `${title} · ${question}`
};
}
if (candidate.pendingKind === "plan-review") {
return { kind: "question", title: t("notification.question"), body: t("body.planReview", { title }) };
}
const tool = candidate.detail;
return {
kind: "approval",
@@ -349,13 +353,13 @@ function createCopy(t) {
body: tool === "" ? t("body.approvalPlain", { title }) : t("body.approval", { title, tool })
};
};
const describeDelivery = (last, tr) => {
if (last === null || last === void 0) return tr("config.diag.none");
const deliveryFacts = (last, tr) => {
if (last === null || last === void 0) return null;
const outcome = last.outcome.startsWith("system-refused") ? tr("config.diag.refused") : last.outcome === "system" ? last.shown === true ? tr("config.diag.systemShown") : last.shown === false ? tr("config.diag.systemFailed") : tr("config.diag.systemUnconfirmed") : last.outcome === "replay" ? tr("config.diag.replayDelivery") : tr("config.diag.popup");
return `${tr("config.diag.last")}: ${last.at} · ${outcome} · ${last.title}`;
return { at: last.at, outcome, title: last.title ?? "" };
};
const describeReplay = (count, tr) => count === 0 ? tr("config.diag.replayNone") : tr("config.diag.replay", { count });
return { copyFor, describeDelivery, describeReplay };
const replayValue = (count, tr) => count === 0 ? tr("config.diag.replayNone") : tr("config.diag.replayValue", { count });
return { copyFor, deliveryFacts, replayValue };
}
// src/client/core/toasts.js
@@ -548,13 +552,18 @@ function isOnScreen(sessionId, list) {
}
return false;
}
function stillWorth(candidate, live) {
function stillOwed(candidate, live) {
if (candidate.test === true) return true;
if (candidate.pendingKind !== "") {
const sessionStatus = live.status?.get?.(candidate.sessionId);
if (sessionStatus === void 0) return true;
return servedPendingKind(sessionStatus.pendingInteraction) === candidate.pendingKind;
}
const list = live.list;
if (candidate.test === true || list === void 0) return true;
if (list === void 0) return true;
const summary = list.byId?.[candidate.sessionId];
if (summary === void 0) return true;
const status = live.status;
const running = status?.get?.(candidate.sessionId)?.running ?? summary.running;
const running = live.status?.get?.(candidate.sessionId)?.running ?? summary.running;
return running !== true;
}
@@ -582,28 +591,32 @@ function createDelivery({ store, copy, live, toasts, system, replay }) {
const deliver = (candidate, ignoreThrottle) => {
if (ignoreThrottle !== true) {
const now = Date.now();
if (now - lastDelivery < THROTTLE_MS) return;
if (now - lastDelivery < THROTTLE_MS) return false;
lastDelivery = now;
}
if (!windowIsAway()) {
if (isOnScreen(candidate.sessionId, live.list)) return;
if (isOnScreen(candidate.sessionId, live.list)) return true;
toasts.showToast(candidate);
recordDelivery("popup", candidate);
return;
return true;
}
const result = system.notifySystem(candidate, candidate.test === true);
if (result.outcome === "raised") {
recordDelivery("system", candidate, result);
if (candidate.test !== true) replay.holdForReplay(candidate, result);
return;
return true;
}
toasts.showToast(candidate);
recordDelivery(`system-refused-${result.outcome}`, candidate);
return true;
};
const flushSettle = () => {
settleTimer = 0;
const candidate = pending.shift();
if (candidate !== void 0 && stillWorth(candidate, live)) deliver(candidate, false);
if (candidate !== void 0 && stillOwed(candidate, live)) {
const delivered = deliver(candidate, false);
if (delivered === false && candidate.pendingKind !== "") pending.push(candidate);
}
if (pending.length > 0) settleTimer = setTimeout(() => flushSettle(), SETTLE_MS);
};
const queue = (candidate) => {
@@ -894,17 +907,29 @@ var CSS = `
.dsn-toast-close{flex:none;display:inline-flex;align-items:center;justify-content:center;width:28px;height:28px;border:0;border-radius:var(--dsw-radius-sm);background:transparent;color:var(--dsw-alias-toast-label);opacity:.8;cursor:pointer}
.dsn-toast-close:hover{background:var(--dsw-alias-interactive-bg-hover);opacity:1}
.dsn-toast-close:focus-visible{outline:var(--dsw-focus-ring-width) solid var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary));outline-offset:2px}
.dsn-sections{display:flex;flex-direction:column;gap:24px}
.dsn-section{display:flex;flex-direction:column;gap:10px}
.dsn-section-title{margin:0;color:var(--dsw-alias-label-primary);font-size:14px;font-weight:500;line-height:22px}
.dsn-section-desc{margin:0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
.dsn-row{display:flex;align-items:center;justify-content:space-between;gap:16px;padding:10px 0;border-bottom:.5px solid var(--dsw-alias-border-l2)}
.dsn-row:last-child{border-bottom:0}
.dsn-page{display:flex;flex-direction:column;gap:28px;max-width:560px}
.dsn-lede{margin:0;color:var(--dsw-alias-label-secondary);font-size:13px;line-height:20px}
.dsn-group{display:flex;flex-direction:column;gap:2px}
.dsn-group-title{margin:0 0 8px;color:var(--dsw-alias-label-primary);font-size:13px;font-weight:600;line-height:20px}
.dsn-group-note{margin:8px 0 0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
.dsn-list{display:flex;flex-direction:column}
.dsn-row{display:flex;align-items:center;justify-content:space-between;gap:16px;padding:10px 0}
.dsn-row+.dsn-row{border-top:.5px solid var(--dsw-alias-border-l2)}
.dsn-row.is-action{justify-content:flex-end;padding:12px 0 0}
.dsn-row-text{display:flex;flex-direction:column;gap:2px;min-width:0}
.dsn-row-title{color:var(--dsw-alias-label-primary);font-size:14px;line-height:22px}
.dsn-row-desc{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
.dsn-status{margin:0;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px}
.dsn-status-error{color:var(--dsw-alias-state-error-primary)}
.dsn-row-sub{margin:0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
.dsn-state{display:inline-flex;align-items:center;gap:8px;color:var(--dsw-alias-label-primary);font-size:14px;line-height:22px}
.dsn-dot{flex:none;width:6px;height:6px;border-radius:50%;background:var(--dsw-alias-state-success-primary)}
.dsn-dot.is-warn{background:var(--dsw-alias-state-warn-label)}
.dsn-dot.is-error{background:var(--dsw-alias-state-error-primary)}
.dsn-dot.is-muted{background:var(--dsw-alias-border-l3)}
.dsn-facts{display:grid;grid-template-columns:auto minmax(0,1fr);gap:8px 14px;margin:0;min-width:0}
.dsn-fact-key{margin:0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px;white-space:nowrap}
.dsn-fact{display:flex;flex-direction:column;gap:2px;margin:0;min-width:0}
.dsn-fact-value{margin:0;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px;overflow-wrap:anywhere}
.dsn-fact-value.is-error{color:var(--dsw-alias-state-error-primary)}
.dsn-fact-title{margin:0;color:var(--dsw-alias-label-primary);font-size:12px;line-height:18px;overflow-wrap:anywhere}
.dsn-switch{box-sizing:border-box;position:relative;flex:0 0 auto;width:36px;height:20px;padding:2px;border:0;border-radius:999px;background:var(--dsw-alias-border-l3);cursor:pointer}
.dsn-switch[aria-checked='true']{background:var(--dsw-alias-brand-primary)}
.dsn-switch:disabled{cursor:default;opacity:.5}
@@ -912,10 +937,12 @@ var CSS = `
.dsn-thumb{display:block;width:16px;height:16px;border-radius:50%;background:var(--dsw-alias-label-primary-foreground);transition:transform 120ms ease}
.dsn-switch[aria-checked='false'] .dsn-thumb{background:var(--dsw-alias-switch-thumb)}
.dsn-switch[aria-checked='true'] .dsn-thumb{transform:translateX(16px)}
.dsn-button{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;gap:4px;height:36px;padding:0 14px;border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);cursor:pointer;font-size:14px;line-height:22px;color:var(--dsw-alias-label-primary);background:transparent;flex:none}
.dsn-button{box-sizing:border-box;display:inline-flex;align-items:center;justify-content:center;gap:4px;height:32px;padding:0 12px;border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-md);cursor:pointer;font-size:13px;line-height:20px;color:var(--dsw-alias-label-primary);background:transparent;flex:none}
.dsn-button:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}
.dsn-button:disabled{cursor:not-allowed;opacity:.4}
.dsn-button:focus-visible{outline:var(--dsw-focus-ring-width) solid var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary));outline-offset:2px}
.dsn-button.is-primary{border-color:transparent;background:var(--dsw-alias-brand-primary);color:var(--dsw-alias-label-primary-foreground)}
.dsn-button.is-primary:hover:not(:disabled){background:var(--dsw-alias-brand-primary);opacity:.88}
`;
// src/client/ui/ToastLayer.js
@@ -1022,85 +1049,125 @@ function ConfigSection(props) {
const supported = permission !== "unsupported";
const failed = permission === "denied" || snapshot.promptError !== "";
const statusKey = permission === "granted" ? "settings.permission.granted" : permission === "denied" ? "settings.permission.denied" : supported ? "settings.permission.default" : "settings.permission.unsupported";
const permissionText = snapshot.promptError === "" ? `${tr(statusKey)}${permission === "denied" || !supported ? ` · ${tr(`settings.permission.hint.${props.platform}`)}` : ""}` : snapshot.promptError;
const promptFailed = snapshot.promptError !== "";
const permissionText = promptFailed ? snapshot.promptError : tr(statusKey);
const dotClass = permission === "granted" ? "" : failed ? " is-error" : supported ? " is-warn" : " is-muted";
const permissionNote = promptFailed ? "" : permission === "denied" || !supported ? tr(`settings.permission.hint.${props.platform}`) : permission === "granted" ? tr("config.testHint") : tr("settings.permission.hint.plain");
const health = snapshot.health;
const healthText = health.state === "watching" ? tr("settings.health.watching") : health.state === "noHooks" ? tr("settings.health.noHooks") : health.state === "error" ? tr("settings.health.error", { message: health.message }) : tr("settings.health.starting");
const healthFailed = health.state !== "watching" && health.state !== "starting";
const delivery = props.copy.deliveryFacts(snapshot.lastDelivery, tr);
return h4(
React5.Fragment,
null,
h4("style", null, CSS),
h4(
"div",
{ className: "dsn-sections" },
// The page header already shows this bundle's title and description, so
// this section opens with what the header cannot say: how alerts are
// carried, and what this form changes.
{ className: "dsn-page" },
// The page header already shows this bundle's title and description, so this
// lede says what the header cannot: how an alert travels, and that the
// channel is chosen at delivery time.
h4("p", { className: "dsn-lede" }, tr("config.intro")),
h4(
"section",
{ className: "dsn-section" },
h4("p", { className: "dsn-section-desc" }, tr("config.intro"))
),
h4(
"section",
{ className: "dsn-section" },
h4("h3", { className: "dsn-section-title" }, tr("config.section.kinds")),
KINDS.map((kind) => h4(KindRow, {
key: kind,
label: tr(`settings.kind.${kind}`),
checked: snapshot.kinds[kind] === true,
disabled: false,
onToggle: () => props.setKind(kind, snapshot.kinds[kind] !== true)
})),
h4("p", { className: "dsn-section-desc" }, tr("config.saveNote"))
),
h4(
"section",
{ className: "dsn-section" },
h4("h3", { className: "dsn-section-title" }, tr("config.section.permission")),
{ className: "dsn-group" },
h4("h3", { className: "dsn-group-title" }, tr("config.section.kinds")),
h4(
"div",
{ className: "dsn-row" },
h4(
"div",
{ className: "dsn-row-text" },
h4("p", {
className: `dsn-status${failed ? " dsn-status-error" : ""}`,
role: failed ? "alert" : "status"
}, permissionText)
),
h4("button", {
type: "button",
className: "dsn-button",
disabled: !supported,
onClick: permission === "granted" ? props.testSystem : props.ask
}, tr(!supported ? "settings.action.unsupported" : permission === "granted" ? "settings.action.testSystem" : "settings.action.allow"))
{ className: "dsn-list" },
KINDS.map((kind) => h4(KindRow, {
key: kind,
label: tr(`settings.kind.${kind}`),
checked: snapshot.kinds[kind] === true,
disabled: false,
onToggle: () => props.setKind(kind, snapshot.kinds[kind] !== true)
}))
),
h4("p", { className: "dsn-section-desc" }, tr("config.testHint"))
h4("p", { className: "dsn-group-note" }, tr("config.saveNote"))
),
h4(
"section",
{ className: "dsn-section" },
h4("h3", { className: "dsn-section-title" }, tr("config.section.status")),
{ className: "dsn-group" },
h4("h3", { className: "dsn-group-title" }, tr("config.section.permission")),
h4(
"div",
{ className: "dsn-row" },
{ className: "dsn-list" },
h4(
"div",
{ className: "dsn-row-text" },
h4("p", { className: "dsn-status" }, `${tr("config.diag.window")}: ${tr(windowIsAway() ? "config.diag.away" : "config.diag.inFront")}`),
h4("p", {
className: `dsn-status${healthFailed ? " dsn-status-error" : ""}`,
role: healthFailed ? "alert" : "status"
}, healthText),
h4("p", { className: "dsn-status" }, props.copy.describeDelivery(snapshot.lastDelivery, tr)),
h4("p", { className: "dsn-status" }, props.copy.describeReplay(props.replayCount(), tr))
{ className: "dsn-row" },
h4(
"div",
{ className: "dsn-row-text" },
h4(
"span",
{
className: "dsn-state",
role: failed ? "alert" : "status"
},
h4("span", { className: `dsn-dot${dotClass}` }),
permissionText
),
h4("p", { className: "dsn-row-sub" }, permissionNote)
),
h4("button", {
type: "button",
className: `dsn-button${supported && permission !== "granted" ? " is-primary" : ""}`,
disabled: !supported,
onClick: permission === "granted" ? props.testSystem : props.ask
}, tr(!supported ? "settings.action.unsupported" : permission === "granted" ? "settings.action.testSystem" : "settings.action.allow"))
)
)
),
h4(
"section",
{ className: "dsn-group" },
h4("h3", { className: "dsn-group-title" }, tr("config.section.status")),
h4(
"dl",
{ className: "dsn-facts" },
h4("dt", { className: "dsn-fact-key" }, tr("config.diag.window")),
h4(
"dd",
{ className: "dsn-fact" },
h4("p", { className: "dsn-fact-value" }, tr(windowIsAway() ? "config.diag.away" : "config.diag.inFront"))
),
h4("button", {
type: "button",
className: "dsn-button",
onClick: props.testAny
}, tr("settings.action.testAny"))
h4("dt", { className: "dsn-fact-key" }, tr("config.diag.watch")),
h4(
"dd",
{ className: "dsn-fact" },
h4("p", {
className: `dsn-fact-value${healthFailed ? " is-error" : ""}`,
role: healthFailed ? "alert" : "status"
}, healthText)
),
h4("dt", { className: "dsn-fact-key" }, tr("config.diag.last")),
h4(
"dd",
{ className: "dsn-fact" },
delivery === null ? h4("p", { className: "dsn-fact-value" }, tr("config.diag.none")) : [
h4("p", { key: "line", className: "dsn-fact-value" }, `${delivery.at} · ${delivery.outcome}`),
delivery.title === "" ? null : h4("p", { key: "title", className: "dsn-fact-title" }, delivery.title)
]
),
h4("dt", { className: "dsn-fact-key" }, tr("config.diag.replay")),
h4(
"dd",
{ className: "dsn-fact" },
h4("p", { className: "dsn-fact-value" }, props.copy.replayValue(props.replayCount(), tr))
)
),
h4(
"div",
{ className: "dsn-list" },
h4(
"div",
{ className: "dsn-row is-action" },
h4("button", {
type: "button",
className: "dsn-button",
onClick: props.testAny
}, tr("settings.action.testAny"))
)
)
)
)