@peerbit/indexer-sqlite3 1.1.4 → 1.2.0

package/src/sqlite3-messages.worker.ts

@@ -24,6 +24,10 @@ interface Close extends Message {
 	type: "close";
 }
 
+interface Drop extends Message {
+	type: "drop";
+}
+
 interface Open extends Message {
 	type: "open";
 }
@@ -107,6 +111,7 @@ export type DatabaseMessages =
 	| Exec
 	| Prepare
 	| Close
+	| Drop
 	| Open
 	| Run
 	| Status;

package/src/sqlite3.browser.ts

@@ -166,6 +166,14 @@ class ProxyDatabase implements IDatabase {
 		});
 	}
 
+	async drop() {
+		return this.send({
+			type: "drop",
+			id: uuid(),
+			databaseId: this.databaseId,
+		});
+	}
+
 	async status() {
 		return this.send<"open" | "closed">({
 			type: "status",

package/src/sqlite3.ts

@@ -8,6 +8,7 @@ import type {
 let create = async (directory?: string) => {
 	let db: DB.Database | undefined = undefined;
 	let statements: Map<string, IStatement> = new Map();
+	let dbFileName: string;
 
 	let close = () => {
 		for (const stmt of statements.values()) {
@@ -20,26 +21,35 @@ let create = async (directory?: string) => {
 			db = undefined;
 		}
 	};
+	let drop = () => {
+		if (db && !db?.memory) {
+			fs.rmSync(dbFileName);
+			db = undefined;
+		}
+		return close();
+	};
 	let open = () => {
-		if (db) {
+		if (db?.open) {
 			return db;
 		}
 
-		let dbFileName: string;
-		if (directory) {
-			// if directory is provided, check if directory exist, if not create it
-			if (!fs.existsSync(directory)) {
-				fs.mkdirSync(directory, { recursive: true });
+		if (!db) {
+			if (directory) {
+				// if directory is provided, check if directory exist, if not create it
+				if (!fs.existsSync(directory)) {
+					fs.mkdirSync(directory, { recursive: true });
+				}
+				dbFileName = `${directory}/db.sqlite`;
+			} else {
+				dbFileName = ":memory:";
 			}
-			dbFileName = `${directory}/db.sqlite`;
-		} else {
-			dbFileName = ":memory:";
+
+			db = new DB(dbFileName, {
+				fileMustExist: false,
+				readonly: false /* , verbose: (message) => console.log(message)  */,
+			});
 		}
 
-		db = new DB(dbFileName, {
-			fileMustExist: false,
-			readonly: false /* , verbose: (message) => console.log(message)  */,
-		});
 		// TODO this test makes things faster, but for benchmarking it might yield wierd results where some runs are faster than others
 		db.pragma("journal_mode = WAL");
 		db.pragma("foreign_keys = on");
@@ -69,6 +79,7 @@ let create = async (directory?: string) => {
 		},
 		statements,
 		close,
+		drop,
 		open,
 		status: () => (db ? "open" : "closed"),
 	} as IDatabase; // TODO fix this

package/src/sqlite3.wasm.ts

@@ -110,6 +110,15 @@ const create = async (directory?: string) => {
 		await sqliteDb?.close();
 		sqliteDb = undefined;
 	};
+	let dbFileName: string;
+
+	let drop = async () => {
+		if (poolUtil && dbFileName != null) {
+			poolUtil.unlink(dbFileName);
+		}
+
+		return close();
+	};
 	let open = async () => {
 		if (sqliteDb) {
 			return sqliteDb;
@@ -119,7 +128,7 @@ const create = async (directory?: string) => {
 			// TODO show warning if directory is not absolute?
 			directory = directory.replace(/^\./, "");
 
-			let dbFileName = `${directory}/db.sqlite`;
+			dbFileName = `${directory}/db.sqlite`;
 
 			poolUtil =
 				poolUtil ||
@@ -143,6 +152,7 @@ const create = async (directory?: string) => {
 			return sqliteDb!.exec(sql);
 		},
 		open,
+		drop,
 		prepare: async (sql: string, id?: string) => {
 			if (id == null) {
 				id = uuid();

package/src/sqlite3.worker.ts

@@ -21,7 +21,9 @@ class SqliteWorkerHandler {
 				if (message.type === "close") {
 					return; // ignore close message if database is not found
 				}
-
+				if (message.type === "drop") {
+					return; // ignore close message if database is not found
+				}
 				if (message.type === "status") {
 					return "closed";
 				}
@@ -45,6 +47,9 @@ class SqliteWorkerHandler {
 			} else if (message.type === "close") {
 				await db.close();
 				this.databases.delete(message.databaseId);
+			} else if (message.type === "drop") {
+				await db.drop();
+				this.databases.delete(message.databaseId);
 			} else if (message.type === "open") {
 				await db.open();
 				this.databases.set(message.databaseId, db);

package/src/types.ts

@@ -8,6 +8,7 @@ export type Database = {
 	exec: (sql: string) => Promise<any> | any;
 	prepare: (sql: string, id?: string) => Promise<Statement> | Statement;
 	close: (err?: (err: any) => any) => Promise<any> | any;
+	drop: () => Promise<any> | any;
 	open(): Promise<any> | any;
 	statements: {
 		get: (id: string) => Statement | undefined;