Fix "delete and restart" after database error

signalapp · Jul 10, 2021 · 455820a · 455820a
1 parent 9c48a95
commit 455820a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/main.js b/main.js
@@ -1318,7 +1318,7 @@ app.on('ready', async () => {
         `Database startup error:\n\n${redactAll(sqlError.stack)}`
       );
     } else {
-      await sql.sqlCall('removeDB', []);
+      await sql.removeDB();
       removeUserConfig();
       app.relaunch();
     }

diff --git a/ts/sql/main.ts b/ts/sql/main.ts
@@ -22,6 +22,9 @@ export type WorkerRequest =
   | {
       readonly type: 'close';
     }
+  | {
+      readonly type: 'removeDB';
+    }
   | {
       readonly type: 'sqlCall';
       readonly method: string;
@@ -117,6 +120,10 @@ export class MainSQL {
     await this.onExit;
   }
 
+  public async removeDB(): Promise<void> {
+    await this.send({ type: 'removeDB' });
+  }
+
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public async sqlCall(method: string, args: ReadonlyArray<any>): Promise<any> {
     if (this.onReady) {

diff --git a/ts/sql/mainWorker.ts b/ts/sql/mainWorker.ts
@@ -39,6 +39,13 @@ port.on('message', async ({ seq, request }: WrappedWorkerRequest) => {
       return;
     }
 
+    if (request.type === 'removeDB') {
+      await db.removeDB();
+
+      respond(seq, undefined, undefined);
+      return;
+    }
+
     if (request.type === 'sqlCall') {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const method = (db as any)[request.method];