feat: node code perf

Author: iamtsm

conf/cfg.json

@@ -37,11 +37,7 @@
      "router": {
           "filter": {
                "whiteDir": [
-                    "socket",
-                    "tables",
-                    "worker",
-                    "oss",
-                    "openai"
+
                ],
                "whiteFile": [
                     "router.js"

local.js

@@ -1,20 +1,47 @@
-const express = require("express"); //express
-const conf = require("./conf/cfg"); //conf
-const fileApiRouters = require("./src/router")(conf); //file routers
+const express = require("express");
+const conf = require("./conf/cfg.json");
+const fileApiRouters = require("./src/controller/router")();
 let resRouter = conf.router.res;
+const db = require("./src/tables/db"); //db
 
 let app = express();
-console.log("resource including...")
+console.log("api init start ...")
 
 //res
-for(let key in resRouter) app.use(key,express.static(resRouter[key]));
+for (let key in resRouter) {
+    app.use(key, express.static(resRouter[key]));
+}
 
 //file api
-for(let key in fileApiRouters) app.use(key,fileApiRouters[key])
+for (let key in fileApiRouters) {
+    app.use(key, fileApiRouters[key])
+}
 
+if (!conf.db.open) {// 没开db
 
-app.listen(conf.node.port);
-console.log("express init...")
+    app.use(async function (req, res, next) {
+        req.ctx = {};
+        req.ctx.tables = {};
+        req.ctx.dbClient = {};
+        await next();
+    })
+    app.listen(conf.node.port);
+    console.log("express init done ...")
+    console.log("web server runing on ", conf.node.port, " successful");
+} else { // 开了db
 
+    (async () => {
+        let { tables, dbClient } = await db.excute(conf)
+        console.log("db init done ...")
+        app.use(async function (req, res, next) {
+            req.ctx = {};
+            req.ctx.tables = tables;
+            req.ctx.dbClient = dbClient;
+            await next();
+        })
 
-console.log("server runing on ",conf.node.port," successful");
+        app.listen(conf.node.port);
+        console.log("express init done ...")
+        console.log("web server runing on ", conf.node.port, " successful");
+    })();
+}

localsocket.js

@@ -1,45 +1,25 @@
 const http = require('http'); // http
 const socketIO = require('socket.io'); //socket
-const app = require("express")(); //express
 const db = require("./src/tables/db"); //db
 const conf = require("./conf/cfg.json"); //conf
-const utils = require("./utils/utils"); //utils
 const socket = require("./src/socket/index") //socket handler
 
-let tables = {};
-let sql = {};
+// Socket连接监听
+let io = socketIO.listen(http.createServer().listen(conf.ws.port));
 
-if(conf.db.open){
-  // db init
-  let dbData = db.excute(conf);
-  tables = dbData.tables;
-  sql = dbData.sql;
-  
-  app.use(async function (req,res,next) {
-    req.ctx = {};
-    req.ctx.tables = tables;
-    req.ctx.sql = sql;
-    req.ctx.Sql = Sql;
-    await next();
-  })
-  console.log("db init...")
-}
+if (!conf.db.open) {// 没开db
+	
+	console.log("db not open ...")
+	socket.excute({}, {}, io);
+	console.log("socket init done ...")
+	console.log("socket server listen on ", conf.ws.port, " successful");
+} else { // 开了db
 
-
-//log flow init --日志流水初始
-app.use(async function (req,res,next) {  
-  res.tl = {};
-  res.tl.flowId = utils.genFlow();
-  await next();
-})
-console.log("flow init...")
-
-//Socket连接监听
-let io = socketIO.listen(
-  http.createServer().listen(conf.ws.port)
-);
-conf.ws.io = io;
-socket.excute(tables, sql, conf);
-console.log("socket init...")
-
-console.log("socket listen on ",conf.ws.port," successful");
+	(async () => {
+		let { tables, dbClient } = await db.excute(conf)
+		console.log("db init done ...")
+		socket.excute(tables, dbClient, io);
+		console.log("socket init done ...")
+		console.log("socket server listen on ", conf.ws.port, " successful");
+	})();
+}

res/js/index.js

@@ -1662,7 +1662,12 @@ axios.get(window.prefix + "/api/comm/initData", {}).then((initData) => {
                         return;
                     }
                     this.setNickName();
-                    this.socket.emit('createAndJoin', { room: this.roomId, nickName : this.nickName });
+                    this.socket.emit('createAndJoin', { 
+                        room: this.roomId,
+                        type : 'password',
+                        password : '', 
+                        nickName : this.nickName 
+                    });
                     this.isJoined = true;
                     this.addPopup({
                         title : "文件房间",
@@ -1694,7 +1699,11 @@ axios.get(window.prefix + "/api/comm/initData", {}).then((initData) => {
                         return;
                     }
                     this.setNickName();
-                    this.socket.emit('createAndJoin', { room: this.roomId, type: type, nickName : this.nickName });
+                    this.socket.emit('createAndJoin', { 
+                        room: this.roomId, 
+                        type: type, 
+                        nickName : this.nickName 
+                    });
                     this.isJoined = true;
                     this.addPopup({
                         title : "流媒体房间",
@@ -1735,7 +1744,12 @@ axios.get(window.prefix + "/api/comm/initData", {}).then((initData) => {
                         return;
                     }
                     this.setNickName();
-                    this.socket.emit('createAndJoin', { room: this.roomId, password: password, nickName : this.nickName });
+                    this.socket.emit('createAndJoin', { 
+                        room: this.roomId, 
+                        type : 'password', 
+                        password: password, 
+                        nickName : this.nickName 
+                    });
                     this.isJoined = true;
                     this.addPopup({
                         title : "密码房间",

server.js

@@ -1,25 +1,57 @@
-const express = require("express"); //express
-const conf = require("./conf/cfg"); //conf
-const fileApiRouters = require("./src/router")(conf); //file routers
+const express = require("express");
+const fs = require('fs');
+const https = require('https');
+const conf = require("./conf/cfg.json");
+const fileApiRouters = require("./src/controller/router")();
 let resRouter = conf.router.res;
-const fs = require('fs'); // fs
-const https = require('https'); // http
+const db = require("./src/tables/db");
 
 let app = express();
-console.log("resource including...")
+console.log("api init start ...")
 
 //res
 for(let key in resRouter) app.use(key,express.static(resRouter[key]));
 
 //file api
 for(let key in fileApiRouters) app.use(key,fileApiRouters[key])
 
-let options = {
-    key: fs.readFileSync('./conf/keys/server.key'),
-    cert: fs.readFileSync('./conf/keys/server.crt')
-}
-https.createServer(options,app).listen(conf.node.port);
-console.log("express init...")
+if (!conf.db.open) {// 没开db
+
+    app.use(async function (req, res, next) {
+        req.ctx = {};
+        req.ctx.tables = {};
+        req.ctx.dbClient = {};
+        await next();
+    })
+    let options = {
+        key: fs.readFileSync('./conf/keys/server.key'),
+        cert: fs.readFileSync('./conf/keys/server.crt')
+    }
+    https.createServer(options,app).listen(conf.node.port);
+    console.log("express init done ...")
+    console.log("web server runing on ", conf.node.port, " successful");
+
+} else {// 开了db
+    
+    (async () => {
+        let { tables, dbClient } = await db.excute(conf)
+        console.log("db init done ...")
+        app.use(async function (req, res, next) {
+            req.ctx = {};
+            req.ctx.tables = tables;
+            req.ctx.dbClient = dbClient;
+            await next();
+        })
 
+        let options = {
+            key: fs.readFileSync('./conf/keys/server.key'),
+            cert: fs.readFileSync('./conf/keys/server.crt')
+        }
+        https.createServer(options,app).listen(conf.node.port);
+        console.log("express init done ...")
+        console.log("web server runing on ", conf.node.port, " successful");
+    })();
+
+}
 
-console.log("server runing on ",conf.node.port," successful");
+console.log("web server runing on ",conf.node.port," successful");

serversocket.js

@@ -1,50 +1,33 @@
-const https = require('https'); // http
-const socketIO = require('socket.io'); //socket
-const app = require("express")(); //express
-const fs = require('fs'); // fs
-const db = require("./src/tables/db"); //db
-const conf = require("./conf/cfg.json"); //conf
-const utils = require("./utils/utils"); //utils
-const socket = require("./src/socket/index") //socket handler
-
-let tables = {};
-let sql = {};
-if(conf.db.open){
-  // db init
-  let dbData = db.excute(conf);
-  tables = dbData.tables;
-  sql = dbData.sql;
-  app.use(async function (req,res,next) {
-    req.ctx = {};
-    req.ctx.tables = tables;
-    req.ctx.sql = sql;
-    req.ctx.Sql = Sql;
-    await next();
-  })
-  console.log("db init...")
-}
-
-
-//log flow init --日志流水初始
-app.use(async function (req,res,next) {  
-  res.tl = {};
-  res.tl.flowId = utils.genFlow();
-  await next();
-})
-console.log("flow init...")
-
+const https = require('https');
+const socketIO = require('socket.io');
+const fs = require('fs');
+const db = require("./src/tables/db");
+const conf = require("./conf/cfg.json");
+const socket = require("./src/socket/index")
 
 //Socket连接监听
 let options = {
-  key: fs.readFileSync('./conf/keys/server.key'),
-  cert: fs.readFileSync('./conf/keys/server.crt')
+	key: fs.readFileSync('./conf/keys/server.key'),
+	cert: fs.readFileSync('./conf/keys/server.crt')
 }
 let io = socketIO.listen(
-  https.createServer(options).listen(conf.ws.ssl_port)
+	https.createServer(options).listen(conf.ws.ssl_port)
 );
-conf.ws.io = io;
-socket.excute(tables, sql, conf);
-console.log("socket init...")
 
+if (!conf.db.open) {// 没开db
+
+	console.log("db not open ...")
+	socket.excute({}, {}, io);
+	console.log("socket init done ...")
+	console.log("socket server listen on ", conf.ws.port, " successful");
+
+} else {// 开了db
 
-console.log("socket listen on ",conf.ws.ssl_port," successful");
+	(async () => {
+		let { tables, dbClient } = await db.excute(conf)
+		console.log("db init done ...")
+		socket.excute(tables, dbClient, io);
+		console.log("socket init done ...")
+		console.log("socket server listen on ", conf.ws.port, " successful");
+	})();
+}

src/bussiness/dog/dog.js

@@ -0,0 +1,67 @@
+const dog = require("./../../dao/dog/dog");
+
+/**
+ * 操作记录
+ * @param {*} data 
+ */
+async function dogData(data) {
+    let req = {
+        ctx: {
+            tables: data.tables
+        },
+        params: data
+    };
+    let res = 0;
+    
+    try {
+        res = await dog.addDogData(req, null);
+    } catch (e) {
+        console.log(e)
+    }
+
+    return res && res.dataValues ? res.dataValues.id : 0
+}
+
+
+
+/**
+ * 获取最近10条公共聊天室数据
+ * @param {*} data 
+ */
+async function getDogChating10Info(data) {
+    let req = {
+        ctx: {
+            tables: data.tables,
+            dbClient: data.dbClient
+        }
+    };
+
+    return await dog.getDogChating10Info(req, null);
+}
+
+/**
+ * 获取操作数据信息
+ * @param {*} data 
+ * @returns 
+ */
+async function getDogManageInfo(data){
+    let req = {
+        ctx: {
+            tables: data.tables,
+            dbClient: data.dbClient,
+            sockets: data.sockets
+        },
+        params: {
+            limit: 10,
+            day: data.day,
+        }
+    }
+    return await dog.getDogManageInfo(req, null);
+}
+
+
+module.exports = {
+    dogData,
+    getDogChating10Info,
+    getDogManageInfo
+}