@alexberardi/jarvis-admin 0.1.63 → 0.1.65
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/package.json +1 -1
- package/public/assets/index-DeByHCh9.css +1 -0
- package/public/assets/index-DeCnqmbD.js +18 -0
- package/public/index.html +2 -2
- package/server/dist/config.d.ts +5 -0
- package/server/dist/config.d.ts.map +1 -1
- package/server/dist/config.js +3 -0
- package/server/dist/config.js.map +1 -1
- package/server/dist/data/service-registry.json +5 -1
- package/server/dist/routes/admin.d.ts +1 -1
- package/server/dist/routes/admin.d.ts.map +1 -1
- package/server/dist/routes/admin.js +25 -1
- package/server/dist/routes/admin.js.map +1 -1
- package/server/dist/routes/setup.d.ts.map +1 -1
- package/server/dist/routes/setup.js +39 -1
- package/server/dist/routes/setup.js.map +1 -1
- package/server/dist/routes/update.d.ts.map +1 -1
- package/server/dist/routes/update.js +8 -3
- package/server/dist/routes/update.js.map +1 -1
- package/server/dist/services/update-checker.d.ts +1 -1
- package/server/dist/services/update-checker.d.ts.map +1 -1
- package/server/dist/services/update-checker.js +14 -2
- package/server/dist/services/update-checker.js.map +1 -1
- package/server/src/data/service-registry.json +5 -1
- package/public/assets/index-077Izc9C.js +0 -18
- package/public/assets/index-DPbaZHnK.css +0 -1
package/public/index.html
CHANGED
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
6
6
|
<link rel="icon" type="image/png" href="/favicon.png" />
|
|
7
7
|
<title>Jarvis Admin</title>
|
|
8
|
-
<script type="module" crossorigin src="/assets/index-
|
|
9
|
-
<link rel="stylesheet" crossorigin href="/assets/index-
|
|
8
|
+
<script type="module" crossorigin src="/assets/index-DeCnqmbD.js"></script>
|
|
9
|
+
<link rel="stylesheet" crossorigin href="/assets/index-DeByHCh9.css">
|
|
10
10
|
</head>
|
|
11
11
|
<body>
|
|
12
12
|
<div id="root"></div>
|
package/server/dist/config.d.ts
CHANGED
|
@@ -12,6 +12,10 @@ export interface Config {
|
|
|
12
12
|
* cross-origin reflection). Set JARVIS_ADMIN_CORS_ORIGINS to a
|
|
13
13
|
* comma-separated allowlist (e.g. "http://localhost:5173"). */
|
|
14
14
|
corsOrigins: string[];
|
|
15
|
+
/** Global, box-level opt-in for outbound update checks + self-update.
|
|
16
|
+
* Defaults to false (fully local; no outbound internet unless opted in).
|
|
17
|
+
* Set JARVIS_ALLOW_UPDATES=true to allow GitHub release checks and applies. */
|
|
18
|
+
allowUpdates: boolean;
|
|
15
19
|
}
|
|
16
20
|
/** Persisted service URLs and version info from the setup wizard. */
|
|
17
21
|
interface PersistedConfig {
|
|
@@ -21,6 +25,7 @@ interface PersistedConfig {
|
|
|
21
25
|
commandCenterUrl?: string;
|
|
22
26
|
installedVersion?: string;
|
|
23
27
|
installed?: boolean;
|
|
28
|
+
allowUpdates?: boolean;
|
|
24
29
|
}
|
|
25
30
|
export declare function isInstalled(): boolean;
|
|
26
31
|
export declare function savePersistedConfig(urls: PersistedConfig): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,EAAE,MAAM,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB;;oEAEgE;IAChE,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB;AAED,qEAAqE;AACrE,UAAU,eAAe;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,EAAE,MAAM,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;IACnB,gBAAgB,EAAE,MAAM,CAAA;IACxB,qBAAqB,EAAE,MAAM,CAAA;IAC7B,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;IAC3B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB;;oEAEgE;IAChE,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB;;oFAEgF;IAChF,YAAY,EAAE,OAAO,CAAA;CACtB;AAED,qEAAqE;AACrE,UAAU,eAAe;IACvB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB;AAED,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAgBD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAK/D;AAED,wBAAgB,UAAU,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,CAuBxF"}
|
package/server/dist/config.js
CHANGED
|
@@ -40,6 +40,9 @@ export function loadConfig(env = process.env) {
|
|
|
40
40
|
.split(',')
|
|
41
41
|
.map((o) => o.trim())
|
|
42
42
|
.filter((o) => o.length > 0),
|
|
43
|
+
// Default false: fully local, no outbound update checks unless opted in.
|
|
44
|
+
allowUpdates: (persisted.allowUpdates ??
|
|
45
|
+
(env.JARVIS_ALLOW_UPDATES === 'true' || env.JARVIS_ALLOW_UPDATES === '1')) === true,
|
|
43
46
|
};
|
|
44
47
|
}
|
|
45
48
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAC5E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,8 +120,12 @@
|
|
|
120
120
|
"port": 7707,
|
|
121
121
|
"image": "ghcr.io/alexberardi/jarvis-tts:latest",
|
|
122
122
|
"healthCheck": "/health",
|
|
123
|
-
"dependsOn": ["jarvis-auth", "jarvis-config-service"],
|
|
123
|
+
"dependsOn": ["postgres", "jarvis-auth", "jarvis-config-service"],
|
|
124
|
+
"database": "jarvis_tts",
|
|
125
|
+
"dbDriverPrefix": "postgresql+psycopg2://",
|
|
126
|
+
"migrate": true,
|
|
124
127
|
"envVars": [
|
|
128
|
+
{ "name": "DATABASE_URL", "description": "PostgreSQL connection string", "required": true },
|
|
125
129
|
{ "name": "JARVIS_CONFIG_URL", "description": "Config service URL", "required": false, "default": "http://jarvis-config-service:7700" },
|
|
126
130
|
{ "name": "TTS_PROVIDER", "description": "Active TTS provider (piper, kokoro)", "required": false, "default": "kokoro" },
|
|
127
131
|
{ "name": "HF_HOME", "description": "HuggingFace cache dir for Kokoro voice weights", "required": false, "default": "/app/models/hf_cache" }
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { FastifyInstance } from 'fastify';
|
|
2
2
|
/**
|
|
3
|
-
* Cross-household admin views (households, nodes) that the regular
|
|
3
|
+
* Cross-household admin views (households, nodes, users) that the regular
|
|
4
4
|
* user-scoped routes don't expose. Backed by jarvis-auth's
|
|
5
5
|
* /superuser/* endpoints; the caller's superuser JWT is forwarded.
|
|
6
6
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/routes/admin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/routes/admin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9C;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDrE"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { requireSuperuser } from '../middleware/auth.js';
|
|
2
2
|
import { proxyRequest } from '../services/proxy.js';
|
|
3
3
|
/**
|
|
4
|
-
* Cross-household admin views (households, nodes) that the regular
|
|
4
|
+
* Cross-household admin views (households, nodes, users) that the regular
|
|
5
5
|
* user-scoped routes don't expose. Backed by jarvis-auth's
|
|
6
6
|
* /superuser/* endpoints; the caller's superuser JWT is forwarded.
|
|
7
7
|
*/
|
|
@@ -25,5 +25,29 @@ export async function adminRoutes(app) {
|
|
|
25
25
|
});
|
|
26
26
|
reply.code(result.status).send(result.data);
|
|
27
27
|
});
|
|
28
|
+
app.get('/users', async (request, reply) => {
|
|
29
|
+
const result = await proxyRequest({
|
|
30
|
+
method: 'GET',
|
|
31
|
+
url: `${app.config.authUrl}/superuser/users`,
|
|
32
|
+
headers: { Authorization: request.headers.authorization },
|
|
33
|
+
timeout: 10_000,
|
|
34
|
+
});
|
|
35
|
+
reply.code(result.status).send(result.data);
|
|
36
|
+
});
|
|
37
|
+
app.post('/users/:userId/temp-password', async (request, reply) => {
|
|
38
|
+
// Numeric-only: the id is interpolated into the upstream URL.
|
|
39
|
+
if (!/^\d+$/.test(request.params.userId)) {
|
|
40
|
+
reply.code(400).send({ detail: 'Invalid user id' });
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const result = await proxyRequest({
|
|
44
|
+
method: 'POST',
|
|
45
|
+
url: `${app.config.authUrl}/superuser/users/${request.params.userId}/temp-password`,
|
|
46
|
+
headers: { Authorization: request.headers.authorization },
|
|
47
|
+
body: request.body ?? {},
|
|
48
|
+
timeout: 10_000,
|
|
49
|
+
});
|
|
50
|
+
reply.code(result.status).send(result.data);
|
|
51
|
+
});
|
|
28
52
|
}
|
|
29
53
|
//# sourceMappingURL=admin.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/routes/admin.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAEnD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAoB;IACpD,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAA;IAE3C,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;YAChC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,uBAAuB;YACjD,OAAO,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,aAAc,EAAE;YAC1D,OAAO,EAAE,MAAM;SAChB,CAAC,CAAA;QACF,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;YAChC,MAAM,EAAE,KAAK;YACb,GAAG,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,OAAO,kBAAkB;YAC5C,OAAO,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,aAAc,EAAE;YAC1D,OAAO,EAAE,MAAM;SAChB,CAAC,CAAA;QACF,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IAC7C,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/routes/admin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/routes/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/routes/setup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAyB9C,wBAAsB,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAoKrE"}
|
|
@@ -1,5 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { lookup } from 'node:dns/promises';
|
|
2
|
+
import { savePersistedConfig, isInstalled } from '../config.js';
|
|
2
3
|
import { resolveServiceUrls } from '../services/configService.js';
|
|
4
|
+
// Reject link-local / cloud-metadata targets (169.254.0.0/16, incl. 169.254.169.254,
|
|
5
|
+
// and IPv6 fe80::/10). These are never a valid Jarvis service URL and are the classic
|
|
6
|
+
// SSRF pivot. RFC1918 / localhost stay allowed — the wizard legitimately probes LAN
|
|
7
|
+
// service URLs (e.g. http://10.0.0.5:7701, http://localhost:7700, container names).
|
|
8
|
+
function isBlockedProbeAddress(ip) {
|
|
9
|
+
const v4 = ip.startsWith('::ffff:') ? ip.slice(7) : ip;
|
|
10
|
+
if (v4.startsWith('169.254.'))
|
|
11
|
+
return true;
|
|
12
|
+
if (ip.toLowerCase().startsWith('fe80:'))
|
|
13
|
+
return true;
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
3
16
|
export async function setupRoutes(app) {
|
|
4
17
|
/**
|
|
5
18
|
* Check whether the admin backend has been configured with service URLs.
|
|
@@ -46,6 +59,30 @@ export async function setupRoutes(app) {
|
|
|
46
59
|
if (!['http:', 'https:'].includes(parsed.protocol)) {
|
|
47
60
|
return reply.code(400).send({ healthy: false, error: 'URL must use http or https' });
|
|
48
61
|
}
|
|
62
|
+
// Defense-in-depth for the native installer process: once it has recorded an
|
|
63
|
+
// install, refuse the wizard probe (it becomes a redirect-only server anyway).
|
|
64
|
+
// NOTE: in the containerized deployment this flag isn't present, so the real
|
|
65
|
+
// SSRF protection below (metadata block + no-redirect) is what carries there.
|
|
66
|
+
if (isInstalled() && !process.env.JARVIS_FORCE_INSTALL) {
|
|
67
|
+
return reply.code(403).send({ healthy: false, error: 'Setup already completed' });
|
|
68
|
+
}
|
|
69
|
+
// Block cloud-metadata / link-local targets — the highest-value SSRF pivot.
|
|
70
|
+
// Resolve and inspect the actual IPs, so a hostname whose A-record points at a
|
|
71
|
+
// blocked range is caught too. RFC1918 / localhost stay allowed: the wizard
|
|
72
|
+
// legitimately probes LAN service URLs. (Residual: a DNS-rebinding server can
|
|
73
|
+
// return a benign IP here and a blocked one to fetch()'s own resolver — the
|
|
74
|
+
// admin surface is expected to sit on a trusted LAN behind the operator's edge,
|
|
75
|
+
// never on the public internet; see the threat model.)
|
|
76
|
+
try {
|
|
77
|
+
const resolved = await lookup(parsed.hostname, { all: true });
|
|
78
|
+
if (resolved.some((a) => isBlockedProbeAddress(a.address))) {
|
|
79
|
+
return reply.code(400).send({ healthy: false, error: 'Target address not allowed' });
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
catch {
|
|
83
|
+
// Host doesn't resolve here — not an SSRF concern. Let the probe fetch below
|
|
84
|
+
// fail naturally (surfaced to the wizard as an unreachable/unhealthy target).
|
|
85
|
+
}
|
|
49
86
|
// Try /health first, then /info, then root
|
|
50
87
|
const paths = ['/health', '/info', '/'];
|
|
51
88
|
let lastError = '';
|
|
@@ -53,6 +90,7 @@ export async function setupRoutes(app) {
|
|
|
53
90
|
try {
|
|
54
91
|
const probeUrl = `${url.replace(/\/$/, '')}${path}`;
|
|
55
92
|
const response = await fetch(probeUrl, {
|
|
93
|
+
redirect: 'manual', // never follow a 3xx into a blocked/internal target
|
|
56
94
|
signal: AbortSignal.timeout(5000),
|
|
57
95
|
});
|
|
58
96
|
if (response.ok) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/routes/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/routes/setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/routes/update.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAM9C,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,OAAO,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAkBD,wBAAsB,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../src/routes/update.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAM9C,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,OAAO,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAkBD,wBAAsB,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAwDtE"}
|
|
@@ -19,12 +19,12 @@ function getUpgradeStatus() {
|
|
|
19
19
|
export async function updateRoutes(app) {
|
|
20
20
|
/** Check for available updates (no auth required — informational) */
|
|
21
21
|
app.get('/check', async (_request, reply) => {
|
|
22
|
-
const info = await checkForUpdate();
|
|
22
|
+
const info = await checkForUpdate(false, app.config.allowUpdates);
|
|
23
23
|
return reply.send(info);
|
|
24
24
|
});
|
|
25
25
|
/** Force a fresh update check */
|
|
26
26
|
app.post('/check', async (_request, reply) => {
|
|
27
|
-
const info = await checkForUpdate(true);
|
|
27
|
+
const info = await checkForUpdate(true, app.config.allowUpdates);
|
|
28
28
|
return reply.send(info);
|
|
29
29
|
});
|
|
30
30
|
/** Get current upgrade status (is an upgrade in progress?) */
|
|
@@ -33,7 +33,12 @@ export async function updateRoutes(app) {
|
|
|
33
33
|
});
|
|
34
34
|
/** Apply an update — SSE endpoint that orchestrates the full upgrade */
|
|
35
35
|
app.post('/apply', { preHandler: requireSuperuser }, async (request, reply) => {
|
|
36
|
-
|
|
36
|
+
if (!app.config.allowUpdates) {
|
|
37
|
+
return reply.code(403).send({
|
|
38
|
+
error: 'Updates are disabled. Set JARVIS_ALLOW_UPDATES=true to allow update checks and applies.',
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
const info = await checkForUpdate(true, app.config.allowUpdates);
|
|
37
42
|
if (!info.updateAvailable) {
|
|
38
43
|
return reply.code(400).send({ error: 'No update available' });
|
|
39
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/routes/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAE9D,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,0BAA0B,CAAC,CAAA;AAS7E,SAAS,gBAAgB;IACvB,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QAChC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAA;IAC9B,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,CAI5D,CAAA;QACD,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,CAAA;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,CAAA;IAC9B,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,GAAoB;IACrD,qEAAqE;IACrE,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;QAC1C,MAAM,IAAI,GAAG,MAAM,cAAc,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../src/routes/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,5 +6,5 @@ export interface UpdateInfo {
|
|
|
6
6
|
releaseNotes: string;
|
|
7
7
|
publishedAt: string;
|
|
8
8
|
}
|
|
9
|
-
export declare function checkForUpdate(force?: boolean): Promise<UpdateInfo>;
|
|
9
|
+
export declare function checkForUpdate(force?: boolean, enabled?: boolean): Promise<UpdateInfo>;
|
|
10
10
|
//# sourceMappingURL=update-checker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-checker.d.ts","sourceRoot":"","sources":["../../src/services/update-checker.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,OAAO,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;CACpB;AAeD,wBAAsB,cAAc,CAAC,KAAK,UAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"update-checker.d.ts","sourceRoot":"","sources":["../../src/services/update-checker.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,UAAU;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,OAAO,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;CACpB;AAeD,wBAAsB,cAAc,CAAC,KAAK,UAAQ,EAAE,OAAO,UAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAsEvF"}
|
|
@@ -13,12 +13,24 @@ function compareSemver(a, b) {
|
|
|
13
13
|
}
|
|
14
14
|
return 0;
|
|
15
15
|
}
|
|
16
|
-
export async function checkForUpdate(force = false) {
|
|
16
|
+
export async function checkForUpdate(force = false, enabled = true) {
|
|
17
|
+
const current = VERSION.replace(/^v/, '');
|
|
18
|
+
// Privacy gate: when updates are disabled, never reach out to GitHub.
|
|
19
|
+
// Fail closed — report "no update available" without any network call.
|
|
20
|
+
if (!enabled) {
|
|
21
|
+
return {
|
|
22
|
+
currentVersion: current,
|
|
23
|
+
latestVersion: current,
|
|
24
|
+
updateAvailable: false,
|
|
25
|
+
releaseUrl: '',
|
|
26
|
+
releaseNotes: '',
|
|
27
|
+
publishedAt: '',
|
|
28
|
+
};
|
|
29
|
+
}
|
|
17
30
|
const now = Date.now();
|
|
18
31
|
if (!force && cached && now - lastCheck < CHECK_INTERVAL_MS) {
|
|
19
32
|
return cached;
|
|
20
33
|
}
|
|
21
|
-
const current = VERSION.replace(/^v/, '');
|
|
22
34
|
try {
|
|
23
35
|
const res = await fetch(`https://api.github.com/repos/${REPO}/releases/latest`, {
|
|
24
36
|
headers: { Accept: 'application/vnd.github+json' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-checker.js","sourceRoot":"","sources":["../../src/services/update-checker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAEvC,MAAM,IAAI,GAAG,0BAA0B,CAAA;AACvC,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA,CAAC,aAAa;AAWtD,IAAI,MAAM,GAAsB,IAAI,CAAA;AACpC,IAAI,SAAS,GAAG,CAAC,CAAA;AAEjB,SAAS,aAAa,CAAC,CAAS,EAAE,CAAS;IACzC,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACrD,MAAM,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACrD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QACxC,IAAI,IAAI,KAAK,CAAC;YAAE,OAAO,IAAI,CAAA;IAC7B,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,KAAK,GAAG,KAAK;
|
|
1
|
+
{"version":3,"file":"update-checker.js","sourceRoot":"","sources":["../../src/services/update-checker.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,8 +120,12 @@
|
|
|
120
120
|
"port": 7707,
|
|
121
121
|
"image": "ghcr.io/alexberardi/jarvis-tts:latest",
|
|
122
122
|
"healthCheck": "/health",
|
|
123
|
-
"dependsOn": ["jarvis-auth", "jarvis-config-service"],
|
|
123
|
+
"dependsOn": ["postgres", "jarvis-auth", "jarvis-config-service"],
|
|
124
|
+
"database": "jarvis_tts",
|
|
125
|
+
"dbDriverPrefix": "postgresql+psycopg2://",
|
|
126
|
+
"migrate": true,
|
|
124
127
|
"envVars": [
|
|
128
|
+
{ "name": "DATABASE_URL", "description": "PostgreSQL connection string", "required": true },
|
|
125
129
|
{ "name": "JARVIS_CONFIG_URL", "description": "Config service URL", "required": false, "default": "http://jarvis-config-service:7700" },
|
|
126
130
|
{ "name": "TTS_PROVIDER", "description": "Active TTS provider (piper, kokoro)", "required": false, "default": "kokoro" },
|
|
127
131
|
{ "name": "HF_HOME", "description": "HuggingFace cache dir for Kokoro voice weights", "required": false, "default": "/app/models/hf_cache" }
|