Compare commits
6
Commits
v1.0.1
..
3986aac863
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3986aac863 | ||
|
|
080d873f9a | ||
|
|
e59be4d983 | ||
|
|
09114e210f | ||
|
|
f0c11176f2 | ||
|
|
2097aeaa76 |
@@ -2,6 +2,17 @@
|
||||
|
||||
版本说明按倒序排列。提交信息遵循 [CONTRIBUTING.md](CONTRIBUTING.md) 的单行规范,因此每次改动"为什么这样改、影响面是什么"记在这里,而不是提交信息里。
|
||||
|
||||
## v1.0.6
|
||||
|
||||
- 修复:**窗口不在前台时,提醒有可能一次都看不到**。排查证据:一次真实投递(会话 17:52:29 结束)在插件页留下 `09:52:30 · 系统通知`——`09:52:30` 是 UTC,本机时间是 17:52:30;而 Windows 的通知平台记录 `LastNotificationAddedTime` 停在 70 分钟前。也就是说 `new Notification()` 没抛错,但**构造函数成功不等于通知真的弹出来了**,加上系统通知的气泡只存在几秒,人不在电脑前时它等于没送达。这一版不再把"发出去"当成"收到了":
|
||||
- 每条系统通知都订阅 `show` / `error`:系统是否确认显示会写进插件页的「最近一次投递」,不再只报"系统通知"三个字;
|
||||
- **凡是在窗口不在前台时投递的提醒,都会在窗口回到前台的那一刻用应用内轻弹窗补发一次**。同一会话同一类只保留最新一条,超过 30 分钟不再补发;"正在看的会话不打扰"这条规则不适用于补发,因为它发生的时候你并不在看。唯一的例外是系统确认气泡已弹出、且你在 20 秒内就回到窗口(气泡还在屏幕上,不再重复);
|
||||
- 点掉系统通知本身(`click`)会取消对应的补发,不重复打扰。
|
||||
- 修复「最近一次投递」的时间显示成 UTC(比本地时间早 8 小时,17:52 显示成 09:52)的问题,现在显示本机时间。
|
||||
- 修复确认窗口的队列会把提醒永久卡住的问题:一次确认窗口只投递一条,剩下没轮到的会自己再排一次(以前排完之后队列里再没人触发,后面的提醒就被吞了)。
|
||||
- 系统通知对象改为有界持有引用:防御性改动,避免显示还没落定时对象被回收(实测中保留引用与否都能送达,所以这不是那次丢失的原因)。
|
||||
- 插件页「运行状态」新增一行:还有几条提醒在等你回到窗口时补发。
|
||||
|
||||
## v1.0.5
|
||||
|
||||
- 修复:**应用在后台时不发系统通知**。前台/后台以前只靠 `window` 的 `focus`/`blur` 事件记住,桌面外壳里 `blur` 可能不到,插件就一直以为窗口在前台,于是走了轻弹窗分支(而用户没在看,表现就是完全没有通知)。现在每次投递都现读 `document.visibilityState` 与 `document.hasFocus()`,任一表示不可见即走系统通知;观察器订阅的事件只是让重算更及时,不再决定通道。
|
||||
|
||||
@@ -1,90 +1,104 @@
|
||||
# 会话通知
|
||||
|
||||
DeepSeek Harness(DSH)插件:会话**需要你注意**时提醒你——窗口不在前台时用**系统通知**,窗口在前台时用**应用内轻弹窗**。
|
||||
|
||||
Windows / macOS / Linux 三个平台走的是同一条通知通道(渲染进程的 Web Notification API),插件里没有平台分支。
|
||||
DeepSeek Harness(DSH)插件:会话**需要你注意**时提醒你——窗口不在前台用**系统通知**,窗口在前台用**应用内轻弹窗**。
|
||||
|
||||
## 提醒什么
|
||||
|
||||
| 触发 | 通知标题 |
|
||||
| 什么时候提醒 | 通知标题 | 内容里带什么 |
|
||||
| --- | --- | --- |
|
||||
| 会话从「运行中」变为「空闲」(一轮回答结束) | 会话已完成 | 会话题目 |
|
||||
| 出现等待你处理的工具授权请求 | 需要授权 | 等待授权的工具名 |
|
||||
| 出现等待你回答的提问,或等待你确认的计划 | 需要回答 | 提问提醒带问题原文,计划确认带会话题目 |
|
||||
|
||||
三类提醒可以分别开关。
|
||||
|
||||
每条只提醒一次:同一会话的同一轮只报一次完成,同一个待处理请求只报一次;请求消失之后再次出现,会重新提醒。
|
||||
|
||||
## 提醒送到哪里
|
||||
|
||||
按 DSH 窗口**当时**的状态选通道,你不需要预先设置:
|
||||
|
||||
| 窗口状态 | 怎么提醒 |
|
||||
| --- | --- |
|
||||
| 会话从「运行中」变为「空闲」(一轮回答结束) | 会话已完成 |
|
||||
| 待处理的工具授权请求(`approval`) | 需要授权 |
|
||||
| 待处理的提问 / 计划确认(`question` / `plan-review`) | 需要回答 |
|
||||
| 窗口**不在前台** | **系统通知**(Windows 通知中心 / macOS 通知中心 / Linux 通知守护)。点一下通知:窗口回到前台,并跳到那个会话 |
|
||||
| 窗口在**前台**,但不是你正在看的那个会话 | **应用内轻弹窗**:右上角浮出一张卡片,标题是提醒类型,下面一行是会话题目与细节 |
|
||||
| 窗口在**前台**,且正是你**在看的**那个会话 | 不打扰(你就在看着,不需要弹) |
|
||||
|
||||
每条只提醒一次:同一会话的同一轮只报一次完成,同一个待处理请求只报一次;请求消失后再来才会再报。
|
||||
系统通知的气泡只存在几秒,**人不在电脑前时它等于没送到**,所以:
|
||||
|
||||
## 走哪个通道
|
||||
- 凡是在窗口不在前台时投递的提醒,**窗口回到前台的那一刻会再用轻弹窗补发一次**(同一会话同一类只留最新一条,超过 30 分钟不再补发);
|
||||
- 唯一的例外:系统确认气泡已经弹出来、而且你 20 秒内就回到窗口——那条气泡还在屏幕上,就不再重复;
|
||||
- 补发不受「正在看的会话不打扰」限制——这条提醒发生的时候你并不在看;
|
||||
- 点掉系统通知本身就会取消对应的补发;
|
||||
- 插件页「最近一次投递」会写清系统到底有没有确认显示(`系统已确认弹出` / `系统没有回报` / `没弹出来`)。
|
||||
|
||||
| 状态 | 行为 |
|
||||
| --- | --- |
|
||||
| DSH 窗口**不在前台** | **系统通知**(这是插件唯一能拿到的系统通知通道,三个平台一致)。点通知:窗口回到前台并跳到该会话 |
|
||||
| DSH 窗口在前台,且**不是**你正在看的那个会话 | **应用内轻弹窗**:右上角悬浮,点「查看」跳过去,6 秒自动消失,鼠标悬停时不消失,Esc 关掉最上面一条 |
|
||||
| DSH 窗口在前台,且就是你**正在看的**那个会话 | 不打扰(你在看,不需要弹) |
|
||||
轻弹窗的用法:
|
||||
|
||||
- 点「查看」跳到该会话;
|
||||
- 6 秒后自动消失;鼠标停在上面期间不消失,移开后重新计时;
|
||||
- 按 `Esc` 关掉最新的一条,或点 ✕ 关掉这一条;
|
||||
- 同屏最多叠 3 条,更早的会被挤掉。
|
||||
|
||||
## 设置
|
||||
|
||||
**设置 → 通用 → 会话通知**:
|
||||
**插件 → 会话通知**:
|
||||
|
||||
- 显示系统通知权限状态;
|
||||
- 未授权时点「允许通知」请求权限(浏览器要求必须由你手动点击才能弹权限框),授权后自动发一条测试通知;
|
||||
- 已授权时点「测试通知」随时验证;
|
||||
- 权限被系统层关闭时,按平台给出开启路径(Windows / macOS 的通知设置、Linux 桌面环境的通知设置);
|
||||
- 三个开关分别控制**完成 / 授权 / 提问**三类提醒(默认全开;开关状态存在当前页面内存里,刷新回到默认——本插件不写配置文件)。
|
||||
| 分组 | 内容 |
|
||||
| --- | --- |
|
||||
| 提醒内容 | **完成 / 授权 / 提问** 三个开关,分别控制三类提醒,默认全开;开关保存在浏览器本地,重开页面、重装插件都保留 |
|
||||
| 系统通知权限 | 当前权限状态;尚未授权时点「允许通知」请求授权(浏览器要求必须由你手动点击),授权成功后会自动发一条测试提醒。权限被系统层关闭时,会按当前平台告诉你去哪里打开 |
|
||||
| 运行状态 | 窗口现在是前台还是后台(即会走哪条通道)、插件是否真的在读会话状态、**最近一次提醒走的通道、系统是否确认弹出、时间**(本机时间),以及还有几条提醒在等你回到窗口时补发;旁边「测试提醒」按钮发一条测试提醒 |
|
||||
|
||||
- 已经授权时,权限行的按钮变成「测试系统通知」:它直接走系统通知通道(窗口在前台也照发),专门用来验证系统通知本身是否可用。
|
||||
- 开关只影响提醒,不改 DSH 本身的任何设置。
|
||||
|
||||
## 安装
|
||||
|
||||
在 DSH 的 **插件 → 添加插件** 里填本目录的绝对路径即可(`plugin_manager` 也会做同样的安装):
|
||||
### 从 Git 仓库安装(推荐)
|
||||
|
||||
在 DSH 的 **插件 → 添加插件** 的上方输入框里填:
|
||||
|
||||
```text
|
||||
https://gitea.iwake.top/dsh-plugin/session-notify.git#v1.0.6
|
||||
```
|
||||
|
||||
`#` 后面跟标签或提交,用来锁定版本;不写则取默认分支。跟随 1.x 最新版可以写 `#semver:^1.0.6`。仓库是公开的,不需要凭据,也不用改「安装源」。
|
||||
|
||||
### 本地路径安装
|
||||
|
||||
把仓库克隆或下载到本机,在同一个输入框里填包目录的绝对路径,例如:
|
||||
|
||||
```text
|
||||
D:\DeepSeek Harness Plugins\dsh-session-notify
|
||||
```
|
||||
|
||||
安装后:
|
||||
### 安装之后
|
||||
|
||||
- **浏览器半**随页面加载,刷新页面即生效;
|
||||
- **宿主半**为空壳(不改任何 DSH 状态),如需重启才生效,完全退出 DSH 再打开即可;
|
||||
- 本插件没有第三方依赖,不需要 pnpm 下载,也不需要构建步骤。
|
||||
- 装好**刷新页面**即生效;本插件没有第三方依赖,也不需要 pnpm 下载或构建步骤。
|
||||
- 卸载:在插件页里移除 `@dsh-plugin/session-notify`。
|
||||
|
||||
卸载:插件页里移除 `@dsh-plugin/session-notify`(它同时是 profile 的一个 bundle)。
|
||||
## 提醒规则
|
||||
|
||||
## 平台说明与验证范围
|
||||
- **只在「运行中 → 空闲」的转变上提醒**:打开应用时已经在跑的会话只建立基线,不补发;历史里早已结束的会话不会被翻出来提醒。
|
||||
- **正在看的那个会话完成后不打扰**。
|
||||
- **子智能体的会话不单独提醒**,等它归属的主会话结束时才提醒。
|
||||
- **空白会话完成不提醒**。
|
||||
- **授权 / 提问如果出现的当下会话仍在运行,会先记下、等这一轮真正停下来再提醒**,不在模型还在跑的时候打扰你。
|
||||
- **节流**:1.5 秒内只投递一条,多个会话同时完成不会刷屏。
|
||||
- **完成提醒有 400ms 的确认窗口**:如果那一轮马上又跑起来,就不报了。
|
||||
- **同一会话的完成提醒会覆盖上一条**(通知带 `tag`),不叠加堆积。
|
||||
- **窗口不在前台时投递过的提醒,回到前台会补发一次轻弹窗**(30 分钟内有效)。
|
||||
- 提醒只在 DSH 运行、页面打开时产生:**DSH 完全退出期间结束的会话不会再补发通知**。
|
||||
|
||||
- **通道是跨平台统一的**:插件的提醒都通过页面(Electron 渲染进程)的 `Notification` 构造器发出,Windows 通知中心 / macOS 通知中心 / Linux 通知守护(libnotify、GNOME、KDE)都由系统把它转成原生通知;应用内轻弹窗是纯 DOM,与平台无关。
|
||||
- **宿主半拿不到系统通知**:DSH Desktop 的宿主进程是纯 Node 进程(不是 Electron 主进程),没有 Electron 的 `Notification` 可用,所以插件的所有提醒都在浏览器半产生——这也正是"三个平台一套代码"的原因。
|
||||
- **已验证**:Windows 上的安装、三个 slot 条目注册、以及 22 条投递规则(见下)的离线验证;设置行与轻弹窗的文案/交互按 DSH 自带的 toast 与 switch 组件对齐。
|
||||
- **未验证**:macOS 与 Linux 上的实际弹窗效果本机无法测试。结构上它们与 Windows 共用同一条通道、同一份代码,只有"权限被系统关闭时显示的开启路径"是分平台的。
|
||||
- 提醒只在 DSH 进程运行、页面打开时产生:**DSH 完全退出期间结束的会话不会再补发通知**。
|
||||
## 平台
|
||||
|
||||
## 行为细节(都已验证)
|
||||
|
||||
- **只有观测到「运行中 → 空闲」的转变才提醒**:打开应用时已经在跑的会话只建立基线,不补发;历史里早已结束的会话不会被翻出来提醒。
|
||||
- **子智能体会话不单独提醒**(`origin === 'subagent'`),归属它的主会话结束时才提醒。
|
||||
- **新会话(空白会话)完成不提醒**。
|
||||
- **授权/提问在会话仍在运行时被延后提醒**:先记下,等这一轮真正停下来再报,避免在模型还在跑的时候就打扰你。
|
||||
- **节流**:1.5 秒内只投递一条,多个会话同时完成不会刷屏;完成提醒前有 400ms 的确认窗口,如果那一轮马上又跑起来就不报。
|
||||
- **同一会话的完成提醒会覆盖上一条**(通知带 `tag`),不堆叠。
|
||||
- Windows / macOS / Linux 都支持,三个平台走同一条通知通道,行为一致;应用内轻弹窗与平台无关。
|
||||
- 当前环境不支持系统通知时(权限一行会显示「不可用」),提醒仍然以应用内轻弹窗的形式送达。
|
||||
- 系统通知被拒绝或发送失败时,插件会改用轻弹窗,并把原因写在插件页的权限 / 状态那一段,不会静默失败。
|
||||
|
||||
## 兼容性
|
||||
|
||||
基于 **DeepSeek Harness 0.2.0-rc.2** 编写,遵循 DSH 插件规范:`dsh.manifestVersion: 1`、`dsh.bundle.patch` 声明宿主行、`dsh.client` 声明 `platform: "web"` 的浏览器半。
|
||||
|
||||
依赖的都是稳定契约:
|
||||
|
||||
- 浏览器半只依赖 **slot 的标准 props**(`useSessions`、`useSessionStatus`)读取会话状态,这是 DSH 官方给插件读会话数据的方式;不轮询、不自己订阅会话事件、不读别的插件的 DOM;
|
||||
- 只往两个官方 slot 注册:`settings.general.item`(设置行)与 `shell.overlay`(两个条目:轻弹窗层 + 无渲染的观察器,内容永远是 `null`);
|
||||
- **不要**把"无渲染"条目放进 `sidebar.panellist`:该 slot 的宿主会把**每个条目的 id 当成一个左侧面板按钮**(`entriesOfSlot('sidebar.panellist')` → 面板列表,按钮文字取 `options.label ?? options.id`,条目本身作为图标内联渲染),放进去会在左侧多出一行空面板并挤坏侧边栏。本插件第一版踩过这个坑,现已改挂到通用浮层;
|
||||
- 样式只用主题 token,不 import 任何 `@deepseek-ai/dsh-client-*` 包(规范要求,也是渲染不被上游改动打断的前提);
|
||||
- 宿主半不声明 `inject`、不注册服务、不注册路由。
|
||||
|
||||
上游若改动 slot 名或 hook 名:注册会静默跳过而不是把页面弄坏,插件会退化成"不提醒";这类情况请按上面的契约名核对。
|
||||
|
||||
## 验证方式(开发记录)
|
||||
|
||||
`client.js` 是纯 JavaScript、浏览器端运行,可以在 Node 里用桩模块加载器评估并驱动:
|
||||
|
||||
- 模块接线:加载后返回的插件、`inject` 声明、注册集合(含"观察器绝不在 sidebar.* 里"这一条)、以及各组件在空状态 / 权限被拒 / 无 Notification API 下的渲染都不报错;
|
||||
- 投递规则:40 项断言覆盖上面"行为细节"里的每一条(完成提醒一次、当前会话不打扰、后台走系统通知、授权/提问各提醒一次、运行中延后、子会话跳过、历史不补发、开关生效、弹窗自动消失等)。
|
||||
需要 **DeepSeek Harness 0.2.0-rc.2 或更高**。
|
||||
|
||||
## License
|
||||
|
||||
|
||||
@@ -36,6 +36,8 @@ window.__ModuleLoader__.load({
|
||||
|
||||
/** Locale namespace owned by this package. */
|
||||
const NS = 'session-notify'
|
||||
/** This package's name: the plugin manager keys a bundle's configuration by it. */
|
||||
const PACKAGE_NAME = '@dsh-plugin/session-notify'
|
||||
/** Trigger ids shared by the store, the copy table, and the settings row. */
|
||||
const KINDS = ['completion', 'approval', 'question']
|
||||
/** Pending-interaction kinds the Harness itself renders, and this plugin serves. */
|
||||
@@ -47,6 +49,18 @@ window.__ModuleLoader__.load({
|
||||
/** In-app popup lifetime, and how many may stack. */
|
||||
const TOAST_DURATION_MS = 6000
|
||||
const TOAST_LIMIT = 3
|
||||
/** Notifications kept referenced, so a collection can never cancel a pending display. */
|
||||
const RAISED_LIMIT = 8
|
||||
/** Alerts carried by the system channel and still worth replaying in-app on return. */
|
||||
const REPLAY_LIMIT = 8
|
||||
/** How long a system notification outlives the moment the user comes back. */
|
||||
const REPLAY_TTL_MS = 30 * 60 * 1000
|
||||
/**
|
||||
* A confirmed banner that the user came back to within this window is treated as
|
||||
* seen: the desktop notification is still on screen at that moment, so replaying
|
||||
* it in-app would be a duplicate rather than a reminder.
|
||||
*/
|
||||
const REPLAY_QUIET_MS = 20 * 1000
|
||||
|
||||
const zh = {
|
||||
'notification.completion': '会话已完成',
|
||||
@@ -71,7 +85,8 @@ window.__ModuleLoader__.load({
|
||||
'settings.permission.hint.mac': '系统设置 → 通知 → DeepSeek Harness',
|
||||
'settings.permission.hint.linux': '在桌面环境的通知设置(GNOME / KDE)中允许 DeepSeek Harness',
|
||||
'settings.action.allow': '允许通知',
|
||||
'settings.action.test': '测试通知',
|
||||
'settings.action.testSystem': '测试系统通知',
|
||||
'settings.action.testAny': '测试提醒',
|
||||
'settings.action.unsupported': '不可用',
|
||||
'settings.permission.promptFailed': '无法请求通知权限:{message}',
|
||||
'settings.health.watching': '正在监听会话状态',
|
||||
@@ -82,6 +97,27 @@ window.__ModuleLoader__.load({
|
||||
'settings.kind.completion': '完成',
|
||||
'settings.kind.approval': '授权',
|
||||
'settings.kind.question': '提问',
|
||||
'config.section.kinds': '提醒内容',
|
||||
'config.section.permission': '系统通知权限',
|
||||
'config.section.status': '运行状态',
|
||||
'config.intro': '提醒都从当前页面发出:窗口不在前台时是系统通知,窗口在前台时是这里的轻弹窗。',
|
||||
'config.saveNote': '开关保存在浏览器本地,重装插件不会丢失。',
|
||||
'config.testHint': '这里的按钮直接走系统通知通道,用来验证系统通知本身是否可用(窗口在前台也照发)。',
|
||||
'config.testAny': '测试提醒',
|
||||
'config.testSystem': '测试系统通知',
|
||||
'config.diag.window': '窗口状态',
|
||||
'config.diag.inFront': '在前台(会走轻弹窗)',
|
||||
'config.diag.away': '不在前台(会走系统通知)',
|
||||
'config.diag.last': '最近一次投递',
|
||||
'config.diag.none': '还没有投递过',
|
||||
'config.diag.systemShown': '系统通知(系统已确认弹出)',
|
||||
'config.diag.systemUnconfirmed': '系统通知(系统没有回报,回到窗口时补发轻弹窗)',
|
||||
'config.diag.systemFailed': '系统通知没弹出来,回到窗口时补发轻弹窗',
|
||||
'config.diag.replayDelivery': '应用内轻弹窗(回到窗口时补发)',
|
||||
'config.diag.popup': '应用内轻弹窗',
|
||||
'config.diag.refused': '系统通知被拒绝,改用了轻弹窗',
|
||||
'config.diag.replay': '等你回到窗口时补发:{count} 条',
|
||||
'config.diag.replayNone': '没有待补发的提醒',
|
||||
}
|
||||
const en = {
|
||||
'notification.completion': 'Conversation finished',
|
||||
@@ -106,7 +142,8 @@ window.__ModuleLoader__.load({
|
||||
'settings.permission.hint.mac': 'System Settings → Notifications → DeepSeek Harness',
|
||||
'settings.permission.hint.linux': 'Allow DeepSeek Harness in your desktop notification settings (GNOME / KDE)',
|
||||
'settings.action.allow': 'Allow notifications',
|
||||
'settings.action.test': 'Test notification',
|
||||
'settings.action.testSystem': 'Test system notification',
|
||||
'settings.action.testAny': 'Test alert',
|
||||
'settings.action.unsupported': 'Unavailable',
|
||||
'settings.permission.promptFailed': 'Could not request notification permission: {message}',
|
||||
'settings.health.watching': 'Watching session status',
|
||||
@@ -117,42 +154,69 @@ window.__ModuleLoader__.load({
|
||||
'settings.kind.completion': 'Finished',
|
||||
'settings.kind.approval': 'Approval',
|
||||
'settings.kind.question': 'Questions',
|
||||
'config.section.kinds': 'What to notify about',
|
||||
'config.section.permission': 'System notification permission',
|
||||
'config.section.status': 'Status',
|
||||
'config.intro': 'Every alert comes from this page: a system notification while the window is in the background, the light popup here while it is in the foreground.',
|
||||
'config.saveNote': 'The switches are stored in this browser and survive reinstalling the plugin.',
|
||||
'config.testHint': 'The buttons here go straight to the system channel, so you can verify it on its own (they fire even while the window is in front).',
|
||||
'config.testAny': 'Test alert',
|
||||
'config.testSystem': 'Test system notification',
|
||||
'config.diag.window': 'Window',
|
||||
'config.diag.inFront': 'in front (popup is used)',
|
||||
'config.diag.away': 'not in front (system notification is used)',
|
||||
'config.diag.last': 'Last delivery',
|
||||
'config.diag.none': 'nothing delivered yet',
|
||||
'config.diag.systemShown': 'system notification (confirmed on screen)',
|
||||
'config.diag.systemUnconfirmed': 'system notification (no confirmation, replayed in-app on return)',
|
||||
'config.diag.systemFailed': 'system notification never appeared, replayed in-app on return',
|
||||
'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',
|
||||
}
|
||||
|
||||
/**
|
||||
* Every declaration below belongs to this package. The popup copies the
|
||||
* shipped toast surface (a fixed entry in the frame-wide overlay, the
|
||||
* `--dsw-alias-toast-bg` / `--dsw-alias-toast-label` pair, `--dsw-radius-lg`,
|
||||
* `--dsw-shadow-lv3`), the switch copies `Switch.module.css` behavior and
|
||||
* proportion, and the settings row copies the General-section row pattern.
|
||||
* `--dsw-shadow-lv3`) and adds a title line above the text; the switch copies
|
||||
* `Switch.module.css` behavior and proportion; the configuration sections
|
||||
* follow the Plugin Manager page's own section rhythm (a column, 32px apart).
|
||||
* Class names are renamed under `dsn-`; only the popup glyphs carry their own
|
||||
* artwork colors.
|
||||
*/
|
||||
const CSS = `
|
||||
.dsn-stack{position:fixed;top:40px;right:24px;z-index:1100;display:flex;flex-direction:column;align-items:flex-end;gap:8px;pointer-events:none}
|
||||
@media (max-width:520px){.dsn-stack{right:12px}}
|
||||
.dsn-toast{box-sizing:border-box;pointer-events:auto;display:flex;align-items:center;gap:10px;width:max-content;max-width:min(420px,calc(100vw - 48px));padding:12px 16px;border-radius:var(--dsw-radius-lg);background:var(--dsw-alias-toast-bg);color:var(--dsw-alias-toast-label);font-size:14px;line-height:22px;box-shadow:var(--dsw-shadow-lv3);animation:dsn-toast-in 160ms ease-out}
|
||||
.dsn-toast{box-sizing:border-box;pointer-events:auto;display:flex;align-items:flex-start;gap:10px;width:max-content;max-width:min(420px,calc(100vw - 48px));padding:12px 12px 12px 16px;border-radius:var(--dsw-radius-lg);background:var(--dsw-alias-toast-bg);color:var(--dsw-alias-toast-label);font-size:14px;line-height:22px;box-shadow:var(--dsw-shadow-lv3);animation:dsn-toast-in 160ms ease-out}
|
||||
@keyframes dsn-toast-in{from{opacity:0;transform:translateX(8px)}to{opacity:1;transform:translateX(0)}}
|
||||
@media (prefers-reduced-motion: reduce){.dsn-toast{animation:none}}
|
||||
.dsn-toast-icon{display:grid;place-items:center;flex:none;color:var(--dsw-alias-state-warn-label)}
|
||||
.dsn-toast-icon{display:grid;place-items:center;flex:none;height:22px;color:var(--dsw-alias-state-warn-label)}
|
||||
.dsn-toast-icon.is-completion{color:var(--dsw-alias-state-success-primary)}
|
||||
.dsn-toast-icon.is-question{color:var(--dsw-alias-brand-primary)}
|
||||
.dsn-toast-text{min-width:0}
|
||||
.dsn-toast-action{padding:0;border:0;background:none;color:var(--dsw-static-deepseek-400);font:inherit;cursor:pointer;margin-inline:3px}
|
||||
.dsn-toast-action:hover{opacity:.8}
|
||||
.dsn-toast-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px}
|
||||
.dsn-toast-title{font-weight:500;font-size:14px;line-height:22px}
|
||||
.dsn-toast-desc{color:var(--dsw-alias-toast-label);opacity:.8;font-size:13px;line-height:20px;overflow-wrap:break-word}
|
||||
.dsn-toast-actions{display:flex;align-items:center;gap:2px;flex:none}
|
||||
.dsn-toast-action{display:inline-flex;align-items:center;height:28px;padding:0 8px;border:0;border-radius:var(--dsw-radius-sm);background:none;color:var(--dsw-static-deepseek-400);font:inherit;font-size:13px;line-height:20px;cursor:pointer}
|
||||
.dsn-toast-action:hover{background:var(--dsw-alias-interactive-bg-hover)}
|
||||
.dsn-toast-action:focus-visible{outline:var(--dsw-focus-ring-width) solid var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary));outline-offset:2px}
|
||||
.dsn-toast-close{flex:none;display:inline-flex;align-items:center;justify-content:center;width:18px;height:18px;border:0;border-radius:var(--dsw-radius-xs);background:transparent;color:var(--dsw-alias-toast-label);opacity:.7;cursor:pointer}
|
||||
.dsn-toast-close:hover{opacity:1}
|
||||
.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-row{border-bottom:.5px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:16px 0;display:flex}
|
||||
.dsn-row-text{flex-direction:column;flex:1;gap:4px;min-width:0;padding-right:48px;display:flex}
|
||||
.dsn-row-title{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:400;line-height:22px}
|
||||
.dsn-row-desc{color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:400;line-height:18px}
|
||||
.dsn-status{color:var(--dsw-alias-label-secondary);font-size:12px;line-height:18px}
|
||||
.dsn-status + .dsn-status,.dsn-row-desc + .dsn-status,.dsn-kinds + .dsn-status{margin-top:8px}
|
||||
.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-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-kinds{display:flex;align-items:center;gap:10px;flex-wrap:wrap;margin-top:10px;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px}
|
||||
.dsn-kind{display:inline-flex;align-items:center;gap:6px;color:var(--dsw-alias-label-secondary)}
|
||||
.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}
|
||||
@@ -291,13 +355,33 @@ window.__ModuleLoader__.load({
|
||||
return 'default'
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether the Harness window is somewhere the user cannot see the app.
|
||||
*
|
||||
* Two independent browser facts are consulted, and ANY of them counts as "not
|
||||
* in the foreground": the page's visibility and the document's focus. They are
|
||||
* read at delivery time rather than remembered from an event, because a missed
|
||||
* blur in the desktop shell made this plugin believe the window was in front
|
||||
* and swallow the alert.
|
||||
* @returns whether the alert must go to the system notification channel.
|
||||
*/
|
||||
function windowIsAway() {
|
||||
try {
|
||||
if (document.visibilityState === 'hidden') return true
|
||||
} catch {
|
||||
/* an unreadable visibility state leaves the focus fact */
|
||||
}
|
||||
try {
|
||||
if (typeof document.hasFocus === 'function') return !document.hasFocus()
|
||||
} catch {
|
||||
/* an unreadable focus state leaves the default below */
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
/** Read the window's live focus state rather than a cached value. */
|
||||
function currentFocus() {
|
||||
try {
|
||||
return typeof document.hasFocus === 'function' ? document.hasFocus() : true
|
||||
} catch {
|
||||
return true
|
||||
}
|
||||
return !windowIsAway()
|
||||
}
|
||||
|
||||
/** Focus the window without letting a refusal stop the navigation. */
|
||||
@@ -375,10 +459,35 @@ window.__ModuleLoader__.load({
|
||||
return preview(interaction.displayReason?.text ?? interaction.reason?.text ?? '')
|
||||
}
|
||||
|
||||
/**
|
||||
* Register this package's dictionaries with the locale service.
|
||||
*
|
||||
* Without this the service has no entry for the namespace and every
|
||||
* `locale.bind(NS)` lookup answers with the key itself, so the settings row
|
||||
* shows `settings.title` instead of its copy. The typed form takes every
|
||||
* shipped locale in one call, and the older single-locale form stays
|
||||
* supported as a fallback. Registration bumps the locale revision, so
|
||||
* already-rendered entries pick the copy up without a reload.
|
||||
* @param locale - the locale service, or undefined when this profile has none.
|
||||
* @returns a disposer for whichever registrations were installed.
|
||||
*/
|
||||
function registerDictionaries(locale) {
|
||||
if (locale === undefined || typeof locale.register !== 'function') return () => {}
|
||||
const dictionaries = { zh, en }
|
||||
try {
|
||||
return locale.register(NS, dictionaries)
|
||||
} catch {
|
||||
const disposers = Object.entries(dictionaries).map(([id, dict]) => locale.register(NS, id, dict))
|
||||
return () => {
|
||||
for (const dispose of disposers) dispose?.()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Build a translate function for one locale service: the service's own bound
|
||||
* namespace first, then the current language's dictionary, then the key
|
||||
* itself, so a missing seat degrades copy instead of rendering.
|
||||
* namespace first, then this package's dictionaries, then the key itself, so
|
||||
* a missing seat degrades copy instead of rendering.
|
||||
* @param locale - the locale service, or undefined when this profile has none.
|
||||
* @returns a translate function with `{ name }` interpolation.
|
||||
*/
|
||||
@@ -387,7 +496,10 @@ window.__ModuleLoader__.load({
|
||||
if (locale !== undefined && typeof locale.bind === 'function') {
|
||||
try {
|
||||
const bound = locale.bind(NS)
|
||||
if (typeof bound === 'function') return bound(key, params)
|
||||
if (typeof bound === 'function') {
|
||||
const translated = bound(key, params)
|
||||
if (typeof translated === 'string' && translated !== key) return translated
|
||||
}
|
||||
} catch {
|
||||
/* a locale service without this namespace still renders the fallback */
|
||||
}
|
||||
@@ -395,7 +507,7 @@ window.__ModuleLoader__.load({
|
||||
let language = ''
|
||||
try {
|
||||
const snapshot = locale?.getSnapshot?.()
|
||||
language = String(snapshot?.language ?? snapshot?.locale ?? snapshot?.id ?? '')
|
||||
language = String(snapshot?.active ?? '')
|
||||
} catch {
|
||||
language = ''
|
||||
}
|
||||
@@ -408,6 +520,42 @@ window.__ModuleLoader__.load({
|
||||
}
|
||||
}
|
||||
|
||||
/** Storage key for this package's own preferences. */
|
||||
const STORAGE_KEY = 'dsh-plugin/session-notify'
|
||||
|
||||
/**
|
||||
* Read this package's stored trigger switches.
|
||||
*
|
||||
* These are browser preferences rather than cordis configuration, so they live
|
||||
* in this origin's own storage instead of the profile's patch file: the plugin
|
||||
* writes nothing into DSH's configuration, and every read is defensive because
|
||||
* storage can be unavailable or hold something an older version wrote.
|
||||
* @returns the stored switches, defaulting to everything on.
|
||||
*/
|
||||
function readStoredKinds() {
|
||||
const kinds = { completion: true, approval: true, question: true }
|
||||
try {
|
||||
const raw = globalThis.localStorage?.getItem(STORAGE_KEY)
|
||||
if (typeof raw !== 'string' || raw === '') return kinds
|
||||
const stored = JSON.parse(raw)
|
||||
for (const kind of KINDS) {
|
||||
if (typeof stored?.[kind] === 'boolean') kinds[kind] = stored[kind]
|
||||
}
|
||||
} catch {
|
||||
/* unreadable or foreign storage keeps the defaults */
|
||||
}
|
||||
return kinds
|
||||
}
|
||||
|
||||
/** Store one trigger switch, ignoring storage that refuses to write. */
|
||||
function writeStoredKinds(kinds) {
|
||||
try {
|
||||
globalThis.localStorage?.setItem(STORAGE_KEY, JSON.stringify(kinds))
|
||||
} catch {
|
||||
/* a refused write leaves the switches live for this page only */
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Install the plugin.
|
||||
* @param ctx - Client root context providing `slots` and `locale`.
|
||||
@@ -418,13 +566,14 @@ window.__ModuleLoader__.load({
|
||||
|
||||
const store = createStore({
|
||||
permission: notificationPermission(),
|
||||
kinds: { completion: true, approval: true, question: true },
|
||||
kinds: readStoredKinds(),
|
||||
toasts: [],
|
||||
promptError: '',
|
||||
health: { state: 'starting', message: '' },
|
||||
lastDelivery: null,
|
||||
})
|
||||
const notify = (message) => {
|
||||
report(`session-notify: ${message}`)
|
||||
report(message)
|
||||
}
|
||||
/** Every component translates through this: the slot's own seat when the owner supplies one, else the locale service. */
|
||||
const seatFor = (props) => (typeof props.t === 'function' ? props.t : t)
|
||||
@@ -436,10 +585,14 @@ window.__ModuleLoader__.load({
|
||||
settleTimer: 0,
|
||||
lastDelivery: 0,
|
||||
toastSeq: 0,
|
||||
deliverySeq: 0,
|
||||
/** System notifications this page still holds open, so nothing collects them mid-display. */
|
||||
raised: new Set(),
|
||||
/** Alerts the user has not been able to see yet, replayed in-app when the window returns. */
|
||||
replay: [],
|
||||
live: {
|
||||
list: undefined,
|
||||
status: undefined,
|
||||
focus: true,
|
||||
},
|
||||
}
|
||||
const timers = new Map()
|
||||
@@ -511,13 +664,18 @@ window.__ModuleLoader__.load({
|
||||
timers.delete(id)
|
||||
}
|
||||
|
||||
/** Show one light in-app popup. */
|
||||
/**
|
||||
* Show one light in-app popup: the trigger as the title, the conversation
|
||||
* and its detail as the description, so the heading says what happened and
|
||||
* the line under it says where.
|
||||
*/
|
||||
const showToast = (candidate) => {
|
||||
const notice = copyFor(candidate)
|
||||
state.toastSeq += 1
|
||||
const toast = {
|
||||
id: `dsn-${String(state.toastSeq)}`,
|
||||
kind: notice.kind,
|
||||
title: notice.title,
|
||||
body: notice.body,
|
||||
sessionId: candidate.sessionId,
|
||||
}
|
||||
@@ -545,12 +703,48 @@ window.__ModuleLoader__.load({
|
||||
}
|
||||
}
|
||||
|
||||
/** Raise one system notification, tolerating every refusal a browser may give. */
|
||||
/**
|
||||
* The system-notification channel's own answer about one notification.
|
||||
*
|
||||
* A browser reports the platform's verdict asynchronously: `show` means the
|
||||
* notification reached the desktop, `error` means the platform refused it, and
|
||||
* silence means neither answer arrived. That third case is the one that used to
|
||||
* lose alerts silently, so it is recorded rather than assumed to be a success.
|
||||
* @param monitor - the record returned by {@link systemNotify} for this notification.
|
||||
* @param shown - `true` when the platform displayed it, `false` when it refused.
|
||||
*/
|
||||
const confirmDelivery = (monitor, shown) => {
|
||||
if (monitor === null || monitor === undefined || typeof monitor !== 'object') return
|
||||
monitor.shown = shown
|
||||
const snapshot = store.getSnapshot()
|
||||
const last = snapshot.lastDelivery
|
||||
if (last === null || last === undefined || last.monitor !== monitor || last.shown === shown) return
|
||||
store.set({ ...snapshot, lastDelivery: { ...last, shown } })
|
||||
}
|
||||
|
||||
/** Hold one raised notification open, bounded, so it cannot be collected while pending. */
|
||||
const keepRaised = (notification) => {
|
||||
state.raised.add(notification)
|
||||
while (state.raised.size > RAISED_LIMIT) {
|
||||
const oldest = state.raised.values().next().value
|
||||
if (oldest === undefined) break
|
||||
state.raised.delete(oldest)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Raise one system notification, tolerating every refusal a browser may give,
|
||||
* and report what the platform said about it.
|
||||
* @returns a record whose `outcome` is the channel's verdict (`raised`,
|
||||
* `permission`, `unsupported`, or `threw`) and whose `shown` is filled in
|
||||
* later by {@link confirmDelivery} — `true` displayed, `false` refused,
|
||||
* `undefined` while the platform has said nothing.
|
||||
*/
|
||||
const systemNotify = (candidate, force) => {
|
||||
const Ctor = globalThis.Notification
|
||||
const permission = notificationPermission()
|
||||
if (permission === 'unsupported') return false
|
||||
if (!force && permission !== 'granted') return false
|
||||
if (permission === 'unsupported') return { outcome: 'unsupported' }
|
||||
if (!force && permission !== 'granted') return { outcome: 'permission' }
|
||||
try {
|
||||
const notice = copyFor(candidate)
|
||||
const options = {
|
||||
@@ -560,7 +754,20 @@ window.__ModuleLoader__.load({
|
||||
}
|
||||
if (systemIcon !== undefined) options.icon = systemIcon
|
||||
const notification = new Ctor(notice.title, options)
|
||||
const record = { outcome: 'raised', notice, shown: undefined }
|
||||
keepRaised(notification)
|
||||
notification.onshow = () => {
|
||||
confirmDelivery(record, true)
|
||||
}
|
||||
notification.onerror = (event) => {
|
||||
confirmDelivery(record, false)
|
||||
notify(`system notification was refused: ${String(event?.message ?? 'unknown')}`)
|
||||
}
|
||||
notification.onclose = () => {
|
||||
state.raised.delete(notification)
|
||||
}
|
||||
notification.onclick = () => {
|
||||
dropReplay(candidate)
|
||||
focusWindow()
|
||||
openSession(candidate.sessionId)
|
||||
try {
|
||||
@@ -569,13 +776,70 @@ window.__ModuleLoader__.load({
|
||||
/* close is best effort on every platform */
|
||||
}
|
||||
}
|
||||
return true
|
||||
return record
|
||||
} catch (error) {
|
||||
notify(`system notification failed: ${text(error)}`)
|
||||
return false
|
||||
return { outcome: 'threw' }
|
||||
}
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------ replay
|
||||
|
||||
/** Forget one queued replay: the user has just answered that alert in the system channel. */
|
||||
const dropReplay = (candidate) => {
|
||||
const next = state.replay.filter((entry) => (
|
||||
entry.candidate.sessionId !== candidate.sessionId || entry.candidate.kind !== candidate.kind
|
||||
))
|
||||
if (next.length === state.replay.length) return
|
||||
state.replay = next
|
||||
publish()
|
||||
}
|
||||
|
||||
/**
|
||||
* Keep one away-channel alert for an in-app replay.
|
||||
*
|
||||
* A desktop notification raised while nobody is looking at the machine is
|
||||
* easy to miss: its banner lives a few seconds, its history lives in the
|
||||
* system's own notification centre, which the user may never open, and a
|
||||
* refused display leaves no trace at all on the page. The alert is therefore
|
||||
* replayed as a light in-app popup as soon as the window is back in the
|
||||
* foreground, except when the platform confirmed the banner and the user was
|
||||
* back within {@link REPLAY_QUIET_MS} — then the banner is still on screen and
|
||||
* a second surface would only be noise. Entries older than
|
||||
* {@link REPLAY_TTL_MS} are dropped instead of waiting for a user who has
|
||||
* moved on.
|
||||
* @param candidate - the alert to keep for a replay.
|
||||
* @param monitor - the system channel's own record, so its confirmation can be read later.
|
||||
*/
|
||||
const holdForReplay = (candidate, monitor) => {
|
||||
const now = Date.now()
|
||||
state.replay = [
|
||||
...state.replay.filter((entry) => (
|
||||
entry.candidate.sessionId !== candidate.sessionId || entry.candidate.kind !== candidate.kind
|
||||
)),
|
||||
{ candidate, at: now, monitor },
|
||||
].slice(-REPLAY_LIMIT)
|
||||
publish()
|
||||
}
|
||||
|
||||
/** Show every away-channel alert the user has not had a chance to see yet. */
|
||||
const flushReplay = () => {
|
||||
if (state.replay.length === 0) return
|
||||
const now = Date.now()
|
||||
const waiting = state.replay
|
||||
state.replay = []
|
||||
const due = waiting.filter((entry) => {
|
||||
if (now - entry.at > REPLAY_TTL_MS) return false
|
||||
// A banner that the platform confirmed and that is still inside its own
|
||||
// visible window has already told the user; do not say it twice.
|
||||
return !(entry.monitor?.shown === true && now - entry.at <= REPLAY_QUIET_MS)
|
||||
})
|
||||
const shown = due.slice(-TOAST_LIMIT)
|
||||
for (const entry of shown) showToast(entry.candidate)
|
||||
if (shown.length > 0) recordDelivery('replay', shown[shown.length - 1].candidate)
|
||||
else publish()
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------- delivery
|
||||
|
||||
/** Whether the user is looking at this exact conversation right now. */
|
||||
@@ -588,6 +852,37 @@ window.__ModuleLoader__.load({
|
||||
return false
|
||||
}
|
||||
|
||||
/**
|
||||
* Record what actually happened to the newest alert.
|
||||
*
|
||||
* Everything on the delivery path used to fail invisibly: the alert simply
|
||||
* never appeared, with no way to tell a wrong channel decision from a
|
||||
* refused constructor. The config page shows this record, so the next
|
||||
* question ("did it even try?") has an answer.
|
||||
*
|
||||
* The time is the user's own clock, not UTC: a log line the reader has to
|
||||
* translate by eight hours is worse than no log line.
|
||||
* @param outcome - which channel carried the alert, or why it fell back.
|
||||
* @param candidate - the alert being recorded.
|
||||
* @param monitor - the system channel's own record, when that is the channel.
|
||||
* @returns the stored record, so a later platform answer can update it.
|
||||
*/
|
||||
const recordDelivery = (outcome, candidate, monitor) => {
|
||||
state.deliverySeq += 1
|
||||
const now = new Date()
|
||||
const pad = (value) => String(value).padStart(2, '0')
|
||||
const record = {
|
||||
seq: state.deliverySeq,
|
||||
outcome,
|
||||
at: `${pad(now.getHours())}:${pad(now.getMinutes())}:${pad(now.getSeconds())}`,
|
||||
title: copyFor(candidate).title,
|
||||
shown: monitor?.shown,
|
||||
monitor,
|
||||
}
|
||||
store.set({ ...store.getSnapshot(), lastDelivery: record })
|
||||
return record
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether a queued candidate is still worth delivering. Read from the LIVE
|
||||
* snapshot rather than the one captured when the transition was seen: a
|
||||
@@ -607,9 +902,15 @@ window.__ModuleLoader__.load({
|
||||
|
||||
/**
|
||||
* Deliver one candidate through exactly one channel: the system
|
||||
* notification while the window is in the background, the light popup while
|
||||
* it is in the foreground, and nothing at all for the conversation on
|
||||
* screen.
|
||||
* notification while the window is away, the light popup while it is in
|
||||
* front, and nothing at all for the conversation on screen.
|
||||
*
|
||||
* The channel decision reads the window state right here, at delivery time,
|
||||
* instead of trusting the state the observer last remembered — that is what
|
||||
* an unreported blur used to defeat. An alert that leaves through the system
|
||||
* channel is additionally held for an in-app replay, because a desktop banner
|
||||
* raised while nobody is looking at the machine is a notification the user
|
||||
* never actually receives.
|
||||
*/
|
||||
const deliver = (candidate, ignoreThrottle) => {
|
||||
if (ignoreThrottle !== true) {
|
||||
@@ -617,23 +918,37 @@ window.__ModuleLoader__.load({
|
||||
if (now - state.lastDelivery < THROTTLE_MS) return
|
||||
state.lastDelivery = now
|
||||
}
|
||||
if (state.live.focus) {
|
||||
if (!isOnScreen(candidate.sessionId, state.live.list)) showToast(candidate)
|
||||
if (!windowIsAway()) {
|
||||
if (isOnScreen(candidate.sessionId, state.live.list)) return
|
||||
showToast(candidate)
|
||||
recordDelivery('popup', candidate)
|
||||
return
|
||||
}
|
||||
if (systemNotify(candidate, candidate.test === true)) return
|
||||
if (candidate.test === true) showToast(candidate)
|
||||
const result = systemNotify(candidate, candidate.test === true)
|
||||
if (result.outcome === 'raised') {
|
||||
recordDelivery('system', candidate, result)
|
||||
if (candidate.test !== true) holdForReplay(candidate, result)
|
||||
return
|
||||
}
|
||||
// A test alert still has to reach the user, and so does a real one when
|
||||
// the system channel refuses: the popup is the channel that remains.
|
||||
showToast(candidate)
|
||||
recordDelivery(`system-refused-${result.outcome}`, candidate)
|
||||
}
|
||||
|
||||
/**
|
||||
* Take the delivery decision on a later tick, from the freshest state.
|
||||
*
|
||||
* One candidate per tick keeps the throttle meaningful, and anything still
|
||||
* queued arms its own follow-up tick — a burst used to leave every candidate
|
||||
* after the first stranded in the queue with no timer to flush it.
|
||||
*/
|
||||
const flushSettle = () => {
|
||||
state.settleTimer = 0
|
||||
if (disposed) return
|
||||
const candidate = state.pending.shift()
|
||||
if (disposed || candidate === undefined) return
|
||||
if (!stillWorth(candidate)) return
|
||||
deliver(candidate, false)
|
||||
if (candidate !== undefined && stillWorth(candidate)) deliver(candidate, false)
|
||||
if (state.pending.length > 0) state.settleTimer = setTimeout(() => flushSettle(), SETTLE_MS)
|
||||
}
|
||||
|
||||
/** Hold one candidate for the settle tick, collapsing a burst onto one timer. */
|
||||
@@ -649,11 +964,13 @@ window.__ModuleLoader__.load({
|
||||
* One derivation pass over the client's own session state: remember the
|
||||
* freshest snapshot for the settle tick, compare it against what this page
|
||||
* already observed, emit at most one candidate per transition, and let the
|
||||
* settle tick decide delivery.
|
||||
* settle tick decide delivery. The window state is deliberately NOT captured
|
||||
* here — the delivery reads it fresh, because it can change inside the
|
||||
* settle window.
|
||||
*/
|
||||
const observe = (focus, list, status) => {
|
||||
const observe = (list, status) => {
|
||||
if (list === undefined || status === undefined) return
|
||||
state.live = { list, status, focus }
|
||||
state.live = { list, status }
|
||||
const kinds = store.getSnapshot().kinds
|
||||
for (const sessionId of Object.keys(list.byId ?? {})) {
|
||||
const summary = list.byId[sessionId]
|
||||
@@ -713,18 +1030,36 @@ window.__ModuleLoader__.load({
|
||||
|
||||
// --------------------------------------------------------------- actions
|
||||
|
||||
/** Raise one test notification through the channel the current state selects. */
|
||||
/** Build one test alert that skips the throttle and the "on screen" rule. */
|
||||
const testCandidate = (title) => ({
|
||||
kind: 'completion',
|
||||
sessionId: 'test',
|
||||
title,
|
||||
detail: '',
|
||||
pendingKind: '',
|
||||
test: true,
|
||||
})
|
||||
|
||||
/**
|
||||
* Raise one test alert through whichever channel the window state selects.
|
||||
* Verified from the config page, where the user is looking at the app, so it
|
||||
* normally lands in the popup — the way to prove the system channel is to
|
||||
* press the button in a channel-specific test instead.
|
||||
*/
|
||||
const sendTest = () => {
|
||||
const candidate = {
|
||||
kind: 'completion',
|
||||
sessionId: 'test',
|
||||
title: t('settings.title'),
|
||||
detail: '',
|
||||
pendingKind: '',
|
||||
test: true,
|
||||
deliver(testCandidate(t('config.testAny')), true)
|
||||
}
|
||||
|
||||
/** Raise the test alert on the system channel specifically, whatever the focus is. */
|
||||
const sendTestSystem = () => {
|
||||
const candidate = testCandidate(t('config.testSystem'))
|
||||
const result = systemNotify(candidate, true)
|
||||
if (result.outcome === 'raised') {
|
||||
recordDelivery('system', candidate, result)
|
||||
return
|
||||
}
|
||||
if (!currentFocus() && notificationPermission() === 'granted' && systemNotify(candidate, true)) return
|
||||
showToast(candidate)
|
||||
recordDelivery(`system-refused-${result.outcome}`, candidate)
|
||||
}
|
||||
|
||||
/** Request notification permission inside a user gesture, then report the outcome. */
|
||||
@@ -752,10 +1087,12 @@ window.__ModuleLoader__.load({
|
||||
if (notificationPermission() === 'granted') sendTest()
|
||||
}
|
||||
|
||||
/** Toggle one trigger. */
|
||||
/** Toggle one trigger and remember the choice. */
|
||||
const setKindEnabled = (kind, enabled) => {
|
||||
const snapshot = store.getSnapshot()
|
||||
store.set({ ...snapshot, kinds: { ...snapshot.kinds, [kind]: enabled } })
|
||||
const kinds = { ...snapshot.kinds, [kind]: enabled }
|
||||
writeStoredKinds(kinds)
|
||||
store.set({ ...snapshot, kinds })
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------- components
|
||||
@@ -765,21 +1102,27 @@ window.__ModuleLoader__.load({
|
||||
return React.useSyncExternalStore(source.subscribe, source.getSnapshot, source.getSnapshot)
|
||||
}
|
||||
|
||||
/** The window's focus state as a React value, kept current by the DOM's own events. */
|
||||
function useFocus() {
|
||||
/**
|
||||
* Subscribe to every browser signal that says whether the app is visible:
|
||||
* the window's focus events and the document's visibility change. The value
|
||||
* itself is a boolean, so the observer re-renders once per transition.
|
||||
*/
|
||||
function useWindowState() {
|
||||
const subscribe = React.useCallback((listener) => {
|
||||
try {
|
||||
window.addEventListener('focus', listener)
|
||||
window.addEventListener('blur', listener)
|
||||
document.addEventListener('visibilitychange', listener)
|
||||
} catch {
|
||||
return () => {}
|
||||
}
|
||||
return () => {
|
||||
window.removeEventListener('focus', listener)
|
||||
window.removeEventListener('blur', listener)
|
||||
document.removeEventListener('visibilitychange', listener)
|
||||
}
|
||||
}, [])
|
||||
return React.useSyncExternalStore(subscribe, currentFocus, () => true)
|
||||
return React.useSyncExternalStore(subscribe, () => !windowIsAway(), () => true)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -787,9 +1130,13 @@ window.__ModuleLoader__.load({
|
||||
* how a plugin reaches the session hooks without occupying visible UI. It
|
||||
* renders `null`, and any failure in its own derivation is contained here so
|
||||
* a slot entry can never crash.
|
||||
*
|
||||
* It subscribes to the window state only so a foreground/background change
|
||||
* re-derives promptly; the delivery itself re-reads that state, so a missed
|
||||
* event can no longer pick the wrong channel.
|
||||
*/
|
||||
function NotifyObserver(props) {
|
||||
const focus = useFocus()
|
||||
useWindowState()
|
||||
const useSessions = props.useSessions
|
||||
const useSessionStatus = props.useSessionStatus
|
||||
const select = React.useCallback((snapshot) => snapshot, [])
|
||||
@@ -805,7 +1152,7 @@ window.__ModuleLoader__.load({
|
||||
applyHealth(store, { state: 'starting', message: '' })
|
||||
return
|
||||
}
|
||||
observe(focus, list, status)
|
||||
observe(list, status)
|
||||
applyHealth(store, { state: 'watching', message: '' })
|
||||
} catch (error) {
|
||||
applyHealth(store, { state: 'error', message: text(error) })
|
||||
@@ -845,30 +1192,60 @@ window.__ModuleLoader__.load({
|
||||
onMouseLeave: () => props.arm(toast.id),
|
||||
},
|
||||
h('span', { className: `dsn-toast-icon is-${toast.kind}` }, h(KindIcon, { kind: toast.kind, size: 16 })),
|
||||
h('span', { className: 'dsn-toast-text' }, toast.body),
|
||||
h('button', {
|
||||
type: 'button',
|
||||
className: 'dsn-toast-action',
|
||||
onClick: () => {
|
||||
props.dismiss(toast.id)
|
||||
props.open(toast.sessionId)
|
||||
},
|
||||
}, tr('toast.view')),
|
||||
h('button', {
|
||||
type: 'button',
|
||||
className: 'dsn-toast-close',
|
||||
'aria-label': tr('toast.dismiss'),
|
||||
onClick: () => props.dismiss(toast.id),
|
||||
}, h(CloseIcon, { size: 12 }))))))
|
||||
h('div', { className: 'dsn-toast-text' },
|
||||
h('div', { className: 'dsn-toast-title' }, toast.title),
|
||||
h('div', { className: 'dsn-toast-desc' }, toast.body)),
|
||||
h('div', { className: 'dsn-toast-actions' },
|
||||
h('button', {
|
||||
type: 'button',
|
||||
className: 'dsn-toast-action',
|
||||
onClick: () => {
|
||||
props.dismiss(toast.id)
|
||||
props.open(toast.sessionId)
|
||||
},
|
||||
}, tr('toast.view')),
|
||||
h('button', {
|
||||
type: 'button',
|
||||
className: 'dsn-toast-close',
|
||||
'aria-label': tr('toast.dismiss'),
|
||||
onClick: () => props.dismiss(toast.id),
|
||||
}, h(CloseIcon, { size: 14 })))))))
|
||||
}
|
||||
|
||||
/** The General-settings row: permission state, one action, per-trigger switches. */
|
||||
function SettingsRow(props) {
|
||||
/**
|
||||
* One trigger switch row: the label says which notification it governs and
|
||||
* the switch is the control, so the row never needs a second description.
|
||||
*/
|
||||
function KindRow(props) {
|
||||
return h('div', { className: 'dsn-row' },
|
||||
h('div', { className: 'dsn-row-text' },
|
||||
h('div', { className: 'dsn-row-title' }, props.label)),
|
||||
h('button', {
|
||||
type: 'button',
|
||||
role: 'switch',
|
||||
className: 'dsn-switch',
|
||||
'aria-checked': props.checked,
|
||||
'aria-label': props.label,
|
||||
disabled: props.disabled,
|
||||
onClick: props.onToggle,
|
||||
}, h('span', { className: 'dsn-thumb' })))
|
||||
}
|
||||
|
||||
/**
|
||||
* This plugin's configuration, rendered on its own page in the plugin
|
||||
* manager (`plugins.bundle.config`, keyed by this package's name).
|
||||
*
|
||||
* The owner asks for two views: `summary` (a one-liner that stands in for
|
||||
* the row's description) and `page` (the whole form). Everything visible here
|
||||
* belongs to this package, including the platform-specific permission hint.
|
||||
*/
|
||||
function ConfigSection(props) {
|
||||
const snapshot = useOwnStore(props.store)
|
||||
const tr = seatFor(props)
|
||||
if (props.view === 'summary') return h(React.Fragment, null, tr('settings.description'))
|
||||
const permission = snapshot.permission
|
||||
const supported = permission !== 'unsupported'
|
||||
const failed = permission === 'denied' || snapshot.promptError !== ''
|
||||
const tr = seatFor(props)
|
||||
const statusKey = permission === 'granted'
|
||||
? 'settings.permission.granted'
|
||||
: permission === 'denied'
|
||||
@@ -876,7 +1253,7 @@ window.__ModuleLoader__.load({
|
||||
: supported
|
||||
? 'settings.permission.default'
|
||||
: 'settings.permission.unsupported'
|
||||
const statusText = snapshot.promptError === ''
|
||||
const permissionText = snapshot.promptError === ''
|
||||
? `${tr(statusKey)}${permission === 'denied' || !supported ? ` · ${tr(`settings.permission.hint.${props.platform}`)}` : ''}`
|
||||
: snapshot.promptError
|
||||
const health = snapshot.health
|
||||
@@ -887,58 +1264,113 @@ window.__ModuleLoader__.load({
|
||||
: health.state === 'error'
|
||||
? tr('settings.health.error', { message: health.message })
|
||||
: tr('settings.health.starting')
|
||||
const healthFailed = health.state !== 'watching' && health.state !== 'starting'
|
||||
return h(React.Fragment, null,
|
||||
h('style', null, CSS),
|
||||
h('div', { className: 'dsn-row' },
|
||||
h('div', { className: 'dsn-row-text' },
|
||||
h('div', { className: 'dsn-row-title' }, tr('settings.title')),
|
||||
h('div', { className: 'dsn-row-desc' }, tr('settings.description')),
|
||||
h('div', {
|
||||
className: `dsn-status${failed ? ' dsn-status-error' : ''}`,
|
||||
role: failed ? 'alert' : 'status',
|
||||
}, statusText),
|
||||
h('div', {
|
||||
className: `dsn-status${health.state === 'watching' || health.state === 'starting' ? '' : ' dsn-status-error'}`,
|
||||
role: health.state === 'watching' || health.state === 'starting' ? 'status' : 'alert',
|
||||
}, healthText),
|
||||
h('div', { className: 'dsn-kinds' },
|
||||
h('span', null, tr('settings.kinds.label')),
|
||||
KINDS.map((kind) => h('span', { className: 'dsn-kind', key: kind },
|
||||
h('span', null, tr(`settings.kind.${kind}`)),
|
||||
h('button', {
|
||||
type: 'button',
|
||||
role: 'switch',
|
||||
className: 'dsn-switch',
|
||||
'aria-checked': snapshot.kinds[kind] === true,
|
||||
'aria-label': tr(`settings.kind.${kind}`),
|
||||
disabled: !supported,
|
||||
onClick: () => props.setKind(kind, snapshot.kinds[kind] !== true),
|
||||
}, h('span', { className: 'dsn-thumb' })))))),
|
||||
h('button', {
|
||||
type: 'button',
|
||||
className: 'dsn-button',
|
||||
disabled: !supported,
|
||||
onClick: permission === 'granted' ? props.test : props.ask,
|
||||
}, tr(!supported ? 'settings.action.unsupported' : permission === 'granted' ? 'settings.action.test' : 'settings.action.allow'))))
|
||||
h('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.
|
||||
h('section', { className: 'dsn-section' },
|
||||
h('p', { className: 'dsn-section-desc' }, tr('config.intro'))),
|
||||
h('section', { className: 'dsn-section' },
|
||||
h('h3', { className: 'dsn-section-title' }, tr('config.section.kinds')),
|
||||
KINDS.map((kind) => h(KindRow, {
|
||||
key: kind,
|
||||
label: tr(`settings.kind.${kind}`),
|
||||
checked: snapshot.kinds[kind] === true,
|
||||
disabled: false,
|
||||
onToggle: () => props.setKind(kind, snapshot.kinds[kind] !== true),
|
||||
})),
|
||||
h('p', { className: 'dsn-section-desc' }, tr('config.saveNote'))),
|
||||
h('section', { className: 'dsn-section' },
|
||||
h('h3', { className: 'dsn-section-title' }, tr('config.section.permission')),
|
||||
h('div', { className: 'dsn-row' },
|
||||
h('div', { className: 'dsn-row-text' },
|
||||
h('p', {
|
||||
className: `dsn-status${failed ? ' dsn-status-error' : ''}`,
|
||||
role: failed ? 'alert' : 'status',
|
||||
}, permissionText)),
|
||||
h('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'))),
|
||||
h('p', { className: 'dsn-section-desc' }, tr('config.testHint'))),
|
||||
h('section', { className: 'dsn-section' },
|
||||
h('h3', { className: 'dsn-section-title' }, tr('config.section.status')),
|
||||
h('div', { className: 'dsn-row' },
|
||||
h('div', { className: 'dsn-row-text' },
|
||||
h('p', { className: 'dsn-status' }, `${tr('config.diag.window')}: ${tr(windowIsAway() ? 'config.diag.away' : 'config.diag.inFront')}`),
|
||||
h('p', {
|
||||
className: `dsn-status${healthFailed ? ' dsn-status-error' : ''}`,
|
||||
role: healthFailed ? 'alert' : 'status',
|
||||
}, healthText),
|
||||
h('p', { className: 'dsn-status' }, deliveryText(tr)),
|
||||
h('p', { className: 'dsn-status' }, replayText(tr))),
|
||||
h('button', {
|
||||
type: 'button',
|
||||
className: 'dsn-button',
|
||||
onClick: props.testAny,
|
||||
}, tr('settings.action.testAny'))))))
|
||||
}
|
||||
|
||||
/** Describe the newest alert's fate in one line. */
|
||||
function deliveryText(tr) {
|
||||
const last = store.getSnapshot().lastDelivery
|
||||
if (last === null || last === undefined) return tr('config.diag.none')
|
||||
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}`
|
||||
}
|
||||
|
||||
/** Say how many away-channel alerts are still waiting to be replayed in-app. */
|
||||
function replayText(tr) {
|
||||
const pending = state.replay.length
|
||||
return pending === 0 ? tr('config.diag.replayNone') : tr('config.diag.replay', { count: pending })
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------- registration
|
||||
|
||||
/** Keep the page's own focus events owned by this plugin's effect. */
|
||||
const installBridges = () => {
|
||||
const onFocusChange = () => {
|
||||
const onBlur = () => {
|
||||
state.lastDelivery = 0
|
||||
}
|
||||
// Coming back is the moment the user can finally be told about whatever the
|
||||
// system channel carried while the window was away, and it also clears the
|
||||
// throttle so the first alert after returning is never swallowed.
|
||||
const onReturn = () => {
|
||||
state.lastDelivery = 0
|
||||
flushReplay()
|
||||
}
|
||||
const onVisibilityChange = () => {
|
||||
if (!windowIsAway()) onReturn()
|
||||
}
|
||||
try {
|
||||
window.addEventListener('focus', onFocusChange)
|
||||
window.addEventListener('blur', onFocusChange)
|
||||
window.addEventListener('focus', onReturn)
|
||||
window.addEventListener('blur', onBlur)
|
||||
document.addEventListener('visibilitychange', onVisibilityChange)
|
||||
} catch {
|
||||
/* an unreadable window still delivers through live focus reads */
|
||||
}
|
||||
return () => {
|
||||
try {
|
||||
window.removeEventListener('focus', onFocusChange)
|
||||
window.removeEventListener('blur', onFocusChange)
|
||||
window.removeEventListener('focus', onReturn)
|
||||
window.removeEventListener('blur', onBlur)
|
||||
document.removeEventListener('visibilitychange', onVisibilityChange)
|
||||
} catch {
|
||||
/* nothing to detach */
|
||||
}
|
||||
@@ -948,9 +1380,12 @@ window.__ModuleLoader__.load({
|
||||
}
|
||||
for (const timer of timers.values()) clearTimeout(timer)
|
||||
timers.clear()
|
||||
state.raised.clear()
|
||||
state.replay = []
|
||||
}
|
||||
}
|
||||
|
||||
ctx.effect(() => registerDictionaries(locale), 'session-notify: dictionaries')
|
||||
ctx.effect(() => installBridges(), 'session-notify: window focus')
|
||||
ctx.effect(() => () => {
|
||||
disposed = true
|
||||
@@ -973,19 +1408,24 @@ window.__ModuleLoader__.load({
|
||||
}),
|
||||
}, ToastLayer))
|
||||
|
||||
ctx.slots.inject('settings.general.item', () => ctx.slots.register({
|
||||
name: 'settings.general.item',
|
||||
id: NS,
|
||||
order: 97,
|
||||
// This plugin's configuration lives on its own page in the plugin manager,
|
||||
// keyed by this package's name — the seat the shipped experimental bundle
|
||||
// uses for its own settings, and the one the plugin page renders between the
|
||||
// bundle's description and its rows. It is deliberately NOT a General
|
||||
// settings row: a plugin's options belong to the plugin.
|
||||
ctx.slots.inject('plugins.bundle.config', () => ctx.slots.register({
|
||||
name: 'plugins.bundle.config',
|
||||
key: PACKAGE_NAME,
|
||||
locale: NS,
|
||||
inject: () => ({
|
||||
store,
|
||||
platform: platformKey(),
|
||||
ask: requestPermission,
|
||||
test: sendTest,
|
||||
testAny: sendTest,
|
||||
testSystem: sendTestSystem,
|
||||
setKind: setKindEnabled,
|
||||
}),
|
||||
}, SettingsRow))
|
||||
}, ConfigSection))
|
||||
|
||||
// The observer lives in the frame-wide overlay, NOT in `sidebar.panellist`.
|
||||
//
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@dsh-plugin/session-notify",
|
||||
"version": "1.0.1",
|
||||
"version": "1.0.6",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"description": "会话完成、需要授权、需要回答时提醒你:窗口不在前台用系统通知,窗口在前台用应用内轻弹窗。",
|
||||
|
||||
Reference in New Issue
Block a user