diff --git a/src/background/background.js b/src/background/background.js index b3f58af..e9912ec 100644 --- a/src/background/background.js +++ b/src/background/background.js @@ -300,7 +300,7 @@ app.on("ready", async () => { } callback.apply(null, arg) }) - }, app.getPath("userData"), app.getVersion(), env.name) + }, app.getPath("userData"), app.getVersion(), env.name, sphinx) // load page only after init app spider.initialized.then(() => { diff --git a/src/background/server.js b/src/background/server.js index 90a17d5..bedcf3c 100644 --- a/src/background/server.js +++ b/src/background/server.js @@ -61,7 +61,7 @@ const start = async () => dbPatcher(() => { spider = new spiderCall((...data) => io.sockets.emit(...data), (message, callback) => { socketMessages[message] = callback - }, path.resolve(packageJson.serverDataDirectory), packageJson.version, 'production') + }, path.resolve(packageJson.serverDataDirectory), packageJson.version, 'production', sphinx) }, null, sphinx) }, path.resolve(packageJson.serverDataDirectory), () => {})) } diff --git a/src/background/sphinx.js b/src/background/sphinx.js index 4be1777..e59963c 100644 --- a/src/background/sphinx.js +++ b/src/background/sphinx.js @@ -263,6 +263,12 @@ module.exports = async (callback, dataDirectory, onClose, params = {}) => { { needConvertation = true; } + + let manticoreVersion; + if (!sphinx.version && (manticoreVersion = /Manticore ([0-9\.]+)/.exec(data))) { + sphinx.version = manticoreVersion[1]; + logT('sphinx', 'sphinx version', sphinx.version); + } if(windowsEncodingFix && data.includes('failed to parse config file')) { diff --git a/src/background/spider.js b/src/background/spider.js index 4ac7295..bbf4a6e 100644 --- a/src/background/spider.js +++ b/src/background/spider.js @@ -39,7 +39,7 @@ const mime = require('mime'); //server.listen(config.httpPort); //console.log('Listening web server on', config.httpPort, 'port') -module.exports = function (send, recive, dataDirectory, version, env) +module.exports = function (send, recive, dataDirectory, version, env, {version: manticoreVersion}) { this.initialized = (async () => { @@ -135,6 +135,8 @@ module.exports = function (send, recive, dataDirectory, version, env) p2p.info.filesSize = 0; } + p2p.info.manticoreVersion = manticoreVersion; + if(filesInfo && filesInfo[0]) { filesInfo = filesInfo[0]