diff --git a/src/app/app.js b/src/app/app.js index 375e338..b1082a4 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -80,6 +80,34 @@ injectTapEventPlugin(); //registerServiceWorker(); +// override log to main process +const consoleLog = console.log +console.log = (...log) => { + window.torrentSocket.emit('log', ...log) + consoleLog(...log) +} +const consoleError = console.error +console.error = (...log) => { + let type = 'logE' + + if(log[0] && log[0].startsWith('Warning:')) + type = 'log' + if(log[0] && log[0].includes('MaxListenersExceededWarning:')) + type = 'log' + + window.torrentSocket.emit(type, ...log) + consoleError(...log) +} + +window.onerror = function (msg, url, line, col, error) { + if(!error || !error.stack) + console.error(msg, 'at', url + ':' + line) + else + console.error(error.stack) + + return true; // same as preventDefault +}; + let loadersCount = 0; let appReady = false; window.customLoader = (func, onLoading, onLoaded) => { diff --git a/src/app/config-page.js b/src/app/config-page.js index bddc750..296fc16 100644 --- a/src/app/config-page.js +++ b/src/app/config-page.js @@ -23,7 +23,6 @@ export default class ConfigPage extends Page { loadSettings() { window.torrentSocket.emit('config', window.customLoader((options) => { this.options = options; - console.log(this.options) this.forceUpdate(); })); } diff --git a/src/app/feed.js b/src/app/feed.js index 200beb4..8eebc8e 100644 --- a/src/app/feed.js +++ b/src/app/feed.js @@ -13,7 +13,6 @@ export default class RecentTorrents extends Component { window.torrentSocket.emit('feed', window.customLoader((data) => { if(data) { this.torrents = data; - console.log(data) this.forceUpdate(); } })) diff --git a/src/app/router.js b/src/app/router.js index 3d83297..b3fdfa4 100644 --- a/src/app/router.js +++ b/src/app/router.js @@ -42,8 +42,6 @@ const router = (page, callback, dontClearRemember) => { { params[pg.args[i]] = p[i] } - console.log(params) - pg.callback({ params }) @@ -65,7 +63,6 @@ const router = (page, callback, dontClearRemember) => { window.router = router; window.routerOpenPrev = () => { - console.log(history) if(history.length < 2) return history.pop() // last page diff --git a/src/background/spider.js b/src/background/spider.js index 27e6f1b..c3e55ab 100644 --- a/src/background/spider.js +++ b/src/background/spider.js @@ -48,6 +48,13 @@ module.exports = function (send, recive, dataDirectory, version, env) { this.initialized = (async () => { + recive('log', (...log) => { + logT('gui', ...log) + }) + + recive('logE', (...log) => { + logTE('gui', ...log) + }) let torrentsId = 1; let filesId = 1;