enstrayed/enstrayedapi
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

working changes

Browse Source
This commit is contained in:
Enstrayed
2025-04-17 22:41:08 -07:00
parent 8a2bd6ecc3
commit 4c0f140e9e
4 changed files with 128 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
routes/debug.js Normal file
View File

@@ -0,0 +1,15 @@
import { app, globalConfig } from "../index.js" // Get globals from index
import { checkToken } from "../liberals/auth.js"
import { logRequest } from "../liberals/logging.js"
app.get("/api/debugtokencheck", (rreq,rres) => {
checkToken(rreq.get("Authorization"),"etyd").then(authRes => {
if (authRes) {
rres.sendStatus(200)
} else {
rres.sendStatus(401)
}
})
})
export { app }

197
routes/etyd.js
View File

@@ -1,130 +1,123 @@
import { app, globalConfig } from "../index.js" // Get globals from index
import { app, db, globalConfig } from "../index.js" // Get globals from index
import { checkToken } from "../liberals/auth.js"
import { logRequest } from "../liberals/logging.js"
app.get("/api/etyd*", (rreq,rres) => {
fetch(`${process.env.API_DBHOST}/etyd${rreq.path.replace("/api/etyd","")}`,{
headers: { "Authorization": `Basic ${btoa(process.env.API_DBCRED)}`}
}).then(dbRes => {
if (dbRes.status == 404) {
rres.sendStatus(404)
let userRequest = rreq.path.replace("/api/etyd/","")
db`select content from etyd where url = ${userRequest}`.then(response => {
if (response.length == 0) {
rres.status(404).send(`etyd.cc: URL "${userRequest}" was not found`)
} else {
dbRes.json().then(dbRes => {
try {
rres.redirect(dbRes.content.url) // Node will crash if the Database entry is malformed
} catch (responseError) {
logRequest(rres,rreq,500,responseError)
rres.sendStatus(500)
}
})
rres.redirect(response[0].content)
}
}).catch(fetchError => {
logRequest(rres,rreq,500,fetchError)
rres.sendStatus(500)
}).catch(dbError => {
logRequest(rres,rreq,500,dbError)
rres.status(500).send(`etyd.cc: An internal error occured`)
})
})
// app.delete("/api/etyd*", (rreq,rres) => {
app.delete("/api/etyd*", (rreq,rres) => {
// if (rreq.get("Authorization") === undefined) {
// rres.sendStatus(400)
// } else {
// checkToken(rreq.get("Authorization"),"etyd").then(authRes => {
// if (authRes === false) {
// rres.sendStatus(401)
// } else if (authRes === true) { // Authorization successful
if (rreq.get("Authorization") === undefined) {
rres.sendStatus(400)
} else {
checkToken(rreq.get("Authorization"),"etyd").then(authRes => {
if (authRes === false) {
rres.sendStatus(401)
} else if (authRes === true) { // Authorization successful
// fetch(`${process.env.API_DBHOST}/etyd${rreq.path.replace("/api/etyd", "")}`,{
// headers: { "Authorization": `Basic ${btoa(process.env.API_DBCRED)}`}
// }).then(dbRes => {
fetch(`${process.env.API_DBHOST}/etyd${rreq.path.replace("/api/etyd", "")}`,{
headers: { "Authorization": `Basic ${btoa(process.env.API_DBCRED)}`}
}).then(dbRes => {
// if (dbRes.status == 404) {
// rres.sendStatus(404) // Entry does not exist
// } else {
// dbRes.json().then(dbRes => {
if (dbRes.status == 404) {
rres.sendStatus(404) // Entry does not exist
} else {
dbRes.json().then(dbRes => {
// fetch(`${process.env.API_DBHOST}/etyd${rreq.path.replace("/api/etyd", ""),{
// headers: { "Authorization": `Basic ${btoa(process.env.API_DBCRED)}`}
// }}`, {
// method: "DELETE",
// headers: {
// "If-Match": dbRes["_rev"] // Using the If-Match header is easiest for deleting entries in couchdb
// }
// }).then(fetchRes => {
// if (fetchRes.status == 200) {
// // console.log(`${rres.get("cf-connecting-ip")} DELETE ${rreq.path} returned 200 KEY: ${rreq.get("Authorization")}`)
// logRequest(rres,rreq,200)
// rres.sendStatus(200)
// }
// }).catch(fetchError => {
// // console.log(`${rres.get("cf-connecting-ip")} DELETE ${rreq.path} returned 500: ${fetchError}`)
// logRequest(rres,rreq,500,fetchError)
// rres.sendStatus(500)
// })
fetch(`${process.env.API_DBHOST}/etyd${rreq.path.replace("/api/etyd", "")}`,{
headers: { "Authorization": `Basic ${btoa(process.env.API_DBCRED)}`},
method: "DELETE",
headers: {
"If-Match": dbRes["_rev"] // Using the If-Match header is easiest for deleting entries in couchdb
}
}).then(fetchRes => {
if (fetchRes.status == 200) {
// console.log(`${rres.get("cf-connecting-ip")} DELETE ${rreq.path} returned 200 KEY: ${rreq.get("Authorization")}`)
logRequest(rres,rreq,200)
rres.sendStatus(200)
} else {
rres.send(`Received status ${fetchRes.status}`)
}
}).catch(fetchError => {
// console.log(`${rres.get("cf-connecting-ip")} DELETE ${rreq.path} returned 500: ${fetchError}`)
logRequest(rres,rreq,500,fetchError)
rres.sendStatus(500)
})
// })
// }
})
}
// }).catch(fetchError => {
// logRequest(rres,rreq,500,fetchError)
// rres.sendStatus(500)
// })
}).catch(fetchError => {
logRequest(rres,rreq,500,fetchError)
rres.sendStatus(500)
})
// }
// })
// }
}
})
}
// })
})
// app.post("/api/etyd*", (rreq,rres) => {
app.post("/api/etyd*", (rreq,rres) => {
// if (rreq.get("Authorization") === undefined) {
// rres.sendStatus(400)
// } else {
// checkToken(rreq.get("Authorization"),"etyd").then(authRes => {
// if (authRes === false) {
// rres.sendStatus(401)
// } else if (authRes === true) { // Authorization successful
if (rreq.get("Authorization") === undefined) {
rres.sendStatus(400)
} else {
checkToken(rreq.get("Authorization"),"etyd").then(authRes => {
if (authRes === false) {
rres.sendStatus(401)
} else if (authRes === true) { // Authorization successful
// if (rreq.body["url"] == undefined) {
// rres.sendStatus(400)
// } else {
// fetch(`${process.env.API_DBHOST}/etyd${rreq.path.replace("/api/etyd", ""),{
// headers: { "Authorization": `Basic ${btoa(process.env.API_DBCRED)}`}
// }}`, {
// method: "PUT",
// body: JSON.stringify({
// "content": {
// "url": rreq.body["url"]
// }
// })
// }).then(dbRes => {
if (rreq.body["url"] == undefined) {
rres.sendStatus(400)
} else {
fetch(`${process.env.API_DBHOST}/etyd${rreq.path.replace("/api/etyd", "")}`,{
headers: { "Authorization": `Basic ${btoa(process.env.API_DBCRED)}`},
method: "PUT",
body: JSON.stringify({
"content": {
"url": rreq.body["url"]
}
})
}).then(dbRes => {
// switch(dbRes.status) {
// case 409:
// rres.sendStatus(409)
// break;
switch(dbRes.status) {
case 409:
rres.sendStatus(409)
break;
// case 201:
// rres.status(200).send(rreq.path.replace("/api/etyd", ""))
// break;
case 201:
rres.status(200).send(rreq.path.replace("/api/etyd", ""))
break;
// default:
// logRequest(rres,rreq,500,`CouchDB PUT did not return expected code: ${dbRes.status} ${dbRes.statusText}`)
// rres.sendStatus(500)
// break;
// }
default:
logRequest(rres,rreq,500,`CouchDB PUT did not return expected code: ${dbRes.status} ${dbRes.statusText}`)
rres.sendStatus(500)
break;
}
// }).catch(fetchError => {
// logRequest(rres,rreq,500,fetchError)
// rres.sendStatus(500)
// })
// }
}).catch(fetchError => {
logRequest(rres,rreq,500,fetchError)
rres.sendStatus(500)
})
}
// }
// })
// }
}
})
}
// })
})
export {app} // export routes to be imported by index for execution