Merge pull request #67 from WaifuAPI/staging

Staging

Author: a3ryk

.gitignore

@@ -17,4 +17,7 @@
 /logs
 
 # Ignore data files
-/data
+/data
+
+# Ignore package-lock.json
+package-lock.json

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "waifu.it",
-  "version": "4.9.1",
+  "version": "4.10.0",
   "description": "Random API Serving Anime stuff",
   "author": "Aeryk",
   "private": true,

package.json

@@ -2,14 +2,16 @@
 import express from 'express';
 import bodyParser from 'body-parser';
 import cors from 'cors';
-import pkg from '../package.json' assert { type: 'json' };
+import { createRequire } from 'module';
+const require = createRequire(import.meta.url);
+const pkg = require('../package.json');
 /*** Importing custom error handlers and logger middleware ***/
 import {
   handle404 /*** @params: req, res, next ***/,
   logErrors /*** @params: err, req, res, next ***/,
   errorHandler /*** @params: err, req, res, next ***/,
 } from './middlewares/errors.js';
-import { logIP } from './middlewares/logger.js';
+import { requestLogger } from './middlewares/logger.js';
 import routesV3 from './routes/v3/index.js';
 import routesV4 from './routes/v4/index.js';
 
@@ -38,7 +40,7 @@ app.use(express.urlencoded({ extended: true }));
  * @param {Function} next - Express next middleware function.
  */
 if (process.env.LOGGER === 'true') {
-  app.use(logIP);
+  app.use(requestLogger);
 }
 
 /*** Middleware to parse the request body ***/

src/app.js

@@ -2,7 +2,6 @@ import createError from 'http-errors';
 import Facts from '../../../models/schemas/Fact.js';
 import tagsFilter from '../../../modules/tagsFilter.js';
 import lengthFilter from '../../../modules/lengthFilter.js';
-import Stats from '../../../models/schemas/Stat.js';
 
 /**
  * Gets a random anime fact with optional length and tags filters and updates system statistics.
@@ -41,18 +40,10 @@ const getRandomFact = async (req, res, next) => {
     }
 
     // Respond with the random fact
-    res.status(200).json(result);
-
-    // Update system statistics for facts
-    await Stats.findOneAndUpdate({ _id: 'systemstats' }, { $inc: { facts: 1 } });
+    return res.status(200).json(result);
   } catch (error) {
-    // Update system statistics for failed requests
-    await Stats.findOneAndUpdate(
-      { _id: 'systemstats' },
-      { $inc: { failed_requests: 1 } }
-    );
     return next(error);
   }
 };
 
-export default getRandomFact;
+export default getRandomFact;

src/controllers/v3/facts/randomFacts.js

@@ -1,7 +1,5 @@
-
 import createError from 'http-errors';
 import Angry from '../../../models/schemas/Angry.js';
-import Stats from '../../../models/schemas/Stat.js';
 
 // Get random Anime Angry
 const getRandomAngry = async (req, res, next) => {
@@ -16,14 +14,8 @@ const getRandomAngry = async (req, res, next) => {
       return next(createError(404, 'Could not find any Angry Gif'));
     }
 
-    res.status(200).json(result);
-
-    await Stats.findOneAndUpdate({ _id: 'systemstats' }, { $inc: { angry: 1 } });
+   return res.status(200).json(result);
   } catch (error) {
-    await Stats.findOneAndUpdate(
-      { _id: 'systemstats' },
-      { $inc: { failed_requests: 1 } }
-    );
     return next(error);
   }
 };

src/controllers/v3/gifs/randomAngry.js

@@ -1,7 +1,5 @@
-
 import createError from 'http-errors';
 import Baka from '../../../models/schemas/Baka.js';
-import Stats from '../../../models/schemas/Stat.js';
 
 // Get random Anime Baka
 const getRandomBaka = async (req, res, next) => {
@@ -16,14 +14,8 @@ const getRandomBaka = async (req, res, next) => {
       return next(createError(404, 'Could not find any Baka Gif'));
     }
 
-    res.status(200).json(result);
-
-    await Stats.findOneAndUpdate({ _id: 'systemstats' }, { $inc: { baka: 1 } });
+    return res.status(200).json(result);
   } catch (error) {
-    await Stats.findOneAndUpdate(
-      { _id: 'systemstats' },
-      { $inc: { failed_requests: 1 } }
-    );
     return next(error);
   }
 };

src/controllers/v3/gifs/randomBaka.js

@@ -1,7 +1,5 @@
-
 import createError from 'http-errors';
 import Bite from '../../../models/schemas/Bite.js';
-import Stats from '../../../models/schemas/Stat.js';
 
 // Get random Anime Bite
 const getRandomBite = async (req, res, next) => {
@@ -16,14 +14,8 @@ const getRandomBite = async (req, res, next) => {
       return next(createError(404, 'Could not find any Bite Gif'));
     }
 
-    res.status(200).json(result);
-
-    await Stats.findOneAndUpdate({ _id: 'systemstats' }, { $inc: { bite: 1 } });
+    return res.status(200).json(result);
   } catch (error) {
-    await Stats.findOneAndUpdate(
-      { _id: 'systemstats' },
-      { $inc: { failed_requests: 1 } }
-    );
     return next(error);
   }
 };

src/controllers/v3/gifs/randomBite.js

@@ -1,4 +1,3 @@
-
 import createError from 'http-errors';
 import Blush from '../../../models/schemas/Blush.js';
 import Stats from '../../../models/schemas/Stat.js';
@@ -16,14 +15,8 @@ const getRandomBlush = async (req, res, next) => {
       return next(createError(404, 'Could not find any Blush Gif'));
     }
 
-    res.status(200).json(result);
-
-    await Stats.findOneAndUpdate({ _id: 'systemstats' }, { $inc: { blush: 1 } });
+    return res.status(200).json(result);
   } catch (error) {
-    await Stats.findOneAndUpdate(
-      { _id: 'systemstats' },
-      { $inc: { failed_requests: 1 } }
-    );
     return next(error);
   }
 };

src/controllers/v3/gifs/randomBlush.js

@@ -1,4 +1,3 @@
-
 import createError from 'http-errors';
 import Bonk from '../../../models/schemas/Bonk.js';
 import Stats from '../../../models/schemas/Stat.js';
@@ -16,14 +15,8 @@ const getRandomBonk = async (req, res, next) => {
       return next(createError(404, 'Could not find any Bonk Gif'));
     }
 
-    res.status(200).json(result);
-
-    await Stats.findOneAndUpdate({ _id: 'systemstats' }, { $inc: { bonk: 1 } });
+    return res.status(200).json(result);
   } catch (error) {
-    await Stats.findOneAndUpdate(
-      { _id: 'systemstats' },
-      { $inc: { failed_requests: 1 } }
-    );
     return next(error);
   }
 };