@agent-link/agent 0.1.301 → 0.1.303
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/auto-start.js +20 -13
- package/dist/auto-start.js.map +1 -1
- package/dist/launcher-manager.js +6 -5
- package/dist/launcher-manager.js.map +1 -1
- package/dist/upgrade-operations.js +21 -6
- package/dist/upgrade-operations.js.map +1 -1
- package/package.json +1 -1
- package/worker/worker.cjs +116 -22
package/dist/auto-start.js
CHANGED
|
@@ -1,12 +1,27 @@
|
|
|
1
|
-
import { existsSync } from 'fs';
|
|
1
|
+
import { existsSync, readFileSync } from 'fs';
|
|
2
2
|
import { resolve } from 'path';
|
|
3
3
|
import { isProcessAlive, loadConfig, loadRuntimeState, saveConfig } from './config.js';
|
|
4
4
|
import { computeLaunchSpecDigest, createServiceLaunchSpec, getLaunchSpecPath, getServiceLaunchSpecPath, loadLaunchSpec, } from './launch-spec.js';
|
|
5
|
-
import { installServiceLaunchSpec, isServiceInstalled, serviceUninstall, } from './service.js';
|
|
5
|
+
import { installServiceLaunchSpec, isServiceInstalled, getServiceArtifactPath, renderServiceArtifact, serviceUninstall, } from './service.js';
|
|
6
6
|
import { validateRuntimeLaunchSpecIdentity } from './upgrade-launch-spec.js';
|
|
7
7
|
function sameLaunchSpec(left, right) {
|
|
8
8
|
return JSON.stringify(left) === JSON.stringify(right);
|
|
9
9
|
}
|
|
10
|
+
function serviceInstallationMatches(target, platform) {
|
|
11
|
+
const serviceSpecPath = getServiceLaunchSpecPath();
|
|
12
|
+
const artifactPath = getServiceArtifactPath(platform);
|
|
13
|
+
if (!existsSync(serviceSpecPath) || !existsSync(artifactPath))
|
|
14
|
+
return false;
|
|
15
|
+
try {
|
|
16
|
+
const existing = loadLaunchSpec(serviceSpecPath);
|
|
17
|
+
return sameLaunchSpec(existing, target)
|
|
18
|
+
&& readFileSync(artifactPath, 'utf8')
|
|
19
|
+
=== renderServiceArtifact(target, serviceSpecPath, platform);
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
10
25
|
function runtimeUsesCurrentServiceSpec() {
|
|
11
26
|
const runtime = loadRuntimeState();
|
|
12
27
|
const servicePath = getServiceLaunchSpecPath();
|
|
@@ -55,17 +70,9 @@ export function applyAutoStartPolicyAfterHealth(source, agentVersion, requestedP
|
|
|
55
70
|
if (config.autoStartMigratedVersion === agentVersion
|
|
56
71
|
&& !config.autoStartPendingReload
|
|
57
72
|
&& isServiceInstalled(platform)
|
|
58
|
-
&&
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
if (sameLaunchSpec(existing, target)) {
|
|
62
|
-
saveConfig({ autoStart: true, autoStartMigratedVersion: agentVersion });
|
|
63
|
-
return { status: 'unchanged', message: 'Auto-start already configured' };
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
catch {
|
|
67
|
-
// Replace an invalid service snapshot only after this healthy start.
|
|
68
|
-
}
|
|
73
|
+
&& serviceInstallationMatches(target, platform)) {
|
|
74
|
+
saveConfig({ autoStart: true, autoStartMigratedVersion: agentVersion });
|
|
75
|
+
return { status: 'unchanged', message: 'Auto-start already configured' };
|
|
69
76
|
}
|
|
70
77
|
const existed = isServiceInstalled(platform);
|
|
71
78
|
// The host entry and LaunchSpec are staged before manager registration.
|
package/dist/auto-start.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-start.js","sourceRoot":"","sources":["../src/auto-start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"auto-start.js","sourceRoot":"","sources":["../src/auto-start.ts"],"names":[],"mappings":"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"}
|
package/dist/launcher-manager.js
CHANGED
|
@@ -56,13 +56,14 @@ export function validateStableLauncher() {
|
|
|
56
56
|
export function getAdoptedLauncherPath() {
|
|
57
57
|
try {
|
|
58
58
|
const adoption = loadAdoptionState();
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
const adoptionInProgress = adoption?.phase === 'prepared'
|
|
60
|
+
|| adoption?.phase === 'activating';
|
|
61
|
+
if (adoptionInProgress) {
|
|
62
|
+
validateVersionInstallation(adoption.selection);
|
|
63
|
+
}
|
|
64
|
+
else if (!isVersionStoreAdopted()) {
|
|
62
65
|
return null;
|
|
63
66
|
}
|
|
64
|
-
if (adoption)
|
|
65
|
-
validateVersionInstallation(adoption.selection);
|
|
66
67
|
return validateStableLauncher();
|
|
67
68
|
}
|
|
68
69
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launcher-manager.js","sourceRoot":"","sources":["../src/launcher-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"launcher-manager.js","sourceRoot":"","sources":["../src/launcher-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,15 @@ function requireJobId(jobId) {
|
|
|
19
19
|
throw new Error(`Invalid upgrade job ID: ${jobId}`);
|
|
20
20
|
return jobId;
|
|
21
21
|
}
|
|
22
|
+
function pidExists(pid) {
|
|
23
|
+
try {
|
|
24
|
+
process.kill(pid, 0);
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
catch (error) {
|
|
28
|
+
return error.code !== 'ESRCH';
|
|
29
|
+
}
|
|
30
|
+
}
|
|
22
31
|
export function loadUpgradeStatus(jobId) {
|
|
23
32
|
if (jobId)
|
|
24
33
|
return loadExternalUpgradeJob(requireJobId(jobId));
|
|
@@ -197,8 +206,13 @@ function descendantIdentities(rootPid) {
|
|
|
197
206
|
}
|
|
198
207
|
async function terminateExactProcessTree(identity) {
|
|
199
208
|
const match = matchProcessStartIdentity(identity.pid, identity.processStartIdentity);
|
|
200
|
-
if (match.status === 'absent' || match.status === 'mismatch')
|
|
201
|
-
|
|
209
|
+
if (match.status === 'absent' || match.status === 'mismatch') {
|
|
210
|
+
if (match.status === 'mismatch')
|
|
211
|
+
return;
|
|
212
|
+
if (process.platform !== 'win32' || !pidExists(identity.pid))
|
|
213
|
+
return;
|
|
214
|
+
throw new Error(`Cannot safely terminate repair PID ${identity.pid}: identity lookup is absent but PID is alive`);
|
|
215
|
+
}
|
|
202
216
|
if (match.status !== 'match') {
|
|
203
217
|
throw new Error(`Cannot safely terminate repair process tree: ${match.error}`);
|
|
204
218
|
}
|
|
@@ -214,6 +228,9 @@ async function terminateExactProcessTree(identity) {
|
|
|
214
228
|
const after = matchProcessStartIdentity(identity.pid, identity.processStartIdentity);
|
|
215
229
|
if (after.status === 'match' || after.status === 'error')
|
|
216
230
|
throw error;
|
|
231
|
+
if (after.status === 'absent' && pidExists(identity.pid)) {
|
|
232
|
+
throw new Error(`Cannot confirm terminated repair process tree: PID ${identity.pid} is alive but identity lookup is absent`);
|
|
233
|
+
}
|
|
217
234
|
}
|
|
218
235
|
return;
|
|
219
236
|
}
|
|
@@ -261,6 +278,7 @@ export async function repairExternalUpgrade(deps = {}) {
|
|
|
261
278
|
const repairLock = acquireUpgradeLock(job.jobId, job.lockNonce);
|
|
262
279
|
try {
|
|
263
280
|
const runtime = loadRuntimeState();
|
|
281
|
+
const terminate = deps.terminateProcessTree ?? terminateExactProcessTree;
|
|
264
282
|
if (job.phase === 'repair-required') {
|
|
265
283
|
const exactRuntime = runtime?.pid && runtime.processInstanceId
|
|
266
284
|
? [
|
|
@@ -273,12 +291,10 @@ export async function repairExternalUpgrade(deps = {}) {
|
|
|
273
291
|
: undefined;
|
|
274
292
|
if (exactRuntime) {
|
|
275
293
|
const state = matchProcessStartIdentity(exactRuntime.pid, exactRuntime.processStartIdentity);
|
|
276
|
-
if (state.status === 'match') {
|
|
277
|
-
throw new Error(`Refusing repair while exact Agent PID ${runtime.pid} is running`);
|
|
278
|
-
}
|
|
279
294
|
if (state.status === 'error') {
|
|
280
295
|
throw new Error(`Cannot determine recorded Agent identity before repair: ${state.error}`);
|
|
281
296
|
}
|
|
297
|
+
await terminate(exactRuntime);
|
|
282
298
|
}
|
|
283
299
|
if (runtime?.pid) {
|
|
284
300
|
clearRuntimePid(runtime.processInstanceId
|
|
@@ -341,7 +357,6 @@ export async function repairExternalUpgrade(deps = {}) {
|
|
|
341
357
|
const failedJob = transitionExternalUpgradeJob(job.jobId, 'repair-required', {
|
|
342
358
|
error: failureMessage,
|
|
343
359
|
});
|
|
344
|
-
const terminate = deps.terminateProcessTree ?? terminateExactProcessTree;
|
|
345
360
|
const cleanupErrors = [];
|
|
346
361
|
let unpersistedLauncher;
|
|
347
362
|
if (unpersistedLauncherPid) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upgrade-operations.js","sourceRoot":"","sources":["../src/upgrade-operations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,MAAM,EACN,QAAQ,GACT,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,EACzB,cAAc,EACd,yBAAyB,EACzB,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,GAG7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,2BAA2B,EAC3B,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3E,MAAM,MAAM,GAAG,uBAAuB,CAAC;AACvC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;AAC7C,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;AAE5C,SAAS,YAAY,CAAC,KAAa;IACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,EAAE,CAAC,CAAC;IAC7E,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,IAAI,KAAK;QAAE,OAAO,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,EAAE,aAAa,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAA+C,CAAC;IACzG,IAAI,KAAK,CAAC,aAAa,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG;QACZ,4BAA4B,CAAC,GAAG,CAAC,KAAK,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC;KAClE,CAAC;IACF,OAAO,KAAK;SACT,MAAM,CAAC,UAAU,CAAC;SAClB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACvC,IAAI,CAAC,EAAE,CAAC;SACR,OAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;SAC9C,OAAO,CAAC,yBAAyB,EAAE,cAAc,CAAC;SAClD,OAAO,CAAC,8CAA8C,EAAE,cAAc,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,eAAe,CAAC,OAAyD;IAChF,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;IACvC,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC,CAAC;IACjG,OAAO,IAAI,OAAO,CAAC,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC3B,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,aAAa,SAAS,CAAC,IAAI,EAAE;gBACnC,aAAa,EAAE,UAAU,SAAS,CAAC,KAAK,EAAE;aAC3C;SACF,EAAE,QAAQ,CAAC,EAAE;YACZ,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACtB,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBACpE,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;wBAChD,YAAY,CAAC,IAAI,KAAK,CAAC,wCAAwC,QAAQ,CAAC,UAAU,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC/F,CAAC;yBAAM,CAAC;wBACN,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAC/B,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,YAAY,CAAC,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC,CAAC;QACrG,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,GAAuB,EACvB,SAAS,GAAG,MAAM;IAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,IAAI,SAAS,GAAG,8CAA8C,CAAC;IAC/D,IAAI,gBAAgB,GAAG,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC;IACjD,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;YACnC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBAChD,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,0BAA0B,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACvD,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CACb,yDACE,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MACpD,EAAE,CACH,CAAC;gBACJ,CAAC;gBACD,gBAAgB,GAAG;oBACjB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;oBAC5C,oBAAoB,EAAE,MAAM,CAAC,QAAQ;iBACtC,CAAC;YACJ,CAAC;YACD,MAAM,aAAa,GAAG,yBAAyB,CAC7C,gBAAgB,CAAC,GAAG,EACpB,gBAAgB,CAAC,oBAAoB,CACtC,CAAC;YACF,IACE,OAAO,CAAC,GAAG,KAAK,gBAAgB,CAAC,GAAG;mBACjC,OAAO,CAAC,iBAAiB,KAAK,gBAAgB,CAAC,iBAAiB;mBAChE,aAAa,CAAC,MAAM,KAAK,OAAO;mBAChC,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC;mBAC5B,OAAO,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI;mBACrC,OAAO,CAAC,YAAY,CAAC,eAAe,KAAK,GAAG,CAAC,sBAAsB,CAAC,OAAO;mBAC3E,OAAO,CAAC,YAAY,CAAC,iBAAiB,KAAK,GAAG,CAAC,sBAAsB,CAAC,SAAS;mBAC/E,OAAO,CAAC,YAAY,KAAK,GAAG,CAAC,KAAK;mBAClC,OAAO,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;mBACrE,OAAO,CAAC,gBAAgB,KAAK,GAAG,CAAC,gBAAgB;mBACjD,uBAAuB,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,KAAK,GAAG,CAAC,gBAAgB,EACvF,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;YAC7F,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,kBAAkB,GAAG,UAAU,CAAC,QAAQ,CAAC;iBAC5C,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;iBAChC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjB,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS,KAAK,GAAG,CAAC,UAAU,CAAC,SAAS;mBAClE,kBAAkB,KAAK,GAAG,CAAC,UAAU,CAAC,cAAc;mBACpD,MAAM,CAAC,UAAU,EAAE,SAAS,KAAK,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;YAC/D,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC;YACjD,MAAM,qBAAqB,GAAG,YAAY;mBACrC,YAAY,CAAC,iBAAiB,KAAK,GAAG,CAAC,UAAU,CAAC,SAAS;mBAC3D,YAAY,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;mBAC5C,YAAY,CAAC,cAAc,KAAK,kBAAkB;mBAClD,MAAM,CAAC,UAAU,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS;mBAClD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC;YAC5D,IACE,MAAM,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG;mBACvB,MAAM,CAAC,OAAO,KAAK,GAAG,CAAC,sBAAsB,CAAC,OAAO;mBACrD,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,MAAM;mBACjC,MAAM,CAAC,UAAU,EAAE,aAAa,KAAK,IAAI;mBACzC,MAAM,CAAC,UAAU,EAAE,YAAY,KAAK,IAAI;mBACxC,CAAC,CAAC,gBAAgB,IAAI,CAAC,qBAAqB,CAAC,EAChD,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACnE,CAAC;YACD,GAAG,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;gBAC/D,aAAa,EAAE,gBAAgB;aAChC,CAAC,CAAC;YACH,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAI,KAAe,CAAC,OAAO,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,aAAa;gBAAE,gBAAgB,GAAG,IAAI,CAAC;QAClD,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;IACjE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,GAAW,EACX,SAAS,GAAG,IAAI;IAEhB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,IAAI,SAAS,GAAG,gCAAgC,CAAC;IACjD,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxD,CAAC;QACD,SAAS,GAAG,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;QACrE,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,kDAAkD,SAAS,EAAE,CAAC,CAAC;AACjF,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAe;IAC3C,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE;QAC7D,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,CAAC,MAAc,EAAQ,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7C,KAAK,CAAC,GAAG,CAAC,CAAC;YACX,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;IACH,CAAC,CAAC;IACF,KAAK,CAAC,OAAO,CAAC,CAAC;IACf,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC/B,MAAM,MAAM,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,MAAM,KAAK,OAAO;YAC9B,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAClD,CAAC,CAAC,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,QAAyB;IAChE,MAAM,KAAK,GAAG,yBAAyB,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACrF,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,UAAU;QAAE,OAAO;IACrE,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,gDAAgD,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,YAAY,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE;gBACvE,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,MAAM;aAChB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,yBAAyB,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YACrF,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO;gBAAE,MAAM,KAAK,CAAC;QACxE,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,GAAG,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/D,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI,yBAAyB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,OAAO;YAAE,SAAS;QACpG,IAAI,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAAC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAC1D,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;gBAAE,MAAM,KAAK,CAAC;QACrE,CAAC;IACH,CAAC;IACD,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/D,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI,yBAAyB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,OAAO;YAAE,SAAS;QACpG,IAAI,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAAC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAC1D,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;gBAAE,MAAM,KAAK,CAAC;QACrE,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAOxC,EAAE;IAIJ,IAAI,GAAG,GAAG,iBAAiB,EAAE,CAAC;IAC9B,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,KAAK,OAAO,GAAG,CAAC,KAAK,0BAA0B,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,GAAG,GAAG,iBAAiB,EAAE,CAAC;IAChC,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAClE,2BAA2B,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC;QACH,sBAAsB,EAAE,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,qBAAqB,EAAE,CAAC;IAC1B,CAAC;IACD,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAChE,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;QACnC,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;YACpC,MAAM,YAAY,GAAG,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC,iBAAiB;gBAC5D,CAAC,CAAC;oBACA,GAAG,CAAC,UAAU;oBACd,GAAG,CAAC,aAAa;oBACjB,GAAG,CAAC,eAAe;oBACnB,GAAG,CAAC,aAAa;iBAClB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAChB,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG;uBAC1B,QAAQ,EAAE,iBAAiB,KAAK,OAAO,CAAC,iBAAiB,CAAC;gBAC/D,CAAC,CAAC,SAAS,CAAC;YACd,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,KAAK,GAAG,yBAAyB,CACrC,YAAY,CAAC,GAAG,EAChB,YAAY,CAAC,oBAAoB,CAClC,CAAC;gBACF,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CAAC,yCAAyC,OAAQ,CAAC,GAAG,aAAa,CAAC,CAAC;gBACtF,CAAC;gBACD,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CAAC,2DAA2D,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC5F,CAAC;YACH,CAAC;YACD,IAAI,OAAO,EAAE,GAAG,EAAE,CAAC;gBACjB,eAAe,CACb,OAAO,CAAC,iBAAiB;oBACvB,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE;oBACpE,CAAC,CAAC,OAAO,CAAC,GAAG,CAChB,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,0BAA0B,GAAG,GAAG,CAAC,aAAa;YAClD,CAAC,CAAC,yBAAyB,CACzB,GAAG,CAAC,aAAa,CAAC,GAAG,EACrB,GAAG,CAAC,aAAa,CAAC,oBAAoB,CACvC;YACD,CAAC,CAAC,IAAI,CAAC;QACT,MAAM,2BAA2B,GAAG,GAAG,CAAC,cAAc;YACpD,CAAC,CAAC,yBAAyB,CACzB,GAAG,CAAC,cAAc,CAAC,GAAG,EACtB,GAAG,CAAC,cAAc,CAAC,oBAAoB,CACxC;YACD,CAAC,CAAC,IAAI,CAAC;QACT,KAAK,MAAM,KAAK,IAAI,CAAC,0BAA0B,EAAE,2BAA2B,CAAC,EAAE,CAAC;YAC9E,IAAI,KAAK,EAAE,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,iDAAiD,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;QACD,GAAG,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;YAC/D,KAAK,EAAE,IAAI;YACX,kBAAkB,EAAE,CAAC,CAAC,GAAG,CAAC,aAAa;mBAClC,0BAA0B,EAAE,MAAM,KAAK,OAAO;YACnD,mBAAmB,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc;mBACpC,2BAA2B,EAAE,MAAM,KAAK,OAAO;SACrD,CAAC,CAAC;QACH,mBAAmB,CAAC,qBAAqB,EAAE,EAAE,GAAG,CAAC,CAAC;QAElD,IAAI,WAAW,GAAG,GAAG,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,CAAC;QAC/C,MAAM,kBAAkB,GAAG,GAAG,CAAC,aAAa;YAC1C,CAAC,CAAC,yBAAyB,CACzB,GAAG,CAAC,aAAa,CAAC,GAAG,EACrB,GAAG,CAAC,aAAa,CAAC,oBAAoB,CACvC;YACD,CAAC,CAAC,IAAI,CAAC;QACT,MAAM,mBAAmB,GAAG,GAAG,CAAC,cAAc;YAC5C,CAAC,CAAC,yBAAyB,CACzB,GAAG,CAAC,cAAc,CAAC,GAAG,EACtB,GAAG,CAAC,cAAc,CAAC,oBAAoB,CACxC;YACD,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,sBAAsB,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,kBAAkB,EAAE,MAAM,KAAK,OAAO,IAAI,mBAAmB,EAAE,MAAM,KAAK,OAAO,EAAE,CAAC;gBACtF,WAAW,GAAG,IAAI,CAAC,aAAa;oBAC9B,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC;oBACxC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,cAAc,EAAE;wBACxC,YAAY,EAAE,GAAG,CAAC,KAAK;wBACvB,aAAa,EAAE,QAAQ;qBACxB,CAAC,CAAC;gBACL,sBAAsB,GAAG,WAAW,CAAC;gBACrC,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBACzD,GAAG,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;oBAC/D,cAAc,EAAE,QAAQ;iBACzB,CAAC,CAAC;gBACH,sBAAsB,GAAG,CAAC,CAAC;YAC7B,CAAC;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/E,IAAI,aAAa,EAAE,CAAC;gBAClB,GAAG,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YACtF,CAAC;YACD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;gBACrD,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;YACrF,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,cAAc,GAAG,kBAAmB,KAAe,CAAC,OAAO,EAAE,CAAC;YACpE,MAAM,SAAS,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;gBAC3E,KAAK,EAAE,cAAc;aACtB,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,IAAI,yBAAyB,CAAC;YACzE,MAAM,aAAa,GAAa,EAAE,CAAC;YACnC,IAAI,mBAAgD,CAAC;YACrD,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,0BAA0B,CAAC,sBAAsB,CAAC,CAAC;gBAClE,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAC9B,mBAAmB,GAAG;wBACpB,GAAG,EAAE,sBAAsB;wBAC3B,oBAAoB,EAAE,MAAM,CAAC,QAAQ;qBACtC,CAAC;gBACJ,CAAC;qBAAM,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBACrC,aAAa,CAAC,IAAI,CAChB,+CAA+C,sBAAsB,KAAK,MAAM,CAAC,KAAK,EAAE,CACzF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI;gBACrB,SAAS,CAAC,cAAc;gBACxB,SAAS,CAAC,aAAa;gBACvB,mBAAmB;aACpB,EAAE,CAAC;gBACF,IAAI,CAAC,QAAQ;oBAAE,SAAS;gBACxB,IAAI,CAAC;oBACH,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;gBAAC,OAAO,YAAY,EAAE,CAAC;oBACtB,aAAa,CAAC,IAAI,CAAE,YAAsB,CAAC,OAAO,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;YACD,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;gBACzB,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;oBACzD,KAAK,EAAE,GAAG,cAAc,qBAAqB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBACxE,CAAC,CAAC;YACL,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,iEAAkE,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/G,CAAC;QACD,MAAM,QAAQ,GAAG,2BAA2B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxD,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxC,CAAC;YAAS,CAAC;QACT,UAAU,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,KAAa,EACb,OAEI,EAAE;IAEN,MAAM,GAAG,GAAG,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,mBAAmB,CAAC;IAChE,IAAI,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,cAAc,EAAE;YAAE,OAAO,UAAU,CAAC;QACzC,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE;YAChC,YAAY,EAAE,GAAG,CAAC,KAAK;SACxB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;QACpC,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,QAAQ;gBAAE,SAAS;YACxB,MAAM,KAAK,GAAG,yBAAyB,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YACrF,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO;gBAAE,OAAO,gBAAgB,CAAC;YACtD,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CAAC,iDAAiD,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;QACD,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE;YAChC,YAAY,EAAE,GAAG,CAAC,KAAK;YACvB,aAAa,EAAE,QAAQ;SACxB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,yBAAyB,CACtC,GAAG,CAAC,MAAM,CAAC,GAAG,EACd,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAChC,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO;YAAE,OAAO,gBAAgB,CAAC;QACvD,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,6CAA6C,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IACD,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE;QAChC,YAAY,EAAE,GAAG,CAAC,KAAK;KACxB,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,4BAA4B,CAAC,IAA0B;IAC9D,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,OAAO,IAAI,CAAC,kBAAkB,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC;QAClE,IAAI,OAAO;YAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1F,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;YAC7E,KAAK,MAAM,OAAO,IAAI;gBACpB,GAAG,CAAC,eAAe;gBACnB,GAAG,CAAC,eAAe;gBACnB,GAAG,CAAC,sBAAsB;aAC3B,EAAE,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC7E,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE;IAKlD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,WAAW,GAAkB,IAAI,CAAC;IACtC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAGzD,CAAC;YACF,IACE,MAAM,CAAC,aAAa,KAAK,CAAC;mBACvB,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ;mBAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAC5B,CAAC;gBACD,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,cAAc,GAAG,IAAI,CAAC;YACxB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,cAAc,GAAG,IAAI,CAAC;QACxB,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;QAClC,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aAChD,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC/D,OAAO,CAAC,KAAK,CAAC,EAAE;YACf,IAAI,CAAC;gBACH,OAAO,CAAC,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,YAAY,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,eAAe,GAAkB,IAAI,CAAC;IAC1C,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,cAAc,EAAE,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,eAAe,GAAG,oBAAoB,EAAE,CAAC,KAAK,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,iBAAiB,GAAG,IAAI,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aAChE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;aAC3E,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5C,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;QAC3E,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACvF,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAChD,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACvE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAAE,SAAS;YAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACrC,GAAG,CAAC,KAAK,KAAK,KAAK,IAAI,CAAC,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,CAAC,CAAC,CAAC;YACrG,0EAA0E;YAC1E,qEAAqE;YACrE,MAAM,eAAe,GAAG,iBAAiB,IAAI,eAAe,KAAK,IAAI,CAAC;YACtE,IACE,CAAC,cAAc;mBACZ,CAAC,eAAe;mBAChB,GAAG,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,GAAG,kBAAkB,EACjE,CAAC;gBACD,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAClD,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,aAAa,GAAG,IAAI;SACvB,MAAM,CAAC,GAAG,CAAC,EAAE,CACZ,CAAC,cAAc;WACZ,GAAG,CAAC,KAAK,KAAK,WAAW;WACzB,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC;WACpC,GAAG,CAAC,KAAK,KAAK,iBAAiB,CAAC;SACpC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACnF,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,cAAc,CAAC;QAC1E,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC;QACpE,IAAI,MAAM,IAAI,WAAW,EAAE,CAAC;YAC1B,MAAM,SAAS,GAAG,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;YAChE,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;AAC1D,CAAC"}
|
|
1
|
+
{"version":3,"file":"upgrade-operations.js","sourceRoot":"","sources":["../src/upgrade-operations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,MAAM,EACN,QAAQ,GACT,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EACL,4BAA4B,EAC5B,yBAAyB,EACzB,cAAc,EACd,yBAAyB,EACzB,sBAAsB,EACtB,2BAA2B,EAC3B,4BAA4B,GAG7B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,uBAAuB,GACxB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,2BAA2B,EAC3B,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3E,MAAM,MAAM,GAAG,uBAAuB,CAAC;AACvC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,cAAc,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;AAC7C,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;AAE5C,SAAS,YAAY,CAAC,KAAa;IACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,EAAE,CAAC,CAAC;IAC7E,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,SAAS,CAAC,GAAW;IAC5B,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAQ,KAA+B,CAAC,IAAI,KAAK,OAAO,CAAC;IAC3D,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAc;IAC9C,IAAI,KAAK;QAAE,OAAO,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,EAAE,EAAE,aAAa,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAA+C,CAAC;IACzG,IAAI,KAAK,CAAC,aAAa,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAc;IAC3C,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG;QACZ,4BAA4B,CAAC,GAAG,CAAC,KAAK,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,YAAY,CAAC;KAClE,CAAC;IACF,OAAO,KAAK;SACT,MAAM,CAAC,UAAU,CAAC;SAClB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SACvC,IAAI,CAAC,EAAE,CAAC;SACR,OAAO,CAAC,gBAAgB,EAAE,mBAAmB,CAAC;SAC9C,OAAO,CAAC,yBAAyB,EAAE,cAAc,CAAC;SAClD,OAAO,CAAC,8CAA8C,EAAE,cAAc,CAAC,CAAC;AAC7E,CAAC;AAED,SAAS,eAAe,CAAC,OAAyD;IAChF,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC;IACvC,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC,CAAC;IACjG,OAAO,IAAI,OAAO,CAAC,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC3B,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,IAAI,EAAE,aAAa,SAAS,CAAC,IAAI,EAAE;gBACnC,aAAa,EAAE,UAAU,SAAS,CAAC,KAAK,EAAE;aAC3C;SACF,EAAE,QAAQ,CAAC,EAAE;YACZ,MAAM,MAAM,GAAa,EAAE,CAAC;YAC5B,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACtB,IAAI,CAAC;oBACH,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;oBACpE,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;wBAChD,YAAY,CAAC,IAAI,KAAK,CAAC,wCAAwC,QAAQ,CAAC,UAAU,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBAC/F,CAAC;yBAAM,CAAC;wBACN,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAC/B,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,YAAY,CAAC,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC,CAAC;gBAChF,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC,CAAC;QACrG,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,GAAuB,EACvB,SAAS,GAAG,MAAM;IAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,IAAI,SAAS,GAAG,8CAA8C,CAAC;IAC/D,IAAI,gBAAgB,GAAG,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC;IACjD,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;YACnC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBAChD,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,MAAM,MAAM,GAAG,0BAA0B,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACvD,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CACb,yDACE,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MACpD,EAAE,CACH,CAAC;gBACJ,CAAC;gBACD,gBAAgB,GAAG;oBACjB,GAAG,EAAE,OAAO,CAAC,GAAG;oBAChB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;oBAC5C,oBAAoB,EAAE,MAAM,CAAC,QAAQ;iBACtC,CAAC;YACJ,CAAC;YACD,MAAM,aAAa,GAAG,yBAAyB,CAC7C,gBAAgB,CAAC,GAAG,EACpB,gBAAgB,CAAC,oBAAoB,CACtC,CAAC;YACF,IACE,OAAO,CAAC,GAAG,KAAK,gBAAgB,CAAC,GAAG;mBACjC,OAAO,CAAC,iBAAiB,KAAK,gBAAgB,CAAC,iBAAiB;mBAChE,aAAa,CAAC,MAAM,KAAK,OAAO;mBAChC,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC;mBAC5B,OAAO,CAAC,YAAY,EAAE,MAAM,KAAK,IAAI;mBACrC,OAAO,CAAC,YAAY,CAAC,eAAe,KAAK,GAAG,CAAC,sBAAsB,CAAC,OAAO;mBAC3E,OAAO,CAAC,YAAY,CAAC,iBAAiB,KAAK,GAAG,CAAC,sBAAsB,CAAC,SAAS;mBAC/E,OAAO,CAAC,YAAY,KAAK,GAAG,CAAC,KAAK;mBAClC,OAAO,CAAC,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;mBACrE,OAAO,CAAC,gBAAgB,KAAK,GAAG,CAAC,gBAAgB;mBACjD,uBAAuB,CAAC,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,KAAK,GAAG,CAAC,gBAAgB,EACvF,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAC;YAC7F,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,kBAAkB,GAAG,UAAU,CAAC,QAAQ,CAAC;iBAC5C,MAAM,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;iBAChC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjB,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS,KAAK,GAAG,CAAC,UAAU,CAAC,SAAS;mBAClE,kBAAkB,KAAK,GAAG,CAAC,UAAU,CAAC,cAAc;mBACpD,MAAM,CAAC,UAAU,EAAE,SAAS,KAAK,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;YAC/D,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC;YACjD,MAAM,qBAAqB,GAAG,YAAY;mBACrC,YAAY,CAAC,iBAAiB,KAAK,GAAG,CAAC,UAAU,CAAC,SAAS;mBAC3D,YAAY,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS;mBAC5C,YAAY,CAAC,cAAc,KAAK,kBAAkB;mBAClD,MAAM,CAAC,UAAU,EAAE,SAAS,KAAK,OAAO,CAAC,SAAS;mBAClD,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC;YAC5D,IACE,MAAM,CAAC,GAAG,KAAK,OAAO,CAAC,GAAG;mBACvB,MAAM,CAAC,OAAO,KAAK,GAAG,CAAC,sBAAsB,CAAC,OAAO;mBACrD,MAAM,CAAC,QAAQ,EAAE,KAAK,KAAK,MAAM;mBACjC,MAAM,CAAC,UAAU,EAAE,aAAa,KAAK,IAAI;mBACzC,MAAM,CAAC,UAAU,EAAE,YAAY,KAAK,IAAI;mBACxC,CAAC,CAAC,gBAAgB,IAAI,CAAC,qBAAqB,CAAC,EAChD,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;YACnE,CAAC;YACD,GAAG,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;gBAC/D,aAAa,EAAE,gBAAgB;aAChC,CAAC,CAAC;YACH,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAI,KAAe,CAAC,OAAO,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,aAAa;gBAAE,gBAAgB,GAAG,IAAI,CAAC;QAClD,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;IACjE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,oBAAoB,CACjC,GAAW,EACX,SAAS,GAAG,IAAI;IAEhB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC;IACxC,IAAI,SAAS,GAAG,gCAAgC,CAAC;IACjD,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;QACxD,CAAC;QACD,SAAS,GAAG,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;QACrE,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,kDAAkD,SAAS,EAAE,CAAC,CAAC;AACjF,CAAC;AAED,SAAS,oBAAoB,CAAC,OAAe;IAC3C,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO;QAAE,OAAO,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE;QAC7D,QAAQ,EAAE,MAAM;QAChB,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,CAAC,MAAc,EAAQ,EAAE;QACrC,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAC7C,KAAK,CAAC,GAAG,CAAC,CAAC;YACX,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;IACH,CAAC,CAAC;IACF,KAAK,CAAC,OAAO,CAAC,CAAC;IACf,OAAO,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC/B,MAAM,MAAM,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO,MAAM,CAAC,MAAM,KAAK,OAAO;YAC9B,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;YAClD,CAAC,CAAC,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,QAAyB;IAChE,MAAM,KAAK,GAAG,yBAAyB,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACrF,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QAC7D,IAAI,KAAK,CAAC,MAAM,KAAK,UAAU;YAAE,OAAO;QACxC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,OAAO;QACrE,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,CAAC,GAAG,8CAA8C,CAAC,CAAC;IACpH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,gDAAgD,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,YAAY,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE;gBACvE,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,MAAM;aAChB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,KAAK,GAAG,yBAAyB,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YACrF,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO;gBAAE,MAAM,KAAK,CAAC;YACtE,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzD,MAAM,IAAI,KAAK,CACb,sDAAsD,QAAQ,CAAC,GAAG,yCAAyC,CAC5G,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO;IACT,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,GAAG,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;IAC/D,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI,yBAAyB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,OAAO;YAAE,SAAS;QACpG,IAAI,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAAC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAC1D,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;gBAAE,MAAM,KAAK,CAAC;QACrE,CAAC;IACH,CAAC;IACD,MAAM,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/D,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI,yBAAyB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,MAAM,KAAK,OAAO;YAAE,SAAS;QACpG,IAAI,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAAC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAC1D,IAAK,KAA+B,CAAC,IAAI,KAAK,OAAO;gBAAE,MAAM,KAAK,CAAC;QACrE,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAOxC,EAAE;IAIJ,IAAI,GAAG,GAAG,iBAAiB,EAAE,CAAC;IAC9B,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,KAAK,OAAO,GAAG,CAAC,KAAK,0BAA0B,CAAC,CAAC;IAClF,CAAC;IACD,MAAM,GAAG,GAAG,iBAAiB,EAAE,CAAC;IAChC,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;IAClE,2BAA2B,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC;QACH,sBAAsB,EAAE,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,qBAAqB,EAAE,CAAC;IAC1B,CAAC;IACD,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAChE,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,gBAAgB,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,IAAI,yBAAyB,CAAC;QACzE,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;YACpC,MAAM,YAAY,GAAG,OAAO,EAAE,GAAG,IAAI,OAAO,CAAC,iBAAiB;gBAC5D,CAAC,CAAC;oBACA,GAAG,CAAC,UAAU;oBACd,GAAG,CAAC,aAAa;oBACjB,GAAG,CAAC,eAAe;oBACnB,GAAG,CAAC,aAAa;iBAClB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAChB,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG;uBAC1B,QAAQ,EAAE,iBAAiB,KAAK,OAAO,CAAC,iBAAiB,CAAC;gBAC/D,CAAC,CAAC,SAAS,CAAC;YACd,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,KAAK,GAAG,yBAAyB,CACrC,YAAY,CAAC,GAAG,EAChB,YAAY,CAAC,oBAAoB,CAClC,CAAC;gBACF,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAC7B,MAAM,IAAI,KAAK,CAAC,2DAA2D,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC5F,CAAC;gBACD,MAAM,SAAS,CAAC,YAAY,CAAC,CAAC;YAChC,CAAC;YACD,IAAI,OAAO,EAAE,GAAG,EAAE,CAAC;gBACjB,eAAe,CACb,OAAO,CAAC,iBAAiB;oBACvB,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE;oBACpE,CAAC,CAAC,OAAO,CAAC,GAAG,CAChB,CAAC;YACJ,CAAC;QACH,CAAC;QACD,MAAM,0BAA0B,GAAG,GAAG,CAAC,aAAa;YAClD,CAAC,CAAC,yBAAyB,CACzB,GAAG,CAAC,aAAa,CAAC,GAAG,EACrB,GAAG,CAAC,aAAa,CAAC,oBAAoB,CACvC;YACD,CAAC,CAAC,IAAI,CAAC;QACT,MAAM,2BAA2B,GAAG,GAAG,CAAC,cAAc;YACpD,CAAC,CAAC,yBAAyB,CACzB,GAAG,CAAC,cAAc,CAAC,GAAG,EACtB,GAAG,CAAC,cAAc,CAAC,oBAAoB,CACxC;YACD,CAAC,CAAC,IAAI,CAAC;QACT,KAAK,MAAM,KAAK,IAAI,CAAC,0BAA0B,EAAE,2BAA2B,CAAC,EAAE,CAAC;YAC9E,IAAI,KAAK,EAAE,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,iDAAiD,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;QACD,GAAG,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;YAC/D,KAAK,EAAE,IAAI;YACX,kBAAkB,EAAE,CAAC,CAAC,GAAG,CAAC,aAAa;mBAClC,0BAA0B,EAAE,MAAM,KAAK,OAAO;YACnD,mBAAmB,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc;mBACpC,2BAA2B,EAAE,MAAM,KAAK,OAAO;SACrD,CAAC,CAAC;QACH,mBAAmB,CAAC,qBAAqB,EAAE,EAAE,GAAG,CAAC,CAAC;QAElD,IAAI,WAAW,GAAG,GAAG,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,CAAC;QAC/C,MAAM,kBAAkB,GAAG,GAAG,CAAC,aAAa;YAC1C,CAAC,CAAC,yBAAyB,CACzB,GAAG,CAAC,aAAa,CAAC,GAAG,EACrB,GAAG,CAAC,aAAa,CAAC,oBAAoB,CACvC;YACD,CAAC,CAAC,IAAI,CAAC;QACT,MAAM,mBAAmB,GAAG,GAAG,CAAC,cAAc;YAC5C,CAAC,CAAC,yBAAyB,CACzB,GAAG,CAAC,cAAc,CAAC,GAAG,EACtB,GAAG,CAAC,cAAc,CAAC,oBAAoB,CACxC;YACD,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,sBAAsB,GAAG,CAAC,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,kBAAkB,EAAE,MAAM,KAAK,OAAO,IAAI,mBAAmB,EAAE,MAAM,KAAK,OAAO,EAAE,CAAC;gBACtF,WAAW,GAAG,IAAI,CAAC,aAAa;oBAC9B,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,cAAc,CAAC;oBACxC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,cAAc,EAAE;wBACxC,YAAY,EAAE,GAAG,CAAC,KAAK;wBACvB,aAAa,EAAE,QAAQ;qBACxB,CAAC,CAAC;gBACL,sBAAsB,GAAG,WAAW,CAAC;gBACrC,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBACzD,GAAG,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;oBAC/D,cAAc,EAAE,QAAQ;iBACzB,CAAC,CAAC;gBACH,sBAAsB,GAAG,CAAC,CAAC;YAC7B,CAAC;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,IAAI,qBAAqB,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/E,IAAI,aAAa,EAAE,CAAC;gBAClB,GAAG,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;YACtF,CAAC;YACD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;gBACrD,MAAM,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC;YACrF,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,cAAc,GAAG,kBAAmB,KAAe,CAAC,OAAO,EAAE,CAAC;YACpE,MAAM,SAAS,GAAG,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;gBAC3E,KAAK,EAAE,cAAc;aACtB,CAAC,CAAC;YACH,MAAM,aAAa,GAAa,EAAE,CAAC;YACnC,IAAI,mBAAgD,CAAC;YACrD,IAAI,sBAAsB,EAAE,CAAC;gBAC3B,MAAM,MAAM,GAAG,0BAA0B,CAAC,sBAAsB,CAAC,CAAC;gBAClE,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAC9B,mBAAmB,GAAG;wBACpB,GAAG,EAAE,sBAAsB;wBAC3B,oBAAoB,EAAE,MAAM,CAAC,QAAQ;qBACtC,CAAC;gBACJ,CAAC;qBAAM,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBACrC,aAAa,CAAC,IAAI,CAChB,+CAA+C,sBAAsB,KAAK,MAAM,CAAC,KAAK,EAAE,CACzF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI;gBACrB,SAAS,CAAC,cAAc;gBACxB,SAAS,CAAC,aAAa;gBACvB,mBAAmB;aACpB,EAAE,CAAC;gBACF,IAAI,CAAC,QAAQ;oBAAE,SAAS;gBACxB,IAAI,CAAC;oBACH,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;gBAC5B,CAAC;gBAAC,OAAO,YAAY,EAAE,CAAC;oBACtB,aAAa,CAAC,IAAI,CAAE,YAAsB,CAAC,OAAO,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;YACD,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;gBACzB,4BAA4B,CAAC,GAAG,CAAC,KAAK,EAAE,iBAAiB,EAAE;oBACzD,KAAK,EAAE,GAAG,cAAc,qBAAqB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;iBACxE,CAAC,CAAC;YACL,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,iEAAkE,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/G,CAAC;QACD,MAAM,QAAQ,GAAG,2BAA2B,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxD,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxC,CAAC;YAAS,CAAC;QACT,UAAU,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,KAAa,EACb,OAEI,EAAE;IAEN,MAAM,GAAG,GAAG,sBAAsB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,mBAAmB,CAAC;IAChE,IAAI,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,cAAc,EAAE;YAAE,OAAO,UAAU,CAAC;QACzC,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE;YAChC,YAAY,EAAE,GAAG,CAAC,KAAK;SACxB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;QACpC,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,QAAQ;gBAAE,SAAS;YACxB,MAAM,KAAK,GAAG,yBAAyB,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,oBAAoB,CAAC,CAAC;YACrF,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO;gBAAE,OAAO,gBAAgB,CAAC;YACtD,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC7B,MAAM,IAAI,KAAK,CAAC,iDAAiD,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YAClF,CAAC;QACH,CAAC;QACD,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE;YAChC,YAAY,EAAE,GAAG,CAAC,KAAK;YACvB,aAAa,EAAE,QAAQ;SACxB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,yBAAyB,CACtC,GAAG,CAAC,MAAM,CAAC,GAAG,EACd,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAChC,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO;YAAE,OAAO,gBAAgB,CAAC;QACvD,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,6CAA6C,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IACD,aAAa,CAAC,GAAG,CAAC,cAAc,EAAE;QAChC,YAAY,EAAE,GAAG,CAAC,KAAK;KACxB,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,4BAA4B,CAAC,IAA0B;IAC9D,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,OAAO,IAAI,CAAC,kBAAkB,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,CAAC;QAClE,IAAI,OAAO;YAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1F,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,EAAE,CAAC;YAC7E,KAAK,MAAM,OAAO,IAAI;gBACpB,GAAG,CAAC,eAAe;gBACnB,GAAG,CAAC,eAAe;gBACnB,GAAG,CAAC,sBAAsB;aAC3B,EAAE,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAC7E,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,GAAG,GAAG,IAAI,IAAI,EAAE;IAKlD,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IACpD,IAAI,WAAW,GAAkB,IAAI,CAAC;IACtC,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAGzD,CAAC;YACF,IACE,MAAM,CAAC,aAAa,KAAK,CAAC;mBACvB,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ;mBAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAC5B,CAAC;gBACD,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,cAAc,GAAG,IAAI,CAAC;YACxB,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,cAAc,GAAG,IAAI,CAAC;QACxB,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,WAAW,CAAC;QAClC,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aAChD,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC/D,OAAO,CAAC,KAAK,CAAC,EAAE;YACf,IAAI,CAAC;gBACH,OAAO,CAAC,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC;QACJ,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,YAAY,GAAG,4BAA4B,CAAC,IAAI,CAAC,CAAC;IACxD,IAAI,eAAe,GAAkB,IAAI,CAAC;IAC1C,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAC9B,IAAI,cAAc,EAAE,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,eAAe,GAAG,oBAAoB,EAAE,CAAC,KAAK,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,iBAAiB,GAAG,IAAI,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;aAChE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;aAC3E,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;aAC5C,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;QAC3E,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACvF,MAAM,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YAChD,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YACvE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;gBAAE,SAAS;YAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACnD,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACrC,GAAG,CAAC,KAAK,KAAK,KAAK,IAAI,CAAC,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,KAAK,iBAAiB,CAAC,CAAC,CAAC;YACrG,0EAA0E;YAC1E,qEAAqE;YACrE,MAAM,eAAe,GAAG,iBAAiB,IAAI,eAAe,KAAK,IAAI,CAAC;YACtE,IACE,CAAC,cAAc;mBACZ,CAAC,eAAe;mBAChB,GAAG,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,GAAG,kBAAkB,EACjE,CAAC;gBACD,MAAM,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAClD,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,aAAa,GAAG,IAAI;SACvB,MAAM,CAAC,GAAG,CAAC,EAAE,CACZ,CAAC,cAAc;WACZ,GAAG,CAAC,KAAK,KAAK,WAAW;WACzB,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC;WACpC,GAAG,CAAC,KAAK,KAAK,iBAAiB,CAAC;SACpC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IACnF,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,cAAc,CAAC;QAC1E,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC;QACpE,IAAI,MAAM,IAAI,WAAW,EAAE,CAAC;YAC1B,MAAM,SAAS,GAAG,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;YAChE,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IACD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;AAC1D,CAAC"}
|
package/package.json
CHANGED
package/worker/worker.cjs
CHANGED
|
@@ -190,6 +190,16 @@ function matchProcessIdentity(pid, expected) {
|
|
|
190
190
|
: { status: 'mismatch', identity: result.identity };
|
|
191
191
|
}
|
|
192
192
|
|
|
193
|
+
function pidExists(pid) {
|
|
194
|
+
try {
|
|
195
|
+
process.kill(pid, 0);
|
|
196
|
+
return true;
|
|
197
|
+
} catch (error) {
|
|
198
|
+
if (error.code === 'ESRCH') return false;
|
|
199
|
+
return true;
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
|
|
193
203
|
function assignLockWorker(job, worker) {
|
|
194
204
|
const lockDirectory = path.join(job.dataRoot, 'upgrades', 'active.lock');
|
|
195
205
|
const lockPath = path.join(lockDirectory, 'owner.json');
|
|
@@ -484,7 +494,8 @@ function waitForSpawn(child) {
|
|
|
484
494
|
});
|
|
485
495
|
}
|
|
486
496
|
|
|
487
|
-
async function waitForTargetRuntime(job, child, timeoutMs = Number(process.env.AGENTLINK_UPGRADE_HEALTH_TIMEOUT_MS) || 15000) {
|
|
497
|
+
async function waitForTargetRuntime(job, child, expectedSelection, timeoutMs = Number(process.env.AGENTLINK_UPGRADE_HEALTH_TIMEOUT_MS) || 15000) {
|
|
498
|
+
validateSelection(job, expectedSelection);
|
|
488
499
|
const runtimePath = path.join(job.dataRoot, 'agent.json');
|
|
489
500
|
const deadline = Date.now() + timeoutMs;
|
|
490
501
|
let earlyExit = null;
|
|
@@ -506,6 +517,11 @@ async function waitForTargetRuntime(job, child, timeoutMs = Number(process.env.A
|
|
|
506
517
|
runtime.upgradeJobId === job.jobId
|
|
507
518
|
&& Number.isSafeInteger(runtime.pid)
|
|
508
519
|
&& runtime.pid > 0
|
|
520
|
+
&& runtime.versionStore?.active === true
|
|
521
|
+
&& runtime.versionStore.selectedVersion === expectedSelection.version
|
|
522
|
+
&& runtime.versionStore.selectedIntegrity === expectedSelection.integrity
|
|
523
|
+
&& path.resolve(runtime.launchSpecPath || '') === path.resolve(job.launchSpecPath)
|
|
524
|
+
&& runtime.launchSpecDigest === job.launchSpecDigest
|
|
509
525
|
) {
|
|
510
526
|
const lookup = processIdentity(runtime.pid);
|
|
511
527
|
if (lookup.status === 'found') {
|
|
@@ -597,7 +613,11 @@ async function startTarget(job) {
|
|
|
597
613
|
fail(`could not clear systemd upgrade environment: ${error.message}`);
|
|
598
614
|
}
|
|
599
615
|
}
|
|
600
|
-
return waitForTargetRuntime(
|
|
616
|
+
return waitForTargetRuntime(
|
|
617
|
+
job,
|
|
618
|
+
null,
|
|
619
|
+
isRollback ? job.lastKnownGoodSelection : job.targetSelection,
|
|
620
|
+
);
|
|
601
621
|
}
|
|
602
622
|
if (hostType === 'launchd') {
|
|
603
623
|
const uid = process.getuid();
|
|
@@ -629,7 +649,11 @@ async function startTarget(job) {
|
|
|
629
649
|
fail(`could not clear launchd upgrade environment: ${error.message}`);
|
|
630
650
|
}
|
|
631
651
|
}
|
|
632
|
-
return waitForTargetRuntime(
|
|
652
|
+
return waitForTargetRuntime(
|
|
653
|
+
job,
|
|
654
|
+
null,
|
|
655
|
+
isRollback ? job.lastKnownGoodSelection : job.targetSelection,
|
|
656
|
+
);
|
|
633
657
|
}
|
|
634
658
|
const targetLog = path.join(path.dirname(job.launchSpecPath), '..', 'logs', 'upgrade-target.log');
|
|
635
659
|
fs.mkdirSync(path.dirname(targetLog), { recursive: true, mode: 0o700 });
|
|
@@ -685,7 +709,11 @@ async function startTarget(job) {
|
|
|
685
709
|
} finally {
|
|
686
710
|
fs.closeSync(output);
|
|
687
711
|
}
|
|
688
|
-
const result =
|
|
712
|
+
const result = await waitForTargetRuntime(
|
|
713
|
+
job,
|
|
714
|
+
child,
|
|
715
|
+
isRollback ? job.lastKnownGoodSelection : job.targetSelection,
|
|
716
|
+
);
|
|
689
717
|
child.unref();
|
|
690
718
|
return result;
|
|
691
719
|
}
|
|
@@ -840,6 +868,11 @@ async function waitForRelay(job, health) {
|
|
|
840
868
|
async function terminateExactRuntime(identity) {
|
|
841
869
|
const match = matchProcessIdentity(identity.pid, identity.processStartIdentity);
|
|
842
870
|
if (match.status === 'absent' || match.status === 'mismatch') {
|
|
871
|
+
if (match.status === 'mismatch') return;
|
|
872
|
+
if (process.platform === 'win32') {
|
|
873
|
+
if (!pidExists(identity.pid)) return;
|
|
874
|
+
throw new Error(`cannot safely terminate PID ${identity.pid}: identity lookup is absent but PID is alive`);
|
|
875
|
+
}
|
|
843
876
|
if (process.platform !== 'win32') {
|
|
844
877
|
try {
|
|
845
878
|
process.kill(-identity.pid, 0);
|
|
@@ -867,6 +900,9 @@ async function terminateExactRuntime(identity) {
|
|
|
867
900
|
} catch (error) {
|
|
868
901
|
const after = matchProcessIdentity(identity.pid, identity.processStartIdentity);
|
|
869
902
|
if (after.status === 'match' || after.status === 'error') throw error;
|
|
903
|
+
if (after.status === 'absent' && pidExists(identity.pid)) {
|
|
904
|
+
throw new Error(`cannot confirm terminated target identity: PID ${identity.pid} is alive but identity lookup is absent`);
|
|
905
|
+
}
|
|
870
906
|
return;
|
|
871
907
|
}
|
|
872
908
|
} else {
|
|
@@ -919,12 +955,32 @@ async function terminateExactRuntime(identity) {
|
|
|
919
955
|
continue;
|
|
920
956
|
}
|
|
921
957
|
const state = matchProcessIdentity(identity.pid, identity.processStartIdentity);
|
|
922
|
-
if (
|
|
958
|
+
if (
|
|
959
|
+
(state.status === 'absent' || state.status === 'mismatch')
|
|
960
|
+
&& !pidExists(identity.pid)
|
|
961
|
+
) return;
|
|
923
962
|
if (state.status === 'error') {
|
|
924
963
|
throw new Error(`cannot confirm terminated target identity: ${state.error}`);
|
|
925
964
|
}
|
|
926
965
|
await new Promise(resolve => setTimeout(resolve, 50));
|
|
927
966
|
}
|
|
967
|
+
if (process.platform === 'win32') {
|
|
968
|
+
const beforeFallback = matchProcessIdentity(identity.pid, identity.processStartIdentity);
|
|
969
|
+
if (beforeFallback.status === 'match') {
|
|
970
|
+
try { process.kill(identity.pid, 'SIGTERM'); } catch (error) {
|
|
971
|
+
if (error.code !== 'ESRCH') throw error;
|
|
972
|
+
}
|
|
973
|
+
const fallbackDeadline = Date.now() + 5000;
|
|
974
|
+
while (Date.now() < fallbackDeadline) {
|
|
975
|
+
const state = matchProcessIdentity(identity.pid, identity.processStartIdentity);
|
|
976
|
+
if (state.status === 'absent' || state.status === 'mismatch') return;
|
|
977
|
+
if (state.status === 'error') {
|
|
978
|
+
throw new Error(`cannot confirm terminated target identity: ${state.error}`);
|
|
979
|
+
}
|
|
980
|
+
await new Promise(resolve => setTimeout(resolve, 50));
|
|
981
|
+
}
|
|
982
|
+
}
|
|
983
|
+
}
|
|
928
984
|
if (unixSignalTarget && unixSignalTarget < 0) {
|
|
929
985
|
try {
|
|
930
986
|
process.kill(unixSignalTarget, 0);
|
|
@@ -935,6 +991,9 @@ async function terminateExactRuntime(identity) {
|
|
|
935
991
|
}
|
|
936
992
|
}
|
|
937
993
|
const final = matchProcessIdentity(identity.pid, identity.processStartIdentity);
|
|
994
|
+
if (final.status === 'absent' && pidExists(identity.pid)) {
|
|
995
|
+
throw new Error(`cannot confirm terminated target identity: PID ${identity.pid} is alive but identity lookup is absent`);
|
|
996
|
+
}
|
|
938
997
|
if (final.status === 'match') {
|
|
939
998
|
throw new Error(`target PID ${identity.pid} did not exit after termination`);
|
|
940
999
|
}
|
|
@@ -981,17 +1040,35 @@ function restoreLastKnownGood(job) {
|
|
|
981
1040
|
atomicJson(path.join(job.dataRoot, 'current-version.json'), job.lastKnownGoodSelection);
|
|
982
1041
|
}
|
|
983
1042
|
|
|
984
|
-
|
|
1043
|
+
function uniqueIdentities(identities) {
|
|
1044
|
+
const seen = new Set();
|
|
1045
|
+
const result = [];
|
|
1046
|
+
for (const identity of identities) {
|
|
1047
|
+
if (!identity) continue;
|
|
1048
|
+
const key = `${identity.pid}\0${identity.processStartIdentity}`;
|
|
1049
|
+
if (seen.has(key)) continue;
|
|
1050
|
+
seen.add(key);
|
|
1051
|
+
result.push(identity);
|
|
1052
|
+
}
|
|
1053
|
+
return result;
|
|
1054
|
+
}
|
|
1055
|
+
|
|
1056
|
+
async function rollback(jobPath, job, worker, reason, transientTargetIdentity = null) {
|
|
985
1057
|
if (job.phase !== 'rolling-back' && job.phase !== 'rollback-starting' && job.phase !== 'rollback-local-health') {
|
|
986
1058
|
job = transition(jobPath, job.jobId, 'rolling-back', {
|
|
987
1059
|
error: String(reason).slice(0, 512),
|
|
988
1060
|
});
|
|
989
1061
|
}
|
|
1062
|
+
let transientRollbackIdentity = null;
|
|
990
1063
|
try {
|
|
991
1064
|
if (job.phase === 'rolling-back') {
|
|
992
|
-
const
|
|
993
|
-
|
|
994
|
-
|
|
1065
|
+
for (const identity of uniqueIdentities([
|
|
1066
|
+
job.targetRuntime,
|
|
1067
|
+
transientTargetIdentity,
|
|
1068
|
+
job.targetLauncher,
|
|
1069
|
+
])) {
|
|
1070
|
+
await terminateExactRuntime(identity);
|
|
1071
|
+
}
|
|
995
1072
|
restoreLastKnownGood(job);
|
|
996
1073
|
job = transition(jobPath, job.jobId, 'rollback-starting');
|
|
997
1074
|
}
|
|
@@ -999,14 +1076,16 @@ async function rollback(jobPath, job, worker, reason) {
|
|
|
999
1076
|
let health;
|
|
1000
1077
|
if (job.phase === 'rollback-starting') {
|
|
1001
1078
|
acknowledged = await startTarget(job);
|
|
1079
|
+
transientRollbackIdentity = acknowledged.identity;
|
|
1080
|
+
job = transition(jobPath, job.jobId, 'rollback-local-health', {
|
|
1081
|
+
rollbackRuntime: acknowledged.identity,
|
|
1082
|
+
});
|
|
1002
1083
|
health = await waitForLocalHealth(
|
|
1003
1084
|
job,
|
|
1004
1085
|
job.lastKnownGoodSelection,
|
|
1005
1086
|
acknowledged.identity,
|
|
1006
1087
|
);
|
|
1007
|
-
|
|
1008
|
-
rollbackRuntime: acknowledged.identity,
|
|
1009
|
-
});
|
|
1088
|
+
transientRollbackIdentity = null;
|
|
1010
1089
|
} else {
|
|
1011
1090
|
const runtime = loadJson(path.join(job.dataRoot, 'agent.json'));
|
|
1012
1091
|
if (!job.rollbackRuntime) {
|
|
@@ -1031,8 +1110,19 @@ async function rollback(jobPath, job, worker, reason) {
|
|
|
1031
1110
|
});
|
|
1032
1111
|
} catch (rollbackError) {
|
|
1033
1112
|
job = loadJob(jobPath);
|
|
1113
|
+
const targetCleanupIdentities = job.phase === 'rolling-back'
|
|
1114
|
+
? [job.targetRuntime, transientTargetIdentity, job.targetLauncher]
|
|
1115
|
+
: [];
|
|
1116
|
+
job = transition(jobPath, job.jobId, 'repair-required', {
|
|
1117
|
+
error: `target failure: ${String(reason).slice(0, 220)}; rollback failure: ${String(rollbackError.message || rollbackError).slice(0, 220)}`,
|
|
1118
|
+
});
|
|
1034
1119
|
const cleanupErrors = [];
|
|
1035
|
-
for (const identity of [
|
|
1120
|
+
for (const identity of uniqueIdentities([
|
|
1121
|
+
...targetCleanupIdentities,
|
|
1122
|
+
job.rollbackRuntime,
|
|
1123
|
+
transientRollbackIdentity,
|
|
1124
|
+
job.rollbackLauncher,
|
|
1125
|
+
])) {
|
|
1036
1126
|
if (!identity) continue;
|
|
1037
1127
|
try {
|
|
1038
1128
|
await terminateExactRuntime(identity);
|
|
@@ -1041,14 +1131,11 @@ async function rollback(jobPath, job, worker, reason) {
|
|
|
1041
1131
|
}
|
|
1042
1132
|
}
|
|
1043
1133
|
if (cleanupErrors.length) {
|
|
1044
|
-
transition(jobPath, job.jobId,
|
|
1045
|
-
error: `rollback failure: ${String(rollbackError.message || rollbackError).slice(0, 220)};
|
|
1134
|
+
transition(jobPath, job.jobId, 'repair-required', {
|
|
1135
|
+
error: `rollback failure: ${String(rollbackError.message || rollbackError).slice(0, 220)}; cleanup failed before lock release: ${cleanupErrors.join('; ').slice(0, 220)}`,
|
|
1046
1136
|
});
|
|
1047
1137
|
throw new Error(`rollback cleanup failed before lock release: ${cleanupErrors.join('; ')}`);
|
|
1048
1138
|
}
|
|
1049
|
-
job = transition(jobPath, job.jobId, 'repair-required', {
|
|
1050
|
-
error: `target failure: ${String(reason).slice(0, 220)}; rollback failure: ${String(rollbackError.message || rollbackError).slice(0, 220)}`,
|
|
1051
|
-
});
|
|
1052
1139
|
releaseLock(job, worker);
|
|
1053
1140
|
cleanupLaunchdWorker(job);
|
|
1054
1141
|
throw new Error(`rollback failed; local repair is required: ${rollbackError.message || rollbackError}`);
|
|
@@ -1197,15 +1284,21 @@ async function main() {
|
|
|
1197
1284
|
let health;
|
|
1198
1285
|
if (job.phase === 'target-starting') {
|
|
1199
1286
|
acknowledged = await startTarget(job);
|
|
1287
|
+
job = transition(jobPath, job.jobId, 'target-local-health', {
|
|
1288
|
+
targetRuntime: acknowledged.identity,
|
|
1289
|
+
});
|
|
1200
1290
|
try {
|
|
1201
1291
|
health = await waitForLocalHealth(job, job.targetSelection, acknowledged.identity);
|
|
1202
1292
|
} catch (error) {
|
|
1203
|
-
await rollback(
|
|
1293
|
+
await rollback(
|
|
1294
|
+
jobPath,
|
|
1295
|
+
loadJob(jobPath),
|
|
1296
|
+
worker,
|
|
1297
|
+
error.message || error,
|
|
1298
|
+
acknowledged.identity,
|
|
1299
|
+
);
|
|
1204
1300
|
return;
|
|
1205
1301
|
}
|
|
1206
|
-
job = transition(jobPath, job.jobId, 'target-local-health', {
|
|
1207
|
-
targetRuntime: acknowledged.identity,
|
|
1208
|
-
});
|
|
1209
1302
|
} else if (job.phase === 'target-local-health' || job.phase === 'relay-pending') {
|
|
1210
1303
|
if (!job.targetRuntime) {
|
|
1211
1304
|
throw new Error('target health phase is missing its durable exact runtime identity');
|
|
@@ -1290,6 +1383,7 @@ main().catch(async error => {
|
|
|
1290
1383
|
if (
|
|
1291
1384
|
failedJob?.worker
|
|
1292
1385
|
&& TERMINAL_PHASES.has(failedJob.phase)
|
|
1386
|
+
&& !String(failedJob.error || '').includes('cleanup failed before lock release')
|
|
1293
1387
|
&& fs.existsSync(path.join(failedJob.dataRoot, 'upgrades', 'active.lock'))
|
|
1294
1388
|
) {
|
|
1295
1389
|
try {
|