mocode-software/meldestelle
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

chore(frontend): remove custom Webpack sqlite-wasm integration plugins and cleanup config

Browse Source 
- Deleted `dummy.js` and its usage for sqlite-wasm integration as custom Webpack adjustments are no longer necessary.
- Removed outdated Webpack configuration files: `ignore-sqlite-wasm.js`, `ignore-sqlite-wasm-critical-dependency.js`, and `sqljs-fix.js`.
- Introduced `sqlite-config.js` for simplified and streamlined sqlite-wasm and Skiko Webpack configuration.
- Minor code formatting adjustments across frontend modules for improved consistency.
This commit is contained in:
Stefan Mogeritsch
2026-01-26 20:37:23 +01:00
parent 29ad73b508
commit 3e587381ed
30 changed files with 1535 additions and 941 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/core/design-system/src/commonMain/kotlin/at/mocode/frontend/core/designsystem/components/Buttons.kt
+18 -18
View File
@@ -22,23 +22,23 @@ import at.mocode.frontend.core.designsystem.theme.Dimens
*/
@Composable
fun DenseButton(
text: String,
onClick: () -> Unit,
modifier: Modifier = Modifier,
enabled: Boolean = true,
containerColor: Color = MaterialTheme.colorScheme.primary
text: String,
onClick: () -> Unit,
modifier: Modifier = Modifier,
enabled: Boolean = true,
containerColor: Color = MaterialTheme.colorScheme.primary
) {
Button(
onClick = onClick,
enabled = enabled,
modifier = modifier.height(32.dp), // Fixe, kompakte Höhe
shape = MaterialTheme.shapes.small, // Nutzt unsere 4dp Rundung
colors = ButtonDefaults.buttonColors(containerColor = containerColor),
contentPadding = PaddingValues(horizontal = Dimens.SpacingM, vertical = 0.dp) // Wenig Padding
) {
Text(
text = text,
style = MaterialTheme.typography.labelMedium // Kleinere Schrift
)
}
Button(
onClick = onClick,
enabled = enabled,
modifier = modifier.height(32.dp), // Fixe, kompakte Höhe
shape = MaterialTheme.shapes.small, // Nutzt unsere 4dp Rundung
colors = ButtonDefaults.buttonColors(containerColor = containerColor),
contentPadding = PaddingValues(horizontal = Dimens.SpacingM, vertical = 0.dp) // Wenig Padding
) {
Text(
text = text,
style = MaterialTheme.typography.labelMedium // Kleinere Schrift
)
}
}
frontend/core/design-system/src/commonMain/kotlin/at/mocode/frontend/core/designsystem/components/Cards.kt
+15 -15
View File
@@ -21,22 +21,22 @@ import at.mocode.frontend.core.designsystem.theme.Dimens
*/
@Composable
fun DashboardCard(
modifier: Modifier = Modifier,
content: @Composable ColumnScope.() -> Unit
modifier: Modifier = Modifier,
content: @Composable ColumnScope.() -> Unit
) {
Card(
modifier = modifier,
shape = MaterialTheme.shapes.medium,
colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface
),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant), // Dünner Rahmen
elevation = CardDefaults.cardElevation(defaultElevation = 0.dp) // Kein Schatten
Card(
modifier = modifier,
shape = MaterialTheme.shapes.medium,
colors = CardDefaults.cardColors(
containerColor = MaterialTheme.colorScheme.surface
),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.outlineVariant), // Dünner Rahmen
elevation = CardDefaults.cardElevation(defaultElevation = 0.dp) // Kein Schatten
) {
Column(
modifier = Modifier.padding(Dimens.SpacingS) // Kompaktes Padding innen
) {
Column(
modifier = Modifier.padding(Dimens.SpacingS) // Kompaktes Padding innen
) {
content()
}
content()
}
}
}
frontend/core/design-system/src/commonMain/kotlin/at/mocode/frontend/core/designsystem/theme/AppTheme.kt
+60 -60
View File
@@ -18,89 +18,89 @@ import androidx.compose.ui.unit.sp
// Blau steht für Aktion/Information, Grau für Struktur.
private val LightColorScheme = lightColorScheme(
primary = Color(0xFF0052CC), // Enterprise Blue (stark)
onPrimary = Color.White,
primaryContainer = Color(0xFFDEEBFF),
onPrimaryContainer = Color(0xFF0052CC),
primary = Color(0xFF0052CC), // Enterprise Blue (stark)
onPrimary = Color.White,
primaryContainer = Color(0xFFDEEBFF),
onPrimaryContainer = Color(0xFF0052CC),
secondary = Color(0xFF2684FF), // Helleres Blau für Akzente
onSecondary = Color.White,
secondary = Color(0xFF2684FF), // Helleres Blau für Akzente
onSecondary = Color.White,
background = Color(0xFFF4F5F7), // Helles Grau (nicht hartes Weiß)
surface = Color.White,
onBackground = Color(0xFF172B4D), // Fast Schwarz (besser lesbar als #000)
onSurface = Color(0xFF172B4D),
background = Color(0xFFF4F5F7), // Helles Grau (nicht hartes Weiß)
surface = Color.White,
onBackground = Color(0xFF172B4D), // Fast Schwarz (besser lesbar als #000)
onSurface = Color(0xFF172B4D),
error = Color(0xFFDE350B),
onError = Color.White
error = Color(0xFFDE350B),
onError = Color.White
)
private val DarkColorScheme = darkColorScheme(
primary = Color(0xFF4C9AFF), // Helleres Blau auf Dunkel
onPrimary = Color(0xFF091E42),
primaryContainer = Color(0xFF0052CC),
onPrimaryContainer = Color.White,
primary = Color(0xFF4C9AFF), // Helleres Blau auf Dunkel
onPrimary = Color(0xFF091E42),
primaryContainer = Color(0xFF0052CC),
onPrimaryContainer = Color.White,
secondary = Color(0xFF2684FF),
onSecondary = Color.White,
secondary = Color(0xFF2684FF),
onSecondary = Color.White,
background = Color(0xFF1E1E1E), // Dunkles Grau (angenehmer als #000)
surface = Color(0xFF2C2C2C), // Panels heben sich leicht ab
onBackground = Color(0xFFEBECF0),
onSurface = Color(0xFFEBECF0),
background = Color(0xFF1E1E1E), // Dunkles Grau (angenehmer als #000)
surface = Color(0xFF2C2C2C), // Panels heben sich leicht ab
onBackground = Color(0xFFEBECF0),
onSurface = Color(0xFFEBECF0),
error = Color(0xFFFF5630),
onError = Color.Black
error = Color(0xFFFF5630),
onError = Color.Black
)
// --- 2. Formen (Shapes) ---
// Enterprise Apps nutzen oft weniger Rundung als Consumer Apps (seriöser).
private val AppShapes = Shapes(
small = RoundedCornerShape(Dimens.CornerRadiusS), // Buttons, Inputs
medium = RoundedCornerShape(Dimens.CornerRadiusM), // Cards, Dialogs
large = RoundedCornerShape(Dimens.CornerRadiusM)
small = RoundedCornerShape(Dimens.CornerRadiusS), // Buttons, Inputs
medium = RoundedCornerShape(Dimens.CornerRadiusM), // Cards, Dialogs
large = RoundedCornerShape(Dimens.CornerRadiusM)
)
// --- 3. Typografie ---
// wir setzen auf klare Hierarchie.
private val AppTypography = Typography(
titleLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Bold,
fontSize = 22.sp,
lineHeight = 28.sp
),
titleMedium = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.SemiBold,
fontSize = 16.sp,
lineHeight = 24.sp
),
bodyMedium = TextStyle( // Standard Text
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 14.sp,
lineHeight = 20.sp
),
labelSmall = TextStyle( // Für dichte Tabellen/Labels
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Medium,
fontSize = 11.sp,
lineHeight = 16.sp
)
titleLarge = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Bold,
fontSize = 22.sp,
lineHeight = 28.sp
),
titleMedium = TextStyle(
fontFamily = FontFamily.Default,
fontWeight = FontWeight.SemiBold,
fontSize = 16.sp,
lineHeight = 24.sp
),
bodyMedium = TextStyle( // Standard Text
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Normal,
fontSize = 14.sp,
lineHeight = 20.sp
),
labelSmall = TextStyle( // Für dichte Tabellen/Labels
fontFamily = FontFamily.Default,
fontWeight = FontWeight.Medium,
fontSize = 11.sp,
lineHeight = 16.sp
)
)
@Composable
fun AppTheme(
darkTheme: Boolean = false, // Kann später via Settings gesteuert werden
content: @Composable () -> Unit
darkTheme: Boolean = false, // Kann später via Settings gesteuert werden
content: @Composable () -> Unit
) {
val colorScheme = if (darkTheme) DarkColorScheme else LightColorScheme
val colorScheme = if (darkTheme) DarkColorScheme else LightColorScheme
MaterialTheme(
colorScheme = colorScheme,
shapes = AppShapes,
typography = AppTypography,
content = content
)
MaterialTheme(
colorScheme = colorScheme,
shapes = AppShapes,
typography = AppTypography,
content = content
)
}
frontend/core/design-system/src/commonMain/kotlin/at/mocode/frontend/core/designsystem/theme/Dimens.kt
+13 -13
View File
@@ -8,20 +8,20 @@ import androidx.compose.ui.unit.dp
* Wenn wir den Abstand global ändern wollen, machen wir das nur hier.
*/
object Dimens {
// Spacing (Abstände)
val SpacingXS = 4.dp // Sehr eng (für Tabellen, dichte Listen)
val SpacingS = 8.dp // Standard Abstand zwischen Elementen
val SpacingM = 16.dp // Abstand für Sektionen
val SpacingL = 24.dp // Außenabstand für Screens
// Spacing (Abstände)
val SpacingXS = 4.dp // Sehr eng (für Tabellen, dichte Listen)
val SpacingS = 8.dp // Standard Abstand zwischen Elementen
val SpacingM = 16.dp // Abstand für Sektionen
val SpacingL = 24.dp // Außenabstand für Screens
// Sizes (Größen)
val IconSizeS = 16.dp
val IconSizeM = 24.dp
// Sizes (Größen)
val IconSizeS = 16.dp
val IconSizeM = 24.dp
// Borders
val BorderThin = 1.dp
// Borders
val BorderThin = 1.dp
// Corner Radius (Ecken)
val CornerRadiusS = 4.dp // Leicht abgerundet (Enterprise Look)
val CornerRadiusM = 8.dp
// Corner Radius (Ecken)
val CornerRadiusS = 4.dp // Leicht abgerundet (Enterprise Look)
val CornerRadiusM = 8.dp
}
frontend/core/local-db/src/commonMain/kotlin/at/mocode/frontend/core/localdb/DatabaseDriverFactory.kt
+1 -1
View File
@@ -4,5 +4,5 @@ import app.cash.sqldelight.db.SqlDriver
@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
expect class DatabaseDriverFactory() {
suspend fun createDriver(): SqlDriver
suspend fun createDriver(): SqlDriver
}
frontend/core/local-db/src/jsMain/kotlin/at/mocode/frontend/core/localdb/DatabaseDriverFactory.js.kt
+14 -12
View File
@@ -6,23 +6,25 @@ import org.w3c.dom.Worker
@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
actual class DatabaseDriverFactory {
actual suspend fun createDriver(): SqlDriver {
// 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 driver = WebWorkerDriver(worker)
actual suspend fun createDriver(): SqlDriver {
// 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 driver = WebWorkerDriver(worker)
// Initialize schema asynchronously
AppDatabase.Schema.create(driver).await()
// Initialize schema asynchronously
AppDatabase.Schema.create(driver).await()
return driver
}
return driver
}
}
// Helper function to create the worker using proper URL resolution
private fun createWorker(): Worker {
return js("""
return js(
"""
new Worker(new URL('sqlite.worker.js', import.meta.url), { type: 'module' })
""")
"""
)
}
frontend/core/local-db/src/jsMain/resources/sqlite.worker.js
+92 -86
View File
@@ -1,103 +1,109 @@
import sqlite3InitModule from '@sqlite.org/sqlite-wasm';
// We do NOT import from node_modules anymore to avoid Webpack bundling issues.
// import sqlite3InitModule from '@sqlite.org/sqlite-wasm';
console.log("Worker: sqlite.worker.js loaded. Starting initialization...");
// Minimal worker protocol compatible with SQLDelight's `web-worker-driver`.
// Mirrors the message format used by SQLDelight's `sqljs.worker.js` implementation.
function runWorker({ driver }) {
console.log("Worker: runWorker called");
let db = null;
const open = (name) => {
console.log("Worker: Opening database", name);
db = driver.open(name);
};
function runWorker({driver}) {
console.log("Worker: runWorker called");
let db = null;
const open = (name) => {
console.log("Worker: Opening database", name);
db = driver.open(name);
};
// Open once with the default database name expected by SQLDelight.
open('app.db');
// Open once with the default database name expected by SQLDelight.
open('app.db');
self.onmessage = (event) => {
const data = event.data;
try {
switch (data && data.action) {
case 'exec': {
if (!data.sql) throw new Error('exec: Missing query string');
// sqlite-wasm oo1 DB supports `.exec(...)`.
// We intentionally return only `values` which is sufficient for SQLDelight.
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.onmessage = (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)});
}
};
}
// Error handling wrapper
self.onerror = function(event) {
console.error("Error in Web Worker (onerror):", event.message, event.filename, event.lineno);
// Optionally, send the error back to the main thread
self.postMessage({ type: 'error', message: event.message, filename: event.filename, lineno: event.lineno });
self.onerror = function (event) {
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});
};
// Manually fetch the WASM file to bypass Webpack/sqlite-wasm loading issues
async function init() {
try {
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);
try {
// 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...");
importScripts('sqlite3.js');
console.log("Worker: Calling sqlite3InitModule with wasmBinary...");
const sqlite3 = await sqlite3InitModule({
print: console.log,
printErr: console.error,
wasmBinary: wasmBinary // Provide the binary directly!
});
console.log("Worker: sqlite3InitModule resolved successfully");
const opfsAvailable = 'opfs' in sqlite3;
console.log("Worker: OPFS available:", opfsAvailable);
runWorker({
driver: {
open: (name) => {
if (opfsAvailable) {
console.log("Initialisiere persistente OPFS Datenbank: " + name);
return new sqlite3.oo1.OpfsDb(name);
} else {
console.warn("OPFS nicht verfügbar, Fallback auf In-Memory");
return new sqlite3.oo1.DB(name);
}
}
}
});
} catch (e) {
console.error("Database initialization error in worker:", e);
self.postMessage({ type: 'error', message: 'Database initialization failed: ' + e.message });
// After importScripts, `sqlite3InitModule` should be available globally.
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);
runWorker({
driver: {
open: (name) => {
if (opfsAvailable) {
console.log("Initialisiere persistente OPFS Datenbank: " + name);
return new sqlite3.oo1.OpfsDb(name);
} else {
console.warn("OPFS nicht verfügbar, Fallback auf In-Memory");
return new sqlite3.oo1.DB(name);
}
}
}
});
} catch (e) {
console.error("Database initialization error in worker:", e);
self.postMessage({type: 'error', message: 'Database initialization failed: ' + e.message});
}
}
init();
frontend/core/local-db/src/jvmMain/kotlin/at/mocode/frontend/core/localdb/DatabaseDriverFactory.jvm.kt
+23 -22
View File
@@ -4,31 +4,32 @@ import app.cash.sqldelight.db.SqlDriver
import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
import java.io.File
@Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
actual class DatabaseDriverFactory {
actual suspend fun createDriver(): SqlDriver {
// For desktop, we use a persistent file database
// In dev mode, we might want to use a temporary file or user home
val dbFile = File(System.getProperty("user.home"), ".meldestelle/app_database.db")
dbFile.parentFile.mkdirs()
actual suspend fun createDriver(): SqlDriver {
// For desktop, we use a persistent file database
// In dev mode, we might want to use a temporary file or user home
val dbFile = File(System.getProperty("user.home"), ".meldestelle/app_database.db")
dbFile.parentFile.mkdirs()
val driver = JdbcSqliteDriver("jdbc:sqlite:${dbFile.absolutePath}")
val driver = JdbcSqliteDriver("jdbc:sqlite:${dbFile.absolutePath}")
// Schema creation/migration needs to be handled carefully.
// For now, we just create it if it doesn't exist.
// In a real app, we'd check version and migrate.
// Since generateAsync=true, the Schema.create signature might be suspend or return AsyncResult.
// However, JdbcSqliteDriver is synchronous. We might need to wrap or await.
// But wait! Schema.create(driver) returns void or Unit usually.
// Let's check the generated code later. For now, we assume standard behavior.
// Schema creation/migration needs to be handled carefully.
// For now, we just create it if it doesn't exist.
// In a real app, we'd check version and migrate.
// Since generateAsync=true, the Schema.create signature might be suspend or return AsyncResult.
// However, JdbcSqliteDriver is synchronous. We might need to wrap or await.
// But wait! Schema.create(driver) returns void or Unit usually.
// Let's check the generated code later. For now, we assume standard behavior.
try {
AppDatabase.Schema.create(driver).await()
} catch (e: Exception) {
// Schema might already exist.
// SQLDelight doesn't have "createIfNotExists" built-in easily without version check.
// We'll leave this simple for now and refine with proper migration logic later.
}
return driver
try {
AppDatabase.Schema.create(driver).await()
} catch (e: Exception) {
// Schema might already exist.
// SQLDelight doesn't have "createIfNotExists" built-in easily without version check.
// We'll leave this simple for now and refine with proper migration logic later.
}
return driver
}
}
frontend/core/local-db/src/wasmJsMain/resources/sqlite.worker.js
+66 -66
View File
@@ -2,82 +2,82 @@ import sqlite3InitModule from '@sqlite.org/sqlite-wasm';
// Minimal worker protocol compatible with SQLDelight's `web-worker-driver`.
// Mirrors the message format used by SQLDelight's `sqljs.worker.js` implementation.
function runWorker({ driver }) {
let db = null;
const open = (name) => {
db = driver.open(name);
};
function runWorker({driver}) {
let db = null;
const open = (name) => {
db = driver.open(name);
};
// Open once with the default database name expected by SQLDelight.
open('app.db');
// Open once with the default database name expected by SQLDelight.
open('app.db');
self.onmessage = (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) {
return postMessage({ id: data && data.id, error: err?.message ?? String(err) });
self.onmessage = (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) {
return postMessage({id: data && data.id, error: err?.message ?? String(err)});
}
};
}
// Error handling wrapper
self.onerror = function(event) {
console.error("Error in Web Worker:", event.message, event.filename, event.lineno);
// Optionally, send the error back to the main thread
self.postMessage({ type: 'error', message: event.message, filename: event.filename, lineno: event.lineno });
self.onerror = function (event) {
console.error("Error in Web Worker:", event.message, event.filename, event.lineno);
// Optionally, send the error back to the main thread
self.postMessage({type: 'error', message: event.message, filename: event.filename, lineno: event.lineno});
};
try {
sqlite3InitModule({
print: console.log,
printErr: console.error,
}).then((sqlite3) => {
try {
const opfsAvailable = 'opfs' in sqlite3;
sqlite3InitModule({
print: console.log,
printErr: console.error,
}).then((sqlite3) => {
try {
const opfsAvailable = 'opfs' in sqlite3;
runWorker({
driver: {
open: (name) => {
if (opfsAvailable) {
console.log("Initialisiere persistente OPFS Datenbank: " + name);
return new sqlite3.oo1.OpfsDb(name);
} else {
console.warn("OPFS nicht verfügbar, Fallback auf In-Memory");
return new sqlite3.oo1.DB(name);
}
}
}
});
} catch (e) {
console.error("Database initialization error in worker (inner):", e);
self.postMessage({ type: 'error', message: 'Database initialization failed (inner): ' + e.message });
runWorker({
driver: {
open: (name) => {
if (opfsAvailable) {
console.log("Initialisiere persistente OPFS Datenbank: " + name);
return new sqlite3.oo1.OpfsDb(name);
} else {
console.warn("OPFS nicht verfügbar, Fallback auf In-Memory");
return new sqlite3.oo1.DB(name);
}
}
}
});
});
} catch (e) {
console.error("Database initialization error in worker (inner):", e);
self.postMessage({type: 'error', message: 'Database initialization failed (inner): ' + e.message});
}
});
} catch (e) {
console.error("Database initialization error in worker (outer):", e);
self.postMessage({ type: 'error', message: 'Database initialization failed (outer): ' + e.message });
console.error("Database initialization error in worker (outer):", e);
self.postMessage({type: 'error', message: 'Database initialization failed (outer): ' + e.message});
}
frontend/core/navigation/src/commonTest/kotlin/at/mocode/frontend/core/navigation/DeepLinkHandlerTest.kt
+3 -1
View File
@@ -8,7 +8,9 @@ import kotlin.test.assertTrue
private class FakeNav : NavigationPort {
var last: String? = null
override fun navigateTo(route: String) { last = route }
override fun navigateTo(route: String) {
last = route
}
}
private class FakeUserProvider(private val user: User?) : CurrentUserProvider {
frontend/core/network/src/commonMain/kotlin/at/mocode/frontend/core/network/NetworkModule.kt
+7 -3
View File
@@ -11,7 +11,7 @@ import org.koin.core.qualifier.named
import org.koin.dsl.module
/**
* Simple token provider interface so core network module does not depend on auth-feature.
* Simple token provider interface so the core network module does not depend on auth-feature.
*/
interface TokenProvider {
fun getAccessToken(): String?
@@ -41,7 +41,11 @@ val networkModule = module {
// 2. API Client (Configured for Gateway & Auth Header)
single(named("apiClient")) {
val tokenProvider: TokenProvider? = try { get<TokenProvider>() } catch (_: Throwable) { null }
val tokenProvider: TokenProvider? = try {
get<TokenProvider>()
} catch (_: Throwable) {
null
}
HttpClient {
// JSON (kotlinx) configuration
install(ContentNegotiation) {
@@ -79,7 +83,7 @@ val networkModule = module {
// Inject Authorization header if token is present
val token = tokenProvider?.getAccessToken()
if (token != null) {
header("Authorization", "Bearer $token")
header("Authorization", "Bearer $token")
}
}
frontend/core/network/src/wasmJsMain/kotlin/at/mocode/frontend/core/network/PlatformConfig.wasmJs.kt
+6 -4
View File
@@ -13,9 +13,9 @@ actual object PlatformConfig {
// In Wasm, we can access a window directly if we are in the browser main thread.
// However, we need to be careful about exceptions.
val origin = try {
window.location.origin
window.location.origin
} catch (e: Throwable) {
null
null
}
if (!origin.isNullOrBlank()) return origin.removeSuffix("/")
@@ -28,9 +28,11 @@ actual object PlatformConfig {
// Helper function for JS interop in Wasm
// Kotlin/Wasm does not support 'dynamic' type or complex js() blocks inside functions.
// We must use top-level external functions or simple js() expressions.
private fun getGlobalApiBaseUrl(): String = js("""
private fun getGlobalApiBaseUrl(): String = js(
"""
(function() {
var global = typeof globalThis !== 'undefined' ? globalThis : (typeof window !== 'undefined' ? window : (typeof self !== 'undefined' ? self : {}));
return (global.API_BASE_URL && typeof global.API_BASE_URL === 'string') ? global.API_BASE_URL : "";
})()
""")
"""
)