merge upstream

Reviewed-on: OpenWF/SpaceNinjaServer#2242
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>

scripts/dev.js

@@ -28,8 +28,12 @@ function run(changedFile) {
         runproc = undefined;
     }
 
-    buildproc = spawn("npm", ["run", "build:dev"], { stdio: "inherit", shell: true });
+    const thisbuildproc = spawn("npm", ["run", "build:dev"], { stdio: "inherit", shell: true });
+    buildproc = thisbuildproc;
     buildproc.on("exit", code => {
+        if (buildproc !== thisbuildproc) {
+            return;
+        }
         buildproc = undefined;
         if (code === 0) {
             runproc = spawn("npm", ["run", "start", "--", ...args], { stdio: "inherit", shell: true });
@@ -44,6 +48,8 @@ run();
 chokidar.watch("src").on("change", run);
 chokidar.watch("static/fixed_responses").on("change", run);
 
-chokidar.watch("static/webui").on("change", () => {
+chokidar.watch("static/webui").on("change", async () => {
-    fetch("http://localhost/custom/webuiFileChangeDetected?secret=" + secret);
+    try {
+        await fetch("http://localhost/custom/webuiFileChangeDetected?secret=" + secret);
+    } catch (e) {}
 });

src/controllers/custom/webuiFileChangeDetectedController.ts

@@ -1,11 +1,10 @@
 import { args } from "@/src/helpers/commandLineArguments";
-import { config } from "@/src/services/configService";
 import { sendWsBroadcast } from "@/src/services/webService";
 import { RequestHandler } from "express";
 
 export const webuiFileChangeDetectedController: RequestHandler = (req, res) => {
     if (args.dev && args.secret && req.query.secret == args.secret) {
-        sendWsBroadcast({ ports: { http: config.httpPort, https: config.httpsPort } });
+        sendWsBroadcast({ reload: true });
     }
     res.end();
 };

src/routes/api.ts

@@ -284,6 +284,7 @@ apiRouter.post("/inventorySlots.php", inventorySlotsController);
 apiRouter.post("/joinSession.php", joinSessionController);
 apiRouter.post("/login.php", loginController);
 apiRouter.post("/loginRewardsSelection.php", loginRewardsSelectionController);
+apiRouter.post("/logout.php", logoutController); // from ~U16, don't know when they changed it to GET
 apiRouter.post("/maturePet.php", maturePetController);
 apiRouter.post("/missionInventoryUpdate.php", missionInventoryUpdateController);
 apiRouter.post("/modularWeaponCrafting.php", modularWeaponCraftingController);

src/services/inventoryService.ts

@@ -1825,12 +1825,15 @@ export const addChallenges = (
     return affiliationMods;
 };
 
-export const addMissionComplete = (inventory: TInventoryDatabaseDocument, { Tag, Completes }: IMission): void => {
+export const addMissionComplete = (inventory: TInventoryDatabaseDocument, { Tag, Completes, Tier }: IMission): void => {
     const { Missions } = inventory;
     const itemIndex = Missions.findIndex(item => item.Tag === Tag);
 
     if (itemIndex !== -1) {
         Missions[itemIndex].Completes += Completes;
+        if (Tier) {
+            Missions[itemIndex].Tier = Tier;
+        }
     } else {
         Missions.push({ Tag, Completes });
     }

src/services/webService.ts

@@ -110,6 +110,7 @@ interface IWsMsgFromClient {
 }
 
 interface IWsMsgToClient {
+    reload?: boolean;
     ports?: {
         http: number | undefined;
         https: number | undefined;
@@ -175,7 +176,17 @@ const wsOnConnect = (ws: ws, _req: http.IncomingMessage): void => {
             }
         }
         if (data.logout) {
+            const accountId = (ws as IWsCustomData).accountId;
             (ws as IWsCustomData).accountId = undefined;
+            await Account.updateOne(
+                {
+                    _id: accountId,
+                    ClientType: "webui"
+                },
+                {
+                    Nonce: 0
+                }
+            );
         }
     });
 };

static/webui/script.js

@@ -9,9 +9,10 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 
 let auth_pending = false,
-    did_initial_auth = false;
+    did_initial_auth = false,
+    ws_is_open = false;
 const sendAuth = isRegister => {
-    if (localStorage.getItem("email") && localStorage.getItem("password")) {
+    if (ws_is_open && localStorage.getItem("email") && localStorage.getItem("password")) {
         auth_pending = true;
         window.ws.send(
             JSON.stringify({
@@ -28,10 +29,18 @@ const sendAuth = isRegister => {
 function openWebSocket() {
     window.ws = new WebSocket("/custom/ws");
     window.ws.onopen = () => {
+        ws_is_open = true;
         sendAuth(false);
     };
     window.ws.onmessage = e => {
         const msg = JSON.parse(e.data);
+        if ("reload" in msg) {
+            setTimeout(() => {
+                getWebSocket().then(() => {
+                    location.reload();
+                });
+            }, 100);
+        }
         if ("ports" in msg) {
             location.port = location.protocol == "https:" ? msg.ports.https : msg.ports.http;
         }
@@ -72,7 +81,7 @@ function openWebSocket() {
         }
     };
     window.ws.onclose = function () {
-        window.ws = undefined;
+        ws_is_open = false;
         setTimeout(openWebSocket, 3000);
     };
 }
@@ -82,7 +91,7 @@ function getWebSocket() {
     return new Promise(resolve => {
         let interval;
         interval = setInterval(() => {
-            if (window.ws) {
+            if (ws_is_open) {
                 clearInterval(interval);
                 resolve(window.ws);
             }
@@ -117,7 +126,7 @@ function logout() {
 
 function doLogout() {
     logout();
-    if (window.ws) {
+    if (ws_is_open) {
         // Unsubscribe from notifications about nonce invalidation
         window.ws.send(JSON.stringify({ logout: true }));
     }

static/webui/translations/es.js

@@ -100,7 +100,7 @@ dict = {
     inventory_bulkRankUpSentinels: `Maximizar rango de todos los centinelas`,
     inventory_bulkRankUpSentinelWeapons: `Maximizar rango de todas las armas de centinela`,
     inventory_bulkRankUpEvolutionProgress: `Maximizar todo el progreso de evolución Incarnon`,
-    inventory_maxPlexus: `[UNTRANSLATED] Max Rank Plexus`,
+    inventory_maxPlexus: `Rango máximo de Plexus`,
 
     quests_list: `Misiones`,
     quests_completeAll: `Completar todas las misiones`,
@@ -135,10 +135,10 @@ dict = {
     cheats_infiniteRegalAya: `Aya Real infinita`,
     cheats_infiniteHelminthMaterials: `Materiales Helminto infinitos`,
     cheats_claimingBlueprintRefundsIngredients: `Reclamar ingredientes devueltos por planos`,
-    cheats_dontSubtractPurchaseCreditCost: `[UNTRANSLATED] Don't Subtract Purchase Credit Cost`,
+    cheats_dontSubtractPurchaseCreditCost: `No restar costo en créditos de la compra`,
-    cheats_dontSubtractPurchasePlatinumCost: `[UNTRANSLATED] Don't Subtract Purchase Platinum Cost`,
+    cheats_dontSubtractPurchasePlatinumCost: `No restar costo en platino de la compra`,
-    cheats_dontSubtractPurchaseItemCost: `[UNTRANSLATED] Don't Subtract Purchase Item Cost`,
+    cheats_dontSubtractPurchaseItemCost: `No restar costo de ítem en la compra`,
-    cheats_dontSubtractPurchaseStandingCost: `[UNTRANSLATED] Don't Subtract Purchase Standing Cost`,
+    cheats_dontSubtractPurchaseStandingCost: `No restar costo en reputación de la compra`,
     cheats_dontSubtractVoidTraces: `No descontar vestigios del Vacío`,
     cheats_dontSubtractConsumables: `No restar consumibles`,
     cheats_unlockAllShipFeatures: `Desbloquear todas las funciones de nave`,
@@ -159,7 +159,7 @@ dict = {
     cheats_noDeathMarks: `Sin marcas de muerte`,
     cheats_noKimCooldowns: `Sin tiempo de espera para conversaciones KIM`,
     cheats_syndicateMissionsRepeatable: `Misiones de sindicato rejugables`,
-    cheats_unlockAllProfitTakerStages: `[UNTRANSLATED] Unlock All Profit Taker Stages`,
+    cheats_unlockAllProfitTakerStages: `Deslobquea todas las etapas del Roba-ganancias`,
     cheats_instantFinishRivenChallenge: `Terminar desafío de agrietado inmediatamente`,
     cheats_instantResourceExtractorDrones: `Drones de extracción de recursos instantáneos`,
     cheats_noResourceExtractorDronesDamage: `Sin daño a los drones extractores de recursos`,
@@ -170,7 +170,7 @@ dict = {
     cheats_noDojoResearchCosts: `Sin costo de investigación del dojo`,
     cheats_noDojoResearchTime: `Sin tiempo de investigación del dojo`,
     cheats_fastClanAscension: `Ascenso rápido del clan`,
-    cheats_missionsCanGiveAllRelics: `[UNTRANSLATED] Missions Can Give All Relics`,
+    cheats_missionsCanGiveAllRelics: `Las misiones pueden otorgar todas las reliquias`,
     cheats_spoofMasteryRank: `Rango de maestría simulado (-1 para desactivar)`,
     cheats_nightwaveStandingMultiplier: `Multiplicador de Reputación de Onda Nocturna`,
     cheats_save: `Guardar`,