@team-work/sandbox-client 0.1.1-beta.0 → 0.2.0-beta.0
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 +5 -2
- package/dist/cli/index.js +0 -0
- package/dist/client/handshake.d.ts +7 -0
- package/dist/client/handshake.js +14 -1
- package/dist/client/handshake.js.map +1 -1
- package/dist/client/ws-client.d.ts +1 -1
- package/dist/client/ws-client.js +13 -2
- package/dist/client/ws-client.js.map +1 -1
- package/dist/daemon/launch.js +1 -1
- package/dist/daemon/launch.js.map +1 -1
- package/dist/handlers/terminal/pty-session.js +10 -3
- package/dist/handlers/terminal/pty-session.js.map +1 -1
- package/dist/update/self-update.js +9 -2
- package/dist/update/self-update.js.map +1 -1
- package/package.json +6 -2
- package/scripts/fix-pty-perms.js +38 -18
- package/dist/utils/pem.d.ts +0 -15
- package/dist/utils/pem.js +0 -31
- package/dist/utils/pem.js.map +0 -1
package/README.md
CHANGED
|
@@ -8,11 +8,14 @@ team-work 平台的 sandbox CLI 客户端。全局命令 `tw`，在用户机器
|
|
|
8
8
|
npm i -g @team-work/sandbox-client
|
|
9
9
|
```
|
|
10
10
|
|
|
11
|
+
支持 macOS / Linux / Windows 的 x64 和 arm64。PTY 使用 `@lydell/node-pty` 的平台预编译二进制，
|
|
12
|
+
安装时请保留 npm 的 optional dependencies（默认行为；不要加 `--omit=optional`）。
|
|
13
|
+
|
|
11
14
|
## 快速开始
|
|
12
15
|
|
|
13
16
|
```bash
|
|
14
|
-
# 1. 配置 sandbox 服务地址（ws://host:
|
|
15
|
-
tw config set serverUrl ws://10.0.0.1:
|
|
17
|
+
# 1. 配置 sandbox 服务地址（ws://host:8082/ws/sandbox/cli）
|
|
18
|
+
tw config set serverUrl ws://10.0.0.1:8082/ws/sandbox/cli
|
|
16
19
|
# 可选：自定义日志目录（默认 ~/.tw/logs）
|
|
17
20
|
tw config set logDir /var/log/tw
|
|
18
21
|
|
package/dist/cli/index.js
CHANGED
|
File without changes
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import { WebSocket } from 'ws';
|
|
2
2
|
import { Logger } from '../logging/logger.js';
|
|
3
|
+
/**
|
|
4
|
+
* 握手被服务端明确拒绝（hello-ack ok=false：密钥不匹配 / 沙箱不存在）。
|
|
5
|
+
* 区别于连接层失败（超时/断网），属永久性失败 —— CLI 不应重连，应提示用户更新配置。
|
|
6
|
+
*/
|
|
7
|
+
export declare class AuthRejectedError extends Error {
|
|
8
|
+
constructor(message: string);
|
|
9
|
+
}
|
|
3
10
|
/**
|
|
4
11
|
* 握手编排：hello → hello-ack → report → report-ack。
|
|
5
12
|
* 返回 authed；鉴权失败/超时 reject。
|
package/dist/client/handshake.js
CHANGED
|
@@ -1,9 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AuthRejectedError = void 0;
|
|
3
4
|
exports.handshake = handshake;
|
|
4
5
|
const frames_js_1 = require("./frames.js");
|
|
5
6
|
const report_js_1 = require("../system/report.js");
|
|
6
7
|
const protocol_js_1 = require("./protocol.js");
|
|
8
|
+
/**
|
|
9
|
+
* 握手被服务端明确拒绝（hello-ack ok=false：密钥不匹配 / 沙箱不存在）。
|
|
10
|
+
* 区别于连接层失败（超时/断网），属永久性失败 —— CLI 不应重连，应提示用户更新配置。
|
|
11
|
+
*/
|
|
12
|
+
class AuthRejectedError extends Error {
|
|
13
|
+
constructor(message) {
|
|
14
|
+
super(message);
|
|
15
|
+
this.name = 'AuthRejectedError';
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
exports.AuthRejectedError = AuthRejectedError;
|
|
7
19
|
/**
|
|
8
20
|
* 握手编排：hello → hello-ack → report → report-ack。
|
|
9
21
|
* 返回 authed；鉴权失败/超时 reject。
|
|
@@ -47,7 +59,8 @@ function handshake(ws, sandboxId, privateKey, logger) {
|
|
|
47
59
|
settled = true;
|
|
48
60
|
clearTimeout(authTimer);
|
|
49
61
|
ws.off('message', onMessage);
|
|
50
|
-
|
|
62
|
+
// 服务端明确拒绝（密钥不匹配/沙箱不存在）：用 AuthRejectedError 标记为永久性失败
|
|
63
|
+
reject(new AuthRejectedError(frame.error || 'hello-ack ok=false'));
|
|
51
64
|
}
|
|
52
65
|
return;
|
|
53
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handshake.js","sourceRoot":"","sources":["../../src/client/handshake.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"handshake.js","sourceRoot":"","sources":["../../src/client/handshake.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Logger } from '../logging/logger.js';
|
|
2
2
|
import { CliFrame } from './frames.js';
|
|
3
3
|
import { WsState } from '../instance/types.js';
|
|
4
|
-
export type ExitReason = 'auth-failed' | 'reconnect-exhausted' | 'signal' | 'kicked';
|
|
4
|
+
export type ExitReason = 'auth-failed' | 'auth-rejected' | 'reconnect-exhausted' | 'signal' | 'kicked';
|
|
5
5
|
export interface WsClientOptions {
|
|
6
6
|
serverUrl: string;
|
|
7
7
|
sandboxId: string;
|
package/dist/client/ws-client.js
CHANGED
|
@@ -54,6 +54,10 @@ class WsClient {
|
|
|
54
54
|
const result = await this.connectOnce();
|
|
55
55
|
if (this.shuttingDown)
|
|
56
56
|
return 'signal';
|
|
57
|
+
if (result === 'auth-rejected') {
|
|
58
|
+
// 永久性握手失败（密钥失效/沙箱不存在）：立即退出，不重连
|
|
59
|
+
return 'auth-rejected';
|
|
60
|
+
}
|
|
57
61
|
if (result === 'auth-failed') {
|
|
58
62
|
if (this.firstAttempt)
|
|
59
63
|
return 'auth-failed';
|
|
@@ -149,8 +153,15 @@ class WsClient {
|
|
|
149
153
|
});
|
|
150
154
|
})
|
|
151
155
|
.catch((err) => {
|
|
152
|
-
|
|
153
|
-
|
|
156
|
+
if (err instanceof handshake_js_1.AuthRejectedError) {
|
|
157
|
+
// 永久性拒绝（密钥失效/沙箱不存在）：不重连
|
|
158
|
+
this.opts.logger.error({ reason: err.message }, 'handshake rejected by server (permanent)');
|
|
159
|
+
done('auth-rejected');
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
this.opts.logger.error({ err: err instanceof Error ? err.message : String(err) }, 'handshake failed');
|
|
163
|
+
done('auth-failed');
|
|
164
|
+
}
|
|
154
165
|
});
|
|
155
166
|
};
|
|
156
167
|
ws.once('open', onOpen);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-client.js","sourceRoot":"","sources":["../../src/client/ws-client.ts"],"names":[],"mappings":";;;AAAA,2BAAwC;AAGxC,2CAMqB;AACrB,+CAOuB;AACvB,
|
|
1
|
+
{"version":3,"file":"ws-client.js","sourceRoot":"","sources":["../../src/client/ws-client.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon/launch.js
CHANGED
|
@@ -50,7 +50,7 @@ async function runDaemon(opts) {
|
|
|
50
50
|
let reason = 'signal';
|
|
51
51
|
try {
|
|
52
52
|
reason = await client.run();
|
|
53
|
-
exitCode = reason === 'auth-failed' || reason === 'reconnect-exhausted' ? 1 : 0;
|
|
53
|
+
exitCode = reason === 'auth-failed' || reason === 'auth-rejected' || reason === 'reconnect-exhausted' ? 1 : 0;
|
|
54
54
|
}
|
|
55
55
|
catch (err) {
|
|
56
56
|
reason = 'crashed';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.js","sourceRoot":"","sources":["../../src/daemon/launch.ts"],"names":[],"mappings":";;;AAuBA,8BA2DC;AAlFD,qCAAmC;AAGnC,iDAAoF;AACpF,yDAA8D;AAC9D,oDAA6D;AAgFpD,0FAhFY,qBAAS,OAgFZ;AA/ElB,6CAAuD;AAEvD,mDAA+F;AAC/F,2CAAoD;AAUpD;;;GAGG;AACI,KAAK,UAAU,SAAS,CAAC,IAAmB;IACjD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAA,0BAAkB,GAAE,CAAC;IAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,0BAAe,CAAC;IACrD,MAAM,MAAM,GAAG,IAAA,sBAAU,EAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAE/D,kBAAkB;IAClB,MAAM,OAAO,GAAG,IAAA,uBAAY,EAAC,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9D,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAClE,CAAC;IAED,UAAU;IACV,MAAM,GAAG,GAAmB;QAC1B,EAAE,EAAE,UAAU;QACd,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,SAAS,EAAE,IAAA,oBAAS,EAAC,IAAI,CAAC,UAAU,CAAC;QACrC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;QAChC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,YAAY;QACrB,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACpC,OAAO,EAAE,IAAA,0BAAe,EAAC,MAAM,EAAE,UAAU,CAAC;KAC7C,CAAC;IACF,IAAA,uBAAY,EAAC,GAAG,CAAC,CAAC;IAElB,MAAM,MAAM,GAAG,IAAI,uBAAQ,CAAC;QAC1B,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;QAChC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,MAAM;QACN,SAAS,EAAE,CAAC,CAAU,EAAE,EAAE,CAAC,IAAA,yBAAc,EAAC,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;KAC5G,CAAC,CAAC;IAEH,IAAA,iCAAqB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtC,MAAM,CAAC,IAAI,CACT,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,IAAA,kBAAQ,GAAE,EAAE,EACnG,oBAAoB,CACrB,CAAC;IAEF,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,MAAM,GAA2B,QAAQ,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;QAC5B,QAAQ,GAAG,MAAM,KAAK,aAAa,IAAI,MAAM,KAAK,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"launch.js","sourceRoot":"","sources":["../../src/daemon/launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,18 +34,19 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.PtySession = void 0;
|
|
37
|
-
const
|
|
37
|
+
const node_os_1 = require("node:os");
|
|
38
|
+
const pty = __importStar(require("@lydell/node-pty"));
|
|
38
39
|
class PtySession {
|
|
39
40
|
term;
|
|
40
41
|
logger;
|
|
41
42
|
constructor(sessionId, cols, rows, cb, logger) {
|
|
42
43
|
this.logger = logger.child({ sessionId });
|
|
43
|
-
const shell =
|
|
44
|
+
const shell = getDefaultShell();
|
|
44
45
|
this.term = pty.spawn(shell, [], {
|
|
45
46
|
name: 'xterm-256color',
|
|
46
47
|
cols: Math.max(1, cols),
|
|
47
48
|
rows: Math.max(1, rows),
|
|
48
|
-
cwd: process.env.HOME || process.
|
|
49
|
+
cwd: process.env.HOME || process.env.USERPROFILE || (0, node_os_1.homedir)(),
|
|
49
50
|
env: process.env,
|
|
50
51
|
});
|
|
51
52
|
this.term.onData((data) => cb.onData(data));
|
|
@@ -73,4 +74,10 @@ class PtySession {
|
|
|
73
74
|
}
|
|
74
75
|
}
|
|
75
76
|
exports.PtySession = PtySession;
|
|
77
|
+
function getDefaultShell() {
|
|
78
|
+
if (process.platform === 'win32') {
|
|
79
|
+
return process.env.ComSpec || 'powershell.exe';
|
|
80
|
+
}
|
|
81
|
+
return process.env.SHELL || (process.platform === 'darwin' ? '/bin/zsh' : '/bin/bash');
|
|
82
|
+
}
|
|
76
83
|
//# sourceMappingURL=pty-session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pty-session.js","sourceRoot":"","sources":["../../../src/handlers/terminal/pty-session.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"pty-session.js","sourceRoot":"","sources":["../../../src/handlers/terminal/pty-session.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAkC;AAElC,sDAAwC;AAcxC,MAAa,UAAU;IACb,IAAI,CAAW;IACf,MAAM,CAAS;IAEvB,YACE,SAAiB,EACjB,IAAY,EACZ,IAAY,EACZ,EAAgB,EAChB,MAAc;QAEd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1C,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAChC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE;YAC/B,IAAI,EAAE,gBAAgB;YACtB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC;YACvB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC;YACvB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,IAAA,iBAAO,GAAE;YAC7D,GAAG,EAAE,OAAO,CAAC,GAA6B;SAC3C,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,IAAY;QAChB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,MAAM,CAAC,IAAY,EAAE,IAAY;QAC/B,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QACzD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAC;QACnG,CAAC;IACH,CAAC;IAED,IAAI;QACF,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;CACF;AA5CD,gCA4CC;AAED,SAAS,eAAe;IACtB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,OAAO,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,gBAAgB,CAAC;IACjD,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;AACzF,CAAC"}
|
|
@@ -10,8 +10,14 @@ const info_js_1 = require("../utils/info.js");
|
|
|
10
10
|
function selfUpdate() {
|
|
11
11
|
const { name } = (0, info_js_1.getPkgInfo)();
|
|
12
12
|
const current = (0, info_js_1.getPkgInfo)().version;
|
|
13
|
+
// Windows 下 npm 是 npm.cmd。spawnSync 需要走 shell 才能从 PATH 解析它。
|
|
14
|
+
const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
15
|
+
const npmSpawnOptions = { shell: process.platform === 'win32' };
|
|
13
16
|
// npm view <name> version（取最新发布版本）
|
|
14
|
-
const view = (0, node_child_process_1.spawnSync)(
|
|
17
|
+
const view = (0, node_child_process_1.spawnSync)(npmCommand, ['view', name, 'version'], {
|
|
18
|
+
encoding: 'utf8',
|
|
19
|
+
...npmSpawnOptions,
|
|
20
|
+
});
|
|
15
21
|
if (view.status !== 0) {
|
|
16
22
|
return {
|
|
17
23
|
changed: false,
|
|
@@ -26,9 +32,10 @@ function selfUpdate() {
|
|
|
26
32
|
return { changed: false, message: `已是最新版本 ${current}` };
|
|
27
33
|
}
|
|
28
34
|
// npm i -g <name>@latest
|
|
29
|
-
const install = (0, node_child_process_1.spawnSync)(
|
|
35
|
+
const install = (0, node_child_process_1.spawnSync)(npmCommand, ['i', '-g', `${name}@latest`], {
|
|
30
36
|
encoding: 'utf8',
|
|
31
37
|
stdio: 'inherit',
|
|
38
|
+
...npmSpawnOptions,
|
|
32
39
|
});
|
|
33
40
|
if (install.status !== 0) {
|
|
34
41
|
return { changed: false, message: `更新失败（npm 退出码 ${install.status}）` };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"self-update.js","sourceRoot":"","sources":["../../src/update/self-update.ts"],"names":[],"mappings":";;AAQA,
|
|
1
|
+
{"version":3,"file":"self-update.js","sourceRoot":"","sources":["../../src/update/self-update.ts"],"names":[],"mappings":";;AAQA,gCAwCC;AAhDD,2DAA+C;AAE/C,8CAA8C;AAE9C;;;GAGG;AACH,SAAgB,UAAU;IACxB,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,oBAAU,GAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAA,oBAAU,GAAE,CAAC,OAAO,CAAC;IACrC,4DAA4D;IAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IACpE,MAAM,eAAe,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;IAEhE,mCAAmC;IACnC,MAAM,IAAI,GAAG,IAAA,8BAAS,EAAC,UAAU,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE;QAC5D,QAAQ,EAAE,MAAM;QAChB,GAAG,eAAe;KACnB,CAAC,CAAC;IACH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO;YACL,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,aAAa,EAAE;SAClF,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;IAClD,CAAC;IAED,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,OAAO,EAAE,EAAE,CAAC;IAC1D,CAAC;IAED,yBAAyB;IACzB,MAAM,OAAO,GAAG,IAAA,8BAAS,EAAC,UAAU,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,SAAS,CAAC,EAAE;QACnE,QAAQ,EAAE,MAAM;QAChB,KAAK,EAAE,SAAS;QAChB,GAAG,eAAe;KACnB,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,gBAAgB,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC;IACxE,CAAC;IACD,OAAO;QACL,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,OAAO,OAAO,MAAM,MAAM,qBAAqB;KACzD,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@team-work/sandbox-client",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0-beta.0",
|
|
4
4
|
"description": "team-work sandbox CLI client — connect to sandbox WS server and accept remote shell / pty / file operations",
|
|
5
5
|
"bin": {
|
|
6
6
|
"tw": "dist/cli/index.js"
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
],
|
|
32
32
|
"license": "MIT",
|
|
33
33
|
"dependencies": {
|
|
34
|
+
"@lydell/node-pty": "1.2.0-beta.15",
|
|
34
35
|
"commander": "^12.1.0",
|
|
35
|
-
"node-pty": "^1.0.0",
|
|
36
36
|
"pino": "^9.5.0",
|
|
37
37
|
"ws": "^8.18.0"
|
|
38
38
|
},
|
|
@@ -40,5 +40,9 @@
|
|
|
40
40
|
"@types/node": "^20.14.0",
|
|
41
41
|
"@types/ws": "^8.5.12",
|
|
42
42
|
"typescript": "^5.5.4"
|
|
43
|
+
},
|
|
44
|
+
"publishConfig": {
|
|
45
|
+
"registry": "https://registry.npmjs.org/",
|
|
46
|
+
"access": "public"
|
|
43
47
|
}
|
|
44
48
|
}
|
package/scripts/fix-pty-perms.js
CHANGED
|
@@ -1,30 +1,50 @@
|
|
|
1
|
-
// node-pty 预编译二进制（prebuilds/<arch>/spawn-helper）经 npm 解包后常丢失可执行位，
|
|
1
|
+
// node-pty 预编译二进制（prebuilds/<platform>-<arch>/spawn-helper）经 npm 解包后常丢失可执行位，
|
|
2
2
|
// 导致 pty.spawn 同步抛 `posix_spawnp failed.`(EACCES)，CLI 守护进程一开终端就崩。
|
|
3
3
|
// postinstall 时补回 +x，保证各平台 prebuild 都可执行。
|
|
4
4
|
const { chmodSync, existsSync, readdirSync, statSync } = require('node:fs');
|
|
5
5
|
const { join } = require('node:path');
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
// npm 可能把依赖提升到全局/上层 node_modules，不能只看当前包自己的 node_modules。
|
|
8
|
+
let scopeDir;
|
|
9
|
+
for (const parent of require.resolve.paths('@lydell/node-pty') || []) {
|
|
10
|
+
const candidate = join(parent, '@lydell');
|
|
11
|
+
if (existsSync(candidate)) {
|
|
12
|
+
scopeDir = candidate;
|
|
13
|
+
break;
|
|
14
|
+
}
|
|
11
15
|
}
|
|
16
|
+
if (!scopeDir) process.exit(0);
|
|
12
17
|
|
|
13
18
|
let touched = 0;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
let foundPlatformPackage = false;
|
|
20
|
+
const platformPackage = `node-pty-${process.platform}-${process.arch}`;
|
|
21
|
+
for (const pkg of readdirSync(scopeDir)) {
|
|
22
|
+
if (!pkg.startsWith('node-pty-')) continue;
|
|
23
|
+
if (pkg === platformPackage) foundPlatformPackage = true;
|
|
24
|
+
const prebuildDir = join(scopeDir, pkg, 'prebuilds');
|
|
25
|
+
if (!existsSync(prebuildDir)) continue;
|
|
26
|
+
|
|
27
|
+
for (const platformArch of readdirSync(prebuildDir)) {
|
|
28
|
+
const dir = join(prebuildDir, platformArch);
|
|
29
|
+
if (!statSync(dir).isDirectory()) continue;
|
|
30
|
+
for (const bin of readdirSync(dir)) {
|
|
31
|
+
// spawn-helper 是 posix_spawn 拉起的可执行；pty.node 是 .node 动态库（也顺带补位，无害）
|
|
32
|
+
if (bin === 'spawn-helper' || bin.endsWith('.node')) {
|
|
33
|
+
const p = join(dir, bin);
|
|
34
|
+
try {
|
|
35
|
+
chmodSync(p, 0o755);
|
|
36
|
+
touched++;
|
|
37
|
+
} catch (err) {
|
|
38
|
+
console.warn(`[fix-pty-perms] chmod failed: ${p} (${err.message})`);
|
|
39
|
+
}
|
|
26
40
|
}
|
|
27
41
|
}
|
|
28
42
|
}
|
|
29
43
|
}
|
|
30
|
-
|
|
44
|
+
|
|
45
|
+
if (!foundPlatformPackage) {
|
|
46
|
+
console.error(`[fix-pty-perms] missing @lydell/node-pty-${platformPackage}. Do not install with --omit=optional.`);
|
|
47
|
+
process.exit(1);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
console.log(`[fix-pty-perms] ensured executable bit on ${touched} file(s) under @lydell/node-pty-*`);
|
package/dist/utils/pem.d.ts
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* 私钥归一化：复现 Node `generateKeyPairSync('rsa', { privateKeyEncoding: { type: 'pkcs8', format: 'pem' } })`
|
|
3
|
-
* 的输出格式，以字节匹配 sandbox DB 中 `oauth_sandbox.private_key`。
|
|
4
|
-
*
|
|
5
|
-
* 背景：oauth `SandboxesService.list()` 对外脱敏时去掉了 PEM 首尾与所有空白，
|
|
6
|
-
* 用户从 UI 复制到的是纯 base64 body；而 sandbox `findByPrivateKeyMatch` 用
|
|
7
|
-
* `safeEqual(row.privateKey, privateKey)` 精确比对 DB 原值（完整 PEM）。两者不一致
|
|
8
|
-
* → 鉴权失败 4001。本函数把用户输入还原成 DB 侧的完整 PEM。
|
|
9
|
-
*
|
|
10
|
-
* 支持三种输入：
|
|
11
|
-
* - 纯 base64 body（UI 复制）：重排 64 字符/行 + 加 BEGIN/END PRIVATE KEY 首尾 + 尾换行
|
|
12
|
-
* - 带字面 \n 的 PEM（mock-cli 风格）：\n 转真换行
|
|
13
|
-
* - 已带 PEM 首尾的真换行串：原样返回（补尾换行）
|
|
14
|
-
*/
|
|
15
|
-
export declare function normalizePrivateKey(key: string): string;
|
package/dist/utils/pem.js
DELETED
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizePrivateKey = normalizePrivateKey;
|
|
4
|
-
/**
|
|
5
|
-
* 私钥归一化：复现 Node `generateKeyPairSync('rsa', { privateKeyEncoding: { type: 'pkcs8', format: 'pem' } })`
|
|
6
|
-
* 的输出格式，以字节匹配 sandbox DB 中 `oauth_sandbox.private_key`。
|
|
7
|
-
*
|
|
8
|
-
* 背景：oauth `SandboxesService.list()` 对外脱敏时去掉了 PEM 首尾与所有空白，
|
|
9
|
-
* 用户从 UI 复制到的是纯 base64 body；而 sandbox `findByPrivateKeyMatch` 用
|
|
10
|
-
* `safeEqual(row.privateKey, privateKey)` 精确比对 DB 原值（完整 PEM）。两者不一致
|
|
11
|
-
* → 鉴权失败 4001。本函数把用户输入还原成 DB 侧的完整 PEM。
|
|
12
|
-
*
|
|
13
|
-
* 支持三种输入：
|
|
14
|
-
* - 纯 base64 body（UI 复制）：重排 64 字符/行 + 加 BEGIN/END PRIVATE KEY 首尾 + 尾换行
|
|
15
|
-
* - 带字面 \n 的 PEM（mock-cli 风格）：\n 转真换行
|
|
16
|
-
* - 已带 PEM 首尾的真换行串：原样返回（补尾换行）
|
|
17
|
-
*/
|
|
18
|
-
function normalizePrivateKey(key) {
|
|
19
|
-
let k = (key ?? '').replace(/\\n/g, '\n').trim();
|
|
20
|
-
if (k.includes('-----BEGIN')) {
|
|
21
|
-
if (!k.endsWith('\n'))
|
|
22
|
-
k += '\n';
|
|
23
|
-
return k;
|
|
24
|
-
}
|
|
25
|
-
const body = k.replace(/\s/g, '');
|
|
26
|
-
if (!body)
|
|
27
|
-
return k;
|
|
28
|
-
const lines = body.match(/.{1,64}/g) ?? [body];
|
|
29
|
-
return `-----BEGIN PRIVATE KEY-----\n${lines.join('\n')}\n-----END PRIVATE KEY-----\n`;
|
|
30
|
-
}
|
|
31
|
-
//# sourceMappingURL=pem.js.map
|
package/dist/utils/pem.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"pem.js","sourceRoot":"","sources":["../../src/utils/pem.ts"],"names":[],"mappings":";;AAcA,kDAUC;AAxBD;;;;;;;;;;;;;GAaG;AACH,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IACjD,IAAI,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,CAAC,IAAI,IAAI,CAAC;QACjC,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAClC,IAAI,CAAC,IAAI;QAAE,OAAO,CAAC,CAAC;IACpB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,OAAO,gCAAgC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC;AACzF,CAAC"}
|