From 960e78503c15e28923fed128ffa054ab5e5f7004 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Thu, 05 Jun 2025 07:25:03 +0000
Subject: [PATCH] link fix
---
app.js | 141 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 133 insertions(+), 8 deletions(-)
diff --git a/app.js b/app.js
index c286d4b..cc1bd5b 100644
--- a/app.js
+++ b/app.js
@@ -1,3 +1,4 @@
+const path = require("path")
const fastify = require('fastify')({
logger: true
})
@@ -5,32 +6,43 @@
const db = require("./lib/db")
const settings = require("./settings")
+const fs = require("node:fs")
/////////////////////////////////////////////////////////////////////////
+// Compress
+let compress = require('@fastify/compress')
+// fastify.register(compress, { global: true })
+fastify.register(compress)
+
// AUTH
fastify.addHook("onRequest", async (req, res) => {
+ console.log(req.url)
const token = req.query.token
- if (token !== settings.authtoken) {
+ console.log(req.url)
+ if (token !== settings.authtoken && !req.url.startsWith("/ui/")) {
console.error("# AUTH ERROR #", token)
await promiseDelay(500) // delay response to avoid denial of service attacks
res.code(403)
return res.send({status: "error", error: "access denied"})
}
- else {}
+ else {
+ console.log("NO AUTH FOR ",req.url)
+ }
})
fastify
- .get('/users', async function (req, res) {
+ /////// USER ////////////////////////////////////////////////////////////////
+ .get('/api/users', async function (req, res) {
const {offset, limit} = req.query
const users = await db.getUsers(offset, limit)
return res.send(users)
})
- .get("/users/count", async function (req, res) {
+ .get("/api/users/count", async function (req, res) {
const count = await db.getUserCount()
return res.send(count)
})
- .get("/user/login/:login", async function (req, res) {
+ .get("/api/user/login/:login", async function (req, res) {
const {login} = req.params
const user = await db.getUserByLogin(login)
if (user.length) {
@@ -40,8 +52,11 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
- .get("/user/userid/:userid", async function (req, res) {
+ .get("/api/user/userid/:userid", async function (req, res) {
const {userid} = req.params
+ if(!userid || isNaN(Number(userid))) {
+ return res.code(500).send({status: "error", msg: "userid error"})
+ }
const user = await db.getUserByUserId(userid)
if (user) {
return res.send(user)
@@ -50,11 +65,121 @@
return res.code(404).send({status: "error", msg: "not found"})
}
})
+ .get("/api/user/teilnahmen/:userId", async function (req, res) {
+ let userId = req.params.userId
+ console.log(`--------${userId}-----------`, typeof userId)
+ if(!userId || isNaN(Number(userId))) {
+ return res.code(500).send({status: "error", msg: "userId error"})
+ }
+ const tn = await db.getUserTeilnahmen(userId)
+ if (tn) {
+ return res.send(tn)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+
+ /////// ref_id / obj_id ////////////////////////////////////////////////////////////////
+
+ .get("/api/ref_id/:ref_id", async function (req, res) {
+ const {ref_id} = req.params
+ const data = await db.getObjIdFromRefId(ref_id)
+ if (data) {
+ return res.send(data)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+ .get("/api/obj_id/:obj_id", async function (req, res) {
+ const {obj_id} = req.params
+ let data = await db.getRefIdFromObjId(obj_id)
+ if (data) {
+ return res.send(data)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+
+ /////// Kurs ////////////////////////////////////////////////////////////////
+ .get("/api/kurs", async function (req, res) {
+ let data = await db.getKurse()
+ if (data) {
+ return res.send(data)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+ .get("/api/kurs/:refId", async function (req, res) {
+ const {refId} = req.params
+ let data = await db.getKurs(refId)
+ if (data) {
+ return res.send(data)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+ .get("/api/kurs/items/:refId", async function (req, res) {
+ const {refId} = req.params
+ let data = await db.getKursItems(refId)
+ if (data) {
+ return res.send(data)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+ .get("/api/kurs/teilnehmer/:refId", async function (req, res) {
+ const {refId} = req.params
+ let data = await db.getKursTeilnehmer(refId)
+ if (data) {
+ return res.send(data)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+ .get("/api/kurs/teilnehmer/:refId/count", async function (req, res) {
+ const {refId} = req.params
+ let data = await db.getKursTeilnehmerCount(refId)
+ if (data) {
+ return res.send(data)
+ }
+ else {
+ return res.code(404).send({status: "error", msg: "not found"})
+ }
+ })
+
+fastify.register(require('@fastify/static'), {
+ root: path.join(__dirname, 'vue/dist'),
+ prefix: '/ui/', // optional: default '/'
+
+ // constraints: { host: 'example.com' } // optional: default {}
+})
+
+
+// fastify.get('*', function (req, reply) {
+// console.log("!!!!!!!!! send index")
+// // index.html should never be cached
+// reply.sendFile('dist/index.html', {maxAge: 0, immutable: false})
+// })
+
+const indexFile = fs.readFileSync(path.join(__dirname, "vue/dist", 'index.html'), 'utf8')
+fastify.setNotFoundHandler(function (req, res) {
+ console.log("!!!")
+ // res.sendFile("vue/dist/index.html")
+ res.type("text/html").send(indexFile)
+})
/////////////////////////////////////////////////////////////////////////
fastify.listen({port: settings.port}, function (err, address) {
+ console.log("📡 -=> Listening on", address)
if (err) {
fastify.log.error(err)
process.exit(1)
@@ -64,6 +189,6 @@
/////////////////////////////////////////////////////////////////////////
-async function promiseDelay(ms) {
- return new Promise(resolve => setTimeout(resolve, ms))
+async function promiseDelay (ms) {
+ return new Promise(resolve => setTimeout(resolve, ms))
}
--
Gitblit v1.8.0