@kaitranntt/ccs 8.0.0-dev.2 → 8.0.0-dev.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/dist/cliproxy/executor/claude-launcher.d.ts.map +1 -1
- package/dist/cliproxy/executor/claude-launcher.js +1 -3
- package/dist/cliproxy/executor/claude-launcher.js.map +1 -1
- package/dist/cliproxy/executor/session-bridge.d.ts +1 -16
- package/dist/cliproxy/executor/session-bridge.d.ts.map +1 -1
- package/dist/cliproxy/executor/session-bridge.js +2 -70
- package/dist/cliproxy/executor/session-bridge.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-launcher.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;AAEH,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAYpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAU/D,MAAM,WAAW,mBAAmB;IAClC,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,sEAAsE;IACtE,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,+BAA+B;IAC/B,GAAG,EAAE,cAAc,CAAC;IACpB,+BAA+B;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,0EAA0E;IAC1E,kBAAkB,EAAE,gBAAgB,EAAE,CAAC;IACvC,iEAAiE;IACjE,aAAa,EAAE,OAAO,CAAC;IACvB,sCAAsC;IACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,0CAA0C;IAC1C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,8EAA8E;IAC9E,iBAAiB,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;IACjD,iDAAiD;IACjD,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7C,4CAA4C;IAC5C,mBAAmB,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAChD,8CAA8C;IAC9C,qBAAqB,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACpD,yCAAyC;IACzC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrC,yCAAyC;IACzC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"claude-launcher.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;;;;AAEH,OAAO,EAAS,YAAY,EAAE,MAAM,eAAe,CAAC;AAYpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAU/D,MAAM,WAAW,mBAAmB;IAClC,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,sEAAsE;IACtE,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,+BAA+B;IAC/B,GAAG,EAAE,cAAc,CAAC;IACpB,+BAA+B;IAC/B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,0EAA0E;IAC1E,kBAAkB,EAAE,gBAAgB,EAAE,CAAC;IACvC,iEAAiE;IACjE,aAAa,EAAE,OAAO,CAAC;IACvB,sCAAsC;IACtC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,0CAA0C;IAC1C,qBAAqB,EAAE,OAAO,CAAC;IAC/B,8EAA8E;IAC9E,iBAAiB,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;IACjD,iDAAiD;IACjD,wBAAwB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7C,4CAA4C;IAC5C,mBAAmB,EAAE,mBAAmB,GAAG,IAAI,CAAC;IAChD,8CAA8C;IAC9C,qBAAqB,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACpD,yCAAyC;IACzC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACrC,yCAAyC;IACzC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC,CAyGtF"}
|
|
@@ -115,10 +115,8 @@ async function launchClaude(context) {
|
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
|
-
const hasSessionProxy = Boolean(codexReasoningProxy || toolSanitizationProxy || httpsTunnel);
|
|
119
|
-
const backgroundKeepAliveBaseUrl = hasSessionProxy ? tracedEnv.ANTHROPIC_BASE_URL : undefined;
|
|
120
118
|
// Wire cleanup handlers (process exit, SIGINT, SIGTERM, proxy teardown)
|
|
121
|
-
(0, session_bridge_1.setupCleanupHandlers)(claude, sessionId, cfg.port, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose
|
|
119
|
+
(0, session_bridge_1.setupCleanupHandlers)(claude, sessionId, cfg.port, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose);
|
|
122
120
|
return claude;
|
|
123
121
|
}
|
|
124
122
|
exports.launchClaude = launchClaude;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-launcher.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"claude-launcher.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/claude-launcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@
|
|
|
8
8
|
* - Startup lock coordination
|
|
9
9
|
*/
|
|
10
10
|
/// <reference types="node" />
|
|
11
|
-
/// <reference types="node" />
|
|
12
11
|
import { ChildProcess } from 'child_process';
|
|
13
12
|
import { CLIProxyBackend } from '../types';
|
|
14
13
|
export interface ProxySessionResult {
|
|
@@ -16,20 +15,6 @@ export interface ProxySessionResult {
|
|
|
16
15
|
proxy?: ChildProcess;
|
|
17
16
|
shouldSpawn: boolean;
|
|
18
17
|
}
|
|
19
|
-
export interface SessionProxyKeepAliveOptions {
|
|
20
|
-
backgroundKeepAliveBaseUrl?: string;
|
|
21
|
-
keepAlivePollIntervalMs?: number;
|
|
22
|
-
hasBackgroundWorkerUsingBaseUrl?: (baseUrl: string) => boolean;
|
|
23
|
-
}
|
|
24
|
-
export interface ShouldKeepSessionProxiesAliveOptions {
|
|
25
|
-
code: number | null;
|
|
26
|
-
signal: NodeJS.Signals | null;
|
|
27
|
-
backgroundKeepAliveBaseUrl?: string;
|
|
28
|
-
hasBackgroundWorkerUsingBaseUrl: (baseUrl: string) => boolean;
|
|
29
|
-
}
|
|
30
|
-
export declare function hasClaudeBackgroundWorkerUsingBaseUrlInProcessList(processList: string, baseUrl: string): boolean;
|
|
31
|
-
export declare function hasClaudeBackgroundWorkerUsingBaseUrl(baseUrl: string): boolean;
|
|
32
|
-
export declare function shouldKeepSessionProxiesAlive(options: ShouldKeepSessionProxiesAliveOptions): boolean;
|
|
33
18
|
/**
|
|
34
19
|
* Check for existing proxy and handle version mismatch, or determine if new spawn needed
|
|
35
20
|
*/
|
|
@@ -41,5 +26,5 @@ export declare function registerProxySession(port: number, pid: number, backend:
|
|
|
41
26
|
/**
|
|
42
27
|
* Setup cleanup handlers for session unregistration
|
|
43
28
|
*/
|
|
44
|
-
export declare function setupCleanupHandlers(claude: ChildProcess, sessionId: string | undefined, sessionPort: number, codexReasoningProxy: unknown, toolSanitizationProxy: unknown, httpsTunnel: unknown, verbose: boolean
|
|
29
|
+
export declare function setupCleanupHandlers(claude: ChildProcess, sessionId: string | undefined, sessionPort: number, codexReasoningProxy: unknown, toolSanitizationProxy: unknown, httpsTunnel: unknown, verbose: boolean): void;
|
|
45
30
|
//# sourceMappingURL=session-bridge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-bridge.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/session-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG
|
|
1
|
+
{"version":3,"file":"session-bridge.d.ts","sourceRoot":"","sources":["../../../src/cliproxy/executor/session-bridge.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAG7C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAgB3C,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,kBAAkB,CAAC,CA2G7B;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,OAAO,GACf,MAAM,CAWR;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,OAAO,EAC5B,qBAAqB,EAAE,OAAO,EAC9B,WAAW,EAAE,OAAO,EACpB,OAAO,EAAE,OAAO,GACf,IAAI,CAsDN"}
|
|
@@ -32,8 +32,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
32
32
|
return result;
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
exports.setupCleanupHandlers = exports.registerProxySession = exports.checkOrJoinProxy =
|
|
36
|
-
const child_process_1 = require("child_process");
|
|
35
|
+
exports.setupCleanupHandlers = exports.registerProxySession = exports.checkOrJoinProxy = void 0;
|
|
37
36
|
const ui_1 = require("../../utils/ui");
|
|
38
37
|
const binary_manager_1 = require("../binary-manager");
|
|
39
38
|
const session_tracker_1 = require("../session-tracker");
|
|
@@ -41,46 +40,6 @@ const proxy_detector_1 = require("../proxy/proxy-detector");
|
|
|
41
40
|
const startup_lock_1 = require("../services/startup-lock");
|
|
42
41
|
const platform_commands_1 = require("../../utils/platform-commands");
|
|
43
42
|
const quota_manager_1 = require("../quota/quota-manager");
|
|
44
|
-
const CLAUDE_BG_WORKER_ARGS = ['--bg-spare', '--bg-pty-host'];
|
|
45
|
-
function hasClaudeBackgroundWorkerUsingBaseUrlInProcessList(processList, baseUrl) {
|
|
46
|
-
const envNeedle = `ANTHROPIC_BASE_URL=${baseUrl}`;
|
|
47
|
-
return processList
|
|
48
|
-
.split(/\r?\n/)
|
|
49
|
-
.some((line) => line.includes(envNeedle) && CLAUDE_BG_WORKER_ARGS.some((arg) => line.includes(arg)));
|
|
50
|
-
}
|
|
51
|
-
exports.hasClaudeBackgroundWorkerUsingBaseUrlInProcessList = hasClaudeBackgroundWorkerUsingBaseUrlInProcessList;
|
|
52
|
-
function hasClaudeBackgroundWorkerUsingBaseUrl(baseUrl) {
|
|
53
|
-
if (process.platform === 'win32') {
|
|
54
|
-
return false;
|
|
55
|
-
}
|
|
56
|
-
for (const args of [['auxEww'], ['auxeww'], ['eww', '-axo', 'pid=,command=']]) {
|
|
57
|
-
try {
|
|
58
|
-
const processList = (0, child_process_1.execFileSync)('ps', args, {
|
|
59
|
-
encoding: 'utf8',
|
|
60
|
-
stdio: ['ignore', 'pipe', 'ignore'],
|
|
61
|
-
});
|
|
62
|
-
if (hasClaudeBackgroundWorkerUsingBaseUrlInProcessList(processList, baseUrl)) {
|
|
63
|
-
return true;
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
catch {
|
|
67
|
-
continue;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
return false;
|
|
71
|
-
}
|
|
72
|
-
exports.hasClaudeBackgroundWorkerUsingBaseUrl = hasClaudeBackgroundWorkerUsingBaseUrl;
|
|
73
|
-
function shouldKeepSessionProxiesAlive(options) {
|
|
74
|
-
if (options.code !== 0 || options.signal) {
|
|
75
|
-
return false;
|
|
76
|
-
}
|
|
77
|
-
const baseUrl = options.backgroundKeepAliveBaseUrl;
|
|
78
|
-
if (!baseUrl) {
|
|
79
|
-
return false;
|
|
80
|
-
}
|
|
81
|
-
return options.hasBackgroundWorkerUsingBaseUrl(baseUrl);
|
|
82
|
-
}
|
|
83
|
-
exports.shouldKeepSessionProxiesAlive = shouldKeepSessionProxiesAlive;
|
|
84
43
|
/**
|
|
85
44
|
* Check for existing proxy and handle version mismatch, or determine if new spawn needed
|
|
86
45
|
*/
|
|
@@ -192,7 +151,7 @@ exports.registerProxySession = registerProxySession;
|
|
|
192
151
|
/**
|
|
193
152
|
* Setup cleanup handlers for session unregistration
|
|
194
153
|
*/
|
|
195
|
-
function setupCleanupHandlers(claude, sessionId, sessionPort, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose
|
|
154
|
+
function setupCleanupHandlers(claude, sessionId, sessionPort, codexReasoningProxy, toolSanitizationProxy, httpsTunnel, verbose) {
|
|
196
155
|
const log = (msg) => {
|
|
197
156
|
if (verbose) {
|
|
198
157
|
console.error(`[cliproxy] ${msg}`);
|
|
@@ -217,19 +176,6 @@ function setupCleanupHandlers(claude, sessionId, sessionPort, codexReasoningProx
|
|
|
217
176
|
log(`Session ${sessionId} unregistered, proxy persists for other sessions or future use`);
|
|
218
177
|
}
|
|
219
178
|
};
|
|
220
|
-
// Security hardening: only allow keepalive when caller provides an explicit,
|
|
221
|
-
// trusted detector. Falling back to global process-list probing is spoofable.
|
|
222
|
-
const backgroundProbe = keepAliveOptions.hasBackgroundWorkerUsingBaseUrl;
|
|
223
|
-
const startKeepAliveWatcher = (baseUrl) => {
|
|
224
|
-
const timer = setInterval(() => {
|
|
225
|
-
if (backgroundProbe?.(baseUrl))
|
|
226
|
-
return;
|
|
227
|
-
log('No Claude bg worker is using the session proxy; cleaning up');
|
|
228
|
-
stopSessionResources();
|
|
229
|
-
process.exit(0);
|
|
230
|
-
}, keepAliveOptions.keepAlivePollIntervalMs ?? 30000);
|
|
231
|
-
timer.unref();
|
|
232
|
-
};
|
|
233
179
|
const cleanup = () => {
|
|
234
180
|
log('Parent signal received, cleaning up');
|
|
235
181
|
stopSessionResources();
|
|
@@ -237,20 +183,6 @@ function setupCleanupHandlers(claude, sessionId, sessionPort, codexReasoningProx
|
|
|
237
183
|
};
|
|
238
184
|
claude.on('exit', (code, signal) => {
|
|
239
185
|
log(`Claude exited: code=${code}, signal=${signal}`);
|
|
240
|
-
const backgroundKeepAliveBaseUrl = keepAliveOptions.backgroundKeepAliveBaseUrl;
|
|
241
|
-
if (backgroundProbe &&
|
|
242
|
-
shouldKeepSessionProxiesAlive({
|
|
243
|
-
code,
|
|
244
|
-
signal,
|
|
245
|
-
backgroundKeepAliveBaseUrl,
|
|
246
|
-
hasBackgroundWorkerUsingBaseUrl: backgroundProbe,
|
|
247
|
-
}) &&
|
|
248
|
-
backgroundKeepAliveBaseUrl) {
|
|
249
|
-
(0, quota_manager_1.stopQuotaMonitor)();
|
|
250
|
-
log(`Keeping session proxy alive for Claude bg worker: ${backgroundKeepAliveBaseUrl}`);
|
|
251
|
-
startKeepAliveWatcher(backgroundKeepAliveBaseUrl);
|
|
252
|
-
return;
|
|
253
|
-
}
|
|
254
186
|
stopSessionResources();
|
|
255
187
|
if (signal) {
|
|
256
188
|
process.kill(process.pid, signal);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-bridge.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/session-bridge.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"session-bridge.js","sourceRoot":"","sources":["../../../src/cliproxy/executor/session-bridge.ts"],"names":[],"mappings":"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"}
|