ming_node 2.9.5 → 2.9.8

package/index.js

@@ -3,7 +3,7 @@
  * By : Minglie
  * QQ: 934031452
  * Date :2021.12.01
- * version :2.9.5
+ * version :2.9.8
  */
 var http = require('http');
 var https = require('https');
@@ -109,7 +109,7 @@ M.get = function (url, callback, data, headers) {
     if (typeof callback == "function") {
 
     } else {
-        headers = data || {};
+        headers = data || {'Content-Type': 'application/json'};
         data = callback;
         callback = () => {
         };
@@ -175,7 +175,11 @@ M.get = function (url, callback, data, headers) {
             res.on('end', function () {
                 callback(html, res);
                 try {
-                    html = JSON.parse(html)
+                    if(headers && headers['Content-Type']=='application/json'){
+                        html = JSON.parse(html)
+                    }else {
+                        html = html;
+                    }
                 } catch (e) {
                     html = html;
                 }
@@ -273,6 +277,7 @@ M._request = function (url, callback, data, headers,methed) {
 
         req.on('error', function (err) {
             console.error(err);
+            throw err;
         });
         if(methed !="GET") req.write(postData);
         req.end();
@@ -357,6 +362,7 @@ M.postJson = function (url, callback, data, headers) {
 
         req.on('error', function (err) {
             console.error(err);
+            throw err;
         });
         req.write(postData);
         req.end();
@@ -1070,6 +1076,7 @@ M.getMySql = function (dbConfig) {
             connection.beginTransaction(  async function(err) {
                 if (err) {
                     console.error(err);
+                    throw err;
                     return;
                 }
                 try {
@@ -1078,6 +1085,7 @@ M.getMySql = function (dbConfig) {
                     connection.rollback(function() {
                         console.error(e);
                         connection.release();
+                        throw e;
                     });
                     return;
                 }
@@ -1086,6 +1094,7 @@ M.getMySql = function (dbConfig) {
                     connection.release();
                     if (err) {
                         console.error(err);
+                        throw err;
                         return;
                     }
                 });
@@ -1497,11 +1506,14 @@ M.server = function () {
                 }
                 return isRest;
             }
-
-            req.ip = req.headers['x-forwarded-for'] ||
-                req.connection.remoteAddress ||
-                req.socket.remoteAddress ||
-                req.connection.socket.remoteAddress;
+            try {
+                req.ip = req.headers['x-forwarded-for'] ||
+                    req.connection.remoteAddress ||
+                    req.socket.remoteAddress ||
+                    req.connection.socket.remoteAddress;
+            }catch (e){
+                req.ip="";
+            }
             //请求cookies封装
             req.cookies = querystring.parse(req.headers['cookie'], "; ");
             //设置浏览器cookies
@@ -1593,6 +1605,7 @@ M.server = function () {
                     fs.createReadStream(url).on("end",d=>{})
                         .on("error",e=>{
                             console.error(e);
+                            throw e;
                         }).pipe(res);
                 }else {
                     var func = http;
@@ -1610,7 +1623,8 @@ M.server = function () {
                         res.writeHead(200, {"Content-Type": "" + (privateObj.staticMime[extname] || 'text/html') + ";charset='utf-8'",});
                         res1.on("end",d=>{})
                             .on("error",e=>{
-                                console.error(e)
+                                console.error(e);
+                                throw e;
                             }).pipe(res);
                     });
                 }
@@ -1769,7 +1783,11 @@ M.server = function () {
             }
         } catch (e) {
             console.error(e);
-            M["_gloable_exception_handle"](e,req,res);
+            try {
+                M["_gloable_exception_handle"](e,req,res);
+            }catch (e){
+                console.error("e2",e);
+            }
         }
     }
 
@@ -1941,7 +1959,7 @@ M.server = function () {
     //全局异常钩子
     app.set("gloable_exception_handle",(err,req,res)=>{
         console.error(err.stack)
-        if (res && !res.alreadySend) {
+        if (res && res.send && !res.alreadySend) {
             // res.writeHead(500, { "Content-Type": "text/j;charset='utf-8'" });
             res.send(M.result(err.message,false,-1));
         }
@@ -1985,8 +2003,6 @@ M.server = function () {
         console.log("listen on port:" + port);
         return server;
     }
-
-    global.app=app;
     return app;
 }
 M["_gloable_exception_handle"]=(err)=>{
@@ -2067,6 +2083,7 @@ M.axios = function (axiosConfig) {
         });
         req.on('error', function (err) {
             console.error(err);
+            throw err;
         });
         req.write(axiosConfig.body);
         req.end();
@@ -2833,7 +2850,7 @@ M.getRemoteCacheByUrl = async function (url) {
     if (url.startsWith("file:")) {
         text = M.readFile(url.substring(5));
     } else {
-        text = await M.get(url);
+        text = await M.get(url,{},{});
     }
     console.log("req remote url:", url);
     M._globle_cacheMap[url] = text;

package/package.json

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

package/utils/yuque/yuque.js

@@ -0,0 +1,25 @@
+M=require("ming_node");
+let url=require("url");
+
+
+//M.yuqueToken="ZW9aH3CUDFWvC0ZU6nzoozBg03smn6Y5D36LqB8x";
+
+
+M.getYuque= async function (yuqueUrl,type){
+    M.reqComHeaders={"X-Auth-Token": M.yuqueToken,"User-Agent":"PostmanRuntime/7.26.1"}
+    type=type||"html";
+    let r= url.parse(yuqueUrl)
+    let host="https://"+r.hostname;
+    let all_path=yuqueUrl.split(host)[1];
+    let all_path_arr=all_path.split("/");
+    let yuqueApi=`${host}/api/v2/repos/${all_path_arr[1]}/${all_path_arr[2]}/docs/${all_path_arr[3]}`;
+    let r1=await M.get(yuqueApi);
+    let artileContent=r1.data.body;
+    artileContent=artileContent.replace(/\s+/g,'')
+    artileContent=artileContent.replace("```"+type,"")
+    artileContent=artileContent.replace("```","")
+    return artileContent;
+}
+
+
+