From 6bae0d1ff60d8b8904af7edc05fcbb6b5ff9032a Mon Sep 17 00:00:00 2001 From: FinnHornhoover Date: Sun, 22 Oct 2023 00:30:35 +0300 Subject: [PATCH] removed async, adjusted load logic, and hash check --- assets/js/server-selector.js | 42 ++++++++++++++++++++++++++++++------ defaults/config.json | 2 ++ index.html | 2 +- package.json | 3 +-- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/assets/js/server-selector.js b/assets/js/server-selector.js index a216fcd..09dc9d2 100644 --- a/assets/js/server-selector.js +++ b/assets/js/server-selector.js @@ -18,6 +18,7 @@ var offlineRoot = path.join(cacheRoot, "Offline"); var versionArray; var serverArray; +var cacheSizes; var config; function enableServerListButtons() { @@ -288,7 +289,13 @@ function storageLoadingUpdate(allSizes) { $.each(allSizes, function (versionString, vSizes) { $.each(vSizes, function (cacheMode, sizes) { var label = document.getElementById(getCacheElemID(versionString, cacheMode, "label")); + + cacheSizes = cacheSizes || {}; + cacheSizes[versionString] = cacheSizes[versionString] || {}; + cacheSizes[versionString][cacheMode] = sizes || {}; + if (!label) return; + label.innerHTML = getCacheLabelText(sizes); }); }); @@ -417,6 +424,12 @@ function loadCacheList() { }); } +function startHashCheck() { + // only run once + if (!cacheSizes) + handleCache("hash-check"); +} + function performCacheSwap(newVersion) { var currentCache = path.join(cacheRoot, "FusionFall"); var newCache = path.join(cacheRoot, newVersion); @@ -479,19 +492,34 @@ function prepGameInfo(serverUUID) { } } - handleCache("hash-check", versionInfo.name, "offline", function (sizes) { - var versionURL = (sizes.intact < sizes.total) ? - versionInfo.url : - "file:///" + path.join(offlineRoot, versionInfo.name).replace(/\\/g, "/") + "/"; - console.log("Cache will expand from " + versionURL); + if (config["always-use-cdn"]) { + // if we always ignore the offline cache, just use the URL + setGameInfo(serverInfo, versionInfo.url); + return; + } - setGameInfo(serverInfo, versionURL); - }); + var offlinePath = path.join(offlineRoot, versionInfo.name); + var offlineURL = "file:///" + offlinePath.replace(/\\/g, "/") + "/"; + + if (config["verify-offline-cache"]) { + // 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) { + var versionURL = (sizes.intact < sizes.total) ? versionInfo.url : offlineURL; + setGameInfo(serverInfo, versionURL); + }); + return; + } + + // if main.unity3d is present, use the offline cache + var mainPath = path.join(offlinePath, "main.unity3d"); + var versionURL = remotefs.existsSync(mainPath) ? versionInfo.url : offlineURL; + setGameInfo(serverInfo, versionURL); } // For writing loginInfo.php, assetInfo.php, etc. function setGameInfo(serverInfo, versionURL) { window.assetUrl = versionURL; // game-client.js needs to access this + console.log("Cache will expand from " + versionURL); remotefs.writeFileSync(path.join(__dirname, "assetInfo.php"), assetUrl); if (serverInfo.hasOwnProperty("endpoint")) { diff --git a/defaults/config.json b/defaults/config.json index ca19c9b..d07ed1b 100644 --- a/defaults/config.json +++ b/defaults/config.json @@ -1,5 +1,7 @@ { "autoupdate-check": true, "cache-swapping": true, + "always-use-cdn": false, + "verify-offline-cache": false, "last-version-initialized": "1.5" } diff --git a/index.html b/index.html index ab2d92c..bd77cf1 100644 --- a/index.html +++ b/index.html @@ -117,7 +117,7 @@ type="button" title="Edit Cache Storage" data-target="#of-editcacheconfigmodal" - onclick="handleCache('hash-check')" + onclick="startHashCheck()" > diff --git a/package.json b/package.json index 5ca974b..da9c7f1 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,6 @@ "afterPack": "./build/after-pack.js" }, "dependencies": { - "fs-extra": "2.0.0", - "async": "1.5.2" + "fs-extra": "2.0.0" } }