Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion launcher/eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ module.exports = [
...globals.node,
...globals.jest,
...globals.browser,
AudioWorkletGlobalScope: globals.browser["AudioWorkletGlobalScope"],
},
parser: require("vue-eslint-parser"),
parserOptions: {
Expand Down
3 changes: 1 addition & 2 deletions launcher/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module.exports = {
moduleFileExtensions: ["js", "json", "vue"],
roots: ["<rootDir>/src/", "<rootDir>/tests/"],
roots: ["<rootDir>/src/"],
// testEnvironment: "jest-environment-jsdom",
testMatch: ["**/?(*.)+(spec|test|int).[tj]s?(x)"],
moduleNameMapper: {
Expand All @@ -10,7 +10,6 @@ module.exports = {
testEnvironment: "jsdom",
transformIgnorePatterns: ["node_modules/(?!(sucrase)/)"],
transform: {
".*\\.(vue)$": "@vue/vue3-jest",
"^.+\\.(js|jsx|ts|tsx|mjs)$": "babel-jest",
// ".*\\.(ts)$": "ts-jest"
},
Expand Down
8,756 changes: 4,466 additions & 4,290 deletions launcher/package-lock.json

Large diffs are not rendered by default.

80 changes: 39 additions & 41 deletions launcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,64 +38,62 @@
"@sapien99/vue-cli-plugin-electron-builder-notarize": "^1.1.3",
"@vue-hero-icons/outline": "^1.7.2",
"@vue-hero-icons/solid": "^1.7.2",
"@xterm/addon-attach": "^0.11.0",
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"@xterm/addon-attach": "^0.12.0",
"@xterm/addon-fit": "^0.11.0",
"@xterm/xterm": "^6.0.0",
"animate.css": "^4.1.1",
"axios": "^1.12.2",
"electron-builder": "^25.1.8",
"axios": "^1.14.0",
"electron-builder": "^26.8.1",
"electron-log": "^5.4.3",
"electron-store": "^10.1.0",
"electron-updater": "^6.6.2",
"electron-store": "^11.0.2",
"electron-updater": "^6.8.3",
"evilscan": "^1.9.1",
"file-saver": "^2.0.5",
"geoip-lite": "^1.4.10",
"gsap": "^3.13.0",
"geoip-lite": "^2.0.1",
"gsap": "^3.14.2",
"jszip": "^3.10.1",
"ping": "^0.4.4",
"pinia": "^3.0.3",
"ping": "^1.0.0",
"pinia": "^3.0.4",
"qrcode": "^1.5.4",
"semver": "^7.7.2",
"semver": "^7.7.4",
"ssh2": "^1.17.0",
"swiper": "^11.2.5",
"swiper": "^12.1.3",
"tailwindcss-animated": "^2.0.0",
"vue": "^3.5.21",
"vue-i18n": "^11.1.12",
"vue-router": "^4.5.1",
"vue3-apexcharts": "^1.8.0",
"vue3-carousel": "^0.16.0",
"vue": "^3.5.31",
"vue-i18n": "^11.3.0",
"vue-router": "^5.0.4",
"vue3-apexcharts": "^1.11.1",
"vue3-carousel": "^0.17.0",
"vue3-circle-progress": "^1.0.7",
"vuedraggable": "^2.24.3",
"web3": "^4.16.0",
"yaml": "^2.8.1"
"yaml": "^2.8.3"
},
"devDependencies": {
"@babel/plugin-transform-runtime": "^7.28.3",
"@babel/preset-env": "^7.28.3",
"@babel/runtime": "^7.28.4",
"@tailwindcss/forms": "^0.5.10",
"@tailwindcss/typography": "^0.5.16",
"@babel/plugin-transform-runtime": "^7.29.0",
"@babel/preset-env": "^7.29.2",
"@babel/runtime": "^7.29.2",
"@eslint/js": "^10.0.1",
"@tailwindcss/forms": "^0.5.11",
"@tailwindcss/typography": "^0.5.19",
"@vue/cli-service": "^5.0.9",
"@vue/compiler-sfc": "^3.5.21",
"@vue/test-utils": "^2.4.6",
"@vue/vue3-jest": "^29.2.6",
"@vue/compiler-sfc": "^3.5.31",
"@vueuse/core": "^13.9.0",
"autoprefixer": "^10.4.21",
"autoprefixer": "^10.4.27",
"concurrently": "^9.2.1",
"electron": "^38.1.0",
"electron-builder": "^25.1.8",
"eslint": "^9.35.0",
"electron": "^41.1.0",
"electron-builder": "^26.8.1",
"eslint": "^10.1.0",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^5.5.4",
"eslint-plugin-promise": "^7.2.1",
"eslint-plugin-vue": "^10.4.0",
"globals": "^16.4.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"nodemon": "^3.1.10",
"postcss": "^8.5.6",
"prettier": "^3.6.2",
"eslint-plugin-prettier": "^5.5.5",
"eslint-plugin-vue": "^10.8.0",
"globals": "^17.4.0",
"jest": "^30.3.0",
"jest-environment-jsdom": "^30.3.0",
"nodemon": "^3.1.14",
"postcss": "^8.5.8",
"prettier": "^3.8.1",
"tailwind-scrollbar": "^3.1.0",
"tailwindcss": "^3.4.17",
"vue-cli-plugin-electron-builder": "^3.0.0-alpha.4",
Expand All @@ -105,7 +103,7 @@
"license": "https://wrapbootstrap.com/help/licenses",
"overrides": {
"vue-cli-plugin-electron-builder": {
"electron-builder": "^25.1.8"
"electron-builder": "^26.8.1"
}
},
"repository": {
Expand Down
16 changes: 8 additions & 8 deletions launcher/src/backend/Monitoring.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export class Monitoring {
// Returns last known head block or false if unknown
async getLastKnownHeadBlock(ntwk) {
const file = this.lastKnownHeadBlockFile;
var cont = {};
var cont;
try {
cont = fs.readFileSync(file);
cont = JSON.parse(cont);
Expand Down Expand Up @@ -367,7 +367,7 @@ export class Monitoring {
`.trim();

// Execute the CURL command on the node and return the result
let result = null;
let result;
try {
result = await this.nodeConnection.sshService.exec(cmd);
} catch (err) {
Expand Down Expand Up @@ -495,7 +495,7 @@ export class Monitoring {
`.trim();

// Execute the CURL command on the node and return the result
let result = null;
let result;
try {
result = await this.nodeConnection.sshService.exec(cmd);
} catch (err) {
Expand Down Expand Up @@ -654,7 +654,7 @@ export class Monitoring {
const cmd = `curl -s --location --request ${method} -w "\\n%{http_code}" '${url}' ${requestheaders} ${requestdata}`.trim();

// Execute the CURL command on the node and return the result
let result = null;
let result;
try {
result = await this.nodeConnection.sshService.exec(cmd);
} catch (err) {
Expand Down Expand Up @@ -794,7 +794,7 @@ export class Monitoring {
const cmd = `curl -s --location --request ${method} -w "\\n%{http_code}" '${url}' ${requestheaders} ${requestdata}`.trim();

// Execute the CURL command on the node and return the result
let result = null;
let result;
try {
result = await this.nodeConnection.sshService.exec(cmd);
} catch (err) {
Expand Down Expand Up @@ -1418,7 +1418,7 @@ export class Monitoring {
// Do not disable consensuc/execution vars on lint warning because they are used with eval!
let consensus = cc; // eslint-disable-line no-unused-vars
let execution = ec; // eslint-disable-line no-unused-vars
var data = {},
var data,
opttyp = null,
optnam = null,
defval = null,
Expand Down Expand Up @@ -1698,7 +1698,7 @@ export class Monitoring {
}

// Execute the command on the node
let result = null;
let result;
try {
result = await this.nodeConnectionProm.sshService.exec(sshcmd);
} catch (err) {
Expand Down Expand Up @@ -3086,7 +3086,7 @@ export class Monitoring {
const logsTail = this.is_numeric(logs_tail) ? parseInt(logs_tail) : 0;
const logsTs = typeof logs_ts == "boolean" && logs_ts ? true : false;
var sshcommand = [];
var logArgs = "";
var logArgs;
for (let i = 0; i < serviceInfos.length; i++) {
var containerName = serviceInfos[i].config.instanceID;
if (logsTail > 0) {
Expand Down
Loading
Loading