@calltelemetry/cli 0.2.6 → 0.3.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/update.d.ts.map +1 -1
- package/dist/commands/update.js +16 -41
- package/dist/commands/update.js.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/bundle.d.ts +16 -1
- package/dist/lib/bundle.d.ts.map +1 -1
- package/dist/lib/bundle.js +64 -14
- package/dist/lib/bundle.js.map +1 -1
- package/dist/lib/rpc-scripts.d.ts +2 -0
- package/dist/lib/rpc-scripts.d.ts.map +1 -0
- package/dist/lib/rpc-scripts.js +55 -0
- package/dist/lib/rpc-scripts.js.map +1 -0
- package/dist/lib/update.d.ts +13 -0
- package/dist/lib/update.d.ts.map +1 -0
- package/dist/lib/update.js +67 -0
- package/dist/lib/update.js.map +1 -0
- package/dist/ui/components/Section.d.ts.map +1 -1
- package/dist/ui/components/Section.js +4 -2
- package/dist/ui/components/Section.js.map +1 -1
- package/dist/ui/hooks/useComposeLogs.d.ts.map +1 -1
- package/dist/ui/hooks/useComposeLogs.js +8 -2
- package/dist/ui/hooks/useComposeLogs.js.map +1 -1
- package/dist/ui/hooks/usePolling.d.ts.map +1 -1
- package/dist/ui/hooks/usePolling.js +6 -0
- package/dist/ui/hooks/usePolling.js.map +1 -1
- package/dist/ui/utils/serviceDisplay.d.ts +5 -0
- package/dist/ui/utils/serviceDisplay.d.ts.map +1 -0
- package/dist/ui/utils/serviceDisplay.js +43 -0
- package/dist/ui/utils/serviceDisplay.js.map +1 -0
- package/dist/ui/views/DbTablesView.d.ts.map +1 -1
- package/dist/ui/views/DbTablesView.js +3 -2
- package/dist/ui/views/DbTablesView.js.map +1 -1
- package/dist/ui/views/DiagNetworkView.d.ts.map +1 -1
- package/dist/ui/views/DiagNetworkView.js +0 -16
- package/dist/ui/views/DiagNetworkView.js.map +1 -1
- package/dist/ui/views/DockerNetworkView.d.ts.map +1 -1
- package/dist/ui/views/DockerNetworkView.js +21 -3
- package/dist/ui/views/DockerNetworkView.js.map +1 -1
- package/dist/ui/views/DockerPruneView.d.ts.map +1 -1
- package/dist/ui/views/DockerPruneView.js +12 -5
- package/dist/ui/views/DockerPruneView.js.map +1 -1
- package/dist/ui/views/MainMenu.d.ts.map +1 -1
- package/dist/ui/views/MainMenu.js +56 -62
- package/dist/ui/views/MainMenu.js.map +1 -1
- package/dist/ui/views/MigrateRollbackView.d.ts.map +1 -1
- package/dist/ui/views/MigrateRollbackView.js +15 -4
- package/dist/ui/views/MigrateRollbackView.js.map +1 -1
- package/dist/ui/views/MigrateRunView.d.ts.map +1 -1
- package/dist/ui/views/MigrateRunView.js +15 -4
- package/dist/ui/views/MigrateRunView.js.map +1 -1
- package/dist/ui/views/MigrateStatusView.d.ts.map +1 -1
- package/dist/ui/views/MigrateStatusView.js +1 -54
- package/dist/ui/views/MigrateStatusView.js.map +1 -1
- package/dist/ui/views/MigrateWatchView.d.ts.map +1 -1
- package/dist/ui/views/MigrateWatchView.js +1 -54
- package/dist/ui/views/MigrateWatchView.js.map +1 -1
- package/dist/ui/views/ServicesView.d.ts.map +1 -1
- package/dist/ui/views/ServicesView.js +6 -53
- package/dist/ui/views/ServicesView.js.map +1 -1
- package/dist/ui/views/UpdateView.d.ts +6 -0
- package/dist/ui/views/UpdateView.d.ts.map +1 -0
- package/dist/ui/views/UpdateView.js +302 -0
- package/dist/ui/views/UpdateView.js.map +1 -0
- package/dist/utils/version.d.ts +7 -0
- package/dist/utils/version.d.ts.map +1 -1
- package/dist/utils/version.js +66 -9
- package/dist/utils/version.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,302 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
|
+
import { useState, useEffect, useMemo } from 'react';
|
|
3
|
+
import { Box, Text, useInput } from 'ink';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
import { AppShell, Section, Spinner, StatusBox, KeyValue, Confirm, StepList, TextInput } from '../components/index.js';
|
|
6
|
+
import { useAsyncTask, useStepRunner, useFinish } from '../hooks/index.js';
|
|
7
|
+
import { fetchLatestVersion, fetchAvailableVersions, downloadBundle, checkImageAvailabilityQuiet } from '../../lib/bundle.js';
|
|
8
|
+
import { checkRam, checkDiskSpace, getDockerVersion } from '../../lib/system.js';
|
|
9
|
+
import { generateSelfSignedCerts } from '../../lib/certs.js';
|
|
10
|
+
import { getCurrentVersion, backupCompose, applyAndRestart, postgresVersionGuard, dockerCleanup, pullImages } from '../../lib/update.js';
|
|
11
|
+
import { compareVersions, isVersionGte } from '../../utils/version.js';
|
|
12
|
+
import { getPaths } from '../../lib/paths.js';
|
|
13
|
+
function versionDirection(current, target) {
|
|
14
|
+
if (current === 'not installed' || current === 'unknown')
|
|
15
|
+
return 'unknown';
|
|
16
|
+
const cmp = compareVersions(target, current);
|
|
17
|
+
if (cmp > 0)
|
|
18
|
+
return 'upgrade';
|
|
19
|
+
if (cmp < 0)
|
|
20
|
+
return 'downgrade';
|
|
21
|
+
return 'same';
|
|
22
|
+
}
|
|
23
|
+
function directionLabel(dir) {
|
|
24
|
+
switch (dir) {
|
|
25
|
+
case 'upgrade': return { text: '↑ UPGRADE', color: 'green' };
|
|
26
|
+
case 'downgrade': return { text: '↓ DOWNGRADE', color: 'red' };
|
|
27
|
+
case 'same': return { text: '= SAME', color: 'gray' };
|
|
28
|
+
default: return { text: '+ NEW', color: 'cyan' };
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
function versionTag(version, data) {
|
|
32
|
+
if (version === data.current)
|
|
33
|
+
return '★ Current';
|
|
34
|
+
if (version === data.stable)
|
|
35
|
+
return 'Stable';
|
|
36
|
+
return '';
|
|
37
|
+
}
|
|
38
|
+
const INITIAL_SHOW = 10;
|
|
39
|
+
export function UpdateView({ onBack }) {
|
|
40
|
+
const finish = useFinish(onBack);
|
|
41
|
+
const [phase, setPhase] = useState('fetch');
|
|
42
|
+
const [versions, setVersions] = useState(null);
|
|
43
|
+
const [selectedVersion, setSelectedVersion] = useState(null);
|
|
44
|
+
const [error, setError] = useState(null);
|
|
45
|
+
const [cursor, setCursor] = useState(0);
|
|
46
|
+
const [showAll, setShowAll] = useState(false);
|
|
47
|
+
const [showCustom, setShowCustom] = useState(false);
|
|
48
|
+
const [customValue, setCustomValue] = useState('');
|
|
49
|
+
// --- Phase: fetch ---
|
|
50
|
+
const fetchTask = useAsyncTask(async () => {
|
|
51
|
+
const [current, stable, latest, all] = await Promise.all([
|
|
52
|
+
Promise.resolve(getCurrentVersion()),
|
|
53
|
+
fetchLatestVersion('stable').catch(() => 'unavailable'),
|
|
54
|
+
fetchLatestVersion('latest').catch(() => 'unavailable'),
|
|
55
|
+
fetchAvailableVersions().catch(() => []),
|
|
56
|
+
]);
|
|
57
|
+
return { current, stable, latest, all };
|
|
58
|
+
}, true);
|
|
59
|
+
useEffect(() => {
|
|
60
|
+
if (fetchTask.status === 'done' && fetchTask.data) {
|
|
61
|
+
setVersions(fetchTask.data);
|
|
62
|
+
setPhase('select');
|
|
63
|
+
}
|
|
64
|
+
if (fetchTask.status === 'error') {
|
|
65
|
+
setError(fetchTask.error?.message ?? 'Failed to fetch versions');
|
|
66
|
+
setPhase('error');
|
|
67
|
+
}
|
|
68
|
+
}, [fetchTask.status, fetchTask.data, fetchTask.error]);
|
|
69
|
+
// --- Build version list ---
|
|
70
|
+
const displayVersions = useMemo(() => {
|
|
71
|
+
if (!versions || versions.all.length === 0)
|
|
72
|
+
return [];
|
|
73
|
+
return showAll ? versions.all : versions.all.slice(0, INITIAL_SHOW);
|
|
74
|
+
}, [versions, showAll]);
|
|
75
|
+
// Items: versions + "Show more" (if truncated) + "Custom..."
|
|
76
|
+
const hasMore = versions ? !showAll && versions.all.length > INITIAL_SHOW : false;
|
|
77
|
+
const itemCount = displayVersions.length + (hasMore ? 1 : 0) + 1; // +1 for Custom
|
|
78
|
+
// --- Preflight steps ---
|
|
79
|
+
const preflightSteps = useMemo(() => {
|
|
80
|
+
const v = selectedVersion ?? '';
|
|
81
|
+
return [
|
|
82
|
+
{
|
|
83
|
+
label: 'Check RAM',
|
|
84
|
+
run: async () => {
|
|
85
|
+
const ram = await checkRam();
|
|
86
|
+
if (isVersionGte(v, '0.8.4') && !ram.ok) {
|
|
87
|
+
throw new Error(`Insufficient RAM: ${ram.totalMb}MB (need 7168MB+)`);
|
|
88
|
+
}
|
|
89
|
+
return `${ram.totalMb} MB`;
|
|
90
|
+
},
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
label: 'Check disk space',
|
|
94
|
+
run: async () => {
|
|
95
|
+
const disk = await checkDiskSpace();
|
|
96
|
+
if (!disk.ok)
|
|
97
|
+
throw new Error(`Low disk: ${disk.freePercent}% free (need 10%+)`);
|
|
98
|
+
return `${disk.freePercent}% free`;
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
label: 'Check Docker',
|
|
103
|
+
run: async () => {
|
|
104
|
+
const ver = await getDockerVersion();
|
|
105
|
+
if (ver === null)
|
|
106
|
+
throw new Error('Docker not found');
|
|
107
|
+
if (ver < 26)
|
|
108
|
+
return `v${ver} (upgrade recommended)`;
|
|
109
|
+
return `v${ver}`;
|
|
110
|
+
},
|
|
111
|
+
},
|
|
112
|
+
];
|
|
113
|
+
}, [selectedVersion]);
|
|
114
|
+
const preflightRunner = useStepRunner(preflightSteps);
|
|
115
|
+
useEffect(() => {
|
|
116
|
+
if (phase === 'preflight')
|
|
117
|
+
preflightRunner.run();
|
|
118
|
+
}, [phase]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
119
|
+
useEffect(() => {
|
|
120
|
+
if (phase !== 'preflight')
|
|
121
|
+
return;
|
|
122
|
+
if (preflightRunner.isDone)
|
|
123
|
+
setPhase('confirm');
|
|
124
|
+
if (preflightRunner.states.some(s => s.status === 'error')) {
|
|
125
|
+
setError(preflightRunner.states.find(s => s.status === 'error')?.detail ?? 'Preflight check failed');
|
|
126
|
+
setPhase('error');
|
|
127
|
+
}
|
|
128
|
+
}, [phase, preflightRunner.isDone, preflightRunner.states]);
|
|
129
|
+
// --- Execute steps ---
|
|
130
|
+
const executeSteps = useMemo(() => {
|
|
131
|
+
const v = selectedVersion ?? '';
|
|
132
|
+
const { installDir } = getPaths();
|
|
133
|
+
const tempFile = join(installDir, 'temp-docker-compose.yml');
|
|
134
|
+
return [
|
|
135
|
+
{
|
|
136
|
+
label: 'Generate certificates',
|
|
137
|
+
run: async () => { await generateSelfSignedCerts(); return 'checked'; },
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
label: 'Backup current config',
|
|
141
|
+
run: async () => { return await backupCompose(); },
|
|
142
|
+
},
|
|
143
|
+
{
|
|
144
|
+
label: 'Download config bundle',
|
|
145
|
+
run: async () => { await downloadBundle(v, { quiet: true }); return v; },
|
|
146
|
+
},
|
|
147
|
+
{
|
|
148
|
+
label: 'Check image availability',
|
|
149
|
+
run: async () => {
|
|
150
|
+
const result = await checkImageAvailabilityQuiet(tempFile);
|
|
151
|
+
if (!result.available) {
|
|
152
|
+
const missing = result.results.filter(r => !r.available).map(r => r.image);
|
|
153
|
+
throw new Error(`Unavailable: ${missing.join(', ')}`);
|
|
154
|
+
}
|
|
155
|
+
return `${result.results.length} images verified`;
|
|
156
|
+
},
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
label: 'Pull Docker images',
|
|
160
|
+
run: async () => {
|
|
161
|
+
const images = await pullImages(tempFile);
|
|
162
|
+
return `${images.length} images`;
|
|
163
|
+
},
|
|
164
|
+
},
|
|
165
|
+
{
|
|
166
|
+
label: 'PostgreSQL version guard',
|
|
167
|
+
run: async () => {
|
|
168
|
+
const pinned = await postgresVersionGuard();
|
|
169
|
+
return pinned ? `pinned to PG ${pinned}` : 'ok';
|
|
170
|
+
},
|
|
171
|
+
},
|
|
172
|
+
{
|
|
173
|
+
label: 'Apply and restart services',
|
|
174
|
+
run: async () => { await applyAndRestart(); return 'done'; },
|
|
175
|
+
},
|
|
176
|
+
{
|
|
177
|
+
label: 'Cleanup unused resources',
|
|
178
|
+
run: async () => { await dockerCleanup(); return 'done'; },
|
|
179
|
+
},
|
|
180
|
+
];
|
|
181
|
+
}, [selectedVersion]);
|
|
182
|
+
const executeRunner = useStepRunner(executeSteps);
|
|
183
|
+
useEffect(() => {
|
|
184
|
+
if (phase === 'execute')
|
|
185
|
+
executeRunner.run();
|
|
186
|
+
}, [phase]); // eslint-disable-line react-hooks/exhaustive-deps
|
|
187
|
+
useEffect(() => {
|
|
188
|
+
if (phase !== 'execute')
|
|
189
|
+
return;
|
|
190
|
+
if (executeRunner.isDone)
|
|
191
|
+
setPhase('done');
|
|
192
|
+
}, [phase, executeRunner.isDone]);
|
|
193
|
+
const executeFailed = phase === 'execute' && !executeRunner.isRunning && executeRunner.states.some(s => s.status === 'error');
|
|
194
|
+
// --- Keyboard ---
|
|
195
|
+
useInput((input, key) => {
|
|
196
|
+
if (phase === 'fetch') {
|
|
197
|
+
if (input === 'q' || key.escape)
|
|
198
|
+
finish();
|
|
199
|
+
return;
|
|
200
|
+
}
|
|
201
|
+
if (phase === 'select' && !showCustom) {
|
|
202
|
+
if (key.upArrow)
|
|
203
|
+
setCursor(prev => (prev > 0 ? prev - 1 : itemCount - 1));
|
|
204
|
+
else if (key.downArrow)
|
|
205
|
+
setCursor(prev => (prev < itemCount - 1 ? prev + 1 : 0));
|
|
206
|
+
else if (key.return) {
|
|
207
|
+
if (cursor < displayVersions.length) {
|
|
208
|
+
// Selected a version
|
|
209
|
+
setSelectedVersion(displayVersions[cursor]);
|
|
210
|
+
setPhase('preflight');
|
|
211
|
+
}
|
|
212
|
+
else if (hasMore && cursor === displayVersions.length) {
|
|
213
|
+
// "Show more"
|
|
214
|
+
setShowAll(true);
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
// "Custom..."
|
|
218
|
+
setShowCustom(true);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
else if (input === 'c')
|
|
222
|
+
setShowCustom(true);
|
|
223
|
+
else if (input === 'q' || key.escape)
|
|
224
|
+
finish();
|
|
225
|
+
return;
|
|
226
|
+
}
|
|
227
|
+
if (phase === 'select' && showCustom) {
|
|
228
|
+
if (key.escape) {
|
|
229
|
+
setShowCustom(false);
|
|
230
|
+
setCustomValue('');
|
|
231
|
+
}
|
|
232
|
+
return;
|
|
233
|
+
}
|
|
234
|
+
// confirm is handled by <Confirm> component
|
|
235
|
+
if (phase === 'done') {
|
|
236
|
+
if (input === 'q' || key.escape)
|
|
237
|
+
finish();
|
|
238
|
+
return;
|
|
239
|
+
}
|
|
240
|
+
if (phase === 'error') {
|
|
241
|
+
if (input === 'r') {
|
|
242
|
+
setError(null);
|
|
243
|
+
setPhase('select');
|
|
244
|
+
}
|
|
245
|
+
if (input === 'q' || key.escape)
|
|
246
|
+
finish();
|
|
247
|
+
return;
|
|
248
|
+
}
|
|
249
|
+
if (executeFailed) {
|
|
250
|
+
if (input === 'q' || key.escape)
|
|
251
|
+
finish();
|
|
252
|
+
return;
|
|
253
|
+
}
|
|
254
|
+
});
|
|
255
|
+
// --- Handlers ---
|
|
256
|
+
const handleConfirm = (yes) => {
|
|
257
|
+
if (yes)
|
|
258
|
+
setPhase('execute');
|
|
259
|
+
else {
|
|
260
|
+
setSelectedVersion(null);
|
|
261
|
+
setCursor(0);
|
|
262
|
+
setPhase('select');
|
|
263
|
+
}
|
|
264
|
+
};
|
|
265
|
+
const handleCustomSubmit = (value) => {
|
|
266
|
+
const v = value.trim();
|
|
267
|
+
if (v) {
|
|
268
|
+
setSelectedVersion(v);
|
|
269
|
+
setShowCustom(false);
|
|
270
|
+
setCustomValue('');
|
|
271
|
+
setPhase('preflight');
|
|
272
|
+
}
|
|
273
|
+
};
|
|
274
|
+
// --- Derived ---
|
|
275
|
+
const direction = versions && selectedVersion
|
|
276
|
+
? versionDirection(versions.current, selectedVersion)
|
|
277
|
+
: null;
|
|
278
|
+
// --- Render ---
|
|
279
|
+
return (_jsxs(AppShell, { command: "ct update", children: [phase === 'fetch' && (_jsx(Section, { title: "Update", children: _jsx(Spinner, { label: "Fetching available versions..." }) })), phase === 'select' && versions && (_jsxs(_Fragment, { children: [_jsx(Section, { title: "Current Version", children: _jsx(Box, { paddingLeft: 2, children: _jsx(Text, { bold: true, children: versions.current }) }) }), _jsx(Section, { title: "Available Versions", children: showCustom ? (_jsxs(Box, { paddingLeft: 2, flexDirection: "column", children: [_jsx(TextInput, { label: "Version", value: customValue, onChange: setCustomValue, onSubmit: handleCustomSubmit, placeholder: "e.g. 0.8.6-rc49" }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: "Enter to confirm Esc to cancel" }) })] })) : (_jsxs(Box, { flexDirection: "column", paddingLeft: 2, children: [displayVersions.map((v, i) => {
|
|
280
|
+
const isActive = i === cursor;
|
|
281
|
+
const dir = versionDirection(versions.current, v);
|
|
282
|
+
const dl = directionLabel(dir);
|
|
283
|
+
const tag = versionTag(v, versions);
|
|
284
|
+
return (_jsxs(Box, { children: [_jsx(Text, { color: isActive ? 'cyan' : undefined, bold: isActive, children: isActive ? '❯ ' : ' ' }), _jsx(Text, { color: isActive ? 'cyan' : undefined, bold: isActive, children: v.padEnd(26) }), _jsx(Text, { color: tag === '★ Current' ? 'yellow' : tag === 'Stable' ? 'green' : undefined, dimColor: !tag, children: (tag || 'Pre-Release').padEnd(16) }), _jsx(Text, { color: dl.color, children: dl.text })] }, v));
|
|
285
|
+
}), hasMore && (_jsxs(Box, { children: [_jsx(Text, { color: cursor === displayVersions.length ? 'cyan' : undefined, bold: cursor === displayVersions.length, children: cursor === displayVersions.length ? '❯ ' : ' ' }), _jsx(Text, { color: cursor === displayVersions.length ? 'cyan' : 'gray', dimColor: cursor !== displayVersions.length, children: `Show all ${versions.all.length} versions...` })] })), (() => {
|
|
286
|
+
const customIdx = displayVersions.length + (hasMore ? 1 : 0);
|
|
287
|
+
const isActive = cursor === customIdx;
|
|
288
|
+
return (_jsxs(Box, { children: [_jsx(Text, { color: isActive ? 'cyan' : undefined, bold: isActive, children: isActive ? '❯ ' : ' ' }), _jsx(Text, { color: isActive ? 'cyan' : undefined, bold: isActive, children: 'Custom...'.padEnd(26) }), _jsx(Text, { dimColor: true, children: "Enter a specific version" })] }));
|
|
289
|
+
})()] })) }), !showCustom && (_jsx(Box, { paddingLeft: 2, paddingTop: 1, children: _jsx(Text, { dimColor: true, children: "\u2191\u2193 Navigate Enter Select c Custom q Back" }) }))] })), phase === 'preflight' && (_jsx(Section, { title: "Pre-flight Checks", children: _jsx(StepList, { steps: preflightRunner.states }) })), phase === 'confirm' && versions && selectedVersion && (_jsxs(Section, { title: "Update Summary", children: [_jsx(KeyValue, { items: [
|
|
290
|
+
{ key: 'Current Version', value: versions.current },
|
|
291
|
+
{ key: 'Target Version', value: selectedVersion },
|
|
292
|
+
{ key: 'Direction', value: directionLabel(direction).text },
|
|
293
|
+
] }), direction === 'downgrade' && (_jsx(Box, { marginTop: 1, paddingLeft: 2, children: _jsx(StatusBox, { variant: "warning", title: "DOWNGRADE WARNING", lines: [
|
|
294
|
+
`You are downgrading from ${versions.current} to ${selectedVersion}.`,
|
|
295
|
+
'This may cause data incompatibilities.',
|
|
296
|
+
] }) })), _jsx(Box, { marginTop: 1, paddingLeft: 2, children: _jsx(Confirm, { message: `Proceed with update to ${selectedVersion}?`, onConfirm: handleConfirm }) })] })), phase === 'execute' && (_jsxs(Section, { title: `Updating to ${selectedVersion}`, children: [_jsx(StepList, { steps: executeRunner.states }), executeFailed && (_jsxs(Box, { marginTop: 1, paddingLeft: 2, flexDirection: "column", children: [_jsx(StatusBox, { variant: "error", title: "Update failed", lines: [
|
|
297
|
+
executeRunner.states.find(s => s.status === 'error')?.detail ?? 'Unknown error',
|
|
298
|
+
] }), _jsx(Box, { paddingTop: 1, children: _jsx(Text, { dimColor: true, children: "Press q to go back" }) })] }))] })), phase === 'done' && versions && selectedVersion && (_jsxs(_Fragment, { children: [_jsx(Box, { paddingLeft: 2, children: _jsx(StatusBox, { variant: "success", title: "Update complete!", lines: [
|
|
299
|
+
`Updated from ${versions.current} to ${selectedVersion}`,
|
|
300
|
+
] }) }), onBack && (_jsx(Box, { paddingLeft: 2, paddingTop: 1, children: _jsx(Text, { dimColor: true, children: "Press q to go back" }) }))] })), phase === 'error' && (_jsxs(_Fragment, { children: [_jsx(Box, { paddingLeft: 2, children: _jsx(StatusBox, { variant: "error", title: "Error", lines: [error ?? 'Unknown error'] }) }), _jsx(Box, { paddingLeft: 2, paddingTop: 1, children: _jsx(Text, { dimColor: true, children: "r Retry q Back" }) })] }))] }));
|
|
301
|
+
}
|
|
302
|
+
//# sourceMappingURL=UpdateView.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UpdateView.js","sourceRoot":"","sources":["../../../src/ui/views/UpdateView.tsx"],"names":[],"mappings":"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"}
|
package/dist/utils/version.d.ts
CHANGED
|
@@ -4,5 +4,12 @@ export declare function parseVersion(version: string): {
|
|
|
4
4
|
patch: number;
|
|
5
5
|
} | null;
|
|
6
6
|
export declare function isVersionGte(version: string, target: string): boolean;
|
|
7
|
+
/**
|
|
8
|
+
* Compare two version strings with full pre-release support.
|
|
9
|
+
* Returns positive if a > b, negative if a < b, 0 if equal.
|
|
10
|
+
*
|
|
11
|
+
* Ordering: stable releases sort HIGHER than RCs of the same base version.
|
|
12
|
+
* 0.8.6 > 0.8.6-rc99 > 0.8.6-rc49-jtapi.4 > 0.8.6-rc49-jtapi > 0.8.6-rc49 > 0.8.6-rc48
|
|
13
|
+
*/
|
|
7
14
|
export declare function compareVersions(a: string, b: string): number;
|
|
8
15
|
//# sourceMappingURL=version.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQpG;
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAQpG;AAqCD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CASrE;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAwB5D"}
|
package/dist/utils/version.js
CHANGED
|
@@ -8,28 +8,85 @@ export function parseVersion(version) {
|
|
|
8
8
|
patch: parseInt(match[3], 10),
|
|
9
9
|
};
|
|
10
10
|
}
|
|
11
|
+
/**
|
|
12
|
+
* Parse pre-release suffix from a version string.
|
|
13
|
+
* Examples:
|
|
14
|
+
* "0.8.6" -> null (stable)
|
|
15
|
+
* "0.8.6-rc48" -> { rc: 48, suffix: null }
|
|
16
|
+
* "0.8.6-rc49-jtapi" -> { rc: 49, suffix: "jtapi" }
|
|
17
|
+
* "0.8.6-rc47-jtapi.4" -> { rc: 47, suffix: "jtapi.4" }
|
|
18
|
+
*/
|
|
19
|
+
function parsePreRelease(version) {
|
|
20
|
+
const match = version.match(/-rc(\d+)(?:-(.+))?$/);
|
|
21
|
+
if (!match)
|
|
22
|
+
return null;
|
|
23
|
+
return {
|
|
24
|
+
rc: parseInt(match[1], 10),
|
|
25
|
+
suffix: match[2] ?? null,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Compare two suffix strings like "jtapi" vs "jtapi.4".
|
|
30
|
+
* No suffix < "jtapi" < "jtapi.2" < "jtapi.4"
|
|
31
|
+
*/
|
|
32
|
+
function compareSuffix(a, b) {
|
|
33
|
+
if (a === b)
|
|
34
|
+
return 0;
|
|
35
|
+
if (a === null)
|
|
36
|
+
return -1;
|
|
37
|
+
if (b === null)
|
|
38
|
+
return 1;
|
|
39
|
+
// Extract numeric part after last dot: "jtapi.4" -> 4, "jtapi" -> 0
|
|
40
|
+
const numA = a.includes('.') ? parseInt(a.split('.').pop(), 10) || 0 : 0;
|
|
41
|
+
const numB = b.includes('.') ? parseInt(b.split('.').pop(), 10) || 0 : 0;
|
|
42
|
+
if (numA !== numB)
|
|
43
|
+
return numA - numB;
|
|
44
|
+
// Fall back to string comparison
|
|
45
|
+
return a.localeCompare(b);
|
|
46
|
+
}
|
|
11
47
|
export function isVersionGte(version, target) {
|
|
12
48
|
if (version === 'latest')
|
|
13
49
|
return true;
|
|
14
|
-
const
|
|
15
|
-
const
|
|
16
|
-
if (!
|
|
50
|
+
const va = parseVersion(version);
|
|
51
|
+
const vt = parseVersion(target);
|
|
52
|
+
if (!va || !vt)
|
|
17
53
|
return false;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
if (v.minor !== t.minor)
|
|
21
|
-
return v.minor > t.minor;
|
|
22
|
-
return v.patch >= t.patch;
|
|
54
|
+
const cmp = compareVersions(version, target);
|
|
55
|
+
return cmp >= 0;
|
|
23
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* Compare two version strings with full pre-release support.
|
|
59
|
+
* Returns positive if a > b, negative if a < b, 0 if equal.
|
|
60
|
+
*
|
|
61
|
+
* Ordering: stable releases sort HIGHER than RCs of the same base version.
|
|
62
|
+
* 0.8.6 > 0.8.6-rc99 > 0.8.6-rc49-jtapi.4 > 0.8.6-rc49-jtapi > 0.8.6-rc49 > 0.8.6-rc48
|
|
63
|
+
*/
|
|
24
64
|
export function compareVersions(a, b) {
|
|
25
65
|
const va = parseVersion(a);
|
|
26
66
|
const vb = parseVersion(b);
|
|
27
67
|
if (!va || !vb)
|
|
28
68
|
return 0;
|
|
69
|
+
// Compare base semver
|
|
29
70
|
if (va.major !== vb.major)
|
|
30
71
|
return va.major - vb.major;
|
|
31
72
|
if (va.minor !== vb.minor)
|
|
32
73
|
return va.minor - vb.minor;
|
|
33
|
-
|
|
74
|
+
if (va.patch !== vb.patch)
|
|
75
|
+
return va.patch - vb.patch;
|
|
76
|
+
// Same base version — compare pre-release
|
|
77
|
+
const preA = parsePreRelease(a);
|
|
78
|
+
const preB = parsePreRelease(b);
|
|
79
|
+
// Stable (no pre-release) sorts higher than any RC
|
|
80
|
+
if (!preA && !preB)
|
|
81
|
+
return 0;
|
|
82
|
+
if (!preA)
|
|
83
|
+
return 1; // a is stable, b is RC -> a > b
|
|
84
|
+
if (!preB)
|
|
85
|
+
return -1; // a is RC, b is stable -> a < b
|
|
86
|
+
// Both are RCs — compare RC number
|
|
87
|
+
if (preA.rc !== preB.rc)
|
|
88
|
+
return preA.rc - preB.rc;
|
|
89
|
+
// Same RC number — compare suffix
|
|
90
|
+
return compareSuffix(preA.suffix, preB.suffix);
|
|
34
91
|
}
|
|
35
92
|
//# sourceMappingURL=version.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,YAAY,CAAC,OAAe;IAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACpD,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,OAAO;QACL,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;KAC9B,CAAC;AACJ,CAAC;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"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"}
|