Skip to content

Commit 5eb0968

Browse files
committed
added more logs
1 parent b6e2569 commit 5eb0968

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

web/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ dbml/
33
.env
44
.idea/
55
build/
6+
public/main.css

web/src/apiRouter.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { prisma } from "./prisma";
33
import logger from "./logger";
44
import {
55
CODE_LIFETIME,
6-
generateCode,
76
generateNewCode,
87
sendDiscordWebhook,
98
setLastTimeChestWasAlive,
@@ -62,12 +61,14 @@ apiRouter.post("/sesame", async (request: Request, response: Response) => {
6261

6362
if (opening.borrow) await generateNewCode(opening.borrow.returnOpeningId);
6463

64+
logger.info(`Opening chest with code ${sesame} for opening ${opening.id}`);
6565
return response.status(200).send("Sésame ouvre toi");
6666
});
6767

6868
apiRouter.get("/ping", async (request: Request, response: Response) => {
6969
const interval: number = Number(request.body.interval) || undefined;
7070
setLastTimeChestWasAlive(Date.now(), interval);
71+
logger.info("Chest pinged");
7172
return response.status(200).send("Good news ! (Me too)");
7273
});
7374

@@ -83,7 +84,7 @@ apiRouter.get("/reports", async (request: Request, response: Response) => {
8384
},
8485
});
8586
if (borrows.length) {
86-
logger.info(`Generating reports for ${borrows.length} users !`);
87+
logger.info(`Generating reports for ${borrows.length} users`);
8788
const count = borrows.reduce((acc, borrow) => acc + borrow.joyconsTaken, 0);
8889
sendDiscordWebhook([
8990
{
@@ -110,6 +111,7 @@ apiRouter.get("/reports", async (request: Request, response: Response) => {
110111
});
111112

112113
apiRouter.use(async (request: Request, response: Response) => {
114+
logger.warning(`Invalid API route : ${request}. This should never happen, verify token is not compromised and chest is working properly`)
113115
return response.status(404).send("captain l'url làààààà");
114116
});
115117

web/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export async function getWaitingOpeningWithValidCode(userLogin: string) {
143143
return formatOpening(opening);
144144
}
145145

146-
export async function generateNewCode(borrowId: string) {
146+
export async function generateNewCode(borrowId: number) {
147147
const code = await generateCode();
148148
await prisma.opening.update({
149149
where: { id: borrowId },

web/src/webRouter.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
getWaitingOpening,
1414
OPENING_INCLUDE_BEFORE_FORMATTING,
1515
} from "./utils";
16+
import logger from "./logger";
1617

1718
const webRouter = Router();
1819

@@ -34,6 +35,7 @@ webRouter.get("/code", async (request: Request, response: Response) => {
3435
if (!(await getWaitingOpening(login))) return response.redirect("/");
3536
const opening = await getWaitingOpening(login);
3637
const newCode = await generateNewCode(opening.id);
38+
logger.info(`Changing code from ${opening.code} to ${newCode} for opening ${opening.id}`);
3739
return response.render(path.join(__dirname, "../www/getCode.html"), {
3840
code: newCode,
3941
joycons: opening.borrow.joyconsTaken,
@@ -136,16 +138,18 @@ webRouter.post("/borrow", async (request: Request, response: Response) => {
136138
user: { connect: { login } },
137139
},
138140
});
139-
return response.redirect("/code");
141+
logger.info(`Borrowing ${joycons} joycons for user ${login} with code ${code}`);
142+
return response.redirect('/code');
140143
});
141144

142145
webRouter.get("/forceOpen", async (request: Request, response: Response) => {
143146
if (!chestAlive()) return response.redirect("/down");
144147
if (!request.query["id"]) return response.redirect("/");
148+
const id = Number.parseInt(request.query['id'] as string);
145149
const opening = formatOpening(
146150
await prisma.opening.findUnique({
147151
where: {
148-
id: request.query.id as string,
152+
id,
149153
date: null,
150154
borrow: null,
151155
},
@@ -155,7 +159,8 @@ webRouter.get("/forceOpen", async (request: Request, response: Response) => {
155159
if (!opening) {
156160
return response.redirect("/");
157161
}
158-
const newCode = await generateNewCode(request.query.id as string);
162+
const newCode = await generateNewCode(id);
163+
logger.info(`Forcing opening ${opening.id} changing code from ${opening.code} to ${newCode}`);
159164
response.render(path.join(__dirname, "../www/getCode.html"), {
160165
code: newCode,
161166
joycons: opening.borrow.joyconsTaken,
@@ -183,7 +188,8 @@ webRouter.get("/cancel", async (request: Request, response: Response) => {
183188
data: { code: null, codeGeneratedAt: null },
184189
});
185190
}
186-
return response.redirect("/");
191+
logger.info(`Cancelling opening ${opening.id} for user ${login}`);
192+
return response.redirect('/');
187193
});
188194

189195
webRouter.get("/", async (request: Request, response: Response) => {

0 commit comments

Comments
 (0)