From f4ffb654da28c3d77c3e23b03eefdf55095a750d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9EBAS8243=E2=80=9C?= <gerd.embruch@uni-hamburg.de>
Date: Tue, 30 Jul 2024 10:56:46 +0200
Subject: [PATCH] changed performance.mark.name schema
---
app.js | 10 +++++-----
controllers/AI.js | 5 ++---
controllers/Auth.js | 18 +++++++++---------
utils/handleDB.js | 4 ++--
utils/handleSchemes.js | 4 ++--
5 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/app.js b/app.js
index dadd325..38fee1e 100644
--- a/app.js
+++ b/app.js
@@ -9,18 +9,18 @@ import { middlewareErrorHandler, middlewareUnknownRoute } from './utils/handleEr
* watches for performance.mark entries
*
* each entry must follow the naming convention:
- * performance.mark('<arbitaryName>_start');
- * performance.mark('<arbitaryName>_end');
+ * performance.mark('<arbitaryName>:start');
+ * performance.mark('<arbitaryName>:end');
*
*/
const observer = new PerformanceObserver((list, observer) => {
for (const entry of list.getEntries()) {
try {
// check if mark is an endpoint
- if (entry.name.endsWith('_end')) {
+ if (entry.name.endsWith(':end')) {
// define names, based on entry name
- const measurementName = entry.name.replace('_end', '');
- const startName = `${measurementName}_start`;
+ const measurementName = entry.name.replace(':end', '');
+ const startName = `${measurementName}:start`;
// calculate
const measurement = performance.measure(measurementName, startName, entry.name);
// log
diff --git a/controllers/AI.js b/controllers/AI.js
index df2ef69..c4517cd 100644
--- a/controllers/AI.js
+++ b/controllers/AI.js
@@ -88,10 +88,9 @@ export const getChat = async (req, res, next) => {
try {
console.info(performance);
// create chat and remember ID
- const markStart = performance.mark('create_chat_start');
+ performance.mark('create_chat:start');
req.body.chatId = await createChat(req.body.model, req.body.input);
- const markEnd = performance.mark('create_chat_end');
- // console.log(performance.measure('createChat', 'create_chat_start', 'create_chat_end'));
+ performance.mark('create_chat:end');
// return
return next();
} catch (error) {
diff --git a/controllers/Auth.js b/controllers/Auth.js
index 6d6e9ab..c3b0091 100644
--- a/controllers/Auth.js
+++ b/controllers/Auth.js
@@ -55,7 +55,7 @@ export const login = async (req, res, next) => {
// check credentials
try {
// search for matching document
- performance.mark('login_start');
+ performance.mark('login:start');
foundUser = await findOneRecord(User, { email: req.body.email }, '+password');
// wrong login name
@@ -68,23 +68,23 @@ export const login = async (req, res, next) => {
return res.status(401).json({ message: 'Your account is still unverified. Check your emails for the verification link.' });
}
- // check for correct passwordperformance.mark('createAccessToken_start');
- performance.mark('bcryptComparePassword_start');
+ // check for correct password
+ performance.mark('bcryptComparePassword:start');
if (await bcrypt.compare(req.body.password, foundUser.password)) {
- performance.mark('bcryptComparePassword_end');
+ performance.mark('bcryptComparePassword:end');
// remember document but remove confidential info
const user = hideConfidentialFields(User, foundUser);
// create jsonwebtoken
- performance.mark('createAccessToken_start');
+ performance.mark('createAccessToken:start');
const accessToken = createAccessToken({ id: user._id, role: user.role });
- performance.mark('createAccessToken_end');
- performance.mark('createRefreshToken_start');
+ performance.mark('createAccessToken:end');
+ performance.mark('createRefreshToken:start');
const refreshToken = await createRefreshToken({ id: user._id });
- performance.mark('createRefreshToken_end');
+ performance.mark('createRefreshToken:end');
if (refreshToken == null) return res.status(500).json({ message: 'Error creating refresh token' });
- performance.mark('login_end');
+ performance.mark('login:end');
// success
return res
.cookie('refreshToken', refreshToken, { httpOnly: true, sameSite: 'none', secure: true })
diff --git a/utils/handleDB.js b/utils/handleDB.js
index 43b103f..8ac7547 100644
--- a/utils/handleDB.js
+++ b/utils/handleDB.js
@@ -64,7 +64,7 @@ export const createRecord = async (model, data) => {
* @return {object} found document
*/
export const findOneRecord = async (model, searchObject = {}, fieldHandler = '') => {
- performance.mark('findOneRecord_start');
+ performance.mark('findOneRecord:start');
try {
let foundRecord;
if (!fieldHandler) {
@@ -72,7 +72,7 @@ export const findOneRecord = async (model, searchObject = {}, fieldHandler = '')
} else {
foundRecord = await model.findOne(searchObject).select(fieldHandler);
}
- performance.mark('findOneRecord_end');
+ performance.mark('findOneRecord:end');
return foundRecord;
} catch (error) {
throw error;
diff --git a/utils/handleSchemes.js b/utils/handleSchemes.js
index ad63127..e64af30 100644
--- a/utils/handleSchemes.js
+++ b/utils/handleSchemes.js
@@ -7,12 +7,12 @@
* @return {array} matching field names
*/
export const getConfidentialFields = (model) => {
- performance.mark('getConfidentialFields_start');
+ performance.mark('getConfidentialFields:start');
const schema = Object.entries(model.schema.paths);
const confidentialFields = schema.filter(function (field) {
return field[1].selected === false;
});
- performance.mark('getConfidentialFields_end');
+ performance.mark('getConfidentialFields:end');
return confidentialFields.map(field => field[0]);
};
--
GitLab