fullgream/kodex-music-catalog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Nikiroy78 2023-10-03 02:50:16 +03:00
parent 725f91ea8c
commit f6275b0998
4 changed files with 125 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.json
View File

@ -8,7 +8,7 @@
}, },
"database" : { "database" : {
"port" : 5433, "port" : 5433,
"address" : "localhost", "address" : "localhost",
"username" : "postgres", "username" : "postgres",
"password" : "root", "password" : "root",
"database" : "kodex-db" "database" : "kodex-db"

138
database.js
View File

@ -1,6 +1,7 @@
const { Sequelize, DataTypes } = require("sequelize"); const { Sequelize, DataTypes } = require("sequelize");
const config = require('./config-handler');
class Table { /*class Table {
constructor(model) { constructor(model) {
this.model = model; this.model = model;
} }
@ -58,7 +59,7 @@ class TablePromise extends Table {
async edit(data, condition) { async edit(data, condition) {
return await this.model.update(data, condition); return await this.model.update(data, condition);
} }
} }*/
class Database { class Database {
constructor(address, port, username, password, database) { constructor(address, port, username, password, database) {
@ -67,62 +68,83 @@ class Database {
); );
this.sequelize.authenticate().then( this.sequelize.authenticate().then(
() => { () => {
this.authors = new Table( // this.authors = new Table(
this.sequelize.define( // this.sequelize.define(
"authors", // "authors",
{ // {
id: { // id: {
type: DataTypes.INTEGER, // type: DataTypes.INTEGER,
primaryKey: true, // primaryKey: true,
autoIncrement: true, // autoIncrement: true,
allowNull: false, // allowNull: false,
}, // },
name: { // name: {
type: DataTypes.TEXT, // type: DataTypes.TEXT,
allowNull: false, // allowNull: false,
}, // },
time: { // time: {
type: DataTypes.INTEGER, // type: DataTypes.INTEGER,
allowNull: false, // allowNull: false,
}, // },
// },
// {
// freezeTableName: true,
// timestamps: false,
// },
// ),
// );
this.authors = this.sequelize.define(
"authors",
{
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
allowNull: false,
}, },
{ name: {
freezeTableName: true, type: DataTypes.TEXT,
timestamps: false, allowNull: false,
}, },
), time: {
); type: DataTypes.INTEGER,
this.muzic = new Table( allowNull: false,
this.sequelize.define(
"muzic",
{
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
allowNull: false,
},
name: {
type: DataTypes.TEXT,
allowNull: false,
},
author_id: {
type: DataTypes.INTEGER,
allowNull: false,
},
data: {
type: DataTypes.BLOB("long"),
},
time: {
type: DataTypes.INTEGER,
allowNull: false,
},
}, },
{ },
freezeTableName: true, {
timestamps: false, freezeTableName: true,
timestamps: false,
},
)
this.music = this.sequelize.define(
"music",
{
id: {
type: DataTypes.INTEGER,
primaryKey: true,
autoIncrement: true,
allowNull: false,
}, },
), name: {
type: DataTypes.TEXT,
allowNull: false,
},
author_id: {
type: DataTypes.INTEGER,
allowNull: false,
},
data: {
type: DataTypes.BLOB("long"),
},
time: {
type: DataTypes.INTEGER,
allowNull: false,
},
},
{
freezeTableName: true,
timestamps: false,
},
); );
console.log("Database successful connected!"); console.log("Database successful connected!");
}, },
@ -133,4 +155,10 @@ class Database {
} }
} }
module.exports = { Database }; module.exports = new Database(
config().database.address,
config().database.port,
config().database.username,
config().database.password,
config().database.database
);

66
logger.js
View File

@ -1,40 +1,36 @@
const config = require("./config-handler"); const config = require("./config-handler");
const fs = require("fs"); const fs = require("fs");
function log(date, req, ip, res) { class Logger {
const requestBody = !req.byteBody.toString("utf-8") constructor () {
? "" this.logId = `${(new Date()).getTime()}`;
: ` let loggerFolder = config().logger_folder;
~~~~~~~~~~~~~~ loggerFolder = !["/", "\\"].includes(loggerFolder.at(-1))
[REQUEST BODY] ? loggerFolder + "/"
~~~~~~~~~~~~~~ : loggerFolder;
${req.byteBody.toString("utf-8")}`; fs.writeFile(
let action = `HTTP ${req.httpVersion} ${req.method} ${req.originalUrl} `${loggerFolder}${this.logId}.log`, '',
~~~~~~~~~ {
[HEADERS] encoding: "utf8"
~~~~~~~~~ }
${Object.entries(req.headers) (err) => {
.map(([header, value]) => header + ": " + value) throw err;
.join("\n")}${requestBody}`; }
let response = !res.isError );
? "" }
: `\n----------------\nError raised:\n----------------\n${JSON.stringify(
res.responseData, log (date, ip, action, isError = false) {
)}`; fs.writeFile(
//console.log(`================================\nREPORT\n================================\n\nIP: ${ip}\n----------------\nACTION:\n----------------\n${action}${response}`); `${loggerFolder}${this.logId}.log`, !isError ? `IP: ${ip}\nДата запроса: ${date}` : `\nПроизошла ошибка: ${action}`,
let loggerFolder = config().logger_folder; {
loggerFolder = !["/", "\\"].includes(loggerFolder.at(-1)) encoding : "utf8",
? loggerFolder + "/" flag : "a"
: loggerFolder; }
(err) => {
fs.writeFileSync( throw err;
`${loggerFolder}${date.getTime()}.log`, }
`================================\nREPORT\n================================\n\nIP: ${ip}\n----------------\nACTION:\n----------------\n${action}${response}`, );
); }
} }
module.exports = async (req, res, next) => { module.exports = async (req, res, next) => { Logger };
// console.log('ip', req.ip);
log(new Date(), req, req.ip, res);
next();
};

20
server.js
View File

@ -3,20 +3,20 @@
const express = require("express"); const express = require("express");
const bodyHand = require("body"); const bodyHand = require("body");
const config = require("./config-handler"); const config = require("./config-handler");
const http = require("http"); // const http = require("http");
const { Database } = require("./database"); const { Database } = require("./database");
const app = express(); const app = express();
global.database = new Database( // global.database = new Database(
config().database.address, // config().database.address,
config().database.port, // config().database.port,
config().database.username, // config().database.username,
config().database.password, // config().database.password,
config().database.database, // config().database.database
); // );
http.ServerResponse.prototype.errorModeOn = function () { /*http.ServerResponse.prototype.errorModeOn = function () {
this.isError = true; this.isError = true;
}; };
@ -62,7 +62,7 @@ app.use((req, res, next) => {
next(); next();
}, },
); );
}); });*/
app.use("/", require("./page-view")); app.use("/", require("./page-view"));
app.use("/api", require("./api")); app.use("/api", require("./api"));