* feat: Improve llamacpp server error reporting and model load stability This commit introduces significant improvements to how the llamacpp server process is managed and how its errors are reported. Key changes: - **Enhanced Error Reporting:** The llamacpp server's stdout and stderr are now piped and captured. If the llamacpp process exits prematurely or fails to start, its stderr output is captured and returned as a `LlamacppError`. This provides much more specific and actionable diagnostic information for users and developers. - **Increased Model Load Timeout:** The `waitForModelLoad` timeout has been increased from 30 seconds to 240 seconds (4 minutes). This addresses issues where larger models or slower systems would prematurely time out during the model loading phase. - **API Secret Update:** The internal API secret for the llamacpp extension has been updated from 'Jan' to 'JustAskNow'. - **Version Bump:** The application version in `tauri.conf.json` has been incremented to `0.6.901`. * fix: should not spam load requests * test: add test to cover the fix * refactor: clean up * test: add more test case --------- Co-authored-by: Louis <louis@jan.ai>
89 lines
2.6 KiB
JSON
89 lines
2.6 KiB
JSON
{
|
|
"$schema": "https://schema.tauri.app/config/2",
|
|
"productName": "Jan",
|
|
"version": "0.6.901",
|
|
"identifier": "jan.ai.app",
|
|
"build": {
|
|
"frontendDist": "../web-app/dist",
|
|
"devUrl": "http://localhost:1420",
|
|
"beforeDevCommand": "cross-env IS_TAURI=true CLEAN=true yarn dev:web",
|
|
"beforeBuildCommand": "cross-env IS_TAURI=true yarn build:web"
|
|
},
|
|
"app": {
|
|
"macOSPrivateApi": true,
|
|
"windows": [
|
|
{
|
|
"zoomHotkeysEnabled": true,
|
|
"label": "main",
|
|
"title": "Jan",
|
|
"width": 1024,
|
|
"minWidth": 375,
|
|
"minHeight": 667,
|
|
"height": 800,
|
|
"resizable": true,
|
|
"fullscreen": false,
|
|
"center": true,
|
|
"hiddenTitle": true,
|
|
"transparent": true,
|
|
"trafficLightPosition": {
|
|
"x": 12,
|
|
"y": 22
|
|
},
|
|
"decorations": true,
|
|
"titleBarStyle": "Overlay",
|
|
"windowEffects": {
|
|
"effects": ["fullScreenUI", "mica", "tabbed", "blur", "acrylic"],
|
|
"state": "active",
|
|
"radius": 8
|
|
}
|
|
}
|
|
],
|
|
"security": {
|
|
"csp": {
|
|
"default-src": "'self' customprotocol: asset: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*",
|
|
"connect-src": "ipc: http://ipc.localhost http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:* https: http:",
|
|
"font-src": [
|
|
"https://fonts.gstatic.com blob: data: tauri://localhost http://tauri.localhost"
|
|
],
|
|
"img-src": "'self' asset: http://asset.localhost blob: data: https://cdn.jsdelivr.net",
|
|
"style-src": "'unsafe-inline' 'self' https://fonts.googleapis.com",
|
|
"script-src": "'self' asset: $APPDATA/**.* http://asset.localhost https://eu-assets.i.posthog.com https://posthog.com"
|
|
},
|
|
"assetProtocol": {
|
|
"enable": true,
|
|
"scope": {
|
|
"requireLiteralLeadingDot": false,
|
|
"allow": ["**/*"]
|
|
}
|
|
}
|
|
}
|
|
},
|
|
"plugins": {
|
|
"os": {
|
|
"version": "latest",
|
|
"resolve": true
|
|
},
|
|
"updater": {
|
|
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDJFNDEzMEVCMUEzNUFENDQKUldSRXJUVWE2ekJCTGc1Mm1BVXgrWmtES3huUlBFR0lCdG5qbWFvMzgyNDhGN3VTTko5Q1NtTW0K",
|
|
"endpoints": [
|
|
"https://github.com/menloresearch/jan/releases/latest/download/latest.json"
|
|
],
|
|
"windows": {
|
|
"installMode": "passive"
|
|
}
|
|
},
|
|
"deep-link": { "schemes": ["jan"] }
|
|
},
|
|
"bundle": {
|
|
"active": true,
|
|
"createUpdaterArtifacts": false,
|
|
"icon": [
|
|
"icons/32x32.png",
|
|
"icons/128x128.png",
|
|
"icons/128x128@2x.png",
|
|
"icons/icon.icns",
|
|
"icons/icon.ico"
|
|
]
|
|
}
|
|
}
|