@calltelemetry/cli 0.14.0 → 0.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/channels.d.ts.map +1 -1
- package/dist/commands/channels.js +5 -2
- package/dist/commands/channels.js.map +1 -1
- package/dist/commands/ship-update.d.ts +1 -1
- package/dist/commands/ship-update.d.ts.map +1 -1
- package/dist/commands/ship-update.js +52 -26
- package/dist/commands/ship-update.js.map +1 -1
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +55 -24
- package/dist/commands/update.js.map +1 -1
- package/dist/lib/bundle.d.ts +6 -4
- package/dist/lib/bundle.d.ts.map +1 -1
- package/dist/lib/bundle.js +78 -4
- package/dist/lib/bundle.js.map +1 -1
- package/dist/lib/channels.d.ts +7 -0
- package/dist/lib/channels.d.ts.map +1 -1
- package/dist/lib/channels.js +33 -1
- package/dist/lib/channels.js.map +1 -1
- package/dist/lib/stable-nightly.d.ts +65 -0
- package/dist/lib/stable-nightly.d.ts.map +1 -0
- package/dist/lib/stable-nightly.js +299 -0
- package/dist/lib/stable-nightly.js.map +1 -0
- package/dist/lib/version.d.ts +1 -1
- package/dist/lib/version.js +1 -1
- package/dist/utils/version.d.ts +14 -6
- package/dist/utils/version.d.ts.map +1 -1
- package/dist/utils/version.js +39 -8
- package/dist/utils/version.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../../src/commands/channels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"channels.d.ts","sourceRoot":"","sources":["../../src/commands/channels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAOpC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsB9D"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { fetchCatalogChannels, formatChannelList, } from '../lib/channels.js';
|
|
1
|
+
import { appendStableNightlyChannel, fetchCatalogChannels, formatChannelList, } from '../lib/channels.js';
|
|
2
2
|
export function registerChannelsCommand(program) {
|
|
3
3
|
program
|
|
4
4
|
.command('channels')
|
|
@@ -6,7 +6,10 @@ export function registerChannelsCommand(program) {
|
|
|
6
6
|
.option('-a, --all', 'Include non-customer-visible channels')
|
|
7
7
|
.action(async (opts) => {
|
|
8
8
|
try {
|
|
9
|
-
const
|
|
9
|
+
const catalogChannels = await fetchCatalogChannels();
|
|
10
|
+
const channels = opts.all
|
|
11
|
+
? await appendStableNightlyChannel(catalogChannels)
|
|
12
|
+
: catalogChannels;
|
|
10
13
|
process.stdout.write(formatChannelList(channels, !opts.all));
|
|
11
14
|
}
|
|
12
15
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channels.js","sourceRoot":"","sources":["../../src/commands/channels.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CACV,mFAAmF,CACpF;SACA,MAAM,CAAC,WAAW,EAAE,uCAAuC,CAAC;SAC5D,MAAM,CAAC,KAAK,EAAE,IAAuB,EAAE,EAAE;QACxC,IAAI,CAAC;YACH,MAAM,
|
|
1
|
+
{"version":3,"file":"channels.js","sourceRoot":"","sources":["../../src/commands/channels.ts"],"names":[],"mappings":"AACA,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CACV,mFAAmF,CACpF;SACA,MAAM,CAAC,WAAW,EAAE,uCAAuC,CAAC;SAC5D,MAAM,CAAC,KAAK,EAAE,IAAuB,EAAE,EAAE;QACxC,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,MAAM,oBAAoB,EAAE,CAAC;YACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG;gBACvB,CAAC,CAAC,MAAM,0BAA0B,CAAC,eAAe,CAAC;gBACnD,CAAC,CAAC,eAAe,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC7D,OAAO,CAAC,KAAK,CAAC,0CAA0C,GAAG,EAAE,CAAC,CAAC;YAC/D,OAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;YAC1E,OAAO,CAAC,KAAK,CAAC,+DAA+D,CAAC,CAAC;YAC/E,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
import type { Command } from 'commander';
|
|
8
8
|
/**
|
|
9
9
|
* Resolve the operator's version argument / flags to a concrete release string.
|
|
10
|
-
* Fail-closed on unknown targets.
|
|
10
|
+
* Fail-closed on unknown targets. Does not mutate saved preferences by itself.
|
|
11
11
|
*/
|
|
12
12
|
export declare function resolveShipUpdateTarget(versionArg: string | undefined, opts: {
|
|
13
13
|
latest?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-update.d.ts","sourceRoot":"","sources":["../../src/commands/ship-update.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"ship-update.d.ts","sourceRoot":"","sources":["../../src/commands/ship-update.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuIzC;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAAC,MAAM,CAAC,CAGjB;AAED,0EAA0E;AAC1E,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,IAAI,EAAE;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,GACA,OAAO,CAAC,IAAI,CAAC,CAsGf;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA6ChE"}
|
|
@@ -7,12 +7,8 @@ import { getDockerVersion } from '../lib/system.js';
|
|
|
7
7
|
import { updateService } from '../lib/ops-port.js';
|
|
8
8
|
import { reportOpsResult } from './go-parity.js';
|
|
9
9
|
import * as out from '../utils/output.js';
|
|
10
|
-
import { isReleaseDowngrade } from '../utils/version.js';
|
|
11
|
-
|
|
12
|
-
* Resolve the operator's version argument / flags to a concrete release string.
|
|
13
|
-
* Fail-closed on unknown targets.
|
|
14
|
-
*/
|
|
15
|
-
export async function resolveShipUpdateTarget(versionArg, opts) {
|
|
10
|
+
import { isReleaseDowngrade, isSameCoreFinalSupersedingRc } from '../utils/version.js';
|
|
11
|
+
async function resolveShipUpdateTargetWithContext(versionArg, opts) {
|
|
16
12
|
let version = versionArg;
|
|
17
13
|
let pinIntent = null;
|
|
18
14
|
if (opts.line) {
|
|
@@ -39,89 +35,119 @@ export async function resolveShipUpdateTarget(versionArg, opts) {
|
|
|
39
35
|
` ct update --channel stable # explicit channel flag`);
|
|
40
36
|
}
|
|
41
37
|
}
|
|
42
|
-
|
|
43
|
-
setPin(pinIntent);
|
|
44
|
-
console.log(`Pinned: ${pinIntent.type} = ${pinIntent.value}`);
|
|
45
|
-
console.log(`(saved to ~/.ct/preferences.json)`);
|
|
46
|
-
}
|
|
38
|
+
let savedPin = null;
|
|
47
39
|
if (!version && !opts.latest && !opts.rc && !opts.stable) {
|
|
48
|
-
|
|
49
|
-
if (
|
|
50
|
-
console.log(`Using saved pin: ${
|
|
51
|
-
version =
|
|
40
|
+
savedPin = getPin();
|
|
41
|
+
if (savedPin) {
|
|
42
|
+
console.log(`Using saved pin: ${savedPin.type} = ${savedPin.value}`);
|
|
43
|
+
version = savedPin.value;
|
|
52
44
|
}
|
|
53
45
|
}
|
|
54
|
-
const
|
|
46
|
+
const effectiveChannel = pinIntent?.type === 'channel'
|
|
47
|
+
? pinIntent.value
|
|
48
|
+
: savedPin?.type === 'channel'
|
|
49
|
+
? savedPin.value
|
|
50
|
+
: null;
|
|
51
|
+
const targetType = pinIntent?.type === 'channel' || savedPin?.type === 'channel'
|
|
52
|
+
? 'channel'
|
|
53
|
+
: pinIntent?.type === 'line' || savedPin?.type === 'line'
|
|
54
|
+
? 'line'
|
|
55
|
+
: detectTargetType(version);
|
|
55
56
|
if (targetType === 'line') {
|
|
56
57
|
console.log(`Fetching latest stable for line ${version}...`);
|
|
57
58
|
const resolved = await fetchLatestForLine(version);
|
|
58
59
|
console.log(`Latest ${version} stable: ${resolved}`);
|
|
59
|
-
return resolved;
|
|
60
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
60
61
|
}
|
|
61
62
|
if (targetType === 'channel') {
|
|
62
63
|
console.log(`Fetching latest on channel '${version}'...`);
|
|
63
64
|
const resolved = await fetchLatestForChannel(version);
|
|
64
65
|
console.log(`Latest on ${version}: ${resolved}`);
|
|
65
|
-
return resolved;
|
|
66
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
66
67
|
}
|
|
67
68
|
if (targetType === 'keyword') {
|
|
68
69
|
if (version === 'latest') {
|
|
69
70
|
console.log('Fetching latest version (including pre-releases)...');
|
|
70
71
|
const resolved = await fetchLatestVersion('latest');
|
|
71
72
|
console.log(`Latest version: ${resolved}`);
|
|
72
|
-
return resolved;
|
|
73
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
73
74
|
}
|
|
74
75
|
if (version === 'rc') {
|
|
75
76
|
console.log('Fetching latest release candidate...');
|
|
76
77
|
const resolved = await fetchLatestVersion('rc');
|
|
77
78
|
console.log(`Latest release candidate: ${resolved}`);
|
|
78
|
-
return resolved;
|
|
79
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
79
80
|
}
|
|
80
81
|
if (version === 'dev') {
|
|
81
82
|
console.log("Fetching latest on channel 'dev'...");
|
|
82
83
|
const resolved = await fetchLatestForChannel('dev');
|
|
83
84
|
console.log(`Latest on dev: ${resolved}`);
|
|
84
|
-
return resolved;
|
|
85
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
85
86
|
}
|
|
86
87
|
console.log('Fetching latest stable version...');
|
|
87
88
|
const resolved = await fetchLatestVersion('stable');
|
|
88
89
|
console.log(`Latest stable version: ${resolved}`);
|
|
89
|
-
return resolved;
|
|
90
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
90
91
|
}
|
|
91
92
|
if (!version && opts.latest) {
|
|
92
93
|
console.log('Fetching latest version (including pre-releases)...');
|
|
93
94
|
const resolved = await fetchLatestVersion('latest');
|
|
94
95
|
console.log(`Latest version: ${resolved}`);
|
|
95
|
-
return resolved;
|
|
96
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
96
97
|
}
|
|
97
98
|
if (!version && opts.rc) {
|
|
98
99
|
console.log('Fetching latest release candidate...');
|
|
99
100
|
const resolved = await fetchLatestVersion('rc');
|
|
100
101
|
console.log(`Latest release candidate: ${resolved}`);
|
|
101
|
-
return resolved;
|
|
102
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
102
103
|
}
|
|
103
104
|
if (!version || opts.stable) {
|
|
104
105
|
console.log('Fetching latest stable version...');
|
|
105
106
|
const resolved = await fetchLatestVersion('stable');
|
|
106
107
|
console.log(`Latest stable version: ${resolved}`);
|
|
107
|
-
return resolved;
|
|
108
|
+
return { version: resolved, pinIntent, effectiveChannel };
|
|
108
109
|
}
|
|
109
110
|
// exact version
|
|
111
|
+
return { version, pinIntent, effectiveChannel };
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Resolve the operator's version argument / flags to a concrete release string.
|
|
115
|
+
* Fail-closed on unknown targets. Does not mutate saved preferences by itself.
|
|
116
|
+
*/
|
|
117
|
+
export async function resolveShipUpdateTarget(versionArg, opts) {
|
|
118
|
+
const { version } = await resolveShipUpdateTargetWithContext(versionArg, opts);
|
|
110
119
|
return version;
|
|
111
120
|
}
|
|
112
121
|
/** Run the non-Ink update pipeline. Throws / sets exitCode on failure. */
|
|
113
122
|
export async function runShipUpdate(versionArg, opts) {
|
|
114
|
-
const version = await
|
|
123
|
+
const { version, pinIntent, effectiveChannel } = await resolveShipUpdateTargetWithContext(versionArg, opts);
|
|
115
124
|
const currentVersion = getCurrentVersion();
|
|
116
125
|
console.log(`Current version: ${currentVersion}`);
|
|
117
126
|
console.log(`Target version: ${version}`);
|
|
118
127
|
console.log();
|
|
128
|
+
if (effectiveChannel === 'stable-nightly' &&
|
|
129
|
+
!opts.allowDowngrade &&
|
|
130
|
+
isSameCoreFinalSupersedingRc(currentVersion, version)) {
|
|
131
|
+
if (pinIntent) {
|
|
132
|
+
setPin(pinIntent);
|
|
133
|
+
console.log(`Pinned: ${pinIntent.type} = ${pinIntent.value}`);
|
|
134
|
+
console.log(`(saved to ~/.ct/preferences.json)`);
|
|
135
|
+
}
|
|
136
|
+
console.log(`Installed final ${currentVersion} already supersedes stable-nightly candidate ${version}; nothing to do.`);
|
|
137
|
+
process.exitCode = 0;
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
119
140
|
if (isReleaseDowngrade(currentVersion, version) && !opts.allowDowngrade) {
|
|
120
141
|
out.fail(`Refusing downgrade: resolved target ${version} is older than the installed version ${currentVersion}.\n` +
|
|
121
142
|
` Downgrading can break the running appliance (DB auth/schema mismatch). Re-run with --allow-downgrade to force it anyway.`);
|
|
122
143
|
process.exitCode = 1;
|
|
123
144
|
return;
|
|
124
145
|
}
|
|
146
|
+
if (pinIntent) {
|
|
147
|
+
setPin(pinIntent);
|
|
148
|
+
console.log(`Pinned: ${pinIntent.type} = ${pinIntent.value}`);
|
|
149
|
+
console.log(`(saved to ~/.ct/preferences.json)`);
|
|
150
|
+
}
|
|
125
151
|
if (!opts.forceUpgrade) {
|
|
126
152
|
try {
|
|
127
153
|
await runStepsCli(preflightSteps(version));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ship-update.js","sourceRoot":"","sources":["../../src/commands/ship-update.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"ship-update.js","sourceRoot":"","sources":["../../src/commands/ship-update.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,8CAQ1B,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,8CAO5B,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,8CAOzB,CAAC;AAEH,gBAAgB;AAChB,eAAO,MAAM,uBAAuB,kIAS1B,CAAC;AAEX,gBAAgB;AAChB,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,IAAI,CAAC,CASnE;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAO,GACvE,OAAO,CAAC,IAAI,CAAC,CAoCf;AAOD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAkBzD;AAOD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiBpC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,eAAe,8CAQ1B,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,8CAO5B,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,8CAOzB,CAAC;AAEH,gBAAgB;AAChB,eAAO,MAAM,uBAAuB,kIAS1B,CAAC;AAEX,gBAAgB;AAChB,wBAAsB,6BAA6B,IAAI,OAAO,CAAC,IAAI,CAAC,CASnE;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,GAAE;IAAE,aAAa,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAO,GACvE,OAAO,CAAC,IAAI,CAAC,CAoCf;AAOD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC,CAkBzD;AAOD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,QA0arD;AAaD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,QA2CnD"}
|
package/dist/commands/update.js
CHANGED
|
@@ -12,7 +12,7 @@ import { preflightSteps, executeSteps, runStepsCli } from '../lib/update-steps.j
|
|
|
12
12
|
import { capturePostUpgradeHealth } from '../lib/post-upgrade-health.js';
|
|
13
13
|
import * as out from '../utils/output.js';
|
|
14
14
|
import { publicDoc } from '../lib/public-doc.js';
|
|
15
|
-
import { isReleaseDowngrade } from '../utils/version.js';
|
|
15
|
+
import { isReleaseDowngrade, isSameCoreFinalSupersedingRc } from '../utils/version.js';
|
|
16
16
|
/**
|
|
17
17
|
* Public-doc metadata for appliance update / lifecycle commands.
|
|
18
18
|
*
|
|
@@ -247,31 +247,27 @@ export function registerUpdateCommand(program) {
|
|
|
247
247
|
console.log('Channel change confirmed with --yes.');
|
|
248
248
|
}
|
|
249
249
|
}
|
|
250
|
-
// Persist the pin BEFORE resolution so an explicit choice survives
|
|
251
|
-
// even if the marker doesn't exist yet (e.g. brand-new channel).
|
|
252
|
-
if (pinIntent) {
|
|
253
|
-
try {
|
|
254
|
-
setPin(pinIntent);
|
|
255
|
-
console.log(`Pinned: ${pinIntent.type} = ${pinIntent.value}`);
|
|
256
|
-
console.log(`(saved to ~/.ct/preferences.json — run 'ct unpin' to clear.)`);
|
|
257
|
-
}
|
|
258
|
-
catch (err) {
|
|
259
|
-
out.fail(`Failed to save pin: ${err.message}`);
|
|
260
|
-
process.exit(1);
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
250
|
// Step 4 — bare 'ct update' with a saved pin.
|
|
251
|
+
let savedPin = null;
|
|
264
252
|
if (!version && !opts.latest && !opts.rc && !opts.stable) {
|
|
265
|
-
|
|
266
|
-
if (
|
|
267
|
-
console.log(`Using saved pin: ${
|
|
268
|
-
version =
|
|
269
|
-
// Route below uses detectTargetType which gives the right resolver path.
|
|
253
|
+
savedPin = getPin();
|
|
254
|
+
if (savedPin) {
|
|
255
|
+
console.log(`Using saved pin: ${savedPin.type} = ${savedPin.value} (run 'ct unpin' to clear)`);
|
|
256
|
+
version = savedPin.value;
|
|
270
257
|
}
|
|
271
258
|
}
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
259
|
+
const effectiveChannel = pinIntent?.type === 'channel'
|
|
260
|
+
? pinIntent.value
|
|
261
|
+
: savedPin?.type === 'channel'
|
|
262
|
+
? savedPin.value
|
|
263
|
+
: null;
|
|
264
|
+
// Detect type so line/channel/version route to the right resolver
|
|
265
|
+
// (explicit --channel / --line flags and saved pins keep their declared type).
|
|
266
|
+
const targetType = pinIntent?.type === 'channel' || savedPin?.type === 'channel'
|
|
267
|
+
? 'channel'
|
|
268
|
+
: pinIntent?.type === 'line' || savedPin?.type === 'line'
|
|
269
|
+
? 'line'
|
|
270
|
+
: detectTargetType(version);
|
|
275
271
|
if (targetType === 'line') {
|
|
276
272
|
console.log(`Fetching latest stable for line ${version}...`);
|
|
277
273
|
const resolved = await fetchLatestForLine(version);
|
|
@@ -327,12 +323,42 @@ export function registerUpdateCommand(program) {
|
|
|
327
323
|
console.log(`Current version: ${currentVersion}`);
|
|
328
324
|
console.log(`Target version: ${version}`);
|
|
329
325
|
console.log();
|
|
326
|
+
if (version &&
|
|
327
|
+
effectiveChannel === 'stable-nightly' &&
|
|
328
|
+
!opts.allowDowngrade &&
|
|
329
|
+
isSameCoreFinalSupersedingRc(currentVersion, version)) {
|
|
330
|
+
if (pinIntent) {
|
|
331
|
+
try {
|
|
332
|
+
setPin(pinIntent);
|
|
333
|
+
console.log(`Pinned: ${pinIntent.type} = ${pinIntent.value}`);
|
|
334
|
+
console.log(`(saved to ~/.ct/preferences.json — run 'ct unpin' to clear.)`);
|
|
335
|
+
}
|
|
336
|
+
catch (err) {
|
|
337
|
+
out.fail(`Failed to save pin: ${err.message}`);
|
|
338
|
+
process.exit(1);
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
console.log(`Installed final ${currentVersion} already supersedes stable-nightly candidate ${version}; nothing to do.`);
|
|
342
|
+
process.exitCode = 0;
|
|
343
|
+
return;
|
|
344
|
+
}
|
|
330
345
|
if (version && isReleaseDowngrade(currentVersion, version) && !opts.allowDowngrade) {
|
|
331
346
|
out.fail(`Refusing downgrade: resolved target ${version} is older than the installed version ${currentVersion}.\n` +
|
|
332
347
|
` Downgrading can break the running appliance (DB auth/schema mismatch). Re-run with --allow-downgrade to force it anyway.`);
|
|
333
348
|
process.exitCode = 1;
|
|
334
349
|
return;
|
|
335
350
|
}
|
|
351
|
+
if (pinIntent) {
|
|
352
|
+
try {
|
|
353
|
+
setPin(pinIntent);
|
|
354
|
+
console.log(`Pinned: ${pinIntent.type} = ${pinIntent.value}`);
|
|
355
|
+
console.log(`(saved to ~/.ct/preferences.json — run 'ct unpin' to clear.)`);
|
|
356
|
+
}
|
|
357
|
+
catch (err) {
|
|
358
|
+
out.fail(`Failed to save pin: ${err.message}`);
|
|
359
|
+
process.exit(1);
|
|
360
|
+
}
|
|
361
|
+
}
|
|
336
362
|
// Preflight checks (shared with TUI)
|
|
337
363
|
if (!opts.forceUpgrade) {
|
|
338
364
|
try {
|
|
@@ -575,10 +601,15 @@ export function registerPinCommands(program) {
|
|
|
575
601
|
console.log('(stored in ~/.ct/preferences.json)');
|
|
576
602
|
console.log();
|
|
577
603
|
if (pin.type === 'line') {
|
|
578
|
-
console.log(`Reads marker: ${releaseBaseUrl}/latest-${pin.value}-stable.txt`);
|
|
604
|
+
console.log(`Reads marker: ${releaseBaseUrl}/trains/${pin.value}.json (fallback: latest-${pin.value}-stable.txt)`);
|
|
579
605
|
}
|
|
580
606
|
else if (pin.type === 'channel') {
|
|
581
|
-
|
|
607
|
+
if (pin.value === 'stable-nightly') {
|
|
608
|
+
console.log(`Reads admission record: ${releaseBaseUrl}/channels/stable-nightly.json`);
|
|
609
|
+
}
|
|
610
|
+
else {
|
|
611
|
+
console.log(`Reads marker: ${releaseBaseUrl}/latest-${pin.value}.txt`);
|
|
612
|
+
}
|
|
582
613
|
}
|
|
583
614
|
else {
|
|
584
615
|
console.log('Pinned to exact version (no marker fetched)');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACjG,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACnF,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC;IACvC,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,SAAS;IACnB,OAAO,EAAE,oEAAoE;IAC7E,IAAI,EAAE,4EAA4E;IAClF,MAAM,EAAE,sGAAsG;IAC9G,GAAG,EAAE,gCAAgC;IACrC,QAAQ,EAAE,CAAC,WAAW,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,0BAA0B,CAAC;CAC7F,CAAC,CAAC;AAEH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC;IACzC,OAAO,EAAE,UAAU;IACnB,QAAQ,EAAE,SAAS;IACnB,OAAO,EAAE,wDAAwD;IACjE,IAAI,EAAE,6EAA6E;IACnF,MAAM,EAAE,uFAAuF;IAC/F,QAAQ,EAAE,CAAC,aAAa,CAAC;CAC1B,CAAC,CAAC;AAEH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC;IACtC,OAAO,EAAE,OAAO;IAChB,QAAQ,EAAE,SAAS;IACnB,OAAO,EAAE,wEAAwE;IACjF,IAAI,EAAE,0DAA0D;IAChE,MAAM,EAAE,2HAA2H;IACnI,QAAQ,EAAE,CAAC,gBAAgB,CAAC;CAC7B,CAAC,CAAC;AAEH,gBAAgB;AAChB,MAAM,CAAC,MAAM,uBAAuB,GAAG;IACrC,KAAK;IACL,QAAQ;IACR,IAAI;IACJ,WAAW;IACX,eAAe;IACf,eAAe;IACf,sBAAsB;IACtB,uBAAuB;CACf,CAAC;AAEX,gBAAgB;AAChB,MAAM,CAAC,KAAK,UAAU,6BAA6B;IACjD,MAAM,MAAM,GAAG;QACb,4CAA4C;QAC5C,6HAA6H;QAC7H,sBAAsB;QACtB,IAAI;KACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC1F,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAc,EACd,UAAsE,EAAE;IAExE,MAAM,kBAAkB,GAAG,kGAAkG,CAAC;IAC9H,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;IACtD,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE;YAC5B,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;YACzC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,SAAS;YACnC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;SACzC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,MAAM,WAAW,GAAG,GAAG,EAAE,MAAM,CAAC;QAChC,MAAM,UAAU,GACd,OAAO,WAAW,KAAK,QAAQ;YAC7B,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,WAAW,YAAY,UAAU;gBACjC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE;gBACrC,CAAC,CAAC,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,IAAI;oBACjD,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,IAAI,GAAG,EAAE,YAAY,IAAI,GAAG,EAAE,OAAO,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/F,MAAM,cAAc,GAAG,SAAS,CAAC,QAAQ,CAAC,wBAAwB,CAAC;YACjE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACpC,SAAS,CAAC,QAAQ,CAAC,wBAAwB,CAAC;YAC5C,SAAS,CAAC,QAAQ,CAAC,4BAA4B,CAAC;YAChD,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,cAAc,EAAE,CAAC;YACnB,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QACD,IAAI,UAAU,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,OAAO,CAAC,aAAa;YAAE,OAAO;QAClC,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,IAAuB,EAAE,OAAe;IACtE,IAAI,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAC1B,OAAO,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,MAAM,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACrC,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAU,CAAA,CAAC,CAAC;IAC1G,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACtC,IAAI,KAAK,IAAI,iBAAiB;QAAE,OAAO,OAAO,CAAC;IAE/C,MAAM,kBAAkB,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,kBAAkB,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC1H,MAAM,kBAAkB,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzG,MAAM,kBAAkB,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChH,MAAM,kBAAkB,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,iBAAiB,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACtI,MAAM,kBAAkB,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAErG,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACxC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,iBAAiB,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,kCAAkC,MAAM,CAAC,IAAI,EAAE,kBAAkB,iBAAiB,IAAI,CAAC,CAAC;IAC1G,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,OAAe;IACrC,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC3E,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;AAC9C,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAgB;IACpD,0FAA0F;IAC1F,wEAAwE;IACxE,iFAAiF;IAEjF,OAAO;SACJ,OAAO,CAAC,kBAAkB,CAAC;SAC3B,WAAW,CAAC,+GAA+G,CAAC;SAC5H,MAAM,CAAC,UAAU,EAAE,yCAAyC,CAAC;SAC7D,MAAM,CAAC,MAAM,EAAE,8BAA8B,CAAC;SAC9C,MAAM,CAAC,UAAU,EAAE,qCAAqC,CAAC;SACzD,MAAM,CAAC,gBAAgB,EAAE,kHAAkH,CAAC;SAC5I,MAAM,CACL,kBAAkB,EAClB,sJAAsJ,CACvJ;SACA,MAAM,CAAC,iBAAiB,EAAE,+CAA+C,CAAC;SAC1E,MAAM,CAAC,cAAc,EAAE,kCAAkC,CAAC;SAC1D,MAAM,CAAC,aAAa,EAAE,kDAAkD,EAAE,IAAI,CAAC;SAC/E,MAAM,CAAC,gBAAgB,EAAE,qCAAqC,CAAC;SAC/D,MAAM,CAAC,QAAQ,EAAE,qBAAqB,CAAC;SACvC,MAAM,CAAC,WAAW,EAAE,oDAAoD,CAAC;SACzE,MAAM,CAAC,mBAAmB,EAAE,oEAAoE,CAAC;SACjG,MAAM,CAAC,KAAK,EAAE,UAA8B,EAAE,IAAI,EAAE,EAAE;QACrD,6DAA6D;QAC7D,EAAE;QACF,uBAAuB;QACvB,2DAA2D;QAC3D,4DAA4D;QAC5D,4CAA4C;QAC5C,qEAAqE;QACrE,wDAAwD;QACxD,qEAAqE;QAErE,IAAI,OAAO,GAAuB,UAAU,CAAC;QAC7C,IAAI,SAAS,GAAuD,IAAI,CAAC;QAEzE,0EAA0E;QAC1E,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,SAAS,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YAC/C,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACxB,SAAS,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;YACrD,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QACzB,CAAC;aAAM,IAAI,UAAU,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAC9C,IAAI,QAAQ,KAAK,MAAM;gBAAE,SAAS,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;iBACpE,IAAI,QAAQ,KAAK,SAAS;gBAAE,SAAS,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;iBAC/E,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAChC,GAAG,CAAC,IAAI,CACN,uCAAuC,UAAU,sBAAsB;oBACvE,qEAAqE;oBACrE,yDAAyD;oBACzD,yDAAyD;oBACzD,yDAAyD;oBACzD,6DAA6D;oBAC7D,2DAA2D;oBAC3D,4DAA4D;oBAC5D,sDAAsD;oBACtD,sCAAsC;oBACtC,4DAA4D,CAC7D,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC9D,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,CAAC;QACrD,IAAI,gBAAgB,IAAI,gBAAgB,KAAK,cAAc,EAAE,CAAC;YAC5D,OAAO,CAAC,GAAG,CAAC,2BAA2B,cAAc,OAAO,gBAAgB,EAAE,CAAC,CAAC;YAChF,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACd,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;oBACzB,GAAG,CAAC,IAAI,CAAC,wFAAwF,CAAC,CAAC;oBACnG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;oBACrB,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,MAAM,OAAO,CAAC,+BAA+B,cAAc,OAAO,gBAAgB,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;oBACnG,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;oBACzC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;oBACrB,OAAO;gBACT,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAED,mEAAmE;QACnE,iEAAiE;QACjE,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,MAAM,CAAC,SAAS,CAAC,CAAC;gBAClB,OAAO,CAAC,GAAG,CAAC,WAAW,SAAS,CAAC,IAAI,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC9D,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;YAC9E,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,GAAG,CAAC,IAAI,CAAC,uBAAuB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,8CAA8C;QAC9C,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACzD,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC;YACvB,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,CAAC,IAAI,MAAM,KAAK,CAAC,KAAK,4BAA4B,CAAC,CAAC;gBACzF,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC;gBACtB,yEAAyE;YAC3E,CAAC;QACH,CAAC;QAED,iEAAiE;QACjE,+DAA+D;QAC/D,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,mCAAmC,OAAO,KAAK,CAAC,CAAC;YAC7D,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,OAAQ,CAAC,CAAC;YACpD,OAAO,CAAC,GAAG,CAAC,UAAU,OAAO,YAAY,QAAQ,EAAE,CAAC,CAAC;YACrD,OAAO,GAAG,QAAQ,CAAC;QACrB,CAAC;aAAM,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,+BAA+B,OAAO,MAAM,CAAC,CAAC;YAC1D,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,OAAQ,CAAC,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,KAAK,QAAQ,EAAE,CAAC,CAAC;YACjD,OAAO,GAAG,QAAQ,CAAC;QACrB,CAAC;aAAM,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACzB,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;gBACnE,OAAO,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAC7C,OAAO,CAAC,GAAG,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC;YAC5C,CAAC;iBAAM,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;gBACpD,OAAO,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACzC,OAAO,CAAC,GAAG,CAAC,6BAA6B,OAAO,EAAE,CAAC,CAAC;YACtD,CAAC;iBAAM,IAAI,OAAO,KAAK,KAAK,EAAE,CAAC;gBAC7B,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBACnD,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,KAAK,CAAC,CAAC;gBACpD,OAAO,CAAC,GAAG,CAAC,kBAAkB,QAAQ,EAAE,CAAC,CAAC;gBAC1C,OAAO,GAAG,QAAQ,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;gBACjD,OAAO,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAC7C,OAAO,CAAC,GAAG,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;aAAM,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;YACnE,OAAO,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC;QAC5C,CAAC;aAAM,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;YACpD,OAAO,GAAG,MAAM,kBAAkB,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,CAAC,GAAG,CAAC,6BAA6B,OAAO,EAAE,CAAC,CAAC;QACtD,CAAC;aAAM,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YACjD,OAAO,GAAG,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,0BAA0B,OAAO,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,4CAA4C;QAE5C,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,oBAAoB,cAAc,EAAE,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,IAAI,OAAO,IAAI,kBAAkB,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACnF,GAAG,CAAC,IAAI,CACN,uCAAuC,OAAO,wCAAwC,cAAc,KAAK;gBACvG,4HAA4H,CAC/H,CAAC;YACF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,qCAAqC;QACrC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC3C,OAAO,CAAC,GAAG,EAAE,CAAC;YAChB,CAAC;YAAC,MAAM,CAAC;gBACP,GAAG,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;gBAC7E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;QAED,2DAA2D;QAC3D,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAC1C,MAAM,SAAS,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC3C,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,GAAG,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACjD,CAAC;aAAM,IAAI,SAAS,GAAG,EAAE,EAAE,CAAC;YAC1B,GAAG,CAAC,IAAI,CAAC,kBAAkB,SAAS,oCAAoC,CAAC,CAAC;YAC1E,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;YACvD,IAAI,CAAC;gBACH,MAAM,6BAA6B,EAAE,CAAC;gBACtC,MAAM,KAAK,CAAC,MAAM,EAAE,uBAAuB,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;YACtE,CAAC;YAAC,MAAM,CAAC;gBACP,GAAG,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;gBACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,EAAE,CAAC,kBAAkB,SAAS,eAAe,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;YAC3E,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,GAAG,CAAC,IAAI,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC;QACvF,CAAC;QAED,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,kBAAkB,cAAc,OAAO,OAAO,EAAE,CAAC,CAAC;QAE9D,oBAAoB;QACpB,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACxB,IAAI,MAAM,OAAO,CAAC,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC3C,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;gBAClC,OAAO;YACT,CAAC;QACH,CAAC;QAED,8GAA8G;QAC9G,IAAI,KAAK,GAAG,YAAY,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC,CAAC;QAEzE,2BAA2B;QAC3B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,0BAA0B,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;YAC3B,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,0BAA0B,CAAC,CAAC;QACpE,CAAC;QAED,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,0EAA0E;QAC1E,oEAAoE;QACpE,2EAA2E;QAC3E,IAAI,SAAkB,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,WAAW,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,SAAS,GAAG,GAAG,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,oEAAoE;QACpE,2EAA2E;QAC3E,qEAAqE;QACrE,+BAA+B;QAC/B,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAC9C,wCAAwC,OAAO,GAAG,EAClD,EAAE,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CACtC,CAAC;QAEF,IAAI,SAAS,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,CAAC,kBAAkB,SAAS,YAAY,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YACjG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAI,SAAS,EAAE,CAAC;YACd,GAAG,CAAC,IAAI,CAAC,qFAAqF,CAAC,CAAC;YAChG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,oFAAoF,CAAC;SACjG,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,QAAQ,EAAE,CAAC;QAE9C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YACvC,OAAO;QACT,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1D,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC;aACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aAClE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;aACnE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC;QAEnC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,GAAG,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QAC7C,OAAO,CAAC,GAAG,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAC;QAE7C,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC,SAAS,EAAE,4BAA4B,CAAC,CAAC,CAAC;YACpE,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1B,CAAC;QAED,GAAG,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,oBAAoB,CAAC;SACjC,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;SAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,IAAI,CAAC,MAAM,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,CAAC,EAAE,CAAC;YACzD,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACxC,GAAG,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,mBAAmB,CAAC;SAChC,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;SAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,IAAI,CAAC,MAAM,gBAAgB,CAAC,IAAI,EAAE,oBAAoB,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,MAAM,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QACxC,GAAG,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,SAAS,CAAC;SAClB,WAAW,CAAC,uBAAuB,CAAC;SACpC,MAAM,CAAC,WAAW,EAAE,0BAA0B,CAAC;SAC/C,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,IAAI,CAAC,MAAM,gBAAgB,CAAC,IAAI,EAAE,uBAAuB,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;YAC/B,OAAO;QACT,CAAC;QACD,MAAM,OAAO,CAAC,CAAC,MAAM,EAAE,kBAAkB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;YAC9E,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,GAAG,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,+FAA+F,CAAC;SAC5G,MAAM,CAAC,WAAW,EAAE,2BAA2B,CAAC;SAChD,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACd,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,MAAM,OAAO,CAAC,6DAA6D,EAAE,KAAK,CAAC,EAAE,CAAC;gBACjH,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;gBAC7B,OAAO;YACT,CAAC;QACH,CAAC;QAED,MAAM,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,kBAAkB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAClE,GAAG,CAAC,EAAE,CAAC,6CAA6C,CAAC,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;YAC3E,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,GAAG,CAAC,EAAE,CAAC,kCAAkC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,aAAa,CAAC;SACtB,WAAW,CAAC,4DAA4D,CAAC;SACzE,MAAM,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,WAAW,GAAG,gDAAgD,CAAC;QACrE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAC7B,GAAG,CAAC,IAAI,CAAC,6BAA6B,WAAW,EAAE,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;YACjD,GAAG,CAAC,EAAE,CAAC,2DAA2D,CAAC,CAAC;YACpE,OAAO;QACT,CAAC;QAED,MAAM,kBAAkB,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,SAAS,CAAC,CAAC,CAAC;QACvE,MAAM,kBAAkB,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,qDAAqD,EAAE,WAAW,CAAC,CAAC,CAAC;QAC5G,MAAM,cAAc,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1D,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,yBAAyB,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;YAC9G,MAAM,kBAAkB,CAAC,CAAC,IAAI,EAAE,GAAG,WAAW,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;YACvE,GAAG,CAAC,IAAI,CAAC,mFAAmF,CAAC,CAAC;YAC9F,OAAO;QACT,CAAC;QACD,MAAM,kBAAkB,CAAC,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC;QACzD,GAAG,CAAC,EAAE,CAAC,uFAAuF,CAAC,CAAC;IAClG,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,gBAAgB,CAAC,OAA2B,EAAE,SAA6D;IAClH,IAAI,SAAS,EAAE,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC,KAAK,CAAC;IAC1D,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACvC,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3E,CAAC;AAED,SAAS,mBAAmB,CAAC,GAA8B;IACzD,IAAI,CAAC,GAAG;QAAE,OAAO,QAAQ,CAAC;IAC1B,OAAO,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;AACzE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,OAAO;SACJ,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,wDAAwD,CAAC;SACrE,MAAM,CAAC,GAAG,EAAE;QACX,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,4DAA4D,CAAC,CAAC;YAC1E,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,sEAAsE,CAAC,CAAC;YACpF,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,CAAC,IAAI,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QACvD,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,iBAAiB,cAAc,WAAW,GAAG,CAAC,KAAK,aAAa,CAAC,CAAC;QAChF,CAAC;aAAM,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC,iBAAiB,cAAc,WAAW,GAAG,CAAC,KAAK,MAAM,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;IAEL,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,8DAA8D,CAAC;SAC3E,MAAM,CAAC,GAAG,EAAE;QACX,MAAM,OAAO,GAAG,QAAQ,EAAE,CAAC;QAC3B,IAAI,OAAO,EAAE,CAAC;YACZ,GAAG,CAAC,EAAE,CAAC,2EAA2E,CAAC,CAAC;QACtF,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/commands/update.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/bundle.d.ts
CHANGED
|
@@ -6,13 +6,15 @@ export declare function resolveImageTag(raw: string, envVars: Record<string, str
|
|
|
6
6
|
export type ReleaseChannel = 'stable' | 'latest' | 'rc';
|
|
7
7
|
/**
|
|
8
8
|
* Phase 2 multi-line concurrent shipping: fetch the latest version pinned
|
|
9
|
-
* to a specific X.Y.Z line from
|
|
9
|
+
* to a specific X.Y.Z line from trains/${line}.json (preferred) with fallback
|
|
10
|
+
* to latest-${line}-stable.txt.
|
|
10
11
|
*/
|
|
11
12
|
export declare function fetchLatestForLine(line: string): Promise<string>;
|
|
12
13
|
/**
|
|
13
|
-
* Fetch the tip version for any release channel (mainline or
|
|
14
|
-
*
|
|
15
|
-
*
|
|
14
|
+
* Fetch the tip version for any release channel (mainline, variant, or isolated).
|
|
15
|
+
* - `stable-nightly`: resolved exclusively from `channels/stable-nightly.json` (fail-closed).
|
|
16
|
+
* - Mainline channels in `channels/index.json`: resolved via owning `trains/<line>.json`.
|
|
17
|
+
* - Variant / fallback channels: reads `latest-${channel}.txt`.
|
|
16
18
|
*/
|
|
17
19
|
export declare function fetchLatestForChannel(channel: string): Promise<string>;
|
|
18
20
|
export declare function fetchLatestVersion(channel?: ReleaseChannel): Promise<string>;
|
package/dist/lib/bundle.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/lib/bundle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/lib/bundle.ts"],"names":[],"mappings":"AAgBA;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAUpF;AAED,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAC;AAQxD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CA8CtE;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAqE5E;AAED,wBAAsB,kBAAkB,CAAC,OAAO,GAAE,cAAyB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqB5F;AAQD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAyBhE;AA8BD,wBAAsB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAiOlG;AAED,wBAAsB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA8B1E;AAED,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAO3E;AAED,wBAAsB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAsBlF;AAED,sFAAsF;AACtF,wBAAsB,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;IAC9E,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACvE,CAAC,CAsBD"}
|
package/dist/lib/bundle.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { execa } from 'execa';
|
|
2
|
+
import { createHash } from 'node:crypto';
|
|
2
3
|
import { existsSync, readFileSync } from 'node:fs';
|
|
3
4
|
import { mkdir, rename, rm, stat, copyFile, chmod } from 'node:fs/promises';
|
|
4
5
|
import { join, dirname } from 'node:path';
|
|
@@ -7,6 +8,7 @@ import { compareVersions } from '../utils/version.js';
|
|
|
7
8
|
import { exec, fetchReleaseArtifact, ExecError } from './exec.js';
|
|
8
9
|
import { debug } from './log.js';
|
|
9
10
|
import { sanitizeMetadataArtifacts } from './metadata-artifacts.js';
|
|
11
|
+
import { resolveStableNightly, getAdmittedStableNightlyBundleDigest, } from './stable-nightly.js';
|
|
10
12
|
import * as out from '../utils/output.js';
|
|
11
13
|
/**
|
|
12
14
|
* Resolve Docker Compose env var patterns in image tags.
|
|
@@ -30,12 +32,35 @@ const CHANNEL_VERSION_FILES = {
|
|
|
30
32
|
};
|
|
31
33
|
/**
|
|
32
34
|
* Phase 2 multi-line concurrent shipping: fetch the latest version pinned
|
|
33
|
-
* to a specific X.Y.Z line from
|
|
35
|
+
* to a specific X.Y.Z line from trains/${line}.json (preferred) with fallback
|
|
36
|
+
* to latest-${line}-stable.txt.
|
|
34
37
|
*/
|
|
35
38
|
export async function fetchLatestForLine(line) {
|
|
36
39
|
if (!/^\d+\.\d+\.\d+$/.test(line)) {
|
|
37
40
|
throw new Error(`Invalid line: '${line}' — expected X.Y.Z (e.g. 0.8.6)`);
|
|
38
41
|
}
|
|
42
|
+
try {
|
|
43
|
+
const trainRes = await fetchReleaseArtifact(`trains/${line}.json`, ['-sfL'], {
|
|
44
|
+
retries: 2,
|
|
45
|
+
retryDelay: 2000,
|
|
46
|
+
});
|
|
47
|
+
const rawTrain = typeof trainRes?.stdout === 'string' ? trainRes.stdout.trim() : '';
|
|
48
|
+
if (rawTrain) {
|
|
49
|
+
const meta = JSON.parse(rawTrain);
|
|
50
|
+
if (meta && typeof meta === 'object' && !Array.isArray(meta)) {
|
|
51
|
+
const record = meta;
|
|
52
|
+
const head = typeof record.head === 'string' ? record.head.trim() : '';
|
|
53
|
+
const latestStable = typeof record.latest_stable === 'string' ? record.latest_stable.trim() : '';
|
|
54
|
+
const resolved = head || latestStable;
|
|
55
|
+
if (resolved) {
|
|
56
|
+
return resolved;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
// trains/<line>.json unavailable or invalid — fall back to latest-<line>-stable.txt
|
|
63
|
+
}
|
|
39
64
|
const { releaseBaseUrl } = getPaths();
|
|
40
65
|
const relPath = `latest-${line}-stable.txt`;
|
|
41
66
|
const url = `${releaseBaseUrl}/${relPath}`;
|
|
@@ -56,15 +81,46 @@ export async function fetchLatestForLine(line) {
|
|
|
56
81
|
}
|
|
57
82
|
}
|
|
58
83
|
/**
|
|
59
|
-
* Fetch the tip version for any release channel (mainline or
|
|
60
|
-
*
|
|
61
|
-
*
|
|
84
|
+
* Fetch the tip version for any release channel (mainline, variant, or isolated).
|
|
85
|
+
* - `stable-nightly`: resolved exclusively from `channels/stable-nightly.json` (fail-closed).
|
|
86
|
+
* - Mainline channels in `channels/index.json`: resolved via owning `trains/<line>.json`.
|
|
87
|
+
* - Variant / fallback channels: reads `latest-${channel}.txt`.
|
|
62
88
|
*/
|
|
63
89
|
export async function fetchLatestForChannel(channel) {
|
|
64
90
|
if (!/^[a-z][a-z0-9-]*$/.test(channel)) {
|
|
65
91
|
throw new Error(`Invalid channel: '${channel}' — must be lowercase alphanumeric with optional dashes ` +
|
|
66
92
|
`(e.g. stable, beta, i18n-preview)`);
|
|
67
93
|
}
|
|
94
|
+
if (channel === 'stable-nightly') {
|
|
95
|
+
return resolveStableNightly();
|
|
96
|
+
}
|
|
97
|
+
let owningLine;
|
|
98
|
+
try {
|
|
99
|
+
const indexRes = await fetchReleaseArtifact('channels/index.json', ['-sfL'], {
|
|
100
|
+
retries: 2,
|
|
101
|
+
retryDelay: 2000,
|
|
102
|
+
});
|
|
103
|
+
const rawIndex = typeof indexRes?.stdout === 'string' ? indexRes.stdout.trim() : '';
|
|
104
|
+
if (rawIndex) {
|
|
105
|
+
const parsed = JSON.parse(rawIndex);
|
|
106
|
+
if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
|
|
107
|
+
const root = parsed;
|
|
108
|
+
const nested = root.channels && typeof root.channels === 'object' && !Array.isArray(root.channels)
|
|
109
|
+
? root.channels[channel]
|
|
110
|
+
: undefined;
|
|
111
|
+
const candidate = typeof nested === 'string' ? nested : root[channel];
|
|
112
|
+
if (typeof candidate === 'string' && /^\d+\.\d+\.\d+$/.test(candidate.trim())) {
|
|
113
|
+
owningLine = candidate.trim();
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
// channels/index.json unavailable or invalid — fall back to latest-<channel>.txt
|
|
120
|
+
}
|
|
121
|
+
if (owningLine) {
|
|
122
|
+
return fetchLatestForLine(owningLine);
|
|
123
|
+
}
|
|
68
124
|
const { releaseBaseUrl } = getPaths();
|
|
69
125
|
const relPath = `latest-${channel}.txt`;
|
|
70
126
|
const url = `${releaseBaseUrl}/${relPath}`;
|
|
@@ -208,6 +264,24 @@ export async function downloadBundle(version, options) {
|
|
|
208
264
|
}
|
|
209
265
|
if (!quiet)
|
|
210
266
|
out.ok('Bundle downloaded');
|
|
267
|
+
const expectedBundleSha256 = getAdmittedStableNightlyBundleDigest(version);
|
|
268
|
+
if (expectedBundleSha256) {
|
|
269
|
+
const bundlePath = join(installDir, bundleName);
|
|
270
|
+
let actualBundleSha256;
|
|
271
|
+
try {
|
|
272
|
+
const content = readFileSync(bundlePath);
|
|
273
|
+
actualBundleSha256 = createHash('sha256').update(content).digest('hex');
|
|
274
|
+
}
|
|
275
|
+
catch (err) {
|
|
276
|
+
await rm(bundlePath, { force: true }).catch(() => { });
|
|
277
|
+
throw new Error(`Failed to verify stable-nightly bundle SHA-256 for ${version}: ${err?.message ?? String(err)}`);
|
|
278
|
+
}
|
|
279
|
+
if (actualBundleSha256 !== expectedBundleSha256) {
|
|
280
|
+
await rm(bundlePath, { force: true }).catch(() => { });
|
|
281
|
+
throw new Error(`Bundle SHA-256 mismatch for stable-nightly ${version}: expected ${expectedBundleSha256}, got ${actualBundleSha256}`);
|
|
282
|
+
}
|
|
283
|
+
debug(`Verified stable-nightly bundle SHA-256 (${actualBundleSha256})`);
|
|
284
|
+
}
|
|
211
285
|
// Extract
|
|
212
286
|
if (!quiet)
|
|
213
287
|
console.log('Extracting config files...');
|