From 0a9a044b27352c28e4e3feddb0f8bb84556da7b7 Mon Sep 17 00:00:00 2001 From: Alessandro Pignotti Date: Mon, 14 Oct 2024 08:18:32 +0200 Subject: [PATCH] Svelte: Restore printing CX init error messages to the visible console --- src/lib/messages.js | 13 ++++++++++++- src/routes/+page.svelte | 7 ++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/lib/messages.js b/src/lib/messages.js index 2c427ec..53ef511 100644 --- a/src/lib/messages.js +++ b/src/lib/messages.js @@ -1,3 +1,4 @@ +const color= "\x1b[1;35m"; const underline= "\x1b[94;4m"; const normal= "\x1b[0m"; export const introMessage = [ @@ -25,5 +26,15 @@ export const introMessage = [ " objdump -d ./helloworld | less -M", " vim examples/c/helloworld.c", " 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:", + "" ]; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 7bf55ca..b160963 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -12,7 +12,7 @@ import '@fortawesome/fontawesome-free/css/all.min.css' import { networkInterface, startLogin } from '$lib/network.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 cx = null; @@ -124,8 +124,9 @@ } catch(e) { - // TODO: Print error message on console - throw e; + printMessage(errorMessage); + printMessage([e.toString()]); + return; } cx.registerCallback("cpuActivity", cpuCallback); cx.registerCallback("diskActivity", hddCallback);