diff --git a/package.json b/package.json index d13860a793..e267399aeb 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "array-move": "2.1.0", "axe-core": "4.1.4", "backbone": "1.4.0", - "better-sqlite3": "https://github.com/signalapp/better-sqlite3#4f66ee7b85477016dd0b2c3d2f13dcb60abd452e", + "better-sqlite3": "https://github.com/signalapp/better-sqlite3#b287153a5c6a5ac77f1e70df75d245e7a6e2286d", "bezier-easing": "2.1.0", "blob-util": "2.0.2", "blueimp-load-image": "5.14.0", @@ -195,7 +195,7 @@ "@storybook/addons": "5.1.11", "@storybook/react": "5.1.11", "@types/backbone": "1.4.5", - "@types/better-sqlite3": "7.4.0", + "@types/better-sqlite3": "7.5.0", "@types/blueimp-load-image": "5.14.1", "@types/chai": "4.2.18", "@types/chai-as-promised": "7.1.4", diff --git a/patches/@types+better-sqlite3+7.4.0.patch b/patches/@types+better-sqlite3+7.4.0.patch deleted file mode 100644 index a90fad55e9..0000000000 --- a/patches/@types+better-sqlite3+7.4.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/node_modules/@types/better-sqlite3/index.d.ts b/node_modules/@types/better-sqlite3/index.d.ts -index d6e4309..5948fd0 100755 ---- a/node_modules/@types/better-sqlite3/index.d.ts -+++ b/node_modules/@types/better-sqlite3/index.d.ts -@@ -84,6 +84,7 @@ declare namespace BetterSqlite3 { - prototype: Database; - - SqliteError: typeof SqliteError; -+ setCorruptionLogger(fn: (message: string) => void): void; - } - } - diff --git a/ts/sql/Client.ts b/ts/sql/Client.ts index f7a892c0fb..42c2e0de47 100644 --- a/ts/sql/Client.ts +++ b/ts/sql/Client.ts @@ -592,10 +592,7 @@ function makeChannel(fnName: string) { 'Detected sql corruption in renderer process. ' + `Restarting the application immediately. Error: ${error.message}` ); - ipc?.send( - 'database-error', - `${error.stack}\n${Server.getCorruptionLog()}` - ); + ipc?.send('database-error', error.stack); } log.error( `Renderer SQL channel job (${fnName}) error ${error.message}` diff --git a/ts/sql/Interface.ts b/ts/sql/Interface.ts index 411d743988..e4660e016d 100644 --- a/ts/sql/Interface.ts +++ b/ts/sql/Interface.ts @@ -644,7 +644,6 @@ export type ServerInterface = DataInterface & { // Server-only - getCorruptionLog: () => string; initialize: (options: { configDir: string; key: string; diff --git a/ts/sql/Server.ts b/ts/sql/Server.ts index ad917324cd..17eca8b7db 100644 --- a/ts/sql/Server.ts +++ b/ts/sql/Server.ts @@ -315,7 +315,6 @@ const dataInterface: ServerInterface = { // Server-only - getCorruptionLog, initialize, initializeRenderer, @@ -468,19 +467,6 @@ let globalInstanceRenderer: Database | undefined; let databaseFilePath: string | undefined; let indexedDBPath: string | undefined; -let corruptionLog = new Array(); - -SQL.setCorruptionLogger(line => { - logger.error(`SQL corruption: ${line}`); - corruptionLog.push(line); -}); - -function getCorruptionLog(): string { - const result = corruptionLog.join('\n'); - corruptionLog = []; - return result; -} - async function initialize({ configDir, key, diff --git a/ts/sql/mainWorker.ts b/ts/sql/mainWorker.ts index 04f1a151c2..1668803c32 100644 --- a/ts/sql/mainWorker.ts +++ b/ts/sql/mainWorker.ts @@ -19,17 +19,10 @@ const port = parentPort; // eslint-disable-next-line @typescript-eslint/no-explicit-any function respond(seq: number, error: Error | undefined, response?: any) { - const corruptionLog = db.getCorruptionLog(); - - const errorMessage = [ - ...(error ? [error.stack] : []), - ...(corruptionLog ? [corruptionLog] : []), - ].join('\n'); - const wrappedResponse: WrappedWorkerResponse = { type: 'response', seq, - error: errorMessage, + error: error?.stack, response, }; port.postMessage(wrappedResponse); diff --git a/yarn.lock b/yarn.lock index d4160eb718..5902de9b43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1901,10 +1901,12 @@ "@types/jquery" "*" "@types/underscore" "*" -"@types/better-sqlite3@7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/better-sqlite3/-/better-sqlite3-7.4.0.tgz#2b88d8474fc3f755617c0a5a8643388252c10aa1" - integrity sha512-tmSORlztb2cdWZDy4V81mRDgL+q7bd+ext4pI+Wj8EtJ5EHIZ6v7yiWbJ6A5eKVtoz77EsBEm7amwAzfqR/kAw== +"@types/better-sqlite3@7.5.0": + version "7.5.0" + resolved "https://registry.yarnpkg.com/@types/better-sqlite3/-/better-sqlite3-7.5.0.tgz#c57f42c76153d070f7673fbad0084ee324905be0" + integrity sha512-G9ZbMjydW2yj1AgiPlUtdgF3a1qNpLJLudc9ynJCeJByS3XFWpmT9LT+VSHrKHFbxb31CvtYwetLTOvG9zdxdg== + dependencies: + "@types/node" "*" "@types/blueimp-load-image@5.14.1": version "5.14.1" @@ -4100,9 +4102,9 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -"better-sqlite3@https://github.com/signalapp/better-sqlite3#4f66ee7b85477016dd0b2c3d2f13dcb60abd452e": - version "7.1.4" - resolved "https://github.com/signalapp/better-sqlite3#4f66ee7b85477016dd0b2c3d2f13dcb60abd452e" +"better-sqlite3@https://github.com/signalapp/better-sqlite3#b287153a5c6a5ac77f1e70df75d245e7a6e2286d": + version "7.5.0" + resolved "https://github.com/signalapp/better-sqlite3#b287153a5c6a5ac77f1e70df75d245e7a6e2286d" dependencies: bindings "^1.5.0" tar "^6.1.0"