added bit more advanced file existance checking, removed vhosts in favor or routes

This commit is contained in:
mrfry 2023-03-29 19:10:44 +02:00
parent ba89f4a342
commit 113a114821
24 changed files with 2720 additions and 2474 deletions

View file

@ -29,6 +29,7 @@ import logger from '../../utils/logger'
import auth from '../../middlewares/auth.middleware'
import { SetupData } from '../../server'
import { ModuleType, Request } from '../../types/basicTypes'
import { LinksSchema, validateJSON } from '../../types/typeSchemas'
// stuff gotten from server.js
let publicdirs: string[] = []
@ -75,7 +76,17 @@ function GetApp(): ModuleType {
function loadDonateURL() {
try {
links = utils.ReadJSON(linksFile)
if (utils.FileExists(linksFile)) {
links = utils.ReadJSON(linksFile)
const { isValid, errorMsg } = validateJSON(links, LinksSchema)
if (!isValid) {
logger.Log(
`Peers file (${linksFile}) has invalid contents!`,
'redbg'
)
errorMsg.forEach((x) => logger.Log(x, 'red'))
}
}
} catch (err) {
logger.Log('Couldnt read donate URL file!', logger.GetColor('red'))
console.error(err)
@ -90,7 +101,10 @@ function GetApp(): ModuleType {
loadDonateURL()
})
} else {
logger.Log('Couldnt read donate URL file!', logger.GetColor('red'))
logger.Log(
`Couldnt read links file! (${linksFile})`,
logger.GetColor('redbg')
)
}
// --------------------------------------------------------------
@ -229,14 +243,6 @@ function GetApp(): ModuleType {
logger.LogReq(req)
})
app.get('*', function (_req: Request, res) {
res.status(404).render('404')
})
app.post('*', function (_req: Request, res) {
res.status(404).render('404')
})
return {
app: app,
}