fix(web-app): remove unused sqlite.worker.js and wasi-dummy.js, update Config.kt and service worker logic
- Deleted `sqlite.worker.js` and `wasi-dummy.js` to clean up outdated resources. - Updated `Config.kt` to use a shared `Json` instance for deserialization. - Revised service worker for cache versioning and to bypass caching of `web-app.js` and `.map` files. - Enhanced debug logging and improved handling of uncaught errors in new `sqlite.worker.js`. Signed-off-by: Stefan Mogeritsch <stefan.mo.co@gmail.com>
This commit is contained in:
@@ -3,6 +3,8 @@ import kotlinx.coroutines.await
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.Json
|
||||
|
||||
private val AppJson = Json { ignoreUnknownKeys = true }
|
||||
|
||||
@Serializable
|
||||
data class AppConfig(
|
||||
val apiBaseUrl: String,
|
||||
@@ -18,7 +20,7 @@ suspend fun loadAppConfig(): AppConfig {
|
||||
return fallbackFromGlobal()
|
||||
}
|
||||
val text = response.text().await()
|
||||
Json.decodeFromString(AppConfig.serializer(), text)
|
||||
AppJson.decodeFromString(AppConfig.serializer(), text)
|
||||
} catch (e: dynamic) {
|
||||
console.error("[Config] Error loading config:", e)
|
||||
// Fallback: Caddy-injizierte Werte aus index.html (globalThis.API_BASE_URL / KEYCLOAK_URL)
|
||||
@@ -28,10 +30,10 @@ suspend fun loadAppConfig(): AppConfig {
|
||||
|
||||
private fun fallbackFromGlobal(): AppConfig {
|
||||
val apiBase = (js("globalThis.API_BASE_URL") as? String)
|
||||
?.takeIf { it.isNotBlank() && !it.startsWith("\${") }
|
||||
?.takeIf { it.isNotBlank() && !it.startsWith($$"${") }
|
||||
?: window.location.origin
|
||||
val kcUrl = (js("globalThis.KEYCLOAK_URL") as? String)
|
||||
?.takeIf { it.isNotBlank() && !it.startsWith("\${") }
|
||||
?.takeIf { it.isNotBlank() && !it.startsWith($$"${") }
|
||||
console.log("[Config] Fallback: apiBaseUrl=$apiBase, keycloakUrl=$kcUrl")
|
||||
return AppConfig(apiBaseUrl = apiBase, keycloakUrl = kcUrl)
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ fun main() {
|
||||
val config = loadAppConfig()
|
||||
console.log("[WebApp] Configuration loaded: apiBaseUrl=${config.apiBaseUrl}, keycloakUrl=${config.keycloakUrl}")
|
||||
|
||||
// Inject config into global JS scope for PlatformConfig to find
|
||||
// Inject config into the global JS scope for PlatformConfig to find
|
||||
val global = js("typeof globalThis !== 'undefined' ? globalThis : window")
|
||||
global.API_BASE_URL = config.apiBaseUrl
|
||||
config.keycloakUrl?.let { global.KEYCLOAK_URL = it }
|
||||
|
||||
@@ -1,122 +0,0 @@
|
||||
// Minimal debug worker
|
||||
console.log("Worker: sqlite.worker.js loaded. Starting initialization...");
|
||||
|
||||
try {
|
||||
// We do NOT import from node_modules anymore to avoid Webpack bundling issues.
|
||||
// import sqlite3InitModule from '@sqlite.org/sqlite-wasm';
|
||||
|
||||
// Message buffer for messages arriving before DB is ready
|
||||
let messageQueue = [];
|
||||
let db = null;
|
||||
let isReady = false;
|
||||
|
||||
// Minimal worker protocol compatible with SQLDelight's `web-worker-driver`.
|
||||
self.onmessage = (event) => {
|
||||
if (!isReady) {
|
||||
console.log("Worker: Buffering message (DB not ready)", event.data);
|
||||
messageQueue.push(event);
|
||||
return;
|
||||
}
|
||||
processMessage(event);
|
||||
};
|
||||
|
||||
function processMessage(event) {
|
||||
const data = event.data;
|
||||
try {
|
||||
switch (data && data.action) {
|
||||
case 'exec': {
|
||||
if (!data.sql) throw new Error('exec: Missing query string');
|
||||
const rows = [];
|
||||
db.exec({
|
||||
sql: data.sql,
|
||||
bind: data.params ?? [],
|
||||
rowMode: 'array',
|
||||
callback: (row) => rows.push(row)
|
||||
});
|
||||
return postMessage({ id: data.id, results: { values: rows } });
|
||||
}
|
||||
case 'begin_transaction':
|
||||
db.exec('BEGIN TRANSACTION;');
|
||||
return postMessage({ id: data.id, results: [] });
|
||||
case 'end_transaction':
|
||||
db.exec('END TRANSACTION;');
|
||||
return postMessage({ id: data.id, results: [] });
|
||||
case 'rollback_transaction':
|
||||
db.exec('ROLLBACK TRANSACTION;');
|
||||
return postMessage({ id: data.id, results: [] });
|
||||
default:
|
||||
throw new Error(`Unsupported action: ${data && data.action}`);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Worker: Error processing message", err);
|
||||
return postMessage({ id: data && data.id, error: err?.message ?? String(err) });
|
||||
}
|
||||
}
|
||||
|
||||
self.onerror = function(event) {
|
||||
console.error("Error in Web Worker (onerror):", event.message, event.filename, event.lineno);
|
||||
// Don't postMessage here as it might confuse the driver if it expects a response to a query
|
||||
};
|
||||
|
||||
async function init() {
|
||||
try {
|
||||
// 1. Load the sqlite3.js library manually via importScripts.
|
||||
console.log("Worker: Loading sqlite3.js via importScripts...");
|
||||
try {
|
||||
importScripts('sqlite3.js');
|
||||
} catch (e) {
|
||||
throw new Error("Failed to importScripts('sqlite3.js'). Check if file exists at root. Error: " + e.message);
|
||||
}
|
||||
|
||||
if (typeof self.sqlite3InitModule !== 'function') {
|
||||
throw new Error("sqlite3InitModule is not defined after importScripts. Check if sqlite3.js was loaded correctly.");
|
||||
}
|
||||
|
||||
console.log("Worker: Fetching sqlite3.wasm manually...");
|
||||
const response = await fetch('sqlite3.wasm');
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch sqlite3.wasm: ${response.status} ${response.statusText}`);
|
||||
}
|
||||
const wasmBinary = await response.arrayBuffer();
|
||||
console.log("Worker: sqlite3.wasm fetched successfully, size:", wasmBinary.byteLength);
|
||||
|
||||
console.log("Worker: Calling sqlite3InitModule with wasmBinary...");
|
||||
const sqlite3 = await self.sqlite3InitModule({
|
||||
print: console.log,
|
||||
printErr: console.error,
|
||||
wasmBinary: wasmBinary
|
||||
});
|
||||
|
||||
console.log("Worker: sqlite3InitModule resolved successfully");
|
||||
const opfsAvailable = 'opfs' in sqlite3;
|
||||
console.log("Worker: OPFS available:", opfsAvailable);
|
||||
|
||||
// Initialize DB
|
||||
const dbName = 'app.db';
|
||||
if (opfsAvailable) {
|
||||
console.log("Initialisiere persistente OPFS Datenbank: " + dbName);
|
||||
db = new sqlite3.oo1.OpfsDb(dbName);
|
||||
} else {
|
||||
console.warn("OPFS nicht verfügbar, Fallback auf In-Memory");
|
||||
db = new sqlite3.oo1.DB(dbName);
|
||||
}
|
||||
|
||||
// Mark as ready and process queue
|
||||
isReady = true;
|
||||
console.log("Worker: DB Ready. Processing " + messageQueue.length + " buffered messages.");
|
||||
while (messageQueue.length > 0) {
|
||||
processMessage(messageQueue.shift());
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
console.error("Database initialization error in worker:", e);
|
||||
// We can't easily communicate this back to the driver during init,
|
||||
// but console.error should show up.
|
||||
}
|
||||
}
|
||||
|
||||
init();
|
||||
|
||||
} catch (e) {
|
||||
console.error("Critical Worker Error:", e);
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
const IS_DEV = self.location.hostname === 'localhost' || self.location.hostname === '127.0.0.1' || self.location.hostname === '::1';
|
||||
|
||||
const CACHE_NAME = 'meldestelle-cache-v2';
|
||||
const CACHE_NAME = 'meldestelle-cache-v3';
|
||||
const PRECACHE_URLS = [
|
||||
'/',
|
||||
'/index.html',
|
||||
@@ -10,7 +10,8 @@ const PRECACHE_URLS = [
|
||||
self.addEventListener('install', (event) => {
|
||||
if (IS_DEV) {
|
||||
// In dev, don't precache. Just activate the SW immediately.
|
||||
self.skipWaiting();
|
||||
self.skipWaiting().then(_ => {
|
||||
});
|
||||
return;
|
||||
}
|
||||
event.waitUntil(
|
||||
@@ -74,6 +75,12 @@ self.addEventListener('fetch', (event) => {
|
||||
return;
|
||||
}
|
||||
|
||||
// App-Bundle immer vom Netzwerk – niemals aus dem Cache (verhindert veraltete JS-Versionen)
|
||||
if (url.pathname.endsWith('web-app.js') || url.pathname.endsWith('web-app.js.map')) {
|
||||
event.respondWith(fetch(req));
|
||||
return;
|
||||
}
|
||||
|
||||
// Avoid noisy errors for favicon during dev/prod when missing
|
||||
if (url.pathname === '/favicon.ico') {
|
||||
event.respondWith(
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
// Dummy module to satisfy WASI imports in Webpack
|
||||
// Used for skiko.wasm and potentially others
|
||||
|
||||
export function abort() {
|
||||
console.error("WASI abort called");
|
||||
}
|
||||
|
||||
// Some WASM modules might look for these
|
||||
export function emscripten_notify_memory_growth() {
|
||||
}
|
||||
|
||||
export default {
|
||||
abort,
|
||||
emscripten_notify_memory_growth
|
||||
};
|
||||
Reference in New Issue
Block a user