Improve DX and update package.json dependencies (#24)

* chore: Update package.json dependencies and description

* chore: format files and enable format on save

* chore: Update package.json name to "OpenFusionClient"

* chore: Update package.json description to "OpenFusionClient"

* chore: Update package name and lockfile for OpenFusionClient
This commit is contained in:
Hichem Fantar 2024-07-15 02:54:29 +01:00 committed by GitHub
parent d52e149192
commit 451cb4a2af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 356 additions and 424 deletions

View File

@ -3,7 +3,7 @@ name: Publish Build
on: on:
push: push:
branches: ["main"] branches: ["main"]
tags: '*' tags: "*"
permissions: permissions:
contents: write contents: write
@ -20,7 +20,7 @@ jobs:
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 20.x node-version: 20.x
cache: 'npm' cache: "npm"
- name: Install dependencies - name: Install dependencies
run: npm install run: npm install
- name: Pack into zip and create installer - name: Pack into zip and create installer

3
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"editor.formatOnSave": true
}

View File

@ -10,10 +10,7 @@ var userData = remote.require("app").getPath("userData");
var configPath = path.join(userData, "config.json"); var configPath = path.join(userData, "config.json");
var serversPath = path.join(userData, "servers.json"); var serversPath = path.join(userData, "servers.json");
var versionsPath = path.join(userData, "versions.json"); var versionsPath = path.join(userData, "versions.json");
var cacheRoot = path.join( var cacheRoot = path.join(userData, "/../../LocalLow/Unity/Web Player/Cache");
userData,
"/../../LocalLow/Unity/Web Player/Cache"
);
var offlineRootDefault = path.join(cacheRoot, "Offline"); var offlineRootDefault = path.join(cacheRoot, "Offline");
var offlineRoot = offlineRootDefault; var offlineRoot = offlineRootDefault;
@ -95,14 +92,15 @@ function validateServerSave(modalName) {
ipInput.classList.remove("invalidinput"); ipInput.classList.remove("invalidinput");
if ( if (
descInput.value.length < parseInt(descInput.getAttribute("minlength")) || descInput.value.length <
parseInt(descInput.getAttribute("minlength")) ||
descInput.value.length > parseInt(descInput.getAttribute("maxlength")) descInput.value.length > parseInt(descInput.getAttribute("maxlength"))
) { ) {
descInput.classList.add("invalidinput"); descInput.classList.add("invalidinput");
valid = false; valid = false;
} }
if (!(new RegExp(ipInput.getAttribute("pattern"))).test(ipInput.value)) { if (!new RegExp(ipInput.getAttribute("pattern")).test(ipInput.value)) {
ipInput.classList.add("invalidinput"); ipInput.classList.add("invalidinput");
valid = false; valid = false;
} }
@ -193,17 +191,17 @@ function validateVersionSave(modalName) {
var matchingVersions = versionArray.filter(function (obj) { var matchingVersions = versionArray.filter(function (obj) {
return obj.name === nameInput.value; return obj.name === nameInput.value;
}); });
var allowedMatches = (modalName === "edit") ? 1 : 0; var allowedMatches = modalName === "edit" ? 1 : 0;
if ( if (
matchingVersions.length > allowedMatches || matchingVersions.length > allowedMatches ||
!(new RegExp(nameInput.getAttribute("pattern"))).test(nameInput.value) !new RegExp(nameInput.getAttribute("pattern")).test(nameInput.value)
) { ) {
nameInput.classList.add("invalidinput"); nameInput.classList.add("invalidinput");
valid = false; valid = false;
} }
if (!(new RegExp(urlInput.getAttribute("pattern"))).test(urlInput.value)) { if (!new RegExp(urlInput.getAttribute("pattern")).test(urlInput.value)) {
urlInput.classList.add("invalidinput"); urlInput.classList.add("invalidinput");
valid = false; valid = false;
} }
@ -246,7 +244,10 @@ function editVersion() {
var editedVersionString = null; var editedVersionString = null;
$.each(jsonToModify["versions"], function (key, value) { $.each(jsonToModify["versions"], function (key, value) {
if (value["name"] == getSelectedVersion() && !defaultHashes.hasOwnProperty(value["name"])) { if (
value["name"] == getSelectedVersion() &&
!defaultHashes.hasOwnProperty(value["name"])
) {
value["name"] = value["name"] =
$("#editversion-nameinput").val().length == 0 $("#editversion-nameinput").val().length == 0
? value["name"] ? value["name"]
@ -296,18 +297,27 @@ function restoreDefaultVersions() {
function editConfig() { function editConfig() {
var jsonToModify = JSON.parse(remotefs.readFileSync(configPath)); var jsonToModify = JSON.parse(remotefs.readFileSync(configPath));
jsonToModify["autoupdate-check"] = $("#editconfig-autoupdate").prop("checked"); jsonToModify["autoupdate-check"] = $("#editconfig-autoupdate").prop(
jsonToModify["cache-swapping"] = $("#editconfig-cacheswapping").prop("checked"); "checked"
jsonToModify["enable-offline-cache"] = $("#editconfig-enableofflinecache").prop("checked"); );
jsonToModify["verify-offline-cache"] = $("#editconfig-verifyofflinecache").prop("checked"); jsonToModify["cache-swapping"] = $("#editconfig-cacheswapping").prop(
"checked"
);
jsonToModify["enable-offline-cache"] = $(
"#editconfig-enableofflinecache"
).prop("checked");
jsonToModify["verify-offline-cache"] = $(
"#editconfig-verifyofflinecache"
).prop("checked");
var dirInput = $("#editconfig-offlinecachelocation:text").val(); var dirInput = $("#editconfig-offlinecachelocation:text").val();
var shouldChangeRoot = ( var shouldChangeRoot =
remotefs.existsSync(dirInput) && remotefs.existsSync(dirInput) &&
remotefs.statSync(dirInput).isDirectory() remotefs.statSync(dirInput).isDirectory();
);
jsonToModify["offline-cache-location"] = shouldChangeRoot ? dirInput : offlineRoot; jsonToModify["offline-cache-location"] = shouldChangeRoot
? dirInput
: offlineRoot;
remotefs.writeFileSync(configPath, JSON.stringify(jsonToModify, null, 4)); remotefs.writeFileSync(configPath, JSON.stringify(jsonToModify, null, 4));
@ -323,7 +333,10 @@ function validateCacheLocation() {
input.classList.remove("invalidinput"); input.classList.remove("invalidinput");
button.removeAttribute("disabled"); button.removeAttribute("disabled");
if (!remotefs.existsSync(input.value) || !remotefs.statSync(input.value).isDirectory()) { if (
!remotefs.existsSync(input.value) ||
!remotefs.statSync(input.value).isDirectory()
) {
input.classList.add("invalidinput"); input.classList.add("invalidinput");
button.setAttribute("disabled", ""); button.setAttribute("disabled", "");
} }
@ -348,8 +361,14 @@ function loadConfig() {
$("#editconfig-autoupdate").prop("checked", config["autoupdate-check"]); $("#editconfig-autoupdate").prop("checked", config["autoupdate-check"]);
$("#editconfig-cacheswapping").prop("checked", config["cache-swapping"]); $("#editconfig-cacheswapping").prop("checked", config["cache-swapping"]);
$("#editconfig-enableofflinecache").prop("checked", config["enable-offline-cache"]); $("#editconfig-enableofflinecache").prop(
$("#editconfig-verifyofflinecache").prop("checked", config["verify-offline-cache"]); "checked",
config["enable-offline-cache"]
);
$("#editconfig-verifyofflinecache").prop(
"checked",
config["verify-offline-cache"]
);
// alter offline root globally // alter offline root globally
offlineRoot = config["offline-cache-location"] || offlineRootDefault; offlineRoot = config["offline-cache-location"] || offlineRootDefault;
@ -395,10 +414,9 @@ function loadCacheList() {
// load default hashes.json for reference while running the cache handler // load default hashes.json for reference while running the cache handler
if (!defaultHashes) { if (!defaultHashes) {
defaultHashes = remotefs.readJsonSync(path.join( defaultHashes = remotefs.readJsonSync(
__dirname, path.join(__dirname, "/defaults/hashes.json")
"/defaults/hashes.json" );
));
} }
deselectVersion(); // Remove selection and disable buttons until another server is selected deselectVersion(); // Remove selection and disable buttons until another server is selected
@ -406,7 +424,7 @@ function loadCacheList() {
$.each(versionArray, function (key, value) { $.each(versionArray, function (key, value) {
var row = document.createElement("tr"); var row = document.createElement("tr");
row.className = "cache-listing-entry" row.className = "cache-listing-entry";
row.setAttribute("id", value.name); row.setAttribute("id", value.name);
var cellVersion = document.createElement("td"); var cellVersion = document.createElement("td");
@ -430,24 +448,34 @@ function loadCacheList() {
} }
function getCacheElemID(versionString, cacheMode, elementName) { function getCacheElemID(versionString, cacheMode, elementName) {
return [versionString, cacheMode, "cache", elementName].filter(function (value) { return [versionString, cacheMode, "cache", elementName]
.filter(function (value) {
return typeof value !== "undefined"; return typeof value !== "undefined";
}).join("-"); })
.join("-");
} }
function getCacheButtonID(versionString, cacheMode, buttonMode) { function getCacheButtonID(versionString, cacheMode, buttonMode) {
return [getCacheElemID(versionString, cacheMode), buttonMode, "button"].join("-"); return [
getCacheElemID(versionString, cacheMode),
buttonMode,
"button",
].join("-");
} }
function getCacheLabelText(sizes) { function getCacheLabelText(sizes) {
if (!sizes || sizes.total === 0) if (!sizes || sizes.total === 0) return "?.?? GB / ?.?? GB";
return "?.?? GB / ?.?? GB";
var gb = 1 << 30; var gb = 1 << 30;
var labelText = (sizes.intact / gb).toFixed(2) + " / " + (sizes.total / gb).toFixed(2) + " GB"; var labelText =
(sizes.intact / gb).toFixed(2) +
" / " +
(sizes.total / gb).toFixed(2) +
" GB";
if (sizes.altered > 0) { if (sizes.altered > 0) {
labelText += "<br/>(" + (sizes.altered / gb).toFixed(2) + " GB Altered)"; labelText +=
"<br/>(" + (sizes.altered / gb).toFixed(2) + " GB Altered)";
} }
return labelText; return labelText;
@ -461,18 +489,18 @@ function getCacheInfoCell(versionString, cacheMode) {
download: { download: {
icon: "fas fa-download", icon: "fas fa-download",
class: "btn btn-success mr-1", class: "btn btn-success mr-1",
tooltip: "Download Cache" tooltip: "Download Cache",
}, },
fix: { fix: {
icon: "fas fa-hammer", icon: "fas fa-hammer",
class: "btn btn-warning mr-1", class: "btn btn-warning mr-1",
tooltip: "Fix Altered Files in Cache" tooltip: "Fix Altered Files in Cache",
}, },
delete: { delete: {
icon: "fas fa-trash-alt", icon: "fas fa-trash-alt",
class: "btn btn-danger mr-1", class: "btn btn-danger mr-1",
tooltip: "Delete Cache" tooltip: "Delete Cache",
} },
}; };
var cellCache = document.createElement("td"); var cellCache = document.createElement("td");
@ -483,9 +511,9 @@ function getCacheInfoCell(versionString, cacheMode) {
labelCache.setAttribute("for", divID); labelCache.setAttribute("for", divID);
// pull existing info from cacheSizes when available // pull existing info from cacheSizes when available
labelCache.innerHTML = getCacheLabelText( labelCache.innerHTML = getCacheLabelText(
(cacheSizes && cacheSizes[versionString]) ? cacheSizes && cacheSizes[versionString]
cacheSizes[versionString][cacheMode] : ? cacheSizes[versionString][cacheMode]
null : null
); );
var divCacheButtons = document.createElement("div"); var divCacheButtons = document.createElement("div");
@ -508,7 +536,16 @@ function getCacheInfoCell(versionString, cacheMode) {
buttonCache.setAttribute("title", config.tooltip); buttonCache.setAttribute("title", config.tooltip);
buttonCache.setAttribute("type", "button"); buttonCache.setAttribute("type", "button");
// handler setup // handler setup
buttonCache.setAttribute("onclick", "handleCache(\"" + buttonMode + "\", \"" + versionString + "\", \"" + cacheMode + "\");"); buttonCache.setAttribute(
"onclick",
'handleCache("' +
buttonMode +
'", "' +
versionString +
'", "' +
cacheMode +
'");'
);
buttonCache.appendChild(iconItalic); buttonCache.appendChild(iconItalic);
divCacheButtons.appendChild(buttonCache); divCacheButtons.appendChild(buttonCache);
@ -526,13 +563,12 @@ function storageLoadingStart(vString, cMode) {
var versionStrings = []; var versionStrings = [];
$.each(versionArray, function (key, value) { $.each(versionArray, function (key, value) {
if (vString) { if (vString) {
if (vString === value.name) if (vString === value.name) versionStrings.push(value.name);
versionStrings.push(value.name);
} else { } else {
versionStrings.push(value.name); versionStrings.push(value.name);
} }
}); });
var cacheModes = (cMode) ? [cMode] : ["offline", "playable"]; var cacheModes = cMode ? [cMode] : ["offline", "playable"];
// deselect and disable the add version button until they are re-enabled // deselect and disable the add version button until they are re-enabled
deselectVersion(); deselectVersion();
@ -541,21 +577,36 @@ function storageLoadingStart(vString, cMode) {
// turn buttons into spinners // turn buttons into spinners
$.each(versionStrings, function (vKey, versionString) { $.each(versionStrings, function (vKey, versionString) {
$.each(cacheModes, function (cKey, cacheMode) { $.each(cacheModes, function (cKey, cacheMode) {
var buttonDelete = document.getElementById(getCacheButtonID(versionString, cacheMode, "delete")); var buttonDelete = document.getElementById(
var buttonDownload = document.getElementById(getCacheButtonID(versionString, cacheMode, "download")); getCacheButtonID(versionString, cacheMode, "delete")
var buttonFix = document.getElementById(getCacheButtonID(versionString, cacheMode, "fix")); );
var buttonDownload = document.getElementById(
getCacheButtonID(versionString, cacheMode, "download")
);
var buttonFix = document.getElementById(
getCacheButtonID(versionString, cacheMode, "fix")
);
if (!buttonDelete) return; if (!buttonDelete) return;
buttonDelete.setAttribute("disabled", ""); buttonDelete.setAttribute("disabled", "");
buttonDelete.children[0].setAttribute("class", "fas fa-spinner fa-spin fa-fw"); buttonDelete.children[0].setAttribute(
"class",
"fas fa-spinner fa-spin fa-fw"
);
if (cacheMode === "offline") { if (cacheMode === "offline") {
buttonDownload.setAttribute("disabled", ""); buttonDownload.setAttribute("disabled", "");
buttonDownload.children[0].setAttribute("class", "fas fa-spinner fa-spin fa-fw"); buttonDownload.children[0].setAttribute(
"class",
"fas fa-spinner fa-spin fa-fw"
);
buttonFix.setAttribute("disabled", ""); buttonFix.setAttribute("disabled", "");
buttonFix.children[0].setAttribute("class", "fas fa-spinner fa-spin fa-fw"); buttonFix.children[0].setAttribute(
"class",
"fas fa-spinner fa-spin fa-fw"
);
} }
}); });
}); });
@ -565,7 +616,9 @@ function storageLoadingUpdate(allSizes) {
// update cacheSizes and display results // update cacheSizes and display results
$.each(allSizes, function (versionString, vSizes) { $.each(allSizes, function (versionString, vSizes) {
$.each(vSizes, function (cacheMode, sizes) { $.each(vSizes, function (cacheMode, sizes) {
var label = document.getElementById(getCacheElemID(versionString, cacheMode, "label")); var label = document.getElementById(
getCacheElemID(versionString, cacheMode, "label")
);
cacheSizes = cacheSizes || {}; cacheSizes = cacheSizes || {};
cacheSizes[versionString] = cacheSizes[versionString] || {}; cacheSizes[versionString] = cacheSizes[versionString] || {};
@ -582,16 +635,25 @@ function storageLoadingComplete(allSizes) {
// re-enable buttons according to the sizes that were read // re-enable buttons according to the sizes that were read
$.each(allSizes, function (versionString, vSizes) { $.each(allSizes, function (versionString, vSizes) {
$.each(vSizes, function (cacheMode, sizes) { $.each(vSizes, function (cacheMode, sizes) {
var buttonDelete = document.getElementById(getCacheButtonID(versionString, cacheMode, "delete")); var buttonDelete = document.getElementById(
var buttonDownload = document.getElementById(getCacheButtonID(versionString, cacheMode, "download")); getCacheButtonID(versionString, cacheMode, "delete")
var buttonFix = document.getElementById(getCacheButtonID(versionString, cacheMode, "fix")); );
var buttonDownload = document.getElementById(
getCacheButtonID(versionString, cacheMode, "download")
);
var buttonFix = document.getElementById(
getCacheButtonID(versionString, cacheMode, "fix")
);
if (!buttonDelete) return; if (!buttonDelete) return;
buttonDelete.children[0].setAttribute("class", "fas fa-trash-alt"); buttonDelete.children[0].setAttribute("class", "fas fa-trash-alt");
if (cacheMode === "offline") { if (cacheMode === "offline") {
buttonDownload.children[0].setAttribute("class", "fas fa-download"); buttonDownload.children[0].setAttribute(
"class",
"fas fa-download"
);
buttonFix.children[0].setAttribute("class", "fas fa-hammer"); buttonFix.children[0].setAttribute("class", "fas fa-hammer");
} }
@ -626,7 +688,7 @@ function handleCache(operation, versionString, cacheMode, callback) {
return obj.name === versionString; return obj.name === versionString;
}); });
// pull version url from the found object, if none found, use the default cdn link // pull version url from the found object, if none found, use the default cdn link
var cdnRoot = (versions.length === 0) ? cdnString : versions[0].url; var cdnRoot = versions.length === 0 ? cdnString : versions[0].url;
var lastSizes = { intact: 0, altered: 0, total: 0 }; var lastSizes = { intact: 0, altered: 0, total: 0 };
var buf = ""; var buf = "";
@ -665,28 +727,42 @@ function handleCache(operation, versionString, cacheMode, callback) {
spawn( spawn(
path.join(__dirname, "lib", "cache_handler.exe"), path.join(__dirname, "lib", "cache_handler.exe"),
[ [
"--operation", operation, "--operation",
operation,
// roots below contain version-agnostic main directories for caches // roots below contain version-agnostic main directories for caches
"--playable-root", cacheRoot, "--playable-root",
"--offline-root", offlineRoot, cacheRoot,
"--user-dir", userData, "--offline-root",
offlineRoot,
"--user-dir",
userData,
// CDN root contains version-specific directory, unless cacheMode is "all" // CDN root contains version-specific directory, unless cacheMode is "all"
"--cdn-root", cdnRoot, "--cdn-root",
"--cache-mode", cacheMode || "all", cdnRoot,
"--cache-version", versionString || "all", "--cache-mode",
cacheMode || "all",
"--cache-version",
versionString || "all",
// learn port from the server object and tell the script where to connect // learn port from the server object and tell the script where to connect
"--port", server.address().port, "--port",
server.address().port,
// tell the script which versions and caches are official // tell the script which versions and caches are official
"--official-caches" "--official-caches",
].concat(Object.keys(defaultHashes)), ].concat(Object.keys(defaultHashes)),
{ {
stdio: "inherit" stdio: "inherit",
} }
).on("exit", function (code, signal) { ).on("exit", function (code, signal) {
if (code !== 0 || signal) { if (code !== 0 || signal) {
dialog.showErrorBox( dialog.showErrorBox(
"Sorry!", "Sorry!",
"Process \"" + operation + "\" failed with code " + code + " and signal " + signal + "." 'Process "' +
operation +
'" failed with code ' +
code +
" and signal " +
signal +
"."
); );
} }
@ -713,7 +789,10 @@ function performCacheSwap(newVersion) {
if (remotefs.existsSync(currentCache)) { if (remotefs.existsSync(currentCache)) {
// Cache already exists, find out what version it belongs to // Cache already exists, find out what version it belongs to
if (remotefs.existsSync(record)) { if (remotefs.existsSync(record)) {
var lastVersion = remotefs.readFileSync(record, (encoding = "utf8")); var lastVersion = remotefs.readFileSync(
record,
(encoding = "utf8")
);
if (lastVersion != newVersion) { if (lastVersion != newVersion) {
// Remove the directory we're trying to store the // Remove the directory we're trying to store the
// existing cache to if it already exists for whatever // existing cache to if it already exists for whatever
@ -773,23 +852,33 @@ function prepGameInfo(serverUUID) {
if (config["verify-offline-cache"]) { if (config["verify-offline-cache"]) {
// if required, do a full hash check, and use the offline cache only if it is fully intact // if required, do a full hash check, and use the offline cache only if it is fully intact
handleCache("hash-check", versionInfo.name, "offline", function (sizes) { handleCache(
var versionURL = (sizes.intact < sizes.total) ? versionInfo.url : offlineURL; "hash-check",
versionInfo.name,
"offline",
function (sizes) {
var versionURL =
sizes.intact < sizes.total ? versionInfo.url : offlineURL;
setGameInfo(serverInfo, versionURL); setGameInfo(serverInfo, versionURL);
}); }
);
return; return;
} }
// otherwise, if main.unity3d is present, use the offline cache // otherwise, if main.unity3d is present, use the offline cache
var mainPath = path.join(offlinePath, "main.unity3d"); var mainPath = path.join(offlinePath, "main.unity3d");
var versionURL = !remotefs.existsSync(mainPath) ? versionInfo.url : offlineURL; var versionURL = !remotefs.existsSync(mainPath)
? versionInfo.url
: offlineURL;
setGameInfo(serverInfo, versionURL); setGameInfo(serverInfo, versionURL);
} }
// For writing loginInfo.php, assetInfo.php, etc. // For writing loginInfo.php, assetInfo.php, etc.
function setGameInfo(serverInfo, versionURL) { function setGameInfo(serverInfo, versionURL) {
// slash fix if people mess it up via text editors // slash fix if people mess it up via text editors
var versionURLRoot = versionURL.endsWith("/") ? versionURL : versionURL + "/"; var versionURLRoot = versionURL.endsWith("/")
? versionURL
: versionURL + "/";
window.assetUrl = versionURLRoot; // game-client.js needs to access this window.assetUrl = versionURLRoot; // game-client.js needs to access this
console.log("Cache will expand from " + versionURLRoot); console.log("Cache will expand from " + versionURLRoot);

View File

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -510,21 +510,24 @@
id="editconfig-autoupdate" id="editconfig-autoupdate"
/> />
<label for="editconfig-cacheswapping" <label for="editconfig-cacheswapping"
>Swap game caches to avoid unnecessary downloads:</label >Swap game caches to avoid unnecessary
downloads:</label
><input ><input
class="form-control form-row w-75" class="form-control form-row w-75"
type="checkbox" type="checkbox"
id="editconfig-cacheswapping" id="editconfig-cacheswapping"
/> />
<label for="editconfig-enableofflinecache" <label for="editconfig-enableofflinecache"
>Use offline caches when they are available:</label >Use offline caches when they are
available:</label
><input ><input
class="form-control form-row w-75" class="form-control form-row w-75"
type="checkbox" type="checkbox"
id="editconfig-enableofflinecache" id="editconfig-enableofflinecache"
/> />
<label for="editconfig-verifyofflinecache" <label for="editconfig-verifyofflinecache"
>Verify offline caches every time they are loaded:</label >Verify offline caches every time they are
loaded:</label
><input ><input
class="form-control form-row w-75" class="form-control form-row w-75"
type="checkbox" type="checkbox"
@ -568,7 +571,10 @@
tabindex="-1" tabindex="-1"
id="of-editcacheconfigmodal" id="of-editcacheconfigmodal"
> >
<div class="modal-dialog modal-dialog-centered modal-lg" role="document"> <div
class="modal-dialog modal-dialog-centered modal-lg"
role="document"
>
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Edit Game Builds</h4> <h4 class="modal-title">Edit Game Builds</h4>
@ -636,7 +642,9 @@
class="table-responsive text-center border rounded border-primary" class="table-responsive text-center border rounded border-primary"
id="cache-table" id="cache-table"
> >
<table class="table table-striped table-hover mb-0"> <table
class="table table-striped table-hover mb-0"
>
<thead> <thead>
<tr> <tr>
<th>Game Version</th> <th>Game Version</th>
@ -644,8 +652,7 @@
<th>Offline Cache</th> <th>Offline Cache</th>
</tr> </tr>
</thead> </thead>
<tbody id="cache-tablebody"> <tbody id="cache-tablebody"></tbody>
</tbody>
</table> </table>
</div> </div>
</div> </div>
@ -738,7 +745,10 @@
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<form id="editversion-form" class="needs-validation"> <form
id="editversion-form"
class="needs-validation"
>
<label for="editversion-nameinput" <label for="editversion-nameinput"
>Version Name</label >Version Name</label
><input ><input

View File

@ -34,9 +34,12 @@ function initialSetup(firstTime) {
if (!firstTime) { if (!firstTime) {
// Migration from pre-1.6 // Migration from pre-1.6
// Back everything up, just in case // Back everything up, just in case
if (fs.existsSync(configPath)) fs.copySync(configPath, configPath + ".bak"); if (fs.existsSync(configPath))
if (fs.existsSync(serversPath)) fs.copySync(serversPath, serversPath + ".bak"); fs.copySync(configPath, configPath + ".bak");
if (fs.existsSync(versionsPath)) fs.copySync(versionsPath, versionsPath + ".bak"); if (fs.existsSync(serversPath))
fs.copySync(serversPath, serversPath + ".bak");
if (fs.existsSync(versionsPath))
fs.copySync(versionsPath, versionsPath + ".bak");
if (fs.existsSync(hashPath)) fs.copySync(hashPath, hashPath + ".bak"); if (fs.existsSync(hashPath)) fs.copySync(hashPath, hashPath + ".bak");
} else { } else {
// First-time setup // First-time setup

417
package-lock.json generated
View File

@ -15,8 +15,8 @@
"devDependencies": { "devDependencies": {
"electron-builder": "^22.14.13", "electron-builder": "^22.14.13",
"electron-prebuilt": "^0.31.2", "electron-prebuilt": "^0.31.2",
"patch-package": "^6.5.1", "patch-package": "^7.0.2",
"prettier": "^2.7.1" "prettier": "^3.3.3"
} }
}, },
"node_modules/@develar/schema-utils": { "node_modules/@develar/schema-utils": {
@ -112,65 +112,6 @@
"node": ">= 10" "node": ">= 10"
} }
}, },
"node_modules/@malept/cross-spawn-promise/node_modules/cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true,
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/@malept/cross-spawn-promise/node_modules/path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/@malept/cross-spawn-promise/node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true,
"dependencies": {
"shebang-regex": "^3.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/@malept/cross-spawn-promise/node_modules/shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/@malept/cross-spawn-promise/node_modules/which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"dependencies": {
"isexe": "^2.0.0"
},
"bin": {
"node-which": "bin/node-which"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/@malept/flatpak-bundler": { "node_modules/@malept/flatpak-bundler": {
"version": "0.4.0", "version": "0.4.0",
"resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz", "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz",
@ -996,20 +937,6 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/builder-util/node_modules/cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true,
"dependencies": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/builder-util/node_modules/debug": { "node_modules/builder-util/node_modules/debug": {
"version": "4.3.4", "version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@ -1059,51 +986,6 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true "dev": true
}, },
"node_modules/builder-util/node_modules/path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/builder-util/node_modules/shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true,
"dependencies": {
"shebang-regex": "^3.0.0"
},
"engines": {
"node": ">=8"
}
},
"node_modules/builder-util/node_modules/shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true,
"engines": {
"node": ">=8"
}
},
"node_modules/builder-util/node_modules/which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"dependencies": {
"isexe": "^2.0.0"
},
"bin": {
"node-which": "bin/node-which"
},
"engines": {
"node": ">= 8"
}
},
"node_modules/cacheable-request": { "node_modules/cacheable-request": {
"version": "6.1.0", "version": "6.1.0",
"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
@ -1423,19 +1305,17 @@
} }
}, },
"node_modules/cross-spawn": { "node_modules/cross-spawn": {
"version": "6.0.5", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"nice-try": "^1.0.4", "path-key": "^3.1.0",
"path-key": "^2.0.1", "shebang-command": "^2.0.0",
"semver": "^5.5.0", "which": "^2.0.1"
"shebang-command": "^1.2.0",
"which": "^1.2.9"
}, },
"engines": { "engines": {
"node": ">=4.8" "node": ">= 8"
} }
}, },
"node_modules/crypto-random-string": { "node_modules/crypto-random-string": {
@ -2597,7 +2477,7 @@
"node_modules/isexe": { "node_modules/isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"dev": true "dev": true
}, },
"node_modules/isstream": { "node_modules/isstream": {
@ -2968,12 +2848,6 @@
"ncp": "bin/ncp" "ncp": "bin/ncp"
} }
}, },
"node_modules/nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
"dev": true
},
"node_modules/node-addon-api": { "node_modules/node-addon-api": {
"version": "1.7.2", "version": "1.7.2",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
@ -3124,34 +2998,49 @@
} }
}, },
"node_modules/patch-package": { "node_modules/patch-package": {
"version": "6.5.1", "version": "7.0.2",
"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.5.1.tgz", "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-7.0.2.tgz",
"integrity": "sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==", "integrity": "sha512-PMYfL8LXxGIRmxXLqlEaBxzKPu7/SdP13ld6GSfAUJUZRmBDPp8chZs0dpzaAFn9TSPnFiMwkC6PJt6pBiAl8Q==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@yarnpkg/lockfile": "^1.1.0", "@yarnpkg/lockfile": "^1.1.0",
"chalk": "^4.1.2", "chalk": "^4.1.2",
"cross-spawn": "^6.0.5", "ci-info": "^3.7.0",
"cross-spawn": "^7.0.3",
"find-yarn-workspace-root": "^2.0.0", "find-yarn-workspace-root": "^2.0.0",
"fs-extra": "^9.0.0", "fs-extra": "^9.0.0",
"is-ci": "^2.0.0",
"klaw-sync": "^6.0.0", "klaw-sync": "^6.0.0",
"minimist": "^1.2.6", "minimist": "^1.2.6",
"open": "^7.4.2", "open": "^7.4.2",
"rimraf": "^2.6.3", "rimraf": "^2.6.3",
"semver": "^5.6.0", "semver": "^7.5.3",
"slash": "^2.0.0", "slash": "^2.0.0",
"tmp": "^0.0.33", "tmp": "^0.0.33",
"yaml": "^1.10.2" "yaml": "^2.2.2"
}, },
"bin": { "bin": {
"patch-package": "index.js" "patch-package": "index.js"
}, },
"engines": { "engines": {
"node": ">=10", "node": ">=14",
"npm": ">5" "npm": ">5"
} }
}, },
"node_modules/patch-package/node_modules/ci-info": {
"version": "3.9.0",
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
"dev": true,
"funding": [
{
"type": "github",
"url": "https://github.com/sponsors/sibiraj-s"
}
],
"engines": {
"node": ">=8"
}
},
"node_modules/patch-package/node_modules/fs-extra": { "node_modules/patch-package/node_modules/fs-extra": {
"version": "9.1.0", "version": "9.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@ -3199,6 +3088,18 @@
"rimraf": "bin.js" "rimraf": "bin.js"
} }
}, },
"node_modules/patch-package/node_modules/semver": {
"version": "7.6.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
"integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
"dev": true,
"bin": {
"semver": "bin/semver.js"
},
"engines": {
"node": ">=10"
}
},
"node_modules/path-exists": { "node_modules/path-exists": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-1.0.0.tgz",
@ -3218,12 +3119,12 @@
} }
}, },
"node_modules/path-key": { "node_modules/path-key": {
"version": "2.0.1", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=4" "node": ">=8"
} }
}, },
"node_modules/path-parse": { "node_modules/path-parse": {
@ -3323,15 +3224,15 @@
} }
}, },
"node_modules/prettier": { "node_modules/prettier": {
"version": "2.7.1", "version": "3.3.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
"dev": true, "dev": true,
"bin": { "bin": {
"prettier": "bin-prettier.js" "prettier": "bin/prettier.cjs"
}, },
"engines": { "engines": {
"node": ">=10.13.0" "node": ">=14"
}, },
"funding": { "funding": {
"url": "https://github.com/prettier/prettier?sponsor=1" "url": "https://github.com/prettier/prettier?sponsor=1"
@ -3681,24 +3582,24 @@
} }
}, },
"node_modules/shebang-command": { "node_modules/shebang-command": {
"version": "1.2.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"shebang-regex": "^1.0.0" "shebang-regex": "^3.0.0"
}, },
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=8"
} }
}, },
"node_modules/shebang-regex": { "node_modules/shebang-regex": {
"version": "1.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true, "dev": true,
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=8"
} }
}, },
"node_modules/signal-exit": { "node_modules/signal-exit": {
@ -4314,15 +4215,18 @@
} }
}, },
"node_modules/which": { "node_modules/which": {
"version": "1.3.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"isexe": "^2.0.0" "isexe": "^2.0.0"
}, },
"bin": { "bin": {
"which": "bin/which" "node-which": "bin/node-which"
},
"engines": {
"node": ">= 8"
} }
}, },
"node_modules/widest-line": { "node_modules/widest-line": {
@ -4439,12 +4343,15 @@
"dev": true "dev": true
}, },
"node_modules/yaml": { "node_modules/yaml": {
"version": "1.10.2", "version": "2.4.5",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
"dev": true, "dev": true,
"bin": {
"yaml": "bin.mjs"
},
"engines": { "engines": {
"node": ">= 6" "node": ">= 14"
} }
}, },
"node_modules/yargs": { "node_modules/yargs": {
@ -4545,49 +4452,6 @@
"dev": true, "dev": true,
"requires": { "requires": {
"cross-spawn": "^7.0.1" "cross-spawn": "^7.0.1"
},
"dependencies": {
"cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true,
"requires": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
}
},
"path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true
},
"shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true,
"requires": {
"shebang-regex": "^3.0.0"
}
},
"shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true
},
"which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}
}
} }
}, },
"@malept/flatpak-bundler": { "@malept/flatpak-bundler": {
@ -5207,17 +5071,6 @@
"integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==", "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==",
"dev": true "dev": true
}, },
"cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true,
"requires": {
"path-key": "^3.1.0",
"shebang-command": "^2.0.0",
"which": "^2.0.1"
}
},
"debug": { "debug": {
"version": "4.3.4", "version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@ -5252,36 +5105,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true "dev": true
},
"path-key": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true
},
"shebang-command": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true,
"requires": {
"shebang-regex": "^3.0.0"
}
},
"shebang-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true
},
"which": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"requires": {
"isexe": "^2.0.0"
}
} }
} }
}, },
@ -5571,16 +5394,14 @@
} }
}, },
"cross-spawn": { "cross-spawn": {
"version": "6.0.5", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
"dev": true, "dev": true,
"requires": { "requires": {
"nice-try": "^1.0.4", "path-key": "^3.1.0",
"path-key": "^2.0.1", "shebang-command": "^2.0.0",
"semver": "^5.5.0", "which": "^2.0.1"
"shebang-command": "^1.2.0",
"which": "^1.2.9"
} }
}, },
"crypto-random-string": { "crypto-random-string": {
@ -6486,7 +6307,7 @@
"isexe": { "isexe": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"dev": true "dev": true
}, },
"isstream": { "isstream": {
@ -6776,12 +6597,6 @@
"integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=", "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=",
"dev": true "dev": true
}, },
"nice-try": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
"dev": true
},
"node-addon-api": { "node-addon-api": {
"version": "1.7.2", "version": "1.7.2",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz",
@ -6901,27 +6716,33 @@
} }
}, },
"patch-package": { "patch-package": {
"version": "6.5.1", "version": "7.0.2",
"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.5.1.tgz", "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-7.0.2.tgz",
"integrity": "sha512-I/4Zsalfhc6bphmJTlrLoOcAF87jcxko4q0qsv4bGcurbr8IskEOtdnt9iCmsQVGL1B+iUhSQqweyTLJfCF9rA==", "integrity": "sha512-PMYfL8LXxGIRmxXLqlEaBxzKPu7/SdP13ld6GSfAUJUZRmBDPp8chZs0dpzaAFn9TSPnFiMwkC6PJt6pBiAl8Q==",
"dev": true, "dev": true,
"requires": { "requires": {
"@yarnpkg/lockfile": "^1.1.0", "@yarnpkg/lockfile": "^1.1.0",
"chalk": "^4.1.2", "chalk": "^4.1.2",
"cross-spawn": "^6.0.5", "ci-info": "^3.7.0",
"cross-spawn": "^7.0.3",
"find-yarn-workspace-root": "^2.0.0", "find-yarn-workspace-root": "^2.0.0",
"fs-extra": "^9.0.0", "fs-extra": "^9.0.0",
"is-ci": "^2.0.0",
"klaw-sync": "^6.0.0", "klaw-sync": "^6.0.0",
"minimist": "^1.2.6", "minimist": "^1.2.6",
"open": "^7.4.2", "open": "^7.4.2",
"rimraf": "^2.6.3", "rimraf": "^2.6.3",
"semver": "^5.6.0", "semver": "^7.5.3",
"slash": "^2.0.0", "slash": "^2.0.0",
"tmp": "^0.0.33", "tmp": "^0.0.33",
"yaml": "^1.10.2" "yaml": "^2.2.2"
}, },
"dependencies": { "dependencies": {
"ci-info": {
"version": "3.9.0",
"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
"integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
"dev": true
},
"fs-extra": { "fs-extra": {
"version": "9.1.0", "version": "9.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@ -6956,6 +6777,12 @@
"requires": { "requires": {
"glob": "^7.1.3" "glob": "^7.1.3"
} }
},
"semver": {
"version": "7.6.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
"integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
"dev": true
} }
} }
}, },
@ -6972,9 +6799,9 @@
"dev": true "dev": true
}, },
"path-key": { "path-key": {
"version": "2.0.1", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
"integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
"dev": true "dev": true
}, },
"path-parse": { "path-parse": {
@ -7050,9 +6877,9 @@
"dev": true "dev": true
}, },
"prettier": { "prettier": {
"version": "2.7.1", "version": "3.3.3",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
"integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
"dev": true "dev": true
}, },
"pretty-bytes": { "pretty-bytes": {
@ -7326,18 +7153,18 @@
} }
}, },
"shebang-command": { "shebang-command": {
"version": "1.2.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
"dev": true, "dev": true,
"requires": { "requires": {
"shebang-regex": "^1.0.0" "shebang-regex": "^3.0.0"
} }
}, },
"shebang-regex": { "shebang-regex": {
"version": "1.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
"integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true "dev": true
}, },
"signal-exit": { "signal-exit": {
@ -7833,9 +7660,9 @@
} }
}, },
"which": { "which": {
"version": "1.3.1", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true, "dev": true,
"requires": { "requires": {
"isexe": "^2.0.0" "isexe": "^2.0.0"
@ -7930,9 +7757,9 @@
"dev": true "dev": true
}, },
"yaml": { "yaml": {
"version": "1.10.2", "version": "2.4.5",
"resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
"dev": true "dev": true
}, },
"yargs": { "yargs": {

View File

@ -15,8 +15,8 @@
"devDependencies": { "devDependencies": {
"electron-builder": "^22.14.13", "electron-builder": "^22.14.13",
"electron-prebuilt": "^0.31.2", "electron-prebuilt": "^0.31.2",
"patch-package": "^6.5.1", "patch-package": "^7.0.2",
"prettier": "^2.7.1" "prettier": "^3.3.3"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -25,7 +25,7 @@
"build": { "build": {
"appId": "xyz.openfusion.client", "appId": "xyz.openfusion.client",
"productName": "OpenFusionClient", "productName": "OpenFusionClient",
"copyright": "© 2020-2023 OpenFusion Contributors", "copyright": "© 2020-2024 OpenFusion Contributors",
"electronDownload": { "electronDownload": {
"version": "0.31.2", "version": "0.31.2",
"platform": "win32", "platform": "win32",