From 89ee5373643d1c5cb664401de745109bf7bcb77c Mon Sep 17 00:00:00 2001
From: Reto Brunner <reto@labrat.space>
Date: Sat, 27 Aug 2022 13:41:52 +0200
Subject: [PATCH] sqlite: add run helper function

Extract the serialization logic into a single place and
consistently log errors to the console rather than a fire
and forget approach.
---
 server/plugins/messageStorage/sqlite.ts | 67 +++++++++++++++----------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/server/plugins/messageStorage/sqlite.ts b/server/plugins/messageStorage/sqlite.ts
index 193cf6dc..dda5e814 100644
--- a/server/plugins/messageStorage/sqlite.ts
+++ b/server/plugins/messageStorage/sqlite.ts
@@ -63,7 +63,7 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 
 		this.database = new sqlite3.Database(sqlitePath);
 		this.database.serialize(() => {
-			schema.forEach((line) => this.database.run(line));
+			schema.forEach((line) => this.run(line));
 
 			this.database.get(
 				"SELECT value FROM options WHERE name = 'schema_version'",
@@ -74,13 +74,10 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 
 					// New table
 					if (row === undefined) {
-						this.database.serialize(() =>
-							this.database.run(
-								"INSERT INTO options (name, value) VALUES ('schema_version', ?)",
-								currentSchemaVersion
-							)
+						this.run(
+							"INSERT INTO options (name, value) VALUES ('schema_version', ?)",
+							currentSchemaVersion
 						);
-
 						return;
 					}
 
@@ -100,11 +97,9 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 						`sqlite messages schema version is out of date (${storedSchemaVersion} < ${currentSchemaVersion}). Running migrations if any.`
 					);
 
-					this.database.serialize(() =>
-						this.database.run(
-							"UPDATE options SET value = ? WHERE name = 'schema_version'",
-							currentSchemaVersion
-						)
+					this.run(
+						"UPDATE options SET value = ? WHERE name = 'schema_version'",
+						currentSchemaVersion
 					);
 				}
 			);
@@ -145,15 +140,13 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 			return newMsg;
 		}, {});
 
-		this.database.serialize(() =>
-			this.database.run(
-				"INSERT INTO messages(network, channel, time, type, msg) VALUES(?, ?, ?, ?, ?)",
-				network.uuid,
-				channel.name.toLowerCase(),
-				msg.time.getTime(),
-				msg.type,
-				JSON.stringify(clonedMsg)
-			)
+		this.run(
+			"INSERT INTO messages(network, channel, time, type, msg) VALUES(?, ?, ?, ?, ?)",
+			network.uuid,
+			channel.name.toLowerCase(),
+			msg.time.getTime(),
+			msg.type,
+			JSON.stringify(clonedMsg)
 		);
 	}
 
@@ -162,12 +155,10 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 			return;
 		}
 
-		this.database.serialize(() =>
-			this.database.run(
-				"DELETE FROM messages WHERE network = ? AND channel = ?",
-				network.uuid,
-				channel.name.toLowerCase()
-			)
+		this.run(
+			"DELETE FROM messages WHERE network = ? AND channel = ?",
+			network.uuid,
+			channel.name.toLowerCase()
 		);
 	}
 
@@ -266,6 +257,28 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
 	canProvideMessages() {
 		return this.isEnabled;
 	}
+
+	private run(stmt: string, ...params: any[]) {
+		this.serialize_run(stmt, params).catch((err) =>
+			log.error(`failed to run ${stmt}`, String(err))
+		);
+	}
+
+	private serialize_run(stmt: string, params: any[]): Promise<void> {
+		return new Promise((resolve, reject) => {
+			this.database.serialize(() => {
+				this.database.run(stmt, params, (err) => {
+
+					if (err) {
+						reject(err);
+						return;
+					}
+
+					resolve();
+				});
+			});
+		});
+	}
 }
 
 // TODO: type any