@alexberardi/jarvis-admin 0.1.77 → 0.1.79
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-CG0PSroa.js +18 -0
- package/public/index.html +1 -1
- package/server/dist/data/service-registry.json +1 -1
- package/server/dist/routes/llm-setup.d.ts.map +1 -1
- package/server/dist/routes/llm-setup.js +24 -2
- package/server/dist/routes/llm-setup.js.map +1 -1
- package/server/dist/routes/models.d.ts.map +1 -1
- package/server/dist/routes/models.js +74 -3
- package/server/dist/routes/models.js.map +1 -1
- package/server/dist/services/env-file.d.ts +12 -0
- package/server/dist/services/env-file.d.ts.map +1 -0
- package/server/dist/services/env-file.js +27 -0
- package/server/dist/services/env-file.js.map +1 -0
- package/server/src/data/service-registry.json +1 -1
- package/public/assets/index-D7KODgJA.js +0 -18
package/public/index.html
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
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-
|
|
8
|
+
<script type="module" crossorigin src="/assets/index-CG0PSroa.js"></script>
|
|
9
9
|
<link rel="stylesheet" crossorigin href="/assets/index-CAv1RM9y.css">
|
|
10
10
|
</head>
|
|
11
11
|
<body>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-setup.d.ts","sourceRoot":"","sources":["../../src/routes/llm-setup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"llm-setup.d.ts","sourceRoot":"","sources":["../../src/routes/llm-setup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AA8B9C,wBAAsB,cAAc,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAsPxE"}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
import { requireSuperuser } from '../middleware/auth.js';
|
|
2
2
|
import { proxyRequest } from '../services/proxy.js';
|
|
3
|
+
import { getHostPlatform } from '../services/host-platform.js';
|
|
4
|
+
import { upsertEnvVar } from '../services/env-file.js';
|
|
5
|
+
/** LLM setting key → the env-fallback var native services read at seed time. */
|
|
6
|
+
const MODEL_ENV_FALLBACK = {
|
|
7
|
+
'model.main.name': 'JARVIS_MODEL_NAME',
|
|
8
|
+
'model.main.backend': 'JARVIS_MODEL_BACKEND',
|
|
9
|
+
'model.main.chat_format': 'JARVIS_MODEL_CHAT_FORMAT',
|
|
10
|
+
'model.main.context_window': 'JARVIS_MODEL_CONTEXT_WINDOW',
|
|
11
|
+
};
|
|
3
12
|
export async function llmSetupRoutes(app) {
|
|
4
13
|
app.addHook('preHandler', requireSuperuser);
|
|
5
14
|
/**
|
|
@@ -85,7 +94,18 @@ export async function llmSetupRoutes(app) {
|
|
|
85
94
|
const promptProvider = settings['llm.interface'];
|
|
86
95
|
const llmProxySettings = { ...settings };
|
|
87
96
|
delete llmProxySettings['llm.interface'];
|
|
88
|
-
//
|
|
97
|
+
// On macOS native the llm-proxy builds its venv asynchronously after install
|
|
98
|
+
// and usually isn't reachable when the wizard's Models step runs. Persist
|
|
99
|
+
// the model choice to .env — its seed reads these env-fallbacks on first
|
|
100
|
+
// start — so the config sticks regardless of whether the HTTP write lands.
|
|
101
|
+
const isNativeMac = getHostPlatform() === 'darwin';
|
|
102
|
+
if (isNativeMac) {
|
|
103
|
+
for (const [key, envVar] of Object.entries(MODEL_ENV_FALLBACK)) {
|
|
104
|
+
if (settings[key] !== undefined)
|
|
105
|
+
upsertEnvVar(envVar, String(settings[key]));
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
// Write LLM proxy settings over HTTP (authoritative when it's up).
|
|
89
109
|
let settingsResult = { status: 200, data: {} };
|
|
90
110
|
if (Object.keys(llmProxySettings).length > 0) {
|
|
91
111
|
settingsResult = await proxyRequest({
|
|
@@ -95,7 +115,9 @@ export async function llmSetupRoutes(app) {
|
|
|
95
115
|
body: { settings: llmProxySettings },
|
|
96
116
|
timeout: 10_000,
|
|
97
117
|
});
|
|
98
|
-
|
|
118
|
+
// On darwin a failure here is expected while llm-proxy is still building —
|
|
119
|
+
// the .env write above is the durable source of truth, so don't fail.
|
|
120
|
+
if (settingsResult.status !== 200 && !isNativeMac) {
|
|
99
121
|
return reply.code(settingsResult.status).send(settingsResult.data);
|
|
100
122
|
}
|
|
101
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-setup.js","sourceRoot":"","sources":["../../src/routes/llm-setup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"llm-setup.js","sourceRoot":"","sources":["../../src/routes/llm-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AA2G9C,wBAAsB,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAoLtE"}
|
|
@@ -1,8 +1,53 @@
|
|
|
1
|
-
import { execFile } from 'node:child_process';
|
|
1
|
+
import { execFile, execSync } from 'node:child_process';
|
|
2
2
|
import { existsSync, readdirSync, statSync, unlinkSync, mkdirSync } from 'node:fs';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { homedir } from 'node:os';
|
|
5
5
|
import { requireSuperuser } from '../middleware/auth.js';
|
|
6
|
+
import { getHostPlatform } from '../services/host-platform.js';
|
|
7
|
+
import { upsertEnvVar } from '../services/env-file.js';
|
|
8
|
+
/**
|
|
9
|
+
* Download a single file straight from HuggingFace with curl — no
|
|
10
|
+
* huggingface_hub / venv python needed. Native macOS services build their venvs
|
|
11
|
+
* asynchronously after install, so the venv python isn't available when the
|
|
12
|
+
* Models step runs; curl always is. Gated repos use the Bearer token.
|
|
13
|
+
*/
|
|
14
|
+
function downloadFileDirect(modelsDir, repo, filename, token) {
|
|
15
|
+
const dest = join(modelsDir, filename);
|
|
16
|
+
const url = `https://huggingface.co/${repo}/resolve/main/${filename}?download=true`;
|
|
17
|
+
const args = ['-fL', '--retry', '3', '--retry-delay', '2', '-o', dest, url];
|
|
18
|
+
if (token)
|
|
19
|
+
args.push('-H', `Authorization: Bearer ${token}`);
|
|
20
|
+
return new Promise((resolve, reject) => {
|
|
21
|
+
execFile('curl', args, { timeout: 1_800_000, maxBuffer: 1024 * 1024 }, (err, _stdout, stderr) => {
|
|
22
|
+
if (err) {
|
|
23
|
+
try {
|
|
24
|
+
if (existsSync(dest))
|
|
25
|
+
unlinkSync(dest);
|
|
26
|
+
}
|
|
27
|
+
catch { /* ignore */ }
|
|
28
|
+
reject(new Error(stderr || err.message));
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
resolve(dest);
|
|
32
|
+
}
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Best-effort `launchctl kickstart -k` for a native service. Failures are
|
|
38
|
+
* swallowed: a crash-looping job can transiently reject a kickstart, but the
|
|
39
|
+
* plist's KeepAlive will restart it anyway (picking up new .env values).
|
|
40
|
+
*/
|
|
41
|
+
function tryKickstartNative(label) {
|
|
42
|
+
try {
|
|
43
|
+
const uid = execSync('id -u', { encoding: 'utf-8' }).trim();
|
|
44
|
+
execSync(`launchctl kickstart -k gui/${uid}/${label}`, { timeout: 8000, stdio: 'pipe' });
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
50
|
+
}
|
|
6
51
|
/**
|
|
7
52
|
* The native macOS llm-proxy runs from ~/.jarvis/native/jarvis-llm-proxy-api and
|
|
8
53
|
* loads models from a `.models/` dir relative to that checkout. Returns that dir
|
|
@@ -107,6 +152,9 @@ export async function modelsRoutes(app) {
|
|
|
107
152
|
if (filename && !FILENAME_PATTERN.test(filename)) {
|
|
108
153
|
return reply.code(400).send({ error: 'Invalid filename format' });
|
|
109
154
|
}
|
|
155
|
+
// Persist the token so the service can pull gated models at runtime too.
|
|
156
|
+
if (token)
|
|
157
|
+
upsertEnvVar('HUGGINGFACE_HUB_TOKEN', token);
|
|
110
158
|
// Try Docker first
|
|
111
159
|
const container = await findLlmContainer(app);
|
|
112
160
|
if (container) {
|
|
@@ -143,8 +191,12 @@ export async function modelsRoutes(app) {
|
|
|
143
191
|
});
|
|
144
192
|
}
|
|
145
193
|
try {
|
|
146
|
-
|
|
147
|
-
|
|
194
|
+
// Single GGUF file → direct curl (no venv). Full-repo snapshot (VLLM, no
|
|
195
|
+
// filename) still needs huggingface_hub via the local venv python.
|
|
196
|
+
const output = filename
|
|
197
|
+
? await downloadFileDirect(modelsDir, repo, filename, token)
|
|
198
|
+
: (await runLocalPython(modelsDir, repo, filename, token)).trim();
|
|
199
|
+
return reply.send({ success: true, output, message: 'Download complete' });
|
|
148
200
|
}
|
|
149
201
|
catch (err) {
|
|
150
202
|
const msg = err instanceof Error ? err.message : String(err);
|
|
@@ -152,6 +204,25 @@ export async function modelsRoutes(app) {
|
|
|
152
204
|
return reply.code(500).send({ error: `Download failed: ${msg}` });
|
|
153
205
|
}
|
|
154
206
|
});
|
|
207
|
+
/**
|
|
208
|
+
* Enable/disable whisper STT model auto-download by writing the
|
|
209
|
+
* WHISPER_ALLOW_MODEL_AUTODOWNLOAD env var (whisper reads it as the settings
|
|
210
|
+
* fallback), then restarting the native whisper service so it fetches
|
|
211
|
+
* ggml-base.en on the next model load. This is the reliable native path — the
|
|
212
|
+
* settings-DB gateway can't reach whisper while it's crash-looping on the
|
|
213
|
+
* missing model.
|
|
214
|
+
*/
|
|
215
|
+
app.post('/whisper-autodownload', async (request, reply) => {
|
|
216
|
+
const enabled = request.body?.enabled ?? true;
|
|
217
|
+
const wrote = upsertEnvVar('WHISPER_ALLOW_MODEL_AUTODOWNLOAD', enabled ? 'true' : 'false');
|
|
218
|
+
if (!wrote) {
|
|
219
|
+
return reply.code(503).send({ error: 'No .env found — install services first.' });
|
|
220
|
+
}
|
|
221
|
+
const restarted = getHostPlatform() === 'darwin'
|
|
222
|
+
? tryKickstartNative('com.jarvis.whisper-api')
|
|
223
|
+
: false;
|
|
224
|
+
return reply.send({ success: true, enabled, restarted });
|
|
225
|
+
});
|
|
155
226
|
/** Delete a model file */
|
|
156
227
|
app.delete('/:name', async (request, reply) => {
|
|
157
228
|
const { name } = request.params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AAExD;;;;GAIG;AACH,SAAS,kBAAkB;IACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,sBAAsB,CAAC,CAAA;IAC7E,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAA;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IACrC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACrC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,iFAAiF;AACjF,SAAS,gBAAgB;IACvB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;IACjG,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AACnC,CAAC;AAcD,8DAA8D;AAC9D,SAAS,kBAAkB;IACzB,kEAAkE;IAClE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;IACrC,IAAI,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAA;IAE/C,2EAA2E;IAC3E,4DAA4D;IAC5D,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAA;IACnC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IAEzB,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,sBAAsB,EAAE,SAAS,CAAC;QAC5D,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC;QAChD,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC;KACtC,CAAA;IACD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,GAAG,CAAA;IACjC,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,GAAoB;IACrD,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAA;IAE3C,qDAAqD;IACrD,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;QAC9C,mBAAmB;QACnB,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAC7C,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE;oBAC7D,QAAQ,EAAE,IAAI;oBACd,uPAAuP;iBACxP,CAAC,CAAA;gBACF,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;gBAC/B,MAAM,MAAM,GAAiB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAsC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC5F,GAAG,CAAC;oBACJ,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;iBACnC,CAAC,CAAC,CAAA;gBACH,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YAC/B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAA;YAClE,CAAC;QACH,CAAC;QAED,4BAA4B;QAC5B,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAA;QACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;QACnC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAA;YACpC,MAAM,MAAM,GAAgB,KAAK;iBAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;iBACxD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;gBAC9C,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAA;YAC5D,CAAC,CAAC,CAAA;YACJ,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAC/B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;YACjD,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;QACnC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,wCAAwC;IACxC,GAAG,CAAC,IAAI,CAAyB,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACrE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,IAAoB,CAAA;QAE9D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAA;QAC5D,CAAC;QAED,MAAM,YAAY,GAAG,oCAAoC,CAAA;QACzD,MAAM,gBAAgB,GAAG,mBAAmB,CAAA;QAE5C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gDAAgD,EAAE,CAAC,CAAA;QAC1F,CAAC;QACD,IAAI,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAA;QACnE,CAAC;QAED,mBAAmB;QACnB,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAC7C,IAAI,SAAS,EAAE,CAAC;YACd,uFAAuF;YACvF,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE,CAAA;YAC5B,MAAM,GAAG,GAAG,QAAQ;gBAClB,CAAC,CAAC;oBACE,QAAQ,EAAE,IAAI;oBACd,iLAAiL;oBACjL,IAAI;oBACJ,QAAQ;oBACR,QAAQ;iBACT;gBACH,CAAC,CAAC;oBACE,QAAQ,EAAE,IAAI;oBACd,+LAA+L;oBAC/L,IAAI;oBACJ,QAAQ;iBACT,CAAA;YAEL,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;gBACnE,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;YAC3F,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBAC5D,OAAO,CAAC,KAAK,CAAC,gDAAgD,EAAE,GAAG,CAAC,CAAA;YACtE,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAA;QACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,2GAA2G;aACnH,CAAC,CAAA;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;YACrE,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;QAC3F,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC5D,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAA;YACrD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,GAAG,EAAE,EAAE,CAAC,CAAA;QACnE,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,0BAA0B;IAC1B,GAAG,CAAC,MAAM,CAA+B,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;QAC/B,MAAM,gBAAgB,GAAG,mBAAmB,CAAA;QAE5C,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAA;QAC5D,CAAC;QAED,mBAAmB;QACnB,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAC7C,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,MAAM,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE;oBAC9C,QAAQ,EAAE,IAAI;oBACd,6GAA6G;oBAC7G,IAAI;iBACL,CAAC,CAAA;gBACF,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;YACtC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,8CAA8C,EAAE,GAAG,CAAC,CAAA;YACpE,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAA;QACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC,CAAA;QACrE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAA;QAC3D,CAAC;QAED,IAAI,CAAC;YACH,UAAU,CAAC,QAAQ,CAAC,CAAA;YACpB,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QACtC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;YACnD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAA;QAClE,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,GAAoB;IAClD,IAAI,CAAC,GAAG,CAAC,MAAM;QAAE,OAAO,IAAI,CAAA;IAC5B,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAA;QAC1D,OAAO,UAAU,CAAC,IAAI,CACpB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9D,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YACtB,CAAC,CAAC,KAAK,KAAK,SAAS,CACxB,IAAI,UAAU,CAAC,IAAI,CAClB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9D,CAAC,CAAC,KAAK,KAAK,SAAS,CACxB,IAAI,IAAI,CAAA;IACX,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CACrB,SAAiB,EACjB,IAAY,EACZ,QAA4B,EAC5B,KAAyB;IAEzB,MAAM,MAAM,GAAG,QAAQ;QACrB,CAAC,CAAC,8MAA8M;QAChN,CAAC,CAAC,+NAA+N,CAAA;IAEnO,8EAA8E;IAC9E,4EAA4E;IAC5E,MAAM,MAAM,GAAG,gBAAgB,EAAE,IAAI,SAAS,CAAA;IAC9C,MAAM,IAAI,GAAG,QAAQ;QACnB,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC;QACnD,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;IAE/C,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAC9B,IAAI,KAAK;QAAE,GAAG,CAAC,qBAAqB,GAAG,KAAK,CAAA;IAE5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACnF,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;YAC1C,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,CAAC,CAAA;YACjB,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,IAAI,KAAK,GAAG,IAAI;QAAE,OAAO,GAAG,KAAK,IAAI,CAAA;IACrC,IAAI,KAAK,GAAG,IAAI,GAAG,IAAI;QAAE,OAAO,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;IACjE,IAAI,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI;QAAE,OAAO,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;IACjF,OAAO,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;AAC1D,CAAC;AAED,6FAA6F;AAC7F,SAAS,WAAW,CAAC,GAAW;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,KAAK,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;AACzB,CAAC"}
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAClF,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,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAEtD;;;;;GAKG;AACH,SAAS,kBAAkB,CACzB,SAAiB,EACjB,IAAY,EACZ,QAAgB,EAChB,KAAyB;IAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IACtC,MAAM,GAAG,GAAG,0BAA0B,IAAI,iBAAiB,QAAQ,gBAAgB,CAAA;IACnF,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;IAC3E,IAAI,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,yBAAyB,KAAK,EAAE,CAAC,CAAA;IAC5D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;YAC9F,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,CAAC;oBAAC,IAAI,UAAU,CAAC,IAAI,CAAC;wBAAE,UAAU,CAAC,IAAI,CAAC,CAAA;gBAAC,CAAC;gBAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;gBACrE,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;YAC1C,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,CAAA;YACf,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,KAAa;IACvC,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,QAAQ,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QAC3D,QAAQ,CAAC,8BAA8B,GAAG,IAAI,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAA;QACxF,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,kBAAkB;IACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,sBAAsB,CAAC,CAAA;IAC7E,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;QAAE,OAAO,IAAI,CAAA;IACtC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IACrC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACrC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,iFAAiF;AACjF,SAAS,gBAAgB;IACvB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;IACjG,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AACnC,CAAC;AAcD,8DAA8D;AAC9D,SAAS,kBAAkB;IACzB,kEAAkE;IAClE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;IACrC,IAAI,MAAM,IAAI,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAA;IAE/C,2EAA2E;IAC3E,4DAA4D;IAC5D,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAA;IACnC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAA;IAEzB,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,sBAAsB,EAAE,SAAS,CAAC;QAC5D,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC;QAChD,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,CAAC;KACtC,CAAA;IACD,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,GAAG,CAAA;IACjC,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,GAAoB;IACrD,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAA;IAE3C,qDAAqD;IACrD,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;QAC9C,mBAAmB;QACnB,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAC7C,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE;oBAC7D,QAAQ,EAAE,IAAI;oBACd,uPAAuP;iBACxP,CAAC,CAAA;gBACF,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;gBAC/B,MAAM,MAAM,GAAiB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAsC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBAC5F,GAAG,CAAC;oBACJ,aAAa,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC;iBACnC,CAAC,CAAC,CAAA;gBACH,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;YAC/B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,4CAA4C,EAAE,GAAG,CAAC,CAAA;YAClE,CAAC;QACH,CAAC;QAED,4BAA4B;QAC5B,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAA;QACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;QACnC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAA;YACpC,MAAM,MAAM,GAAgB,KAAK;iBAC9B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;iBACxD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;gBAC9C,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,CAAA;YAC5D,CAAC,CAAC,CAAA;YACJ,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAC/B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAA;YACjD,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;QACnC,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,wCAAwC;IACxC,GAAG,CAAC,IAAI,CAAyB,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACrE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,IAAoB,CAAA;QAE9D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAA;QAC5D,CAAC;QAED,MAAM,YAAY,GAAG,oCAAoC,CAAA;QACzD,MAAM,gBAAgB,GAAG,mBAAmB,CAAA;QAE5C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gDAAgD,EAAE,CAAC,CAAA;QAC1F,CAAC;QACD,IAAI,QAAQ,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,yBAAyB,EAAE,CAAC,CAAA;QACnE,CAAC;QAED,yEAAyE;QACzE,IAAI,KAAK;YAAE,YAAY,CAAC,uBAAuB,EAAE,KAAK,CAAC,CAAA;QAEvD,mBAAmB;QACnB,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAC7C,IAAI,SAAS,EAAE,CAAC;YACd,uFAAuF;YACvF,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE,CAAA;YAC5B,MAAM,GAAG,GAAG,QAAQ;gBAClB,CAAC,CAAC;oBACE,QAAQ,EAAE,IAAI;oBACd,iLAAiL;oBACjL,IAAI;oBACJ,QAAQ;oBACR,QAAQ;iBACT;gBACH,CAAC,CAAC;oBACE,QAAQ,EAAE,IAAI;oBACd,+LAA+L;oBAC/L,IAAI;oBACJ,QAAQ;iBACT,CAAA;YAEL,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;gBACnE,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;YAC3F,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBAC5D,OAAO,CAAC,KAAK,CAAC,gDAAgD,EAAE,GAAG,CAAC,CAAA;YACtE,CAAC;QACH,CAAC;QAED,iDAAiD;QACjD,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAA;QACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBAC1B,KAAK,EAAE,2GAA2G;aACnH,CAAC,CAAA;QACJ,CAAC;QAED,IAAI,CAAC;YACH,yEAAyE;YACzE,mEAAmE;YACnE,MAAM,MAAM,GAAG,QAAQ;gBACrB,CAAC,CAAC,MAAM,kBAAkB,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC;gBAC5D,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;YACnE,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAA;QAC5E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC5D,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAA;YACrD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,GAAG,EAAE,EAAE,CAAC,CAAA;QACnE,CAAC;IACH,CAAC,CAAC,CAAA;IAEF;;;;;;;OAOG;IACH,GAAG,CAAC,IAAI,CAAiC,uBAAuB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACzF,MAAM,OAAO,GAAI,OAAO,CAAC,IAA8B,EAAE,OAAO,IAAI,IAAI,CAAA;QACxE,MAAM,KAAK,GAAG,YAAY,CAAC,kCAAkC,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAC1F,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,yCAAyC,EAAE,CAAC,CAAA;QACnF,CAAC;QACD,MAAM,SAAS,GAAG,eAAe,EAAE,KAAK,QAAQ;YAC9C,CAAC,CAAC,kBAAkB,CAAC,wBAAwB,CAAC;YAC9C,CAAC,CAAC,KAAK,CAAA;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;IAC1D,CAAC,CAAC,CAAA;IAEF,0BAA0B;IAC1B,GAAG,CAAC,MAAM,CAA+B,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;QAC/B,MAAM,gBAAgB,GAAG,mBAAmB,CAAA;QAE5C,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAA;QAC5D,CAAC;QAED,mBAAmB;QACnB,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAA;QAC7C,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,MAAM,GAAG,CAAC,MAAO,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE,EAAE;oBAC9C,QAAQ,EAAE,IAAI;oBACd,6GAA6G;oBAC7G,IAAI;iBACL,CAAC,CAAA;gBACF,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;YACtC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,CAAC,KAAK,CAAC,8CAA8C,EAAE,GAAG,CAAC,CAAA;YACpE,CAAC;QACH,CAAC;QAED,iBAAiB;QACjB,MAAM,SAAS,GAAG,kBAAkB,EAAE,CAAA;QACtC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC,CAAA;QACrE,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAA;QAC3D,CAAC;QAED,IAAI,CAAC;YACH,UAAU,CAAC,QAAQ,CAAC,CAAA;YACpB,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;QACtC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAA;YACnD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAA;QAClE,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,GAAoB;IAClD,IAAI,CAAC,GAAG,CAAC,MAAM;QAAE,OAAO,IAAI,CAAA;IAC5B,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAA;QAC1D,OAAO,UAAU,CAAC,IAAI,CACpB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9D,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YACtB,CAAC,CAAC,KAAK,KAAK,SAAS,CACxB,IAAI,UAAU,CAAC,IAAI,CAClB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC9D,CAAC,CAAC,KAAK,KAAK,SAAS,CACxB,IAAI,IAAI,CAAA;IACX,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CACrB,SAAiB,EACjB,IAAY,EACZ,QAA4B,EAC5B,KAAyB;IAEzB,MAAM,MAAM,GAAG,QAAQ;QACrB,CAAC,CAAC,8MAA8M;QAChN,CAAC,CAAC,+NAA+N,CAAA;IAEnO,8EAA8E;IAC9E,4EAA4E;IAC5E,MAAM,MAAM,GAAG,gBAAgB,EAAE,IAAI,SAAS,CAAA;IAC9C,MAAM,IAAI,GAAG,QAAQ;QACnB,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC;QACnD,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;IAE/C,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;IAC9B,IAAI,KAAK;QAAE,GAAG,CAAC,qBAAqB,GAAG,KAAK,CAAA;IAE5C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACnF,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;YAC1C,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,CAAC,CAAA;YACjB,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,IAAI,KAAK,GAAG,IAAI;QAAE,OAAO,GAAG,KAAK,IAAI,CAAA;IACrC,IAAI,KAAK,GAAG,IAAI,GAAG,IAAI;QAAE,OAAO,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;IACjE,IAAI,KAAK,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI;QAAE,OAAO,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;IACjF,OAAO,GAAG,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;AAC1D,CAAC;AAED,6FAA6F;AAC7F,SAAS,WAAW,CAAC,GAAW;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC9B,IAAI,KAAK,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAA;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;AACzB,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Upsert a KEY=value line in ~/.jarvis/compose/.env — the file that native
|
|
3
|
+
* macOS services source (Docker services read it too). Returns false if the
|
|
4
|
+
* .env doesn't exist yet (install hasn't generated it).
|
|
5
|
+
*
|
|
6
|
+
* This is the reliable way to configure native services that build their venvs
|
|
7
|
+
* asynchronously (via launchd) after install and so aren't reachable over HTTP
|
|
8
|
+
* when the wizard's Models step runs. Services read these as settings
|
|
9
|
+
* env-fallbacks and, on a fresh install, seed_settings picks them up.
|
|
10
|
+
*/
|
|
11
|
+
export declare function upsertEnvVar(key: string, value: string): boolean;
|
|
12
|
+
//# sourceMappingURL=env-file.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-file.d.ts","sourceRoot":"","sources":["../../src/services/env-file.ts"],"names":[],"mappings":"AAIA;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAWhE"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { getComposePath } from './compose-path.js';
|
|
4
|
+
/**
|
|
5
|
+
* Upsert a KEY=value line in ~/.jarvis/compose/.env — the file that native
|
|
6
|
+
* macOS services source (Docker services read it too). Returns false if the
|
|
7
|
+
* .env doesn't exist yet (install hasn't generated it).
|
|
8
|
+
*
|
|
9
|
+
* This is the reliable way to configure native services that build their venvs
|
|
10
|
+
* asynchronously (via launchd) after install and so aren't reachable over HTTP
|
|
11
|
+
* when the wizard's Models step runs. Services read these as settings
|
|
12
|
+
* env-fallbacks and, on a fresh install, seed_settings picks them up.
|
|
13
|
+
*/
|
|
14
|
+
export function upsertEnvVar(key, value) {
|
|
15
|
+
const envPath = join(getComposePath(), '.env');
|
|
16
|
+
if (!existsSync(envPath))
|
|
17
|
+
return false;
|
|
18
|
+
let content = readFileSync(envPath, 'utf-8');
|
|
19
|
+
const line = `${key}=${value}`;
|
|
20
|
+
const re = new RegExp(`^${key}=.*$`, 'm');
|
|
21
|
+
content = re.test(content)
|
|
22
|
+
? content.replace(re, line)
|
|
23
|
+
: `${content.replace(/\n?$/, '\n')}${line}\n`;
|
|
24
|
+
writeFileSync(envPath, content);
|
|
25
|
+
return true;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=env-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-file.js","sourceRoot":"","sources":["../../src/services/env-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAElD;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAC,GAAW,EAAE,KAAa;IACrD,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,EAAE,MAAM,CAAC,CAAA;IAC9C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAA;IACtC,IAAI,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC5C,MAAM,IAAI,GAAG,GAAG,GAAG,IAAI,KAAK,EAAE,CAAA;IAC9B,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,IAAI,GAAG,MAAM,EAAE,GAAG,CAAC,CAAA;IACzC,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;QACxB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC;QAC3B,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,IAAI,IAAI,CAAA;IAC/C,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IAC/B,OAAO,IAAI,CAAA;AACb,CAAC"}
|