agent-loft 0.2.44 → 0.2.46
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -3
- package/package.json +1 -1
- package/src/channels/web/api.ts +42 -5
- package/src/channels/web/http.ts +12 -0
- package/src/channels/web/push.ts +130 -6
- package/src/channels/web/server.ts +4 -3
- package/src/core/config.ts +36 -0
- package/src/core/memory.ts +22 -3
- package/src/core/servers.ts +134 -0
- package/src/main.ts +3 -0
- package/web/css/servers.css +265 -0
- package/web/index.html +1 -0
- package/web/lib/api.js +1 -0
- package/web/lib/overlay.js +1 -1
- package/web/lib/push.js +8 -1
- package/web/lib/shell.js +691 -0
- package/web/lib/ws.js +7 -1
- package/web/settings/common.js +3 -0
- package/web/settings/index.js +2 -0
- package/web/settings/notify.js +7 -2
- package/web/settings/security.js +8 -3
- package/web/settings/servers.js +207 -0
- package/web/state.js +2 -0
- package/web/views/auth.js +3 -1
- package/web/views/composer.js +1 -1
- package/web/views/layout.js +43 -5
- package/web/views/messages.js +2 -2
- package/web/views/remote.js +2 -2
- package/web/views/sidebar.js +6 -4
- package/web/views/tasks.js +1 -1
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
// 多服务器:网页左上角切换到别的 agent-loft。
|
|
2
|
+
//
|
|
3
|
+
// 别的服务器的页面原样嵌在这台页面的 iframe 里,各自登录、各自直连自己的服务端,这台不中转。
|
|
4
|
+
// 几台要在同一个主域名下(a.example.com、b.example.com):同站的 iframe 才带得上登录 cookie,
|
|
5
|
+
// iPhone 的 Safari 跨站一律不带。
|
|
6
|
+
//
|
|
7
|
+
// 两头各有一份配置(config.json 的 servers):
|
|
8
|
+
// - list:这台左上角能切到哪几台(这台是「外壳」);
|
|
9
|
+
// - embedders:允许哪些地址把这台的页面嵌进去(这台被别人嵌)。页面的 frame-ancestors 就按它出,
|
|
10
|
+
// 不在里面的一律嵌不进来。
|
|
11
|
+
import crypto from "node:crypto";
|
|
12
|
+
import os from "node:os";
|
|
13
|
+
import type { AppConfig } from "./config.js";
|
|
14
|
+
|
|
15
|
+
export type ServerEntry = AppConfig["servers"]["list"][number];
|
|
16
|
+
|
|
17
|
+
/** 切换列表里最多几台:每台都是一整个常驻的页面 */
|
|
18
|
+
export const MAX_SERVERS = 12;
|
|
19
|
+
const MAX_EMBEDDERS = 20;
|
|
20
|
+
const MAX_NAME = 40;
|
|
21
|
+
/** 图标是 emoji:一个字形可能由好几个码位拼成(肤色、ZWJ 组合),按码位数放宽一点 */
|
|
22
|
+
const MAX_ICON = 16;
|
|
23
|
+
|
|
24
|
+
/** 外壳自己在列表里的 id(别的服务器的 id 是随机生成的,不会撞上) */
|
|
25
|
+
export const SELF_ID = "home";
|
|
26
|
+
|
|
27
|
+
/** 页面切换和通知链接共用的 id;home 只代表外壳自己。 */
|
|
28
|
+
export function validServerId(id: unknown): id is string {
|
|
29
|
+
return typeof id === "string" && id !== SELF_ID && /^[\w-]{1,40}$/.test(id);
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
/**
|
|
33
|
+
* 地址规范成 origin(https://a.example.com、http://localhost:8800)。
|
|
34
|
+
* 只认 http / https,不带路径、查询、账号密码:agent-loft 只能挂在根路径上。
|
|
35
|
+
*/
|
|
36
|
+
export function normalizeOrigin(raw: unknown): string {
|
|
37
|
+
const text = String(raw ?? "").trim();
|
|
38
|
+
if (!text) throw new Error("地址不能为空");
|
|
39
|
+
let url: URL;
|
|
40
|
+
try {
|
|
41
|
+
url = new URL(/^[a-z][a-z\d+.-]*:\/\//i.test(text) ? text : `https://${text}`);
|
|
42
|
+
} catch {
|
|
43
|
+
throw new Error(`地址不对:${text}`);
|
|
44
|
+
}
|
|
45
|
+
if (url.protocol !== "https:" && url.protocol !== "http:") throw new Error(`只支持 http / https 地址:${text}`);
|
|
46
|
+
if (url.username || url.password) throw new Error(`地址里不能带账号密码:${text}`);
|
|
47
|
+
if ((url.pathname !== "/" && url.pathname !== "") || url.search || url.hash) {
|
|
48
|
+
throw new Error(`只填到域名(和端口)就行,agent-loft 不支持挂在子路径下:${text}`);
|
|
49
|
+
}
|
|
50
|
+
return url.origin;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
const clip = (v: unknown, max: number) => [...String(v ?? "").trim()].slice(0, max).join("");
|
|
54
|
+
|
|
55
|
+
function newId(taken: Set<string>): string {
|
|
56
|
+
for (;;) {
|
|
57
|
+
const id = crypto.randomBytes(4).toString("hex");
|
|
58
|
+
if (!taken.has(id) && id !== SELF_ID) return id;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* 设置页传来的 servers(只改了其中几项也行),校验后和现有的合并。
|
|
64
|
+
* selfOrigin:这台页面自己的地址,不能把自己加进列表。出错抛 Error(说明给用户看)
|
|
65
|
+
*/
|
|
66
|
+
export function cleanServers(input: unknown, current: AppConfig["servers"], selfOrigin?: string): AppConfig["servers"] {
|
|
67
|
+
const patch = (input ?? {}) as Partial<Record<keyof AppConfig["servers"], unknown>>;
|
|
68
|
+
const next = structuredClone(current);
|
|
69
|
+
if (patch.selfName !== undefined) next.selfName = clip(patch.selfName, MAX_NAME);
|
|
70
|
+
if (patch.selfIcon !== undefined) next.selfIcon = clip(patch.selfIcon, MAX_ICON);
|
|
71
|
+
|
|
72
|
+
if (patch.list !== undefined) {
|
|
73
|
+
if (!Array.isArray(patch.list)) throw new Error("服务器列表格式不对");
|
|
74
|
+
if (patch.list.length > MAX_SERVERS) throw new Error(`最多加 ${MAX_SERVERS} 台服务器`);
|
|
75
|
+
const known = new Set(current.list.map((s) => s.id));
|
|
76
|
+
const taken = new Set<string>();
|
|
77
|
+
const origins = new Set<string>();
|
|
78
|
+
const list: ServerEntry[] = [];
|
|
79
|
+
for (const raw of patch.list as Partial<ServerEntry>[]) {
|
|
80
|
+
const url = normalizeOrigin(raw?.url);
|
|
81
|
+
if (selfOrigin && url === selfOrigin) throw new Error(`${url} 就是这台自己,不用加`);
|
|
82
|
+
if (origins.has(url)) throw new Error(`${url} 加了两次`);
|
|
83
|
+
origins.add(url);
|
|
84
|
+
// 老的 id 留着(页面记着上次切到哪台、推送里带的也是它);新加的现生成
|
|
85
|
+
const id = typeof raw?.id === "string" && known.has(raw.id) && !taken.has(raw.id) ? raw.id : newId(new Set([...known, ...taken]));
|
|
86
|
+
taken.add(id);
|
|
87
|
+
const name = clip(raw?.name, MAX_NAME) || new URL(url).hostname.split(".")[0] || url;
|
|
88
|
+
list.push({ id, name, icon: clip(raw?.icon, MAX_ICON), url });
|
|
89
|
+
}
|
|
90
|
+
next.list = list;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
if (patch.embedders !== undefined) {
|
|
94
|
+
if (!Array.isArray(patch.embedders)) throw new Error("允许嵌入的地址格式不对");
|
|
95
|
+
const set = new Set<string>();
|
|
96
|
+
for (const raw of patch.embedders) set.add(normalizeOrigin(raw));
|
|
97
|
+
if (set.size > MAX_EMBEDDERS) throw new Error(`允许嵌入的地址最多 ${MAX_EMBEDDERS} 个`);
|
|
98
|
+
next.embedders = [...set];
|
|
99
|
+
}
|
|
100
|
+
return next;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/** 切换列表里这台的名字:没设就用主机名 */
|
|
104
|
+
export function selfName(cfg: AppConfig["servers"]): string {
|
|
105
|
+
return cfg.selfName || os.hostname().split(".")[0] || "这台";
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
/** 页面要的:左上角的切换列表。没加别的服务器就是 null(不显示切换) */
|
|
109
|
+
export function shellInfo(cfg: AppConfig["servers"]) {
|
|
110
|
+
if (cfg.list.length === 0) return null;
|
|
111
|
+
return {
|
|
112
|
+
self: { id: SELF_ID, name: selfName(cfg), icon: cfg.selfIcon },
|
|
113
|
+
list: cfg.list.map(({ id, name, icon, url }) => ({ id, name, icon, url })),
|
|
114
|
+
};
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
/**
|
|
118
|
+
* 页面(HTML 等静态文件)的 CSP:
|
|
119
|
+
* - frame-src:外壳要能嵌列表里的服务器;
|
|
120
|
+
* - frame-ancestors:只让 embedders 里的地址嵌这台,没有就谁都不行。
|
|
121
|
+
*/
|
|
122
|
+
export function pageCsp(cfg: AppConfig["servers"]): string {
|
|
123
|
+
const frames = ["'self'", ...cfg.list.map((s) => s.url)].join(" ");
|
|
124
|
+
const ancestors = cfg.embedders.length ? cfg.embedders.join(" ") : "'none'";
|
|
125
|
+
return `default-src 'self'; img-src 'self' data: blob:; style-src 'self' 'unsafe-inline'; script-src 'self'; connect-src 'self' ws: wss:; frame-src ${frames}; frame-ancestors ${ancestors}; base-uri 'self'; form-action 'self'`;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
/**
|
|
129
|
+
* 这台自己嵌的东西(PDF 预览、回复里的图表)的 frame-ancestors。frame-ancestors 要求每一层祖先
|
|
130
|
+
* 都对得上:这台被外壳嵌着时,只写 'self' 的话外壳那层通不过,预览就是一片空白
|
|
131
|
+
*/
|
|
132
|
+
export function ownFrameAncestors(cfg: AppConfig["servers"]): string {
|
|
133
|
+
return ["'self'", ...cfg.embedders].join(" ");
|
|
134
|
+
}
|
package/src/main.ts
CHANGED
|
@@ -10,6 +10,8 @@ import { startFeishu, stopFeishu } from "./channels/feishu/index.js";
|
|
|
10
10
|
import { startWeb, stopWeb } from "./channels/web/server.js";
|
|
11
11
|
import { home } from "./home.js";
|
|
12
12
|
import { startMemoryCurator } from "./core/memory-curator.js";
|
|
13
|
+
import { migrateMemoryDefault } from "./core/memory.js";
|
|
14
|
+
import { listUsers } from "./core/users.js";
|
|
13
15
|
import { startScheduler, stopScheduler } from "./core/scheduled.js";
|
|
14
16
|
import { startTaskRunner, stopTaskRunner } from "./core/task-runner.js";
|
|
15
17
|
import { startTasksBridge, stopTasksBridge } from "./core/tasks-bridge.js";
|
|
@@ -44,6 +46,7 @@ async function main(): Promise<void> {
|
|
|
44
46
|
});
|
|
45
47
|
|
|
46
48
|
// 聊天记录索引和聊完后的记忆整理
|
|
49
|
+
migrateMemoryDefault(listUsers().map((u) => u.id));
|
|
47
50
|
startMemoryCurator();
|
|
48
51
|
|
|
49
52
|
startFeishu();
|
|
@@ -0,0 +1,265 @@
|
|
|
1
|
+
/* ---------- 多服务器:左上角切换(lib/shell.js) ---------- */
|
|
2
|
+
|
|
3
|
+
.side-switch {
|
|
4
|
+
padding: 10px 10px 0;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
.side-switch[hidden],
|
|
8
|
+
.auth-switch[hidden],
|
|
9
|
+
.srv-pill[hidden] {
|
|
10
|
+
display: none;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
.server-switch {
|
|
14
|
+
display: flex;
|
|
15
|
+
align-items: center;
|
|
16
|
+
gap: 8px;
|
|
17
|
+
width: 100%;
|
|
18
|
+
min-width: 0;
|
|
19
|
+
padding: 6px 8px;
|
|
20
|
+
border-radius: 10px;
|
|
21
|
+
font-size: 15px;
|
|
22
|
+
font-weight: 600;
|
|
23
|
+
text-align: left;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
.server-switch:hover {
|
|
27
|
+
background: var(--bg-hover);
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
.srv-icon {
|
|
31
|
+
width: 24px;
|
|
32
|
+
height: 24px;
|
|
33
|
+
flex-shrink: 0;
|
|
34
|
+
display: inline-grid;
|
|
35
|
+
place-items: center;
|
|
36
|
+
border-radius: 7px;
|
|
37
|
+
font-size: 16px;
|
|
38
|
+
line-height: 1;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
.srv-icon.letter {
|
|
42
|
+
background: var(--accent);
|
|
43
|
+
color: var(--accent-fg);
|
|
44
|
+
font-size: 12px;
|
|
45
|
+
font-weight: 600;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
.srv-name,
|
|
49
|
+
.srv-item-name {
|
|
50
|
+
flex: 1;
|
|
51
|
+
min-width: 0;
|
|
52
|
+
overflow: hidden;
|
|
53
|
+
text-overflow: ellipsis;
|
|
54
|
+
white-space: nowrap;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
.srv-chev {
|
|
58
|
+
display: inline-grid;
|
|
59
|
+
opacity: 0.55;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
.srv-chev svg {
|
|
63
|
+
width: 14px;
|
|
64
|
+
height: 14px;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
.srv-badge {
|
|
68
|
+
min-width: 18px;
|
|
69
|
+
height: 18px;
|
|
70
|
+
padding: 0 5px;
|
|
71
|
+
border-radius: 9px;
|
|
72
|
+
background: var(--danger);
|
|
73
|
+
color: #fff;
|
|
74
|
+
font-size: 11px;
|
|
75
|
+
font-weight: 600;
|
|
76
|
+
line-height: 18px;
|
|
77
|
+
text-align: center;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
.srv-busy {
|
|
81
|
+
width: 8px;
|
|
82
|
+
height: 8px;
|
|
83
|
+
border-radius: 50%;
|
|
84
|
+
background: var(--accent);
|
|
85
|
+
animation: srv-pulse 1.4s ease-in-out infinite;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
@keyframes srv-pulse {
|
|
89
|
+
50% {
|
|
90
|
+
opacity: 0.35;
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
.srv-down {
|
|
95
|
+
font-size: 12px;
|
|
96
|
+
color: var(--fg-faint);
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
.srv-check {
|
|
100
|
+
color: var(--accent);
|
|
101
|
+
font-weight: 600;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
.menu .srv-item {
|
|
105
|
+
min-width: 220px;
|
|
106
|
+
padding: 7px 10px;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
.menu .srv-item.on {
|
|
110
|
+
font-weight: 600;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
.menu .srv-manage {
|
|
114
|
+
color: var(--fg-soft);
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
/* 登录页(被嵌着、还没登录):左上角照样能切回去 */
|
|
118
|
+
.auth-switch {
|
|
119
|
+
position: absolute;
|
|
120
|
+
top: calc(env(safe-area-inset-top) + 10px);
|
|
121
|
+
left: 10px;
|
|
122
|
+
max-width: min(260px, calc(100vw - 20px));
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
/* ---------- 外壳上的 iframe ---------- */
|
|
126
|
+
|
|
127
|
+
/* 用 absolute 不用 fixed:iOS PWA 会拿贴着顶部的 fixed 元素给状态栏上色(见 mobile.css) */
|
|
128
|
+
.server-frames {
|
|
129
|
+
position: absolute;
|
|
130
|
+
inset: 0;
|
|
131
|
+
z-index: 38;
|
|
132
|
+
background: var(--bg);
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
.server-frames[hidden] {
|
|
136
|
+
display: none;
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
/* 不显示的也只是藏起来(visibility),页面照常排版,切回来时滚动位置、输入框都还在 */
|
|
140
|
+
.server-frame {
|
|
141
|
+
position: absolute;
|
|
142
|
+
inset: 0;
|
|
143
|
+
visibility: hidden;
|
|
144
|
+
box-sizing: border-box;
|
|
145
|
+
background: var(--bg);
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
.server-frame.on {
|
|
149
|
+
visibility: visible;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
.server-frame iframe {
|
|
153
|
+
display: block;
|
|
154
|
+
width: 100%;
|
|
155
|
+
height: 100%;
|
|
156
|
+
border: 0;
|
|
157
|
+
background: var(--bg);
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
.srv-overlay {
|
|
161
|
+
position: absolute;
|
|
162
|
+
inset: 0;
|
|
163
|
+
display: grid;
|
|
164
|
+
place-items: center;
|
|
165
|
+
padding: 24px;
|
|
166
|
+
background: var(--bg);
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
.srv-overlay[hidden] {
|
|
170
|
+
display: none;
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
.srv-loading {
|
|
174
|
+
display: flex;
|
|
175
|
+
align-items: center;
|
|
176
|
+
gap: 10px;
|
|
177
|
+
color: var(--fg-soft);
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
.srv-card {
|
|
181
|
+
max-width: 440px;
|
|
182
|
+
padding: 20px 22px;
|
|
183
|
+
border: 1px solid var(--border);
|
|
184
|
+
border-radius: var(--radius);
|
|
185
|
+
box-shadow: var(--shadow);
|
|
186
|
+
background: var(--bg);
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
.srv-card h3 {
|
|
190
|
+
margin: 0 0 8px;
|
|
191
|
+
font-size: 17px;
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
.srv-card ul {
|
|
195
|
+
margin: 0 0 14px;
|
|
196
|
+
padding-left: 20px;
|
|
197
|
+
color: var(--fg-soft);
|
|
198
|
+
font-size: 14px;
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
.srv-card .row {
|
|
202
|
+
flex-wrap: wrap;
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
/* iframe 里的页面还没报到(加载中、没响应)时浮在左上角的切换按钮:不然手机上就回不去了 */
|
|
206
|
+
.srv-pill {
|
|
207
|
+
position: absolute;
|
|
208
|
+
top: calc(env(safe-area-inset-top) + 8px);
|
|
209
|
+
left: 8px;
|
|
210
|
+
z-index: 2;
|
|
211
|
+
max-width: min(260px, calc(100vw - 16px));
|
|
212
|
+
background: var(--bg);
|
|
213
|
+
border: 1px solid var(--border);
|
|
214
|
+
border-radius: 12px;
|
|
215
|
+
box-shadow: var(--shadow);
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
/* ---------- 设置 → 服务器 ---------- */
|
|
219
|
+
|
|
220
|
+
.srv-rows {
|
|
221
|
+
display: flex;
|
|
222
|
+
flex-direction: column;
|
|
223
|
+
gap: 8px;
|
|
224
|
+
}
|
|
225
|
+
|
|
226
|
+
.srv-edit {
|
|
227
|
+
display: flex;
|
|
228
|
+
align-items: center;
|
|
229
|
+
gap: 8px;
|
|
230
|
+
flex-wrap: wrap;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
.srv-edit-fields {
|
|
234
|
+
flex: 1;
|
|
235
|
+
min-width: 260px;
|
|
236
|
+
display: grid;
|
|
237
|
+
grid-template-columns: 48px minmax(80px, 1fr) minmax(140px, 2fr);
|
|
238
|
+
gap: 6px;
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
.srv-edit-fields.self {
|
|
242
|
+
grid-template-columns: 48px minmax(0, 1fr);
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
.srv-edit-fields input.srv-emoji {
|
|
246
|
+
text-align: center;
|
|
247
|
+
padding-left: 4px;
|
|
248
|
+
padding-right: 4px;
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
.srv-edit-actions {
|
|
252
|
+
display: flex;
|
|
253
|
+
align-items: center;
|
|
254
|
+
gap: 4px;
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
@media (max-width: 768px) {
|
|
258
|
+
.srv-edit-fields {
|
|
259
|
+
grid-template-columns: 48px minmax(0, 1fr);
|
|
260
|
+
}
|
|
261
|
+
|
|
262
|
+
.srv-edit-fields input:nth-child(3) {
|
|
263
|
+
grid-column: 1 / -1;
|
|
264
|
+
}
|
|
265
|
+
}
|
package/web/index.html
CHANGED
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
<link rel="stylesheet" href="/css/skills.css" />
|
|
29
29
|
<link rel="stylesheet" href="/css/terminal.css" />
|
|
30
30
|
<link rel="stylesheet" href="/css/remote.css" />
|
|
31
|
+
<link rel="stylesheet" href="/css/servers.css" />
|
|
31
32
|
<link rel="stylesheet" href="/css/mobile.css" />
|
|
32
33
|
</head>
|
|
33
34
|
<body>
|
package/web/lib/api.js
CHANGED
|
@@ -4,6 +4,7 @@ export async function api(path, opts = {}) {
|
|
|
4
4
|
const res = await fetch(path, {
|
|
5
5
|
method: opts.method ?? "GET",
|
|
6
6
|
credentials: "same-origin",
|
|
7
|
+
keepalive: opts.keepalive ?? false,
|
|
7
8
|
headers: opts.body !== undefined && !(opts.body instanceof Blob) ? { "Content-Type": "application/json" } : opts.headers,
|
|
8
9
|
body: opts.body === undefined ? undefined : opts.body instanceof Blob ? opts.body : JSON.stringify(opts.body),
|
|
9
10
|
});
|
package/web/lib/overlay.js
CHANGED
package/web/lib/push.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { api } from "./api.js";
|
|
2
|
-
import { desktop } from "../state.js";
|
|
2
|
+
import { desktop, framed } from "../state.js";
|
|
3
3
|
|
|
4
4
|
// ---------- 系统通知(Web Push) ----------
|
|
5
5
|
|
|
@@ -7,6 +7,7 @@ export function pushSupport() {
|
|
|
7
7
|
const ios = /iPhone|iPad|iPod/.test(navigator.userAgent);
|
|
8
8
|
const standalone = window.matchMedia("(display-mode: standalone)").matches || navigator.standalone === true;
|
|
9
9
|
if (desktop) return { ok: false, why: "桌面端会直接弹出 macOS 系统通知,不需要在这里开启。" };
|
|
10
|
+
if (framed) return { ok: false, framed: true, why: "这台是在别的服务器的页面里打开的:通知跟着外层那台走,在那边的 设置 → 通知 里开启,这台的提醒也会推过去。" };
|
|
10
11
|
if (!window.isSecureContext) return { ok: false, why: "通知需要 HTTPS 访问(localhost 除外)。请通过 HTTPS 的反向代理地址打开。" };
|
|
11
12
|
if (ios && !standalone) {
|
|
12
13
|
return { ok: false, why: "iPhone / iPad 上要先在 Safari 里点「分享 → 添加到主屏幕」,再从桌面图标打开,才能开启通知(需 iOS 16.4+)。" };
|
|
@@ -52,6 +53,12 @@ export async function enablePush() {
|
|
|
52
53
|
|
|
53
54
|
/** 这台设备不再收通知:服务端删掉订阅,浏览器也退订 */
|
|
54
55
|
export async function dropPushSub() {
|
|
56
|
+
if (framed) {
|
|
57
|
+
// 只撤销这台的转发订阅,不能退订外壳与其他服务器共用的浏览器订阅。
|
|
58
|
+
const { dropRelayPush } = await import("./shell.js");
|
|
59
|
+
await dropRelayPush();
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
55
62
|
const sub = await currentPushSub();
|
|
56
63
|
if (!sub) return;
|
|
57
64
|
await api("/api/push/unsubscribe", { method: "POST", body: { endpoint: sub.endpoint } }).catch(() => {});
|