mdkcontroller 1.2.3 → 1.3.1

package/dk_modules/authorization.js

@@ -1,22 +1,14 @@
-import child_process from "child_process";
+import { decrypt, encrypt } from "./dkEncrypC.js";
 
-function isCalledFromNodeModules() {
-    const error = new Error();
-    const stackLines = error.stack.split('\n');
-    // Bỏ qua dòng đầu tiên vì đó là thông tin của Error
-    for (let i = 1; i < stackLines.length; i++) {
-        if (stackLines[i].includes('node_modules')) {
-            return true;
-        }
-    }
-    return false;
-}
+export default function () {
 
-export default function (db) {
-    const tbLoginToken = db.data.loginTokens;
-    const tbUser = db.data.users;
-    const isModule = isCalledFromNodeModules();
     const validateBase = function name(req, res) {
+        const db = global.db;
+        db.data.loginTokens = db.data.loginTokens || [];
+        const tbLoginToken = db.data.loginTokens;
+        db.data.users = db.data.users || [];
+        const tbUser = db.data.users;
+
         const accessToken = req.cookies?.access_token;
         if (accessToken) {
             const datenow = new Date();
@@ -38,50 +30,29 @@ export default function (db) {
         }
     }
     console.log(
-        "Module dk_modules/authorization.js: (db)=>{ validate:fn, validateBool:fn }"
+        "Module dk_modules/authorization.js: ()=>{ validate:fn, validateBool:fn, encrypt:fn, decrypt:fn }"
     );
     return {
         validate: (req, res, next) => {
             const resultValidate = validateBase(req, res);
             switch (resultValidate) {
                 case 0:
-                    return res.status(401).json({message: 'Token không được cung cấp'});
+                    return res.status(401).json({ message: 'Bạn cần đăng nhập trước khi thực hiện các yêu cầu đến endpoint này.' });
                 case 1:
-
                     next();
                     break;
                 case -1:
-                    return res.status(401).json({message: 'Token không hợp lệ'});
+                    return res.status(401).json({ message: 'Token không hợp lệ' });
             }
         },
         validateBool: (req, res) => {
             return validateBase(req, res);
         },
-        encrypt: async function (data = "", pw = "mdkpaswoEcrHidDefat") {
-            const cdtoCmd = isModule ? "node_modules\\mdkcontroller\\" : "";
-            const cmd = data + " " + pw;
-            return new Promise((resolve, reject) => {
-                child_process.exec(`${cdtoCmd}dk_modules\\EncryptC\\DKEncryptCMD e ${cmd}`, (error, stdout, stderr) => {
-                    if (error) {
-                        reject(error);
-                        return;
-                    }
-                    resolve(stdout.trimEnd());
-                });
-            });
+        encrypt: function (data = "", pw = "mdkpaswoEcrHidDefat") {
+            return encrypt(data, pw);
         },
         decrypt: function (data = "", pw = "mdkpaswoEcrHidDefat") {
-            const cdtoCmd = isModule ? "node_modules\\mdkcontroller\\" : "";
-            const cmd = data + " " + pw;
-            return new Promise((resolve, reject) => {
-                child_process.exec(`${cdtoCmd}dk_modules\\EncryptC\\DKEncryptCMD d ${cmd}`, (error, stdout, stderr) => {
-                    if (error) {
-                        reject(error);
-                        return;
-                    }
-                    resolve(stdout);
-                });
-            });
+            return decrypt(data, pw);
         }
     }
 };

package/dk_modules/autoSequence.js

@@ -1,23 +1,23 @@
-export default (db) => {
+
+
+export const getNumber = (name) => {
+    const db = global.db;
+    db.data.autoSequenceNumber = db.data.autoSequenceNumber || [];
     const tbSequence = db.data.autoSequenceNumber;
+    let continueNumber = tbSequence.find(f => f.name == name);
+    if (!continueNumber) {
+        tbSequence
+            .push({
+                name: name,
+                currentNumber: 0
+            });
+        continueNumber = tbSequence.find(f => f.name == name);
+    }
+    continueNumber.currentNumber += 1
+    db.write();
+    return continueNumber.currentNumber;
+};
 
-    console.log(
-        "Module dk_modules/autoSequence.js: (db)=>{ getNumber:fn }"
-    );
-    return {
-        getNumber: (name) => {
-            let continueNumber = tbSequence.find(f => f.name == name);
-            if (!continueNumber) {
-                tbSequence
-                    .push({
-                        name: name,
-                        currentNumber: 0
-                    });
-                continueNumber = tbSequence.find(f => f.name == name);
-            }
-            continueNumber.currentNumber += 1
-            db.write();
-            return continueNumber.currentNumber;
-        }
-    };
-}
+console.log(
+    "Module dk_modules/autoSequence.js: ()=> getNumber:fn"
+);

package/dk_modules/dkEncrypC.js

@@ -0,0 +1,33 @@
+import crypto from 'crypto';
+
+function normalizeKey32(inputKey) {
+    const length = 32;
+    if (inputKey.length > length) {
+        return inputKey.slice(0, length); // Cắt bớt nếu quá dài
+    }
+    return inputKey.padEnd(length, '0'); // Thêm '0' vào cuối nếu quá ngắn
+}
+
+export const encrypt = (text, keyTextMAX32) => {
+    const key = Buffer.from(normalizeKey32(keyTextMAX32), 'utf8');
+    const iv = crypto.randomBytes(16); // Vector khởi tạo
+    const cipher = crypto.createCipheriv('aes-256-cbc', Buffer.from(key, 'hex'), iv);
+    let encrypted = cipher.update(text, 'utf8', 'hex');
+    encrypted += cipher.final('hex');
+    return iv.toString('hex') + encrypted;
+}
+
+export const decrypt = (encryptedText, keyTextMAX32) => {
+    const key = Buffer.from(normalizeKey32(keyTextMAX32), 'utf8');
+    const iv = Buffer.from(encryptedText.slice(0, 32), 'hex');
+    const encryptedData = encryptedText.slice(32);
+    const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(key, 'hex'), iv);
+    let decrypted = decipher.update(encryptedData, 'hex', 'utf8');
+    decrypted += decipher.final('utf8');
+    return decrypted;
+}
+
+
+console.log(
+    "Module dk_modules/authorization.js: {  encrypt:fn, decrypt:fn }"
+);

package/dk_modules/users.js

@@ -1,23 +1,25 @@
+import { console } from "inspector";
 import authInstant from "./authorization.js";
-import autoSequenceInstant from "./autoSequence.js";
-import {generateRandomToken, privateKey} from "./dkvar.js";
+import { getNumber } from "./autoSequence.js";
 
 export default (router, db) => {
 
-    const auth = authInstant(db);
-    const autoNumber = autoSequenceInstant(db);
+    const auth = authInstant();
+
+    db.data.users = db.data.users || [];
     const tbUser = db.data.users;
+    db.data.loginTokens = db.data.loginTokens || [];
     const tbLoginToken = db.data.loginTokens;
 
 
     router.get("/users/gets", auth.validate, (req, res) => {
-        res.json({message: "Get all users"});
+        res.json({ message: "Get all users" });
     });
 
     router.get("/users/get", auth.validate, (req, res) => {
         const userId = req.params.id;
-        const userO = tbUser.find({id: parseInt(userId)});
-        res.json({message: `Get user with ID ${userId}`, user: userO});
+        const userO = tbUser.find({ id: parseInt(userId) });
+        res.json({ message: `Get user with ID ${userId}`, user: userO });
     });
     router.get('/users/logout', async (req, res) => {
         const accessToken = req.cookies?.access_token;
@@ -26,7 +28,7 @@ export default (router, db) => {
             tbLoginToken.slice(indexToken, 1);
             await db.write();
         }
-        res.clearCookie('access_token', {httpOnly: true});
+        res.clearCookie('access_token', { httpOnly: true });
         res.clearCookie('sessionUExt', {});
         res.redirect('/login');
     });
@@ -34,29 +36,30 @@ export default (router, db) => {
     router.post("/users/login", async (req, res) => {
         const bodyParser = req.body;
         if (bodyParser.userName && bodyParser.password) {
-            let userLoging = tbUser.find(f => f.userName == bodyParser.userName.toLowerCase() && f.password == bodyParser.password);
+
+            let userLoging = tbUser.find(f => f.userName == bodyParser.userName.toLowerCase().trim() && auth.decrypt(f.password) == bodyParser.password);
             if (userLoging) {
-                const userIdCode = await auth.encrypt(userLoging.userName);
-                const accessToken = userIdCode + generateRandomToken(100);
+                const userIdCode = auth.encrypt(userLoging.userName);
+                const accessToken = userIdCode + global.generateRandomString(100);
 
                 const expiredValue = new Date();
                 expiredValue.setMonth(expiredValue.getMonth() + 1);
 
                 tbLoginToken.push({
-                    id: autoNumber.getNumber('loginTokens'),
+                    id: getNumber('loginTokens'),
                     userId: userLoging.id,
                     tokenString: accessToken,
                     expired: expiredValue
                 });
                 await db.write();
-                res.cookie('access_token', accessToken, {httpOnly: true, expires: expiredValue});
-                res.cookie('sessionUExt', userIdCode, {expires: expiredValue});
-                res.json({message: `Đăng nhập thành công.`, success: true});
+                res.cookie('access_token', accessToken, { httpOnly: true, expires: expiredValue });
+                res.cookie('sessionUExt', userIdCode, { expires: expiredValue });
+                res.json({ message: `Đăng nhập thành công.`, success: true });
             } else {
-                res.json({message: `Tài khoản hoặc mật khẩu không chính xác.`, success: false});
+                res.json({ message: `Tài khoản hoặc mật khẩu không chính xác.`, success: false });
             }
         } else {
-            res.json({message: `Không đủ thông tin để đăng nhập.`, success: false});
+            res.json({ message: `Không đủ thông tin để đăng nhập.`, success: false });
         }
     });
     router.get("/users/tryGetAccess", (req, res) => {
@@ -65,13 +68,13 @@ export default (router, db) => {
             const accessToken = req.cookies?.access_token;
             const expiredValue = new Date();
             expiredValue.setMonth(expiredValue.getMonth() + 1);
-            res.cookie('access_token', accessToken, {httpOnly: true, expires: expiredValue});
+            res.cookie('access_token', accessToken, { httpOnly: true, expires: expiredValue });
         }
-        res.json({success: true, isLogin: isLogin});
+        res.json({ success: true, isLogin: isLogin });
     });
     router.post("/users/create", async (req, res) => {
         if (!global.allowRegister) {
-            res.json({message: `Chức năng đăng ký tài khoản mới không được cung cấp.`, success: false});
+            res.json({ message: `Chức năng đăng ký tài khoản mới không được cung cấp.`, success: false });
             return;
         }
         const bodyParser = req.body;
@@ -80,15 +83,15 @@ export default (router, db) => {
             if (!newUser) {
                 let validateUserName = tbUser.find(f => f.userName == bodyParser.userName.toLowerCase());
                 if (validateUserName) {
-                    res.json({message: `Tên tài khoản đã có người đăng ký.`, success: false});
+                    res.json({ message: `Tên tài khoản đã có người đăng ký.`, success: false });
                     return;
                 }
                 tbUser
                     .push({
-                        id: autoNumber.getNumber('users'),
+                        id: getNumber('users'),
                         userName: bodyParser.userName.toLowerCase(),
                         email: bodyParser.email.toLowerCase(),
-                        password: bodyParser.password,
+                        password: auth.encrypt(bodyParser.password),
                         active: true,
                         amount: 0
                     });
@@ -107,14 +110,14 @@ export default (router, db) => {
                 });
             }
         } else {
-            res.json({message: `Không đủ thông tin để tạo User mới.`, success: false});
+            res.json({ message: `Không đủ thông tin để tạo User mới.`, success: false });
         }
     });
 
     console.log(
         "Module dk_modules/users.js: (db)=>{ router: router, table: tbUser }"
     );
-    return {router: router, table: tbUser};
+    return { router: router, table: tbUser };
 };
 
 // // Thêm một người dùng mới

package/index.js

@@ -1,7 +1,9 @@
 import main from "./main.js"
 import authen from "./dk_modules/authorization.js"
-import ause from "./dk_modules/autoSequence.js"
+import { getNumber } from "./dk_modules/autoSequence.js"
 
 export const Root = async (a, b) => await main(a, b);
-export const Authen = (db) => authen(db);
-export const Sequense = (db) => ause(db);
+export const Authen = () => authen();
+export const Sequense = (key) => {
+    return getNumber(key);
+}

package/main.js

@@ -12,7 +12,6 @@ import authInstant from "./dk_modules/authorization.js";
 
 import {fileURLToPath} from "url";
 import path from 'path';
-// import {privateKey, encodeMini} from "./dk_modules/dkvar.js";
 
 export default async function (appname, cfgHandler = {}) {
 
@@ -22,7 +21,7 @@ export default async function (appname, cfgHandler = {}) {
     const app = express();
     const server = createServer(app);
     const db = await dbInstant(appname + "-Database.json");
-    const auth = authInstant(db);
+    const auth = authInstant();
     const userRoutes = userInstant(Router(), db);
 
     app.use(json());

package/package.json

@@ -1,24 +1,19 @@
 {
   "dependencies": {
-    "child_process": "^1.0.2",
     "cookie-parser": "^1.4.6",
     "express": "^4.18.2",
-    "fluent-ffmpeg": "^2.1.2",
-    "handlebars": "^4.7.8",
-    "js-yaml": "^4.1.0",
     "lowdb": "^7.0.1",
     "socket.io": "^4.7.2"
   },
   "name": "mdkcontroller",
-  "version": "1.2.3",
+  "version": "1.3.1",
   "keywords": [],
   "author": "KHANHNBD <khanh272421@gmail.com>",
   "license": "ISC",
   "description": "Quick setup authentication and express",
   "type": "module",
   "exports": {
-    ".": "./index.js",
-    "./autosequence": "./dk_modules/autoSequence.js"
+    ".": "./index.js"
   },
   "types": "./index.js",
   "files": [

package/dk_modules/EncryptC/DKEncryptCMD.deps.json

@@ -1,23 +0,0 @@
-{
-  "runtimeTarget": {
-    "name": ".NETCoreApp,Version=v7.0",
-    "signature": ""
-  },
-  "compilationOptions": {},
-  "targets": {
-    ".NETCoreApp,Version=v7.0": {
-      "DKEncryptCMD/1.0.0": {
-        "runtime": {
-          "DKEncryptCMD.dll": {}
-        }
-      }
-    }
-  },
-  "libraries": {
-    "DKEncryptCMD/1.0.0": {
-      "type": "project",
-      "serviceable": false,
-      "sha512": ""
-    }
-  }
-}

package/dk_modules/EncryptC/DKEncryptCMD.runtimeconfig.json

@@ -1,9 +0,0 @@
-{
-  "runtimeOptions": {
-    "tfm": "net7.0",
-    "framework": {
-      "name": "Microsoft.NETCore.App",
-      "version": "7.0.0"
-    }
-  }
-}

package/dk_modules/dkvar.js

@@ -1,13 +0,0 @@
-import {Buffer} from 'node:buffer';
-
-export const privateKey = 'eyJzdWIiOiI5Nzc4IiwibmFtZSI6IkRraGFuaE1NTSIsImlhdCI6ODkxMDB9';
-
-export function generateRandomToken(length = 100) {
-    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    let token = '';
-    for (let i = 0; i < length; i++) {
-        const randomIndex = Math.floor(Math.random() * characters.length);
-        token += characters.charAt(randomIndex);
-    }
-    return token;
-}