Merge pull request 'Обновил express до 5 версии + логгер' (#51) from update into master

Reviewed-on: #51

.gitignore

@@ -2,3 +2,4 @@ node_modules/
 .env
 .idea
 coverage/
+server/log/

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:20
 
-RUN mkdir -p /usr/src/app/server/
+RUN mkdir -p /usr/src/app/server/log/
 WORKDIR /usr/src/app/
 
 COPY ./server /usr/src/app/server

docker-compose.yaml

@@ -2,6 +2,7 @@ version: "3"
 
 volumes:
     ms_volume8:
+    ms_logs:
 
 services:
     mongoDb:
@@ -15,6 +16,8 @@ services:
         # build: .
         image: bro.js/ms/bh:$TAG
         restart: always
+        volumes:
+            - ms_logs:/usr/src/app/server/log
         ports:
             - 8044:8044
         environment:

package.json

@@ -23,33 +23,34 @@
   "license": "MIT",
   "homepage": "https://bitbucket.org/online-mentor/multi-stub#readme",
   "dependencies": {
-    "axios": "^1.7.7",
-    "bcrypt": "^5.1.0",
-    "body-parser": "^1.19.0",
-    "cookie-parser": "^1.4.5",
-    "cors": "^2.8.5",
+    "axios": "^1.7.9",
+    "bcrypt": "^5.1.1",
+    "body-parser": "^1.20.3",
+    "cookie-parser": "^1.4.7",
     "cross-env": "^7.0.3",
-    "crypto-js": "^4.1.1",
-    "dotenv": "^16.3.1",
-    "express": "^4.18.2",
-    "express-jwt": "^8.4.1",
-    "express-session": "^1.17.3",
-    "jsdom": "^22.1.0",
-    "jsonwebtoken": "^8.5.1",
-    "mongodb": "^3.6.8",
-    "mongoose": "^8.7.1",
+    "crypto-js": "^4.2.0",
+    "dotenv": "^16.4.7",
+    "express": "5.0.1",
+    "express-jwt": "^8.5.1",
+    "express-session": "^1.18.1",
+    "jsdom": "^25.0.1",
+    "jsonwebtoken": "^9.0.2",
+    "mongodb": "^6.12.0",
+    "mongoose": "^8.9.2",
+    "morgan": "^1.10.0",
     "pbkdf2-password": "^1.2.1",
-    "socket.io": "^4.7.1",
-    "uuid": "^9.0.0"
+    "rotating-file-stream": "^3.2.5",
+    "socket.io": "^4.8.1",
+    "uuid": "^11.0.3"
   },
   "devDependencies": {
-    "@eslint/js": "^9.12.0",
-    "@types/node": "18.17.1",
-    "eslint": "^9.12.0",
-    "globals": "^15.11.0",
+    "@eslint/js": "^9.17.0",
+    "@types/node": "22.10.2",
+    "eslint": "^9.17.0",
+    "globals": "^15.14.0",
     "jest": "^29.7.0",
     "mockingoose": "^2.16.2",
-    "nodemon": "3.0.1",
+    "nodemon": "3.1.9",
     "supertest": "^7.0.0"
   }
-}
+}

server/error.js

@@ -6,6 +6,7 @@ module.exports = (err, req, res, next) => {
             success: false, error: 'Токен авторизации не найден',
         })
     }
+
     res.status(400).send({
         success: false, error: err.message || 'Что-то пошло не так',
     })

server/index.js

@@ -1,57 +1,95 @@
-const express = require('express')
-const bodyParser = require('body-parser')
-const cookieParser = require('cookie-parser')
-const session = require('express-session')
+const express = require("express")
+const bodyParser = require("body-parser")
+const cookieParser = require("cookie-parser")
+const session = require("express-session")
+const morgan = require("morgan")
+const path = require("path")
+const rfs = require("rotating-file-stream")
 
 const app = express()
-const cors = require('cors')
-require('dotenv').config()
-
+require("dotenv").config()
 exports.app = app
 
-const config = require('../.serverrc')
-const { setIo } = require('./io')
+const accessLogStream = rfs.createStream("access.log", {
+  size: "10M",
+  interval: "1d",
+  compress: "gzip",
+  path: path.join(__dirname, "log"),
+})
+
+const errorLogStream = rfs.createStream("error.log", {
+  size: "10M",
+  interval: "1d",
+  compress: "gzip",
+  path: path.join(__dirname, "log"),
+})
+
+const config = require("../.serverrc")
+const { setIo } = require("./io")
 
 app.use(cookieParser())
-app.options('*', cors())
-app.use(cors())
+app.use(
+  morgan("combined", {
+    stream: accessLogStream,
+    skip: function (req, res) {
+      return res.statusCode >= 400
+    },
+  })
+)
+
+// log all requests to access.log
+app.use(
+  morgan("combined", {
+    stream: errorLogStream,
+    skip: function (req, res) {
+        console.log('statusCode', res.statusCode, res.statusCode <= 400)
+        return res.statusCode < 400
+    },
+  })
+)
+
 const server = setIo(app)
 
 const sess = {
-    secret: 'super-secret-key',
-    resave: true,
-    saveUninitialized: true,
-    cookie: {
-    },
+  secret: "super-secret-key",
+  resave: true,
+  saveUninitialized: true,
+  cookie: {},
 }
-if (app.get('env') === 'production') {
-    app.set('trust proxy', 1)
-    sess.cookie.secure = true
+if (app.get("env") === "production") {
+  app.set("trust proxy", 1)
+  sess.cookie.secure = true
 }
 app.use(session(sess))
 
-app.use(bodyParser.json({
-    limit: '50mb',
-}))
-app.use(bodyParser.urlencoded({
-    limit: '50mb',
+app.use(
+  bodyParser.json({
+    limit: "50mb",
+  })
+)
+app.use(
+  bodyParser.urlencoded({
+    limit: "50mb",
     extended: true,
-}))
-app.use(require('./root'))
+  })
+)
+app.use(require("./root"))
 
 /**
  * Добавляйте сюда свои routers.
  */
-app.use('/kfu-m-24-1', require('./routers/kfu-m-24-1'))
-app.use('/epja-2024-1', require('./routers/epja-2024-1'))
-app.use('/todo', require('./routers/todo/routes'))
-app.use('/dogsitters-finder', require('./routers/dogsitters-finder'))
-app.use('/kazan-explore', require('./routers/kazan-explore'))
-app.use('/edateam', require('./routers/edateam-legacy'))
-app.use('/dry-wash', require('./routers/dry-wash'))
-app.use('/freetracker', require('./routers/freetracker'))
-app.use('/dhs-testing', require('./routers/dhs-testing'))
+app.use("/kfu-m-24-1", require("./routers/kfu-m-24-1"))
+app.use("/epja-2024-1", require("./routers/epja-2024-1"))
+app.use("/todo", require("./routers/todo/routes"))
+app.use("/dogsitters-finder", require("./routers/dogsitters-finder"))
+app.use("/kazan-explore", require("./routers/kazan-explore"))
+app.use("/edateam", require("./routers/edateam-legacy"))
+app.use("/dry-wash", require("./routers/dry-wash"))
+app.use("/freetracker", require("./routers/freetracker"))
+app.use("/dhs-testing", require("./routers/dhs-testing"))
 
-app.use(require('./error'))
+app.use(require("./error"))
 
-server.listen(config.port, () => console.log(`Listening on http://localhost:${config.port}`))
+server.listen(config.port, () =>
+  console.log(`Listening on http://localhost:${config.port}`)
+)

server/root.js

@@ -10,6 +10,7 @@ const folderPath = path.resolve(__dirname, './routers')
 const folders = fs.readdirSync(folderPath)
 
 router.get('/', async (req, res) => {
+  // throw new Error('check error message')
   res.send(`
         <h1>multy stub is working v${pkg.version}</h1>
         <ul>
@@ -19,8 +20,7 @@ router.get('/', async (req, res) => {
         <h2>models</h2>
         <ul>${
           (await Promise.all(
-            (
-              await mongoose.modelNames()).map(async (name) => {
+            (await mongoose.modelNames()).map(async (name) => {
                 const count = await mongoose.model(name).countDocuments()
                 return `<li>${name} - ${count}</li>`
               }