Sunny-Moom/webvm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Svelte: Restore printing CX init error messages to the visible console

Browse Source
This commit is contained in:
Alessandro Pignotti 2024-10-14 08:18:32 +02:00
parent 834566aa0e
commit 0a9a044b27
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/messages.js
View File

@ -1,3 +1,4 @@
const color= "\x1b[1;35m";
const underline= "\x1b[94;4m"; const underline= "\x1b[94;4m";
const normal= "\x1b[0m"; const normal= "\x1b[0m";
export const introMessage = [ export const introMessage = [
@ -25,5 +26,15 @@ export const introMessage = [
" objdump -d ./helloworld | less -M", " objdump -d ./helloworld | less -M",
" vim examples/c/helloworld.c", " vim examples/c/helloworld.c",
" curl --max-time 15 parrot.live # requires networking", " curl --max-time 15 parrot.live # requires networking",
"", ""
];
export const errorMessage = [
color + "CheerpX could not start" + normal,
"",
"CheerpX is expected to work with recent desktop versions of Chrome, Edge, Firefox and Safari",
"",
"Give it a try from a desktop version / another browser!",
"",
"CheerpX internal error message is:",
""
]; ];

7
src/routes/+page.svelte
View File

@ -12,7 +12,7 @@
import '@fortawesome/fontawesome-free/css/all.min.css' import '@fortawesome/fontawesome-free/css/all.min.css'
import { networkInterface, startLogin } from '$lib/network.js' import { networkInterface, startLogin } from '$lib/network.js'
import { cpuActivity, diskActivity } from '$lib/activities.js' import { cpuActivity, diskActivity } from '$lib/activities.js'
import { introMessage } from '$lib/messages.js' import { introMessage, errorMessage } from '$lib/messages.js'
var term = new Terminal({cursorBlink:true, convertEol:true, fontFamily:"monospace", fontWeight: 400, fontWeightBold: 700}); var term = new Terminal({cursorBlink:true, convertEol:true, fontFamily:"monospace", fontWeight: 400, fontWeightBold: 700});
var cx = null; var cx = null;
@ -124,8 +124,9 @@
} }
catch(e) catch(e)
{ {
// TODO: Print error message on console printMessage(errorMessage);
throw e; printMessage([e.toString()]);
return;
} }
cx.registerCallback("cpuActivity", cpuCallback); cx.registerCallback("cpuActivity", cpuCallback);
cx.registerCallback("diskActivity", hddCallback); cx.registerCallback("diskActivity", hddCallback);