fix(webui): fix bug with how index.html was changed

Author: Rinse12

ci-bin/download-web-uis.ts

@@ -48,14 +48,14 @@ import decompress from "decompress";
         writer.close();
         console.log("Downloaded", htmlZipAsset.name, "webui successfully. Attempting to unzip");
 
-        await decompress(zipfilePath, dstOfWebui);
         console.log("Unzipped", zipfilePath);
         await fs.rm(zipfilePath);
         console.log(`Downloaded`, githubRepo, "successfully");
 
+        const extractedDirName = htmlZipAsset.name.replace(".zip", "");
         // We're renaming index.html here because we don't somebody to go to unmodified index.html
         // they will get an error, but an error is preferable to going to the wrong html
-        const backupIndexHtml = path.join(dstOfWebui, "index_backup_no_rpc.html");
-        await fs.rename(path.join(dstOfWebui, "index.html"), backupIndexHtml);
+        const backupIndexHtml = path.join(dstOfWebui, extractedDirName, "index_backup_no_rpc.html");
+        await fs.rename(path.join(dstOfWebui, extractedDirName, "index.html"), backupIndexHtml);
     }
 })();

src/webui/daemon-server.ts

@@ -7,7 +7,7 @@ import express from "express";
 import type { InputPlebbitOptions } from "@plebbit/plebbit-js/dist/node/types";
 
 async function _generateModifiedIndexHtmlWithRpcSettings(webuiPath: string, webuiName: string, ipfsGatewayPort: number) {
-    const indexHtmlString = (await fs.readFile(path.join(webuiPath, "index.html"))).toString();
+    const indexHtmlString = (await fs.readFile(path.join(webuiPath, "index_backup_no_rpc.html"))).toString();
     const defaultRpcOptionString = `[window.location.origin.replace("https://", "wss://").replace("http://", "ws://") + window.location.pathname.split('/' + '${webuiName}')[0]]`;
     // Ipfs media only locally because ipfs gateway doesn't allow remote connections
     const defaultIpfsMedia = `if (window.location.hostname === "localhost" || window.location.hostname === "127.0.0.1" || window.location.hostname === "0.0.0.0")window.defaultMediaIpfsGatewayUrl = 'http://' + window.location.hostname + ':' + ${ipfsGatewayPort}`;