@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,123 @@
|
|
|
1
|
+
import crypto from "node:crypto";
|
|
2
|
+
import fs from "node:fs";
|
|
3
|
+
import os from "node:os";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { fileURLToPath } from "node:url";
|
|
6
|
+
export function buildPtyBrokerEndpoint(sessionKey) {
|
|
7
|
+
const sessionHash = crypto.createHash("sha1").update(sessionKey).digest("hex").slice(0, 24);
|
|
8
|
+
if (process.platform === "win32") {
|
|
9
|
+
return `\\\\.\\pipe\\codingns-terminal-${sessionHash}`;
|
|
10
|
+
}
|
|
11
|
+
return path.join(os.tmpdir(), `codingns-terminal-${sessionHash}.sock`);
|
|
12
|
+
}
|
|
13
|
+
export function resolvePtyBrokerScriptLaunch(scriptBaseName) {
|
|
14
|
+
const currentFilePath = fileURLToPath(import.meta.url);
|
|
15
|
+
const currentDir = path.dirname(currentFilePath);
|
|
16
|
+
const isSourceFile = currentFilePath.endsWith(".ts");
|
|
17
|
+
const scriptPath = path.join(currentDir, `${scriptBaseName}${isSourceFile ? ".ts" : ".js"}`);
|
|
18
|
+
const hostAppRoot = resolveHostAppRoot(currentFilePath);
|
|
19
|
+
if (isSourceFile) {
|
|
20
|
+
return {
|
|
21
|
+
command: process.execPath,
|
|
22
|
+
args: ["--import", "tsx", scriptPath],
|
|
23
|
+
cwd: hostAppRoot
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
return {
|
|
27
|
+
command: process.execPath,
|
|
28
|
+
args: [scriptPath],
|
|
29
|
+
cwd: hostAppRoot
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
export function writeJsonLine(writer, payload) {
|
|
33
|
+
writer.write(`${JSON.stringify(payload)}\n`);
|
|
34
|
+
}
|
|
35
|
+
export function createJsonLineParser(onMessage) {
|
|
36
|
+
let buffer = "";
|
|
37
|
+
return {
|
|
38
|
+
push(chunk) {
|
|
39
|
+
buffer += typeof chunk === "string" ? chunk : chunk.toString("utf8");
|
|
40
|
+
while (true) {
|
|
41
|
+
const newlineIndex = buffer.indexOf("\n");
|
|
42
|
+
if (newlineIndex < 0) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
const line = buffer.slice(0, newlineIndex).trim();
|
|
46
|
+
buffer = buffer.slice(newlineIndex + 1);
|
|
47
|
+
if (!line) {
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
50
|
+
onMessage(JSON.parse(line));
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
export function encodeTerminalData(content) {
|
|
56
|
+
return Buffer.from(content, "utf8").toString("base64");
|
|
57
|
+
}
|
|
58
|
+
export function decodeTerminalData(content) {
|
|
59
|
+
return Buffer.from(content, "base64").toString("utf8");
|
|
60
|
+
}
|
|
61
|
+
export function parseCliArgs(argv) {
|
|
62
|
+
const result = new Map();
|
|
63
|
+
for (let index = 0; index < argv.length; index += 1) {
|
|
64
|
+
const current = argv[index];
|
|
65
|
+
if (!current?.startsWith("--")) {
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
68
|
+
const key = current.slice(2);
|
|
69
|
+
const nextValue = argv[index + 1];
|
|
70
|
+
if (!nextValue || nextValue.startsWith("--")) {
|
|
71
|
+
result.set(key, true);
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
result.set(key, nextValue);
|
|
75
|
+
index += 1;
|
|
76
|
+
}
|
|
77
|
+
return result;
|
|
78
|
+
}
|
|
79
|
+
export function readRequiredCliArg(args, key) {
|
|
80
|
+
const value = args.get(key);
|
|
81
|
+
if (typeof value !== "string" || value.length === 0) {
|
|
82
|
+
throw new Error(`缺少命令行参数 --${key}`);
|
|
83
|
+
}
|
|
84
|
+
return value;
|
|
85
|
+
}
|
|
86
|
+
export function normalizeProcessId(processId) {
|
|
87
|
+
if (typeof processId !== "number" || !Number.isInteger(processId) || processId <= 0) {
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
return processId;
|
|
91
|
+
}
|
|
92
|
+
export function normalizeShellExitCode(exitCode) {
|
|
93
|
+
if (typeof exitCode !== "number" || !Number.isInteger(exitCode)) {
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
return exitCode;
|
|
97
|
+
}
|
|
98
|
+
export function normalizeTerminalDimension(value, fallback, minimum) {
|
|
99
|
+
if (!Number.isInteger(value) || typeof value !== "number") {
|
|
100
|
+
return fallback;
|
|
101
|
+
}
|
|
102
|
+
return value >= minimum ? value : fallback;
|
|
103
|
+
}
|
|
104
|
+
export function preparePtyBrokerEndpoint(endpoint) {
|
|
105
|
+
if (process.platform === "win32") {
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
fs.rmSync(endpoint, { force: true });
|
|
109
|
+
}
|
|
110
|
+
export function cleanupPtyBrokerEndpoint(endpoint) {
|
|
111
|
+
if (process.platform === "win32") {
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
fs.rmSync(endpoint, { force: true });
|
|
115
|
+
}
|
|
116
|
+
function resolveHostAppRoot(currentFilePath) {
|
|
117
|
+
const srcRootCandidate = path.resolve(path.dirname(currentFilePath), "..", "..", "..");
|
|
118
|
+
const withoutSrc = path.basename(srcRootCandidate) === "src"
|
|
119
|
+
? path.dirname(srcRootCandidate)
|
|
120
|
+
: srcRootCandidate;
|
|
121
|
+
return path.basename(withoutSrc) === ".build" ? path.dirname(withoutSrc) : withoutSrc;
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=pty-broker-shared.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pty-broker-shared.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/pty-broker-shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ export declare class PtyHostAttachmentManager extends EventEmitter {
|
|
|
26
26
|
env: Record<string, string>;
|
|
27
27
|
cols?: number;
|
|
28
28
|
rows?: number;
|
|
29
|
+
closeStrategy?: "pty-kill" | "process-kill";
|
|
29
30
|
}): number | null;
|
|
30
31
|
write(attachmentId: string, content: string): void;
|
|
31
32
|
resize(attachmentId: string, cols: number, rows: number): void;
|
|
@@ -22,7 +22,8 @@ export class PtyHostAttachmentManager extends EventEmitter {
|
|
|
22
22
|
const processId = normalizeProcessId(ptyProcess.pid);
|
|
23
23
|
this.attachments.set(attachmentId, {
|
|
24
24
|
pty: ptyProcess,
|
|
25
|
-
processId
|
|
25
|
+
processId,
|
|
26
|
+
closeStrategy: input.closeStrategy ?? "pty-kill"
|
|
26
27
|
});
|
|
27
28
|
ptyProcess.onData((content) => {
|
|
28
29
|
this.emit("output", {
|
|
@@ -77,6 +78,15 @@ export class PtyHostAttachmentManager extends EventEmitter {
|
|
|
77
78
|
return;
|
|
78
79
|
}
|
|
79
80
|
this.requestedClose.add(attachmentId);
|
|
81
|
+
if (runtime.closeStrategy === "process-kill" && runtime.processId) {
|
|
82
|
+
try {
|
|
83
|
+
process.kill(runtime.processId);
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
// 进程已经结束时退回到 node-pty 默认关闭逻辑。
|
|
88
|
+
}
|
|
89
|
+
}
|
|
80
90
|
runtime.pty.kill();
|
|
81
91
|
}
|
|
82
92
|
isRunning(attachmentId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty-host-attachment-manager.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/pty-host-attachment-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAa,MAAM,UAAU,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC/C,IAAI,wBAAwB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"pty-host-attachment-manager.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/pty-host-attachment-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export interface TerminalLogAppendResult {
|
|
|
5
5
|
}
|
|
6
6
|
export declare class TerminalLogFileStore {
|
|
7
7
|
private readonly rootDir;
|
|
8
|
+
private readonly ensuredDirectories;
|
|
8
9
|
constructor(rootDir: string);
|
|
9
10
|
append(relativePath: string, content: string, currentSizeBytes: number): TerminalLogAppendResult;
|
|
10
11
|
deleteTerminalLogs(terminalId: string): void;
|
|
@@ -2,12 +2,17 @@ import { appendFileSync, closeSync, mkdirSync, openSync, readSync, rmSync } from
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
export class TerminalLogFileStore {
|
|
4
4
|
rootDir;
|
|
5
|
+
ensuredDirectories = new Set();
|
|
5
6
|
constructor(rootDir) {
|
|
6
7
|
this.rootDir = rootDir;
|
|
7
8
|
}
|
|
8
9
|
append(relativePath, content, currentSizeBytes) {
|
|
9
10
|
const filePath = this.resolvePath(relativePath);
|
|
10
|
-
|
|
11
|
+
const directoryPath = path.dirname(filePath);
|
|
12
|
+
if (!this.ensuredDirectories.has(directoryPath)) {
|
|
13
|
+
mkdirSync(directoryPath, { recursive: true });
|
|
14
|
+
this.ensuredDirectories.add(directoryPath);
|
|
15
|
+
}
|
|
11
16
|
appendFileSync(filePath, content, "utf8");
|
|
12
17
|
const byteLength = Buffer.byteLength(content, "utf8");
|
|
13
18
|
return {
|
|
@@ -18,6 +23,7 @@ export class TerminalLogFileStore {
|
|
|
18
23
|
}
|
|
19
24
|
deleteTerminalLogs(terminalId) {
|
|
20
25
|
const terminalDir = this.resolvePath(terminalId);
|
|
26
|
+
this.ensuredDirectories.delete(terminalDir);
|
|
21
27
|
rmSync(terminalDir, { recursive: true, force: true });
|
|
22
28
|
}
|
|
23
29
|
read(relativePath, startOffset, byteLength) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-log-file-store.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/terminal-log-file-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3F,OAAO,IAAI,MAAM,WAAW,CAAC;AAQ7B,MAAM,OAAO,oBAAoB;
|
|
1
|
+
{"version":3,"file":"terminal-log-file-store.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/terminal-log-file-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3F,OAAO,IAAI,MAAM,WAAW,CAAC;AAQ7B,MAAM,OAAO,oBAAoB;IAGF;IAFZ,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAExD,YAA6B,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IAEhD,MAAM,CAAC,YAAoB,EAAE,OAAe,EAAE,gBAAwB;QACpE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAE7C,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAChD,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC7C,CAAC;QAED,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAE1C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAEtD,OAAO;YACL,WAAW,EAAE,gBAAgB;YAC7B,SAAS,EAAE,gBAAgB,GAAG,UAAU;YACxC,UAAU;SACX,CAAC;IACJ,CAAC;IAED,kBAAkB,CAAC,UAAkB;QACnC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACjD,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC5C,MAAM,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,CAAC,YAAoB,EAAE,WAAmB,EAAE,UAAkB;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAExC,IAAI,CAAC;YACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACnD,CAAC;gBAAS,CAAC;YACT,SAAS,CAAC,EAAE,CAAC,CAAC;QAChB,CAAC;QAED,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,uBAAuB,CAAC,UAAkB;QACxC,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAEO,WAAW,CAAC,YAAoB;QACtC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAE9D,IAAI,YAAY,KAAK,YAAY,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YAC5F,MAAM,IAAI,KAAK,CAAC,8BAA8B,YAAY,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { createId } from "../../../shared/utils/id.js";
|
|
2
2
|
import { nowIso } from "../../../shared/utils/time.js";
|
|
3
3
|
import { TerminalLogFileStore } from "./terminal-log-file-store.js";
|
|
4
|
-
const DEFAULT_FLUSH_INTERVAL_MS =
|
|
5
|
-
const DEFAULT_MAX_BATCH_BYTES =
|
|
4
|
+
const DEFAULT_FLUSH_INTERVAL_MS = 2_000;
|
|
5
|
+
const DEFAULT_MAX_BATCH_BYTES = 256 * 1024;
|
|
6
6
|
export class TerminalLogSpooler {
|
|
7
7
|
options;
|
|
8
8
|
fileStore;
|
|
@@ -144,6 +144,7 @@ export class TerminalLogSpooler {
|
|
|
144
144
|
batch.timer = null;
|
|
145
145
|
this.flushTerminal(terminalId);
|
|
146
146
|
}, Math.max(0, delayMs));
|
|
147
|
+
batch.timer.unref?.();
|
|
147
148
|
}
|
|
148
149
|
clearBatchTimer(batch) {
|
|
149
150
|
if (batch.timer) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-log-spooler.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/terminal-log-spooler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAIvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAiBpE,MAAM,yBAAyB,GAAG,
|
|
1
|
+
{"version":3,"file":"terminal-log-spooler.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/terminal-log-spooler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { TerminalInstance, TerminalRuntimeSession, TerminalRuntimeType } fr
|
|
|
2
2
|
export interface PersistentSessionInspection {
|
|
3
3
|
alive: boolean;
|
|
4
4
|
shellPid: number | null;
|
|
5
|
+
agentPid?: number | null;
|
|
5
6
|
detail: string | null;
|
|
6
7
|
}
|
|
7
8
|
export interface HostAttachmentLaunch {
|
|
@@ -9,6 +10,7 @@ export interface HostAttachmentLaunch {
|
|
|
9
10
|
args: string[];
|
|
10
11
|
cwd: string;
|
|
11
12
|
env: Record<string, string>;
|
|
13
|
+
closeStrategy?: "pty-kill" | "process-kill";
|
|
12
14
|
}
|
|
13
15
|
export interface TerminalRuntimeAdapter {
|
|
14
16
|
readonly type: TerminalRuntimeType;
|
|
@@ -17,11 +19,11 @@ export interface TerminalRuntimeAdapter {
|
|
|
17
19
|
terminal: TerminalInstance;
|
|
18
20
|
session: TerminalRuntimeSession;
|
|
19
21
|
env: Record<string, string>;
|
|
20
|
-
}): PersistentSessionInspection
|
|
22
|
+
}): Promise<PersistentSessionInspection>;
|
|
21
23
|
inspectPersistentSession(input: {
|
|
22
24
|
terminal: TerminalInstance;
|
|
23
25
|
session: TerminalRuntimeSession;
|
|
24
|
-
}): PersistentSessionInspection
|
|
26
|
+
}): Promise<PersistentSessionInspection>;
|
|
25
27
|
buildHostAttachmentLaunch(input: {
|
|
26
28
|
terminal: TerminalInstance;
|
|
27
29
|
session: TerminalRuntimeSession;
|
|
@@ -30,5 +32,5 @@ export interface TerminalRuntimeAdapter {
|
|
|
30
32
|
terminatePersistentSession(input: {
|
|
31
33
|
terminal: TerminalInstance;
|
|
32
34
|
session: TerminalRuntimeSession;
|
|
33
|
-
}): void
|
|
35
|
+
}): Promise<void>;
|
|
34
36
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EventEmitter } from "node:events";
|
|
2
2
|
import type { TerminalInstance, TerminalRuntimeSession } from "../../../types/domain.js";
|
|
3
|
-
import type { PersistentSessionInspection } from "./terminal-runtime-adapter.js";
|
|
3
|
+
import type { PersistentSessionInspection, TerminalRuntimeAdapter } from "./terminal-runtime-adapter.js";
|
|
4
4
|
export interface RuntimeAttachmentExitEvent {
|
|
5
5
|
terminalId: string;
|
|
6
6
|
exitCode: number | null;
|
|
@@ -25,17 +25,23 @@ export declare class TerminalRuntimeManager extends EventEmitter {
|
|
|
25
25
|
private readonly attachmentManager;
|
|
26
26
|
private readonly adapters;
|
|
27
27
|
private readonly attachments;
|
|
28
|
+
private readonly brokerAttachments;
|
|
28
29
|
private readonly closeIntents;
|
|
29
30
|
constructor();
|
|
30
|
-
createPersistentSession(terminal: TerminalInstance, session: TerminalRuntimeSession, env: Record<string, string>): PersistentSessionInspection
|
|
31
|
-
inspectPersistentSession(terminal: TerminalInstance, session: TerminalRuntimeSession): PersistentSessionInspection
|
|
32
|
-
ensureAttached(terminal: TerminalInstance, session: TerminalRuntimeSession, env: Record<string, string>): number | null
|
|
31
|
+
createPersistentSession(terminal: TerminalInstance, session: TerminalRuntimeSession, env: Record<string, string>): Promise<PersistentSessionInspection>;
|
|
32
|
+
inspectPersistentSession(terminal: TerminalInstance, session: TerminalRuntimeSession): Promise<PersistentSessionInspection>;
|
|
33
|
+
ensureAttached(terminal: TerminalInstance, session: TerminalRuntimeSession, env: Record<string, string>): Promise<number | null>;
|
|
34
|
+
ensureLegacyAttached(terminal: TerminalInstance, session: TerminalRuntimeSession, env: Record<string, string>, adapter?: TerminalRuntimeAdapter): number | null;
|
|
33
35
|
write(terminalId: string, content: string): void;
|
|
34
36
|
resize(terminalId: string, cols: number, rows: number): void;
|
|
35
37
|
detach(terminalId: string): void;
|
|
36
|
-
terminateSession(terminal: TerminalInstance, session: TerminalRuntimeSession): boolean
|
|
38
|
+
terminateSession(terminal: TerminalInstance, session: TerminalRuntimeSession): Promise<boolean>;
|
|
37
39
|
isAttached(terminalId: string): boolean;
|
|
40
|
+
getProcessId(terminalId: string): number | null;
|
|
38
41
|
closeAllAttachments(): void;
|
|
39
42
|
private handleAttachmentExit;
|
|
43
|
+
private handleAttachmentExitAsync;
|
|
44
|
+
private getAttachedProcessId;
|
|
45
|
+
private getAttachedAgentPid;
|
|
40
46
|
private getAdapter;
|
|
41
47
|
}
|
|
@@ -1,14 +1,22 @@
|
|
|
1
1
|
import { EventEmitter } from "node:events";
|
|
2
|
+
import { ConptyRuntimeAdapter } from "./adapters/conpty-runtime-adapter.js";
|
|
2
3
|
import { EmbeddedPtyRuntimeAdapter } from "./adapters/embedded-pty-runtime-adapter.js";
|
|
3
4
|
import { TmuxRuntimeAdapter } from "./adapters/tmux-runtime-adapter.js";
|
|
5
|
+
import { buildConptyPipeName, isConptyRuntimeType } from "./conpty-runtime-shared.js";
|
|
6
|
+
import { PtyBrokerClient } from "./pty-broker-client.js";
|
|
7
|
+
import { buildPtyBrokerEndpoint } from "./pty-broker-shared.js";
|
|
4
8
|
import { PtyHostAttachmentManager } from "./pty-host-attachment-manager.js";
|
|
5
9
|
export class TerminalRuntimeManager extends EventEmitter {
|
|
6
10
|
attachmentManager = new PtyHostAttachmentManager();
|
|
7
11
|
adapters = new Map([
|
|
8
12
|
["embedded-pty", new EmbeddedPtyRuntimeAdapter()],
|
|
9
|
-
["tmux", new TmuxRuntimeAdapter()]
|
|
13
|
+
["tmux", new TmuxRuntimeAdapter()],
|
|
14
|
+
["conpty-powershell", new ConptyRuntimeAdapter("conpty-powershell")],
|
|
15
|
+
["conpty-cmd", new ConptyRuntimeAdapter("conpty-cmd")],
|
|
16
|
+
["conpty-git-bash", new ConptyRuntimeAdapter("conpty-git-bash")]
|
|
10
17
|
]);
|
|
11
18
|
attachments = new Map();
|
|
19
|
+
brokerAttachments = new Map();
|
|
12
20
|
closeIntents = new Map();
|
|
13
21
|
constructor() {
|
|
14
22
|
super();
|
|
@@ -22,32 +30,73 @@ export class TerminalRuntimeManager extends EventEmitter {
|
|
|
22
30
|
this.handleAttachmentExit(event);
|
|
23
31
|
});
|
|
24
32
|
}
|
|
25
|
-
createPersistentSession(terminal, session, env) {
|
|
33
|
+
async createPersistentSession(terminal, session, env) {
|
|
26
34
|
return this.getAdapter(session).createPersistentSession({
|
|
27
35
|
terminal,
|
|
28
36
|
session,
|
|
29
37
|
env
|
|
30
38
|
});
|
|
31
39
|
}
|
|
32
|
-
inspectPersistentSession(terminal, session) {
|
|
33
|
-
|
|
34
|
-
if (this.isAttached(terminal.id) && !adapter.survivesHostRestart) {
|
|
40
|
+
async inspectPersistentSession(terminal, session) {
|
|
41
|
+
if (this.isAttached(terminal.id) && session.runtimeType !== "tmux") {
|
|
35
42
|
return {
|
|
36
43
|
alive: true,
|
|
37
|
-
shellPid: this.
|
|
44
|
+
shellPid: this.getAttachedProcessId(terminal.id),
|
|
45
|
+
agentPid: this.getAttachedAgentPid(terminal.id),
|
|
38
46
|
detail: null
|
|
39
47
|
};
|
|
40
48
|
}
|
|
49
|
+
const adapter = this.getAdapter(session);
|
|
41
50
|
return adapter.inspectPersistentSession({
|
|
42
51
|
terminal,
|
|
43
52
|
session
|
|
44
53
|
});
|
|
45
54
|
}
|
|
46
|
-
ensureAttached(terminal, session, env) {
|
|
55
|
+
async ensureAttached(terminal, session, env) {
|
|
47
56
|
if (this.isAttached(terminal.id)) {
|
|
48
|
-
return this.
|
|
57
|
+
return this.getAttachedProcessId(terminal.id);
|
|
49
58
|
}
|
|
50
59
|
const adapter = this.getAdapter(session);
|
|
60
|
+
if (session.runtimeType === "embedded-pty" || isConptyRuntimeType(session.runtimeType)) {
|
|
61
|
+
const endpoint = session.runtimeType === "embedded-pty"
|
|
62
|
+
? buildPtyBrokerEndpoint(session.sessionKey)
|
|
63
|
+
: buildConptyPipeName(session.sessionKey);
|
|
64
|
+
const brokerClient = await PtyBrokerClient.connect(endpoint);
|
|
65
|
+
brokerClient.on("output", (content) => {
|
|
66
|
+
this.emit("output", {
|
|
67
|
+
terminalId: terminal.id,
|
|
68
|
+
content
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
brokerClient.on("exit", (event) => {
|
|
72
|
+
this.brokerAttachments.delete(terminal.id);
|
|
73
|
+
this.handleAttachmentExit({
|
|
74
|
+
attachmentId: terminal.id,
|
|
75
|
+
exitCode: event.exitCode,
|
|
76
|
+
requestedClose: event.requestedClose
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
this.attachments.set(terminal.id, {
|
|
80
|
+
terminal,
|
|
81
|
+
session,
|
|
82
|
+
adapter
|
|
83
|
+
});
|
|
84
|
+
this.brokerAttachments.set(terminal.id, {
|
|
85
|
+
client: brokerClient,
|
|
86
|
+
processId: brokerClient.getProcessId(),
|
|
87
|
+
agentPid: brokerClient.getAgentPid()
|
|
88
|
+
});
|
|
89
|
+
return brokerClient.getProcessId();
|
|
90
|
+
}
|
|
91
|
+
return this.ensureLegacyAttached(terminal, session, env, adapter);
|
|
92
|
+
}
|
|
93
|
+
ensureLegacyAttached(terminal, session, env, adapter = this.getAdapter(session)) {
|
|
94
|
+
if (this.isAttached(terminal.id)) {
|
|
95
|
+
return this.getAttachedProcessId(terminal.id);
|
|
96
|
+
}
|
|
97
|
+
if (session.runtimeType === "embedded-pty") {
|
|
98
|
+
throw new Error("embedded-pty 运行时必须通过 broker 异步附着");
|
|
99
|
+
}
|
|
51
100
|
const launch = adapter.buildHostAttachmentLaunch({
|
|
52
101
|
terminal,
|
|
53
102
|
session,
|
|
@@ -62,9 +111,19 @@ export class TerminalRuntimeManager extends EventEmitter {
|
|
|
62
111
|
return processId;
|
|
63
112
|
}
|
|
64
113
|
write(terminalId, content) {
|
|
114
|
+
const brokerAttachment = this.brokerAttachments.get(terminalId);
|
|
115
|
+
if (brokerAttachment) {
|
|
116
|
+
brokerAttachment.client.write(content);
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
65
119
|
this.attachmentManager.write(terminalId, content);
|
|
66
120
|
}
|
|
67
121
|
resize(terminalId, cols, rows) {
|
|
122
|
+
const brokerAttachment = this.brokerAttachments.get(terminalId);
|
|
123
|
+
if (brokerAttachment) {
|
|
124
|
+
brokerAttachment.client.resize(cols, rows);
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
68
127
|
this.attachmentManager.resize(terminalId, cols, rows);
|
|
69
128
|
}
|
|
70
129
|
detach(terminalId) {
|
|
@@ -72,36 +131,56 @@ export class TerminalRuntimeManager extends EventEmitter {
|
|
|
72
131
|
return;
|
|
73
132
|
}
|
|
74
133
|
this.closeIntents.set(terminalId, "detach");
|
|
134
|
+
const brokerAttachment = this.brokerAttachments.get(terminalId);
|
|
135
|
+
if (brokerAttachment) {
|
|
136
|
+
brokerAttachment.client.close();
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
75
139
|
this.attachmentManager.close(terminalId);
|
|
76
140
|
}
|
|
77
|
-
terminateSession(terminal, session) {
|
|
141
|
+
async terminateSession(terminal, session) {
|
|
78
142
|
const adapter = this.getAdapter(session);
|
|
79
143
|
const hadAttachment = this.isAttached(terminal.id);
|
|
80
144
|
if (hadAttachment) {
|
|
81
145
|
this.closeIntents.set(terminal.id, "terminate");
|
|
82
146
|
}
|
|
83
|
-
adapter.terminatePersistentSession({
|
|
147
|
+
await adapter.terminatePersistentSession({
|
|
84
148
|
terminal,
|
|
85
149
|
session
|
|
86
150
|
});
|
|
87
151
|
if (hadAttachment) {
|
|
152
|
+
const brokerAttachment = this.brokerAttachments.get(terminal.id);
|
|
153
|
+
if (brokerAttachment) {
|
|
154
|
+
brokerAttachment.client.terminate();
|
|
155
|
+
return hadAttachment;
|
|
156
|
+
}
|
|
88
157
|
this.attachmentManager.close(terminal.id);
|
|
89
158
|
}
|
|
90
159
|
return hadAttachment;
|
|
91
160
|
}
|
|
92
161
|
isAttached(terminalId) {
|
|
93
|
-
return this.attachmentManager.isRunning(terminalId);
|
|
162
|
+
return this.attachmentManager.isRunning(terminalId) || this.brokerAttachments.has(terminalId);
|
|
163
|
+
}
|
|
164
|
+
getProcessId(terminalId) {
|
|
165
|
+
return this.getAttachedProcessId(terminalId);
|
|
94
166
|
}
|
|
95
167
|
closeAllAttachments() {
|
|
96
168
|
for (const terminalId of this.attachments.keys()) {
|
|
97
169
|
this.closeIntents.set(terminalId, "detach");
|
|
98
170
|
}
|
|
171
|
+
for (const brokerAttachment of this.brokerAttachments.values()) {
|
|
172
|
+
brokerAttachment.client.close();
|
|
173
|
+
}
|
|
99
174
|
this.attachmentManager.closeAll();
|
|
100
175
|
}
|
|
101
176
|
handleAttachmentExit(event) {
|
|
177
|
+
void this.handleAttachmentExitAsync(event);
|
|
178
|
+
}
|
|
179
|
+
async handleAttachmentExitAsync(event) {
|
|
102
180
|
const attachment = this.attachments.get(event.attachmentId);
|
|
103
181
|
const intent = this.closeIntents.get(event.attachmentId) ?? null;
|
|
104
182
|
this.attachments.delete(event.attachmentId);
|
|
183
|
+
this.brokerAttachments.delete(event.attachmentId);
|
|
105
184
|
this.closeIntents.delete(event.attachmentId);
|
|
106
185
|
if (!attachment) {
|
|
107
186
|
this.emit("exit", {
|
|
@@ -114,19 +193,26 @@ export class TerminalRuntimeManager extends EventEmitter {
|
|
|
114
193
|
});
|
|
115
194
|
return;
|
|
116
195
|
}
|
|
117
|
-
const inspection = attachment.adapter.inspectPersistentSession({
|
|
196
|
+
const inspection = await attachment.adapter.inspectPersistentSession({
|
|
118
197
|
terminal: attachment.terminal,
|
|
119
198
|
session: attachment.session
|
|
120
199
|
});
|
|
121
200
|
this.emit("exit", {
|
|
122
201
|
terminalId: event.attachmentId,
|
|
123
|
-
exitCode: event.exitCode,
|
|
202
|
+
exitCode: extractExitCode(inspection.detail) ?? event.exitCode,
|
|
124
203
|
requestedClose: intent === "terminate" ? true : false,
|
|
125
204
|
sessionAlive: inspection.alive,
|
|
126
205
|
sessionDetail: inspection.detail,
|
|
127
206
|
shellPid: inspection.shellPid
|
|
128
207
|
});
|
|
129
208
|
}
|
|
209
|
+
getAttachedProcessId(terminalId) {
|
|
210
|
+
return this.brokerAttachments.get(terminalId)?.processId
|
|
211
|
+
?? this.attachmentManager.getProcessId(terminalId);
|
|
212
|
+
}
|
|
213
|
+
getAttachedAgentPid(terminalId) {
|
|
214
|
+
return this.brokerAttachments.get(terminalId)?.agentPid ?? null;
|
|
215
|
+
}
|
|
130
216
|
getAdapter(session) {
|
|
131
217
|
const adapter = this.adapters.get(session.runtimeType);
|
|
132
218
|
if (!adapter) {
|
|
@@ -135,4 +221,15 @@ export class TerminalRuntimeManager extends EventEmitter {
|
|
|
135
221
|
return adapter;
|
|
136
222
|
}
|
|
137
223
|
}
|
|
224
|
+
function extractExitCode(detail) {
|
|
225
|
+
if (!detail) {
|
|
226
|
+
return null;
|
|
227
|
+
}
|
|
228
|
+
const matched = detail.match(/exitCode=(\d+)/);
|
|
229
|
+
if (!matched) {
|
|
230
|
+
return null;
|
|
231
|
+
}
|
|
232
|
+
const exitCode = Number.parseInt(matched[1] ?? "", 10);
|
|
233
|
+
return Number.isInteger(exitCode) ? exitCode : null;
|
|
234
|
+
}
|
|
138
235
|
//# sourceMappingURL=terminal-runtime-manager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal-runtime-manager.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/terminal-runtime-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EACL,wBAAwB,EAEzB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal-runtime-manager.js","sourceRoot":"","sources":["../../../../../src/modules/terminal/runtime/terminal-runtime-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type IncomingMessage } from "node:http";
|
|
2
|
+
import type { Duplex } from "node:stream";
|
|
3
|
+
import type { FastifyReply, FastifyRequest } from "fastify";
|
|
4
|
+
import type { CommandTemplateService } from "./command-template-service.js";
|
|
5
|
+
export declare class TemplateReverseProxyService {
|
|
6
|
+
private readonly commandTemplateService;
|
|
7
|
+
constructor(commandTemplateService: CommandTemplateService);
|
|
8
|
+
handleHttpProxy(request: FastifyRequest, reply: FastifyReply): Promise<void>;
|
|
9
|
+
handleWebSocketUpgrade(request: IncomingMessage, socket: Duplex, head: Buffer): boolean;
|
|
10
|
+
}
|