diff --git a/tizenbrew-app/TizenBrew/config.xml b/tizenbrew-app/TizenBrew/config.xml index d761665..33d2d65 100644 --- a/tizenbrew-app/TizenBrew/config.xml +++ b/tizenbrew-app/TizenBrew/config.xml @@ -1,5 +1,5 @@ - + diff --git a/tizenbrew-app/TizenBrew/css/style.css b/tizenbrew-app/TizenBrew/css/style.css index 2c3c76a..ed01ba8 100644 --- a/tizenbrew-app/TizenBrew/css/style.css +++ b/tizenbrew-app/TizenBrew/css/style.css @@ -51,6 +51,7 @@ body { .status { font-size: 1.5vw; padding: 0.5rem; + margin-top: 1rem; border: 0.5px solid #aaa; color: snow; border-radius: 16px; diff --git a/tizenbrew-app/TizenBrew/index.html b/tizenbrew-app/TizenBrew/index.html index 31a6aab..1e411d6 100644 --- a/tizenbrew-app/TizenBrew/index.html +++ b/tizenbrew-app/TizenBrew/index.html @@ -2,13 +2,6 @@ - - TizenBrew @@ -34,7 +27,10 @@ -

Status

+
+

Status

+

Version

+
diff --git a/tizenbrew-app/TizenBrew/js/wsClient.js b/tizenbrew-app/TizenBrew/js/wsClient.js index 0b0d587..e38ea5f 100644 --- a/tizenbrew-app/TizenBrew/js/wsClient.js +++ b/tizenbrew-app/TizenBrew/js/wsClient.js @@ -55,6 +55,13 @@ function onMessage(msg) { send({ type: 'startService', package: JSON.parse(localStorage.getItem('autoLaunchService')) }); } send({ type: 'getServiceStatuses' }); + + fetch('config.xml').then(res => res.text()).then(xml => { + const parser = new DOMParser(); + const xmlDoc = parser.parseFromString(xml, 'text/xml'); + const version = xmlDoc.getElementsByTagName('widget')[0].attributes.version.nodeValue + document.getElementById('version').innerText = `v${version}`; + }); } else { send({ type: 'canLaunchInDebug' }); } diff --git a/tizenbrew-app/TizenBrew/service/package-lock.json b/tizenbrew-app/TizenBrew/service/package-lock.json index ec1b72a..3f67059 100644 --- a/tizenbrew-app/TizenBrew/service/package-lock.json +++ b/tizenbrew-app/TizenBrew/service/package-lock.json @@ -5,7 +5,6 @@ "packages": { "": { "dependencies": { - "@sentry/node": "^4.6.6", "adbhost": "^0.0.2", "express": "^4.19.2", "node-fetch": "^2.7.0", @@ -1841,101 +1840,6 @@ "dev": true, "optional": true }, - "node_modules/@sentry/core": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-4.6.6.tgz", - "integrity": "sha512-7z9HKLTNr3zVBR3tBRheTxkkkuK2IqISUc5Iyo3crN2OecOLtpptT96f5XjLndBEL2ab39eCBPpA5OFjbpzrIA==", - "dependencies": { - "@sentry/hub": "4.6.5", - "@sentry/minimal": "4.6.5", - "@sentry/types": "4.5.3", - "@sentry/utils": "4.6.5", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/hub": { - "version": "4.6.5", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-4.6.5.tgz", - "integrity": "sha512-v9vee8s8C1fK/DPtNOzv6r+AMbPDOWfnasouNcBUkbQUSN5wUNyCDvt51QbWaw5kMMY5TSqjdVqY6gXQZI0APQ==", - "dependencies": { - "@sentry/types": "4.5.3", - "@sentry/utils": "4.6.5", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/minimal": { - "version": "4.6.5", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-4.6.5.tgz", - "integrity": "sha512-tf+J+uUNmSgzC7d9JSN8Ekw1HeBAX87Efa/jyFbzLvaw80oibvTiLSLqDjQ9PgvyIzBUuuPImkS2NpvPQGWFtg==", - "dependencies": { - "@sentry/hub": "4.6.5", - "@sentry/types": "4.5.3", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/node": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-4.6.6.tgz", - "integrity": "sha512-+zZHE2uOwQTgypP6N9oBd0Io6BKXaJh6mdmZBauF0G46/8V28sBQ/dXBtJJNZ8tW7eVlLGpLSGuJb9Ai7c/rNw==", - "dependencies": { - "@sentry/core": "4.6.6", - "@sentry/hub": "4.6.5", - "@sentry/types": "4.5.3", - "@sentry/utils": "4.6.5", - "@types/stack-trace": "0.0.29", - "cookie": "0.3.1", - "https-proxy-agent": "2.2.1", - "lru_map": "0.3.3", - "lsmod": "1.0.0", - "stack-trace": "0.0.10", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/node/node_modules/cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha512-+IJOX0OqlHCszo2mBUq+SrEbCj6w7Kpffqx60zYbPTFaO4+yYgRjHwcZNpWvaTylDHaV7PPmBHzSecZiMhtPgw==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/@sentry/types": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-4.5.3.tgz", - "integrity": "sha512-7ll1PAFNjrBNX9rzy3P2qAQrpQwHaDO3uKj735qsnGw34OtAS8Xr8WYrjI14f9fMPa/XIeWvMPb4GMic28V/ag==", - "engines": { - "node": ">=6" - } - }, - "node_modules/@sentry/utils": { - "version": "4.6.5", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-4.6.5.tgz", - "integrity": "sha512-rTISJtRRbWsd3UE+TkA3QG1C0VzPKPW8w74tieBwYhtTCGmOHNwz2nDC/MZGbGj4OgDmNKKl4CCyQr88EX08hA==", - "dependencies": { - "@sentry/types": "4.5.3", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@types/stack-trace": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/stack-trace/-/stack-trace-0.0.29.tgz", - "integrity": "sha512-TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g==" - }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -1953,17 +1857,6 @@ "resolved": "https://registry.npmjs.org/adbhost/-/adbhost-0.0.2.tgz", "integrity": "sha512-8eF+KUEoqF+OAo6tRnGB6el0uXNZjPWM//QN62UKva+opguPPvt5ZTCWXAaT2cazKM0JKJ2ODhdKrxYlpLT/9Q==" }, - "node_modules/agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dependencies": { - "es6-promisify": "^5.0.0" - }, - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -2381,19 +2274,6 @@ "node": ">= 0.4" } }, - "node_modules/es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" - }, - "node_modules/es6-promisify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==", - "dependencies": { - "es6-promise": "^4.0.3" - } - }, "node_modules/escalade": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", @@ -2704,31 +2584,6 @@ "node": ">= 0.8" } }, - "node_modules/https-proxy-agent": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz", - "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==", - "dependencies": { - "agent-base": "^4.1.0", - "debug": "^3.1.0" - }, - "engines": { - "node": ">= 4.5.0" - } - }, - "node_modules/https-proxy-agent/node_modules/debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dependencies": { - "ms": "^2.1.1" - } - }, - "node_modules/https-proxy-agent/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -2861,11 +2716,6 @@ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==", "dev": true }, - "node_modules/lru_map": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/lru_map/-/lru_map-0.3.3.tgz", - "integrity": "sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==" - }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -2875,11 +2725,6 @@ "yallist": "^3.0.2" } }, - "node_modules/lsmod": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lsmod/-/lsmod-1.0.0.tgz", - "integrity": "sha512-Y+6V75r+mGWzWEPr9h6PFmStielICu5JBHLUg18jCsD2VFmEfgHbq/EgnY4inElsUD9eKL9id1qp34w46rSIKQ==" - }, "node_modules/make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", @@ -3371,14 +3216,6 @@ "node": ">=6" } }, - "node_modules/stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", - "engines": { - "node": "*" - } - }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -3446,11 +3283,6 @@ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, - "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", diff --git a/tizenbrew-app/TizenBrew/service/package.json b/tizenbrew-app/TizenBrew/service/package.json index c1c4d84..b1ba7ad 100644 --- a/tizenbrew-app/TizenBrew/service/package.json +++ b/tizenbrew-app/TizenBrew/service/package.json @@ -1,6 +1,5 @@ { "dependencies": { - "@sentry/node": "^4.6.6", "adbhost": "^0.0.2", "express": "^4.19.2", "node-fetch": "^2.7.0", diff --git a/tizenbrew-app/TizenBrew/service/service.js b/tizenbrew-app/TizenBrew/service/service.js index 4539841..913b912 100644 --- a/tizenbrew-app/TizenBrew/service/service.js +++ b/tizenbrew-app/TizenBrew/service/service.js @@ -2,17 +2,6 @@ // TizenBrew Standalone Service // I wish I've seen running Node.JS on Tizen way before... -const Sentry = require('@sentry/node'); - -Sentry.init({ dsn: 'https://32b5ee2b4c114c3b875ee1716790c1ec@89.168.107.251:8001/1' }); - -Sentry.configureScope(scope => { - scope.setTag('platformVersion', tizen.systeminfo.getCapability("http://tizen.org/feature/platform.version")); - scope.setTag('nodeVersion', process.version); -}); - -global.Sentry = Sentry; - module.exports.onStart = function () { console.log('Service started.'); const adbhost = require('adbhost'); diff --git a/tizenbrew-app/TizenBrew/service/serviceLauncher.js b/tizenbrew-app/TizenBrew/service/serviceLauncher.js index 3a7bf9b..6e30269 100644 --- a/tizenbrew-app/TizenBrew/service/serviceLauncher.js +++ b/tizenbrew-app/TizenBrew/service/serviceLauncher.js @@ -7,7 +7,7 @@ function startService(module, pkg) { let sandbox = {}; Object.getOwnPropertyNames(global).forEach(prop => { - const disAllowed = ['services', 'module', 'global', 'inDebug', 'currentClient', 'currentModule', 'Sentry']; + const disAllowed = ['services', 'module', 'global', 'inDebug', 'currentClient', 'currentModule']; // Node.js v4.4.3 does not have Array.prototype.includes... if (disAllowed.indexOf(prop) >= 0) return; sandbox[prop] = global[prop]; @@ -29,7 +29,6 @@ function startService(module, pkg) { try { vm.runInContext(script, global.services.get(pkg).context); } catch (e) { - global.Sentry.captureException(e); global.services.get(pkg).hasCrashed = true; global.services.get(pkg).error = e; }