fix(closing): fix errors on closing

src/background/api.js

@@ -210,10 +210,6 @@ module.exports = async ({
 			if(typeof callback != 'function')
 				return;
 	
-			// ignore sql requests on closing
-			if(sphinxSingle.state === 'disconnected')
-				return
-
 			const cpu = cpuUsage()
 			const limit = Math.max(1, 5 - (cpu / 20) | 0)
 

src/background/mysql.js

@@ -2,7 +2,15 @@ const mysql = require('mysql');
 const config = require('./config');
 
 const expand = (sphinx) => {
-	const queryCall = sphinx.query.bind(sphinx)
+	const queryOriginal = sphinx.query.bind(sphinx)
+	const queryCall = (...args) => {
+		if(sphinx.__closed)
+		{
+			logT('sql', 'prevent sql request after end of connection')
+			return
+		}
+		return queryOriginal(...args)
+	}
 
 	sphinx.query = (sql, args, callback) => new Promise((resolve, reject) => {
 		if(typeof args === 'function' || typeof args === 'undefined')
@@ -125,10 +133,13 @@ const pool = async () => {
 		});
 		sphinx = expand(sphinx)
 		const end = sphinx.end.bind(sphinx)
-		sphinx.end = async (cb) => new Promise(resolve => end(() => {
+		sphinx.end = (cb) => new Promise(resolve => { 
-			resolve()
+			sphinx.__closed = true
-			if(cb) cb()
+			end(() => {
-		}))
+				resolve()
+				if(cb) cb()
+			})
+		})
 		return sphinx
 	}
 	else
@@ -161,7 +172,7 @@ const pool = async () => {
 			},
 			async end(cb)
 			{
-				await Promise.all(connectionPool.map(conn => new Promise(resolve => conn.end(resolve))))
+				await Promise.all(connectionPool.map(conn => conn.end()))
 				if(cb)
 					cb()
 				connectionPool = null
@@ -234,6 +245,18 @@ const single = (callback) => {
 		});
 
 		mysqlSingle._mysql = expand(mysqlSingle._mysql)
+	
+		// fix prevent query after closing
+		const end = mysqlSingle._mysql.end.bind(mysqlSingle._mysql)
+		mysqlSingle._mysql.end = (cb) => new Promise(resolve => {
+			mysqlSingle._mysql.__closed = true
+			end(() => {
+				resolve()
+				if(cb)
+					cb()
+			})	
+		})
+
 		return proxySingle
 	}
 

src/background/spider.js

@@ -743,7 +743,7 @@ module.exports = function (send, recive, dataDirectory, version, env)
 				upnp.ratsUnmap()
 
 			logT('close', 'closing alternative db interface')
-			await new Promise(resolve => sphinxSingleAlternative.end(resolve))
+			await sphinxSingleAlternative.end()
 
 			// save torrents sessions
 			logT('close', 'save torrents downloads sessions')
@@ -830,13 +830,14 @@ module.exports = function (send, recive, dataDirectory, version, env)
 			client.removeAllListeners('complete')
 
 			logT('close', 'closing torrent client')
-			torrentClient.destroy(() => {
+			torrentClient.destroy(() => spider.close(async () => {
-				sphinx.end(() => spider.close(() => {
+				await sphinx.end()
-					sphinxSingle.destroy()
+				logT('close', 'pool closed')
-					logT('close', 'spider closed')
+				await sphinxSingle.end()
-					callback()
+				logT('close', 'single closed')
-				}))
+				logT('close', 'spider closed')
-			})
+				callback()
+			}))
 		}
     
 	})()