ming_node 2.9.0 → 2.9.5

package/README.md

@@ -55,7 +55,7 @@ app.get("/getSession",(req,res)=>{
 ```javascript
 +async function(){
     M =await new Promise((v)=>require('https').get("https://minglie.github.io/js/ming_node.js",(q)=>{d='';q.on('data',(a)=>d+=a);q.on('end',()=>v(eval(d)))}))
-  var app=M.server();
+   var app=M.server();
     app.listen(8888);
     app.get("/",async (req,res)=>{ 
        app.redirect("/index.html",req,res)
@@ -110,13 +110,21 @@ app.listen(8888);
 app.get("/baidu",(req,res)=>{ 
     console.log(req.params);
     //响应html文本
-   // res.renderHtml("hello woed")
+    res.renderHtml("hello woed")
    //响应js文本
-    //res.renderJs("alert(5)")
+    res.renderJs("alert(5)")
     //响应本地文件
-    //res.renderUrl("file:D:/G/ming_node/test/test.html");
+    res.renderUrl("file:D:/G/ming_node/test/test.html");
     //响应百度首页
     res.renderUrl("https://www.baidu.com/index.html");
+    //响应一个网络文件,支持二进制
+    res.sendFile("https://ming/a.txt");
+    //响应一个本地文件,支持二进制
+    res.sendFile("file:C:/Users/a.txt");
+    //响应一个网络文件,支持二进制,浏览器直接下载
+    res.sendFile("https://ming/a.txt",true);
+    //响应一个本地文件,支持二进制,浏览器直接下载
+    res.sendFile("file:C:/Users/a.txt",true);
 })
 
 ```

package/beforeTest/FileDbTest.js

@@ -0,0 +1,18 @@
+FileDb=require("../module/FileDb")
+
+db= new FileDb("a.json",false)
+
+db.add({
+    name:"zs"
+})
+
+console.log(db.listByPage({caseObj:{
+        "$name":"s"
+    }}))
+
+
+db.add({
+    name:"ls"
+})
+
+console.log(db.listByPage({}))

package/beforeTest/MemorDbTest.js

@@ -6,11 +6,13 @@ db.add({
     name:"zs"
 })
 
-console.log(db.listByPage())
+console.log(db.listByPage({caseObj:{
+        "$name":"s"
+    }}))
 
 
 db.add({
     name:"ls"
 })
 
-console.log(db.listByPage())
+console.log(db.listByPage({}))

package/beforeTest/MingNodemonUtilsTest.js

@@ -0,0 +1,3 @@
+let restart= require("../utils/nodemon/restart");
+restart("test.js","test.js")
+

package/beforeTest/test.js

@@ -4,5 +4,5 @@ app=M.server()
 app.listen(8888)
 
 app.get(["/h15","/h16","/h18888"],(req,res)=>{
-    res.send("BBBB")
+    res.send("BBBBXXXEEEEE")
 })

package/index.js

@@ -3,7 +3,7 @@
  * By : Minglie
  * QQ: 934031452
  * Date :2021.12.01
- * version :2.8.0
+ * version :2.9.5
  */
 var http = require('http');
 var https = require('https');
@@ -437,23 +437,22 @@ M.import=async function (url,callback){
 /**
  *下载图片
  */
-M.download = function (url, file, callback) {
+M.download =async function (url, file) {
     var func = http;
     if (url.indexOf("https") >= 0) {
         func = https;
     }
-    func.get(url, function (res) {
-        res.setEncoding('binary');//转成二进制
-        var content = '';
-        res.on('data', function (data) {
-            content += data;
-        }).on('end', function () {
-            if (callback) callback();
-            fs.writeFile(file, content, 'binary', function (err) {
-                if (err) throw err;
-            });
+    return new Promise(((resolve, reject) => {
+        func.get(url, function (res) {
+            let writeStream = fs.createWriteStream(file);
+            res.on("end",d=>{
+                resolve(file);
+            }).on("error",e=>{
+                reject(e);
+            }).pipe(writeStream);
         });
-    });
+    }))
+
 }
 /**
  *下载所有图片
@@ -823,10 +822,8 @@ M.readLine =async function (file, callback) {
             }
         });
         input.on('end', function () {
-            if (remaining.length > 0) {
-                resolve(lineCount);
-                callback(remaining);
-            }
+            resolve(lineCount);
+            callback(remaining);
         });
     } )
 }
@@ -1579,6 +1576,47 @@ M.server = function () {
                 G._end(req,text);
             }
 
+
+            res.sendFile= async function (url,isDownLoad=false) {
+                let extname = path.extname(url);
+                let fileName=M.getFileNameByUrl(url);
+                if(url.startsWith("file")){
+                    url= url.substring(5);
+                    res.setHeader("Access-Control-Allow-Origin", "*");
+                    res.setHeader("Access-Control-Allow-Headers", "X-Requested-With");
+                    res.setHeader("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS");
+                    res.setHeader("X-Powered-By", ' 3.2.1');
+                    if(isDownLoad){
+                        res.setHeader("Content-Disposition", "attachment;filename="+encodeURIComponent(fileName,"utf-8"));
+                    }
+                    res.writeHead(200, {"Content-Type": "" + (privateObj.staticMime[extname] || 'text/html') + ";charset='utf-8'",});
+                    fs.createReadStream(url).on("end",d=>{})
+                        .on("error",e=>{
+                            console.error(e);
+                        }).pipe(res);
+                }else {
+                    var func = http;
+                    if (url.indexOf("https") >= 0) {
+                        func = https;
+                    }
+                    func.get(url, function (res1) {
+                        res.setHeader("Access-Control-Allow-Origin", "*");
+                        res.setHeader("Access-Control-Allow-Headers", "X-Requested-With");
+                        res.setHeader("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS");
+                        res.setHeader("X-Powered-By", ' 3.2.1');
+                        if(isDownLoad){
+                            res.setHeader("Content-Disposition", "attachment;filename="+encodeURIComponent(fileName,"utf-8"));
+                        }
+                        res.writeHead(200, {"Content-Type": "" + (privateObj.staticMime[extname] || 'text/html') + ";charset='utf-8'",});
+                        res1.on("end",d=>{})
+                            .on("error",e=>{
+                                console.error(e)
+                            }).pipe(res);
+                    });
+                }
+            }
+
+
             res.render = async function (url) {
                 res.alreadySend = true;
                 let text="";
@@ -1628,6 +1666,14 @@ M.server = function () {
                 res.end();
                 G._end(req,text);
             }
+            //扩充res一个renderHtml方法
+            res.renderCss = function (text) {
+                res.alreadySend = true;
+                res.writeHead(200, {"Content-Type": "text/css;charset='utf-8'"});
+                res.write(text);
+                res.end();
+                G._end(req,text);
+            }
             res.redirect = function (url) {
                 res.alreadySend = true;
                 res.writeHead(302, {'Content-Type': 'text/html; charset=utf-8', 'Location': url});
@@ -2036,8 +2082,9 @@ M.axios = function (axiosConfig) {
 privateObj.dealUseServer = async function (req, res) {
     for (let key in M._use){
         if(M._use[key].regExp.test(req.url)){
-            await  M._use[key].callback(req,res);
-            return;
+            if(!res.alreadySend){
+                await  M._use[key].callback(req,res);
+            }
         }
     }
 }

package/module/FileDb.js

@@ -0,0 +1,193 @@
+/**
+ * File : MemoryDb.js
+ * By : Minglie
+ * QQ: 934031452
+ * Date :2021.09.14
+ * rem : 文件数据库
+ */
+
+const M=require("../index");
+
+class FileDb{
+
+    constructor(tableName,readFromMemory=true) {
+        this.tableName=tableName;
+        this.readFromMemory=readFromMemory;
+        this.dataList=M.getObjByFile(this.tableName)
+    }
+
+    readFromFile(){
+        if(this.readFromMemory){
+            return
+        }else {
+            this.dataList=M.getObjByFile(this.tableName);
+        }
+    }
+
+    /**
+     * 单个加
+     * @param obj
+     * @returns {Promise<*>}
+     */
+    async add(obj){
+        this.readFromFile();
+        obj.id = M.randomStr();
+        this.dataList=[...this.dataList,obj];
+        M.writeObjToFile(this.tableName,this.dataList)
+        return obj;
+    }
+
+    async update(obj){
+        this.readFromFile();
+        for (let i = 0; i < this.dataList.length; i++) {
+            if (this.dataList[i].id == obj.id) {
+                this.dataList[i]=obj;
+                return
+            }
+        }
+        M.writeObjToFile(this.tableName,this.dataList)
+    }
+
+    listAll(caseObj){
+        this.readFromFile();
+        let o_keys=[];
+        if(caseObj){
+            o_keys = Object.keys(caseObj);
+        }
+        if (caseObj && o_keys.length>0) {
+            let r_list = [];
+            let o_vals = Object.values(caseObj);
+            var d = this.dataList;
+            for (let i = 0; i < d.length; i++) {
+                let s=0;
+                for (let j=0;j<o_keys.length;j++){
+                    if(o_keys[j][0]=="$"){
+                        let realKey=o_keys[j].replace("$","");
+                        if (d[i][realKey].indexOf(o_vals[j])==-1) {
+                            break
+                        }
+                    }else {
+                        if (d[i][o_keys[j]] != o_vals[j]) {
+                            break
+                        }
+                    }
+                    s++;
+                }
+                if(s==o_keys.length){
+                    r_list.push(d[i]);
+                }
+            }
+            return r_list;
+        } else {
+            return this.dataList;
+        }
+    }
+
+
+    listByPage({page=0, num=10, caseObj,order}) {
+        page=Number.parseInt(page);
+        num=Number.parseInt(num);
+        if (page <= 0) page = 1;
+        let rows;
+        if (caseObj) {
+            rows = this.listAll(caseObj);
+        } else {
+            rows = this.listAll();
+        }
+        if(order){
+            let orderArr= order.split(" ");
+            let orderField=orderArr[0];
+            let orderType=orderArr[1];
+            rows.sort((a,b)=>{
+                let ret=0;
+                let a_order_v=0;
+                let b_order_v=0;
+                if(a[orderField]!=null){
+                    a_order_v=a[orderField];
+                }
+                if(b[orderField]!=null){
+                    b_order_v=b[orderField];
+                }
+                if (a_order_v>b_order_v) {
+                    ret= 1;
+                }else if(a_order_v<b_order_v){
+                    ret= -1
+                }else{
+                    ret= 0;
+                }
+                if(orderType=="asc"){
+                    return ret;
+                }else {
+                    return -1*ret;
+                }
+            })
+        }
+        let total = rows.length;
+        rows=JSON.parse(JSON.stringify(rows))
+        rows = rows.splice((page - 1) * num, num)
+        return {rows, total}
+    }
+
+
+    deleteAll(o) {
+        this.readFromFile();
+        if (o) {
+            let r_list = [];
+            let o_keys = Object.keys(o);
+            let o_vals = Object.values(o)
+            var d = this.dataList;
+            let delete_index=[]
+            for (let i = 0; i < d.length; i++) {
+                let s=0;
+                for (let j=0;j<o_keys.length;j++){
+                    if (d[i][o_keys[j]] != o_vals[j]) {
+                        break
+                    }
+                    s++;
+                }
+                if(s==o_keys.length){
+                    delete_index.push(i)
+                }
+            }
+            for (let i = 0; i < d.length; i++) {
+                if(!delete_index.includes(i)){
+                    r_list.push(d[i])
+                }
+            }
+            this.dataList=r_list;
+            return delete_index.length;
+        } else {
+            let length=this.dataList.length;
+            this.dataList=[];
+            return length;
+        }
+        M.writeObjToFile(this.tableName,this.dataList)
+    }
+
+    getById(id) {
+        this.readFromFile();
+        var d = this.dataList;
+        for (let i = 0; i < d.length; i++) {
+            if(d[i].id==id){
+                return d[i];
+            }
+        }
+        return null;
+    }
+
+    deleteById(id) {
+        this.readFromFile();
+        var d = this.dataList;
+        for (let i = 0; i < d.length; i++) {
+            if(d[i].id==id){
+                this.dataList.splice(i, 1);
+                return id;
+            }
+        }
+        M.writeObjToFile(this.tableName,this.dataList)
+        return 0;
+    }
+}
+
+
+module.exports = FileDb;

package/module/MemoryDb.js

@@ -36,7 +36,10 @@ class MemoryDb{
     }
 
     listAll(caseObj){
-        let o_keys = Object.keys(caseObj);
+        let o_keys=[];
+        if(caseObj){
+            o_keys = Object.keys(caseObj);
+        }
         if (caseObj && o_keys.length>0) {
             let r_list = [];
             let o_vals = Object.values(caseObj);
@@ -44,8 +47,15 @@ class MemoryDb{
             for (let i = 0; i < d.length; i++) {
                 let s=0;
                 for (let j=0;j<o_keys.length;j++){
-                    if (d[i][o_keys[j]] != o_vals[j]) {
-                       break
+                    if(o_keys[j][0]=="$"){
+                        let realKey=o_keys[j].replace("$","");
+                        if (d[i][realKey].indexOf(o_vals[j])==-1) {
+                            break
+                        }
+                    }else {
+                        if (d[i][o_keys[j]] != o_vals[j]) {
+                            break
+                        }
                     }
                     s++;
                 }
@@ -60,19 +70,39 @@ class MemoryDb{
     }
 
 
-    listByPage(startPage=0, limit=10, caseObj) {
-        startPage=Number.parseInt(startPage);
-        limit=Number.parseInt(limit);
-        if (startPage <= 0) startPage = 1;
+    listByPage({page=0, num=10, caseObj,order}) {
+        page=Number.parseInt(page);
+        num=Number.parseInt(num);
+        if (page <= 0) page = 1;
         let rows;
         if (caseObj) {
             rows = this.listAll(caseObj);
         } else {
             rows = this.listAll();
         }
+        if(order){
+            let orderArr= order.split(" ");
+            let orderField=orderArr[0];
+            let orderType=orderArr[1];
+            rows.sort((a,b)=>{
+                let ret=0;
+                if (a[orderField]>b[orderField]) {
+                    ret= 1;
+                 }else if(a<b){
+                    ret= -1
+                 }else{
+                    ret= 0;
+                 }
+                 if(orderType=="desc"){
+                     return ret;
+                 }else {
+                     return -1*ret;
+                 }
+            })
+        }
         let total = rows.length;
         rows=JSON.parse(JSON.stringify(rows))
-        rows = rows.splice((startPage - 1) * limit, limit)
+        rows = rows.splice((page - 1) * num, num)
         return {rows, total}
     }
 

package/package.json

@@ -46,5 +46,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "2.9.0"
+  "version": "2.9.5"
 }

package/plugins/BaseRestApi/AbstractBaseRestApi.js

@@ -10,7 +10,7 @@ class AbstractBaseRest{
 
     async add(obj){}
     async delete(obj){}
-    async list({page,num,...queryCase}){}
+    async list({page,num,order,...queryCase}){}
     async listAll(obj){}
     async update(obj){}
     async getChildenList(id,queryCase){}
@@ -42,9 +42,9 @@ class AbstractBaseRest{
         });
 
         app.get(`${this.prefix}/:id`,async (req,res)=>{
-            const {id,page,num,...queryCase}=req.params;
+            const {id,page,num,order,...queryCase}=req.params;
             if(id==undefined){
-                let r=await this.list({page,num,queryCase});
+                let r=await this.list({page,num,order,queryCase});
                 res.send(M.successResult(r));
             }else {
                 let r=await this.getById(req.params.id);

package/plugins/BaseRestApi/ApiCloudBaseRestApi.js

@@ -27,12 +27,12 @@ class ApiCloudBaseRestApi extends AbstractBaseRestApi{
         return r[0];
     }
 
-    async list({page=1,num=10,queryCase}){
+    async list({page=1,num=10,order="createdAt ASC",queryCase}){
         page=Number.parseInt(page);
         num=Number.parseInt(num);
         let limit=num;
         let skip= (page-1)*num
-        let r=await this.tableClient.list(queryCase,limit,skip,"createdAt ASC");
+        let r=await this.tableClient.list(queryCase,limit,skip,order);
         return r;
     }
 

package/plugins/BaseRestApi/FileBaseRestApi.js

@@ -29,7 +29,7 @@ class FileBaseRestApi extends AbstractBaseRestApi{
         return r;
     }
 
-    async list({page=1,num=10,queryCase}){
+    async list({page=1,num=10,order,queryCase}){
         page=Number.parseInt(page);
         num=Number.parseInt(num);
         if (page <= 0) page = 1;

package/plugins/BaseRestApi/MemoryBaseRestApi.js

@@ -25,8 +25,8 @@ class MemoryBaseRestApi extends AbstractBaseRestApi{
         return r;
     }
 
-    async list({page,num,queryCase}){
-        let r= this.memoryDb.listByPage(page,num,queryCase);
+    async list({page,num,order,queryCase}){
+        let r= this.memoryDb.listByPage({page,num,caseObj:queryCase,order});
         return r;
     }
 

package/plugins/BaseRestApi/MongoDbBaseRestApi.js

@@ -28,7 +28,7 @@ class MongoDbBaseRestApi extends AbstractBaseRestApi{
         return r;
     }
 
-    async list({page=1,num=10,queryCase}){
+    async list({page=1,num=10,order,queryCase}){
         page=Number.parseInt(page);
         num=Number.parseInt(num);
         let tableName=this.tableName;

package/plugins/BaseRestApi/MysqlBaseRestApi.js

@@ -30,9 +30,9 @@ class MysqlBaseRestApi extends AbstractBaseRestApi{
         return r;
     }
 
-    async list({page,num,queryCase}){
-        let queryCaseStr= MysqlBaseRestApi.obj2QueryCase(queryCase);
-        let r= this.dbBaseMapper.selectPage({page,num,queryCase:queryCaseStr});
+    async list({page,num,order,queryCase}){
+        let queryCaseStr= MysqlBaseRpcApi.obj2QueryCase(queryCase);
+        let r= this.dbBaseMapper.selectPage({order,page,num,queryCase:queryCaseStr});
         return r;
     }
 

package/plugins/BaseRpcApi/AbstractBaseRpcApi.js

@@ -11,7 +11,7 @@ class AbstractBaseRpcApi{
 
     async add(obj){}
     async delete(obj){}
-    async list({page,num,...queryCase}){}
+    async list({page,num,order,...queryCase}){}
     async listAll(obj){}
     async update(obj){}
     async getChildenList(id,queryCase){}
@@ -51,10 +51,13 @@ class AbstractBaseRpcApi{
         });
 
         app.get(`${this.prefix}/list`,async (req,res)=>{
-            const {page,num,...queryCase}=req.params;
-            let r=await this.list({page,num,queryCase});
+            let {page,num,order,...queryCase}=req.params;
+            if(!order){
+                order=null;
+            }
+            let r=await this.list({page,num,order,queryCase});
             res.send(M.successResult(r));
-        })
+        });
 
         /**
          * 如果有parent_id才能返回树

package/plugins/BaseRpcApi/ApiCloudBaseRpcApi.js

@@ -27,12 +27,12 @@ class ApiCloudBaseRpcApi extends AbstractBaseRpcApi{
         return r[0];
     }
 
-    async list({page=1,num=10,queryCase}){
+    async list({page=1,num=10,order="createdAt ASC",queryCase}){
         page=Number.parseInt(page);
         num=Number.parseInt(num);
         let limit=num;
         let skip= (page-1)*num
-        let rows=await this.tableClient.list(queryCase,limit,skip,"createdAt ASC");
+        let rows=await this.tableClient.list(queryCase,limit,skip,order);
         let countResult=await this.tableClient.count(queryCase);
         return {rows, total:countResult.count}
     }

package/plugins/BaseRpcApi/FileBaseRpcApi.js

@@ -1,59 +1,50 @@
 /**
  * 数据源为内存的rpc风格接口
  */
-const M=require("../../index")
+const FileDb=require("../../module/FileDb");
 const AbstractBaseRpcApi=require("./AbstractBaseRpcApi");
 
 class FileBaseRpcApi extends AbstractBaseRpcApi{
+
     constructor(props) {
         super(props);
+        if(props.readFromMemory==null){
+            props.readFromMemory=true;
+        }
+        this.fileDb=new FileDb(props.tableName,props.readFromMemory);
     }
     async add(obj){
-        obj.id = M.randomStr();
-        M.addObjToFile(this.tableName, obj);
-        return obj;
+        let r= this.fileDb.add(obj);
+        return r;
     }
 
     async delete(obj){
-        let r=0;
-        if (obj) {
-            r= M.deleteObjByPropFile(this.tableName, obj);
-        } else {
-            r=M.writeObjToFile(this.tableName,[]);
-        }
+        let r= this.fileDb.deleteAll(obj);
         return r;
     }
 
     async getById(id){
-        let r=M.getById(this.tableName,id);
+        let r=this.fileDb.getById(id);
         return r;
     }
 
-    async list({page=1,num=10,queryCase}){
-        page=Number.parseInt(page);
-        num=Number.parseInt(num);
-        if (page <= 0) page = 1;
-        let rows =await this.listAll(queryCase);
-        let total = rows.length;
-        rows = rows.splice((page - 1) * num, num)
-        return {rows, total}
+    async list({page,num,order,queryCase}){
+        let r= this.fileDb.listByPage({page,num,caseObj:queryCase,order});
+        return r;
     }
 
     async listAll(obj){
-        if (obj) {
-            return M.listAllObjByPropFile(this.tableName, obj);
-        } else {
-            return M.getObjByFile(this.tableName);
-        }
+        let r= this.fileDb.listAll(obj);
+        return r;
     }
 
     async update(obj){
-        let r=  M.updateObjByIdFile(this.tableName,obj);
+        let r= this.fileDb.update(obj);
         return r;
     }
 
     async getChildenList(id,caseObj){
-        let r= this.listAll({parent_id:id,...caseObj});
+        let r= this.fileDb.listAll({parent_id:id,...caseObj});
         return r;
     }
 }

package/plugins/BaseRpcApi/MemoryBaseRpcApi.js

@@ -25,8 +25,8 @@ class MemoryBaseRpcApi extends AbstractBaseRpcApi{
         return r;
     }
 
-    async list({page,num,queryCase}){
-        let r= this.memoryDb.listByPage(page,num,queryCase);
+    async list({page,num,order,queryCase}){
+        let r= this.memoryDb.listByPage({page,num,caseObj: queryCase,order});
         return r;
     }
 

package/plugins/BaseRpcApi/MongoDbBaseRpcApi.js

@@ -28,7 +28,7 @@ class MongoDbBaseRpcApi extends AbstractBaseRpcApi{
         return r;
     }
 
-    async list({page=1,num=10,queryCase}){
+    async list({page=1,num=10,order,queryCase}){
         page=Number.parseInt(page);
         num=Number.parseInt(num);
         let tableName=this.tableName;

package/plugins/BaseRpcApi/MysqlBaseRpcApi.js

@@ -30,9 +30,9 @@ class MysqlBaseRpcApi extends AbstractBaseRpcApi{
         return r;
     }
 
-    async list({page,num,queryCase}){
+    async list({page,num,order,queryCase}){
         let queryCaseStr= MysqlBaseRpcApi.obj2QueryCase(queryCase);
-        let r= this.dbBaseMapper.selectPage({page,num,queryCase:queryCaseStr});
+        let r= this.dbBaseMapper.selectPage({order,page,num,queryCase:queryCaseStr});
         return r;
     }
 

package/utils/nodemon/restart.js

@@ -0,0 +1,38 @@
+const M = require('../../index.js');
+const { spawn } = require('child_process')
+
+let childProcess;
+let timer = null;
+
+function debounce(mainFile) {
+    timer && clearTimeout(timer)
+    timer = setTimeout(() => {
+        //console.log('nodemon')
+        childProcess && childProcess.kill()
+        childProcess = spawn('node', [mainFile], {
+            stdio: [process.stdin, process.stdout, process.stderr]
+        });
+    }, 800)
+}
+
+function watchSigleFile(file,mainFile){
+    M.watchFile(file,({file,event})=>{
+        if(event=="change"){
+            console.log("change:"+file);
+            debounce(mainFile)
+        }
+    })
+}
+
+module.exports = function (watchFile,mainFile){
+    debounce(mainFile);
+    let r=[];
+    if(Array.isArray(watchFile)) {
+        r=watchFile;
+    }else {
+        r.push(watchFile);
+    }
+    r.forEach(u=>{
+        watchSigleFile(u,mainFile);
+    })
+};