From 3d0c10db2b40ccd02adaee5de644051161e17c71 Mon Sep 17 00:00:00 2001 From: Raven Scott Date: Sun, 9 Jun 2024 03:33:28 -0400 Subject: [PATCH] Bug Fix: Update HTTP Port for icon on launch, remove timebased stoage directory for single user usage --- app.js | 16 ++++++++++++++-- config.json | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 config.json diff --git a/app.js b/app.js index 8ceceb6..61830ed 100644 --- a/app.js +++ b/app.js @@ -7,7 +7,7 @@ import Corestore from 'corestore'; import { EventEmitter } from 'events'; import fs from "fs"; -const storagePath = `./storage/storage_${Date.now()}_${Math.random().toString(36).substring(2, 15)}`; +const storagePath = `./storage/`; const store = new Corestore(storagePath); const drive = new Hyperdrive(store); @@ -99,9 +99,14 @@ async function initialize() { if (configExists) { config = JSON.parse(fs.readFileSync("./config.json", 'utf8')); console.log("Read config from file:", config) + // Update port in URLs + config.userAvatar = updatePortInUrl(config.userAvatar); config.rooms.forEach(room => { addRoomToListWithoutWritingToConfig(room); }); + for (let user in registeredUsers) { + registeredUsers[user] = updatePortInUrl(registeredUsers[user]); + } } const registerDiv = document.querySelector('#register'); @@ -175,7 +180,7 @@ function registerUser(e) { const buffer = new Uint8Array(event.target.result); await drive.put(`/icons/${regUsername}.png`, buffer); config.userAvatar = `http://localhost:${servePort}/icons/${regUsername}.png`; // Set the correct URL - registeredUsers[regUsername] = config.userAvatar; + registeredUsers[regUsername] = `http://localhost:${servePort}/icons/${regUsername}.png`; // Use placeholder URL localStorage.setItem('registeredUsers', JSON.stringify(registeredUsers)); continueRegistration(regUsername); }; @@ -438,4 +443,11 @@ function writeConfigToFile(filePath) { }); } +function updatePortInUrl(url) { + if (!url) return url; + const urlObject = new URL(url); + urlObject.port = servePort; + return urlObject.toString(); +} + initialize(); diff --git a/config.json b/config.json new file mode 100644 index 0000000..1da36b0 --- /dev/null +++ b/config.json @@ -0,0 +1 @@ +{"userName":"Raven2","userAvatar":"http://localhost:59080/icons/Raven2.png","rooms":["9c2dd1bb04533761a18508e558616d9c4add62ebbce59632eefe53defb5295f6"]} \ No newline at end of file