add handler to query storages

Author: phartenfeller

package.json

@@ -13,26 +13,26 @@
 	},
 	"devDependencies": {
 		"@rgossiaux/svelte-headlessui": "^1.0.2",
-		"@sveltejs/adapter-auto": "^2.0.0",
-		"@sveltejs/kit": "^1.15.0",
+		"@sveltejs/adapter-auto": "^2.0.1",
+		"@sveltejs/kit": "^1.16.2",
 		"@types/better-sqlite3": "^7.6.4",
-		"@typescript-eslint/eslint-plugin": "^5.57.0",
-		"@typescript-eslint/parser": "^5.57.0",
+		"@typescript-eslint/eslint-plugin": "^5.59.2",
+		"@typescript-eslint/parser": "^5.59.2",
 		"autoprefixer": "^10.4.14",
-		"eslint": "^8.37.0",
+		"eslint": "^8.40.0",
 		"eslint-config-prettier": "^8.8.0",
 		"eslint-plugin-svelte3": "^4.0.0",
-		"postcss": "^8.4.21",
-		"prettier": "^2.8.7",
+		"postcss": "^8.4.23",
+		"prettier": "^2.8.8",
 		"prettier-plugin-svelte": "^2.10.0",
-		"svelte": "^3.58.0",
-		"svelte-check": "^3.1.4",
-		"tailwindcss": "^3.3.1",
+		"svelte": "^3.59.0",
+		"svelte-check": "^3.3.1",
+		"tailwindcss": "^3.3.2",
 		"tslib": "^2.5.0",
-		"typescript": "^5.0.3",
-		"vite": "^4.2.1",
+		"typescript": "^5.0.4",
+		"vite": "^4.3.5",
 		"vite-plugin-cross-origin-isolation": "^0.1.6",
-		"vite-plugin-mkcert": "^1.14.0"
+		"vite-plugin-mkcert": "^1.15.0"
 	},
 	"type": "module",
 	"packageManager": "yarn@3.5.0",

src/lib/sqlite/dataApi.ts

@@ -0,0 +1,24 @@
+import { sendMsgToWorker } from './messageBus';
+import {
+	WorkerMessageTypes,
+	type DataRow,
+	type QueryRequestData,
+	type QueryResponseData
+} from './types';
+
+export async function runQuery(sql: string): Promise<DataRow[]> {
+	const res = await sendMsgToWorker({
+		storageId: 'generic',
+		type: WorkerMessageTypes.QUERY,
+		data: {
+			sql: sql
+		} as QueryRequestData,
+		expectedType: WorkerMessageTypes.QUERY_RESPONSE
+	});
+
+	const data = res.data as QueryResponseData;
+
+	if (data?.errorMsg) throw new Error(data.errorMsg);
+
+	return data.rows;
+}

src/lib/sqlite/initStorages.ts

@@ -65,6 +65,33 @@ async function fillStorage(storage: string, structure: TableStructure) {
 	console.timeEnd(`fillStorage-${storage}`);
 }
 
+const readyStorages = new Set<string>();
+const storageCbs = new Map<string, (() => void)[]>();
+
+function storageIsReady(storageId: string) {
+	readyStorages.add(storageId);
+
+	if (storageCbs.has(storageId)) {
+		const cbs = storageCbs.get(storageId);
+		cbs?.forEach((cb) => cb());
+		storageCbs.delete(storageId);
+	}
+}
+
+export function waitTillStroageReady(storageId: string) {
+	return new Promise<void>((resolve) => {
+		if (readyStorages.has(storageId)) {
+			resolve();
+		} else {
+			if (!storageCbs.has(storageId)) {
+				storageCbs.set(storageId, [resolve]);
+			} else {
+				storageCbs.get(storageId)?.push(resolve);
+			}
+		}
+	});
+}
+
 export default async function initStorages() {
 	for (const storageId of storages) {
 		const res = (await sendMsgToWorker({
@@ -89,5 +116,7 @@ export default async function initStorages() {
 			await createStorage(storageId, structure);
 			await fillStorage(storageId, structure);
 		}
+
+		storageIsReady(storageId);
 	}
 }

src/lib/sqlite/types.ts

@@ -8,7 +8,9 @@ export enum WorkerMessageTypes {
 	CREATE_TABLE = 'CREATE_TABLE',
 	CREATE_TABLE_RESPONSE = 'CREATE_TABLE_RESPONSE',
 	FILL_STORAGE = 'FILL_STORAGE',
-	FILL_STORAGE_RESPONSE = 'FILL_STORAGE_RESPONSE'
+	FILL_STORAGE_RESPONSE = 'FILL_STORAGE_RESPONSE',
+	QUERY = 'QUERY',
+	QUERY_RESPONSE = 'QUERY_RESPONSE'
 }
 
 export type DataRow = { [key: string]: string | number | boolean | null };
@@ -43,3 +45,12 @@ export type FillStorageRequestData = {
 export type FillStorageResponseData = {
 	errorMsg?: string;
 };
+
+export type QueryRequestData = {
+	sql: string;
+};
+
+export type QueryResponseData = {
+	rows: DataRow[];
+	errorMsg?: string;
+};

src/lib/sqlite/worker/handleQuery.ts

@@ -0,0 +1,34 @@
+import getErrorMessage from '$lib/util/getErrorMsg';
+import type { DataRow, QueryRequestData, QueryResponseData, WorkerMessage } from '../types';
+import { db } from './initDb';
+
+export function handleQuery(msg: WorkerMessage<QueryRequestData>): QueryResponseData {
+	try {
+		console.log('sql', msg.data);
+
+		let data: DataRow[] = [];
+
+		try {
+			db.transaction(() => {
+				data = db.selectObjects(msg.data.sql);
+				throw new Error('force rollback');
+			});
+		} catch (err) {
+			if (getErrorMessage(err) !== 'force rollback') {
+				throw err;
+			}
+		}
+
+		return {
+			rows: data
+		};
+	} catch (err) {
+		const msg = `Error running query: ${err}`;
+		console.error(msg);
+
+		return {
+			rows: [],
+			errorMsg: msg
+		};
+	}
+}

src/lib/sqlite/worker/worker.ts

@@ -6,8 +6,11 @@ import {
 	type CreateTableResponseData,
 	type CreateTableRequestData,
 	type FillStorageRequestData,
-	type FillStorageResponseData
+	type FillStorageResponseData,
+	type QueryRequestData,
+	type QueryResponseData
 } from '../types';
+import { handleQuery } from './handleQuery';
 import { initDb } from './initDb';
 import { handleCreateTable, handleFillStorage, handleTableExists } from './storageHandlers';
 
@@ -23,7 +26,7 @@ function sendMsgToMain(obj: WorkerMessage<unknown>) {
 
 		switch (data.type) {
 			case WorkerMessageTypes.INIT_DB:
-				await import('../jswasm/sqlite3.mjs');
+				await import('../jswasm/sqlite3-bundler-friendly.mjs');
 
 				const initRes = await initDb();
 				console.log('worker initDb result:', initRes);
@@ -79,6 +82,18 @@ function sendMsgToMain(obj: WorkerMessage<unknown>) {
 				sendMsgToMain(fillStorageResult);
 				break;
 
+			case WorkerMessageTypes.QUERY:
+				const queryData = await handleQuery(data as WorkerMessage<QueryRequestData>);
+				const queryResult: WorkerMessage<QueryResponseData> = {
+					type: WorkerMessageTypes.QUERY_RESPONSE,
+					messageId: data.messageId,
+					storageId: data.storageId,
+					data: queryData
+				};
+
+				sendMsgToMain(queryResult);
+				break;
+
 			default:
 				throw new Error(`Unknown message type: ${data.type}`);
 		}

src/lib/util/getErrorMsg.ts

@@ -0,0 +1,4 @@
+export default function getErrorMessage(error: unknown) {
+	if (error instanceof Error) return error.message;
+	return String(error);
+}

src/routes/+page.svelte

@@ -1,2 +1,22 @@
-<h1 class="text-5xl text-teal-500">Welcome to SvelteKit</h1>
-<p>Visit <a href="https://kit.svelte.dev">kit.svelte.dev</a> to read the documentation</p>
+<script lang="ts">
+	import { runQuery } from '$lib/sqlite/dataApi';
+	import { waitTillStroageReady } from '$lib/sqlite/initStorages';
+	import { onMount } from 'svelte';
+
+	let storageReady = false;
+
+	onMount(async () => {
+		await waitTillStroageReady('customers_v1');
+		storageReady = true;
+		const data = await runQuery(`update customers_v1 set company = 'xyz' where 1 = 1`);
+		console.log(data);
+		const data2 = await runQuery('SELECT * FROM customers_v1 limit 10');
+		console.log(data2);
+	});
+</script>
+
+<h1 class="text-5xl text-teal-500">SvelteKit Offline SQLite</h1>
+
+<div>
+	Storage Ready: {storageReady ? 'true' : 'false'}
+</div>