From d2e803ab82c391b0babd89c861f3a5a20c8041c0 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Sun, 28 Jan 2024 10:21:12 +0100 Subject: [PATCH] Bugfixing on manager --- manager/.vscode/tasks.json | 2 +- manager/ejs/instances.ejs | 23 ++- manager/ejs/result.ejs | 6 +- manager/ejs/settings.ejs | 7 +- manager/index.html | 6 +- manager/javascripts/dcsinstance.js | 13 +- manager/javascripts/manager.js | 58 +++--- manager/javascripts/preload.js | 15 +- manager/manager.log | 317 ----------------------------- manager/stylesheets/style.css | 4 +- 10 files changed, 79 insertions(+), 372 deletions(-) delete mode 100644 manager/manager.log diff --git a/manager/.vscode/tasks.json b/manager/.vscode/tasks.json index 9732cc95..7e89e91f 100644 --- a/manager/.vscode/tasks.json +++ b/manager/.vscode/tasks.json @@ -6,7 +6,7 @@ { "label": "mirror-package", "type": "shell", - "command": "call ./scripts/mirror-package.bat", + "command": "./scripts/mirror-package.bat", "isBackground": true } ] diff --git a/manager/ejs/instances.ejs b/manager/ejs/instances.ejs index 0871d658..d2fdbbaa 100644 --- a/manager/ejs/instances.ejs +++ b/manager/ejs/instances.ejs @@ -1,9 +1,13 @@ -
+
@@ -278,6 +293,10 @@
Open in browser
Stop Olympus
+
Open logs
<% } %>
diff --git a/manager/ejs/result.ejs b/manager/ejs/result.ejs index 46d3173c..d13fb87f 100644 --- a/manager/ejs/result.ejs +++ b/manager/ejs/result.ejs @@ -114,7 +114,7 @@
- Alternatively, you can run the Olympus Server instead and visit
http://localhost:<%= activeInstance["clientPort"] %>
in a web browser (Google Chrome recommended) to replace the first step above. + Alternatively, you can run the Olympus Server instead and visit
')" >http://localhost:<%= activeInstance["clientPort"] %>
in a web browser (Google Chrome recommended) to replace the first step above.
<% } else { %>
@@ -128,7 +128,7 @@
- To access Olympus remotely visit
http://<%= ip %>:<%= activeInstance["clientPort"] %>
in a web browser (Google Chrome recommended). + To access Olympus remotely visit
')">http://<%= ip %>:<%= activeInstance["clientPort"] %>
in a web browser (Google Chrome recommended).
@@ -140,7 +140,7 @@
- To access Olympus from this PC, you need to visit
http://localhost:<%= activeInstance["clientPort"] %>
in a web browser (Google Chrome recommended) instead. + To access Olympus from this PC, you need to visit
')">http://localhost:<%= activeInstance["clientPort"] %>
in a web browser (Google Chrome recommended) instead.
<% } %> diff --git a/manager/ejs/settings.ejs b/manager/ejs/settings.ejs index 56b1f197..2b964070 100644 --- a/manager/ejs/settings.ejs +++ b/manager/ejs/settings.ejs @@ -29,6 +29,7 @@ border-left: 5px solid var(--blue); flex-direction: column; row-gap: 25px; + position: relative; } #manager-settings .option:not(.installed) { @@ -226,7 +227,7 @@ View and manage installs - The following DCS installations have been identified.
You can modify settings and uninstall below. + The following Olympus installations have been identified.
You can modify settings and uninstall below.
@@ -252,6 +253,10 @@
<%= instances[i].installed? instances[i].backendAddress: "N/A" %>
+
Open logs
Edit settings
diff --git a/manager/index.html b/manager/index.html index 637e5370..b51718a2 100644 --- a/manager/index.html +++ b/manager/index.html @@ -30,9 +30,9 @@
Troubleshooting Guide
- - - + + +
Loading, please wait...
diff --git a/manager/javascripts/dcsinstance.js b/manager/javascripts/dcsinstance.js index b2f7e8a9..60052876 100644 --- a/manager/javascripts/dcsinstance.js +++ b/manager/javascripts/dcsinstance.js @@ -41,15 +41,18 @@ class DCSInstance { if (result[shellFoldersKey] !== undefined && result[shellFoldersKey]["exists"] && result[shellFoldersKey]['values'][saveGamesKey] !== undefined && result[shellFoldersKey]['values'][saveGamesKey]['value'] !== undefined) { /* Read all the folders in Saved Games */ const searchpath = result[shellFoldersKey]['values'][saveGamesKey]['value']; - const folders = fs.readdirSync(searchpath); + var folders = fs.readdirSync(searchpath).map((folder) => {return path.join(searchpath, folder);}); + console.log(folders); var instances = []; + folders = folders.concat(getManager().options.additionalDCSInstances); + console.log(folders); /* A DCS Instance is created if either the appsettings.lua or serversettings.lua file is detected */ for (let i = 0; i < folders.length; i++) { const folder = folders[i]; - if (fs.existsSync(path.join(searchpath, folder, "Config", "appsettings.lua")) ||fs.existsSync(path.join(searchpath, folder, "Config", "serversettings.lua"))) { + if (fs.existsSync(path.join(folder, "Config", "appsettings.lua")) || fs.existsSync(path.join(folder, "Config", "serversettings.lua")) || getManager().options.additionalDCSInstances.includes(folder)) { logger.log(`Found instance in ${folder}, checking for Olympus`) - var newInstance = new DCSInstance(path.join(searchpath, folder)); + var newInstance = new DCSInstance(path.join(folder)); /* Check if Olympus is already installed */ getManager().setLoadingProgress(`Found instance in ${folder}, checking for Olympus...`, (i + 1) / folders.length * 100); @@ -471,11 +474,11 @@ class DCSInstance { logger.log(`Editing completed successfully`); hidePopup(); - this.options.mode === "basic"? getManager().menuPage.show(): getManager().instancesPage.show(); + getManager().options.mode === "basic"? getManager().menuPage.show(): getManager().instancesPage.show(); } catch (err) { logger.log(`An error occurred during editing: ${err}`); hidePopup(); - showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`) + showErrorPopup(`A critical error occurred, check ${getManager().options.logLocation} for more info.`) } } diff --git a/manager/javascripts/manager.js b/manager/javascripts/manager.js index c3899be3..8e7d7c56 100644 --- a/manager/javascripts/manager.js +++ b/manager/javascripts/manager.js @@ -167,9 +167,10 @@ class Manager { */ createOptionsFile(mode) { try { - fs.writeFileSync("options.json", JSON.stringify({ mode: mode })); + fs.writeFileSync("options.json", JSON.stringify({ mode: mode, additionalDCSInstances: [] }, null, 2)); location.reload(); - } catch (e) { + } catch (err) { + logger.log(err); showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`) } } @@ -182,7 +183,7 @@ class Manager { /* Change the mode in the options.json and reload the page */ var options = JSON.parse(fs.readFileSync("options.json")); options.mode = newMode; - fs.writeFileSync("options.json", JSON.stringify(options)); + fs.writeFileSync("options.json", JSON.stringify(options, null, 2)); location.reload(); } @@ -240,13 +241,7 @@ class Manager { onEditMenuClicked() { this.activePage.hide() this.options.install = false; - - if (this.options.singleInstance) { - this.options.activeInstance = this.options.instances[0]; - this.connectionsTypePage.show(); - } else { - this.settingsPage.show(); - } + this.settingsPage.show(); } /** When a folder is selected, find what instance was clicked to set as active @@ -271,8 +266,9 @@ class Manager { this.typePage.getElement().querySelector(`.multiplayer`).classList.toggle("selected", type === 'multiplayer'); if (this.options.activeInstance) this.options.activeInstance.installationType = type; - else - showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`) + else { + showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`); + } } /* When the connections type is selected */ @@ -281,8 +277,9 @@ class Manager { this.connectionsTypePage.getElement().querySelector(`.manual`).classList.toggle("selected", type === 'manual'); if (this.options.activeInstance) this.options.activeInstance.connectionsType = type; - else - showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`) + else { + showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`); + } } /* When the next button of a wizard page is clicked */ @@ -340,7 +337,7 @@ class Manager { if (this.options.activeInstance) { if (this.options.activeInstance.installed && !this.options.activeInstance.arePasswordsEdited()) { this.activePage.hide(); - this.options.install? this.options.activeInstance.install(): this.options.activeInstance.edit(); + this.options.install ? this.options.activeInstance.install() : this.options.activeInstance.edit(); } else { if (!this.options.activeInstance.arePasswordsSet()) { @@ -349,7 +346,7 @@ class Manager { showErrorPopup('Please, set different passwords for the Game Master, Blue Commander, and Red Commander roles!'); } else { this.activePage.hide(); - this.options.install? this.options.activeInstance.install(): this.options.activeInstance.edit(); + this.options.install ? this.options.activeInstance.install() : this.options.activeInstance.edit(); } } } else { @@ -377,8 +374,9 @@ class Manager { if (!this.options.activeInstance.redCommanderPasswordEdited) this.passwordsPage.getElement().querySelector(".red-commander input").value = ""; } - else - showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`) + else { + showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`); + } } onBlueCommanderPasswordChanged(value) { @@ -389,8 +387,9 @@ class Manager { if (!this.options.activeInstance.redCommanderPasswordEdited) this.passwordsPage.getElement().querySelector(".red-commander input").value = ""; } - else - showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`) + else { + showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`); + } } onRedCommanderPasswordChanged(value) { @@ -401,8 +400,9 @@ class Manager { if (!this.options.activeInstance.blueCommanderPasswordEdited) this.passwordsPage.getElement().querySelector(".blue-commander input").value = ""; } - else - showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`) + else { + showErrorPopup(`A critical error occurred, check ${this.options.logLocation} for more info.`); + } } /* When the client port input value is changed */ @@ -472,7 +472,7 @@ class Manager { this.options.activeInstance = instance; this.options.install = false; this.activePage.hide(); - this.connectionsTypePage.show(); + this.typePage.show(); } } @@ -494,6 +494,14 @@ class Manager { await instance.uninstall(); } + onLinkClicked(url) { + exec(`start ${url}`); + } + + onTextFileClicked(path) { + exec(`notepad "${path}"`); + } + async getClickedInstance(name) { var instances = await DCSInstance.getInstances() return instances.find((instance) => { return instance.name === name; }); @@ -556,7 +564,7 @@ class Manager { instanceDiv.querySelector(".backend.online").classList.toggle("hide", !instance.backendOnline); instanceDiv.querySelector(".backend.offline").classList.toggle("hide", instance.backendOnline); - if (this.backendOnline) { + if (instance.backendOnline) { instanceDiv.querySelector(".fps .data").innerText = instance.fps; instanceDiv.querySelector(".load .data").innerText = instance.load; } @@ -567,7 +575,7 @@ class Manager { instanceDiv.querySelector(".button.open-browser").classList.toggle("hide", !instance.webserverOnline); instanceDiv.querySelector(".button.stop").classList.toggle("hide", !instance.webserverOnline); - if (this.webserverOnline) + if (instance.webserverOnline) instanceDiv.querySelector(".button.start").classList.remove("loading"); } } diff --git a/manager/javascripts/preload.js b/manager/javascripts/preload.js index 6c050d1c..3fc523ad 100644 --- a/manager/javascripts/preload.js +++ b/manager/javascripts/preload.js @@ -69,9 +69,9 @@ async function updateOlympusBeta() { var artifact = artifacts.find((artifact) => { return artifact.name = "development_build_not_a_release" }); const date1 = new Date(artifact.updated_at); - const date2 = fs.statSync(path.join("package.json")).birthtime; + const date2 = fs.statSync(".").mtime; if (date1 > date2) { - showConfirmPopup(`Latest beta artifact has a timestamp of ${artifact.updated_at}, while your installation was created on ${date2.toISOString()}. Do you want to update to the newest beta version?`, () => { + showConfirmPopup(`Looks like you are running a beta version of Olympus!Latest beta artifact timestamp of: ${date1.toLocaleString()}
Your installation timestamp: ${date2.toLocaleString()}

Do you want to update to the newest beta version?`, () => { /* Run the browser and download the artifact */ //TODO: try and directly download the file from code rather than using the browser exec(`start https://github.com/Pax1601/DCSOlympus/actions/runs/${artifact.workflow_run.id}/artifacts/${artifact.id}`) showConfirmPopup('A browser window was opened to download the beta artifact. Please wait for the download to complete, then press "Accept" and select the downloaded beta artifact.', @@ -262,17 +262,6 @@ contextBridge.exposeInMainWorld( window.addEventListener('DOMContentLoaded', async () => { document.getElementById("loader").classList.remove("hide"); await getManager().start(); - - /* Create event listeners for the hyperlinks */ - var links = document.querySelectorAll(".link"); - for (let i = 0; i < links.length; i++) { - if (links[i].dataset.link) { - links[i].addEventListener("click", (e) => { - if (e.target.dataset.link) - exec("start " + e.target.dataset.link); - }) - } - } }) window.addEventListener('resize', () => { diff --git a/manager/manager.log b/manager/manager.log deleted file mode 100644 index c2bfa646..00000000 --- a/manager/manager.log +++ /dev/null @@ -1,317 +0,0 @@ - ======================= New log starting at Thu Jan 11 2024 16:07:31 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Development build detected, skipping version checks... - ======================= New log starting at Thu Jan 11 2024 16:11:52 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:11:54 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:11:56 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:13:03 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:13:31 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:13:41 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:13:48 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:23:11 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:32 - 30|
- 31|
- >> 32|
User path
- 33|
Ports and address
- 34|
Passwords
- 35|
<%= install? 'Install': 'Update' %>
- -basic is not defined - at eval ("./ejs/connections.ejs":12:38) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:41:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:70:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:24:03 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:32 - 30|
- 31|
- >> 32|
User path
- 33|
Ports and address
- 34|
Passwords
- 35|
<%= install? 'Install': 'Update' %>
- -basic is not defined - at eval ("./ejs/connections.ejs":12:38) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:41:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:70:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:24:25 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:32 - 30|
- 31|
- >> 32|
User path
- 33|
Ports and address
- 34|
Passwords
- 35|
<%= install? 'Install': 'Update' %>
- -basic is not defined - at eval ("./ejs/connections.ejs":12:38) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:41:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:71:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:24:45 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:32 - 30|
- 31|
- >> 32|
User path
- 33|
Ports and address
- 34|
Passwords
- 35|
<%= install? 'Install': 'Update' %>
- -basic is not defined - at eval ("./ejs/connections.ejs":12:38) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:41:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:71:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:25:20 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:32 - 30|
- 31|
- >> 32|
User path
- 33|
Ports and address
- 34|
Passwords
- 35|
<%= install? 'Install': 'Update' %>
- -basic is not defined - at eval ("./ejs/connections.ejs":12:38) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:41:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:78:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:28:55 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:52 - 50| - 51|
- >> 52| "> - 53| - 54|
- 55| Port already in use - -instance is not defined - at eval ("./ejs/connections.ejs":18:26) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:41:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:78:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:29:02 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:52 - 50| - 51|
- >> 52| "> - 53| - 54|
- 55| Port already in use - -instance is not defined - at eval ("./ejs/connections.ejs":18:26) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:41:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:78:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:31:06 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:52 - 50| - 51|
- >> 52| "> - 53| - 54|
- 55| Port already in use - -instance is not defined - at eval ("./ejs/connections.ejs":18:26) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:41:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:77:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:37:31 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -ReferenceError: ./ejs/connections.ejs:52 - 50| - 51|
- >> 52| "> - 53| - 54|
- 55| Port already in use - -instance is not defined - at eval ("./ejs/connections.ejs":18:26) - at connections (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ConnectionsPage.show (D:\Documents\DCSOlympus\manager\javascripts\connections.js:38:13) - at Manager.start (D:\Documents\DCSOlympus\manager\javascripts\manager.js:77:42) - at process.processTicksAndRejections (node:internal/process/task_queues:95:5) - at async D:\Documents\DCSOlympus\manager\javascripts\preload.js:268:5 { - path: './ejs/connections.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:38:57 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:39:52 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:41:14 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:41:25 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:41:48 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:42:27 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:42:52 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:43:06 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:43:24 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 - ======================= New log starting at Thu Jan 11 2024 16:54:16 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts - ======================= New log starting at Thu Jan 11 2024 16:54:21 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 -ReferenceError: ./ejs/passwords.ejs:6 - 4|
- 5|
- >> 6|
User path
- 7|
Ports and address
- 8|
Passwords
- 9|
<%= install? 'Install': 'Update' %>
- -install is not defined - at eval ("./ejs/passwords.ejs":12:27) - at passwords (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at PasswordsPage.show (D:\Documents\DCSOlympus\manager\javascripts\passwords.js:35:13) - at ConnectionsPage.onNextClicked (D:\Documents\DCSOlympus\manager\javascripts\connections.js:58:36) - at HTMLDivElement. (D:\Documents\DCSOlympus\manager\javascripts\connections.js:21:87) { - path: './ejs/passwords.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:54:49 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 -ReferenceError: ./ejs/passwords.ejs:44 - 42|
- 43|
- >> 44| <% if (!basic) { %> - 45|
- 46| <%= install? "Cancel installation": "Cancel editing" %> - 47|
- -basic is not defined - at eval ("./ejs/passwords.ejs":18:8) - at passwords (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at PasswordsPage.show (D:\Documents\DCSOlympus\manager\javascripts\passwords.js:35:13) - at ConnectionsPage.onNextClicked (D:\Documents\DCSOlympus\manager\javascripts\connections.js:58:36) - at HTMLDivElement. (D:\Documents\DCSOlympus\manager\javascripts\connections.js:21:87) { - path: './ejs/passwords.ejs' -} - ======================= New log starting at Thu Jan 11 2024 16:55:57 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 - ======================= New log starting at Fri Jan 12 2024 08:51:22 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Development build detected, skipping version checks... -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 - ======================= New log starting at Fri Jan 12 2024 08:53:17 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 - ======================= New log starting at Fri Jan 12 2024 08:53:42 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 -ReferenceError: ./ejs/result.ejs:132 - 130|
- 131| - >> 132| <%= instance.name %> - 133| - 134| - 135| <%= instance.folder %> - -instance is not defined - at eval ("./ejs/result.ejs":27:26) - at result (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:703:17) - at tryHandleCache (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:274:36) - at exports.renderFile (D:\Documents\DCSOlympus\manager\node_modules\ejs\lib\ejs.js:491:10) - at ResultPage.show (D:\Documents\DCSOlympus\manager\javascripts\result.js:25:13) - at PasswordsPage.onNextClicked (D:\Documents\DCSOlympus\manager\javascripts\passwords.js:40:33) - at HTMLDivElement. (D:\Documents\DCSOlympus\manager\javascripts\managerpage.js:39:87) { - path: './ejs/result.ejs' -} - ======================= New log starting at Fri Jan 12 2024 08:54:41 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 - ======================= New log starting at Fri Jan 12 2024 08:56:11 GMT+0100 (Central European Standard Time) ======================= -Running in D:\Documents\DCSOlympus\manager\javascripts -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3000 -Instance C:\Users\dpassoni\Saved Games\dcs.openbeta client port set to 3001 -Installing hooks in C:\Users\dpassoni\Saved Games\dcs.openbeta -Error installing hooks in C:\Users\dpassoni\Saved Games\dcs.openbeta: Error: ENOENT: no such file or directory, lstat 'D:\Documents\DCSOlympus\scripts\OlympusHook.lua' diff --git a/manager/stylesheets/style.css b/manager/stylesheets/style.css index 80af768d..0b831d0d 100644 --- a/manager/stylesheets/style.css +++ b/manager/stylesheets/style.css @@ -275,8 +275,8 @@ input { left: 0px; width: 100%; height: 100%; - background-color: white; - opacity: 15%; + background-color: black; + opacity: 30%; z-index: 999; }