@jingyi0605/codingns 0.1.1 → 0.1.3
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 +14 -0
- package/dist/public/assets/{TerminalPage-CVG1cGAJ.js → TerminalPage-Nq5sPc5c.js} +19 -19
- package/dist/public/assets/index-9hnprhO7.css +1 -0
- package/dist/public/assets/index-BTpmuKhG.js +108 -0
- package/dist/public/index.html +2 -2
- package/dist/server/config/env.js +24 -3
- package/dist/server/config/env.js.map +1 -1
- package/dist/server/config/opencode-base-url-resolver.d.ts +13 -8
- package/dist/server/config/opencode-base-url-resolver.js +117 -147
- package/dist/server/config/opencode-base-url-resolver.js.map +1 -1
- package/dist/server/config/opencode-system-probe-helper-client.d.ts +18 -0
- package/dist/server/config/opencode-system-probe-helper-client.js +127 -0
- package/dist/server/config/opencode-system-probe-helper-client.js.map +1 -0
- package/dist/server/config/opencode-system-probe-helper-process.d.ts +1 -0
- package/dist/server/config/opencode-system-probe-helper-process.js +208 -0
- package/dist/server/config/opencode-system-probe-helper-process.js.map +1 -0
- package/dist/server/modules/git/git-command-helper-client.d.ts +25 -0
- package/dist/server/modules/git/git-command-helper-client.js +143 -0
- package/dist/server/modules/git/git-command-helper-client.js.map +1 -0
- package/dist/server/modules/git/git-command-helper-process.d.ts +1 -0
- package/dist/server/modules/git/git-command-helper-process.js +237 -0
- package/dist/server/modules/git/git-command-helper-process.js.map +1 -0
- package/dist/server/modules/git/git-command-runner.d.ts +8 -0
- package/dist/server/modules/git/git-command-runner.js +77 -6
- package/dist/server/modules/git/git-command-runner.js.map +1 -1
- package/dist/server/modules/git/git-controller.d.ts +4 -0
- package/dist/server/modules/git/git-controller.js +4 -1
- package/dist/server/modules/git/git-controller.js.map +1 -1
- package/dist/server/modules/git/git-read-service.d.ts +2 -1
- package/dist/server/modules/git/git-read-service.js +30 -0
- package/dist/server/modules/git/git-read-service.js.map +1 -1
- package/dist/server/modules/git/git-write-service.d.ts +1 -1
- package/dist/server/modules/git/git-write-service.js +8 -7
- package/dist/server/modules/git/git-write-service.js.map +1 -1
- package/dist/server/modules/git/types.d.ts +5 -0
- package/dist/server/modules/preferences/common.d.ts +2 -0
- package/dist/server/modules/preferences/common.js +13 -0
- package/dist/server/modules/preferences/common.js.map +1 -0
- package/dist/server/modules/preferences/profile-controller.d.ts +11 -0
- package/dist/server/modules/preferences/profile-controller.js +14 -0
- package/dist/server/modules/preferences/profile-controller.js.map +1 -0
- package/dist/server/modules/preferences/profile-service.d.ts +17 -0
- package/dist/server/modules/preferences/profile-service.js +213 -0
- package/dist/server/modules/preferences/profile-service.js.map +1 -0
- package/dist/server/modules/preferences/quick-phrase-controller.js +2 -12
- package/dist/server/modules/preferences/quick-phrase-controller.js.map +1 -1
- package/dist/server/modules/provider/codex-model-options.js +26 -165
- package/dist/server/modules/provider/codex-model-options.js.map +1 -1
- package/dist/server/modules/provider/opencode-model-options.js +6 -71
- package/dist/server/modules/provider/opencode-model-options.js.map +1 -1
- package/dist/server/modules/provider/provider-controller.d.ts +2 -0
- package/dist/server/modules/provider/provider-controller.js +21 -1
- package/dist/server/modules/provider/provider-controller.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-client.d.ts +25 -0
- package/dist/server/modules/provider/provider-discovery-helper-client.js +114 -0
- package/dist/server/modules/provider/provider-discovery-helper-client.js.map +1 -0
- package/dist/server/modules/provider/provider-discovery-helper-process.d.ts +1 -0
- package/dist/server/modules/provider/provider-discovery-helper-process.js +296 -0
- package/dist/server/modules/provider/provider-discovery-helper-process.js.map +1 -0
- package/dist/server/modules/sessions/claude-runtime-helper-client.d.ts +28 -0
- package/dist/server/modules/sessions/claude-runtime-helper-client.js +221 -0
- package/dist/server/modules/sessions/claude-runtime-helper-client.js.map +1 -0
- package/dist/server/modules/sessions/claude-runtime-helper-process.d.ts +1 -0
- package/dist/server/modules/sessions/claude-runtime-helper-process.js +146 -0
- package/dist/server/modules/sessions/claude-runtime-helper-process.js.map +1 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.d.ts +17 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.js +260 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.js.map +1 -0
- package/dist/server/modules/sessions/codex-app-server-helper-process.d.ts +1 -0
- package/dist/server/modules/sessions/codex-app-server-helper-process.js +484 -0
- package/dist/server/modules/sessions/codex-app-server-helper-process.js.map +1 -0
- package/dist/server/modules/sessions/session-activity-authority-service.d.ts +52 -0
- package/dist/server/modules/sessions/session-activity-authority-service.js +377 -0
- package/dist/server/modules/sessions/session-activity-authority-service.js.map +1 -0
- package/dist/server/modules/sessions/session-activity-inspector.js +80 -40
- package/dist/server/modules/sessions/session-activity-inspector.js.map +1 -1
- package/dist/server/modules/sessions/session-controller.d.ts +15 -1
- package/dist/server/modules/sessions/session-controller.js +14 -1
- package/dist/server/modules/sessions/session-controller.js.map +1 -1
- package/dist/server/modules/sessions/session-history-service.d.ts +4 -2
- package/dist/server/modules/sessions/session-history-service.js +167 -44
- package/dist/server/modules/sessions/session-history-service.js.map +1 -1
- package/dist/server/modules/sessions/session-live-runtime-service.d.ts +42 -4
- package/dist/server/modules/sessions/session-live-runtime-service.js +343 -51
- package/dist/server/modules/sessions/session-live-runtime-service.js.map +1 -1
- package/dist/server/modules/sessions/session-permission-request-service.d.ts +175 -0
- package/dist/server/modules/sessions/session-permission-request-service.js +1615 -0
- package/dist/server/modules/sessions/session-permission-request-service.js.map +1 -0
- package/dist/server/modules/sessions/session-provider-error-mapper.js +14 -0
- package/dist/server/modules/sessions/session-provider-error-mapper.js.map +1 -1
- package/dist/server/modules/terminal/command-template-service.d.ts +6 -2
- package/dist/server/modules/terminal/command-template-service.js +91 -5
- package/dist/server/modules/terminal/command-template-service.js.map +1 -1
- package/dist/server/modules/terminal/runtime/adapters/conpty-control-helper-client.d.ts +24 -0
- package/dist/server/modules/terminal/runtime/adapters/conpty-control-helper-client.js +104 -0
- package/dist/server/modules/terminal/runtime/adapters/conpty-control-helper-client.js.map +1 -0
- package/dist/server/modules/terminal/runtime/adapters/conpty-control-helper-process.d.ts +1 -0
- package/dist/server/modules/terminal/runtime/adapters/conpty-control-helper-process.js +96 -0
- package/dist/server/modules/terminal/runtime/adapters/conpty-control-helper-process.js.map +1 -0
- package/dist/server/modules/terminal/runtime/adapters/conpty-runtime-adapter.d.ts +37 -0
- package/dist/server/modules/terminal/runtime/adapters/conpty-runtime-adapter.js +123 -0
- package/dist/server/modules/terminal/runtime/adapters/conpty-runtime-adapter.js.map +1 -0
- package/dist/server/modules/terminal/runtime/adapters/embedded-pty-runtime-adapter.d.ts +12 -5
- package/dist/server/modules/terminal/runtime/adapters/embedded-pty-runtime-adapter.js +44 -4
- package/dist/server/modules/terminal/runtime/adapters/embedded-pty-runtime-adapter.js.map +1 -1
- package/dist/server/modules/terminal/runtime/adapters/tmux-helper-client.d.ts +14 -0
- package/dist/server/modules/terminal/runtime/adapters/tmux-helper-client.js +105 -0
- package/dist/server/modules/terminal/runtime/adapters/tmux-helper-client.js.map +1 -0
- package/dist/server/modules/terminal/runtime/adapters/tmux-helper-process.d.ts +1 -0
- package/dist/server/modules/terminal/runtime/adapters/tmux-helper-process.js +67 -0
- package/dist/server/modules/terminal/runtime/adapters/tmux-helper-process.js.map +1 -0
- package/dist/server/modules/terminal/runtime/adapters/tmux-runtime-adapter.d.ts +8 -12
- package/dist/server/modules/terminal/runtime/adapters/tmux-runtime-adapter.js +112 -21
- package/dist/server/modules/terminal/runtime/adapters/tmux-runtime-adapter.js.map +1 -1
- package/dist/server/modules/terminal/runtime/conpty-runtime-shared.d.ts +25 -0
- package/dist/server/modules/terminal/runtime/conpty-runtime-shared.js +124 -0
- package/dist/server/modules/terminal/runtime/conpty-runtime-shared.js.map +1 -0
- package/dist/server/modules/terminal/runtime/conpty-session-agent-process.d.ts +1 -0
- package/dist/server/modules/terminal/runtime/conpty-session-agent-process.js +205 -0
- package/dist/server/modules/terminal/runtime/conpty-session-agent-process.js.map +1 -0
- package/dist/server/modules/terminal/runtime/conpty-session-attach-client.d.ts +1 -0
- package/dist/server/modules/terminal/runtime/conpty-session-attach-client.js +108 -0
- package/dist/server/modules/terminal/runtime/conpty-session-attach-client.js.map +1 -0
- package/dist/server/modules/terminal/runtime/conpty-session-control-client.d.ts +1 -0
- package/dist/server/modules/terminal/runtime/conpty-session-control-client.js +90 -0
- package/dist/server/modules/terminal/runtime/conpty-session-control-client.js.map +1 -0
- package/dist/server/modules/terminal/runtime/pty-broker-agent-process.d.ts +1 -0
- package/dist/server/modules/terminal/runtime/pty-broker-agent-process.js +179 -0
- package/dist/server/modules/terminal/runtime/pty-broker-agent-process.js.map +1 -0
- package/dist/server/modules/terminal/runtime/pty-broker-client.d.ts +29 -0
- package/dist/server/modules/terminal/runtime/pty-broker-client.js +169 -0
- package/dist/server/modules/terminal/runtime/pty-broker-client.js.map +1 -0
- package/dist/server/modules/terminal/runtime/pty-broker-shared.d.ts +22 -0
- package/dist/server/modules/terminal/runtime/pty-broker-shared.js +123 -0
- package/dist/server/modules/terminal/runtime/pty-broker-shared.js.map +1 -0
- package/dist/server/modules/terminal/runtime/pty-host-attachment-manager.d.ts +1 -0
- package/dist/server/modules/terminal/runtime/pty-host-attachment-manager.js +11 -1
- package/dist/server/modules/terminal/runtime/pty-host-attachment-manager.js.map +1 -1
- package/dist/server/modules/terminal/runtime/terminal-log-file-store.d.ts +1 -0
- package/dist/server/modules/terminal/runtime/terminal-log-file-store.js +7 -1
- package/dist/server/modules/terminal/runtime/terminal-log-file-store.js.map +1 -1
- package/dist/server/modules/terminal/runtime/terminal-log-spooler.js +3 -2
- package/dist/server/modules/terminal/runtime/terminal-log-spooler.js.map +1 -1
- package/dist/server/modules/terminal/runtime/terminal-runtime-adapter.d.ts +5 -3
- package/dist/server/modules/terminal/runtime/terminal-runtime-manager.d.ts +11 -5
- package/dist/server/modules/terminal/runtime/terminal-runtime-manager.js +110 -13
- package/dist/server/modules/terminal/runtime/terminal-runtime-manager.js.map +1 -1
- package/dist/server/modules/terminal/template-reverse-proxy-service.d.ts +10 -0
- package/dist/server/modules/terminal/template-reverse-proxy-service.js +320 -0
- package/dist/server/modules/terminal/template-reverse-proxy-service.js.map +1 -0
- package/dist/server/modules/terminal/terminal-controller.d.ts +1 -0
- package/dist/server/modules/terminal/terminal-controller.js +23 -7
- package/dist/server/modules/terminal/terminal-controller.js.map +1 -1
- package/dist/server/modules/terminal/terminal-service.d.ts +30 -14
- package/dist/server/modules/terminal/terminal-service.js +260 -51
- package/dist/server/modules/terminal/terminal-service.js.map +1 -1
- package/dist/server/modules/terminal/terminal-shell.d.ts +4 -0
- package/dist/server/modules/terminal/terminal-shell.js +165 -18
- package/dist/server/modules/terminal/terminal-shell.js.map +1 -1
- package/dist/server/modules/workbench/workspace-file-watcher.d.ts +30 -0
- package/dist/server/modules/workbench/workspace-file-watcher.js +137 -0
- package/dist/server/modules/workbench/workspace-file-watcher.js.map +1 -0
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js +48 -7
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js.map +1 -1
- package/dist/server/routes/git.js +1 -0
- package/dist/server/routes/git.js.map +1 -1
- package/dist/server/routes/preferences.d.ts +2 -1
- package/dist/server/routes/preferences.js +3 -1
- package/dist/server/routes/preferences.js.map +1 -1
- package/dist/server/routes/proxy.d.ts +3 -0
- package/dist/server/routes/proxy.js +24 -0
- package/dist/server/routes/proxy.js.map +1 -0
- package/dist/server/routes/sessions.js +2 -0
- package/dist/server/routes/sessions.js.map +1 -1
- package/dist/server/server/create-server.d.ts +4 -0
- package/dist/server/server/create-server.js +29 -5
- package/dist/server/server/create-server.js.map +1 -1
- package/dist/server/shared/utils/command-launch.d.ts +6 -0
- package/dist/server/shared/utils/command-launch.js +39 -0
- package/dist/server/shared/utils/command-launch.js.map +1 -0
- package/dist/server/shared/utils/perf-log.d.ts +1 -0
- package/dist/server/shared/utils/perf-log.js +8 -2
- package/dist/server/shared/utils/perf-log.js.map +1 -1
- package/dist/server/shared/utils/permission-debug-log.d.ts +2 -0
- package/dist/server/shared/utils/permission-debug-log.js +40 -0
- package/dist/server/shared/utils/permission-debug-log.js.map +1 -0
- package/dist/server/shared/utils/terminal-debug-log.d.ts +4 -0
- package/dist/server/shared/utils/terminal-debug-log.js +71 -0
- package/dist/server/shared/utils/terminal-debug-log.js.map +1 -0
- package/dist/server/storage/repositories/terminal-command-template-repository.d.ts +1 -0
- package/dist/server/storage/repositories/terminal-command-template-repository.js +34 -3
- package/dist/server/storage/repositories/terminal-command-template-repository.js.map +1 -1
- package/dist/server/storage/repositories/user-preference-profile-repository.d.ts +8 -0
- package/dist/server/storage/repositories/user-preference-profile-repository.js +46 -0
- package/dist/server/storage/repositories/user-preference-profile-repository.js.map +1 -0
- package/dist/server/storage/sqlite/client.js +27 -0
- package/dist/server/storage/sqlite/client.js.map +1 -1
- package/dist/server/storage/sqlite/schema.sql +15 -0
- package/dist/server/types/domain.d.ts +30 -1
- package/dist/server/ws/terminal-ws-hub.d.ts +2 -0
- package/dist/server/ws/terminal-ws-hub.js +42 -5
- package/dist/server/ws/terminal-ws-hub.js.map +1 -1
- package/dist/server/ws/workbench-ws-hub.d.ts +9 -1
- package/dist/server/ws/workbench-ws-hub.js +132 -21
- package/dist/server/ws/workbench-ws-hub.js.map +1 -1
- package/dist/server/ws/ws-server.d.ts +22 -1
- package/dist/server/ws/ws-server.js +82 -44
- package/dist/server/ws/ws-server.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/claude-message-utils.js +42 -0
- package/node_modules/@codingns/session-sync-core/dist/claude-message-utils.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/patch-builder.d.ts +30 -0
- package/node_modules/@codingns/session-sync-core/dist/patch-builder.js +103 -0
- package/node_modules/@codingns/session-sync-core/dist/patch-builder.js.map +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.d.ts +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js +167 -7
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.d.ts +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode-permissions.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode-permissions.js +8 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode-permissions.js.map +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode-shared.js +31 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode-shared.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.d.ts +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js +8 -4
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.js +15 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/claude-runtime.d.ts +5 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/claude-runtime.js +85 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/claude-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.d.ts +25 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js +718 -17
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/opencode-runtime.d.ts +3 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/opencode-runtime.js +106 -23
- package/node_modules/@codingns/session-sync-core/dist/runtime/opencode-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/provider-runtime-service.d.ts +3 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/provider-runtime-service.js +19 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/provider-runtime-service.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/types.d.ts +3 -0
- package/node_modules/@codingns/session-sync-core/dist/services.d.ts +1 -1
- package/node_modules/@codingns/session-sync-core/dist/services.js +2 -2
- package/node_modules/@codingns/session-sync-core/dist/services.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/types.d.ts +1 -1
- package/package.json +3 -2
- package/scripts/postinstall.mjs +15 -8
- package/dist/public/assets/index-BUPByQPG.css +0 -1
- package/dist/public/assets/index-D1CwTkI2.js +0 -106
|
@@ -0,0 +1,320 @@
|
|
|
1
|
+
import http from "node:http";
|
|
2
|
+
import { AppError } from "../../shared/errors/app-error.js";
|
|
3
|
+
const UPSTREAM_HOST = "127.0.0.1";
|
|
4
|
+
const HOP_BY_HOP_HEADERS = new Set([
|
|
5
|
+
"connection",
|
|
6
|
+
"keep-alive",
|
|
7
|
+
"proxy-authenticate",
|
|
8
|
+
"proxy-authorization",
|
|
9
|
+
"te",
|
|
10
|
+
"trailer",
|
|
11
|
+
"upgrade"
|
|
12
|
+
]);
|
|
13
|
+
export class TemplateReverseProxyService {
|
|
14
|
+
commandTemplateService;
|
|
15
|
+
constructor(commandTemplateService) {
|
|
16
|
+
this.commandTemplateService = commandTemplateService;
|
|
17
|
+
}
|
|
18
|
+
async handleHttpProxy(request, reply) {
|
|
19
|
+
const parsed = parseProxyUrl(request.raw.url);
|
|
20
|
+
if (!parsed) {
|
|
21
|
+
throw new AppError({
|
|
22
|
+
statusCode: 404,
|
|
23
|
+
errorCode: "PROXY_NOT_FOUND",
|
|
24
|
+
detail: "代理路径不存在"
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
const template = this.commandTemplateService.getTemplateByProxySlug(parsed.proxySlug);
|
|
28
|
+
if (!template) {
|
|
29
|
+
throw new AppError({
|
|
30
|
+
statusCode: 404,
|
|
31
|
+
errorCode: "PROXY_NOT_FOUND",
|
|
32
|
+
detail: "代理地址不存在或未开启"
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
if (template.port === null) {
|
|
36
|
+
throw new AppError({
|
|
37
|
+
statusCode: 400,
|
|
38
|
+
errorCode: "PROXY_TARGET_INVALID",
|
|
39
|
+
detail: "代理目标未配置端口"
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
// 这里使用 hijack 直接接管底层响应流,避免 Fastify 再次包装导致流式返回失真。
|
|
43
|
+
reply.hijack();
|
|
44
|
+
const upstreamRequest = http.request({
|
|
45
|
+
host: UPSTREAM_HOST,
|
|
46
|
+
port: template.port,
|
|
47
|
+
method: request.method,
|
|
48
|
+
path: parsed.upstreamPath,
|
|
49
|
+
headers: buildUpstreamHeaders(request.raw.headers, template.port, false)
|
|
50
|
+
}, (upstreamResponse) => {
|
|
51
|
+
const statusCode = upstreamResponse.statusCode ?? 502;
|
|
52
|
+
const rewriteMode = resolveResponseRewriteMode(upstreamResponse.headers);
|
|
53
|
+
if (rewriteMode === "none") {
|
|
54
|
+
reply.raw.writeHead(statusCode, buildDownstreamHeaders(upstreamResponse.headers, parsed.proxySlug));
|
|
55
|
+
upstreamResponse.pipe(reply.raw);
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const chunks = [];
|
|
59
|
+
upstreamResponse.on("data", (chunk) => {
|
|
60
|
+
chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
|
|
61
|
+
});
|
|
62
|
+
upstreamResponse.on("end", () => {
|
|
63
|
+
const upstreamText = Buffer.concat(chunks).toString("utf8");
|
|
64
|
+
const rewrittenText = rewriteTextResponse(upstreamText, parsed.proxySlug, rewriteMode);
|
|
65
|
+
const bodyBuffer = Buffer.from(rewrittenText, "utf8");
|
|
66
|
+
reply.raw.writeHead(statusCode, buildDownstreamHeaders(upstreamResponse.headers, parsed.proxySlug, {
|
|
67
|
+
contentLength: bodyBuffer.byteLength
|
|
68
|
+
}));
|
|
69
|
+
reply.raw.end(bodyBuffer);
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
upstreamRequest.on("error", () => {
|
|
73
|
+
if (!reply.raw.headersSent) {
|
|
74
|
+
reply.raw.writeHead(502, {
|
|
75
|
+
"content-type": "application/json; charset=utf-8"
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
reply.raw.end(JSON.stringify({
|
|
79
|
+
error_code: "UPSTREAM_PROXY_FAILED",
|
|
80
|
+
detail: "代理上游服务失败",
|
|
81
|
+
timestamp: new Date().toISOString()
|
|
82
|
+
}));
|
|
83
|
+
});
|
|
84
|
+
// 客户端提前断开时,主动取消上游请求,避免悬挂连接。
|
|
85
|
+
reply.raw.on("close", () => {
|
|
86
|
+
upstreamRequest.destroy();
|
|
87
|
+
});
|
|
88
|
+
writeRequestBody(request, upstreamRequest);
|
|
89
|
+
}
|
|
90
|
+
handleWebSocketUpgrade(request, socket, head) {
|
|
91
|
+
const parsed = parseProxyUrl(request.url);
|
|
92
|
+
if (!parsed) {
|
|
93
|
+
return false;
|
|
94
|
+
}
|
|
95
|
+
const template = this.commandTemplateService.getTemplateByProxySlug(parsed.proxySlug);
|
|
96
|
+
if (!template || template.port === null) {
|
|
97
|
+
writeErrorResponse(socket, 404, "Proxy Not Found");
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
// WebSocket 升级不走 Fastify 路由,直接透传握手与后续双向字节流。
|
|
101
|
+
const upstreamRequest = http.request({
|
|
102
|
+
host: UPSTREAM_HOST,
|
|
103
|
+
port: template.port,
|
|
104
|
+
method: "GET",
|
|
105
|
+
path: parsed.upstreamPath,
|
|
106
|
+
headers: buildUpstreamHeaders(request.headers, template.port, true)
|
|
107
|
+
});
|
|
108
|
+
upstreamRequest.on("upgrade", (upstreamResponse, upstreamSocket, upstreamHead) => {
|
|
109
|
+
writeUpgradeResponse(socket, upstreamResponse);
|
|
110
|
+
if (upstreamHead.length > 0) {
|
|
111
|
+
socket.write(upstreamHead);
|
|
112
|
+
}
|
|
113
|
+
if (head.length > 0) {
|
|
114
|
+
upstreamSocket.write(head);
|
|
115
|
+
}
|
|
116
|
+
socket.pipe(upstreamSocket).pipe(socket);
|
|
117
|
+
upstreamSocket.on("error", () => {
|
|
118
|
+
socket.destroy();
|
|
119
|
+
});
|
|
120
|
+
socket.on("error", () => {
|
|
121
|
+
upstreamSocket.destroy();
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
upstreamRequest.on("response", (upstreamResponse) => {
|
|
125
|
+
const statusCode = upstreamResponse.statusCode ?? 502;
|
|
126
|
+
writeHttpResponse(socket, statusCode, upstreamResponse.statusMessage ?? "Bad Gateway", upstreamResponse.headers);
|
|
127
|
+
upstreamResponse.pipe(socket);
|
|
128
|
+
});
|
|
129
|
+
upstreamRequest.on("error", () => {
|
|
130
|
+
writeErrorResponse(socket, 502, "Bad Gateway");
|
|
131
|
+
});
|
|
132
|
+
upstreamRequest.end();
|
|
133
|
+
return true;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
function parseProxyUrl(rawUrl) {
|
|
137
|
+
const parsedUrl = new URL(rawUrl ?? "/", "http://127.0.0.1");
|
|
138
|
+
const match = parsedUrl.pathname.match(/^\/proxy\/([^/]+)(?:\/(.*))?$/);
|
|
139
|
+
if (!match) {
|
|
140
|
+
return null;
|
|
141
|
+
}
|
|
142
|
+
// 代理码仅允许字母数字,避免路径穿透与奇怪编码边界。
|
|
143
|
+
const proxySlug = match[1]?.trim().toLowerCase() ?? "";
|
|
144
|
+
if (!/^[a-z0-9]+$/.test(proxySlug)) {
|
|
145
|
+
return null;
|
|
146
|
+
}
|
|
147
|
+
const remainder = match[2] ?? "";
|
|
148
|
+
const upstreamPath = `/${remainder}${parsedUrl.search}`;
|
|
149
|
+
return {
|
|
150
|
+
proxySlug,
|
|
151
|
+
upstreamPath
|
|
152
|
+
};
|
|
153
|
+
}
|
|
154
|
+
function buildUpstreamHeaders(requestHeaders, port, includeUpgradeHeaders) {
|
|
155
|
+
const headers = {};
|
|
156
|
+
for (const [key, value] of Object.entries(requestHeaders)) {
|
|
157
|
+
const normalizedKey = key.toLowerCase();
|
|
158
|
+
if (!key || value === undefined || HOP_BY_HOP_HEADERS.has(normalizedKey)) {
|
|
159
|
+
continue;
|
|
160
|
+
}
|
|
161
|
+
// 禁止压缩响应,方便代理层按纯文本改写 HTML 里的根路径资源引用。
|
|
162
|
+
if (!includeUpgradeHeaders && normalizedKey === "accept-encoding") {
|
|
163
|
+
continue;
|
|
164
|
+
}
|
|
165
|
+
headers[key] = value;
|
|
166
|
+
}
|
|
167
|
+
headers.host = `${UPSTREAM_HOST}:${port}`;
|
|
168
|
+
if (includeUpgradeHeaders) {
|
|
169
|
+
const connection = requestHeaders.connection;
|
|
170
|
+
const upgrade = requestHeaders.upgrade;
|
|
171
|
+
if (connection) {
|
|
172
|
+
headers.connection = connection;
|
|
173
|
+
}
|
|
174
|
+
if (upgrade) {
|
|
175
|
+
headers.upgrade = upgrade;
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
return headers;
|
|
179
|
+
}
|
|
180
|
+
function stripHopByHopHeaders(headers) {
|
|
181
|
+
const nextHeaders = {};
|
|
182
|
+
for (const [key, value] of Object.entries(headers)) {
|
|
183
|
+
if (!key || value === undefined || HOP_BY_HOP_HEADERS.has(key.toLowerCase())) {
|
|
184
|
+
continue;
|
|
185
|
+
}
|
|
186
|
+
nextHeaders[key] = value;
|
|
187
|
+
}
|
|
188
|
+
return nextHeaders;
|
|
189
|
+
}
|
|
190
|
+
function buildDownstreamHeaders(headers, proxySlug, options) {
|
|
191
|
+
const nextHeaders = stripHopByHopHeaders(headers);
|
|
192
|
+
const location = nextHeaders["location"];
|
|
193
|
+
if (typeof location === "string") {
|
|
194
|
+
nextHeaders["location"] = rewriteRedirectLocation(location, proxySlug);
|
|
195
|
+
}
|
|
196
|
+
if (options?.contentLength !== undefined) {
|
|
197
|
+
delete nextHeaders["content-length"];
|
|
198
|
+
nextHeaders["content-length"] = String(options.contentLength);
|
|
199
|
+
}
|
|
200
|
+
return nextHeaders;
|
|
201
|
+
}
|
|
202
|
+
function resolveResponseRewriteMode(headers) {
|
|
203
|
+
const contentType = String(headers["content-type"] ?? "").toLowerCase();
|
|
204
|
+
const contentEncoding = String(headers["content-encoding"] ?? "").trim();
|
|
205
|
+
if (contentEncoding) {
|
|
206
|
+
return "none";
|
|
207
|
+
}
|
|
208
|
+
if (contentType.includes("text/html")) {
|
|
209
|
+
return "html";
|
|
210
|
+
}
|
|
211
|
+
if (contentType.includes("text/javascript")
|
|
212
|
+
|| contentType.includes("application/javascript")
|
|
213
|
+
|| contentType.includes("application/x-javascript")
|
|
214
|
+
|| contentType.includes("application/ecmascript")
|
|
215
|
+
|| contentType.includes("text/ecmascript")) {
|
|
216
|
+
return "javascript";
|
|
217
|
+
}
|
|
218
|
+
if (contentType.includes("text/css")) {
|
|
219
|
+
return "css";
|
|
220
|
+
}
|
|
221
|
+
return "none";
|
|
222
|
+
}
|
|
223
|
+
function rewriteRedirectLocation(location, proxySlug) {
|
|
224
|
+
if (!location.startsWith("/")) {
|
|
225
|
+
return location;
|
|
226
|
+
}
|
|
227
|
+
if (location.startsWith(`/proxy/${proxySlug}/`) || location === `/proxy/${proxySlug}`) {
|
|
228
|
+
return location;
|
|
229
|
+
}
|
|
230
|
+
return `/proxy/${proxySlug}${location}`;
|
|
231
|
+
}
|
|
232
|
+
function rewriteTextResponse(source, proxySlug, rewriteMode) {
|
|
233
|
+
const proxyBasePath = `/proxy/${proxySlug}`;
|
|
234
|
+
const rewriteMarkupAttributes = (input) => input
|
|
235
|
+
.replace(/((?:src|href|action|poster)=["'])\/(?!\/|proxy\/)/gi, `$1${proxyBasePath}/`)
|
|
236
|
+
.replace(/(srcset=["'][^"']*?)\/(?!\/|proxy\/)/gi, `$1${proxyBasePath}/`);
|
|
237
|
+
const rewriteCssPaths = (input) => input
|
|
238
|
+
.replace(/(@import\s+["'])\/(?!\/|proxy\/)/gi, `$1${proxyBasePath}/`)
|
|
239
|
+
.replace(/(url\(["']?)\/(?!\/|proxy\/)/gi, `$1${proxyBasePath}/`);
|
|
240
|
+
const rewriteJavaScriptModulePaths = (input) => input
|
|
241
|
+
.replace(/(\bfrom\s*["'])\/(?!\/|proxy\/)/g, `$1${proxyBasePath}/`)
|
|
242
|
+
.replace(/(\bimport\s*["'])\/(?!\/|proxy\/)/g, `$1${proxyBasePath}/`)
|
|
243
|
+
.replace(/(\bimport\s*\(\s*["'])\/(?!\/|proxy\/)/g, `$1${proxyBasePath}/`)
|
|
244
|
+
.replace(/(\bexport\s+\*\s+from\s*["'])\/(?!\/|proxy\/)/g, `$1${proxyBasePath}/`)
|
|
245
|
+
.replace(/(\bfetch\s*\(\s*["'])\/(?!\/|proxy\/)/g, `$1${proxyBasePath}/`)
|
|
246
|
+
.replace(/(\bnew\s+URL\s*\(\s*["'])\/(?!\/|proxy\/)/g, `$1${proxyBasePath}/`);
|
|
247
|
+
const rewriteViteClientRuntime = (input) => input
|
|
248
|
+
.replace(/\$\{"\/"\}/g, `\${"${proxyBasePath}/"}`)
|
|
249
|
+
.replace(/const base = "\/" \|\| "\/";/g, `const base = "${proxyBasePath}/" || "${proxyBasePath}/";`);
|
|
250
|
+
if (rewriteMode === "html") {
|
|
251
|
+
return rewriteCssPaths(rewriteJavaScriptModulePaths(rewriteMarkupAttributes(source)));
|
|
252
|
+
}
|
|
253
|
+
if (rewriteMode === "css") {
|
|
254
|
+
return rewriteCssPaths(source);
|
|
255
|
+
}
|
|
256
|
+
return rewriteViteClientRuntime(rewriteJavaScriptModulePaths(source));
|
|
257
|
+
}
|
|
258
|
+
function writeRequestBody(request, upstreamRequest) {
|
|
259
|
+
const method = request.method.toUpperCase();
|
|
260
|
+
if (method === "GET" || method === "HEAD") {
|
|
261
|
+
upstreamRequest.end();
|
|
262
|
+
return;
|
|
263
|
+
}
|
|
264
|
+
// 代理作用域会把 body 作为原始流挂在 request.body,这里优先按流透传。
|
|
265
|
+
if (isReadableStream(request.body)) {
|
|
266
|
+
request.body.pipe(upstreamRequest);
|
|
267
|
+
return;
|
|
268
|
+
}
|
|
269
|
+
if (request.body === undefined || request.body === null) {
|
|
270
|
+
request.raw.pipe(upstreamRequest);
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
273
|
+
if (Buffer.isBuffer(request.body) || typeof request.body === "string") {
|
|
274
|
+
upstreamRequest.end(request.body);
|
|
275
|
+
return;
|
|
276
|
+
}
|
|
277
|
+
upstreamRequest.end(JSON.stringify(request.body));
|
|
278
|
+
}
|
|
279
|
+
function isReadableStream(value) {
|
|
280
|
+
return typeof value === "object" && value !== null && typeof value.pipe === "function";
|
|
281
|
+
}
|
|
282
|
+
function writeUpgradeResponse(socket, response) {
|
|
283
|
+
const statusCode = response.statusCode ?? 101;
|
|
284
|
+
const statusMessage = response.statusMessage ?? "Switching Protocols";
|
|
285
|
+
socket.write(`HTTP/1.1 ${statusCode} ${statusMessage}\r\n`);
|
|
286
|
+
for (const [key, value] of Object.entries(stripHopByHopHeaders(response.headers))) {
|
|
287
|
+
writeHeader(socket, key, value);
|
|
288
|
+
}
|
|
289
|
+
// WebSocket 升级响应必须保留 Upgrade 和 Connection 头。
|
|
290
|
+
writeHeader(socket, "upgrade", response.headers.upgrade ?? "websocket");
|
|
291
|
+
writeHeader(socket, "connection", "Upgrade");
|
|
292
|
+
socket.write("\r\n");
|
|
293
|
+
}
|
|
294
|
+
function writeHttpResponse(socket, statusCode, statusMessage, headers) {
|
|
295
|
+
socket.write(`HTTP/1.1 ${statusCode} ${statusMessage}\r\n`);
|
|
296
|
+
for (const [key, value] of Object.entries(stripHopByHopHeaders(headers))) {
|
|
297
|
+
writeHeader(socket, key, value);
|
|
298
|
+
}
|
|
299
|
+
socket.write("\r\n");
|
|
300
|
+
}
|
|
301
|
+
function writeHeader(socket, key, value) {
|
|
302
|
+
if (value === undefined) {
|
|
303
|
+
return;
|
|
304
|
+
}
|
|
305
|
+
if (Array.isArray(value)) {
|
|
306
|
+
for (const item of value) {
|
|
307
|
+
socket.write(`${key}: ${item}\r\n`);
|
|
308
|
+
}
|
|
309
|
+
return;
|
|
310
|
+
}
|
|
311
|
+
socket.write(`${key}: ${value}\r\n`);
|
|
312
|
+
}
|
|
313
|
+
function writeErrorResponse(socket, statusCode, message) {
|
|
314
|
+
if (socket.destroyed) {
|
|
315
|
+
return;
|
|
316
|
+
}
|
|
317
|
+
socket.write(`HTTP/1.1 ${statusCode} ${message}\r\nConnection: close\r\n\r\n`);
|
|
318
|
+
socket.destroy();
|
|
319
|
+
}
|
|
320
|
+
//# sourceMappingURL=template-reverse-proxy-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"template-reverse-proxy-service.js","sourceRoot":"","sources":["../../../../src/modules/terminal/template-reverse-proxy-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ export class TerminalController {
|
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
reply.send({
|
|
21
|
-
items: this.terminalService.listTerminals(workspaceId)
|
|
21
|
+
items: await this.terminalService.listTerminals(workspaceId)
|
|
22
22
|
});
|
|
23
23
|
};
|
|
24
24
|
createTerminal = async (request, reply) => {
|
|
@@ -31,7 +31,7 @@ export class TerminalController {
|
|
|
31
31
|
field: "workspaceId"
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
|
-
const terminal = this.terminalService.createTerminal({
|
|
34
|
+
const terminal = await this.terminalService.createTerminal({
|
|
35
35
|
workspaceId,
|
|
36
36
|
name: request.body.name?.trim(),
|
|
37
37
|
cwd: request.body.cwd?.trim(),
|
|
@@ -47,15 +47,15 @@ export class TerminalController {
|
|
|
47
47
|
});
|
|
48
48
|
};
|
|
49
49
|
closeTerminal = async (request, reply) => {
|
|
50
|
-
reply.send(this.terminalService.closeTerminal(request.params.terminalId));
|
|
50
|
+
reply.send(await this.terminalService.closeTerminal(request.params.terminalId));
|
|
51
51
|
};
|
|
52
52
|
deleteTerminal = async (request, reply) => {
|
|
53
|
-
reply.send(this.terminalService.deleteTerminal(request.params.terminalId));
|
|
53
|
+
reply.send(await this.terminalService.deleteTerminal(request.params.terminalId));
|
|
54
54
|
};
|
|
55
55
|
readHistory = async (request, reply) => {
|
|
56
56
|
const beforeSeq = normalizeOptionalInteger(request.query.beforeSeq, "beforeSeq");
|
|
57
57
|
const limit = normalizePositiveInteger(request.query.limit, 20, 100, "limit");
|
|
58
|
-
reply.send(this.terminalService.readTerminalHistory(request.params.terminalId, beforeSeq, limit));
|
|
58
|
+
reply.send(await this.terminalService.readTerminalHistory(request.params.terminalId, beforeSeq, limit));
|
|
59
59
|
};
|
|
60
60
|
writeInput = async (request, reply) => {
|
|
61
61
|
const content = request.body.content;
|
|
@@ -67,7 +67,7 @@ export class TerminalController {
|
|
|
67
67
|
field: "content"
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
|
-
reply.send(this.terminalService.writeInput(request.params.terminalId, content));
|
|
70
|
+
reply.send(await this.terminalService.writeInput(request.params.terminalId, content));
|
|
71
71
|
};
|
|
72
72
|
listTemplates = async (request, reply) => {
|
|
73
73
|
const workspaceId = request.query.workspaceId?.trim();
|
|
@@ -115,6 +115,7 @@ export class TerminalController {
|
|
|
115
115
|
args: normalizeArgs(request.body.args),
|
|
116
116
|
env: request.body.env,
|
|
117
117
|
port: normalizePort(request.body.port),
|
|
118
|
+
proxyEnabled: normalizeProxyEnabled(request.body.proxyEnabled),
|
|
118
119
|
runtimeType: normalizeRuntimeType(request.body.runtimeType)
|
|
119
120
|
});
|
|
120
121
|
reply.status(201).send(template);
|
|
@@ -128,6 +129,7 @@ export class TerminalController {
|
|
|
128
129
|
args: normalizeArgs(request.body.args),
|
|
129
130
|
env: request.body.env,
|
|
130
131
|
port: normalizePort(request.body.port),
|
|
132
|
+
proxyEnabled: normalizeProxyEnabled(request.body.proxyEnabled),
|
|
131
133
|
runtimeType: normalizeRuntimeType(request.body.runtimeType)
|
|
132
134
|
}));
|
|
133
135
|
};
|
|
@@ -135,7 +137,7 @@ export class TerminalController {
|
|
|
135
137
|
reply.send(this.commandTemplateService.deleteTemplate(request.params.templateId));
|
|
136
138
|
};
|
|
137
139
|
runTemplate = async (request, reply) => {
|
|
138
|
-
reply.send(this.commandTemplateService.runTemplate({
|
|
140
|
+
reply.send(await this.commandTemplateService.runTemplate({
|
|
139
141
|
templateId: request.params.templateId,
|
|
140
142
|
terminalId: request.body.terminalId?.trim(),
|
|
141
143
|
shell: request.body.shell?.trim(),
|
|
@@ -203,6 +205,20 @@ function normalizePort(input) {
|
|
|
203
205
|
}
|
|
204
206
|
return input;
|
|
205
207
|
}
|
|
208
|
+
function normalizeProxyEnabled(input) {
|
|
209
|
+
if (input === undefined) {
|
|
210
|
+
return undefined;
|
|
211
|
+
}
|
|
212
|
+
if (typeof input !== "boolean") {
|
|
213
|
+
throw new AppError({
|
|
214
|
+
statusCode: 400,
|
|
215
|
+
errorCode: "INVALID_INPUT",
|
|
216
|
+
detail: "proxyEnabled 必须是布尔值",
|
|
217
|
+
field: "proxyEnabled"
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
return input;
|
|
221
|
+
}
|
|
206
222
|
function normalizeOptionalInteger(input, field) {
|
|
207
223
|
if (input === undefined || input.trim() === "") {
|
|
208
224
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-controller.js","sourceRoot":"","sources":["../../../../src/modules/terminal/terminal-controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAE5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-controller.js","sourceRoot":"","sources":["../../../../src/modules/terminal/terminal-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,11 @@ interface CreateTerminalInput {
|
|
|
17
17
|
createdByUserId: string;
|
|
18
18
|
env?: Record<string, string>;
|
|
19
19
|
}
|
|
20
|
+
interface TerminalInputDebugContext {
|
|
21
|
+
clientTraceId?: string;
|
|
22
|
+
clientSentAtMs?: number | null;
|
|
23
|
+
wsReceivedAtMs?: number | null;
|
|
24
|
+
}
|
|
20
25
|
interface SubscribeTerminalCallbacks {
|
|
21
26
|
onBackfill: (payload: TerminalBackfillResult) => Promise<void> | void;
|
|
22
27
|
onOutput: (chunk: TerminalOutputChunk) => Promise<void> | void;
|
|
@@ -59,37 +64,41 @@ export declare class TerminalService extends EventEmitter {
|
|
|
59
64
|
private readonly workspaceService;
|
|
60
65
|
private readonly outputBuffer;
|
|
61
66
|
private readonly runtimeManager;
|
|
62
|
-
private readonly lastPersistedActivity;
|
|
63
67
|
private readonly terminalSubscriptionCounts;
|
|
64
68
|
private readonly pendingCloseReasons;
|
|
65
69
|
private readonly pendingDeletedTerminalIds;
|
|
70
|
+
private readonly pendingActivityByTerminalId;
|
|
71
|
+
private readonly pendingInputTraceByTerminalId;
|
|
72
|
+
private readonly pendingOutputByTerminalId;
|
|
66
73
|
private readonly terminalLogSpooler;
|
|
67
74
|
private readonly terminalLogFileRepository;
|
|
68
75
|
private readonly terminalLogSegmentRepository;
|
|
69
76
|
private readonly terminalLogFileStore;
|
|
77
|
+
private activityFlushTimer;
|
|
70
78
|
private isDisposing;
|
|
71
79
|
constructor(db: Database.Database, terminalInstanceRepository: TerminalInstanceRepository, terminalRuntimeSessionRepository: TerminalRuntimeSessionRepository, workspaceService: WorkspaceService, _idleTimeoutSeconds: number, options?: TerminalServiceOptions);
|
|
72
|
-
createTerminal(input: CreateTerminalInput): TerminalInstance
|
|
73
|
-
listTerminals(workspaceId: string): TerminalInstance[]
|
|
80
|
+
createTerminal(input: CreateTerminalInput): Promise<TerminalInstance>;
|
|
81
|
+
listTerminals(workspaceId: string): Promise<TerminalInstance[]>;
|
|
82
|
+
listTerminalSnapshotItems(workspaceId: string): TerminalInstance[];
|
|
74
83
|
getTerminalOrThrow(terminalId: string): TerminalInstance;
|
|
75
84
|
getRuntimeSessionOrThrow(runtimeSessionId: string): TerminalRuntimeSession;
|
|
76
|
-
closeTerminal(terminalId: string, reason?: TerminalCloseReason): {
|
|
85
|
+
closeTerminal(terminalId: string, reason?: TerminalCloseReason): Promise<{
|
|
77
86
|
success: true;
|
|
78
|
-
}
|
|
79
|
-
deleteTerminal(terminalId: string): {
|
|
87
|
+
}>;
|
|
88
|
+
deleteTerminal(terminalId: string): Promise<{
|
|
80
89
|
success: true;
|
|
81
|
-
}
|
|
82
|
-
writeInput(terminalId: string, content: string): {
|
|
90
|
+
}>;
|
|
91
|
+
writeInput(terminalId: string, content: string, debugContext?: TerminalInputDebugContext): Promise<{
|
|
83
92
|
accepted: true;
|
|
84
|
-
}
|
|
85
|
-
resizeTerminal(terminalId: string, cols: number, rows: number): {
|
|
93
|
+
}>;
|
|
94
|
+
resizeTerminal(terminalId: string, cols: number, rows: number): Promise<{
|
|
86
95
|
accepted: true;
|
|
87
|
-
}
|
|
88
|
-
subscribeTerminal(terminalId: string, lastCursor: string | null, callbacks: SubscribeTerminalCallbacks): {
|
|
96
|
+
}>;
|
|
97
|
+
subscribeTerminal(terminalId: string, lastCursor: string | null, callbacks: SubscribeTerminalCallbacks): Promise<{
|
|
89
98
|
close(): void;
|
|
90
|
-
}
|
|
99
|
+
}>;
|
|
91
100
|
dispose(): Promise<void>;
|
|
92
|
-
readTerminalHistory(terminalId: string, beforeSeq: number | null, limit: number): TerminalHistoryPageDto
|
|
101
|
+
readTerminalHistory(terminalId: string, beforeSeq: number | null, limit: number): Promise<TerminalHistoryPageDto>;
|
|
93
102
|
private readTerminalHistorySegments;
|
|
94
103
|
private handleRuntimeOutput;
|
|
95
104
|
private handleRuntimeExit;
|
|
@@ -108,5 +117,12 @@ export declare class TerminalService extends EventEmitter {
|
|
|
108
117
|
private detachRuntimeAttachmentIfIdle;
|
|
109
118
|
private flushTerminalLogs;
|
|
110
119
|
private clearTerminalLogs;
|
|
120
|
+
private getOrCreatePendingOutputBatch;
|
|
121
|
+
private flushPendingTerminalOutput;
|
|
122
|
+
private commitTerminalOutput;
|
|
123
|
+
private recordPendingInputTrace;
|
|
124
|
+
private scheduleActivityFlush;
|
|
125
|
+
private flushPendingActivity;
|
|
126
|
+
private clearActivityFlushTimerIfIdle;
|
|
111
127
|
}
|
|
112
128
|
export {};
|