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:
@@ -1,122 +1,123 @@
|
||||
// Minimal debug worker
|
||||
console.log("Worker: sqlite.worker.js loaded. Starting initialization...");
|
||||
'use strict';
|
||||
|
||||
try {
|
||||
// We do NOT import from node_modules anymore to avoid Webpack bundling issues.
|
||||
// import sqlite3InitModule from '@sqlite.org/sqlite-wasm';
|
||||
// --- State ---
|
||||
let db = null;
|
||||
let isReady = false;
|
||||
let initError = null;
|
||||
const messageQueue = [];
|
||||
|
||||
// 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) => {
|
||||
// --- Message Handler ---
|
||||
self.onmessage = (event) => {
|
||||
if (!isReady) {
|
||||
console.log("Worker: Buffering message (DB not ready)", event.data);
|
||||
messageQueue.push(event);
|
||||
if (initError) {
|
||||
postMessage({id: event.data?.id, error: `Worker not initialized: ${initError}`});
|
||||
} else {
|
||||
messageQueue.push(event);
|
||||
}
|
||||
return;
|
||||
}
|
||||
processMessage(event);
|
||||
};
|
||||
};
|
||||
|
||||
function processMessage(event) {
|
||||
self.onerror = (event) => {
|
||||
console.error('[sqlite.worker] Uncaught error:', event.message, `${event.filename}:${event.lineno}`);
|
||||
};
|
||||
|
||||
// --- Message Processor ---
|
||||
function processMessage(event) {
|
||||
const data = event.data;
|
||||
if (!data) return;
|
||||
|
||||
try {
|
||||
switch (data && data.action) {
|
||||
switch (data.action) {
|
||||
case 'exec': {
|
||||
if (!data.sql) throw new Error('exec: Missing query string');
|
||||
if (!data.sql) throw new Error('exec: Missing sql string');
|
||||
const rows = [];
|
||||
db.exec({
|
||||
sql: data.sql,
|
||||
bind: data.params ?? [],
|
||||
rowMode: 'array',
|
||||
callback: (row) => rows.push(row)
|
||||
callback: (row) => rows.push(row),
|
||||
});
|
||||
return postMessage({id: data.id, results: {values: rows}});
|
||||
postMessage({id: data.id, results: {values: rows}});
|
||||
break;
|
||||
}
|
||||
case 'begin_transaction':
|
||||
db.exec('BEGIN TRANSACTION;');
|
||||
return postMessage({id: data.id, results: []});
|
||||
postMessage({id: data.id, results: []});
|
||||
break;
|
||||
case 'end_transaction':
|
||||
db.exec('END TRANSACTION;');
|
||||
return postMessage({id: data.id, results: []});
|
||||
postMessage({id: data.id, results: []});
|
||||
break;
|
||||
case 'rollback_transaction':
|
||||
db.exec('ROLLBACK TRANSACTION;');
|
||||
return postMessage({id: data.id, results: []});
|
||||
postMessage({id: data.id, results: []});
|
||||
break;
|
||||
default:
|
||||
throw new Error(`Unsupported action: ${data && data.action}`);
|
||||
throw new Error(`Unsupported action: ${data.action}`);
|
||||
}
|
||||
} catch (err) {
|
||||
console.error("Worker: Error processing message", err);
|
||||
return postMessage({id: data && data.id, error: err?.message ?? String(err)});
|
||||
console.error('[sqlite.worker] Error processing message:', err);
|
||||
postMessage({id: 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() {
|
||||
// --- Initialization ---
|
||||
async function init() {
|
||||
try {
|
||||
// 1. Load the sqlite3.js library manually via importScripts.
|
||||
console.log("Worker: Loading sqlite3.js via importScripts...");
|
||||
// Load sqlite3.js via importScripts (avoids Webpack bundling issues)
|
||||
try {
|
||||
importScripts('sqlite3.js');
|
||||
} catch (e) {
|
||||
throw new Error("Failed to importScripts('sqlite3.js'). Check if file exists at root. Error: " + e.message);
|
||||
throw new Error(`importScripts('sqlite3.js') failed – is the file served at root? ${e.message}`);
|
||||
}
|
||||
|
||||
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 not found after importScripts – sqlite3.js may be corrupt or wrong version.');
|
||||
}
|
||||
|
||||
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}`);
|
||||
// Fetch WASM binary manually so we control the URL and can detect failures early
|
||||
const wasmResponse = await fetch('sqlite3.wasm');
|
||||
if (!wasmResponse.ok) {
|
||||
throw new Error(`Failed to fetch sqlite3.wasm: ${wasmResponse.status} ${wasmResponse.statusText}`);
|
||||
}
|
||||
const wasmBinary = await response.arrayBuffer();
|
||||
console.log("Worker: sqlite3.wasm fetched successfully, size:", wasmBinary.byteLength);
|
||||
const wasmBinary = await wasmResponse.arrayBuffer();
|
||||
|
||||
console.log("Worker: Calling sqlite3InitModule with wasmBinary...");
|
||||
const sqlite3 = await self.sqlite3InitModule({
|
||||
print: console.log,
|
||||
printErr: console.error,
|
||||
wasmBinary: 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);
|
||||
console.log(`[sqlite.worker] Using persistent OPFS database: ${dbName}`);
|
||||
db = new sqlite3.oo1.OpfsDb(dbName);
|
||||
} else {
|
||||
console.warn("OPFS nicht verfügbar, Fallback auf In-Memory");
|
||||
console.warn('[sqlite.worker] OPFS not available – falling back to in-memory database');
|
||||
db = new sqlite3.oo1.DB(dbName);
|
||||
}
|
||||
|
||||
// Mark as ready and process queue
|
||||
// Flush buffered messages
|
||||
isReady = true;
|
||||
console.log("Worker: DB Ready. Processing " + messageQueue.length + " buffered messages.");
|
||||
console.log(`[sqlite.worker] Ready. Flushing ${messageQueue.length} buffered message(s).`);
|
||||
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.
|
||||
initError = e?.message ?? String(e);
|
||||
console.error('[sqlite.worker] Initialization failed:', e);
|
||||
|
||||
// Notify all buffered callers so they don't hang indefinitely
|
||||
while (messageQueue.length > 0) {
|
||||
const queued = messageQueue.shift();
|
||||
postMessage({id: queued.data?.id, error: `Worker initialization failed: ${initError}`});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
init();
|
||||
|
||||
} catch (e) {
|
||||
console.error("Critical Worker Error:", e);
|
||||
}
|
||||
|
||||
init();
|
||||
|
||||
Reference in New Issue
Block a user