fix: solve issues with unclosed connections (#1310)

Author: dziudek

app/back-end/app.js

@@ -212,8 +212,12 @@ class App {
             return { status: false };
         }
 
-        if (this.db && this.db.isOpen) {
-            this.db.close();
+        if (this.db) {
+            try {
+                this.db.close();
+            } catch (e) {
+                console.log('[SWITCH WEBSITE] DB already closed');
+            }
         }
 
         this.db = new DBUtils(new Database(dbPath));

app/back-end/events/app.js

@@ -44,8 +44,12 @@ class AppEvents {
                 if (appInstance.appConfig.sitesLocation) {
                     let appFilesHelper = new AppFiles(appInstance);
 
-                    if (appInstance.db && appInstance.db.isOpen) {
-                        appInstance.db.close();
+                    if (appInstance.db) {
+                        try {
+                            appInstance.db.close();
+                        } catch (e) {
+                            console.log('[SITE LOCATION CHANGE] DB already closed');
+                        }
                     }
 
                     setTimeout(() => {

app/back-end/events/site.js

@@ -70,8 +70,12 @@ class SiteEvents {
                     !fs.existsSync(path.join(appInstance.sitesDir, config.settings.name)) &&
                     slug(config.settings.displayName) === config.settings.name
                 ) {
-                    if (appInstance.db && appInstance.db.isOpen) {
-                        appInstance.db.close();
+                    if (appInstance.db) {
+                        try {
+                            appInstance.db.close();
+                        } catch (e) {
+                            console.log('[SITE NAME CHANGE] DB already closed');
+                        }
                     }
 
                     // If yes - rename the dir
@@ -431,8 +435,12 @@ class SiteEvents {
             let siteDir = path.join(appInstance.sitesDir, config.name);
             let dbPath = path.join(siteDir, 'input', 'db.sqlite');
 
-            if (appInstance.db && appInstance.db.isOpen) {
-                appInstance.db.close();
+            if (appInstance.db) {
+                try {
+                    appInstance.db.close();
+                } catch (e) {
+                    console.log('[SITE CREATION] DB already closed');
+                }
             }
 
             appInstance.db = new DBUtils(new Database(dbPath));

app/back-end/modules/backup/backup.js

@@ -277,8 +277,12 @@ class Backup {
                     }
 
                     // Close DB connection and remove site dir contents
-                    if (appInstance.db && appInstance.db.isOpen) {
-                        appInstance.db.close();
+                    if (appInstance.db) {
+                        try {
+                            appInstance.db.close();
+                        } catch (e) {
+                            console.log('[BACKUP RESTORE] DB already closed');
+                        }
                     }
 
                     fs.emptyDirSync(destinationPath);

app/back-end/modules/import/import.js

@@ -36,8 +36,12 @@ class Import {
 
         const dbPath = path.join(this.appInstance.sitesDir, this.siteName, 'input', 'db.sqlite');
 
-        if (this.appInstance.db && this.appInstance.db.isOpen) {
-            this.appInstance.db.close();
+        if (this.appInstance.db) {
+            try {
+                this.appInstance.db.close();
+            } catch (e) {
+                console.log('[WP IMPORT] DB already closed');
+            }
         }
 
         this.appInstance.db = new DBUtils(new Database(dbPath));

app/back-end/site.js

@@ -434,8 +434,12 @@ class Site {
     static delete(appInstance, name) {
         let sitePath = path.join(appInstance.sitesDir, name);
 
-        if (appInstance.db && appInstance.db.isOpen) {
-            appInstance.db.close();
+        if (appInstance.db) {
+            try {
+                appInstance.db.close();
+            } catch (e) {
+                console.log('[SITE DELETE] DB already closed');
+            }
         }
 
         setTimeout(async () => {

app/src/components/Backups.vue

@@ -115,7 +115,6 @@
                     </p-button>
 
                     <p-button
-                        v-if="!isWin"
                         :type="operationInProgress ? 'disabled secondary small' : 'secondary small'"
                         :onClick="restoreFile.bind(this, item.name)"
                         :disabled="operationInProgress">
@@ -148,9 +147,6 @@ export default {
         };
     },
     computed: {
-        isWin () {
-            return document.body.getAttribute('data-os') === 'win';
-        },
         noBackups () {
             return this.items.length === 0;
         }