chore(frontend): integrate SQLite Web Worker and improve debug initialization

- Added `sqlite.worker.js` for custom SQLite Web Worker setup compatible with SQLDelight.
- Enhanced Webpack configuration in `sqlite-config.js` for SQLite-related assets and dynamic path resolution.
- Updated Koin `apiClient` setup to dynamically inject Authorization headers using the `HttpSend` plugin.
- Fixed Keycloak realm configuration to include new local URLs (`http://localhost:8080`).
- Removed redundant Web Worker copy tasks from Gradle and adjusted Kotlin code for streamlined worker creation.
This commit is contained in:
2026-01-26 22:02:13 +01:00
parent 3e587381ed
commit bddeba81be
7 changed files with 346 additions and 184 deletions
@@ -191,11 +191,13 @@
"implicitFlowEnabled": false, "implicitFlowEnabled": false,
"directAccessGrantsEnabled": false, "directAccessGrantsEnabled": false,
"redirectUris": [ "redirectUris": [
"http://localhost:8080/*",
"http://localhost:4000/*", "http://localhost:4000/*",
"http://localhost:3000/*", "http://localhost:3000/*",
"https://app.meldestelle.at/*" "https://app.meldestelle.at/*"
], ],
"webOrigins": [ "webOrigins": [
"http://localhost:8080",
"http://localhost:4000", "http://localhost:4000",
"http://localhost:3000", "http://localhost:3000",
"https://app.meldestelle.at" "https://app.meldestelle.at"
@@ -8,8 +8,6 @@ import org.w3c.dom.Worker
actual class DatabaseDriverFactory { actual class DatabaseDriverFactory {
actual suspend fun createDriver(): SqlDriver { actual suspend fun createDriver(): SqlDriver {
// Wir nutzen eine Helper-Funktion, um den Worker zu erstellen. // Wir nutzen eine Helper-Funktion, um den Worker zu erstellen.
// Dies ermöglicht uns, 'new URL(..., import.meta.url)' in JS zu verwenden,
// was Webpack dazu bringt, den Pfad korrekt aufzulösen.
val worker = createWorker() val worker = createWorker()
val driver = WebWorkerDriver(worker) val driver = WebWorkerDriver(worker)
@@ -20,11 +18,8 @@ actual class DatabaseDriverFactory {
} }
} }
// Helper function to create the worker using proper URL resolution // Helper function to create the worker
private fun createWorker(): Worker { private fun createWorker(): Worker {
return js( // Try the relative path again, as an absolute path might fail depending on base href
""" return js("new Worker('sqlite.worker.js')")
new Worker(new URL('sqlite.worker.js', import.meta.url), { type: 'module' })
"""
)
} }
@@ -1,21 +1,26 @@
// 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. // We do NOT import from node_modules anymore to avoid Webpack bundling issues.
// import sqlite3InitModule from '@sqlite.org/sqlite-wasm'; // import sqlite3InitModule from '@sqlite.org/sqlite-wasm';
console.log("Worker: sqlite.worker.js loaded. Starting initialization..."); // 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`. // Minimal worker protocol compatible with SQLDelight's `web-worker-driver`.
function runWorker({driver}) { self.onmessage = (event) => {
console.log("Worker: runWorker called"); if (!isReady) {
let db = null; console.log("Worker: Buffering message (DB not ready)", event.data);
const open = (name) => { messageQueue.push(event);
console.log("Worker: Opening database", name); return;
db = driver.open(name); }
processMessage(event);
}; };
// Open once with the default database name expected by SQLDelight. function processMessage(event) {
open('app.db');
self.onmessage = (event) => {
const data = event.data; const data = event.data;
try { try {
switch (data && data.action) { switch (data && data.action) {
@@ -46,23 +51,23 @@ function runWorker({driver}) {
console.error("Worker: Error processing message", err); console.error("Worker: Error processing message", err);
return postMessage({ id: data && data.id, error: err?.message ?? String(err) }); return postMessage({ id: data && data.id, error: err?.message ?? String(err) });
} }
};
} }
self.onerror = function(event) { self.onerror = function(event) {
console.error("Error in Web Worker (onerror):", event.message, event.filename, event.lineno); console.error("Error in Web Worker (onerror):", event.message, event.filename, event.lineno);
self.postMessage({type: 'error', message: event.message, filename: event.filename, lineno: event.lineno}); // Don't postMessage here as it might confuse the driver if it expects a response to a query
}; };
async function init() { async function init() {
try { try {
// 1. Load the sqlite3.js library manually via importScripts. // 1. Load the sqlite3.js library manually via importScripts.
// This file is copied to the root by Webpack (CopyWebpackPlugin).
// This bypasses Webpack's module resolution for the library itself.
console.log("Worker: Loading sqlite3.js via importScripts..."); console.log("Worker: Loading sqlite3.js via importScripts...");
try {
importScripts('sqlite3.js'); importScripts('sqlite3.js');
} catch (e) {
throw new Error("Failed to importScripts('sqlite3.js'). Check if file exists at root. Error: " + e.message);
}
// After importScripts, `sqlite3InitModule` should be available globally.
if (typeof self.sqlite3InitModule !== 'function') { if (typeof self.sqlite3InitModule !== 'function') {
throw new Error("sqlite3InitModule is not defined after importScripts. Check if sqlite3.js was loaded correctly."); throw new Error("sqlite3InitModule is not defined after importScripts. Check if sqlite3.js was loaded correctly.");
} }
@@ -86,24 +91,32 @@ async function init() {
const opfsAvailable = 'opfs' in sqlite3; const opfsAvailable = 'opfs' in sqlite3;
console.log("Worker: OPFS available:", opfsAvailable); console.log("Worker: OPFS available:", opfsAvailable);
runWorker({ // Initialize DB
driver: { const dbName = 'app.db';
open: (name) => {
if (opfsAvailable) { if (opfsAvailable) {
console.log("Initialisiere persistente OPFS Datenbank: " + name); console.log("Initialisiere persistente OPFS Datenbank: " + dbName);
return new sqlite3.oo1.OpfsDb(name); db = new sqlite3.oo1.OpfsDb(dbName);
} else { } else {
console.warn("OPFS nicht verfügbar, Fallback auf In-Memory"); console.warn("OPFS nicht verfügbar, Fallback auf In-Memory");
return new sqlite3.oo1.DB(name); 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) { } catch (e) {
console.error("Database initialization error in worker:", e); console.error("Database initialization error in worker:", e);
self.postMessage({type: 'error', message: 'Database initialization failed: ' + e.message}); // We can't easily communicate this back to the driver during init,
// but console.error should show up.
} }
} }
init(); init();
} catch (e) {
console.error("Critical Worker Error:", e);
}
@@ -41,11 +41,14 @@ val networkModule = module {
// 2. API Client (Configured for Gateway & Auth Header) // 2. API Client (Configured for Gateway & Auth Header)
single(named("apiClient")) { single(named("apiClient")) {
// Resolve TokenProvider lazily to avoid circular dependency issues during init
val tokenProvider: TokenProvider? = try { val tokenProvider: TokenProvider? = try {
get<TokenProvider>() get<TokenProvider>()
} catch (_: Throwable) { } catch (_: Throwable) {
println("[apiClient] Warning: No TokenProvider found in Koin")
null null
} }
HttpClient { HttpClient {
// JSON (kotlinx) configuration // JSON (kotlinx) configuration
install(ContentNegotiation) { install(ContentNegotiation) {
@@ -75,16 +78,10 @@ val networkModule = module {
exponentialDelay() exponentialDelay()
} }
// Manual Auth Header Injection (instead of Auth plugin) to support immediate logout // Base URL configuration
install(DefaultRequest) { defaultRequest {
val base = NetworkConfig.baseUrl.trimEnd('/') val base = NetworkConfig.baseUrl.trimEnd('/')
url(base) // Set base URL url(base)
// Inject Authorization header if token is present
val token = tokenProvider?.getAccessToken()
if (token != null) {
header("Authorization", "Bearer $token")
}
} }
// Logging for development // Logging for development
@@ -96,6 +93,22 @@ val networkModule = module {
} }
level = LogLevel.INFO level = LogLevel.INFO
} }
}.also { client ->
// Dynamic Auth Header Injection via HttpSend plugin
// This ensures we get the CURRENT token for each request
if (tokenProvider != null) {
client.plugin(HttpSend).intercept { request ->
try {
val token = tokenProvider.getAccessToken()
if (token != null) {
request.header("Authorization", "Bearer $token")
}
} catch (e: Exception) {
println("[apiClient] Error getting access token: $e")
}
execute(request)
}
}
} }
} }
} }
@@ -109,34 +109,6 @@ kotlin {
} }
} }
// ---------------------------------------------------------------------------
// SQLDelight WebWorker (OPFS) resource
// ---------------------------------------------------------------------------
// `:frontend:core:local-db` ships `sqlite.worker.js` as a JS resource.
// We need to ensure this worker file is available in the output directory so the browser can load it.
// The WASM file itself is handled by Webpack (via CopyWebpackPlugin in webpack.config.d/sqlite-config.js).
val copySqliteWorkerToWebpackSource by tasks.registering(Copy::class) {
val localDb = project(":frontend:core:local-db")
dependsOn(localDb.tasks.named("jsProcessResources"))
from(localDb.layout.buildDirectory.file("processedResources/js/main/sqlite.worker.js"))
// Root build directory where Kotlin JS packages are assembled.
// This is one of the directories served by webpack-dev-server for static content.
into(rootProject.layout.buildDirectory.dir("js/packages/${rootProject.name}-frontend-shells-meldestelle-portal/kotlin"))
}
// Ensure the worker is present for the development bundle.
tasks.named("jsBrowserDevelopmentWebpack") {
dependsOn(copySqliteWorkerToWebpackSource)
}
// Ensure the worker is present for the production bundle.
tasks.named("jsBrowserProductionWebpack") {
dependsOn(copySqliteWorkerToWebpackSource)
}
// KMP Compile-Optionen // KMP Compile-Optionen
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> { tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
compilerOptions { compilerOptions {
@@ -0,0 +1,122 @@
// 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);
}
@@ -4,6 +4,9 @@ const webpack = require('webpack');
const path = require('path'); const path = require('path');
const fs = require('fs'); const fs = require('fs');
console.log("SQLite Config: Current working directory (cwd):", process.cwd());
console.log("SQLite Config: __dirname:", __dirname);
config.resolve = config.resolve || {}; config.resolve = config.resolve || {};
config.resolve.fallback = config.resolve.fallback || {}; config.resolve.fallback = config.resolve.fallback || {};
config.resolve.alias = config.resolve.alias || {}; config.resolve.alias = config.resolve.alias || {};
@@ -24,32 +27,74 @@ try {
} }
// 3. Copy ALL sqlite3 assets (wasm, js, and auxiliary workers) // 3. Copy ALL sqlite3 assets (wasm, js, and auxiliary workers)
const copyPatterns = [];
if (fs.existsSync(sqliteBaseDir)) { if (fs.existsSync(sqliteBaseDir)) {
console.log("Copying sqlite3 assets from:", sqliteBaseDir); console.log("Copying sqlite3 assets from:", sqliteBaseDir);
config.plugins.push( copyPatterns.push({
new CopyWebpackPlugin({
patterns: [
{
from: sqliteBaseDir, from: sqliteBaseDir,
to: '.', // Copy to root of dist to: '.', // Copy to root of dist
globOptions: { globOptions: {
ignore: ['**/package.json'] // Don't copy package.json if present ignore: ['**/package.json']
}, },
noErrorOnMissing: true noErrorOnMissing: true
} });
]
})
);
} else { } else {
console.error("ERROR: sqlite3 base directory does not exist:", sqliteBaseDir); console.error("ERROR: sqlite3 base directory does not exist:", sqliteBaseDir);
} }
// 4. Alias sqlite3.wasm (still needed for some internal checks maybe) // 4. Copy sqlite.worker.js from source
// Try multiple strategies to find the file
// Strategy A: Relative to __dirname (webpack.config.d)
// ../../../core/local-db/src/jsMain/resources/sqlite.worker.js
const pathA = path.resolve(__dirname, '../../../core/local-db/src/jsMain/resources/sqlite.worker.js');
// Strategy B: Relative to process.cwd() (project root usually)
// ../../core/local-db/src/jsMain/resources/sqlite.worker.js (assuming cwd is meldestelle-portal)
const pathB = path.resolve(process.cwd(), '../../core/local-db/src/jsMain/resources/sqlite.worker.js');
// Strategy C: Hardcoded fallback based on typical structure
const pathC = path.resolve(__dirname, '../../../../core/local-db/src/jsMain/resources/sqlite.worker.js');
let workerSourcePath = null;
if (fs.existsSync(pathA)) {
workerSourcePath = pathA;
console.log("Found sqlite.worker.js at (Strategy A):", pathA);
} else if (fs.existsSync(pathB)) {
workerSourcePath = pathB;
console.log("Found sqlite.worker.js at (Strategy B):", pathB);
} else if (fs.existsSync(pathC)) {
workerSourcePath = pathC;
console.log("Found sqlite.worker.js at (Strategy C):", pathC);
} else {
console.error("ERROR: Could not find sqlite.worker.js in any expected location!");
console.error("Checked A:", pathA);
console.error("Checked B:", pathB);
console.error("Checked C:", pathC);
}
if (workerSourcePath) {
copyPatterns.push({
from: workerSourcePath,
to: 'sqlite.worker.js',
noErrorOnMissing: true
});
}
config.plugins.push(
new CopyWebpackPlugin({
patterns: copyPatterns
})
);
// 5. Alias sqlite3.wasm (still needed for some internal checks maybe)
const sqliteWasmPath = path.join(sqliteBaseDir, 'sqlite3.wasm'); const sqliteWasmPath = path.join(sqliteBaseDir, 'sqlite3.wasm');
config.resolve.alias['sqlite3.wasm'] = sqliteWasmPath; config.resolve.alias['sqlite3.wasm'] = sqliteWasmPath;
config.resolve.alias['./sqlite3.wasm'] = sqliteWasmPath; config.resolve.alias['./sqlite3.wasm'] = sqliteWasmPath;
// 5. Handle .wasm files // 6. Handle .wasm files
config.experiments = config.experiments || {}; config.experiments = config.experiments || {};
config.experiments.asyncWebAssembly = true; config.experiments.asyncWebAssembly = true;
@@ -69,11 +114,11 @@ config.module.rules.push({
type: 'webassembly/async' type: 'webassembly/async'
}); });
// 6. Ignore warnings // 7. Ignore warnings
config.ignoreWarnings = config.ignoreWarnings || []; config.ignoreWarnings = config.ignoreWarnings || [];
config.ignoreWarnings.push(/Critical dependency: the request of a dependency is an expression/); config.ignoreWarnings.push(/Critical dependency: the request of a dependency is an expression/);
// 7. Fix for "webpackEmptyContext" in sqlite3.mjs // 8. Fix for "webpackEmptyContext" in sqlite3.mjs
config.plugins.push( config.plugins.push(
new webpack.ContextReplacementPlugin( new webpack.ContextReplacementPlugin(
/@sqlite\.org\/sqlite-wasm/, /@sqlite\.org\/sqlite-wasm/,
@@ -84,7 +129,7 @@ config.plugins.push(
) )
); );
// 8. MIME types // 9. MIME types
config.devServer = config.devServer || {}; config.devServer = config.devServer || {};
config.devServer.devMiddleware = config.devServer.devMiddleware || {}; config.devServer.devMiddleware = config.devServer.devMiddleware || {};
config.devServer.devMiddleware.mimeTypes = { config.devServer.devMiddleware.mimeTypes = {