From 44ed0e19d029d91b87de26b6af969d8e9424b265 Mon Sep 17 00:00:00 2001 From: Enstrayed <48845980+Enstrayed@users.noreply.github.com> Date: Sun, 26 Oct 2025 00:44:54 -0700 Subject: [PATCH] env file handling + fix error in libnowplaying --- .gitignore | 3 +- index.js | 16 ++++--- liberals/libnowplaying.js | 48 ++++++++++--------- ...S-What-is-EOES.md => EOES-What_is_EOES.md} | 0 4 files changed, 38 insertions(+), 29 deletions(-) rename website/helpdesk/kbas/{EOES-What-is-EOES.md => EOES-What_is_EOES.md} (100%) diff --git a/.gitignore b/.gitignore index b725d4e..041eeb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules/ bun.lockb todo.txt -proto.js \ No newline at end of file +proto.js +.env \ No newline at end of file diff --git a/index.js b/index.js index be9652a..1cd957a 100644 --- a/index.js +++ b/index.js @@ -7,20 +7,24 @@ import cookieParser from 'cookie-parser' const app = express() if (!process.env.DATABASE_URL) { - console.log("FATAL: DATABASE_URI must be set") - process.exit(1) + try { + process.loadEnvFile("./.env") + } catch { + console.log("FATAL: DATABASE_URL was not defined or found in env file") + process.exit(1) + } } const db = postgres(process.env.DATABASE_URL) -const globalConfig = await db`select content from config where id = ${process.env.CONFIG_OVERRIDE ?? 'production'}`.then(response => {return response[0]["content"]}).catch(error => { +const globalConfig = await db`select content from config where id = ${process.env.CONFIG_OVERRIDE ?? 'production'}`.then(response => { return response[0]["content"] }).catch(error => { console.log(`FATAL: Error occured in downloading configuration: ${error}`) process.exit(1) }) const globalVersion = execSync(`git show --oneline -s`).toString().split(" ")[0] // Returns ISO 8601 Date & 24hr time for UTC-7/PDT -const startTime = new Date(new Date().getTime() - 25200000).toISOString().slice(0,19).replace('T',' ') +const startTime = new Date(new Date().getTime() - 25200000).toISOString().slice(0, 19).replace('T', ' ') export { app, fs, db, globalConfig, globalVersion } @@ -28,7 +32,7 @@ app.use(json()) // Allows receiving JSON bodies // see important note: https://expressjs.com/en/api.html#express.json app.use(cookieParser()) // Allows receiving cookies -process.on('SIGTERM', function() { +process.on('SIGTERM', function () { console.log("Received SIGTERM, exiting...") process.exit(0) }) @@ -41,7 +45,7 @@ fs.readdir("./routes", (err, files) => { let importedRoutes = [] files.forEach(file => { import(`./routes/${file}`) - importedRoutes.push(file.slice(0,-3)) + importedRoutes.push(file.slice(0, -3)) }) process.stdout.write(` | Imported ${importedRoutes} \n`) } diff --git a/liberals/libnowplaying.js b/liberals/libnowplaying.js index 3876e18..8acd6c4 100644 --- a/liberals/libnowplaying.js +++ b/liberals/libnowplaying.js @@ -32,7 +32,7 @@ async function queryLastfm() { } } }).catch(fetchError => { - console.log("libnowplaying.js: Fetch failed! "+fetchError) + console.log("libnowplaying.js: Fetch failed! " + fetchError) return {} }) } @@ -42,30 +42,34 @@ async function queryLastfm() { * @returns {object} Object containing response in JSON and HTML (as string) */ async function queryJellyfin() { - return await fetch(`${globalConfig.nowplaying.jellyfin.host}/Sessions`, { - headers: { - "Authorization": `MediaBrowser Token=${globalConfig.nowplaying.jellyfin.apiKey}` - } - }).then(response => response.json()).then(response => { - for (let x in response) { - if (response[x].UserName !== globalConfig.nowplaying.jellyfin.target) { break } // If session does not belong to target specified in config, skip - if (response[x].NowPlayingItem == undefined) { break } // If the NowPlayingItem object is not present, skip (session is not playing anything) - if (response[x].NowPlayingItem.MediaType !== "Audio") { break } // If not playing 'audio', skip, this might change in the future - - return { - "json": { - "songName": response[x].NowPlayingItem.Name, - "artistName": response[x].NowPlayingItem.Artists[0], - "albumName": response[x].NowPlayingItem.Album ?? `${response[x].NowPlayingItem.Name} (Single)`, - "artUrl": `${globalConfig.nowplaying.jellyfin.hostPublic}/Items/${response[x].NowPlayingItem.Id}/Images/Primary`, - "link": `https://www.last.fm/music/${response[x].NowPlayingItem.Artists[0].replaceAll(" ","+")}/_/${response[x].NowPlayingItem.Name.replaceAll(" ","+")}` - }, - "html": `Album Art
I'm listening to ${response[x].NowPlayingItem.Name} by ${response[x].NowPlayingItem.Artists[0]} from ${response[x].NowPlayingItem.Album ?? `${response[x].NowPlayingItem.Name} (Single)`} View on Last.fm
` + try { + return await fetch(`${globalConfig.nowplaying.jellyfin.host}/Sessions`, { + headers: { + "Authorization": `MediaBrowser Token=${globalConfig.nowplaying.jellyfin.apiKey}` } - } + }).then(response => response.json()).then(response => { + for (let x in response) { + if (response[x].UserName !== globalConfig.nowplaying.jellyfin.target) { break } // If session does not belong to target specified in config, skip + if (response[x].NowPlayingItem == undefined) { break } // If the NowPlayingItem object is not present, skip (session is not playing anything) + if (response[x].NowPlayingItem.MediaType !== "Audio") { break } // If not playing 'audio', skip, this might change in the future + return { + "json": { + "songName": response[x].NowPlayingItem.Name, + "artistName": response[x].NowPlayingItem.Artists[0], + "albumName": response[x].NowPlayingItem.Album ?? `${response[x].NowPlayingItem.Name} (Single)`, + "artUrl": `${globalConfig.nowplaying.jellyfin.hostPublic}/Items/${response[x].NowPlayingItem.Id}/Images/Primary`, + "link": `https://www.last.fm/music/${response[x].NowPlayingItem.Artists[0].replaceAll(" ", "+")}/_/${response[x].NowPlayingItem.Name.replaceAll(" ", "+")}` + }, + "html": `Album Art
I'm listening to ${response[x].NowPlayingItem.Name} by ${response[x].NowPlayingItem.Artists[0]} from ${response[x].NowPlayingItem.Album ?? `${response[x].NowPlayingItem.Name} (Single)`} View on Last.fm
` + } + } + + return notPlayingAnythingPlaceholder + }) + } catch { return notPlayingAnythingPlaceholder - }) + } } export { queryLastfm, queryJellyfin } \ No newline at end of file diff --git a/website/helpdesk/kbas/EOES-What-is-EOES.md b/website/helpdesk/kbas/EOES-What_is_EOES.md similarity index 100% rename from website/helpdesk/kbas/EOES-What-is-EOES.md rename to website/helpdesk/kbas/EOES-What_is_EOES.md