@boxes-dev/dvb 1.0.1100 → 1.0.1102
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/README.md +1 -1
- package/dist/bin/dvb-update.cjs +208 -85
- package/dist/bin/dvb.cjs +146 -53
- package/dist/bin/dvbd.cjs +146 -53
- package/package.json +2 -2
package/README.md
CHANGED
package/dist/bin/dvb-update.cjs
CHANGED
|
@@ -25,7 +25,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
25
25
|
|
|
26
26
|
// src/bootstrap/runtimeManager.ts
|
|
27
27
|
var import_node_child_process2 = require("node:child_process");
|
|
28
|
-
var
|
|
28
|
+
var import_node_crypto4 = require("node:crypto");
|
|
29
29
|
var import_node_module = require("node:module");
|
|
30
30
|
var import_promises3 = __toESM(require("node:fs/promises"), 1);
|
|
31
31
|
var import_node_fs8 = require("node:fs");
|
|
@@ -2989,6 +2989,9 @@ var resolvePreviousRuntimeLink = (homeDir = import_node_os.default.homedir()) =>
|
|
|
2989
2989
|
var resolveUpdaterDaemonPath = (homeDir = import_node_os.default.homedir()) => import_node_path10.default.join(resolveUpdaterDir(homeDir), "daemon.json");
|
|
2990
2990
|
var resolveUpdaterStatePath = (homeDir = import_node_os.default.homedir()) => import_node_path10.default.join(resolveUpdaterDir(homeDir), "state.json");
|
|
2991
2991
|
|
|
2992
|
+
// src/bootstrap/npmRegistry.ts
|
|
2993
|
+
var import_node_crypto2 = require("node:crypto");
|
|
2994
|
+
|
|
2992
2995
|
// src/bootstrap/semver.ts
|
|
2993
2996
|
var parseSemver = (value) => {
|
|
2994
2997
|
const trimmed = value.trim();
|
|
@@ -3054,20 +3057,142 @@ var isSemverGreater = (candidateVersion, currentVersion) => {
|
|
|
3054
3057
|
return comparison !== null && comparison > 0;
|
|
3055
3058
|
};
|
|
3056
3059
|
|
|
3060
|
+
// src/bootstrap/npmRegistry.ts
|
|
3061
|
+
var PINNED_NPM_REGISTRY_KEYS = [
|
|
3062
|
+
{
|
|
3063
|
+
keyid: "SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U",
|
|
3064
|
+
key: "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEY6Ya7W++7aUPzvMTrezH6Ycx3c+HOKYCcNGybJZSCJq/fd7Qa8uuAKtdIkUQtQiEKERhAmE5lMMJhP8OkDOa2g==",
|
|
3065
|
+
expires: null
|
|
3066
|
+
}
|
|
3067
|
+
];
|
|
3068
|
+
var resolveNpmRegistryTrust = () => {
|
|
3069
|
+
if (false) {
|
|
3070
|
+
return JSON.parse(void 0);
|
|
3071
|
+
}
|
|
3072
|
+
return {
|
|
3073
|
+
registryUrl: "https://registry.npmjs.org",
|
|
3074
|
+
keys: PINNED_NPM_REGISTRY_KEYS
|
|
3075
|
+
};
|
|
3076
|
+
};
|
|
3077
|
+
var NPM_REGISTRY_TRUST = resolveNpmRegistryTrust();
|
|
3078
|
+
var FETCH_TIMEOUT_MS = 1e4;
|
|
3079
|
+
var TARBALL_TIMEOUT_MS = 5 * 60 * 1e3;
|
|
3080
|
+
var NpmRegistryVerificationError = class extends Error {
|
|
3081
|
+
code;
|
|
3082
|
+
constructor(code, message) {
|
|
3083
|
+
super(message);
|
|
3084
|
+
this.name = "NpmRegistryVerificationError";
|
|
3085
|
+
this.code = code;
|
|
3086
|
+
}
|
|
3087
|
+
};
|
|
3088
|
+
var readString = (value) => typeof value === "string" ? value.trim() : "";
|
|
3089
|
+
var readSignatures = (value) => {
|
|
3090
|
+
if (!Array.isArray(value)) return [];
|
|
3091
|
+
const signatures = [];
|
|
3092
|
+
for (const entry of value) {
|
|
3093
|
+
if (!entry || typeof entry !== "object") continue;
|
|
3094
|
+
const record = entry;
|
|
3095
|
+
const keyid = readString(record.keyid);
|
|
3096
|
+
const sig = readString(record.sig);
|
|
3097
|
+
if (keyid && sig) {
|
|
3098
|
+
signatures.push({ keyid, sig });
|
|
3099
|
+
}
|
|
3100
|
+
}
|
|
3101
|
+
return signatures;
|
|
3102
|
+
};
|
|
3103
|
+
var isKeyActive = (key, now) => key.expires === null || now.getTime() < Date.parse(key.expires);
|
|
3104
|
+
var verifyRegistryRelease = (packageName, manifest, trust = NPM_REGISTRY_TRUST, now = /* @__PURE__ */ new Date()) => {
|
|
3105
|
+
const record = manifest && typeof manifest === "object" ? manifest : {};
|
|
3106
|
+
const dist = record.dist && typeof record.dist === "object" ? record.dist : {};
|
|
3107
|
+
const version = readString(record.version);
|
|
3108
|
+
const tarballUrl = readString(dist.tarball);
|
|
3109
|
+
const integrity = readString(dist.integrity);
|
|
3110
|
+
if (!version || compareSemver(version, version) === null || !tarballUrl || !/^sha512-[A-Za-z0-9+/]+={0,2}$/.test(integrity)) {
|
|
3111
|
+
throw new NpmRegistryVerificationError(
|
|
3112
|
+
"invalid_manifest",
|
|
3113
|
+
`The npm registry returned an incomplete manifest for ${packageName}.`
|
|
3114
|
+
);
|
|
3115
|
+
}
|
|
3116
|
+
const signatures = readSignatures(dist.signatures);
|
|
3117
|
+
if (signatures.length === 0) {
|
|
3118
|
+
throw new NpmRegistryVerificationError(
|
|
3119
|
+
"missing_signature",
|
|
3120
|
+
`${packageName}@${version} has no npm registry signature.`
|
|
3121
|
+
);
|
|
3122
|
+
}
|
|
3123
|
+
const message = Buffer.from(`${packageName}@${version}:${integrity}`);
|
|
3124
|
+
let checkedTrustedSignature = false;
|
|
3125
|
+
for (const signature of signatures) {
|
|
3126
|
+
const key = trust.keys.find(
|
|
3127
|
+
(candidate) => candidate.keyid === signature.keyid
|
|
3128
|
+
);
|
|
3129
|
+
if (!key || !isKeyActive(key, now)) continue;
|
|
3130
|
+
checkedTrustedSignature = true;
|
|
3131
|
+
const publicKey = (0, import_node_crypto2.createPublicKey)({
|
|
3132
|
+
key: Buffer.from(key.key, "base64"),
|
|
3133
|
+
format: "der",
|
|
3134
|
+
type: "spki"
|
|
3135
|
+
});
|
|
3136
|
+
if ((0, import_node_crypto2.verify)("sha256", message, publicKey, Buffer.from(signature.sig, "base64"))) {
|
|
3137
|
+
return { name: packageName, version, tarballUrl, integrity };
|
|
3138
|
+
}
|
|
3139
|
+
}
|
|
3140
|
+
if (!checkedTrustedSignature) {
|
|
3141
|
+
throw new NpmRegistryVerificationError(
|
|
3142
|
+
"untrusted_key",
|
|
3143
|
+
`${packageName}@${version} is signed with an npm registry key this version of dvb doesn't trust (${signatures.map((signature) => signature.keyid).join(", ")}). Reinstall dvb to get its current signing keys.`
|
|
3144
|
+
);
|
|
3145
|
+
}
|
|
3146
|
+
throw new NpmRegistryVerificationError(
|
|
3147
|
+
"invalid_signature",
|
|
3148
|
+
`The npm registry signature for ${packageName}@${version} is invalid.`
|
|
3149
|
+
);
|
|
3150
|
+
};
|
|
3151
|
+
var verifyTarballIntegrity = (release, tarball) => {
|
|
3152
|
+
const actual = `sha512-${(0, import_node_crypto2.createHash)("sha512").update(tarball).digest("base64")}`;
|
|
3153
|
+
if (actual !== release.integrity) {
|
|
3154
|
+
throw new NpmRegistryVerificationError(
|
|
3155
|
+
"integrity_mismatch",
|
|
3156
|
+
`The downloaded tarball for ${release.name}@${release.version} doesn't match its signed checksum.`
|
|
3157
|
+
);
|
|
3158
|
+
}
|
|
3159
|
+
};
|
|
3160
|
+
var fetchLatestVerifiedRelease = async (packageName, trust = NPM_REGISTRY_TRUST) => {
|
|
3161
|
+
const url = `${trust.registryUrl}/${encodeURIComponent(packageName)}/latest`;
|
|
3162
|
+
const response = await fetch(url, {
|
|
3163
|
+
headers: { accept: "application/json" },
|
|
3164
|
+
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3165
|
+
});
|
|
3166
|
+
if (!response.ok) {
|
|
3167
|
+
throw new Error(
|
|
3168
|
+
`npm registry request for ${packageName} failed with ${response.status}.`
|
|
3169
|
+
);
|
|
3170
|
+
}
|
|
3171
|
+
return verifyRegistryRelease(packageName, await response.json(), trust);
|
|
3172
|
+
};
|
|
3173
|
+
var downloadVerifiedTarball = async (release) => {
|
|
3174
|
+
const response = await fetch(release.tarballUrl, {
|
|
3175
|
+
signal: AbortSignal.timeout(TARBALL_TIMEOUT_MS)
|
|
3176
|
+
});
|
|
3177
|
+
if (!response.ok) {
|
|
3178
|
+
throw new Error(
|
|
3179
|
+
`Download of ${release.name}@${release.version} failed with ${response.status}.`
|
|
3180
|
+
);
|
|
3181
|
+
}
|
|
3182
|
+
const tarball = Buffer.from(await response.arrayBuffer());
|
|
3183
|
+
verifyTarballIntegrity(release, tarball);
|
|
3184
|
+
return tarball;
|
|
3185
|
+
};
|
|
3186
|
+
|
|
3057
3187
|
// src/bootstrap/standaloneManager.ts
|
|
3058
3188
|
var import_node_child_process = require("node:child_process");
|
|
3059
|
-
var
|
|
3189
|
+
var import_node_crypto3 = require("node:crypto");
|
|
3060
3190
|
var import_node_fs7 = require("node:fs");
|
|
3061
3191
|
var import_promises2 = __toESM(require("node:fs/promises"), 1);
|
|
3062
3192
|
var import_node_os2 = __toESM(require("node:os"), 1);
|
|
3063
3193
|
var import_node_path11 = __toESM(require("node:path"), 1);
|
|
3064
|
-
var
|
|
3065
|
-
var
|
|
3066
|
-
if ("https://deploy.boxes.dev/cli/latest.json") {
|
|
3067
|
-
return "https://deploy.boxes.dev/cli/latest.json";
|
|
3068
|
-
}
|
|
3069
|
-
return DEFAULT_MANIFEST_URL;
|
|
3070
|
-
};
|
|
3194
|
+
var SHIM_PACKAGE_NAME = "@boxes-dev/cli";
|
|
3195
|
+
var STANDALONE_MANIFEST_FILE = "standalone-manifest.json";
|
|
3071
3196
|
var isStandaloneMode = () => {
|
|
3072
3197
|
const versionJsonPath = import_node_path11.default.join(
|
|
3073
3198
|
import_node_path11.default.dirname(process.execPath),
|
|
@@ -3089,34 +3214,69 @@ var readLocalVersionMeta = () => {
|
|
|
3089
3214
|
};
|
|
3090
3215
|
var resolveStandaloneDir = (homeDir) => import_node_path11.default.join(resolveDevboxDir(homeDir), "standalone");
|
|
3091
3216
|
var resolveCurrentLink = (homeDir) => import_node_path11.default.join(resolveStandaloneDir(homeDir), "current");
|
|
3092
|
-
var
|
|
3093
|
-
|
|
3094
|
-
|
|
3095
|
-
const
|
|
3096
|
-
|
|
3097
|
-
|
|
3098
|
-
|
|
3099
|
-
|
|
3217
|
+
var SHA256_PATTERN = /^[a-f0-9]{64}$/;
|
|
3218
|
+
var readReleaseStandaloneManifest = async (release) => {
|
|
3219
|
+
const tarball = await downloadVerifiedTarball(release);
|
|
3220
|
+
const tempDir = await import_promises2.default.mkdtemp(
|
|
3221
|
+
import_node_path11.default.join(import_node_os2.default.tmpdir(), "dvb-standalone-manifest-")
|
|
3222
|
+
);
|
|
3223
|
+
try {
|
|
3224
|
+
const tarballPath = import_node_path11.default.join(tempDir, "package.tgz");
|
|
3225
|
+
(0, import_node_fs7.writeFileSync)(tarballPath, tarball);
|
|
3226
|
+
const entryPath = `package/${STANDALONE_MANIFEST_FILE}`;
|
|
3227
|
+
await uo({
|
|
3228
|
+
cwd: tempDir,
|
|
3229
|
+
file: tarballPath,
|
|
3230
|
+
filter: (entry) => entry === entryPath
|
|
3231
|
+
});
|
|
3232
|
+
const manifestPath = import_node_path11.default.join(tempDir, entryPath);
|
|
3233
|
+
if (!(0, import_node_fs7.existsSync)(manifestPath)) {
|
|
3234
|
+
throw new Error(
|
|
3235
|
+
`${release.name}@${release.version} doesn't include standalone archive checksums.`
|
|
3236
|
+
);
|
|
3237
|
+
}
|
|
3238
|
+
return parseStandaloneManifest(
|
|
3239
|
+
JSON.parse((0, import_node_fs7.readFileSync)(manifestPath, "utf8")),
|
|
3240
|
+
release.version
|
|
3241
|
+
);
|
|
3242
|
+
} finally {
|
|
3243
|
+
await import_promises2.default.rm(tempDir, { recursive: true, force: true });
|
|
3244
|
+
}
|
|
3245
|
+
};
|
|
3246
|
+
var parseStandaloneManifest = (payload, expectedVersion) => {
|
|
3247
|
+
const record = payload && typeof payload === "object" ? payload : {};
|
|
3248
|
+
if (record.version !== expectedVersion) {
|
|
3100
3249
|
throw new Error(
|
|
3101
|
-
`
|
|
3250
|
+
`Standalone archive checksums are for ${String(record.version)}, not ${expectedVersion}.`
|
|
3102
3251
|
);
|
|
3103
3252
|
}
|
|
3104
|
-
const
|
|
3105
|
-
|
|
3253
|
+
const archives = {};
|
|
3254
|
+
const rawArchives = record.archives && typeof record.archives === "object" ? record.archives : {};
|
|
3255
|
+
for (const [platformKey, value] of Object.entries(rawArchives)) {
|
|
3256
|
+
const entry = value && typeof value === "object" ? value : {};
|
|
3257
|
+
if (typeof entry.url !== "string" || typeof entry.sha256 !== "string" || !SHA256_PATTERN.test(entry.sha256)) {
|
|
3258
|
+
throw new Error(
|
|
3259
|
+
`Standalone archive checksums for ${expectedVersion} are malformed.`
|
|
3260
|
+
);
|
|
3261
|
+
}
|
|
3262
|
+
archives[platformKey] = { url: entry.url, sha256: entry.sha256 };
|
|
3263
|
+
}
|
|
3264
|
+
return { version: expectedVersion, archives };
|
|
3265
|
+
};
|
|
3266
|
+
var resolveStandaloneUpdate = async (local, trust = NPM_REGISTRY_TRUST) => {
|
|
3267
|
+
const release = await fetchLatestVerifiedRelease(SHIM_PACKAGE_NAME, trust);
|
|
3268
|
+
if (!isSemverGreater(release.version, local.version)) {
|
|
3106
3269
|
return null;
|
|
3107
3270
|
}
|
|
3271
|
+
const manifest = await readReleaseStandaloneManifest(release);
|
|
3108
3272
|
const platformKey = `${local.platform}-${local.arch}`;
|
|
3109
|
-
const archive = manifest.archives
|
|
3273
|
+
const archive = manifest.archives[platformKey];
|
|
3110
3274
|
if (!archive) {
|
|
3111
3275
|
throw new Error(
|
|
3112
3276
|
`No standalone archive for ${platformKey} in manifest v${manifest.version}`
|
|
3113
3277
|
);
|
|
3114
3278
|
}
|
|
3115
|
-
return {
|
|
3116
|
-
manifest,
|
|
3117
|
-
archive,
|
|
3118
|
-
currentVersion: local.version
|
|
3119
|
-
};
|
|
3279
|
+
return { manifest, archive };
|
|
3120
3280
|
};
|
|
3121
3281
|
var downloadStandaloneUpdate = async (manifest, archive, homeDir = import_node_os2.default.homedir()) => {
|
|
3122
3282
|
const standaloneDir = resolveStandaloneDir(homeDir);
|
|
@@ -3143,7 +3303,7 @@ var downloadStandaloneUpdate = async (manifest, archive, homeDir = import_node_o
|
|
|
3143
3303
|
}
|
|
3144
3304
|
const body = await res.arrayBuffer();
|
|
3145
3305
|
(0, import_node_fs7.writeFileSync)(tarballPath, Buffer.from(body));
|
|
3146
|
-
const hash = (0,
|
|
3306
|
+
const hash = (0, import_node_crypto3.createHash)("sha256");
|
|
3147
3307
|
hash.update((0, import_node_fs7.readFileSync)(tarballPath));
|
|
3148
3308
|
const actualHash = hash.digest("hex");
|
|
3149
3309
|
if (actualHash !== archive.sha256) {
|
|
@@ -3188,20 +3348,20 @@ var downloadStandaloneUpdate = async (manifest, archive, homeDir = import_node_o
|
|
|
3188
3348
|
}
|
|
3189
3349
|
};
|
|
3190
3350
|
var updateStandaloneOnce = async (homeDir = import_node_os2.default.homedir()) => {
|
|
3191
|
-
const
|
|
3192
|
-
|
|
3193
|
-
|
|
3351
|
+
const local = readLocalVersionMeta();
|
|
3352
|
+
const update = local ? await resolveStandaloneUpdate(local) : null;
|
|
3353
|
+
if (!update) {
|
|
3194
3354
|
return {
|
|
3195
3355
|
changed: false,
|
|
3196
3356
|
previousVersion: local?.version ?? null,
|
|
3197
3357
|
currentVersion: local?.version ?? "unknown"
|
|
3198
3358
|
};
|
|
3199
3359
|
}
|
|
3200
|
-
await downloadStandaloneUpdate(
|
|
3360
|
+
await downloadStandaloneUpdate(update.manifest, update.archive, homeDir);
|
|
3201
3361
|
return {
|
|
3202
3362
|
changed: true,
|
|
3203
|
-
previousVersion:
|
|
3204
|
-
currentVersion:
|
|
3363
|
+
previousVersion: local?.version ?? null,
|
|
3364
|
+
currentVersion: update.manifest.version
|
|
3205
3365
|
};
|
|
3206
3366
|
};
|
|
3207
3367
|
var atomicSymlink = async (parentDir, linkPath, target) => {
|
|
@@ -3242,8 +3402,6 @@ var pruneOldVersions = async (standaloneDir, currentVersion, platformKey) => {
|
|
|
3242
3402
|
// src/bootstrap/runtimeManager.ts
|
|
3243
3403
|
var MIN_NODE_MAJOR = 22;
|
|
3244
3404
|
var RUNTIME_PACKAGE_NAME = "@boxes-dev/dvb-runtime";
|
|
3245
|
-
var RUNTIME_MANIFEST_URL = `https://registry.npmjs.org/${encodeURIComponent(RUNTIME_PACKAGE_NAME)}/latest`;
|
|
3246
|
-
var FETCH_TIMEOUT_MS = 1e4;
|
|
3247
3405
|
var VALIDATION_TIMEOUT_MS = 5e3;
|
|
3248
3406
|
var UPDATER_INTERVAL_MS = 15 * 60 * 1e3;
|
|
3249
3407
|
var MAX_UPDATER_ERROR_LENGTH = 2e3;
|
|
@@ -3476,39 +3634,6 @@ var copyBundledRuntimeToStage = async (bundled, stageDir) => {
|
|
|
3476
3634
|
}
|
|
3477
3635
|
);
|
|
3478
3636
|
};
|
|
3479
|
-
var fetchLatestRuntimeManifest = async () => {
|
|
3480
|
-
const response = await fetch(RUNTIME_MANIFEST_URL, {
|
|
3481
|
-
headers: {
|
|
3482
|
-
accept: "application/json"
|
|
3483
|
-
},
|
|
3484
|
-
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3485
|
-
});
|
|
3486
|
-
if (!response.ok) {
|
|
3487
|
-
throw new Error(`Runtime manifest fetch failed with ${response.status}.`);
|
|
3488
|
-
}
|
|
3489
|
-
const payload = await response.json();
|
|
3490
|
-
const version = typeof payload.version === "string" ? payload.version.trim() : "";
|
|
3491
|
-
const tarball = typeof payload.dist?.tarball === "string" ? payload.dist.tarball.trim() : "";
|
|
3492
|
-
if (!version || !tarball) {
|
|
3493
|
-
throw new Error("Runtime manifest is missing version or dist.tarball.");
|
|
3494
|
-
}
|
|
3495
|
-
return {
|
|
3496
|
-
version,
|
|
3497
|
-
dist: {
|
|
3498
|
-
tarball
|
|
3499
|
-
}
|
|
3500
|
-
};
|
|
3501
|
-
};
|
|
3502
|
-
var downloadTarball = async (url, filePath) => {
|
|
3503
|
-
const response = await fetch(url, {
|
|
3504
|
-
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3505
|
-
});
|
|
3506
|
-
if (!response.ok) {
|
|
3507
|
-
throw new Error(`Runtime tarball download failed with ${response.status}.`);
|
|
3508
|
-
}
|
|
3509
|
-
const buffer = Buffer.from(await response.arrayBuffer());
|
|
3510
|
-
await import_promises3.default.writeFile(filePath, buffer);
|
|
3511
|
-
};
|
|
3512
3637
|
var extractRuntimeTarballToStage = async (tarballPath, stageDir) => {
|
|
3513
3638
|
await uo({
|
|
3514
3639
|
cwd: stageDir,
|
|
@@ -3654,7 +3779,7 @@ var terminateChild = async (child) => {
|
|
|
3654
3779
|
var validateRuntimeStage = async (stageDir, expectedVersion) => {
|
|
3655
3780
|
const socketDir = import_node_path12.default.join(
|
|
3656
3781
|
"/tmp",
|
|
3657
|
-
`dvb-runtime-validate-${process.pid}-${(0,
|
|
3782
|
+
`dvb-runtime-validate-${process.pid}-${(0, import_node_crypto4.randomUUID)().slice(0, 8)}`
|
|
3658
3783
|
);
|
|
3659
3784
|
const socketPath = import_node_path12.default.join(socketDir, "devboxd.sock");
|
|
3660
3785
|
const daemonBinPath = resolveRuntimeBinPath(stageDir, "dvbd");
|
|
@@ -3834,22 +3959,19 @@ var installBundledRuntime = async (bundled, homeDir = import_node_os3.default.ho
|
|
|
3834
3959
|
throw error;
|
|
3835
3960
|
}
|
|
3836
3961
|
};
|
|
3837
|
-
var installDownloadedRuntime = async (
|
|
3838
|
-
const tarball =
|
|
3839
|
-
|
|
3840
|
-
throw new Error("Runtime manifest is missing dist.tarball.");
|
|
3841
|
-
}
|
|
3842
|
-
const stageDir = await createStageDir(manifest.version, homeDir);
|
|
3962
|
+
var installDownloadedRuntime = async (release, homeDir = import_node_os3.default.homedir()) => {
|
|
3963
|
+
const tarball = await downloadVerifiedTarball(release);
|
|
3964
|
+
const stageDir = await createStageDir(release.version, homeDir);
|
|
3843
3965
|
const tarballPath = import_node_path12.default.join(stageDir, "runtime.tgz");
|
|
3844
3966
|
try {
|
|
3845
|
-
await
|
|
3967
|
+
await import_promises3.default.writeFile(tarballPath, tarball);
|
|
3846
3968
|
await extractRuntimeTarballToStage(tarballPath, stageDir);
|
|
3847
3969
|
await import_promises3.default.rm(tarballPath, { force: true });
|
|
3848
|
-
await validateRuntimeStage(stageDir,
|
|
3849
|
-
await promoteRuntimeStage(stageDir,
|
|
3970
|
+
await validateRuntimeStage(stageDir, release.version);
|
|
3971
|
+
await promoteRuntimeStage(stageDir, release.version, homeDir);
|
|
3850
3972
|
return {
|
|
3851
|
-
version:
|
|
3852
|
-
runtimeDir: resolveRuntimeVersionDir(
|
|
3973
|
+
version: release.version,
|
|
3974
|
+
runtimeDir: resolveRuntimeVersionDir(release.version, homeDir)
|
|
3853
3975
|
};
|
|
3854
3976
|
} catch (error) {
|
|
3855
3977
|
await import_promises3.default.rm(stageDir, { recursive: true, force: true });
|
|
@@ -3874,12 +3996,13 @@ var ensureBundledRuntimeStaged = async (homeDir = import_node_os3.default.homedi
|
|
|
3874
3996
|
throw error;
|
|
3875
3997
|
}
|
|
3876
3998
|
};
|
|
3877
|
-
var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node_os3.default.homedir()) => {
|
|
3999
|
+
var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node_os3.default.homedir(), trust = NPM_REGISTRY_TRUST) => {
|
|
3878
4000
|
assertNodeVersion();
|
|
3879
4001
|
const bundled = await readBundledRuntime();
|
|
3880
|
-
const
|
|
3881
|
-
const
|
|
3882
|
-
|
|
4002
|
+
const ensureBundledRuntimeStagedFn = runtimeManagerTestHooks.ensureBundledRuntimeStaged ?? ensureBundledRuntimeStaged;
|
|
4003
|
+
const current = await ensureBundledRuntimeStagedFn(homeDir);
|
|
4004
|
+
const release = await fetchLatestVerifiedRelease(RUNTIME_PACKAGE_NAME, trust);
|
|
4005
|
+
if (!isSemverGreater(release.version, current.version)) {
|
|
3883
4006
|
return {
|
|
3884
4007
|
changed: false,
|
|
3885
4008
|
previousVersion: current.version,
|
|
@@ -3887,7 +4010,7 @@ var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node
|
|
|
3887
4010
|
source: compareSemver(current.version, bundled.version) === 0 ? "bundled" : "downloaded"
|
|
3888
4011
|
};
|
|
3889
4012
|
}
|
|
3890
|
-
const updated = await installDownloadedRuntime(
|
|
4013
|
+
const updated = await installDownloadedRuntime(release, homeDir);
|
|
3891
4014
|
return {
|
|
3892
4015
|
changed: true,
|
|
3893
4016
|
previousVersion: current.version,
|
package/dist/bin/dvb.cjs
CHANGED
|
@@ -25,7 +25,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
25
25
|
|
|
26
26
|
// src/bootstrap/runtimeManager.ts
|
|
27
27
|
var import_node_child_process = require("node:child_process");
|
|
28
|
-
var
|
|
28
|
+
var import_node_crypto3 = require("node:crypto");
|
|
29
29
|
var import_node_module = require("node:module");
|
|
30
30
|
var import_promises2 = __toESM(require("node:fs/promises"), 1);
|
|
31
31
|
var import_node_fs7 = require("node:fs");
|
|
@@ -2989,6 +2989,9 @@ var resolvePreviousRuntimeLink = (homeDir = import_node_os.default.homedir()) =>
|
|
|
2989
2989
|
var resolveUpdaterDaemonPath = (homeDir = import_node_os.default.homedir()) => import_node_path10.default.join(resolveUpdaterDir(homeDir), "daemon.json");
|
|
2990
2990
|
var resolveUpdaterStatePath = (homeDir = import_node_os.default.homedir()) => import_node_path10.default.join(resolveUpdaterDir(homeDir), "state.json");
|
|
2991
2991
|
|
|
2992
|
+
// src/bootstrap/npmRegistry.ts
|
|
2993
|
+
var import_node_crypto2 = require("node:crypto");
|
|
2994
|
+
|
|
2992
2995
|
// src/bootstrap/semver.ts
|
|
2993
2996
|
var parseSemver = (value) => {
|
|
2994
2997
|
const trimmed = value.trim();
|
|
@@ -3054,11 +3057,136 @@ var isSemverGreater = (candidateVersion, currentVersion) => {
|
|
|
3054
3057
|
return comparison !== null && comparison > 0;
|
|
3055
3058
|
};
|
|
3056
3059
|
|
|
3060
|
+
// src/bootstrap/npmRegistry.ts
|
|
3061
|
+
var PINNED_NPM_REGISTRY_KEYS = [
|
|
3062
|
+
{
|
|
3063
|
+
keyid: "SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U",
|
|
3064
|
+
key: "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEY6Ya7W++7aUPzvMTrezH6Ycx3c+HOKYCcNGybJZSCJq/fd7Qa8uuAKtdIkUQtQiEKERhAmE5lMMJhP8OkDOa2g==",
|
|
3065
|
+
expires: null
|
|
3066
|
+
}
|
|
3067
|
+
];
|
|
3068
|
+
var resolveNpmRegistryTrust = () => {
|
|
3069
|
+
if (false) {
|
|
3070
|
+
return JSON.parse(void 0);
|
|
3071
|
+
}
|
|
3072
|
+
return {
|
|
3073
|
+
registryUrl: "https://registry.npmjs.org",
|
|
3074
|
+
keys: PINNED_NPM_REGISTRY_KEYS
|
|
3075
|
+
};
|
|
3076
|
+
};
|
|
3077
|
+
var NPM_REGISTRY_TRUST = resolveNpmRegistryTrust();
|
|
3078
|
+
var FETCH_TIMEOUT_MS = 1e4;
|
|
3079
|
+
var TARBALL_TIMEOUT_MS = 5 * 60 * 1e3;
|
|
3080
|
+
var NpmRegistryVerificationError = class extends Error {
|
|
3081
|
+
code;
|
|
3082
|
+
constructor(code, message) {
|
|
3083
|
+
super(message);
|
|
3084
|
+
this.name = "NpmRegistryVerificationError";
|
|
3085
|
+
this.code = code;
|
|
3086
|
+
}
|
|
3087
|
+
};
|
|
3088
|
+
var readString = (value) => typeof value === "string" ? value.trim() : "";
|
|
3089
|
+
var readSignatures = (value) => {
|
|
3090
|
+
if (!Array.isArray(value)) return [];
|
|
3091
|
+
const signatures = [];
|
|
3092
|
+
for (const entry of value) {
|
|
3093
|
+
if (!entry || typeof entry !== "object") continue;
|
|
3094
|
+
const record = entry;
|
|
3095
|
+
const keyid = readString(record.keyid);
|
|
3096
|
+
const sig = readString(record.sig);
|
|
3097
|
+
if (keyid && sig) {
|
|
3098
|
+
signatures.push({ keyid, sig });
|
|
3099
|
+
}
|
|
3100
|
+
}
|
|
3101
|
+
return signatures;
|
|
3102
|
+
};
|
|
3103
|
+
var isKeyActive = (key, now) => key.expires === null || now.getTime() < Date.parse(key.expires);
|
|
3104
|
+
var verifyRegistryRelease = (packageName, manifest, trust = NPM_REGISTRY_TRUST, now = /* @__PURE__ */ new Date()) => {
|
|
3105
|
+
const record = manifest && typeof manifest === "object" ? manifest : {};
|
|
3106
|
+
const dist = record.dist && typeof record.dist === "object" ? record.dist : {};
|
|
3107
|
+
const version = readString(record.version);
|
|
3108
|
+
const tarballUrl = readString(dist.tarball);
|
|
3109
|
+
const integrity = readString(dist.integrity);
|
|
3110
|
+
if (!version || compareSemver(version, version) === null || !tarballUrl || !/^sha512-[A-Za-z0-9+/]+={0,2}$/.test(integrity)) {
|
|
3111
|
+
throw new NpmRegistryVerificationError(
|
|
3112
|
+
"invalid_manifest",
|
|
3113
|
+
`The npm registry returned an incomplete manifest for ${packageName}.`
|
|
3114
|
+
);
|
|
3115
|
+
}
|
|
3116
|
+
const signatures = readSignatures(dist.signatures);
|
|
3117
|
+
if (signatures.length === 0) {
|
|
3118
|
+
throw new NpmRegistryVerificationError(
|
|
3119
|
+
"missing_signature",
|
|
3120
|
+
`${packageName}@${version} has no npm registry signature.`
|
|
3121
|
+
);
|
|
3122
|
+
}
|
|
3123
|
+
const message = Buffer.from(`${packageName}@${version}:${integrity}`);
|
|
3124
|
+
let checkedTrustedSignature = false;
|
|
3125
|
+
for (const signature of signatures) {
|
|
3126
|
+
const key = trust.keys.find(
|
|
3127
|
+
(candidate) => candidate.keyid === signature.keyid
|
|
3128
|
+
);
|
|
3129
|
+
if (!key || !isKeyActive(key, now)) continue;
|
|
3130
|
+
checkedTrustedSignature = true;
|
|
3131
|
+
const publicKey = (0, import_node_crypto2.createPublicKey)({
|
|
3132
|
+
key: Buffer.from(key.key, "base64"),
|
|
3133
|
+
format: "der",
|
|
3134
|
+
type: "spki"
|
|
3135
|
+
});
|
|
3136
|
+
if ((0, import_node_crypto2.verify)("sha256", message, publicKey, Buffer.from(signature.sig, "base64"))) {
|
|
3137
|
+
return { name: packageName, version, tarballUrl, integrity };
|
|
3138
|
+
}
|
|
3139
|
+
}
|
|
3140
|
+
if (!checkedTrustedSignature) {
|
|
3141
|
+
throw new NpmRegistryVerificationError(
|
|
3142
|
+
"untrusted_key",
|
|
3143
|
+
`${packageName}@${version} is signed with an npm registry key this version of dvb doesn't trust (${signatures.map((signature) => signature.keyid).join(", ")}). Reinstall dvb to get its current signing keys.`
|
|
3144
|
+
);
|
|
3145
|
+
}
|
|
3146
|
+
throw new NpmRegistryVerificationError(
|
|
3147
|
+
"invalid_signature",
|
|
3148
|
+
`The npm registry signature for ${packageName}@${version} is invalid.`
|
|
3149
|
+
);
|
|
3150
|
+
};
|
|
3151
|
+
var verifyTarballIntegrity = (release, tarball) => {
|
|
3152
|
+
const actual = `sha512-${(0, import_node_crypto2.createHash)("sha512").update(tarball).digest("base64")}`;
|
|
3153
|
+
if (actual !== release.integrity) {
|
|
3154
|
+
throw new NpmRegistryVerificationError(
|
|
3155
|
+
"integrity_mismatch",
|
|
3156
|
+
`The downloaded tarball for ${release.name}@${release.version} doesn't match its signed checksum.`
|
|
3157
|
+
);
|
|
3158
|
+
}
|
|
3159
|
+
};
|
|
3160
|
+
var fetchLatestVerifiedRelease = async (packageName, trust = NPM_REGISTRY_TRUST) => {
|
|
3161
|
+
const url = `${trust.registryUrl}/${encodeURIComponent(packageName)}/latest`;
|
|
3162
|
+
const response = await fetch(url, {
|
|
3163
|
+
headers: { accept: "application/json" },
|
|
3164
|
+
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3165
|
+
});
|
|
3166
|
+
if (!response.ok) {
|
|
3167
|
+
throw new Error(
|
|
3168
|
+
`npm registry request for ${packageName} failed with ${response.status}.`
|
|
3169
|
+
);
|
|
3170
|
+
}
|
|
3171
|
+
return verifyRegistryRelease(packageName, await response.json(), trust);
|
|
3172
|
+
};
|
|
3173
|
+
var downloadVerifiedTarball = async (release) => {
|
|
3174
|
+
const response = await fetch(release.tarballUrl, {
|
|
3175
|
+
signal: AbortSignal.timeout(TARBALL_TIMEOUT_MS)
|
|
3176
|
+
});
|
|
3177
|
+
if (!response.ok) {
|
|
3178
|
+
throw new Error(
|
|
3179
|
+
`Download of ${release.name}@${release.version} failed with ${response.status}.`
|
|
3180
|
+
);
|
|
3181
|
+
}
|
|
3182
|
+
const tarball = Buffer.from(await response.arrayBuffer());
|
|
3183
|
+
verifyTarballIntegrity(release, tarball);
|
|
3184
|
+
return tarball;
|
|
3185
|
+
};
|
|
3186
|
+
|
|
3057
3187
|
// src/bootstrap/runtimeManager.ts
|
|
3058
3188
|
var MIN_NODE_MAJOR = 22;
|
|
3059
3189
|
var RUNTIME_PACKAGE_NAME = "@boxes-dev/dvb-runtime";
|
|
3060
|
-
var RUNTIME_MANIFEST_URL = `https://registry.npmjs.org/${encodeURIComponent(RUNTIME_PACKAGE_NAME)}/latest`;
|
|
3061
|
-
var FETCH_TIMEOUT_MS = 1e4;
|
|
3062
3190
|
var VALIDATION_TIMEOUT_MS = 5e3;
|
|
3063
3191
|
var UPGRADE_REQUIRED_EXIT_CODE = 86;
|
|
3064
3192
|
var UPDATER_INTERVAL_MS = 15 * 60 * 1e3;
|
|
@@ -3325,39 +3453,6 @@ var copyBundledRuntimeToStage = async (bundled, stageDir) => {
|
|
|
3325
3453
|
}
|
|
3326
3454
|
);
|
|
3327
3455
|
};
|
|
3328
|
-
var fetchLatestRuntimeManifest = async () => {
|
|
3329
|
-
const response = await fetch(RUNTIME_MANIFEST_URL, {
|
|
3330
|
-
headers: {
|
|
3331
|
-
accept: "application/json"
|
|
3332
|
-
},
|
|
3333
|
-
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3334
|
-
});
|
|
3335
|
-
if (!response.ok) {
|
|
3336
|
-
throw new Error(`Runtime manifest fetch failed with ${response.status}.`);
|
|
3337
|
-
}
|
|
3338
|
-
const payload = await response.json();
|
|
3339
|
-
const version = typeof payload.version === "string" ? payload.version.trim() : "";
|
|
3340
|
-
const tarball = typeof payload.dist?.tarball === "string" ? payload.dist.tarball.trim() : "";
|
|
3341
|
-
if (!version || !tarball) {
|
|
3342
|
-
throw new Error("Runtime manifest is missing version or dist.tarball.");
|
|
3343
|
-
}
|
|
3344
|
-
return {
|
|
3345
|
-
version,
|
|
3346
|
-
dist: {
|
|
3347
|
-
tarball
|
|
3348
|
-
}
|
|
3349
|
-
};
|
|
3350
|
-
};
|
|
3351
|
-
var downloadTarball = async (url, filePath) => {
|
|
3352
|
-
const response = await fetch(url, {
|
|
3353
|
-
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3354
|
-
});
|
|
3355
|
-
if (!response.ok) {
|
|
3356
|
-
throw new Error(`Runtime tarball download failed with ${response.status}.`);
|
|
3357
|
-
}
|
|
3358
|
-
const buffer = Buffer.from(await response.arrayBuffer());
|
|
3359
|
-
await import_promises2.default.writeFile(filePath, buffer);
|
|
3360
|
-
};
|
|
3361
3456
|
var extractRuntimeTarballToStage = async (tarballPath, stageDir) => {
|
|
3362
3457
|
await uo({
|
|
3363
3458
|
cwd: stageDir,
|
|
@@ -3503,7 +3598,7 @@ var terminateChild = async (child) => {
|
|
|
3503
3598
|
var validateRuntimeStage = async (stageDir, expectedVersion) => {
|
|
3504
3599
|
const socketDir = import_node_path11.default.join(
|
|
3505
3600
|
"/tmp",
|
|
3506
|
-
`dvb-runtime-validate-${process.pid}-${(0,
|
|
3601
|
+
`dvb-runtime-validate-${process.pid}-${(0, import_node_crypto3.randomUUID)().slice(0, 8)}`
|
|
3507
3602
|
);
|
|
3508
3603
|
const socketPath = import_node_path11.default.join(socketDir, "devboxd.sock");
|
|
3509
3604
|
const daemonBinPath = resolveRuntimeBinPath(stageDir, "dvbd");
|
|
@@ -3693,22 +3788,19 @@ var installBundledRuntime = async (bundled, homeDir = import_node_os2.default.ho
|
|
|
3693
3788
|
throw error;
|
|
3694
3789
|
}
|
|
3695
3790
|
};
|
|
3696
|
-
var installDownloadedRuntime = async (
|
|
3697
|
-
const tarball =
|
|
3698
|
-
|
|
3699
|
-
throw new Error("Runtime manifest is missing dist.tarball.");
|
|
3700
|
-
}
|
|
3701
|
-
const stageDir = await createStageDir(manifest.version, homeDir);
|
|
3791
|
+
var installDownloadedRuntime = async (release, homeDir = import_node_os2.default.homedir()) => {
|
|
3792
|
+
const tarball = await downloadVerifiedTarball(release);
|
|
3793
|
+
const stageDir = await createStageDir(release.version, homeDir);
|
|
3702
3794
|
const tarballPath = import_node_path11.default.join(stageDir, "runtime.tgz");
|
|
3703
3795
|
try {
|
|
3704
|
-
await
|
|
3796
|
+
await import_promises2.default.writeFile(tarballPath, tarball);
|
|
3705
3797
|
await extractRuntimeTarballToStage(tarballPath, stageDir);
|
|
3706
3798
|
await import_promises2.default.rm(tarballPath, { force: true });
|
|
3707
|
-
await validateRuntimeStage(stageDir,
|
|
3708
|
-
await promoteRuntimeStage(stageDir,
|
|
3799
|
+
await validateRuntimeStage(stageDir, release.version);
|
|
3800
|
+
await promoteRuntimeStage(stageDir, release.version, homeDir);
|
|
3709
3801
|
return {
|
|
3710
|
-
version:
|
|
3711
|
-
runtimeDir: resolveRuntimeVersionDir(
|
|
3802
|
+
version: release.version,
|
|
3803
|
+
runtimeDir: resolveRuntimeVersionDir(release.version, homeDir)
|
|
3712
3804
|
};
|
|
3713
3805
|
} catch (error) {
|
|
3714
3806
|
await import_promises2.default.rm(stageDir, { recursive: true, force: true });
|
|
@@ -3766,12 +3858,13 @@ var runRuntimeChild = async (binPath, args, signalPath) => {
|
|
|
3766
3858
|
}
|
|
3767
3859
|
return result;
|
|
3768
3860
|
};
|
|
3769
|
-
var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node_os2.default.homedir()) => {
|
|
3861
|
+
var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node_os2.default.homedir(), trust = NPM_REGISTRY_TRUST) => {
|
|
3770
3862
|
assertNodeVersion();
|
|
3771
3863
|
const bundled = await readBundledRuntime();
|
|
3772
|
-
const
|
|
3773
|
-
const
|
|
3774
|
-
|
|
3864
|
+
const ensureBundledRuntimeStagedFn = runtimeManagerTestHooks.ensureBundledRuntimeStaged ?? ensureBundledRuntimeStaged;
|
|
3865
|
+
const current = await ensureBundledRuntimeStagedFn(homeDir);
|
|
3866
|
+
const release = await fetchLatestVerifiedRelease(RUNTIME_PACKAGE_NAME, trust);
|
|
3867
|
+
if (!isSemverGreater(release.version, current.version)) {
|
|
3775
3868
|
return {
|
|
3776
3869
|
changed: false,
|
|
3777
3870
|
previousVersion: current.version,
|
|
@@ -3779,7 +3872,7 @@ var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node
|
|
|
3779
3872
|
source: compareSemver(current.version, bundled.version) === 0 ? "bundled" : "downloaded"
|
|
3780
3873
|
};
|
|
3781
3874
|
}
|
|
3782
|
-
const updated = await installDownloadedRuntime(
|
|
3875
|
+
const updated = await installDownloadedRuntime(release, homeDir);
|
|
3783
3876
|
return {
|
|
3784
3877
|
changed: true,
|
|
3785
3878
|
previousVersion: current.version,
|
package/dist/bin/dvbd.cjs
CHANGED
|
@@ -25,7 +25,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
25
25
|
|
|
26
26
|
// src/bootstrap/runtimeManager.ts
|
|
27
27
|
var import_node_child_process = require("node:child_process");
|
|
28
|
-
var
|
|
28
|
+
var import_node_crypto3 = require("node:crypto");
|
|
29
29
|
var import_node_module = require("node:module");
|
|
30
30
|
var import_promises2 = __toESM(require("node:fs/promises"), 1);
|
|
31
31
|
var import_node_fs7 = require("node:fs");
|
|
@@ -2989,6 +2989,9 @@ var resolvePreviousRuntimeLink = (homeDir = import_node_os.default.homedir()) =>
|
|
|
2989
2989
|
var resolveUpdaterDaemonPath = (homeDir = import_node_os.default.homedir()) => import_node_path10.default.join(resolveUpdaterDir(homeDir), "daemon.json");
|
|
2990
2990
|
var resolveUpdaterStatePath = (homeDir = import_node_os.default.homedir()) => import_node_path10.default.join(resolveUpdaterDir(homeDir), "state.json");
|
|
2991
2991
|
|
|
2992
|
+
// src/bootstrap/npmRegistry.ts
|
|
2993
|
+
var import_node_crypto2 = require("node:crypto");
|
|
2994
|
+
|
|
2992
2995
|
// src/bootstrap/semver.ts
|
|
2993
2996
|
var parseSemver = (value) => {
|
|
2994
2997
|
const trimmed = value.trim();
|
|
@@ -3054,11 +3057,136 @@ var isSemverGreater = (candidateVersion, currentVersion) => {
|
|
|
3054
3057
|
return comparison !== null && comparison > 0;
|
|
3055
3058
|
};
|
|
3056
3059
|
|
|
3060
|
+
// src/bootstrap/npmRegistry.ts
|
|
3061
|
+
var PINNED_NPM_REGISTRY_KEYS = [
|
|
3062
|
+
{
|
|
3063
|
+
keyid: "SHA256:DhQ8wR5APBvFHLF/+Tc+AYvPOdTpcIDqOhxsBHRwC7U",
|
|
3064
|
+
key: "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEY6Ya7W++7aUPzvMTrezH6Ycx3c+HOKYCcNGybJZSCJq/fd7Qa8uuAKtdIkUQtQiEKERhAmE5lMMJhP8OkDOa2g==",
|
|
3065
|
+
expires: null
|
|
3066
|
+
}
|
|
3067
|
+
];
|
|
3068
|
+
var resolveNpmRegistryTrust = () => {
|
|
3069
|
+
if (false) {
|
|
3070
|
+
return JSON.parse(void 0);
|
|
3071
|
+
}
|
|
3072
|
+
return {
|
|
3073
|
+
registryUrl: "https://registry.npmjs.org",
|
|
3074
|
+
keys: PINNED_NPM_REGISTRY_KEYS
|
|
3075
|
+
};
|
|
3076
|
+
};
|
|
3077
|
+
var NPM_REGISTRY_TRUST = resolveNpmRegistryTrust();
|
|
3078
|
+
var FETCH_TIMEOUT_MS = 1e4;
|
|
3079
|
+
var TARBALL_TIMEOUT_MS = 5 * 60 * 1e3;
|
|
3080
|
+
var NpmRegistryVerificationError = class extends Error {
|
|
3081
|
+
code;
|
|
3082
|
+
constructor(code, message) {
|
|
3083
|
+
super(message);
|
|
3084
|
+
this.name = "NpmRegistryVerificationError";
|
|
3085
|
+
this.code = code;
|
|
3086
|
+
}
|
|
3087
|
+
};
|
|
3088
|
+
var readString = (value) => typeof value === "string" ? value.trim() : "";
|
|
3089
|
+
var readSignatures = (value) => {
|
|
3090
|
+
if (!Array.isArray(value)) return [];
|
|
3091
|
+
const signatures = [];
|
|
3092
|
+
for (const entry of value) {
|
|
3093
|
+
if (!entry || typeof entry !== "object") continue;
|
|
3094
|
+
const record = entry;
|
|
3095
|
+
const keyid = readString(record.keyid);
|
|
3096
|
+
const sig = readString(record.sig);
|
|
3097
|
+
if (keyid && sig) {
|
|
3098
|
+
signatures.push({ keyid, sig });
|
|
3099
|
+
}
|
|
3100
|
+
}
|
|
3101
|
+
return signatures;
|
|
3102
|
+
};
|
|
3103
|
+
var isKeyActive = (key, now) => key.expires === null || now.getTime() < Date.parse(key.expires);
|
|
3104
|
+
var verifyRegistryRelease = (packageName, manifest, trust = NPM_REGISTRY_TRUST, now = /* @__PURE__ */ new Date()) => {
|
|
3105
|
+
const record = manifest && typeof manifest === "object" ? manifest : {};
|
|
3106
|
+
const dist = record.dist && typeof record.dist === "object" ? record.dist : {};
|
|
3107
|
+
const version = readString(record.version);
|
|
3108
|
+
const tarballUrl = readString(dist.tarball);
|
|
3109
|
+
const integrity = readString(dist.integrity);
|
|
3110
|
+
if (!version || compareSemver(version, version) === null || !tarballUrl || !/^sha512-[A-Za-z0-9+/]+={0,2}$/.test(integrity)) {
|
|
3111
|
+
throw new NpmRegistryVerificationError(
|
|
3112
|
+
"invalid_manifest",
|
|
3113
|
+
`The npm registry returned an incomplete manifest for ${packageName}.`
|
|
3114
|
+
);
|
|
3115
|
+
}
|
|
3116
|
+
const signatures = readSignatures(dist.signatures);
|
|
3117
|
+
if (signatures.length === 0) {
|
|
3118
|
+
throw new NpmRegistryVerificationError(
|
|
3119
|
+
"missing_signature",
|
|
3120
|
+
`${packageName}@${version} has no npm registry signature.`
|
|
3121
|
+
);
|
|
3122
|
+
}
|
|
3123
|
+
const message = Buffer.from(`${packageName}@${version}:${integrity}`);
|
|
3124
|
+
let checkedTrustedSignature = false;
|
|
3125
|
+
for (const signature of signatures) {
|
|
3126
|
+
const key = trust.keys.find(
|
|
3127
|
+
(candidate) => candidate.keyid === signature.keyid
|
|
3128
|
+
);
|
|
3129
|
+
if (!key || !isKeyActive(key, now)) continue;
|
|
3130
|
+
checkedTrustedSignature = true;
|
|
3131
|
+
const publicKey = (0, import_node_crypto2.createPublicKey)({
|
|
3132
|
+
key: Buffer.from(key.key, "base64"),
|
|
3133
|
+
format: "der",
|
|
3134
|
+
type: "spki"
|
|
3135
|
+
});
|
|
3136
|
+
if ((0, import_node_crypto2.verify)("sha256", message, publicKey, Buffer.from(signature.sig, "base64"))) {
|
|
3137
|
+
return { name: packageName, version, tarballUrl, integrity };
|
|
3138
|
+
}
|
|
3139
|
+
}
|
|
3140
|
+
if (!checkedTrustedSignature) {
|
|
3141
|
+
throw new NpmRegistryVerificationError(
|
|
3142
|
+
"untrusted_key",
|
|
3143
|
+
`${packageName}@${version} is signed with an npm registry key this version of dvb doesn't trust (${signatures.map((signature) => signature.keyid).join(", ")}). Reinstall dvb to get its current signing keys.`
|
|
3144
|
+
);
|
|
3145
|
+
}
|
|
3146
|
+
throw new NpmRegistryVerificationError(
|
|
3147
|
+
"invalid_signature",
|
|
3148
|
+
`The npm registry signature for ${packageName}@${version} is invalid.`
|
|
3149
|
+
);
|
|
3150
|
+
};
|
|
3151
|
+
var verifyTarballIntegrity = (release, tarball) => {
|
|
3152
|
+
const actual = `sha512-${(0, import_node_crypto2.createHash)("sha512").update(tarball).digest("base64")}`;
|
|
3153
|
+
if (actual !== release.integrity) {
|
|
3154
|
+
throw new NpmRegistryVerificationError(
|
|
3155
|
+
"integrity_mismatch",
|
|
3156
|
+
`The downloaded tarball for ${release.name}@${release.version} doesn't match its signed checksum.`
|
|
3157
|
+
);
|
|
3158
|
+
}
|
|
3159
|
+
};
|
|
3160
|
+
var fetchLatestVerifiedRelease = async (packageName, trust = NPM_REGISTRY_TRUST) => {
|
|
3161
|
+
const url = `${trust.registryUrl}/${encodeURIComponent(packageName)}/latest`;
|
|
3162
|
+
const response = await fetch(url, {
|
|
3163
|
+
headers: { accept: "application/json" },
|
|
3164
|
+
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3165
|
+
});
|
|
3166
|
+
if (!response.ok) {
|
|
3167
|
+
throw new Error(
|
|
3168
|
+
`npm registry request for ${packageName} failed with ${response.status}.`
|
|
3169
|
+
);
|
|
3170
|
+
}
|
|
3171
|
+
return verifyRegistryRelease(packageName, await response.json(), trust);
|
|
3172
|
+
};
|
|
3173
|
+
var downloadVerifiedTarball = async (release) => {
|
|
3174
|
+
const response = await fetch(release.tarballUrl, {
|
|
3175
|
+
signal: AbortSignal.timeout(TARBALL_TIMEOUT_MS)
|
|
3176
|
+
});
|
|
3177
|
+
if (!response.ok) {
|
|
3178
|
+
throw new Error(
|
|
3179
|
+
`Download of ${release.name}@${release.version} failed with ${response.status}.`
|
|
3180
|
+
);
|
|
3181
|
+
}
|
|
3182
|
+
const tarball = Buffer.from(await response.arrayBuffer());
|
|
3183
|
+
verifyTarballIntegrity(release, tarball);
|
|
3184
|
+
return tarball;
|
|
3185
|
+
};
|
|
3186
|
+
|
|
3057
3187
|
// src/bootstrap/runtimeManager.ts
|
|
3058
3188
|
var MIN_NODE_MAJOR = 22;
|
|
3059
3189
|
var RUNTIME_PACKAGE_NAME = "@boxes-dev/dvb-runtime";
|
|
3060
|
-
var RUNTIME_MANIFEST_URL = `https://registry.npmjs.org/${encodeURIComponent(RUNTIME_PACKAGE_NAME)}/latest`;
|
|
3061
|
-
var FETCH_TIMEOUT_MS = 1e4;
|
|
3062
3190
|
var VALIDATION_TIMEOUT_MS = 5e3;
|
|
3063
3191
|
var UPGRADE_REQUIRED_EXIT_CODE = 86;
|
|
3064
3192
|
var UPDATER_INTERVAL_MS = 15 * 60 * 1e3;
|
|
@@ -3325,39 +3453,6 @@ var copyBundledRuntimeToStage = async (bundled, stageDir) => {
|
|
|
3325
3453
|
}
|
|
3326
3454
|
);
|
|
3327
3455
|
};
|
|
3328
|
-
var fetchLatestRuntimeManifest = async () => {
|
|
3329
|
-
const response = await fetch(RUNTIME_MANIFEST_URL, {
|
|
3330
|
-
headers: {
|
|
3331
|
-
accept: "application/json"
|
|
3332
|
-
},
|
|
3333
|
-
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3334
|
-
});
|
|
3335
|
-
if (!response.ok) {
|
|
3336
|
-
throw new Error(`Runtime manifest fetch failed with ${response.status}.`);
|
|
3337
|
-
}
|
|
3338
|
-
const payload = await response.json();
|
|
3339
|
-
const version = typeof payload.version === "string" ? payload.version.trim() : "";
|
|
3340
|
-
const tarball = typeof payload.dist?.tarball === "string" ? payload.dist.tarball.trim() : "";
|
|
3341
|
-
if (!version || !tarball) {
|
|
3342
|
-
throw new Error("Runtime manifest is missing version or dist.tarball.");
|
|
3343
|
-
}
|
|
3344
|
-
return {
|
|
3345
|
-
version,
|
|
3346
|
-
dist: {
|
|
3347
|
-
tarball
|
|
3348
|
-
}
|
|
3349
|
-
};
|
|
3350
|
-
};
|
|
3351
|
-
var downloadTarball = async (url, filePath) => {
|
|
3352
|
-
const response = await fetch(url, {
|
|
3353
|
-
signal: AbortSignal.timeout(FETCH_TIMEOUT_MS)
|
|
3354
|
-
});
|
|
3355
|
-
if (!response.ok) {
|
|
3356
|
-
throw new Error(`Runtime tarball download failed with ${response.status}.`);
|
|
3357
|
-
}
|
|
3358
|
-
const buffer = Buffer.from(await response.arrayBuffer());
|
|
3359
|
-
await import_promises2.default.writeFile(filePath, buffer);
|
|
3360
|
-
};
|
|
3361
3456
|
var extractRuntimeTarballToStage = async (tarballPath, stageDir) => {
|
|
3362
3457
|
await uo({
|
|
3363
3458
|
cwd: stageDir,
|
|
@@ -3503,7 +3598,7 @@ var terminateChild = async (child) => {
|
|
|
3503
3598
|
var validateRuntimeStage = async (stageDir, expectedVersion) => {
|
|
3504
3599
|
const socketDir = import_node_path11.default.join(
|
|
3505
3600
|
"/tmp",
|
|
3506
|
-
`dvb-runtime-validate-${process.pid}-${(0,
|
|
3601
|
+
`dvb-runtime-validate-${process.pid}-${(0, import_node_crypto3.randomUUID)().slice(0, 8)}`
|
|
3507
3602
|
);
|
|
3508
3603
|
const socketPath = import_node_path11.default.join(socketDir, "devboxd.sock");
|
|
3509
3604
|
const daemonBinPath = resolveRuntimeBinPath(stageDir, "dvbd");
|
|
@@ -3693,22 +3788,19 @@ var installBundledRuntime = async (bundled, homeDir = import_node_os2.default.ho
|
|
|
3693
3788
|
throw error;
|
|
3694
3789
|
}
|
|
3695
3790
|
};
|
|
3696
|
-
var installDownloadedRuntime = async (
|
|
3697
|
-
const tarball =
|
|
3698
|
-
|
|
3699
|
-
throw new Error("Runtime manifest is missing dist.tarball.");
|
|
3700
|
-
}
|
|
3701
|
-
const stageDir = await createStageDir(manifest.version, homeDir);
|
|
3791
|
+
var installDownloadedRuntime = async (release, homeDir = import_node_os2.default.homedir()) => {
|
|
3792
|
+
const tarball = await downloadVerifiedTarball(release);
|
|
3793
|
+
const stageDir = await createStageDir(release.version, homeDir);
|
|
3702
3794
|
const tarballPath = import_node_path11.default.join(stageDir, "runtime.tgz");
|
|
3703
3795
|
try {
|
|
3704
|
-
await
|
|
3796
|
+
await import_promises2.default.writeFile(tarballPath, tarball);
|
|
3705
3797
|
await extractRuntimeTarballToStage(tarballPath, stageDir);
|
|
3706
3798
|
await import_promises2.default.rm(tarballPath, { force: true });
|
|
3707
|
-
await validateRuntimeStage(stageDir,
|
|
3708
|
-
await promoteRuntimeStage(stageDir,
|
|
3799
|
+
await validateRuntimeStage(stageDir, release.version);
|
|
3800
|
+
await promoteRuntimeStage(stageDir, release.version, homeDir);
|
|
3709
3801
|
return {
|
|
3710
|
-
version:
|
|
3711
|
-
runtimeDir: resolveRuntimeVersionDir(
|
|
3802
|
+
version: release.version,
|
|
3803
|
+
runtimeDir: resolveRuntimeVersionDir(release.version, homeDir)
|
|
3712
3804
|
};
|
|
3713
3805
|
} catch (error) {
|
|
3714
3806
|
await import_promises2.default.rm(stageDir, { recursive: true, force: true });
|
|
@@ -3766,12 +3858,13 @@ var runRuntimeChild = async (binPath, args, signalPath) => {
|
|
|
3766
3858
|
}
|
|
3767
3859
|
return result;
|
|
3768
3860
|
};
|
|
3769
|
-
var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node_os2.default.homedir()) => {
|
|
3861
|
+
var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node_os2.default.homedir(), trust = NPM_REGISTRY_TRUST) => {
|
|
3770
3862
|
assertNodeVersion();
|
|
3771
3863
|
const bundled = await readBundledRuntime();
|
|
3772
|
-
const
|
|
3773
|
-
const
|
|
3774
|
-
|
|
3864
|
+
const ensureBundledRuntimeStagedFn = runtimeManagerTestHooks.ensureBundledRuntimeStaged ?? ensureBundledRuntimeStaged;
|
|
3865
|
+
const current = await ensureBundledRuntimeStagedFn(homeDir);
|
|
3866
|
+
const release = await fetchLatestVerifiedRelease(RUNTIME_PACKAGE_NAME, trust);
|
|
3867
|
+
if (!isSemverGreater(release.version, current.version)) {
|
|
3775
3868
|
return {
|
|
3776
3869
|
changed: false,
|
|
3777
3870
|
previousVersion: current.version,
|
|
@@ -3779,7 +3872,7 @@ var updateRuntimeOnce = async (homeDir = process.env.HOME?.trim() || import_node
|
|
|
3779
3872
|
source: compareSemver(current.version, bundled.version) === 0 ? "bundled" : "downloaded"
|
|
3780
3873
|
};
|
|
3781
3874
|
}
|
|
3782
|
-
const updated = await installDownloadedRuntime(
|
|
3875
|
+
const updated = await installDownloadedRuntime(release, homeDir);
|
|
3783
3876
|
return {
|
|
3784
3877
|
changed: true,
|
|
3785
3878
|
previousVersion: current.version,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@boxes-dev/dvb",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.1102",
|
|
4
4
|
"description": "The boxes.dev CLI: run Claude Code and Codex on cloud devboxes from your terminal",
|
|
5
5
|
"homepage": "https://boxes.dev",
|
|
6
6
|
"keywords": [
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"clean": "rm -rf dist tsconfig.tsbuildinfo"
|
|
39
39
|
},
|
|
40
40
|
"engines": {
|
|
41
|
-
"node": ">=
|
|
41
|
+
"node": "^22.19.0 || >=24.5.0"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@boxes-dev/dvb-runtime": "*",
|