dshost-plugin 0.1.8 → 0.1.9
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/LICENSE +21 -0
- package/README.md +106 -0
- package/lib/core.js +182 -23
- package/lib/index.js +4 -0
- package/lib/protocol.js +7 -2
- package/package.json +21 -2
- package/scripts/prepack.mjs +10 -2
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 dsh-remote contributors
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
ADDED
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
# dshost-plugin
|
|
2
|
+
|
|
3
|
+
[](https://www.npmjs.com/package/dshost-plugin)
|
|
4
|
+
[](./LICENSE)
|
|
5
|
+
[](https://www.npmjs.com/package/dshost-plugin)
|
|
6
|
+
[](https://github.com/NoelJudeNoel/dshost-plugin)
|
|
7
|
+
|
|
8
|
+
**DSHost 官方 DSH 远程中继插件** — 在你的 dsh(DeepSeek Harness)实例上运行一个 Agent,
|
|
9
|
+
通过 `wss` 主动外连 DHost 中继,让你在世界任何地方用浏览器安全访问自己的 dsh Web UI,
|
|
10
|
+
无需公网 IP、无需端口映射。
|
|
11
|
+
|
|
12
|
+
*Official remote cloud relay plugin for DSHost (dshost.me): securely access your
|
|
13
|
+
dsh Web UI from anywhere.*
|
|
14
|
+
|
|
15
|
+
## 特性
|
|
16
|
+
|
|
17
|
+
- **零公网 IP**:Agent 主动外连中继(`wss://dshost.me/agent`),本机不开任何入站端口
|
|
18
|
+
- **零破坏性多版本兼容**:同时支持 dsh `0.0.1-rc.*` / `0.1.0-rc.*` / `0.1.1-*` / `0.1.2-*`
|
|
19
|
+
- **安全**:中继层 Host/Origin 重写遵守 dsh 信任栅栏;`settings.describe` 密钥脱敏下发;
|
|
20
|
+
生产环境强制 `wss://`
|
|
21
|
+
- **随 dsh 启动**:以 cordis 插件身份随 `dsh web` 加载,自动重连、休眠省流
|
|
22
|
+
|
|
23
|
+
## 快速开始
|
|
24
|
+
|
|
25
|
+
### 1. 申请 Token
|
|
26
|
+
|
|
27
|
+
在 [dshost.me](https://dshost.me) 注册/登录(支持 GitHub OAuth),创建实例获得
|
|
28
|
+
`dsh_` 开头的接入 Token。
|
|
29
|
+
|
|
30
|
+
### 2. 一键安装(推荐)
|
|
31
|
+
|
|
32
|
+
```bash
|
|
33
|
+
curl -fsSL https://dshost.me/install.sh | bash
|
|
34
|
+
```
|
|
35
|
+
|
|
36
|
+
脚本会安装 pnpm、通过 `dsh plugin add dshost-plugin` 把插件装入当前 profile,
|
|
37
|
+
并写入 profile 的 `cordis.patch.yml`。
|
|
38
|
+
|
|
39
|
+
### 3. 手动安装
|
|
40
|
+
|
|
41
|
+
```bash
|
|
42
|
+
# 装入 dsh profile(等价于在 profile 目录执行 pnpm add dshost-plugin)
|
|
43
|
+
dsh plugin add dshost-plugin
|
|
44
|
+
```
|
|
45
|
+
|
|
46
|
+
然后在 profile 的 `cordis.patch.yml` 里声明插件(新增行必须放在 `- insert:` 块内):
|
|
47
|
+
|
|
48
|
+
```yaml
|
|
49
|
+
- insert:
|
|
50
|
+
- id: dsh-remote-agent
|
|
51
|
+
name: 'dshost-plugin'
|
|
52
|
+
config:
|
|
53
|
+
token: dsh_your_token_here
|
|
54
|
+
relayUrl: wss://dshost.me/agent
|
|
55
|
+
autoConnect: true
|
|
56
|
+
```
|
|
57
|
+
|
|
58
|
+
### 4. 重启 dsh
|
|
59
|
+
|
|
60
|
+
```bash
|
|
61
|
+
sudo systemctl restart dsh # 或你的启动方式
|
|
62
|
+
```
|
|
63
|
+
|
|
64
|
+
启动后控制台(dshost.me)应看到实例上线。
|
|
65
|
+
|
|
66
|
+
## 配置项
|
|
67
|
+
|
|
68
|
+
| 字段 | 必填 | 说明 |
|
|
69
|
+
|---|---|---|
|
|
70
|
+
| `token` | ✔ | 中继接入 Token(`dsh_` 前缀,在 dshost.me 申请) |
|
|
71
|
+
| `relayUrl` | ✔ | 中继 WebSocket 地址,生产必须 `wss://` |
|
|
72
|
+
| `autoConnect` | ✕ | 默认 `true`;启动即连接 |
|
|
73
|
+
| `dshHost` / `dshPort` | ✕ | 本机 dsh web 地址,默认 `127.0.0.1:3080` |
|
|
74
|
+
|
|
75
|
+
## 兼容性
|
|
76
|
+
|
|
77
|
+
| dsh 版本 | 支持 |
|
|
78
|
+
|---|---|
|
|
79
|
+
| `0.1.2-*`(含 `--trusted-host`、BrowserAuth、remote.mux) | ✔ |
|
|
80
|
+
| `0.1.1-*` / `0.1.0-rc.7+`(insert 块 patch 格式) | ✔ |
|
|
81
|
+
| `0.1.0-rc.2 ~ rc.6` / `0.0.1-rc.*` | ✔(旧包名 `@noeljude/dsh-remote-plugin` 亦可解析) |
|
|
82
|
+
|
|
83
|
+
## 仓库结构
|
|
84
|
+
|
|
85
|
+
```
|
|
86
|
+
├── package.json # npm 包定义(dsh.bundle.patch 指向 cordis.patch.yml)
|
|
87
|
+
├── cordis.patch.yml # bundle patch(有意为空:插件入口由用户 profile 声明)
|
|
88
|
+
├── lib/index.js # 插件入口(cordis apply)
|
|
89
|
+
├── agent/core.js # Agent 引擎(与独立 agent 共享的唯一源)
|
|
90
|
+
├── common/protocol.js # 中继协议
|
|
91
|
+
└── scripts/prepack.mjs # npm pack 时物化 lib/core.js + lib/protocol.js
|
|
92
|
+
```
|
|
93
|
+
|
|
94
|
+
`prepack.mjs` 是布局自适应的:在本 monorepo(源码位于 `src/agent`、`src/common`)与
|
|
95
|
+
本仓库独立检出(`agent/`、`common/` 位于包根)下均可运行,支持
|
|
96
|
+
`npm i github:NoelJudeNoel/dshost-plugin` 的 git 直装(经 `prepare` 构建)。
|
|
97
|
+
|
|
98
|
+
## 发布流程
|
|
99
|
+
|
|
100
|
+
npm 与 GitHub 同步发布:改动主仓源码 → bump `version` → `npm publish` →
|
|
101
|
+
`bash scripts/publish-github.sh`(同步 GitHub、打 `vX.Y.Z` tag、刷新 topics)。
|
|
102
|
+
完整标准规则见 [`docs/github-release-sop.md`](./docs/github-release-sop.md)。
|
|
103
|
+
|
|
104
|
+
## License
|
|
105
|
+
|
|
106
|
+
[MIT](./LICENSE) © 2026 dsh-remote contributors
|
package/lib/core.js
CHANGED
|
@@ -67,6 +67,20 @@ function getInstanceId() {
|
|
|
67
67
|
return cachedInstanceId;
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
+
/**
|
|
71
|
+
* Effective instance id. DSH_INSTANCE_ID (env) overrides the derived id —
|
|
72
|
+
* used when a dedicated services agent coexists with the dsh-hosted plugin
|
|
73
|
+
* on the SAME machine: both derive the identical hostname+machine-id id,
|
|
74
|
+
* and the relay would treat them as one instance, evicting each other in a
|
|
75
|
+
* reconnect war. The override must be stable across restarts (it is the
|
|
76
|
+
* key sessions/tickets bind to).
|
|
77
|
+
*/
|
|
78
|
+
function getEffectiveInstanceId() {
|
|
79
|
+
const override = (process.env.DSH_INSTANCE_ID || '').trim();
|
|
80
|
+
if (override && /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/.test(override)) return override;
|
|
81
|
+
return getInstanceId();
|
|
82
|
+
}
|
|
83
|
+
|
|
70
84
|
/**
|
|
71
85
|
* Collect every real disk partition (df -kPT), not just the root filesystem.
|
|
72
86
|
* Filters to physical filesystems (/dev/* or common on-disk types), excludes
|
|
@@ -236,7 +250,7 @@ export function collectSystemInfo(defaultVersion) {
|
|
|
236
250
|
const cpus = os.cpus();
|
|
237
251
|
const meta = detectDshMetadata();
|
|
238
252
|
return {
|
|
239
|
-
instanceId:
|
|
253
|
+
instanceId: getEffectiveInstanceId(),
|
|
240
254
|
hostname: os.hostname(),
|
|
241
255
|
platform: os.platform(),
|
|
242
256
|
release: os.release(),
|
|
@@ -258,6 +272,77 @@ export function collectSystemInfo(defaultVersion) {
|
|
|
258
272
|
};
|
|
259
273
|
}
|
|
260
274
|
|
|
275
|
+
// ── Plugin workspace services(config.services)───────────────────────
|
|
276
|
+
// 实例在 cordis.patch.yml(插件配置)或 standalone agent 的 DSH_SERVICES env
|
|
277
|
+
// JSON 中声明的本地/内网上游清单。relay 只能经本 agent 隧道触达这些上游。
|
|
278
|
+
// 安全关键:上游白名单在此强制 —— 回环 + EasyTier mesh 10.144.144.0/24 +
|
|
279
|
+
// AGENT_UPSTREAM_ALLOW 显式追加。被攻破的 relay 也无法借隧道横移到宿主者
|
|
280
|
+
// 未声明的任意内网地址;仅接受字面 IP(localhost 归一为 127.0.0.1),
|
|
281
|
+
// 不做 DNS 解析,杜绝 DNS rebinding 绕过白名单。
|
|
282
|
+
const SVC_ID_RE = /^[a-z0-9][a-z0-9_-]{0,31}$/;
|
|
283
|
+
|
|
284
|
+
function parseUpstream(raw) {
|
|
285
|
+
const m = /^(.+):(\d{1,5})$/.exec(String(raw || '').trim());
|
|
286
|
+
if (!m) return null;
|
|
287
|
+
const host = m[1].toLowerCase() === 'localhost' ? '127.0.0.1' : m[1];
|
|
288
|
+
const port = parseInt(m[2], 10);
|
|
289
|
+
if (!/^\d{1,3}(\.\d{1,3}){3}$|^[0-9a-f:]+$/i.test(host)) return null;
|
|
290
|
+
if (port < 1 || port > 65535) return null;
|
|
291
|
+
return { host, port };
|
|
292
|
+
}
|
|
293
|
+
|
|
294
|
+
function upstreamAllowed(host) {
|
|
295
|
+
if (host === '::1' || /^127\./.test(host)) return true;
|
|
296
|
+
if (/^10\.144\.144\./.test(host)) return true; // EasyTier wolo-mesh 网段
|
|
297
|
+
const extra = (process.env.AGENT_UPSTREAM_ALLOW || '').split(',').map((s) => s.trim()).filter(Boolean);
|
|
298
|
+
return extra.includes(host);
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
/**
|
|
302
|
+
* Normalize + validate the declared services list. Invalid entries are
|
|
303
|
+
* skipped with a warning, never thrown — one bad line must not take down
|
|
304
|
+
* the dsh remote tunnel.
|
|
305
|
+
* @returns {Array<{id,name,desc,icon,auth,entry,ssoSecret,host,port}>}
|
|
306
|
+
*/
|
|
307
|
+
export function normalizeServices(raw, log) {
|
|
308
|
+
if (!Array.isArray(raw)) return [];
|
|
309
|
+
const out = [];
|
|
310
|
+
const seen = new Set();
|
|
311
|
+
for (const s of raw) {
|
|
312
|
+
if (!s || typeof s !== 'object') continue;
|
|
313
|
+
const id = String(s.id || '').trim();
|
|
314
|
+
const up = parseUpstream(s.upstream);
|
|
315
|
+
if (!SVC_ID_RE.test(id) || id === 'dsh') {
|
|
316
|
+
log?.warn?.(`[agent] service "${id || '(unnamed)'}": invalid/reserved id, skipped`);
|
|
317
|
+
continue;
|
|
318
|
+
}
|
|
319
|
+
if (seen.has(id)) continue;
|
|
320
|
+
if (!up) {
|
|
321
|
+
log?.warn?.(`[agent] service "${id}": bad upstream "${s.upstream}" (want host:port), skipped`);
|
|
322
|
+
continue;
|
|
323
|
+
}
|
|
324
|
+
if (!upstreamAllowed(up.host)) {
|
|
325
|
+
log?.warn?.(`[agent] service "${id}": upstream ${up.host} not in allowlist (loopback / 10.144.144.0/24 / AGENT_UPSTREAM_ALLOW), skipped`);
|
|
326
|
+
continue;
|
|
327
|
+
}
|
|
328
|
+
seen.add(id);
|
|
329
|
+
out.push({
|
|
330
|
+
id,
|
|
331
|
+
name: String(s.name || id).slice(0, 64),
|
|
332
|
+
desc: String(s.desc || '').slice(0, 200),
|
|
333
|
+
icon: String(s.icon || '').slice(0, 32),
|
|
334
|
+
auth: s.auth === 'sso' ? 'sso' : 'open',
|
|
335
|
+
entry: typeof s.entry === 'string' && s.entry.startsWith('/') ? s.entry : '/',
|
|
336
|
+
ssoSecret: typeof s.ssoSecret === 'string' && s.ssoSecret ? s.ssoSecret : '',
|
|
337
|
+
basicUser: typeof s.basicUser === 'string' ? s.basicUser : '',
|
|
338
|
+
basicPassword: typeof s.basicPassword === 'string' ? s.basicPassword : '',
|
|
339
|
+
host: up.host,
|
|
340
|
+
port: up.port,
|
|
341
|
+
});
|
|
342
|
+
}
|
|
343
|
+
return out;
|
|
344
|
+
}
|
|
345
|
+
|
|
261
346
|
/**
|
|
262
347
|
* Start the agent connection loop.
|
|
263
348
|
* @param {object} opts
|
|
@@ -269,6 +354,7 @@ export function collectSystemInfo(defaultVersion) {
|
|
|
269
354
|
* @param {string} [opts.webToken] local dsh web launch token (dsh >= 0.1.2 auth mode)
|
|
270
355
|
* @param {object} [opts.log] logger with log/warn/error (default console)
|
|
271
356
|
* @param {string} [opts.dshVersion] reported dsh version (default rc.6)
|
|
357
|
+
* @param {Array} [opts.services] plugin workspace services (see normalizeServices)
|
|
272
358
|
* @returns {{ stop: () => void }}
|
|
273
359
|
*/
|
|
274
360
|
export function startAgent(opts) {
|
|
@@ -280,8 +366,16 @@ export function startAgent(opts) {
|
|
|
280
366
|
dshPort = 3080,
|
|
281
367
|
log = console,
|
|
282
368
|
dshVersion,
|
|
369
|
+
services = [],
|
|
283
370
|
} = opts;
|
|
284
371
|
|
|
372
|
+
const svcList = normalizeServices(services, log);
|
|
373
|
+
const svcMap = new Map(svcList.map((s) => [s.id, s]));
|
|
374
|
+
let relayUsername = null; // set on 'registered'; subject of SSO trust headers
|
|
375
|
+
if (svcList.length) {
|
|
376
|
+
log.log?.(`[agent] plugin services: ${svcList.map((s) => `${s.id}->${s.host}:${s.port}${s.auth === 'sso' ? ' (sso)' : ''}`).join(', ')}`);
|
|
377
|
+
}
|
|
378
|
+
|
|
285
379
|
if (!token) {
|
|
286
380
|
log.error?.('[agent] No token configured.');
|
|
287
381
|
return { stop() {} };
|
|
@@ -372,8 +466,14 @@ export function startAgent(opts) {
|
|
|
372
466
|
if (msg.type === 'registered') {
|
|
373
467
|
registered = true;
|
|
374
468
|
reconnectAttempt = 0;
|
|
469
|
+
relayUsername = msg.username || null;
|
|
375
470
|
log.log?.(`[agent] Registered as ${msg.username} (session ${msg.sessionId || ''})`);
|
|
376
471
|
send(ws, { type: 'system-info', info: collectSystemInfo(dshVersion) });
|
|
472
|
+
// 插件工作区:上报本实例声明的服务清单(relay 存实例维度,供 /p 路由校验)
|
|
473
|
+
send(ws, {
|
|
474
|
+
type: 'services',
|
|
475
|
+
services: svcList.map(({ id, name, desc, icon, auth, entry }) => ({ id, name, desc, icon, auth, entry })),
|
|
476
|
+
});
|
|
377
477
|
startHeartbeat(ws);
|
|
378
478
|
return;
|
|
379
479
|
}
|
|
@@ -381,7 +481,8 @@ export function startAgent(opts) {
|
|
|
381
481
|
if (msg.type === 'heartbeat') return;
|
|
382
482
|
|
|
383
483
|
if (msg.type === 'http:request') {
|
|
384
|
-
|
|
484
|
+
// [Artifact Viewer] 是 dsh UI 注入脚本的专属旁路;插件流不经过它。
|
|
485
|
+
if (!msg.target && serveArtifactIfRequested(ws, msg)) return;
|
|
385
486
|
handleHttpRequest(ws, msg);
|
|
386
487
|
} else if (msg.type === 'http:body') {
|
|
387
488
|
const ab = artifactFormBodies.get(msg.streamId);
|
|
@@ -394,9 +495,13 @@ export function startAgent(opts) {
|
|
|
394
495
|
const stream = streams.get(msg.streamId);
|
|
395
496
|
if (stream && stream.dshReq) stream.dshReq.end();
|
|
396
497
|
} else if (msg.type === 'ws:open') {
|
|
397
|
-
// dsh >= 0.1.2: make sure the auth cookie exists before the upgrade
|
|
398
|
-
|
|
399
|
-
|
|
498
|
+
// dsh >= 0.1.2: make sure the auth cookie exists before the upgrade
|
|
499
|
+
// (仅 dsh 目标需要本地 web auth cookie;插件上游不做 cookie 注入)。
|
|
500
|
+
if ((!msg.target || msg.target === 'dsh') && (webToken || authCookie) && !authCookie) {
|
|
501
|
+
mintAuthCookie().then(() => handleWsOpen(ws, msg));
|
|
502
|
+
} else {
|
|
503
|
+
handleWsOpen(ws, msg);
|
|
504
|
+
}
|
|
400
505
|
} else if (msg.type === 'ws:frame') {
|
|
401
506
|
const stream = streams.get(msg.streamId);
|
|
402
507
|
if (stream && stream.dshWs) {
|
|
@@ -560,29 +665,68 @@ export function startAgent(opts) {
|
|
|
560
665
|
streams.delete(streamId);
|
|
561
666
|
}
|
|
562
667
|
|
|
668
|
+
/** Resolve msg.target to a dial target. null = plugin not declared. */
|
|
669
|
+
function resolveTarget(msg) {
|
|
670
|
+
const t = msg.target || 'dsh';
|
|
671
|
+
if (t === 'dsh') return { id: 'dsh', host: dshHost, port: dshPort, dsh: true, svc: null };
|
|
672
|
+
const svc = svcMap.get(t);
|
|
673
|
+
if (!svc) return null;
|
|
674
|
+
return { id: t, host: svc.host, port: svc.port, dsh: false, svc };
|
|
675
|
+
}
|
|
676
|
+
|
|
677
|
+
/** auth:'sso' 服务出站的信任头(M3:relay↔业务系统共享密钥的 HMAC 链)。 */
|
|
678
|
+
function ssoHeaders(svc) {
|
|
679
|
+
if (!svc || svc.auth !== 'sso' || !svc.ssoSecret || !relayUsername) return {};
|
|
680
|
+
const ts = Date.now().toString();
|
|
681
|
+
const sig = crypto.createHmac('sha256', svc.ssoSecret).update(`${relayUsername}.${ts}`).digest('hex');
|
|
682
|
+
return { 'x-sso-user': relayUsername, 'x-sso-ts': ts, 'x-sso-sig': sig };
|
|
683
|
+
}
|
|
684
|
+
|
|
685
|
+
/** auth:'open' 服务的上游 Basic 凭据注入(服务自身保留 Basic Auth 时的代填)。 */
|
|
686
|
+
function basicHeader(svc) {
|
|
687
|
+
if (!svc || svc.auth !== 'open' || !svc.basicPassword) return undefined;
|
|
688
|
+
return 'Basic ' + Buffer.from(`${svc.basicUser || 'user'}:${svc.basicPassword}`).toString('base64');
|
|
689
|
+
}
|
|
690
|
+
|
|
563
691
|
function handleHttpRequest(ws, msg, isRetry) {
|
|
564
692
|
const { streamId, method, path, headers } = msg;
|
|
693
|
+
const target = resolveTarget(msg);
|
|
694
|
+
if (!target) {
|
|
695
|
+
respondError(ws, streamId, 404, `dsh-remote: plugin "${msg.target}" is not declared on this instance`);
|
|
696
|
+
return;
|
|
697
|
+
}
|
|
565
698
|
|
|
566
699
|
// dsh >= 0.1.2 web auth: inject the minted browser cookie when we have
|
|
567
700
|
// one. dsh <= 0.1.1 has no web auth; with no token/cookie nothing is
|
|
568
701
|
// injected and requests go out exactly like plugin 0.1.5 sent them.
|
|
702
|
+
// 插件上游:不注入 dsh cookie,注入 SSO 信任头(若声明),剥除 Origin。
|
|
569
703
|
const issue = (cookie) => {
|
|
570
|
-
const
|
|
704
|
+
const upstreamHeaders = {
|
|
571
705
|
...headers,
|
|
572
|
-
host: `${
|
|
573
|
-
origin: `http://${dshHost}:${dshPort}`,
|
|
706
|
+
host: `${target.host}:${target.port}`,
|
|
574
707
|
};
|
|
575
|
-
if (
|
|
576
|
-
|
|
708
|
+
if (target.dsh) {
|
|
709
|
+
upstreamHeaders.origin = `http://${target.host}:${target.port}`;
|
|
710
|
+
if (cookie) upstreamHeaders.cookie = cookie;
|
|
711
|
+
} else {
|
|
712
|
+
delete upstreamHeaders.origin;
|
|
713
|
+
// 插件上游不透传 dshost 站点 Cookie(dsh_session 等),业务自身的
|
|
714
|
+
// Bearer authorization 保留(relay 侧已放行)。
|
|
715
|
+
delete upstreamHeaders.cookie;
|
|
716
|
+
Object.assign(upstreamHeaders, ssoHeaders(target.svc));
|
|
717
|
+
const basic = basicHeader(target.svc);
|
|
718
|
+
if (basic) upstreamHeaders.authorization = basic;
|
|
719
|
+
}
|
|
720
|
+
delete upstreamHeaders['content-length'];
|
|
577
721
|
|
|
578
722
|
const dshReq = http.request({
|
|
579
|
-
hostname:
|
|
580
|
-
port:
|
|
723
|
+
hostname: target.host,
|
|
724
|
+
port: target.port,
|
|
581
725
|
path,
|
|
582
726
|
method,
|
|
583
|
-
headers:
|
|
727
|
+
headers: upstreamHeaders,
|
|
584
728
|
}, (dshRes) => {
|
|
585
|
-
if (dshRes.statusCode === 401 && cookie) {
|
|
729
|
+
if (target.dsh && dshRes.statusCode === 401 && cookie) {
|
|
586
730
|
// Cached cookie rejected (launch token rotated, e.g. dsh restarted).
|
|
587
731
|
// Re-mint; body-less requests are retried once with the fresh
|
|
588
732
|
// cookie, everything else forwards the 401 and the browser app
|
|
@@ -640,14 +784,14 @@ export function startAgent(opts) {
|
|
|
640
784
|
streams.delete(streamId);
|
|
641
785
|
});
|
|
642
786
|
dshRes.on('error', () => {
|
|
643
|
-
send(ws, { type: 'error', streamId, message: 'Local dsh response error
|
|
787
|
+
send(ws, { type: 'error', streamId, message: `${target.dsh ? 'Local dsh' : `Plugin ${target.id}`} response error` });
|
|
644
788
|
streams.delete(streamId);
|
|
645
789
|
});
|
|
646
790
|
});
|
|
647
791
|
|
|
648
792
|
dshReq.on('error', (err) => {
|
|
649
793
|
log.error?.(`[agent] HTTP Error: ${err.message}`);
|
|
650
|
-
send(ws, { type: 'error', streamId, message: err.message });
|
|
794
|
+
send(ws, { type: 'error', streamId, message: `${target.dsh ? 'local dsh' : `plugin ${target.id}`} upstream: ${err.message}` });
|
|
651
795
|
streams.delete(streamId);
|
|
652
796
|
});
|
|
653
797
|
|
|
@@ -661,7 +805,9 @@ export function startAgent(opts) {
|
|
|
661
805
|
if (method === 'GET' || method === 'HEAD') dshReq.end();
|
|
662
806
|
};
|
|
663
807
|
|
|
664
|
-
if (
|
|
808
|
+
if (!target.dsh) {
|
|
809
|
+
issue(undefined);
|
|
810
|
+
} else if ((webToken || authCookie) && !authCookie) {
|
|
665
811
|
// A token is known but the eager mint has not landed yet (startup
|
|
666
812
|
// race): mint first, then issue. Body frames arriving during the mint
|
|
667
813
|
// window are dropped (no streams entry yet) — only POSTs racing the
|
|
@@ -675,19 +821,32 @@ export function startAgent(opts) {
|
|
|
675
821
|
|
|
676
822
|
function handleWsOpen(ws, msg) {
|
|
677
823
|
const { streamId, path, headers } = msg;
|
|
678
|
-
const
|
|
679
|
-
|
|
824
|
+
const target = resolveTarget(msg);
|
|
825
|
+
if (!target) {
|
|
826
|
+
send(ws, { type: 'error', streamId, message: `dsh-remote: plugin "${msg.target}" is not declared on this instance` });
|
|
827
|
+
return;
|
|
828
|
+
}
|
|
829
|
+
const dshWsUrl = `ws://${target.host}:${target.port}${path || '/'}`;
|
|
830
|
+
log.log?.(`[agent] WS OPEN stream ${streamId} -> ${target.id}@${dshWsUrl}`);
|
|
680
831
|
|
|
681
832
|
const options = {
|
|
682
833
|
headers: {
|
|
683
834
|
...headers,
|
|
684
|
-
host: `${
|
|
685
|
-
origin: `https://${dshHost}:${dshPort}`,
|
|
835
|
+
host: `${target.host}:${target.port}`,
|
|
686
836
|
},
|
|
687
837
|
rejectUnauthorized: false,
|
|
688
838
|
};
|
|
689
|
-
|
|
690
|
-
|
|
839
|
+
if (target.dsh) {
|
|
840
|
+
// dsh 信任栅栏要求 Origin 与本地 web 一致
|
|
841
|
+
options.headers.origin = `https://${target.host}:${target.port}`;
|
|
842
|
+
// dsh >= 0.1.2 gates the WS upgrade behind the same browser cookie.
|
|
843
|
+
if (authCookie) options.headers.cookie = authCookie;
|
|
844
|
+
} else {
|
|
845
|
+
delete options.headers.origin;
|
|
846
|
+
Object.assign(options.headers, ssoHeaders(target.svc));
|
|
847
|
+
const basic = basicHeader(target.svc);
|
|
848
|
+
if (basic) options.headers.authorization = basic;
|
|
849
|
+
}
|
|
691
850
|
|
|
692
851
|
const dshWs = new WebSocket(dshWsUrl, undefined, options);
|
|
693
852
|
const pending = [];
|
package/lib/index.js
CHANGED
|
@@ -18,8 +18,11 @@ export function apply(ctx, config) {
|
|
|
18
18
|
// Local dsh instance this plugin proxies (config-overridable for tests/dev)
|
|
19
19
|
const dshHost = config.dshHost || process.env.DSH_HOST || DSH_HOST;
|
|
20
20
|
const dshPort = parseInt(config.dshPort || process.env.DSH_PORT || String(DSH_PORT), 10);
|
|
21
|
+
// 插件工作区服务清单(cordis.patch.yml 的 config.services 数组)
|
|
22
|
+
const services = Array.isArray(config.services) ? config.services : [];
|
|
21
23
|
|
|
22
24
|
console.log('[dsh-remote] Plugin loaded, token:', token ? '***' : 'none');
|
|
25
|
+
if (services.length) console.log('[dsh-remote] Plugin services:', services.map((s) => s && s.id).filter(Boolean).join(', '));
|
|
23
26
|
|
|
24
27
|
if (!token) {
|
|
25
28
|
console.warn('[dsh-remote] No token configured. Please set token in settings.');
|
|
@@ -37,6 +40,7 @@ export function apply(ctx, config) {
|
|
|
37
40
|
relayUrl,
|
|
38
41
|
dshHost,
|
|
39
42
|
dshPort,
|
|
43
|
+
services,
|
|
40
44
|
});
|
|
41
45
|
|
|
42
46
|
// dsh >= 0.1.2 web auth: the web UI is gated behind a per-process one-time
|
package/lib/protocol.js
CHANGED
|
@@ -36,10 +36,10 @@ export function sanitizeCloseCode(code) {
|
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
// Relay -> Agent
|
|
39
|
-
export const HTTP_REQUEST = 'http:request'; // { streamId, method, path, headers }
|
|
39
|
+
export const HTTP_REQUEST = 'http:request'; // { streamId, method, path, headers, target? }
|
|
40
40
|
export const HTTP_BODY = 'http:body'; // { streamId, data }
|
|
41
41
|
export const HTTP_END = 'http:end'; // { streamId }
|
|
42
|
-
export const WS_OPEN = 'ws:open'; // { streamId, path, headers }
|
|
42
|
+
export const WS_OPEN = 'ws:open'; // { streamId, path, headers, target? }
|
|
43
43
|
export const WS_FRAME = 'ws:frame'; // { streamId, data, binary }
|
|
44
44
|
export const WS_CLOSE = 'ws:close'; // { streamId, code, reason }
|
|
45
45
|
|
|
@@ -53,3 +53,8 @@ export const ERROR = 'error'; // { streamId?, message }
|
|
|
53
53
|
export const REGISTER = 'register'; // Agent -> Relay: { token, version }
|
|
54
54
|
export const REGISTERED = 'registered'; // Relay -> Agent: { username, sessionId }
|
|
55
55
|
export const HEARTBEAT = 'heartbeat'; // { ts }
|
|
56
|
+
|
|
57
|
+
// Agent -> Relay: advertise the plugin workspace services declared in this
|
|
58
|
+
// instance's cordis config (config.services). Sent right after system-info.
|
|
59
|
+
// { services: [{id, name, desc, icon, auth, mount, upstreamLabel}] }
|
|
60
|
+
export const SERVICES = 'services';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dshost-plugin",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.9",
|
|
4
4
|
"description": "Official remote cloud relay plugin for DSHost (dshost.me): securely access your dsh Web UI from anywhere",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -14,8 +14,27 @@
|
|
|
14
14
|
"scripts"
|
|
15
15
|
],
|
|
16
16
|
"scripts": {
|
|
17
|
-
"prepack": "node scripts/prepack.mjs"
|
|
17
|
+
"prepack": "node scripts/prepack.mjs",
|
|
18
|
+
"prepare": "node scripts/prepack.mjs"
|
|
18
19
|
},
|
|
20
|
+
"keywords": [
|
|
21
|
+
"dsh",
|
|
22
|
+
"dsh-plugin",
|
|
23
|
+
"cordis",
|
|
24
|
+
"deepseek-harness",
|
|
25
|
+
"remote-access",
|
|
26
|
+
"relay",
|
|
27
|
+
"websocket",
|
|
28
|
+
"tunnel"
|
|
29
|
+
],
|
|
30
|
+
"repository": {
|
|
31
|
+
"type": "git",
|
|
32
|
+
"url": "git+https://github.com/NoelJudeNoel/dshost-plugin.git"
|
|
33
|
+
},
|
|
34
|
+
"bugs": {
|
|
35
|
+
"url": "https://github.com/NoelJudeNoel/dshost-plugin/issues"
|
|
36
|
+
},
|
|
37
|
+
"homepage": "https://dshost.me",
|
|
19
38
|
"license": "MIT",
|
|
20
39
|
"engines": {
|
|
21
40
|
"node": ">=22.5.0"
|
package/scripts/prepack.mjs
CHANGED
|
@@ -14,8 +14,16 @@ const here = path.dirname(fileURLToPath(import.meta.url));
|
|
|
14
14
|
const pkgRoot = path.resolve(here, '..');
|
|
15
15
|
const repoRoot = path.resolve(pkgRoot, '..', '..');
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
// Source resolution is layout-aware so one script serves both checkouts:
|
|
18
|
+
// · GitHub standalone repo (dshost-plugin): repo root == package root, with
|
|
19
|
+
// agent/core.js and common/protocol.js beside the package.
|
|
20
|
+
// · dshost monorepo (/root/dshost): sources live under src/.
|
|
21
|
+
const coreSrc = fs.existsSync(path.join(pkgRoot, 'agent', 'core.js'))
|
|
22
|
+
? path.join(pkgRoot, 'agent', 'core.js')
|
|
23
|
+
: path.join(repoRoot, 'src', 'agent', 'core.js');
|
|
24
|
+
const protocolSrc = fs.existsSync(path.join(pkgRoot, 'common', 'protocol.js'))
|
|
25
|
+
? path.join(pkgRoot, 'common', 'protocol.js')
|
|
26
|
+
: path.join(repoRoot, 'src', 'common', 'protocol.js');
|
|
19
27
|
const coreDest = path.join(pkgRoot, 'lib', 'core.js');
|
|
20
28
|
const protocolDest = path.join(pkgRoot, 'lib', 'protocol.js');
|
|
21
29
|
|