@nurix/nustack 0.26.0 → 0.26.1
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/lib/sync/client.js +17 -4
- package/package.json +2 -2
package/dist/lib/sync/client.js
CHANGED
|
@@ -18,7 +18,19 @@ const REQUEST_TIMEOUT_MS = 10_000;
|
|
|
18
18
|
const MAX_PUSH_PASSES = 50;
|
|
19
19
|
const MAX_PULL_PAGES = 500;
|
|
20
20
|
const DEVICE_PROJECTION_FIELDS = ["origin", "type", "subject", "state", "outcome", "ownerAgentDefinitionId"];
|
|
21
|
-
|
|
21
|
+
function releaseOf(version) {
|
|
22
|
+
const match = version ? /^v?(\d+)\.(\d+)/.exec(version.trim()) : null;
|
|
23
|
+
return match ? [Number(match[1]), Number(match[2])] : null;
|
|
24
|
+
}
|
|
25
|
+
export function outdatedMessage(message, serverVersion, clientVersion = cliVersion()) {
|
|
26
|
+
const client = releaseOf(clientVersion);
|
|
27
|
+
const server = releaseOf(serverVersion);
|
|
28
|
+
const isAhead = client !== null && server !== null && (client[0] > server[0] || (client[0] === server[0] && client[1] > server[1]));
|
|
29
|
+
if (isAhead) {
|
|
30
|
+
return `${message} — this CLI (${clientVersion}) is newer than the server (${serverVersion}); sync resumes once the server is updated, or install the server's release: npm i -g @nurix/nustack@${server[0]}.${server[1]}`;
|
|
31
|
+
}
|
|
32
|
+
return `${message} — this CLI (${clientVersion}) is behind the server. Update NuStack: ${UPGRADE_COMMAND}`;
|
|
33
|
+
}
|
|
22
34
|
async function request(url, init, bearer, timeoutMs) {
|
|
23
35
|
try {
|
|
24
36
|
await assertCredentialOrigin(url);
|
|
@@ -47,7 +59,8 @@ async function request(url, init, bearer, timeoutMs) {
|
|
|
47
59
|
if (!response.ok) {
|
|
48
60
|
const code = typeof body?.error?.code === "string" ? body.error.code : null;
|
|
49
61
|
const detail = typeof body?.error?.message === "string" ? body.error.message : typeof body?.message === "string" ? body.message : `HTTP ${response.status}`;
|
|
50
|
-
|
|
62
|
+
const serverVersion = typeof body?.error?.details?.minimumVersion === "string" ? body.error.details.minimumVersion : null;
|
|
63
|
+
return { ok: false, status: response.status, code, message: `${code ?? `HTTP ${response.status}`}: ${detail}`, serverVersion };
|
|
51
64
|
}
|
|
52
65
|
if (!body || body.data === undefined || body.data === null)
|
|
53
66
|
return { ok: false, status: response.status, code: null, message: "the server answered no data" };
|
|
@@ -176,7 +189,7 @@ async function pushBatch(store, base, batch, bearer, summary, timeoutMs) {
|
|
|
176
189
|
const now = Date.now();
|
|
177
190
|
if (!answer.ok) {
|
|
178
191
|
if (answer.status === 426) {
|
|
179
|
-
summary.outdated = outdatedMessage(answer.message);
|
|
192
|
+
summary.outdated = outdatedMessage(answer.message, answer.serverVersion);
|
|
180
193
|
summary.lastError = summary.outdated;
|
|
181
194
|
return false;
|
|
182
195
|
}
|
|
@@ -311,7 +324,7 @@ export async function pullAll(store, globals, options = {}) {
|
|
|
311
324
|
withApplying(store.db, () => writeSyncState(store.db, "cursor", "0"));
|
|
312
325
|
continue;
|
|
313
326
|
}
|
|
314
|
-
summary.lastError = answer.status === 426 ? outdatedMessage(answer.message) : answer.message;
|
|
327
|
+
summary.lastError = answer.status === 426 ? outdatedMessage(answer.message, answer.serverVersion) : answer.message;
|
|
315
328
|
if (answer.status === 426)
|
|
316
329
|
summary.outdated = summary.lastError;
|
|
317
330
|
return summary;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nurix/nustack",
|
|
3
|
-
"version": "0.26.
|
|
3
|
+
"version": "0.26.1",
|
|
4
4
|
"description": "The nustack CLI — bootstrap NuStack services into a repo via the NuStack discovery plane.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"private": false,
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
"@types/node": "^22.19.20",
|
|
35
35
|
"typescript": "^5.7.2",
|
|
36
36
|
"vitest": "^4.1.11",
|
|
37
|
-
"@nurix/contracts": "3.0.1",
|
|
38
37
|
"@nurix/harness": "0.0.0",
|
|
38
|
+
"@nurix/contracts": "3.0.2",
|
|
39
39
|
"@nurix/nustack.studio": "0.0.0",
|
|
40
40
|
"@nurix/nustack.ui": "0.0.0"
|
|
41
41
|
},
|