@boxes-dev/dvb 1.0.3 → 1.0.5
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/bin/dvb.cjs +110 -14
- package/dist/bin/dvbd.cjs +23 -2
- package/dist/devbox/commands/version.d.ts.map +1 -1
- package/dist/devbox/commands/version.js +20 -3
- package/dist/devbox/commands/version.js.map +1 -1
- package/dist/devbox/daemonClient.d.ts.map +1 -1
- package/dist/devbox/daemonClient.js +72 -1
- package/dist/devbox/daemonClient.js.map +1 -1
- package/package.json +1 -1
package/dist/bin/dvb.cjs
CHANGED
|
@@ -11859,10 +11859,11 @@ __export(src_exports, {
|
|
|
11859
11859
|
runDaemon: () => runDaemon,
|
|
11860
11860
|
startDaemon: () => startDaemon
|
|
11861
11861
|
});
|
|
11862
|
-
var import_node_http, import_promises5, import_node_fs2, import_node_crypto4, import_node_net2, import_node_path5, logger6, startedAt, DAEMON_API_VERSION, DAEMON_FEATURES, allowShutdown, buildBoxSummaries, readBody, readRequestPath, writeJson, handleRequestError, isSocketAlive, waitForSocketAlive, ensureRuntimeDir, startDaemon, runDaemon;
|
|
11862
|
+
var import_node_http, import_node_module, import_promises5, import_node_fs2, import_node_crypto4, import_node_net2, import_node_path5, readPackageVersion, logger6, startedAt, daemonVersion, DAEMON_API_VERSION, DAEMON_FEATURES, allowShutdown, buildBoxSummaries, readBody, readRequestPath, writeJson, handleRequestError, isSocketAlive, waitForSocketAlive, ensureRuntimeDir, startDaemon, runDaemon;
|
|
11863
11863
|
var init_src2 = __esm({
|
|
11864
11864
|
"../daemon/src/index.ts"() {
|
|
11865
11865
|
import_node_http = require("node:http");
|
|
11866
|
+
import_node_module = require("node:module");
|
|
11866
11867
|
import_promises5 = __toESM(require("node:fs/promises"));
|
|
11867
11868
|
import_node_fs2 = require("node:fs");
|
|
11868
11869
|
import_node_crypto4 = require("node:crypto");
|
|
@@ -11871,8 +11872,28 @@ var init_src2 = __esm({
|
|
|
11871
11872
|
init_src();
|
|
11872
11873
|
init_ports2();
|
|
11873
11874
|
init_spritesRegistry();
|
|
11875
|
+
readPackageVersion = () => {
|
|
11876
|
+
const base = (() => {
|
|
11877
|
+
if (typeof __filename === "string" && __filename) return __filename;
|
|
11878
|
+
const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
|
|
11879
|
+
if (!argv1) return import_node_path5.default.join(process.cwd(), "dvb");
|
|
11880
|
+
try {
|
|
11881
|
+
return (0, import_node_fs2.realpathSync)(argv1);
|
|
11882
|
+
} catch {
|
|
11883
|
+
return argv1;
|
|
11884
|
+
}
|
|
11885
|
+
})();
|
|
11886
|
+
const require3 = (0, import_node_module.createRequire)(base);
|
|
11887
|
+
try {
|
|
11888
|
+
const pkg = require3("@boxes-dev/dvb/package.json");
|
|
11889
|
+
return typeof pkg.version === "string" ? pkg.version : "unknown";
|
|
11890
|
+
} catch {
|
|
11891
|
+
return "unknown";
|
|
11892
|
+
}
|
|
11893
|
+
};
|
|
11874
11894
|
logger6 = createLogger("devboxd");
|
|
11875
11895
|
startedAt = (/* @__PURE__ */ new Date()).toISOString();
|
|
11896
|
+
daemonVersion = readPackageVersion();
|
|
11876
11897
|
DAEMON_API_VERSION = 2;
|
|
11877
11898
|
DAEMON_FEATURES = [
|
|
11878
11899
|
"boxes",
|
|
@@ -12027,7 +12048,7 @@ var init_src2 = __esm({
|
|
|
12027
12048
|
if (path26 === "/version") {
|
|
12028
12049
|
writeJson(res, 200, {
|
|
12029
12050
|
name: "dvbd",
|
|
12030
|
-
version:
|
|
12051
|
+
version: daemonVersion,
|
|
12031
12052
|
apiVersion: DAEMON_API_VERSION,
|
|
12032
12053
|
features: DAEMON_FEATURES
|
|
12033
12054
|
});
|
|
@@ -12647,11 +12668,12 @@ var init_controlPlane = __esm({
|
|
|
12647
12668
|
});
|
|
12648
12669
|
|
|
12649
12670
|
// src/devbox/daemonClient.ts
|
|
12650
|
-
var import_node_http3, import_node_path6, import_node_child_process2, import_node_crypto6, import_node_fs3, import_promises6, DAEMON_TIMEOUT_MS, DaemonConnectionError, isConnectionError, requestJson3, requireDaemonFeatures, resolveDaemonCommand, spawnDaemon, waitForHealth, listAlternateSocketPaths, pruneDuplicateDaemons, ensureDaemonRunning, waitForSocketGone, stopDaemon;
|
|
12671
|
+
var import_node_http3, import_node_module2, import_node_path6, import_node_child_process2, import_node_crypto6, import_node_fs3, import_promises6, DAEMON_TIMEOUT_MS, DaemonConnectionError, isConnectionError, expectedDaemonVersionCache, readExpectedDaemonVersion, normalizeVersion, requestJson3, requireDaemonFeatures, resolveDaemonCommand, spawnDaemon, waitForHealth, listAlternateSocketPaths, pruneDuplicateDaemons, maybeRestartDaemonForVersionMismatch, ensureDaemonRunning, waitForSocketGone, stopDaemon;
|
|
12651
12672
|
var init_daemonClient = __esm({
|
|
12652
12673
|
"src/devbox/daemonClient.ts"() {
|
|
12653
12674
|
"use strict";
|
|
12654
12675
|
import_node_http3 = __toESM(require("node:http"), 1);
|
|
12676
|
+
import_node_module2 = require("node:module");
|
|
12655
12677
|
import_node_path6 = __toESM(require("node:path"), 1);
|
|
12656
12678
|
import_node_child_process2 = require("node:child_process");
|
|
12657
12679
|
import_node_crypto6 = require("node:crypto");
|
|
@@ -12681,6 +12703,35 @@ var init_daemonClient = __esm({
|
|
|
12681
12703
|
const code2 = error.code;
|
|
12682
12704
|
return code2 === "ENOENT" || code2 === "ECONNREFUSED" || code2 === "EPIPE" || code2 === "ENOTFOUND";
|
|
12683
12705
|
};
|
|
12706
|
+
expectedDaemonVersionCache = null;
|
|
12707
|
+
readExpectedDaemonVersion = () => {
|
|
12708
|
+
if (expectedDaemonVersionCache) return expectedDaemonVersionCache;
|
|
12709
|
+
const base = (() => {
|
|
12710
|
+
if (typeof __filename === "string" && __filename) return __filename;
|
|
12711
|
+
const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
|
|
12712
|
+
if (!argv1) return import_node_path6.default.join(process.cwd(), "dvb");
|
|
12713
|
+
try {
|
|
12714
|
+
return import_node_fs3.default.realpathSync(argv1);
|
|
12715
|
+
} catch {
|
|
12716
|
+
return argv1;
|
|
12717
|
+
}
|
|
12718
|
+
})();
|
|
12719
|
+
const require3 = (0, import_node_module2.createRequire)(base);
|
|
12720
|
+
try {
|
|
12721
|
+
const pkg = require3("@boxes-dev/dvb/package.json");
|
|
12722
|
+
expectedDaemonVersionCache = typeof pkg.version === "string" ? pkg.version : "unknown";
|
|
12723
|
+
} catch {
|
|
12724
|
+
expectedDaemonVersionCache = "unknown";
|
|
12725
|
+
}
|
|
12726
|
+
return expectedDaemonVersionCache;
|
|
12727
|
+
};
|
|
12728
|
+
normalizeVersion = (value) => {
|
|
12729
|
+
if (typeof value !== "string") return null;
|
|
12730
|
+
const trimmed = value.trim();
|
|
12731
|
+
if (!trimmed) return null;
|
|
12732
|
+
if (trimmed === "unknown") return null;
|
|
12733
|
+
return trimmed;
|
|
12734
|
+
};
|
|
12684
12735
|
requestJson3 = async (socketPath, method, requestPath, timeoutMs, body) => {
|
|
12685
12736
|
const requestId = (0, import_node_crypto6.randomUUID)();
|
|
12686
12737
|
logger7.info("daemon_request", {
|
|
@@ -12896,6 +12947,37 @@ var init_daemonClient = __esm({
|
|
|
12896
12947
|
}
|
|
12897
12948
|
}
|
|
12898
12949
|
};
|
|
12950
|
+
maybeRestartDaemonForVersionMismatch = async (socketPath, health) => {
|
|
12951
|
+
const expected = normalizeVersion(readExpectedDaemonVersion());
|
|
12952
|
+
if (!expected) return health;
|
|
12953
|
+
const versionResponse = await requestJson3(
|
|
12954
|
+
socketPath,
|
|
12955
|
+
"GET",
|
|
12956
|
+
"/version",
|
|
12957
|
+
DAEMON_TIMEOUT_MS.quick
|
|
12958
|
+
);
|
|
12959
|
+
if (versionResponse.status !== 200) return health;
|
|
12960
|
+
const actual = normalizeVersion(versionResponse.body.version);
|
|
12961
|
+
if (!actual || actual === expected) return health;
|
|
12962
|
+
logger7.warn("daemon_version_mismatch", {
|
|
12963
|
+
socketPath,
|
|
12964
|
+
pid: health.pid,
|
|
12965
|
+
expected,
|
|
12966
|
+
actual
|
|
12967
|
+
});
|
|
12968
|
+
try {
|
|
12969
|
+
await stopDaemon(socketPath);
|
|
12970
|
+
} catch (error) {
|
|
12971
|
+
logger7.warn("daemon_restart_failed", {
|
|
12972
|
+
socketPath,
|
|
12973
|
+
pid: health.pid,
|
|
12974
|
+
error: String(error)
|
|
12975
|
+
});
|
|
12976
|
+
return health;
|
|
12977
|
+
}
|
|
12978
|
+
spawnDaemon(socketPath);
|
|
12979
|
+
return await waitForHealth(socketPath, 5e3);
|
|
12980
|
+
};
|
|
12899
12981
|
ensureDaemonRunning = async (socketPath) => {
|
|
12900
12982
|
try {
|
|
12901
12983
|
const response = await requestJson3(
|
|
@@ -12906,7 +12988,7 @@ var init_daemonClient = __esm({
|
|
|
12906
12988
|
);
|
|
12907
12989
|
if (response.status === 200 && response.body.ok) {
|
|
12908
12990
|
await pruneDuplicateDaemons(socketPath);
|
|
12909
|
-
return response.body;
|
|
12991
|
+
return await maybeRestartDaemonForVersionMismatch(socketPath, response.body);
|
|
12910
12992
|
}
|
|
12911
12993
|
} catch (error) {
|
|
12912
12994
|
if (!isConnectionError(error)) throw error;
|
|
@@ -31346,11 +31428,12 @@ var init_setup = __esm({
|
|
|
31346
31428
|
});
|
|
31347
31429
|
|
|
31348
31430
|
// src/devbox/commands/version.ts
|
|
31349
|
-
var
|
|
31431
|
+
var import_node_module3, import_node_fs8, import_node_path24, parseVersionArgs, readPackageVersion2, tryReadDaemonInfo, runVersion;
|
|
31350
31432
|
var init_version = __esm({
|
|
31351
31433
|
"src/devbox/commands/version.ts"() {
|
|
31352
31434
|
"use strict";
|
|
31353
|
-
|
|
31435
|
+
import_node_module3 = require("node:module");
|
|
31436
|
+
import_node_fs8 = require("node:fs");
|
|
31354
31437
|
import_node_path24 = __toESM(require("node:path"), 1);
|
|
31355
31438
|
init_src();
|
|
31356
31439
|
init_src();
|
|
@@ -31374,10 +31457,18 @@ var init_version = __esm({
|
|
|
31374
31457
|
}
|
|
31375
31458
|
return parsed;
|
|
31376
31459
|
};
|
|
31377
|
-
|
|
31378
|
-
const
|
|
31379
|
-
|
|
31380
|
-
|
|
31460
|
+
readPackageVersion2 = () => {
|
|
31461
|
+
const base = (() => {
|
|
31462
|
+
if (typeof __filename === "string" && __filename) return __filename;
|
|
31463
|
+
const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
|
|
31464
|
+
if (!argv1) return import_node_path24.default.join(process.cwd(), "dvb");
|
|
31465
|
+
try {
|
|
31466
|
+
return (0, import_node_fs8.realpathSync)(argv1);
|
|
31467
|
+
} catch {
|
|
31468
|
+
return argv1;
|
|
31469
|
+
}
|
|
31470
|
+
})();
|
|
31471
|
+
const require3 = (0, import_node_module3.createRequire)(base);
|
|
31381
31472
|
try {
|
|
31382
31473
|
const pkg = require3("@boxes-dev/dvb/package.json");
|
|
31383
31474
|
return typeof pkg.version === "string" ? pkg.version : "unknown";
|
|
@@ -31410,7 +31501,7 @@ var init_version = __esm({
|
|
|
31410
31501
|
};
|
|
31411
31502
|
runVersion = async (args) => {
|
|
31412
31503
|
const parsed = parseVersionArgs(args);
|
|
31413
|
-
const dvbVersion =
|
|
31504
|
+
const dvbVersion = readPackageVersion2();
|
|
31414
31505
|
const nodeVersion = process.versions.node;
|
|
31415
31506
|
const controlPlaneUrl = getControlPlaneUrl();
|
|
31416
31507
|
const convexUrl = getConvexUrl();
|
|
@@ -31446,6 +31537,7 @@ var init_version = __esm({
|
|
|
31446
31537
|
dvbd: daemon ? {
|
|
31447
31538
|
pid: daemon.health.pid,
|
|
31448
31539
|
startedAt: daemon.health.startedAt,
|
|
31540
|
+
version: daemon.version?.version ?? null,
|
|
31449
31541
|
apiVersion: daemon.version?.apiVersion ?? null,
|
|
31450
31542
|
features: daemon.version?.features ?? null
|
|
31451
31543
|
} : null
|
|
@@ -31465,9 +31557,13 @@ var init_version = __esm({
|
|
|
31465
31557
|
);
|
|
31466
31558
|
console.log(`socket: ${socketInfo.socketPath}`);
|
|
31467
31559
|
if (daemon) {
|
|
31560
|
+
const dvbdVersion = daemon.version?.version;
|
|
31468
31561
|
const apiVersion = daemon.version?.apiVersion;
|
|
31469
31562
|
const features = Array.isArray(daemon.version?.features) ? daemon.version?.features.join(", ") : "";
|
|
31470
31563
|
console.log(`dvbd: running (pid ${daemon.health.pid})`);
|
|
31564
|
+
if (typeof dvbdVersion === "string" && dvbdVersion.trim().length > 0) {
|
|
31565
|
+
console.log(`dvbd version: ${dvbdVersion}`);
|
|
31566
|
+
}
|
|
31471
31567
|
if (typeof apiVersion === "number") {
|
|
31472
31568
|
console.log(`dvbd api: ${apiVersion}`);
|
|
31473
31569
|
}
|
|
@@ -32436,7 +32532,7 @@ var init_cli = __esm({
|
|
|
32436
32532
|
});
|
|
32437
32533
|
|
|
32438
32534
|
// src/bin/dvb.ts
|
|
32439
|
-
var
|
|
32535
|
+
var import_node_fs9 = __toESM(require("node:fs"), 1);
|
|
32440
32536
|
var import_node_os11 = __toESM(require("node:os"), 1);
|
|
32441
32537
|
var import_node_path26 = __toESM(require("node:path"), 1);
|
|
32442
32538
|
init_src();
|
|
@@ -32494,8 +32590,8 @@ run().catch((error) => {
|
|
|
32494
32590
|
if (homeDir) {
|
|
32495
32591
|
try {
|
|
32496
32592
|
const logDir = import_node_path26.default.join(resolveDevboxDir(homeDir), "wezterm");
|
|
32497
|
-
|
|
32498
|
-
|
|
32593
|
+
import_node_fs9.default.mkdirSync(logDir, { recursive: true });
|
|
32594
|
+
import_node_fs9.default.appendFileSync(
|
|
32499
32595
|
import_node_path26.default.join(logDir, "proxy.log"),
|
|
32500
32596
|
`${(/* @__PURE__ */ new Date()).toISOString()} ${message}
|
|
32501
32597
|
`
|
package/dist/bin/dvbd.cjs
CHANGED
|
@@ -11667,10 +11667,11 @@ __export(src_exports, {
|
|
|
11667
11667
|
runDaemon: () => runDaemon,
|
|
11668
11668
|
startDaemon: () => startDaemon
|
|
11669
11669
|
});
|
|
11670
|
-
var import_node_http, import_promises5, import_node_fs2, import_node_crypto4, import_node_net2, import_node_path5, logger6, startedAt, DAEMON_API_VERSION, DAEMON_FEATURES, allowShutdown, buildBoxSummaries, readBody, readRequestPath, writeJson, handleRequestError, isSocketAlive, waitForSocketAlive, ensureRuntimeDir, startDaemon, runDaemon;
|
|
11670
|
+
var import_node_http, import_node_module, import_promises5, import_node_fs2, import_node_crypto4, import_node_net2, import_node_path5, readPackageVersion, logger6, startedAt, daemonVersion, DAEMON_API_VERSION, DAEMON_FEATURES, allowShutdown, buildBoxSummaries, readBody, readRequestPath, writeJson, handleRequestError, isSocketAlive, waitForSocketAlive, ensureRuntimeDir, startDaemon, runDaemon;
|
|
11671
11671
|
var init_src2 = __esm({
|
|
11672
11672
|
"../daemon/src/index.ts"() {
|
|
11673
11673
|
import_node_http = require("node:http");
|
|
11674
|
+
import_node_module = require("node:module");
|
|
11674
11675
|
import_promises5 = __toESM(require("node:fs/promises"));
|
|
11675
11676
|
import_node_fs2 = require("node:fs");
|
|
11676
11677
|
import_node_crypto4 = require("node:crypto");
|
|
@@ -11679,8 +11680,28 @@ var init_src2 = __esm({
|
|
|
11679
11680
|
init_src();
|
|
11680
11681
|
init_ports2();
|
|
11681
11682
|
init_spritesRegistry();
|
|
11683
|
+
readPackageVersion = () => {
|
|
11684
|
+
const base = (() => {
|
|
11685
|
+
if (typeof __filename === "string" && __filename) return __filename;
|
|
11686
|
+
const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
|
|
11687
|
+
if (!argv1) return import_node_path5.default.join(process.cwd(), "dvb");
|
|
11688
|
+
try {
|
|
11689
|
+
return (0, import_node_fs2.realpathSync)(argv1);
|
|
11690
|
+
} catch {
|
|
11691
|
+
return argv1;
|
|
11692
|
+
}
|
|
11693
|
+
})();
|
|
11694
|
+
const require3 = (0, import_node_module.createRequire)(base);
|
|
11695
|
+
try {
|
|
11696
|
+
const pkg = require3("@boxes-dev/dvb/package.json");
|
|
11697
|
+
return typeof pkg.version === "string" ? pkg.version : "unknown";
|
|
11698
|
+
} catch {
|
|
11699
|
+
return "unknown";
|
|
11700
|
+
}
|
|
11701
|
+
};
|
|
11682
11702
|
logger6 = createLogger("devboxd");
|
|
11683
11703
|
startedAt = (/* @__PURE__ */ new Date()).toISOString();
|
|
11704
|
+
daemonVersion = readPackageVersion();
|
|
11684
11705
|
DAEMON_API_VERSION = 2;
|
|
11685
11706
|
DAEMON_FEATURES = [
|
|
11686
11707
|
"boxes",
|
|
@@ -11835,7 +11856,7 @@ var init_src2 = __esm({
|
|
|
11835
11856
|
if (path6 === "/version") {
|
|
11836
11857
|
writeJson(res, 200, {
|
|
11837
11858
|
name: "dvbd",
|
|
11838
|
-
version:
|
|
11859
|
+
version: daemonVersion,
|
|
11839
11860
|
apiVersion: DAEMON_API_VERSION,
|
|
11840
11861
|
features: DAEMON_FEATURES
|
|
11841
11862
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/devbox/commands/version.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/devbox/commands/version.ts"],"names":[],"mappings":"AA4FA,eAAO,MAAM,UAAU,GAAU,MAAM,MAAM,EAAE,kBAqF9C,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { createRequire } from "node:module";
|
|
2
|
+
import { realpathSync } from "node:fs";
|
|
2
3
|
import path from "node:path";
|
|
3
4
|
import { resolveSocketInfo } from "@boxes-dev/core";
|
|
4
5
|
import { createSecretStore, loadConfig } from "@boxes-dev/core";
|
|
@@ -27,9 +28,20 @@ const parseVersionArgs = (args) => {
|
|
|
27
28
|
const readPackageVersion = () => {
|
|
28
29
|
// npm always includes package.json at the package root, even if it's excluded
|
|
29
30
|
// from "files". Resolving by package name avoids relative-path issues in dist.
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
const base = (() => {
|
|
32
|
+
if (typeof __filename === "string" && __filename)
|
|
33
|
+
return __filename;
|
|
34
|
+
const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
|
|
35
|
+
if (!argv1)
|
|
36
|
+
return path.join(process.cwd(), "dvb");
|
|
37
|
+
try {
|
|
38
|
+
return realpathSync(argv1);
|
|
39
|
+
}
|
|
40
|
+
catch {
|
|
41
|
+
return argv1;
|
|
42
|
+
}
|
|
43
|
+
})();
|
|
44
|
+
const require = createRequire(base);
|
|
33
45
|
try {
|
|
34
46
|
const pkg = require("@boxes-dev/dvb/package.json");
|
|
35
47
|
return typeof pkg.version === "string" ? pkg.version : "unknown";
|
|
@@ -85,6 +97,7 @@ export const runVersion = async (args) => {
|
|
|
85
97
|
? {
|
|
86
98
|
pid: daemon.health.pid,
|
|
87
99
|
startedAt: daemon.health.startedAt,
|
|
100
|
+
version: daemon.version?.version ?? null,
|
|
88
101
|
apiVersion: daemon.version?.apiVersion ?? null,
|
|
89
102
|
features: daemon.version?.features ?? null,
|
|
90
103
|
}
|
|
@@ -100,11 +113,15 @@ export const runVersion = async (args) => {
|
|
|
100
113
|
`control_plane=${controlPlaneTokenPresent ? "ok" : "missing"}`);
|
|
101
114
|
console.log(`socket: ${socketInfo.socketPath}`);
|
|
102
115
|
if (daemon) {
|
|
116
|
+
const dvbdVersion = daemon.version?.version;
|
|
103
117
|
const apiVersion = daemon.version?.apiVersion;
|
|
104
118
|
const features = Array.isArray(daemon.version?.features)
|
|
105
119
|
? daemon.version?.features.join(", ")
|
|
106
120
|
: "";
|
|
107
121
|
console.log(`dvbd: running (pid ${daemon.health.pid})`);
|
|
122
|
+
if (typeof dvbdVersion === "string" && dvbdVersion.trim().length > 0) {
|
|
123
|
+
console.log(`dvbd version: ${dvbdVersion}`);
|
|
124
|
+
}
|
|
108
125
|
if (typeof apiVersion === "number") {
|
|
109
126
|
console.log(`dvbd api: ${apiVersion}`);
|
|
110
127
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/devbox/commands/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAoBpE,MAAM,gBAAgB,GAAG,CAAC,IAAc,EAAe,EAAE;IACvD,MAAM,MAAM,GAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC5C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,IAAI,GAAG,KAAK,QAAQ,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YACnB,SAAS;QACX,CAAC;QACD,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACrC,iCAAiC;YACjC,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,GAAG,EAAE,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,GAAW,EAAE;IACtC,8EAA8E;IAC9E,+EAA+E;IAC/E,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../src/devbox/commands/version.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemonClient.d.ts","sourceRoot":"","sources":["../../src/devbox/daemonClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"daemonClient.d.ts","sourceRoot":"","sources":["../../src/devbox/daemonClient.ts"],"names":[],"mappings":"AAWA,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,OAAO,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,iBAAiB;;;;CAIpB,CAAC;AA4DX,eAAO,MAAM,WAAW,GAAU,CAAC,EACjC,YAAY,MAAM,EAClB,QAAQ,MAAM,EACd,aAAa,MAAM,EACnB,WAAW,MAAM,EACjB,OAAO,OAAO,KACb,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAgF/B,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAChC,YAAY,MAAM,EAClB,UAAU,MAAM,EAAE,kBA0BnB,CAAC;AA0KF,eAAO,MAAM,mBAAmB,GAAU,YAAY,MAAM,4BAmB3D,CAAC;AAkBF,eAAO,MAAM,UAAU,GAAU,YAAY,MAAM,KAAG,OAAO,CAAC,OAAO,CA2BpE,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import http from "node:http";
|
|
2
|
+
import { createRequire } from "node:module";
|
|
2
3
|
import path from "node:path";
|
|
3
4
|
import { spawn } from "node:child_process";
|
|
4
5
|
import { randomUUID } from "node:crypto";
|
|
@@ -32,6 +33,46 @@ const isConnectionError = (error) => {
|
|
|
32
33
|
code === "EPIPE" ||
|
|
33
34
|
code === "ENOTFOUND");
|
|
34
35
|
};
|
|
36
|
+
let expectedDaemonVersionCache = null;
|
|
37
|
+
const readExpectedDaemonVersion = () => {
|
|
38
|
+
if (expectedDaemonVersionCache)
|
|
39
|
+
return expectedDaemonVersionCache;
|
|
40
|
+
// npm always includes package.json at the package root, even if it's excluded
|
|
41
|
+
// from "files". Resolving by package name avoids relative-path issues in dist.
|
|
42
|
+
const base = (() => {
|
|
43
|
+
if (typeof __filename === "string" && __filename)
|
|
44
|
+
return __filename;
|
|
45
|
+
const argv1 = typeof process.argv[1] === "string" ? process.argv[1] : "";
|
|
46
|
+
if (!argv1)
|
|
47
|
+
return path.join(process.cwd(), "dvb");
|
|
48
|
+
try {
|
|
49
|
+
return fs.realpathSync(argv1);
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return argv1;
|
|
53
|
+
}
|
|
54
|
+
})();
|
|
55
|
+
const require = createRequire(base);
|
|
56
|
+
try {
|
|
57
|
+
const pkg = require("@boxes-dev/dvb/package.json");
|
|
58
|
+
expectedDaemonVersionCache =
|
|
59
|
+
typeof pkg.version === "string" ? pkg.version : "unknown";
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
expectedDaemonVersionCache = "unknown";
|
|
63
|
+
}
|
|
64
|
+
return expectedDaemonVersionCache;
|
|
65
|
+
};
|
|
66
|
+
const normalizeVersion = (value) => {
|
|
67
|
+
if (typeof value !== "string")
|
|
68
|
+
return null;
|
|
69
|
+
const trimmed = value.trim();
|
|
70
|
+
if (!trimmed)
|
|
71
|
+
return null;
|
|
72
|
+
if (trimmed === "unknown")
|
|
73
|
+
return null;
|
|
74
|
+
return trimmed;
|
|
75
|
+
};
|
|
35
76
|
export const requestJson = async (socketPath, method, requestPath, timeoutMs, body) => {
|
|
36
77
|
const requestId = randomUUID();
|
|
37
78
|
logger.info("daemon_request", {
|
|
@@ -240,12 +281,42 @@ const pruneDuplicateDaemons = async (primary) => {
|
|
|
240
281
|
}
|
|
241
282
|
}
|
|
242
283
|
};
|
|
284
|
+
const maybeRestartDaemonForVersionMismatch = async (socketPath, health) => {
|
|
285
|
+
const expected = normalizeVersion(readExpectedDaemonVersion());
|
|
286
|
+
if (!expected)
|
|
287
|
+
return health;
|
|
288
|
+
const versionResponse = await requestJson(socketPath, "GET", "/version", DAEMON_TIMEOUT_MS.quick);
|
|
289
|
+
if (versionResponse.status !== 200)
|
|
290
|
+
return health;
|
|
291
|
+
const actual = normalizeVersion(versionResponse.body.version);
|
|
292
|
+
if (!actual || actual === expected)
|
|
293
|
+
return health;
|
|
294
|
+
logger.warn("daemon_version_mismatch", {
|
|
295
|
+
socketPath,
|
|
296
|
+
pid: health.pid,
|
|
297
|
+
expected,
|
|
298
|
+
actual,
|
|
299
|
+
});
|
|
300
|
+
try {
|
|
301
|
+
await stopDaemon(socketPath);
|
|
302
|
+
}
|
|
303
|
+
catch (error) {
|
|
304
|
+
logger.warn("daemon_restart_failed", {
|
|
305
|
+
socketPath,
|
|
306
|
+
pid: health.pid,
|
|
307
|
+
error: String(error),
|
|
308
|
+
});
|
|
309
|
+
return health;
|
|
310
|
+
}
|
|
311
|
+
spawnDaemon(socketPath);
|
|
312
|
+
return await waitForHealth(socketPath, 5000);
|
|
313
|
+
};
|
|
243
314
|
export const ensureDaemonRunning = async (socketPath) => {
|
|
244
315
|
try {
|
|
245
316
|
const response = await requestJson(socketPath, "GET", "/health", DAEMON_TIMEOUT_MS.health);
|
|
246
317
|
if (response.status === 200 && response.body.ok) {
|
|
247
318
|
await pruneDuplicateDaemons(socketPath);
|
|
248
|
-
return response.body;
|
|
319
|
+
return await maybeRestartDaemonForVersionMismatch(socketPath, response.body);
|
|
249
320
|
}
|
|
250
321
|
}
|
|
251
322
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemonClient.js","sourceRoot":"","sources":["../../src/devbox/daemonClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"daemonClient.js","sourceRoot":"","sources":["../../src/devbox/daemonClient.ts"],"names":[],"mappings":"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"}
|