@kaitranntt/ccs 8.8.1-dev.18 → 8.8.1-dev.19
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/commands/bar/bar-process-control.d.ts +43 -0
- package/dist/commands/bar/bar-process-control.d.ts.map +1 -0
- package/dist/commands/bar/bar-process-control.js +255 -0
- package/dist/commands/bar/bar-process-control.js.map +1 -0
- package/dist/commands/bar/bar-server-probe.d.ts +5 -2
- package/dist/commands/bar/bar-server-probe.d.ts.map +1 -1
- package/dist/commands/bar/bar-server-probe.js +38 -12
- package/dist/commands/bar/bar-server-probe.js.map +1 -1
- package/dist/commands/bar/help-subcommand.d.ts.map +1 -1
- package/dist/commands/bar/help-subcommand.js +2 -0
- package/dist/commands/bar/help-subcommand.js.map +1 -1
- package/dist/commands/bar/index.d.ts.map +1 -1
- package/dist/commands/bar/index.js +13 -3
- package/dist/commands/bar/index.js.map +1 -1
- package/dist/commands/bar/launch-descriptor.d.ts +2 -0
- package/dist/commands/bar/launch-descriptor.d.ts.map +1 -1
- package/dist/commands/bar/launch-descriptor.js +6 -1
- package/dist/commands/bar/launch-descriptor.js.map +1 -1
- package/dist/commands/bar/launch-subcommand.d.ts +18 -1
- package/dist/commands/bar/launch-subcommand.d.ts.map +1 -1
- package/dist/commands/bar/launch-subcommand.js +149 -45
- package/dist/commands/bar/launch-subcommand.js.map +1 -1
- package/dist/commands/bar/port-arg.d.ts +16 -0
- package/dist/commands/bar/port-arg.d.ts.map +1 -0
- package/dist/commands/bar/port-arg.js +41 -0
- package/dist/commands/bar/port-arg.js.map +1 -0
- package/dist/commands/bar/serve-subcommand.d.ts +5 -0
- package/dist/commands/bar/serve-subcommand.d.ts.map +1 -1
- package/dist/commands/bar/serve-subcommand.js +47 -29
- package/dist/commands/bar/serve-subcommand.js.map +1 -1
- package/dist/commands/bar/status-subcommand.d.ts.map +1 -1
- package/dist/commands/bar/status-subcommand.js +11 -2
- package/dist/commands/bar/status-subcommand.js.map +1 -1
- package/dist/commands/bar/stop-subcommand.d.ts +5 -0
- package/dist/commands/bar/stop-subcommand.d.ts.map +1 -1
- package/dist/commands/bar/stop-subcommand.js +71 -27
- package/dist/commands/bar/stop-subcommand.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-subcommand.js","sourceRoot":"","sources":["../../../src/commands/bar/serve-subcommand.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;GAYG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,2CAA6B;AAC7B,4EAA8D;AAC9D,2CAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"serve-subcommand.js","sourceRoot":"","sources":["../../../src/commands/bar/serve-subcommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-subcommand.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/status-subcommand.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"status-subcommand.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/status-subcommand.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAWH,MAAM,WAAW,UAAU;IACzB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,MAAM,CAAC;IACxB;;;OAGG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAChD;;;;OAIG;IACH,cAAc,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC;;;OAGG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD;;OAEG;IACH,kBAAkB,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;CAC5D;AA2DD,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,IAAI,GAAE,OAAO,CAAC,UAAU,CAAM,GAC7B,OAAO,CAAC,IAAI,CAAC,CAmDf"}
|
|
@@ -33,6 +33,7 @@ exports.handleBarStatus = void 0;
|
|
|
33
33
|
const fs = __importStar(require("fs"));
|
|
34
34
|
const config_loader_facade_1 = require("../../config/config-loader-facade");
|
|
35
35
|
const bar_paths_1 = require("./bar-paths");
|
|
36
|
+
const bar_process_control_1 = require("./bar-process-control");
|
|
36
37
|
// ---------------------------------------------------------------------------
|
|
37
38
|
// Default implementations
|
|
38
39
|
// ---------------------------------------------------------------------------
|
|
@@ -101,11 +102,19 @@ async function handleBarStatus(_args, deps = {}) {
|
|
|
101
102
|
console.log('[i] CCS Bar server: stopped (no server.pid)');
|
|
102
103
|
return;
|
|
103
104
|
}
|
|
104
|
-
const
|
|
105
|
-
if (
|
|
105
|
+
const processRecord = (0, bar_process_control_1.parseBarServerProcessRecord)(pidRaw);
|
|
106
|
+
if (processRecord === null) {
|
|
107
|
+
const legacyPid = (0, bar_process_control_1.parseLegacyServerPid)(pidRaw);
|
|
108
|
+
if (legacyPid !== null) {
|
|
109
|
+
console.log(`[!] CCS Bar server: legacy server.pid has unverified PID ${legacyPid}; status cannot safely identify it.`);
|
|
110
|
+
console.log(`[i] Verify manually with: ps -p ${legacyPid} -o command=`);
|
|
111
|
+
console.log('[i] If it is CCS Bar, stop it manually, remove server.pid, then restart.');
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
106
114
|
console.log(`[!] CCS Bar server: server.pid is invalid ("${pidRaw}")`);
|
|
107
115
|
return;
|
|
108
116
|
}
|
|
117
|
+
const { pid } = processRecord;
|
|
109
118
|
// 2. Check process liveness.
|
|
110
119
|
const alive = isProcessAlive(pid);
|
|
111
120
|
if (!alive) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-subcommand.js","sourceRoot":"","sources":["../../../src/commands/bar/status-subcommand.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,4EAA8D;AAC9D,2CAA+D;AA+
|
|
1
|
+
{"version":3,"file":"status-subcommand.js","sourceRoot":"","sources":["../../../src/commands/bar/status-subcommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@
|
|
|
4
4
|
* Reads ~/.ccs/bar/server.pid, sends SIGTERM, then removes pid + bar.json.
|
|
5
5
|
* ASCII output only. Non-fatal if the server is already gone.
|
|
6
6
|
*/
|
|
7
|
+
import { waitForProcessExit } from './bar-process-control';
|
|
8
|
+
import type { ClaimedBarServerStopOutcome } from './bar-process-control';
|
|
7
9
|
export interface StopDeps {
|
|
8
10
|
/** Returns ~/.ccs dir (respects CCS_HOME). */
|
|
9
11
|
getCcsDir: () => string;
|
|
@@ -17,6 +19,9 @@ export interface StopDeps {
|
|
|
17
19
|
* Throws if the signal cannot be delivered (e.g. ESRCH — no such process).
|
|
18
20
|
*/
|
|
19
21
|
killProcess: (pid: number, signal: 'SIGTERM') => void;
|
|
22
|
+
getProcessBirthIdentity: (pid: number) => string | null;
|
|
23
|
+
waitForProcessExit: typeof waitForProcessExit;
|
|
24
|
+
stopProcessFile: (pidPath: string) => Promise<ClaimedBarServerStopOutcome>;
|
|
20
25
|
/** Remove a file, ignoring errors if absent. */
|
|
21
26
|
removeFile: (filePath: string) => void;
|
|
22
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop-subcommand.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/stop-subcommand.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"stop-subcommand.d.ts","sourceRoot":"","sources":["../../../src/commands/bar/stop-subcommand.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAML,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAMzE,MAAM,WAAW,QAAQ;IACvB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,MAAM,CAAC;IACxB;;;OAGG;IACH,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAChD;;;OAGG;IACH,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IACtD,uBAAuB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACxD,kBAAkB,EAAE,OAAO,kBAAkB,CAAC;IAC9C,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,2BAA2B,CAAC,CAAC;IAC3E,gDAAgD;IAChD,UAAU,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACxC;AAkCD,wBAAsB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE,OAAO,CAAC,QAAQ,CAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6FhG"}
|
|
@@ -33,6 +33,7 @@ exports.handleBarStop = void 0;
|
|
|
33
33
|
const fs = __importStar(require("fs"));
|
|
34
34
|
const config_loader_facade_1 = require("../../config/config-loader-facade");
|
|
35
35
|
const bar_paths_1 = require("./bar-paths");
|
|
36
|
+
const bar_process_control_1 = require("./bar-process-control");
|
|
36
37
|
// ---------------------------------------------------------------------------
|
|
37
38
|
// Default implementations
|
|
38
39
|
// ---------------------------------------------------------------------------
|
|
@@ -66,42 +67,85 @@ async function handleBarStop(_args, deps = {}) {
|
|
|
66
67
|
const readPidFile = deps.readPidFile ?? defaultReadPidFile;
|
|
67
68
|
const killProcess = deps.killProcess ?? defaultKillProcess;
|
|
68
69
|
const removeFile = deps.removeFile ?? defaultRemoveFile;
|
|
70
|
+
const readProcessBirthIdentity = deps.getProcessBirthIdentity ?? bar_process_control_1.getProcessBirthIdentity;
|
|
71
|
+
const waitForExit = deps.waitForProcessExit ?? bar_process_control_1.waitForProcessExit;
|
|
69
72
|
const pidPath = (0, bar_paths_1.getServerPidPath)(ccsDir);
|
|
70
73
|
const barJsonPath = (0, bar_paths_1.getBarJsonPath)(ccsDir);
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
74
|
+
let outcome;
|
|
75
|
+
if (deps.stopProcessFile !== undefined || deps.readPidFile === undefined) {
|
|
76
|
+
const stopProcessFile = deps.stopProcessFile ??
|
|
77
|
+
((filePath) => (0, bar_process_control_1.stopBarServerProcessFile)(filePath, {
|
|
78
|
+
getProcessBirthIdentity: readProcessBirthIdentity,
|
|
79
|
+
killProcess,
|
|
80
|
+
waitForProcessExit: waitForExit,
|
|
81
|
+
}));
|
|
82
|
+
outcome = await stopProcessFile(pidPath);
|
|
83
|
+
if (outcome.result === 'no-record') {
|
|
84
|
+
console.log('[i] CCS Bar server is not running (no server.pid found).');
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
83
87
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
+
else {
|
|
89
|
+
// Injected record reads remain available for isolated unit tests. Production
|
|
90
|
+
// always uses the atomic file claim above.
|
|
91
|
+
const pidRaw = readPidFile(pidPath);
|
|
92
|
+
if (pidRaw === null) {
|
|
93
|
+
console.log('[i] CCS Bar server is not running (no server.pid found).');
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
const recordedOutcome = await (0, bar_process_control_1.stopRecordedBarServer)(pidRaw, {
|
|
97
|
+
getProcessBirthIdentity: readProcessBirthIdentity,
|
|
98
|
+
killProcess,
|
|
99
|
+
waitForProcessExit: waitForExit,
|
|
100
|
+
});
|
|
101
|
+
outcome = {
|
|
102
|
+
...recordedOutcome,
|
|
103
|
+
legacyPid: recordedOutcome.result === 'legacy-record'
|
|
104
|
+
? ((0, bar_process_control_1.parseLegacyServerPid)(pidRaw) ?? undefined)
|
|
105
|
+
: undefined,
|
|
106
|
+
};
|
|
88
107
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
if (
|
|
92
|
-
|
|
108
|
+
const pid = outcome.record?.pid;
|
|
109
|
+
if (outcome.result === 'stopped' || outcome.result === 'stale') {
|
|
110
|
+
if (outcome.result === 'stopped') {
|
|
111
|
+
console.log(`[OK] CCS Bar server stopped (PID ${pid}).`);
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
93
114
|
console.log(`[i] Server PID ${pid} is no longer running. Cleaning up stale files.`);
|
|
94
115
|
}
|
|
116
|
+
if (deps.readPidFile !== undefined) {
|
|
117
|
+
removeFile(pidPath);
|
|
118
|
+
removeFile(barJsonPath);
|
|
119
|
+
console.log('[i] Removed server.pid and bar.json.');
|
|
120
|
+
}
|
|
95
121
|
else {
|
|
96
|
-
const
|
|
97
|
-
|
|
98
|
-
|
|
122
|
+
const removedDiscovery = (0, bar_process_control_1.removeBarDiscoveryIfNoProcess)(barJsonPath, pidPath);
|
|
123
|
+
if (removedDiscovery)
|
|
124
|
+
console.log('[i] Removed server.pid and bar.json.');
|
|
125
|
+
else
|
|
126
|
+
console.log('[i] A replacement server record appeared; its recovery state was preserved.');
|
|
99
127
|
}
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
if (outcome.result === 'legacy-record') {
|
|
131
|
+
const legacyPid = outcome.legacyPid;
|
|
132
|
+
console.error(`[X] Legacy server.pid records PID ${legacyPid} without process identity; no signal was sent.`);
|
|
133
|
+
console.error(`[i] Verify manually with: ps -p ${legacyPid} -o command=`);
|
|
134
|
+
console.error(`[i] If it is CCS Bar, stop it manually, then remove ${outcome.recoveryPath ?? pidPath} and ${barJsonPath}.`);
|
|
135
|
+
process.exitCode = 1;
|
|
136
|
+
return;
|
|
100
137
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
138
|
+
const reason = outcome.result === 'invalid-record'
|
|
139
|
+
? 'server.pid does not contain a verified process record'
|
|
140
|
+
: outcome.result === 'identity-mismatch'
|
|
141
|
+
? `PID ${pid} belongs to a different process`
|
|
142
|
+
: outcome.result === 'permission-denied'
|
|
143
|
+
? `permission denied while signaling PID ${pid}`
|
|
144
|
+
: outcome.result === 'timeout'
|
|
145
|
+
? `PID ${pid} did not exit within 3 seconds`
|
|
146
|
+
: `failed to signal PID ${pid}: ${outcome.error?.message ?? 'unknown error'}`;
|
|
147
|
+
console.error(`[X] Refusing to remove CCS Bar recovery state: ${reason}.`);
|
|
148
|
+
process.exitCode = 1;
|
|
105
149
|
}
|
|
106
150
|
exports.handleBarStop = handleBarStop;
|
|
107
151
|
//# sourceMappingURL=stop-subcommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop-subcommand.js","sourceRoot":"","sources":["../../../src/commands/bar/stop-subcommand.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AACzB,4EAA8D;AAC9D,2CAA+D;
|
|
1
|
+
{"version":3,"file":"stop-subcommand.js","sourceRoot":"","sources":["../../../src/commands/bar/stop-subcommand.ts"],"names":[],"mappings":"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"}
|