@agent-link/agent 0.1.296 → 0.1.298
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/bootstrap-delegator.js +1 -1
- package/dist/bootstrap-delegator.js.map +1 -1
- package/dist/cli.js +55 -1
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +2 -0
- package/dist/config.js.map +1 -1
- package/dist/daemon.js +1 -1
- package/dist/daemon.js.map +1 -1
- package/dist/external-upgrade.d.ts +22 -0
- package/dist/external-upgrade.js +186 -0
- package/dist/external-upgrade.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.js +7 -2
- package/dist/index.js.map +1 -1
- package/dist/local-control-client.d.ts +4 -0
- package/dist/local-control-client.js.map +1 -1
- package/dist/local-control-http.js +28 -4
- package/dist/local-control-http.js.map +1 -1
- package/dist/local-control.d.ts +7 -2
- package/dist/local-control.js +12 -0
- package/dist/local-control.js.map +1 -1
- package/dist/process-identity.d.ts +30 -0
- package/dist/process-identity.js +99 -0
- package/dist/process-identity.js.map +1 -0
- package/dist/upgrade-job.d.ts +51 -0
- package/dist/upgrade-job.js +233 -20
- package/dist/upgrade-job.js.map +1 -1
- package/dist/upgrade-lock.d.ts +25 -0
- package/dist/upgrade-lock.js +207 -0
- package/dist/upgrade-lock.js.map +1 -0
- package/dist/upgrade-persistence.d.ts +1 -0
- package/dist/upgrade-persistence.js +25 -0
- package/dist/upgrade-persistence.js.map +1 -0
- package/dist/worker-host.d.ts +38 -0
- package/dist/worker-host.js +172 -0
- package/dist/worker-host.js.map +1 -0
- package/dist/worker-shutdown-authorization.d.ts +7 -0
- package/dist/worker-shutdown-authorization.js +71 -0
- package/dist/worker-shutdown-authorization.js.map +1 -0
- package/package.json +3 -2
- package/worker/worker.cjs +612 -0
package/dist/index.js
CHANGED
|
@@ -16,6 +16,7 @@ import { shutdownScheduler } from './scheduler.js';
|
|
|
16
16
|
import { createLocalControlService } from './local-control.js';
|
|
17
17
|
import { startLocalControlServer } from './local-control-http.js';
|
|
18
18
|
import { createShutdownCoordinator } from './shutdown-coordinator.js';
|
|
19
|
+
import { authorizeWorkerUpgradeShutdown } from './worker-shutdown-authorization.js';
|
|
19
20
|
const require = createRequire(import.meta.url);
|
|
20
21
|
const qrcode = require('qrcode-terminal');
|
|
21
22
|
const processInstanceId = randomUUID();
|
|
@@ -25,7 +26,7 @@ function highlightUrl(url) {
|
|
|
25
26
|
return url;
|
|
26
27
|
return `\x1b[1;4;36m${url}\x1b[0m`;
|
|
27
28
|
}
|
|
28
|
-
export async function start(config, daemon = false, pidFile, launchSpecPath, launchSpecDigest) {
|
|
29
|
+
export async function start(config, daemon = false, pidFile, launchSpecPath, launchSpecDigest, upgradeJobId) {
|
|
29
30
|
console.log('[AgentLink] Starting agent...');
|
|
30
31
|
console.log(`[AgentLink] Working directory: ${config.dir}`);
|
|
31
32
|
console.log(`[AgentLink] Relay server: ${config.server}`);
|
|
@@ -48,7 +49,9 @@ export async function start(config, daemon = false, pidFile, launchSpecPath, lau
|
|
|
48
49
|
name: 'notify-web',
|
|
49
50
|
run: async (request) => {
|
|
50
51
|
await sendAndFlush({
|
|
51
|
-
type: request.reason === 'upgrade'
|
|
52
|
+
type: request.reason === 'upgrade' || request.reason === 'worker-upgrade'
|
|
53
|
+
? 'agent_upgrading'
|
|
54
|
+
: 'agent_stopping',
|
|
52
55
|
reason: request.reason,
|
|
53
56
|
requestId: request.requestId,
|
|
54
57
|
jobId: request.jobId,
|
|
@@ -73,6 +76,7 @@ export async function start(config, daemon = false, pidFile, launchSpecPath, lau
|
|
|
73
76
|
getConnectionStatus,
|
|
74
77
|
getShutdownStatus: () => shutdownCoordinator.status(),
|
|
75
78
|
requestShutdown: (request) => shutdownCoordinator.request(request),
|
|
79
|
+
authorizeWorkerUpgradeShutdown,
|
|
76
80
|
});
|
|
77
81
|
controlServer = await startLocalControlServer(controlService);
|
|
78
82
|
// Persist runtime state so `agentlink status` can discover the exact process.
|
|
@@ -88,6 +92,7 @@ export async function start(config, daemon = false, pidFile, launchSpecPath, lau
|
|
|
88
92
|
agent: config.agent,
|
|
89
93
|
launchSpecPath,
|
|
90
94
|
launchSpecDigest,
|
|
95
|
+
upgradeJobId,
|
|
91
96
|
controlPlane: controlServer.discovery,
|
|
92
97
|
...(process.env.AGENTLINK_VERSION_STORE_ACTIVE === '1'
|
|
93
98
|
&& process.env.AGENTLINK_SELECTED_VERSION
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGpC,oFAAoF;AACpF,MAAM,UAAU,mBAAmB;IACjC,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAU,EAAE,CAAC;QACjH,MAAM,IAAI,GAAI,OAAe,CAAC,MAAM,CAAC,CAAC;QACrC,OAAe,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC3G,CAAC;AACH,CAAC;AAED,yEAAyE;AACzE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK;IAAE,mBAAmB,EAAE,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EACL,aAAa,EACb,OAAO,EACP,UAAU,EACV,mBAAmB,EACnB,SAAS,EACT,YAAY,GACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAwB,MAAM,oBAAoB,CAAC;AACrF,OAAO,EAAE,uBAAuB,EAA2B,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,10 @@ export declare class LocalControlResponseError extends Error {
|
|
|
10
10
|
}
|
|
11
11
|
export declare function getLocalControlStatus(state: RuntimeState, timeoutMs?: number): Promise<LocalControlStatus>;
|
|
12
12
|
export declare function requestLocalControlShutdown(state: RuntimeState, reason: ShutdownReason, options?: {
|
|
13
|
+
expectedProcessInstanceId?: string;
|
|
13
14
|
jobId?: string;
|
|
14
15
|
targetVersion?: string;
|
|
16
|
+
lockNonce?: string;
|
|
17
|
+
workerPid?: number;
|
|
18
|
+
workerProcessStartIdentity?: string;
|
|
15
19
|
}, timeoutMs?: number): Promise<ShutdownAccepted>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-control-client.js","sourceRoot":"","sources":["../src/local-control-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"local-control-client.js","sourceRoot":"","sources":["../src/local-control-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAWpC,MAAM,OAAO,4BAA6B,SAAQ,KAAK;IACrD,YAAY,OAAe,EAAE,OAAsB;QACjD,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,8BAA8B,CAAC;IAC7C,CAAC;CACF;AAED,MAAM,OAAO,yBAA0B,SAAQ,KAAK;IAEhC;IACA;IAFlB,YACkB,MAAc,EACd,IAAY,EAC5B,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAJC,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAQ;QAI5B,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC;IAC1C,CAAC;CACF;AAED,KAAK,UAAU,WAAW,CACxB,KAAmB,EACnB,MAAsB,EACtB,IAAY,EACZ,IAA8B,EAC9B,SAAS,GAAG,IAAI;IAEhB,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC;IACrC,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,UAAU,KAAK,CAAC,IAAI,SAAS,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QAC/E,MAAM,IAAI,4BAA4B,CAAC,iDAAiD,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,IAAI,SAAS,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAC9G,MAAM,IAAI,4BAA4B,CAAC,0CAA0C,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,SAAS,GAAG,UAAU,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,WAAW,CAAC;YAC1B,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,IAAI;YACJ,MAAM;YACN,OAAO,EAAE;gBACP,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE;gBAC3C,aAAa,EAAE,UAAU,SAAS,CAAC,KAAK,EAAE;gBAC1C,cAAc,EAAE,SAAS;gBACzB,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;oBACZ,cAAc,EAAE,kBAAkB;oBAClC,gBAAgB,EAAE,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;oBAC5C,iBAAiB,EAAE,SAAS;iBAC7B,CAAC,CAAC,CAAC,EAAE,CAAC;aACR;SACF,EAAE,CAAC,QAAQ,EAAE,EAAE;YACd,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,IAAI,IAAI,GAAG,CAAC,CAAC;YACb,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;gBACpC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;gBACrB,IAAI,IAAI,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC;oBACrB,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;oBACrE,OAAO;gBACT,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;YACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACtB,IAAI,QAA4B,CAAC;gBACjC,IAAI,CAAC;oBACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAuB,CAAC;gBACtF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,yBAAyB,CAAC,GAAG,EAAE,kBAAkB,EAAE,qCAAqC,CAAC,CAAC,CAAC;oBACtG,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,GAAG,GAAG,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;oBACpG,MAAM,CAAC,IAAI,yBAAyB,CAClC,QAAQ,CAAC,UAAU,IAAI,GAAG,EAC1B,QAAQ,CAAC,KAAK,EAAE,IAAI,IAAI,eAAe,EACvC,QAAQ,CAAC,KAAK,EAAE,OAAO,IAAI,8BAA8B,CAC1D,CAAC,CAAC;oBACH,OAAO;gBACT,CAAC;gBACD,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAChC,MAAM,CAAC,IAAI,yBAAyB,CAAC,GAAG,EAAE,kBAAkB,EAAE,6CAA6C,CAAC,CAAC,CAAC;oBAC9G,OAAO;gBACT,CAAC;gBACD,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,UAAU,CAAC,SAAS,EAAE,GAAG,EAAE;YACjC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,yCAAyC,SAAS,IAAI,CAAC,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC5B,MAAM,CAAC,IAAI,4BAA4B,CAAC,iCAAiC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAC/G,CAAC,CAAC,CAAC;QACH,IAAI,OAAO;YAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpC,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,KAAmB,EAAE,SAAkB;IAC3E,OAAO,WAAW,CAAqB,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,KAAmB,EACnB,MAAsB,EACtB,UAOI,EAAE,EACN,SAAkB;IAElB,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,4BAA4B,CAAC,6CAA6C,CAAC,CAAC;IACxF,CAAC;IACD,OAAO,WAAW,CAChB,KAAK,EACL,MAAM,EACN,wBAAwB,EACxB;QACE,MAAM;QACN,WAAW,EAAE,KAAK,CAAC,GAAG;QACtB,GAAG,OAAO;KACX,EACD,SAAS,CACV,CAAC;AACJ,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { LOCAL_CONTROL_API_VERSION, LocalControlError, } from './local-control.j
|
|
|
4
4
|
const HOST = '127.0.0.1';
|
|
5
5
|
const MAX_BODY_BYTES = 16 * 1024;
|
|
6
6
|
const MAX_AUTH_FAILURES_PER_MINUTE = 30;
|
|
7
|
-
const VALID_REASONS = new Set(['upgrade', 'stop', 'service']);
|
|
7
|
+
const VALID_REASONS = new Set(['upgrade', 'worker-upgrade', 'stop', 'service']);
|
|
8
8
|
function writeJson(response, status, envelope) {
|
|
9
9
|
const payload = JSON.stringify(envelope);
|
|
10
10
|
response.writeHead(status, {
|
|
@@ -57,13 +57,23 @@ function parseShutdownRequest(value, headerRequestId) {
|
|
|
57
57
|
throw new LocalControlError(400, 'INVALID_REQUEST', 'Shutdown request must be a JSON object');
|
|
58
58
|
}
|
|
59
59
|
const body = value;
|
|
60
|
-
const allowedKeys = new Set([
|
|
60
|
+
const allowedKeys = new Set([
|
|
61
|
+
'reason',
|
|
62
|
+
'requestId',
|
|
63
|
+
'expectedPid',
|
|
64
|
+
'expectedProcessInstanceId',
|
|
65
|
+
'jobId',
|
|
66
|
+
'targetVersion',
|
|
67
|
+
'lockNonce',
|
|
68
|
+
'workerPid',
|
|
69
|
+
'workerProcessStartIdentity',
|
|
70
|
+
]);
|
|
61
71
|
const unknownKey = Object.keys(body).find((key) => !allowedKeys.has(key));
|
|
62
72
|
if (unknownKey) {
|
|
63
73
|
throw new LocalControlError(400, 'UNKNOWN_FIELD', `Unknown shutdown field: ${unknownKey}`);
|
|
64
74
|
}
|
|
65
75
|
if (typeof body.reason !== 'string' || !VALID_REASONS.has(body.reason)) {
|
|
66
|
-
throw new LocalControlError(400, 'INVALID_REASON', 'reason must be upgrade, stop, or service');
|
|
76
|
+
throw new LocalControlError(400, 'INVALID_REASON', 'reason must be upgrade, worker-upgrade, stop, or service');
|
|
67
77
|
}
|
|
68
78
|
const requestId = body.requestId ?? headerRequestId;
|
|
69
79
|
if (typeof requestId !== 'string' || requestId.length < 1 || requestId.length > 128) {
|
|
@@ -73,7 +83,17 @@ function parseShutdownRequest(value, headerRequestId) {
|
|
|
73
83
|
&& (!Number.isSafeInteger(body.expectedPid) || body.expectedPid <= 0)) {
|
|
74
84
|
throw new LocalControlError(400, 'INVALID_EXPECTED_PID', 'expectedPid must be a positive integer');
|
|
75
85
|
}
|
|
76
|
-
|
|
86
|
+
if (body.workerPid !== undefined
|
|
87
|
+
&& (!Number.isSafeInteger(body.workerPid) || body.workerPid <= 0)) {
|
|
88
|
+
throw new LocalControlError(400, 'INVALID_WORKER_PID', 'workerPid must be a positive integer');
|
|
89
|
+
}
|
|
90
|
+
for (const field of [
|
|
91
|
+
'expectedProcessInstanceId',
|
|
92
|
+
'jobId',
|
|
93
|
+
'targetVersion',
|
|
94
|
+
'lockNonce',
|
|
95
|
+
'workerProcessStartIdentity',
|
|
96
|
+
]) {
|
|
77
97
|
if (body[field] !== undefined
|
|
78
98
|
&& (typeof body[field] !== 'string' || body[field].length < 1 || body[field].length > 128)) {
|
|
79
99
|
throw new LocalControlError(400, 'INVALID_REQUEST', `${field} must be a non-empty string up to 128 characters`);
|
|
@@ -83,8 +103,12 @@ function parseShutdownRequest(value, headerRequestId) {
|
|
|
83
103
|
reason: body.reason,
|
|
84
104
|
requestId,
|
|
85
105
|
expectedPid: body.expectedPid,
|
|
106
|
+
expectedProcessInstanceId: body.expectedProcessInstanceId,
|
|
86
107
|
jobId: body.jobId,
|
|
87
108
|
targetVersion: body.targetVersion,
|
|
109
|
+
lockNonce: body.lockNonce,
|
|
110
|
+
workerPid: body.workerPid,
|
|
111
|
+
workerProcessStartIdentity: body.workerProcessStartIdentity,
|
|
88
112
|
};
|
|
89
113
|
}
|
|
90
114
|
function getRequestId(request) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-control-http.js","sourceRoot":"","sources":["../src/local-control-http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAA0D,MAAM,MAAM,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAElE,OAAO,EACL,yBAAyB,EACzB,iBAAiB,GAIlB,MAAM,oBAAoB,CAAC;AAG5B,MAAM,IAAI,GAAG,WAAW,CAAC;AACzB,MAAM,cAAc,GAAG,EAAE,GAAG,IAAI,CAAC;AACjC,MAAM,4BAA4B,GAAG,EAAE,CAAC;AACxC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"local-control-http.js","sourceRoot":"","sources":["../src/local-control-http.ts"],"names":[],"mappings":"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"}
|
package/dist/local-control.d.ts
CHANGED
|
@@ -1,15 +1,19 @@
|
|
|
1
1
|
import type { AgentConfig } from './config.js';
|
|
2
2
|
export declare const LOCAL_CONTROL_API_VERSION = 1;
|
|
3
|
-
export declare const LOCAL_CONTROL_CAPABILITIES: readonly ["health.read", "status.read", "lifecycle.shutdown"];
|
|
3
|
+
export declare const LOCAL_CONTROL_CAPABILITIES: readonly ["health.read", "status.read", "lifecycle.shutdown", "upgrade.worker-shutdown"];
|
|
4
4
|
export type LocalControlCapability = typeof LOCAL_CONTROL_CAPABILITIES[number];
|
|
5
|
-
export type ShutdownReason = 'upgrade' | 'stop' | 'service';
|
|
5
|
+
export type ShutdownReason = 'upgrade' | 'worker-upgrade' | 'stop' | 'service';
|
|
6
6
|
export type ShutdownPhase = 'idle' | 'accepted' | 'shutting-down' | 'completed' | 'failed';
|
|
7
7
|
export interface ShutdownRequest {
|
|
8
8
|
reason: ShutdownReason;
|
|
9
9
|
requestId: string;
|
|
10
10
|
expectedPid?: number;
|
|
11
|
+
expectedProcessInstanceId?: string;
|
|
11
12
|
jobId?: string;
|
|
12
13
|
targetVersion?: string;
|
|
14
|
+
lockNonce?: string;
|
|
15
|
+
workerPid?: number;
|
|
16
|
+
workerProcessStartIdentity?: string;
|
|
13
17
|
}
|
|
14
18
|
export interface ShutdownAccepted {
|
|
15
19
|
requestId: string;
|
|
@@ -70,5 +74,6 @@ export interface LocalControlServiceDeps {
|
|
|
70
74
|
getConnectionStatus: () => ConnectionStatus;
|
|
71
75
|
getShutdownStatus: () => LocalControlStatus['shutdown'];
|
|
72
76
|
requestShutdown: (request: ShutdownRequest) => ShutdownAccepted;
|
|
77
|
+
authorizeWorkerUpgradeShutdown?: (request: ShutdownRequest) => void;
|
|
73
78
|
}
|
|
74
79
|
export declare function createLocalControlService(deps: LocalControlServiceDeps): LocalControlService;
|
package/dist/local-control.js
CHANGED
|
@@ -3,6 +3,7 @@ export const LOCAL_CONTROL_CAPABILITIES = [
|
|
|
3
3
|
'health.read',
|
|
4
4
|
'status.read',
|
|
5
5
|
'lifecycle.shutdown',
|
|
6
|
+
'upgrade.worker-shutdown',
|
|
6
7
|
];
|
|
7
8
|
export class LocalControlError extends Error {
|
|
8
9
|
status;
|
|
@@ -48,6 +49,17 @@ export function createLocalControlService(deps) {
|
|
|
48
49
|
if (request.expectedPid !== undefined && request.expectedPid !== process.pid) {
|
|
49
50
|
throw new LocalControlError(409, 'PID_MISMATCH', `Control request expected PID ${request.expectedPid}, but agent PID is ${process.pid}`);
|
|
50
51
|
}
|
|
52
|
+
if (request.reason === 'worker-upgrade') {
|
|
53
|
+
if (!deps.authorizeWorkerUpgradeShutdown) {
|
|
54
|
+
throw new LocalControlError(403, 'WORKER_UPGRADE_NOT_AUTHORIZED', 'This Agent cannot authorize an external upgrade worker');
|
|
55
|
+
}
|
|
56
|
+
try {
|
|
57
|
+
deps.authorizeWorkerUpgradeShutdown(request);
|
|
58
|
+
}
|
|
59
|
+
catch (error) {
|
|
60
|
+
throw new LocalControlError(409, 'WORKER_UPGRADE_REJECTED', error.message);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
51
63
|
return deps.requestShutdown(request);
|
|
52
64
|
},
|
|
53
65
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-control.js","sourceRoot":"","sources":["../src/local-control.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,aAAa;IACb,aAAa;IACb,oBAAoB;
|
|
1
|
+
{"version":3,"file":"local-control.js","sourceRoot":"","sources":["../src/local-control.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,aAAa;IACb,aAAa;IACb,oBAAoB;IACpB,yBAAyB;CACjB,CAAC;AA2DX,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAExB;IACA;IAFlB,YACkB,MAAc,EACd,IAAY,EAC5B,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAJC,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAQ;QAI5B,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAkBD,MAAM,UAAU,yBAAyB,CAAC,IAA6B;IACrE,OAAO;QACL,MAAM;YACJ,OAAO;gBACL,MAAM,EAAE,IAAI;gBACZ,UAAU,EAAE,yBAAyB;gBACrC,YAAY,EAAE,0BAA0B;aACzC,CAAC;QACJ,CAAC;QAED,MAAM;YACJ,OAAO;gBACL,UAAU,EAAE,yBAAyB;gBACrC,YAAY,EAAE,0BAA0B;gBACxC,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,aAAa,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;gBACxD,QAAQ,EAAE,IAAI,CAAC,iBAAiB,EAAE;gBAClC,UAAU,EAAE,IAAI,CAAC,mBAAmB,EAAE;gBACtC,MAAM,EAAE;oBACN,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;oBAC1B,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;oBACpB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;oBACtB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,QAAQ;oBACpC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI;oBACjC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,IAAI;oBACxC,kBAAkB,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;iBAClD;aACF,CAAC;QACJ,CAAC;QAED,QAAQ,CAAC,OAAO;YACd,IAAI,OAAO,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC;gBAC7E,MAAM,IAAI,iBAAiB,CACzB,GAAG,EACH,cAAc,EACd,gCAAgC,OAAO,CAAC,WAAW,sBAAsB,OAAO,CAAC,GAAG,EAAE,CACvF,CAAC;YACJ,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE,CAAC;oBACzC,MAAM,IAAI,iBAAiB,CACzB,GAAG,EACH,+BAA+B,EAC/B,wDAAwD,CACzD,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC;oBACH,IAAI,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;gBAC/C,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,IAAI,iBAAiB,CACzB,GAAG,EACH,yBAAyB,EACxB,KAAe,CAAC,OAAO,CACzB,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
export interface ProcessIdentityDeps {
|
|
2
|
+
platform?: NodeJS.Platform;
|
|
3
|
+
readFile?: (path: string) => string;
|
|
4
|
+
execFile?: (file: string, args: string[]) => string;
|
|
5
|
+
}
|
|
6
|
+
export type ProcessIdentityLookup = {
|
|
7
|
+
status: 'found';
|
|
8
|
+
identity: string;
|
|
9
|
+
} | {
|
|
10
|
+
status: 'absent';
|
|
11
|
+
} | {
|
|
12
|
+
status: 'error';
|
|
13
|
+
error: string;
|
|
14
|
+
};
|
|
15
|
+
export type ProcessIdentityMatch = {
|
|
16
|
+
status: 'match';
|
|
17
|
+
identity: string;
|
|
18
|
+
} | {
|
|
19
|
+
status: 'mismatch';
|
|
20
|
+
identity: string;
|
|
21
|
+
} | {
|
|
22
|
+
status: 'absent';
|
|
23
|
+
} | {
|
|
24
|
+
status: 'error';
|
|
25
|
+
error: string;
|
|
26
|
+
};
|
|
27
|
+
export declare function lookupProcessStartIdentity(pid: number, deps?: ProcessIdentityDeps): ProcessIdentityLookup;
|
|
28
|
+
export declare function getProcessStartIdentity(pid: number, deps?: ProcessIdentityDeps): string | null;
|
|
29
|
+
export declare function matchProcessStartIdentity(pid: number, expected: string, deps?: ProcessIdentityDeps): ProcessIdentityMatch;
|
|
30
|
+
export declare function processIdentityMatches(pid: number, expected: string, deps?: ProcessIdentityDeps): boolean;
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import { execFileSync } from 'child_process';
|
|
2
|
+
import { readFileSync } from 'fs';
|
|
3
|
+
function requirePid(pid) {
|
|
4
|
+
if (!Number.isSafeInteger(pid) || pid <= 0)
|
|
5
|
+
throw new Error('Process PID must be a positive integer');
|
|
6
|
+
}
|
|
7
|
+
function describeError(error) {
|
|
8
|
+
return error instanceof Error ? error.message : String(error);
|
|
9
|
+
}
|
|
10
|
+
function isConfirmedAbsent(error) {
|
|
11
|
+
const value = error;
|
|
12
|
+
return value.code === 'ENOENT' || value.code === 'ESRCH' || value.status === 1;
|
|
13
|
+
}
|
|
14
|
+
export function lookupProcessStartIdentity(pid, deps = {}) {
|
|
15
|
+
requirePid(pid);
|
|
16
|
+
const platform = deps.platform ?? process.platform;
|
|
17
|
+
const readFile = deps.readFile ?? ((path) => readFileSync(path, 'utf8'));
|
|
18
|
+
const execFile = deps.execFile ?? ((file, args) => execFileSync(file, args, {
|
|
19
|
+
encoding: 'utf8',
|
|
20
|
+
windowsHide: true,
|
|
21
|
+
timeout: 3000,
|
|
22
|
+
}));
|
|
23
|
+
if (platform === 'linux') {
|
|
24
|
+
let stat;
|
|
25
|
+
try {
|
|
26
|
+
stat = readFile(`/proc/${pid}/stat`).trim();
|
|
27
|
+
}
|
|
28
|
+
catch (error) {
|
|
29
|
+
return isConfirmedAbsent(error)
|
|
30
|
+
? { status: 'absent' }
|
|
31
|
+
: { status: 'error', error: describeError(error) };
|
|
32
|
+
}
|
|
33
|
+
try {
|
|
34
|
+
const commandEnd = stat.lastIndexOf(')');
|
|
35
|
+
if (commandEnd < 0)
|
|
36
|
+
return { status: 'error', error: 'Malformed Linux process stat' };
|
|
37
|
+
const fieldsFromState = stat.slice(commandEnd + 2).split(/\s+/);
|
|
38
|
+
const startTicks = fieldsFromState[19];
|
|
39
|
+
const bootId = readFile('/proc/sys/kernel/random/boot_id').trim();
|
|
40
|
+
if (!startTicks || !bootId) {
|
|
41
|
+
return { status: 'error', error: 'Incomplete Linux process identity' };
|
|
42
|
+
}
|
|
43
|
+
return { status: 'found', identity: `linux:${bootId}:${startTicks}` };
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
return { status: 'error', error: describeError(error) };
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
if (platform === 'darwin') {
|
|
50
|
+
try {
|
|
51
|
+
const started = execFile('/bin/ps', ['-o', 'lstart=', '-p', String(pid)]).trim();
|
|
52
|
+
return started
|
|
53
|
+
? { status: 'found', identity: `darwin:${started}` }
|
|
54
|
+
: { status: 'absent' };
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
return isConfirmedAbsent(error)
|
|
58
|
+
? { status: 'absent' }
|
|
59
|
+
: { status: 'error', error: describeError(error) };
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
if (platform === 'win32') {
|
|
63
|
+
try {
|
|
64
|
+
const script = '& { param([int]$ProcessId) $p=Get-CimInstance Win32_Process -Filter ("ProcessId="+$ProcessId);if($p){$p.CreationDate.ToUniversalTime().ToString("O",[Globalization.CultureInfo]::InvariantCulture)} }';
|
|
65
|
+
const started = execFile('powershell.exe', [
|
|
66
|
+
'-NoLogo',
|
|
67
|
+
'-NoProfile',
|
|
68
|
+
'-NonInteractive',
|
|
69
|
+
'-Command',
|
|
70
|
+
script,
|
|
71
|
+
'-ProcessId',
|
|
72
|
+
String(pid),
|
|
73
|
+
]).trim();
|
|
74
|
+
return started
|
|
75
|
+
? { status: 'found', identity: `win32:${started}` }
|
|
76
|
+
: { status: 'absent' };
|
|
77
|
+
}
|
|
78
|
+
catch (error) {
|
|
79
|
+
return { status: 'error', error: describeError(error) };
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return { status: 'error', error: `Unsupported process identity platform: ${platform}` };
|
|
83
|
+
}
|
|
84
|
+
export function getProcessStartIdentity(pid, deps = {}) {
|
|
85
|
+
const result = lookupProcessStartIdentity(pid, deps);
|
|
86
|
+
return result.status === 'found' ? result.identity : null;
|
|
87
|
+
}
|
|
88
|
+
export function matchProcessStartIdentity(pid, expected, deps = {}) {
|
|
89
|
+
const result = lookupProcessStartIdentity(pid, deps);
|
|
90
|
+
if (result.status !== 'found')
|
|
91
|
+
return result;
|
|
92
|
+
return result.identity === expected
|
|
93
|
+
? { status: 'match', identity: result.identity }
|
|
94
|
+
: { status: 'mismatch', identity: result.identity };
|
|
95
|
+
}
|
|
96
|
+
export function processIdentityMatches(pid, expected, deps = {}) {
|
|
97
|
+
return matchProcessStartIdentity(pid, expected, deps).status === 'match';
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=process-identity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"process-identity.js","sourceRoot":"","sources":["../src/process-identity.ts"],"names":[],"mappings":"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"}
|
package/dist/upgrade-job.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ReleaseChannel } from './emergency-upgrade.js';
|
|
2
|
+
import { type VersionPointer } from './version-store.js';
|
|
2
3
|
export type UpgradeJobPhase = 'prepared' | 'stopping' | 'installing' | 'restarting' | 'completed' | 'failed';
|
|
3
4
|
export interface UpgradeJob {
|
|
4
5
|
schemaVersion: 1;
|
|
@@ -12,6 +13,45 @@ export interface UpgradeJob {
|
|
|
12
13
|
launchSpecPath?: string;
|
|
13
14
|
error?: string;
|
|
14
15
|
}
|
|
16
|
+
export declare const EXTERNAL_UPGRADE_PROTOCOL_VERSION = 1;
|
|
17
|
+
export type ExternalUpgradePhase = 'created' | 'worker-starting' | 'worker-ready' | 'shutdown-requested' | 'old-agent-stopped' | 'switching' | 'target-starting' | 'target-started' | 'failed';
|
|
18
|
+
export interface ProcessIdentity {
|
|
19
|
+
pid: number;
|
|
20
|
+
processStartIdentity: string;
|
|
21
|
+
}
|
|
22
|
+
export interface ExternalUpgradeJob {
|
|
23
|
+
schemaVersion: 2;
|
|
24
|
+
jobId: string;
|
|
25
|
+
requestId: string;
|
|
26
|
+
channel: ReleaseChannel;
|
|
27
|
+
sourceVersion: string;
|
|
28
|
+
targetVersion: string;
|
|
29
|
+
phase: ExternalUpgradePhase;
|
|
30
|
+
dataRoot: string;
|
|
31
|
+
launchSpecPath: string;
|
|
32
|
+
launchSpecDigest: string;
|
|
33
|
+
oldRuntime: ProcessIdentity & {
|
|
34
|
+
processInstanceId: string;
|
|
35
|
+
sessionId: string;
|
|
36
|
+
sessionUrlHash: string;
|
|
37
|
+
};
|
|
38
|
+
worker?: ProcessIdentity & {
|
|
39
|
+
protocolVersion: 1;
|
|
40
|
+
};
|
|
41
|
+
restartOwner: 'worker';
|
|
42
|
+
sourceSelection: VersionPointer;
|
|
43
|
+
targetSelection: VersionPointer;
|
|
44
|
+
lastKnownGoodSelection: VersionPointer;
|
|
45
|
+
lockNonce: string;
|
|
46
|
+
handoffExpiresAt: string;
|
|
47
|
+
createdAt: string;
|
|
48
|
+
updatedAt: string;
|
|
49
|
+
error: string | null;
|
|
50
|
+
}
|
|
51
|
+
export declare function getUpgradeRoot(): string;
|
|
52
|
+
export declare function getExternalUpgradeJobDirectory(jobId: string): string;
|
|
53
|
+
export declare function getExternalUpgradeJobPath(jobId: string): string;
|
|
54
|
+
export declare function getExternalUpgradeEventsPath(jobId: string): string;
|
|
15
55
|
export declare function createUpgradeJob(input: {
|
|
16
56
|
sourceVersion: string;
|
|
17
57
|
targetVersion: string;
|
|
@@ -23,3 +63,14 @@ export declare function updateUpgradeJob(jobId: string, phase: UpgradeJobPhase,
|
|
|
23
63
|
error?: string;
|
|
24
64
|
now?: Date;
|
|
25
65
|
}): UpgradeJob;
|
|
66
|
+
export declare function validateExternalUpgradeJob(value: unknown): ExternalUpgradeJob;
|
|
67
|
+
export declare function createExternalUpgradeJob(input: Omit<ExternalUpgradeJob, 'schemaVersion' | 'phase' | 'createdAt' | 'updatedAt' | 'error'> & {
|
|
68
|
+
now?: Date;
|
|
69
|
+
}): ExternalUpgradeJob;
|
|
70
|
+
export declare function loadExternalUpgradeJob(jobId: string): ExternalUpgradeJob;
|
|
71
|
+
export declare function transitionExternalUpgradeJob(jobId: string, phase: ExternalUpgradePhase, options?: {
|
|
72
|
+
worker?: ExternalUpgradeJob['worker'];
|
|
73
|
+
error?: string | null;
|
|
74
|
+
now?: Date;
|
|
75
|
+
}): ExternalUpgradeJob;
|
|
76
|
+
export declare function appendExternalUpgradeEvent(job: ExternalUpgradeJob, code: string, detail?: string): void;
|