ming_node 2.5.0 → 2.9.1

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/MingNodemonUtilsTest.js

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

package/beforeTest/test.js

@@ -0,0 +1,8 @@
+var M=require("../index");
+
+app=M.server()
+app.listen(8888)
+
+app.get(["/h15","/h16","/h18888"],(req,res)=>{
+    res.send("BBBBXXXEEEEE")
+})

package/index.js

@@ -3,7 +3,7 @@
  * By : Minglie
  * QQ: 934031452
  * Date :2021.12.01
- * version :2.5.0
+ * version :2.9.1
  */
 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);
         });
     } )
 }
@@ -1512,13 +1509,15 @@ M.server = function () {
                 let o = {}
                 o[key] = value;
                 let r_cookie = Object.assign(o, cfg)
-                res.setHeader("Set-Cookie", querystring.stringify(r_cookie, " ;"));
+                let setCookies= querystring.stringify(r_cookie, " ;");
+                setCookies=  setCookies.replace(/%2F/g,'/');
+                res.setHeader("Set-Cookie", setCookies);
             }
             if (true) {
                 Object.defineProperty(req, 'session', {
                     set: function (o) {
                         let sessionValue = req.cookies.sessionid || M.randomStr();
-                        res.cookie("sessionid", sessionValue)
+                        res.cookie("sessionid", sessionValue,{Path:"/"})
                         M.sessions[sessionValue] = o;
                     },
                     get: function () {
@@ -1577,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="";
@@ -1626,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});
@@ -1740,7 +1788,7 @@ M.server = function () {
         G._server = callback;
     }
     app.use=function (url,callback){
-        if(typeof url === 'function' || typeof url === 'object'  ){
+        if(typeof url === 'function' || (typeof url === 'object' && !Array.isArray(url))){
             let plugin=url;
             let args=callback;
             if(plugin.installed){
@@ -1777,62 +1825,86 @@ M.server = function () {
         app.use(plugin,pluginParams)
     }
 
+    app.registServer=function (url,callback,single){
+        if (Array.isArray(url)) {
+            url.forEach(u=>{
+                single(u,callback);
+            })
+        } else {
+            single(url,callback);
+        }
+    }
+
     /**
      * 注册get请求
      */
     app.get = function (url, callback) {
-        url = M.formatUrl(url);
-        var realUrl = url;
-        if (url.indexOf(":") > 0) {
-            url = url.substr(0, url.indexOf(":"));
-            G._rest[url] = realUrl;
+        const single=(url,callback)=>{
+            url = M.formatUrl(url);
+            var realUrl = url;
+            if (url.indexOf(":") > 0) {
+                url = url.substr(0, url.indexOf(":"));
+                G._rest[url] = realUrl;
+            }
+            G._get[url] = callback;
         }
-
-        G._get[url] = callback;
+        app.registServer(url,callback,single)
     }
     /**
      *注册post请求
      */
     app.post = function (url, callback) {
-        url = M.formatUrl(url);
-        var realUrl = url;
-        if (url.indexOf(":") > 0) {
-            url = url.substr(0, url.indexOf(":"));
-            G._rest[url] = realUrl;
+        const single=(url,callback)=>{
+            url = M.formatUrl(url);
+            var realUrl = url;
+            if (url.indexOf(":") > 0) {
+                url = url.substr(0, url.indexOf(":"));
+                G._rest[url] = realUrl;
+            }
+            G._post[url] = callback;
         }
-        G._post[url] = callback;
+        app.registServer(url,callback,single)
     }
 
     app.put = function (url, callback) {
-        url = M.formatUrl(url);
-        var realUrl = url;
-        if (url.indexOf(":") > 0) {
-            url = url.substr(0, url.indexOf(":"));
-            G._rest[url] = realUrl;
+        const single=(url,callback)=>{
+            url = M.formatUrl(url);
+            var realUrl = url;
+            if (url.indexOf(":") > 0) {
+                url = url.substr(0, url.indexOf(":"));
+                G._rest[url] = realUrl;
+            }
+            G._put[url] = callback;
         }
-        G._put[url] = callback;
+        app.registServer(url,callback,single)
     }
 
     app.delete = function (url, callback) {
-        url = M.formatUrl(url);
-        var realUrl = url;
-        if (url.indexOf(":") > 0) {
-            url = url.substr(0, url.indexOf(":"));
-            G._rest[url] = realUrl;
+        const single=(url,callback)=>{
+            url = M.formatUrl(url);
+            var realUrl = url;
+            if (url.indexOf(":") > 0) {
+                url = url.substr(0, url.indexOf(":"));
+                G._rest[url] = realUrl;
+            }
+            G._delete[url] = callback;
         }
-        G._delete[url] = callback;
+        app.registServer(url,callback,single);
     }
     /**
      *注册任意请求方法的请求
      */
     app.mapping = function (url, callback) {
-        url = M.formatUrl(url);
-        var realUrl = url;
-        if (url.indexOf(":") > 0) {
-            url = url.substr(0, url.indexOf(":"));
-            G._rest[url] = realUrl;
+        const single=(url,callback)=>{
+            url = M.formatUrl(url);
+            var realUrl = url;
+            if (url.indexOf(":") > 0) {
+                url = url.substr(0, url.indexOf(":"));
+                G._rest[url] = realUrl;
+            }
+            G._mapping[url] = callback;
         }
-        G._mapping[url] = callback;
+        app.registServer(url,callback,single);
     }
 
 

package/package.json

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

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,7 +25,7 @@ class MemoryBaseRestApi extends AbstractBaseRestApi{
         return r;
     }
 
-    async list({page,num,queryCase}){
+    async list({page,num,order,queryCase}){
         let r= this.memoryDb.listByPage(page,num,queryCase);
         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

@@ -29,7 +29,7 @@ class FileBaseRpcApi 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);
         if (page <= 0) page = 1;

package/plugins/BaseRpcApi/MemoryBaseRpcApi.js

@@ -25,7 +25,7 @@ class MemoryBaseRpcApi extends AbstractBaseRpcApi{
         return r;
     }
 
-    async list({page,num,queryCase}){
+    async list({page,num,order,queryCase}){
         let r= this.memoryDb.listByPage(page,num,queryCase);
         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);
+    })
+};