From 647790885dc296c5b659b7672123640285e751a8 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 3 May 2020 21:27:24 +0200 Subject: [PATCH] downgrade sqlite3 library which has issues with electron build --- package-lock.json | 108 ++++++++++++++++------------------- package.json | 4 +- src/services/options_init.js | 4 +- src/services/sql.js | 4 ++ src/services/sql_init.js | 9 +-- 5 files changed, 59 insertions(+), 70 deletions(-) diff --git a/package-lock.json b/package-lock.json index d1b5a9a5e..6df66d018 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1192,38 +1192,38 @@ "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg==" }, "app-builder-bin": { - "version": "3.5.8", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.8.tgz", - "integrity": "sha512-ni3q7QTfQNWHNWuyn5x3FZu6GnQZv+TFnfgk5++svqleKEhHGqS1mIaKsh7x5pBX6NFXU3/+ktk98wA/AW4EXw==", + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.6.tgz", + "integrity": "sha512-gY9ABoV5jh67IrPEwF81R8l9LwE3RqHUyU3rIKitwqMpKhplN5OZC6WEHOXO3XhwiLCIlr9LLI6OPhr3bmtQIg==", "dev": true }, "app-builder-lib": { - "version": "22.6.0", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.6.0.tgz", - "integrity": "sha512-ky2aLYy92U+Gh6dKq/e8/bNmCotp6/GMhnX8tDZPv9detLg9WuBnWWi1ktBPlpbl1DREusy+TIh+9rgvfduQoA==", + "version": "22.5.1", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.5.1.tgz", + "integrity": "sha512-VtB/PD8actR1317D/0uGzuJIYbpw4pRrfMB6IyTLwGynUd3ihqiCFjejVWHjCwopgCct2kE0MvLwo8P49xHIeQ==", "dev": true, "requires": { "7zip-bin": "~5.0.3", "@develar/schema-utils": "~2.6.5", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.6.0", + "builder-util": "22.5.1", "builder-util-runtime": "8.7.0", "chromium-pickle-js": "^0.2.0", "debug": "^4.1.1", - "ejs": "^3.1.2", - "electron-publish": "22.6.0", + "ejs": "^3.0.2", + "electron-publish": "22.5.1", "fs-extra": "^9.0.0", "hosted-git-info": "^3.0.4", "is-ci": "^2.0.0", - "isbinaryfile": "^4.0.6", + "isbinaryfile": "^4.0.5", "js-yaml": "^3.13.1", "lazy-val": "^1.0.4", "minimatch": "^3.0.4", "normalize-package-data": "^2.5.0", "read-config-file": "6.0.0", "sanitize-filename": "^1.6.3", - "semver": "^7.3.2", + "semver": "^7.1.3", "temp-file": "^3.3.7" }, "dependencies": { @@ -1864,23 +1864,23 @@ } }, "builder-util": { - "version": "22.6.0", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.6.0.tgz", - "integrity": "sha512-jgdES2ExJYkuXC3DEaGAjFctKNA81C4QDy8zdoc+rqdSqheTizuDNtZg02uMFklmUES4V4fggmqds+Y7wraqng==", + "version": "22.5.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.5.1.tgz", + "integrity": "sha512-CelDTP3+fvDfZfbwy3PXif7mudPaWankJ8vrRg/NtCGvL+hXnwycnJZr46d5EQL7AgQcpJ27o9LTdfu61cxTFw==", "dev": true, "requires": { "7zip-bin": "~5.0.3", "@types/debug": "^4.1.5", "@types/fs-extra": "^8.1.0", - "app-builder-bin": "3.5.8", + "app-builder-bin": "3.5.6", "bluebird-lst": "^1.0.9", "builder-util-runtime": "8.7.0", - "chalk": "^4.0.0", + "chalk": "^3.0.0", "debug": "^4.1.1", "fs-extra": "^9.0.0", "is-ci": "^2.0.0", "js-yaml": "^3.13.1", - "source-map-support": "^0.5.19", + "source-map-support": "^0.5.16", "stat-mode": "^1.0.0", "temp-file": "^3.3.7" }, @@ -1896,9 +1896,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -1920,16 +1920,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, "stat-mode": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", @@ -3153,13 +3143,13 @@ } }, "dmg-builder": { - "version": "22.6.0", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.6.0.tgz", - "integrity": "sha512-rJxuGhHIpcuDGBtWZMM8aLxkbZNgYO2MO5dUerDIBXebhX1K8DA23iz/uZ8ahcRNgWEv57b8GDqJbXKEfr5T0A==", + "version": "22.5.1", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.5.1.tgz", + "integrity": "sha512-AwIiyGwgqhA8Ty/YnEU20aSzfrWZns6suOBTqddD+rLDI4jEASKGQadfvcXRSWgaK/VQW0GrhheXrhJpzZzt3g==", "dev": true, "requires": { - "app-builder-lib": "22.6.0", - "builder-util": "22.6.0", + "app-builder-lib": "22.5.1", + "builder-util": "22.5.1", "fs-extra": "^9.0.0", "iconv-lite": "^0.5.1", "js-yaml": "^3.13.1", @@ -3345,9 +3335,9 @@ } }, "electron": { - "version": "9.0.0-beta.21", - "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.21.tgz", - "integrity": "sha512-xFOD8I4RB9IkpVKnzoHwHvDNGvGl1IinpYTyQ7o7FAgSnkvP/upI1JtzE5Ff6PlAdyIGnbC+Rz1hJIfmAXxVuQ==", + "version": "9.0.0-beta.18", + "resolved": "https://registry.npmjs.org/electron/-/electron-9.0.0-beta.18.tgz", + "integrity": "sha512-mOdPB4nPc4kO2uwpvvbNZz0RDrRDIko/C8XFmOZmz7k3JaU7r0h/tLxdeypiqfLwxW/Bu1n+uwqG1X34i3fTEw==", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -3356,18 +3346,18 @@ } }, "electron-builder": { - "version": "22.6.0", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.6.0.tgz", - "integrity": "sha512-aLHlB6DTfjJ3MI4AUIFeWnwIozNgNlbOk2c2sTHxB10cAKp0dBVSPZ7xF5NK0uwDhElvRzJQubnHtJD6zKg42Q==", + "version": "22.5.1", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.5.1.tgz", + "integrity": "sha512-7gnHN8Ml5zecDerN8/ljAwUKtE+hhGLuT/X2/zO0FJM2q2hlLx/6ZgzESFILKqnPQFEBRxQ8SL1OxjdIY0HIrw==", "dev": true, "requires": { "@types/yargs": "^15.0.4", - "app-builder-lib": "22.6.0", + "app-builder-lib": "22.5.1", "bluebird-lst": "^1.0.9", - "builder-util": "22.6.0", + "builder-util": "22.5.1", "builder-util-runtime": "8.7.0", - "chalk": "^4.0.0", - "dmg-builder": "22.6.0", + "chalk": "^3.0.0", + "dmg-builder": "22.5.1", "fs-extra": "^9.0.0", "is-ci": "^2.0.0", "lazy-val": "^1.0.4", @@ -3388,9 +3378,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -3734,16 +3724,16 @@ } }, "electron-publish": { - "version": "22.6.0", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.6.0.tgz", - "integrity": "sha512-+v05SBf9qR7Os5au+fifloNHy5QxHQkUGudBj68YaTb43Pn37UkwRxSc49Lf13s4wW32ohM45g8BOVInPJEdnA==", + "version": "22.5.1", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.5.1.tgz", + "integrity": "sha512-g5bwLAHZT6A++yU1+Et+fncnFAdXXgkRao9rzTFAvhQ0QJBsmLiyOd0Ta2RI/EQcVoy6jyHtxFs7CWIXE5aZOA==", "dev": true, "requires": { "@types/fs-extra": "^8.1.0", "bluebird-lst": "^1.0.9", - "builder-util": "22.6.0", + "builder-util": "22.5.1", "builder-util-runtime": "8.7.0", - "chalk": "^4.0.0", + "chalk": "^3.0.0", "fs-extra": "^9.0.0", "lazy-val": "^1.0.4", "mime": "^2.4.4" @@ -3760,9 +3750,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -3785,9 +3775,9 @@ "dev": true }, "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", + "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==", "dev": true }, "supports-color": { diff --git a/package.json b/package.json index 4d96ee213..f218eddfe 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "session-file-store": "1.4.0", "simple-node-logger": "18.12.24", "sqlite": "4.0.7", - "sqlite3": "4.2.0", + "sqlite3": "4.1.1", "string-similarity": "4.0.1", "tar-stream": "2.1.2", "turndown": "6.0.0", @@ -78,7 +78,7 @@ "yazl": "^2.5.1" }, "devDependencies": { - "electron": "9.0.0-beta.21", + "electron": "9.0.0-beta.22", "electron-builder": "22.6.0", "electron-packager": "14.2.1", "electron-rebuild": "1.10.1", diff --git a/src/services/options_init.js b/src/services/options_init.js index 43d8060d9..ad5b509b6 100644 --- a/src/services/options_init.js +++ b/src/services/options_init.js @@ -83,8 +83,8 @@ const defaultOptions = [ { name: 'rightPaneVisible', value: 'true', isSynced: false }, { name: 'nativeTitleBarVisible', value: 'false', isSynced: false }, { name: 'eraseNotesAfterTimeInSeconds', value: '604800', isSynced: true }, // default is 7 days - { name: 'hideArchivedNotes_main', value: 'false', isSynced: false }, // default is 7 days - { name: 'hideIncludedImages_main', value: 'true', isSynced: false } // default is 7 days + { name: 'hideArchivedNotes_main', value: 'false', isSynced: false }, + { name: 'hideIncludedImages_main', value: 'true', isSynced: false } ]; async function initStartupOptions() { diff --git a/src/services/sql.js b/src/services/sql.js index a928f319e..325dbc292 100644 --- a/src/services/sql.js +++ b/src/services/sql.js @@ -163,6 +163,10 @@ async function executeScript(query) { } async function wrap(func, query) { + if (!dbConnection) { + throw new Error("DB connection not initialized yet"); + } + const thisError = new Error(); try { diff --git a/src/services/sql_init.js b/src/services/sql_init.js index d258ea4e8..eaf0aaf23 100644 --- a/src/services/sql_init.js +++ b/src/services/sql_init.js @@ -13,16 +13,11 @@ const port = require('./port'); const Option = require('../entities/option'); const TaskContext = require('./task_context.js'); -async function createConnection() { - return await sqlite.open({ +const dbConnection = new Promise(async (resolve, reject) => { + const db = await sqlite.open({ filename: dataDir.DOCUMENT_PATH, driver: sqlite3.Database }); -} - -const dbConnection = new Promise(async (resolve, reject) => { - // no need to create new connection now since DB stays the same all the time - const db = await createConnection(); db.run('PRAGMA journal_mode = WAL;');