@serfab/cadre-host 0.9.0 → 0.11.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/auth/index.d.ts +2 -0
- package/dist/auth/index.js +1 -0
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/self-label.d.ts +36 -0
- package/dist/auth/self-label.js +57 -0
- package/dist/auth/self-label.js.map +1 -0
- package/dist/auth/trust-circle.d.ts +32 -5
- package/dist/auth/trust-circle.js +31 -11
- package/dist/auth/trust-circle.js.map +1 -1
- package/dist/bin/host.js +41 -5
- package/dist/bin/host.js.map +1 -1
- package/dist/donation/__tests__/fake-orchestrator.d.ts +103 -0
- package/dist/donation/__tests__/fake-orchestrator.js +180 -0
- package/dist/donation/__tests__/fake-orchestrator.js.map +1 -0
- package/dist/donation/donation-service.d.ts +237 -12
- package/dist/donation/donation-service.js +491 -34
- package/dist/donation/donation-service.js.map +1 -1
- package/dist/donation/donation-store.d.ts +7 -0
- package/dist/donation/donation-store.js +7 -0
- package/dist/donation/donation-store.js.map +1 -1
- package/dist/donation/donation-supervisor.d.ts +167 -0
- package/dist/donation/donation-supervisor.js +341 -0
- package/dist/donation/donation-supervisor.js.map +1 -0
- package/dist/donation/index.d.ts +4 -2
- package/dist/donation/index.js +2 -1
- package/dist/donation/index.js.map +1 -1
- package/dist/donation/types.d.ts +26 -0
- package/dist/donation/types.js.map +1 -1
- package/dist/index.d.ts +3 -1
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/orchestrator/host-process-orchestrator.d.ts +109 -5
- package/dist/orchestrator/host-process-orchestrator.js +341 -98
- package/dist/orchestrator/host-process-orchestrator.js.map +1 -1
- package/dist/orchestrator/node-identity.d.ts +26 -0
- package/dist/orchestrator/node-identity.js +36 -0
- package/dist/orchestrator/node-identity.js.map +1 -0
- package/dist/orchestrator/port-allocator.d.ts +14 -0
- package/dist/orchestrator/port-allocator.js +45 -0
- package/dist/orchestrator/port-allocator.js.map +1 -1
- package/dist/owner/owner-node-client.d.ts +20 -5
- package/dist/owner/owner-node-client.js +21 -4
- package/dist/owner/owner-node-client.js.map +1 -1
- package/dist/server/error-handler.d.ts +7 -1
- package/dist/server/error-handler.js +23 -1
- package/dist/server/error-handler.js.map +1 -1
- package/dist/server/events/types.d.ts +3 -0
- package/dist/server/index.d.ts +7 -0
- package/dist/server/index.js +9 -3
- package/dist/server/index.js.map +1 -1
- package/dist/server/routes/grants.js +22 -3
- package/dist/server/routes/grants.js.map +1 -1
- package/dist/server/routes/strands.d.ts +20 -0
- package/dist/server/routes/strands.js +38 -0
- package/dist/server/routes/strands.js.map +1 -0
- package/dist/server/static.js +38 -38
- package/dist/strands/index.d.ts +7 -0
- package/dist/strands/index.js +6 -0
- package/dist/strands/index.js.map +1 -0
- package/dist/strands/strand-service.d.ts +50 -0
- package/dist/strands/strand-service.js +103 -0
- package/dist/strands/strand-service.js.map +1 -0
- package/dist/strands/types.d.ts +93 -0
- package/dist/strands/types.js +23 -0
- package/dist/strands/types.js.map +1 -0
- package/dist/ui/assets/index-BVoqLjyX.css +1 -0
- package/dist/ui/assets/index-C-iks41M.js +17 -0
- package/dist/ui/assets/index-C-iks41M.js.map +1 -0
- package/dist/ui/index.html +14 -14
- package/dist/update/release-key.d.ts +1 -1
- package/dist/update/release-key.js +1 -1
- package/package.json +5 -5
- package/service/cadre-host.service.tmpl +16 -16
- package/service/com.serfab.cadre-host.plist.tmpl +35 -35
- package/service/install-service.ps1 +98 -98
- package/service/uninstall-service.ps1 +19 -19
- package/src/__tests__/build-targets.test.ts +26 -0
- package/src/__tests__/cli-invite.smoke.test.ts +192 -192
- package/src/__tests__/cli-nat.smoke.test.ts +212 -212
- package/src/__tests__/cli.smoke.test.ts +46 -46
- package/src/__tests__/global-setup.ts +51 -0
- package/src/__tests__/host-owner.smoke.test.ts +123 -123
- package/src/__tests__/orchestrator-env-scrub.test.ts +140 -0
- package/src/__tests__/orchestrator-node-identity.test.ts +204 -0
- package/src/__tests__/orchestrator-owner.test.ts +198 -198
- package/src/__tests__/orchestrator-pin-keys.test.ts +153 -153
- package/src/__tests__/orchestrator-push.test.ts +145 -145
- package/src/__tests__/orchestrator.test.ts +951 -570
- package/src/auth/__tests__/duration.test.ts +28 -28
- package/src/auth/__tests__/self-label.test.ts +85 -0
- package/src/auth/__tests__/trust-circle-integration.test.ts +152 -147
- package/src/auth/__tests__/trust-circle-store.test.ts +115 -115
- package/src/auth/__tests__/trust-circle.test.ts +445 -401
- package/src/auth/duration.ts +33 -33
- package/src/auth/index.ts +21 -19
- package/src/auth/self-label.ts +74 -0
- package/src/auth/trust-circle-store.ts +155 -155
- package/src/auth/trust-circle.ts +45 -13
- package/src/auth/types.ts +99 -99
- package/src/bin/host.ts +1299 -1258
- package/src/donation/__tests__/donation-service.test.ts +1068 -290
- package/src/donation/__tests__/donation-supervisor.test.ts +510 -0
- package/src/donation/__tests__/fake-orchestrator.test.ts +168 -0
- package/src/donation/__tests__/fake-orchestrator.ts +225 -0
- package/src/donation/__tests__/grant-service.test.ts +213 -213
- package/src/donation/__tests__/grant-store.test.ts +113 -113
- package/src/donation/donation-service.ts +962 -392
- package/src/donation/donation-store.ts +171 -164
- package/src/donation/donation-supervisor.ts +388 -0
- package/src/donation/grant-service.ts +200 -200
- package/src/donation/grant-store.ts +152 -152
- package/src/donation/index.ts +64 -49
- package/src/donation/types.ts +243 -220
- package/src/index.ts +14 -0
- package/src/installer/__tests__/identity.test.ts +34 -34
- package/src/installer/__tests__/paths.test.ts +47 -47
- package/src/installer/__tests__/service-host.test.ts +62 -62
- package/src/installer/__tests__/wizard.test.ts +64 -64
- package/src/installer/identity.ts +49 -49
- package/src/installer/paths.ts +109 -109
- package/src/installer/platform.ts +27 -27
- package/src/installer/service-host/index.ts +21 -21
- package/src/installer/service-host/template.ts +21 -21
- package/src/installer/wizard.ts +103 -103
- package/src/nat/__tests__/address-resolver.test.ts +82 -82
- package/src/nat/__tests__/ddns-duckdns.test.ts +83 -83
- package/src/nat/__tests__/ddns-updater.test.ts +253 -253
- package/src/nat/__tests__/external-ip.test.ts +124 -124
- package/src/nat/__tests__/nat-service.test.ts +497 -497
- package/src/nat/__tests__/nat-store.test.ts +93 -93
- package/src/nat/__tests__/port-mapper.test.ts +191 -191
- package/src/nat/__tests__/reachability.test.ts +24 -24
- package/src/nat/__tests__/secrets.test.ts +178 -178
- package/src/nat/address-resolver.ts +51 -51
- package/src/nat/ddns/duckdns.ts +76 -76
- package/src/nat/ddns/index.ts +55 -55
- package/src/nat/ddns/updater.ts +243 -243
- package/src/nat/external-ip.ts +154 -154
- package/src/nat/index.ts +71 -71
- package/src/nat/nat-service.ts +501 -501
- package/src/nat/nat-store.ts +154 -154
- package/src/nat/port-mapper.ts +329 -329
- package/src/nat/reachability.ts +34 -34
- package/src/nat/secrets/file-store.ts +130 -130
- package/src/nat/secrets/index.ts +112 -112
- package/src/nat/secrets/keytar-store.ts +67 -67
- package/src/nat/types.ts +159 -159
- package/src/orchestrator/__tests__/node-identity.test.ts +62 -0
- package/src/orchestrator/host-process-orchestrator.ts +1133 -894
- package/src/orchestrator/index.ts +10 -10
- package/src/orchestrator/log-rotator.ts +53 -53
- package/src/orchestrator/node-identity.ts +40 -0
- package/src/orchestrator/pid-liveness.ts +24 -24
- package/src/orchestrator/port-allocator.ts +91 -43
- package/src/orchestrator/state-store.ts +90 -90
- package/src/orchestrator/types.ts +141 -141
- package/src/owner/__tests__/owner-node-client.test.ts +194 -194
- package/src/owner/index.ts +12 -12
- package/src/owner/owner-node-client.ts +259 -233
- package/src/push/__tests__/push.test.ts +90 -90
- package/src/push/index.ts +146 -146
- package/src/server/__tests__/bus.test.ts +38 -38
- package/src/server/__tests__/error-handler.test.ts +118 -118
- package/src/server/__tests__/grants-admin-route.test.ts +73 -73
- package/src/server/__tests__/grants-route.test.ts +263 -189
- package/src/server/__tests__/nodes-route.test.ts +259 -259
- package/src/server/__tests__/origin-guard.test.ts +72 -72
- package/src/server/__tests__/publishers.test.ts +216 -216
- package/src/server/__tests__/server.smoke.test.ts +253 -253
- package/src/server/__tests__/settings-route.test.ts +194 -194
- package/src/server/__tests__/sse-route.test.ts +119 -119
- package/src/server/__tests__/static.test.ts +145 -145
- package/src/server/__tests__/status-route.test.ts +134 -134
- package/src/server/__tests__/strands-route.test.ts +233 -0
- package/src/server/error-handler.ts +178 -155
- package/src/server/events/bus.ts +42 -42
- package/src/server/events/sse-route.ts +81 -81
- package/src/server/events/types.ts +23 -22
- package/src/server/index.ts +267 -254
- package/src/server/origin-guard.ts +84 -84
- package/src/server/routes/grants-admin.ts +41 -41
- package/src/server/routes/grants.ts +210 -186
- package/src/server/routes/nat.ts +63 -63
- package/src/server/routes/nodes.ts +170 -170
- package/src/server/routes/settings.ts +123 -123
- package/src/server/routes/status.ts +118 -118
- package/src/server/routes/strands.ts +54 -0
- package/src/server/routes/trust-circle.ts +49 -49
- package/src/server/routes/update.ts +43 -43
- package/src/server/server.ts +122 -122
- package/src/server/settings-store.ts +37 -37
- package/src/server/static.ts +207 -207
- package/src/strands/__tests__/strand-service.test.ts +165 -0
- package/src/strands/index.ts +14 -0
- package/src/strands/strand-service.ts +135 -0
- package/src/strands/types.ts +102 -0
- package/src/update/__tests__/apply.test.ts +158 -158
- package/src/update/__tests__/manifest.test.ts +128 -128
- package/src/update/__tests__/release-key.test.ts +42 -42
- package/src/update/__tests__/sign.test.ts +78 -78
- package/src/update/__tests__/store.test.ts +81 -81
- package/src/update/__tests__/update-service.integration.test.ts +256 -256
- package/src/update/__tests__/version.test.ts +31 -31
- package/src/update/apply.ts +190 -190
- package/src/update/index.ts +341 -341
- package/src/update/release-key.ts +71 -71
- package/src/update/sign.ts +74 -74
- package/src/update/store.ts +101 -101
- package/src/update/types.ts +109 -109
- package/src/update/version.ts +80 -80
- package/dist/ui/assets/index-BlMXQPSw.js +0 -14
- package/dist/ui/assets/index-BlMXQPSw.js.map +0 -1
- package/dist/ui/assets/index-BwU5mJGF.css +0 -1
package/src/update/types.ts
CHANGED
|
@@ -1,109 +1,109 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Types for the cadre-host update flow.
|
|
3
|
-
*
|
|
4
|
-
* The update flow is split across:
|
|
5
|
-
*
|
|
6
|
-
* - manifest.ts — fetch + verify the signed `latest.json` envelope.
|
|
7
|
-
* - store.ts — persist the user-facing `UpdateState` to `<dataDir>/update-state.json`.
|
|
8
|
-
* - apply.ts — invoke `npm install -g` + rollback on failure.
|
|
9
|
-
* - index.ts — composes the above (UpdateService).
|
|
10
|
-
*
|
|
11
|
-
* Mirrors the typed-handler pattern used by trust-circle and NAT (handlers
|
|
12
|
-
* throw `UpdateError` whose `.code` the local-UI maps to HTTP status).
|
|
13
|
-
*/
|
|
14
|
-
|
|
15
|
-
/** Inner manifest object — signed by the release key. */
|
|
16
|
-
export interface UpdateManifest {
|
|
17
|
-
/** Schema version. Bumped on incompatible manifest changes. */
|
|
18
|
-
v: 1;
|
|
19
|
-
/** Version string being announced (semver). */
|
|
20
|
-
version: string;
|
|
21
|
-
/** ISO publish timestamp. */
|
|
22
|
-
publishedAt: string;
|
|
23
|
-
/** Per-channel install hints. cadre-host currently only consults `npm`. */
|
|
24
|
-
channels: {
|
|
25
|
-
npm: { package: string; tag: string };
|
|
26
|
-
};
|
|
27
|
-
/** Optional human-facing release-notes URL. */
|
|
28
|
-
releaseNotesUrl?: string;
|
|
29
|
-
/**
|
|
30
|
-
* Minimum previous version that can step directly to this release. If the
|
|
31
|
-
* current install is older, the user must update through an intermediate
|
|
32
|
-
* release first.
|
|
33
|
-
*/
|
|
34
|
-
minPreviousVersion?: string;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
/** Signed envelope as fetched from the manifest URL. */
|
|
38
|
-
export interface SignedManifest {
|
|
39
|
-
manifest: UpdateManifest;
|
|
40
|
-
/** Detached signature in the form `ed25519:<base64>`. */
|
|
41
|
-
sig: string;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
/** Persisted shape of `<dataDir>/update-state.json`. */
|
|
45
|
-
export interface UpdateState {
|
|
46
|
-
/** Schema version of this file. */
|
|
47
|
-
version: 1;
|
|
48
|
-
/** ISO timestamp of the most recent successful manifest fetch. */
|
|
49
|
-
lastChecked?: string;
|
|
50
|
-
/** Set when the manifest advertises a version newer than `currentVersion`. */
|
|
51
|
-
available?: {
|
|
52
|
-
version: string;
|
|
53
|
-
publishedAt: string;
|
|
54
|
-
releaseNotesUrl?: string;
|
|
55
|
-
};
|
|
56
|
-
/** Records the version before an apply, so a rollback can target it. */
|
|
57
|
-
applyInProgress?: {
|
|
58
|
-
fromVersion: string;
|
|
59
|
-
toVersion: string;
|
|
60
|
-
startedAt: string;
|
|
61
|
-
};
|
|
62
|
-
/** Most recent apply / verification error, surfaced by the UI banner. */
|
|
63
|
-
lastError?: UpdateError;
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
/** Stable error payload — both thrown via `UpdateErrorException` and serialized into state. */
|
|
67
|
-
export interface UpdateError {
|
|
68
|
-
code: UpdateErrorCode;
|
|
69
|
-
message: string;
|
|
70
|
-
at: string;
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
export type UpdateErrorCode =
|
|
74
|
-
| 'signature_invalid'
|
|
75
|
-
| 'manifest_invalid'
|
|
76
|
-
| 'unsupported_state_version'
|
|
77
|
-
| 'apply_in_progress'
|
|
78
|
-
| 'apply_failed'
|
|
79
|
-
| 'rollback_failed'
|
|
80
|
-
| 'min_previous_version'
|
|
81
|
-
| 'no_update_available'
|
|
82
|
-
| 'storage_error';
|
|
83
|
-
|
|
84
|
-
/** Thrown by UpdateService.apply() and related entry points. */
|
|
85
|
-
export class UpdateErrorException extends Error {
|
|
86
|
-
readonly code: UpdateErrorCode;
|
|
87
|
-
|
|
88
|
-
constructor(code: UpdateErrorCode, message: string) {
|
|
89
|
-
super(message);
|
|
90
|
-
this.name = 'UpdateErrorException';
|
|
91
|
-
this.code = code;
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
/** Result of a successful apply() — the caller can inspect what just happened. */
|
|
96
|
-
export interface UpdateApplyResult {
|
|
97
|
-
fromVersion: string;
|
|
98
|
-
toVersion: string;
|
|
99
|
-
restarted: boolean;
|
|
100
|
-
restartError?: string;
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
/** Subset of `host.config.json` consumed by the update flow. */
|
|
104
|
-
export interface UpdateSettings {
|
|
105
|
-
/** When true, the daily timer applies updates automatically. */
|
|
106
|
-
autoApply: boolean;
|
|
107
|
-
/** Optional override for the manifest URL. */
|
|
108
|
-
manifestUrl?: string;
|
|
109
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* Types for the cadre-host update flow.
|
|
3
|
+
*
|
|
4
|
+
* The update flow is split across:
|
|
5
|
+
*
|
|
6
|
+
* - manifest.ts — fetch + verify the signed `latest.json` envelope.
|
|
7
|
+
* - store.ts — persist the user-facing `UpdateState` to `<dataDir>/update-state.json`.
|
|
8
|
+
* - apply.ts — invoke `npm install -g` + rollback on failure.
|
|
9
|
+
* - index.ts — composes the above (UpdateService).
|
|
10
|
+
*
|
|
11
|
+
* Mirrors the typed-handler pattern used by trust-circle and NAT (handlers
|
|
12
|
+
* throw `UpdateError` whose `.code` the local-UI maps to HTTP status).
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
/** Inner manifest object — signed by the release key. */
|
|
16
|
+
export interface UpdateManifest {
|
|
17
|
+
/** Schema version. Bumped on incompatible manifest changes. */
|
|
18
|
+
v: 1;
|
|
19
|
+
/** Version string being announced (semver). */
|
|
20
|
+
version: string;
|
|
21
|
+
/** ISO publish timestamp. */
|
|
22
|
+
publishedAt: string;
|
|
23
|
+
/** Per-channel install hints. cadre-host currently only consults `npm`. */
|
|
24
|
+
channels: {
|
|
25
|
+
npm: { package: string; tag: string };
|
|
26
|
+
};
|
|
27
|
+
/** Optional human-facing release-notes URL. */
|
|
28
|
+
releaseNotesUrl?: string;
|
|
29
|
+
/**
|
|
30
|
+
* Minimum previous version that can step directly to this release. If the
|
|
31
|
+
* current install is older, the user must update through an intermediate
|
|
32
|
+
* release first.
|
|
33
|
+
*/
|
|
34
|
+
minPreviousVersion?: string;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/** Signed envelope as fetched from the manifest URL. */
|
|
38
|
+
export interface SignedManifest {
|
|
39
|
+
manifest: UpdateManifest;
|
|
40
|
+
/** Detached signature in the form `ed25519:<base64>`. */
|
|
41
|
+
sig: string;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/** Persisted shape of `<dataDir>/update-state.json`. */
|
|
45
|
+
export interface UpdateState {
|
|
46
|
+
/** Schema version of this file. */
|
|
47
|
+
version: 1;
|
|
48
|
+
/** ISO timestamp of the most recent successful manifest fetch. */
|
|
49
|
+
lastChecked?: string;
|
|
50
|
+
/** Set when the manifest advertises a version newer than `currentVersion`. */
|
|
51
|
+
available?: {
|
|
52
|
+
version: string;
|
|
53
|
+
publishedAt: string;
|
|
54
|
+
releaseNotesUrl?: string;
|
|
55
|
+
};
|
|
56
|
+
/** Records the version before an apply, so a rollback can target it. */
|
|
57
|
+
applyInProgress?: {
|
|
58
|
+
fromVersion: string;
|
|
59
|
+
toVersion: string;
|
|
60
|
+
startedAt: string;
|
|
61
|
+
};
|
|
62
|
+
/** Most recent apply / verification error, surfaced by the UI banner. */
|
|
63
|
+
lastError?: UpdateError;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/** Stable error payload — both thrown via `UpdateErrorException` and serialized into state. */
|
|
67
|
+
export interface UpdateError {
|
|
68
|
+
code: UpdateErrorCode;
|
|
69
|
+
message: string;
|
|
70
|
+
at: string;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
export type UpdateErrorCode =
|
|
74
|
+
| 'signature_invalid'
|
|
75
|
+
| 'manifest_invalid'
|
|
76
|
+
| 'unsupported_state_version'
|
|
77
|
+
| 'apply_in_progress'
|
|
78
|
+
| 'apply_failed'
|
|
79
|
+
| 'rollback_failed'
|
|
80
|
+
| 'min_previous_version'
|
|
81
|
+
| 'no_update_available'
|
|
82
|
+
| 'storage_error';
|
|
83
|
+
|
|
84
|
+
/** Thrown by UpdateService.apply() and related entry points. */
|
|
85
|
+
export class UpdateErrorException extends Error {
|
|
86
|
+
readonly code: UpdateErrorCode;
|
|
87
|
+
|
|
88
|
+
constructor(code: UpdateErrorCode, message: string) {
|
|
89
|
+
super(message);
|
|
90
|
+
this.name = 'UpdateErrorException';
|
|
91
|
+
this.code = code;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/** Result of a successful apply() — the caller can inspect what just happened. */
|
|
96
|
+
export interface UpdateApplyResult {
|
|
97
|
+
fromVersion: string;
|
|
98
|
+
toVersion: string;
|
|
99
|
+
restarted: boolean;
|
|
100
|
+
restartError?: string;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/** Subset of `host.config.json` consumed by the update flow. */
|
|
104
|
+
export interface UpdateSettings {
|
|
105
|
+
/** When true, the daily timer applies updates automatically. */
|
|
106
|
+
autoApply: boolean;
|
|
107
|
+
/** Optional override for the manifest URL. */
|
|
108
|
+
manifestUrl?: string;
|
|
109
|
+
}
|
package/src/update/version.ts
CHANGED
|
@@ -1,80 +1,80 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Tiny semver comparator. We refuse to pull in `semver` for a single
|
|
3
|
-
* compareVersions() call; the surface here is intentionally narrow.
|
|
4
|
-
*
|
|
5
|
-
* Supports `MAJOR.MINOR.PATCH` and `MAJOR.MINOR.PATCH-PRERELEASE` (semver §11).
|
|
6
|
-
* Build metadata (`+...`) is rejected — releases shouldn't ship with it and
|
|
7
|
-
* it'd only confuse equality.
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
|
-
const SEMVER_RE = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/;
|
|
11
|
-
|
|
12
|
-
export interface ParsedVersion {
|
|
13
|
-
major: number;
|
|
14
|
-
minor: number;
|
|
15
|
-
patch: number;
|
|
16
|
-
/** Empty string when there is no prerelease (= a higher precedence release). */
|
|
17
|
-
prerelease: string;
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
export function parseVersion(input: string): ParsedVersion {
|
|
21
|
-
if (typeof input !== 'string') {
|
|
22
|
-
throw new Error(`Invalid version: ${String(input)}`);
|
|
23
|
-
}
|
|
24
|
-
const m = SEMVER_RE.exec(input.trim());
|
|
25
|
-
if (!m) {
|
|
26
|
-
throw new Error(`Invalid version: ${input}`);
|
|
27
|
-
}
|
|
28
|
-
return {
|
|
29
|
-
major: Number(m[1]),
|
|
30
|
-
minor: Number(m[2]),
|
|
31
|
-
patch: Number(m[3]),
|
|
32
|
-
prerelease: m[4] ?? '',
|
|
33
|
-
};
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
/** -1 if a < b, 0 if equal, +1 if a > b. */
|
|
37
|
-
export function compareVersions(a: string, b: string): number {
|
|
38
|
-
const pa = parseVersion(a);
|
|
39
|
-
const pb = parseVersion(b);
|
|
40
|
-
|
|
41
|
-
if (pa.major !== pb.major) return pa.major < pb.major ? -1 : 1;
|
|
42
|
-
if (pa.minor !== pb.minor) return pa.minor < pb.minor ? -1 : 1;
|
|
43
|
-
if (pa.patch !== pb.patch) return pa.patch < pb.patch ? -1 : 1;
|
|
44
|
-
|
|
45
|
-
// Per semver §11: a version *without* a prerelease has higher precedence
|
|
46
|
-
// than one with a prerelease.
|
|
47
|
-
if (pa.prerelease === '' && pb.prerelease === '') return 0;
|
|
48
|
-
if (pa.prerelease === '') return 1;
|
|
49
|
-
if (pb.prerelease === '') return -1;
|
|
50
|
-
|
|
51
|
-
return comparePrerelease(pa.prerelease, pb.prerelease);
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
/** Component-wise compare per semver §11.4. */
|
|
55
|
-
function comparePrerelease(a: string, b: string): number {
|
|
56
|
-
const as = a.split('.');
|
|
57
|
-
const bs = b.split('.');
|
|
58
|
-
const len = Math.min(as.length, bs.length);
|
|
59
|
-
for (let i = 0; i < len; i++) {
|
|
60
|
-
const c = compareIdentifier(as[i]!, bs[i]!);
|
|
61
|
-
if (c !== 0) return c;
|
|
62
|
-
}
|
|
63
|
-
if (as.length === bs.length) return 0;
|
|
64
|
-
return as.length < bs.length ? -1 : 1;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
function compareIdentifier(a: string, b: string): number {
|
|
68
|
-
const aNum = /^\d+$/.test(a);
|
|
69
|
-
const bNum = /^\d+$/.test(b);
|
|
70
|
-
if (aNum && bNum) {
|
|
71
|
-
const na = Number(a);
|
|
72
|
-
const nb = Number(b);
|
|
73
|
-
return na === nb ? 0 : na < nb ? -1 : 1;
|
|
74
|
-
}
|
|
75
|
-
// Numeric identifiers always have lower precedence than alphanumeric.
|
|
76
|
-
if (aNum) return -1;
|
|
77
|
-
if (bNum) return 1;
|
|
78
|
-
if (a === b) return 0;
|
|
79
|
-
return a < b ? -1 : 1;
|
|
80
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* Tiny semver comparator. We refuse to pull in `semver` for a single
|
|
3
|
+
* compareVersions() call; the surface here is intentionally narrow.
|
|
4
|
+
*
|
|
5
|
+
* Supports `MAJOR.MINOR.PATCH` and `MAJOR.MINOR.PATCH-PRERELEASE` (semver §11).
|
|
6
|
+
* Build metadata (`+...`) is rejected — releases shouldn't ship with it and
|
|
7
|
+
* it'd only confuse equality.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
const SEMVER_RE = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/;
|
|
11
|
+
|
|
12
|
+
export interface ParsedVersion {
|
|
13
|
+
major: number;
|
|
14
|
+
minor: number;
|
|
15
|
+
patch: number;
|
|
16
|
+
/** Empty string when there is no prerelease (= a higher precedence release). */
|
|
17
|
+
prerelease: string;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export function parseVersion(input: string): ParsedVersion {
|
|
21
|
+
if (typeof input !== 'string') {
|
|
22
|
+
throw new Error(`Invalid version: ${String(input)}`);
|
|
23
|
+
}
|
|
24
|
+
const m = SEMVER_RE.exec(input.trim());
|
|
25
|
+
if (!m) {
|
|
26
|
+
throw new Error(`Invalid version: ${input}`);
|
|
27
|
+
}
|
|
28
|
+
return {
|
|
29
|
+
major: Number(m[1]),
|
|
30
|
+
minor: Number(m[2]),
|
|
31
|
+
patch: Number(m[3]),
|
|
32
|
+
prerelease: m[4] ?? '',
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/** -1 if a < b, 0 if equal, +1 if a > b. */
|
|
37
|
+
export function compareVersions(a: string, b: string): number {
|
|
38
|
+
const pa = parseVersion(a);
|
|
39
|
+
const pb = parseVersion(b);
|
|
40
|
+
|
|
41
|
+
if (pa.major !== pb.major) return pa.major < pb.major ? -1 : 1;
|
|
42
|
+
if (pa.minor !== pb.minor) return pa.minor < pb.minor ? -1 : 1;
|
|
43
|
+
if (pa.patch !== pb.patch) return pa.patch < pb.patch ? -1 : 1;
|
|
44
|
+
|
|
45
|
+
// Per semver §11: a version *without* a prerelease has higher precedence
|
|
46
|
+
// than one with a prerelease.
|
|
47
|
+
if (pa.prerelease === '' && pb.prerelease === '') return 0;
|
|
48
|
+
if (pa.prerelease === '') return 1;
|
|
49
|
+
if (pb.prerelease === '') return -1;
|
|
50
|
+
|
|
51
|
+
return comparePrerelease(pa.prerelease, pb.prerelease);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/** Component-wise compare per semver §11.4. */
|
|
55
|
+
function comparePrerelease(a: string, b: string): number {
|
|
56
|
+
const as = a.split('.');
|
|
57
|
+
const bs = b.split('.');
|
|
58
|
+
const len = Math.min(as.length, bs.length);
|
|
59
|
+
for (let i = 0; i < len; i++) {
|
|
60
|
+
const c = compareIdentifier(as[i]!, bs[i]!);
|
|
61
|
+
if (c !== 0) return c;
|
|
62
|
+
}
|
|
63
|
+
if (as.length === bs.length) return 0;
|
|
64
|
+
return as.length < bs.length ? -1 : 1;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
function compareIdentifier(a: string, b: string): number {
|
|
68
|
+
const aNum = /^\d+$/.test(a);
|
|
69
|
+
const bNum = /^\d+$/.test(b);
|
|
70
|
+
if (aNum && bNum) {
|
|
71
|
+
const na = Number(a);
|
|
72
|
+
const nb = Number(b);
|
|
73
|
+
return na === nb ? 0 : na < nb ? -1 : 1;
|
|
74
|
+
}
|
|
75
|
+
// Numeric identifiers always have lower precedence than alphanumeric.
|
|
76
|
+
if (aNum) return -1;
|
|
77
|
+
if (bNum) return 1;
|
|
78
|
+
if (a === b) return 0;
|
|
79
|
+
return a < b ? -1 : 1;
|
|
80
|
+
}
|