更新magicJS3

Scripts/util/MagicJS3.js

@@ -110,7 +110,7 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
             //     }
             // }
             // let msg = logs.join('\n');
-            if (!(logLevels[_level] < logLevels[level.toUpperCase()])) console.log(`██[${scriptName}][${level}]`+''+`${logEmoji[level.toUpperCase()]}${msg}`+'\n'+``);
+            if (!(logLevels[_level] < logLevels[level.toUpperCase()])) console.log(`██[${scriptName}][${level}]` + '' + `${logEmoji[level.toUpperCase()]}${msg}` + '\n' + ``);
         };
         const setLevel = logLevel => {
             _level = logLevel;
@@ -126,7 +126,7 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
             },
             log: (...logs) => {
                 let msg = logs.join(logSeparator);
-                console.log(`██[${scriptName}]`+''+`${msg}`+'\n'+``);
+                console.log(`██[${scriptName}]` + '' + `${msg}` + '\n' + ``);
             },
             debug: (...logs) => {
                 let msg = logs.join(logSeparator);
@@ -204,22 +204,22 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
             }
         }
 
-        log(...logs){
+        log(...logs) {
             this.logger.log(logs);
         }
 
-        toStr(data, defVal=null){
-            try{
+        toStr(data, defVal = null) {
+            try {
                 return JSON.stringify(data);
-            }catch{
+            } catch {
                 return defVal;
             }
         }
 
-        toObj(str, defVal=null){
-            try{
+        toObj(str, defVal = null) {
+            try {
                 return JSON.parse(str);
-            }catch{
+            } catch {
                 return defVal;
             }
         }
@@ -280,7 +280,7 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
         // 解析cookie字符串的函数
         parseCookies(cookieString) {
             let dict = {};
-            cookieString && cookieString.split(';').forEach(function(cookie) {
+            cookieString && cookieString.split(';').forEach(function (cookie) {
                 let parts = cookie.split('=');
                 dict[parts.shift().trim()] = decodeURI(parts.join('='));
             });
@@ -290,7 +290,7 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
         // 系列化为cookie字符串
         serializeCookies(cookieData) {
             const parts = [];
-            for(let key in cookieData){
+            for (let key in cookieData) {
                 let value = cookieData[key];
                 let cookiePart = `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
                 parts.push(cookiePart);
@@ -420,6 +420,66 @@ function MagicJS(scriptName = "MagicJS", logLevel = "INFO") {
             if (obj.S !== 0) date.setMilliseconds(obj.S); // 如果设置了毫秒
             return date;
         }
+
+        getBaseDoneHeaders(mixHeaders = {}) {
+            return Object.assign(
+                {
+                    'Access-Control-Allow-Origin': '*',
+                    'Access-Control-Allow-Methods': 'POST,GET,OPTIONS,PUT,DELETE',
+                    'Access-Control-Allow-Headers': 'Origin, X-Requested-With, Content-Type, Accept'
+                },
+                mixHeaders
+            )
+        }
+
+        getHtmlDoneHeaders() {
+            return this.getBaseDoneHeaders({
+                'Content-Type': 'text/html;charset=UTF-8'
+            })
+        }
+
+        getJsonDoneHeaders() {
+            return this.getBaseDoneHeaders({
+                'Content-Type': 'text/json; charset=utf-8',
+                'Connection': 'keep-alive'
+            })
+        }
+
+        /**
+         * 推送微信消息
+         *
+         * 通用助手 AT_7wDWqSoT8xpJCQqJtHpshKhw7kXc0XCW
+         * 光予助手 AT_rTc93GQYIdMU8XLRnoJaSea8WkfhSzhX
+         * i茅台助手 AT_6b8KjFF3bYqcr7Cv7woUUES7KadNFbvR
+         * 个人uid UID_6P4B00X6Zv8U2oKC0I2R09emxtqq
+         */
+        doWxpusherSend(data) {
+            // let data = {
+            //     appToken: "AT_rTc93GQYIdMU8XLRnoJaSea8WkfhSzhX",
+            //     content: content,// 这是主体内容
+            //     summary: summary,// 该参数可选，默认为 msg 的前10个字符
+            //     contentType: 1,
+            //     topicIds: [],
+            //     uids: [
+            //         "UID_6P4B00X6Zv8U2oKC0I2R09emxtqq"
+            //     ],
+            //     url: "",
+            //     verifyPay: false
+            // };
+            // if (url) {
+            //     data.url = url;
+            // }
+            const headers = this.getJsonDoneHeaders();
+            headers.Host = 'wxpusher.zjiecode.com';
+            headers['Content-Type'] = 'application/json;charset=UTF-8';
+            let options = {
+                url: 'https://wxpusher.zjiecode.com/api/send/message',
+                headers: headers,
+                body: JSON.stringify(data),
+            };
+            return this.http.post(options);
+        }
+
         costTime() {
             let info = `${this.scriptName}执行完毕！`
             // if (this.isNode && this.isExecComm) {
@@ -558,7 +618,7 @@ function MagicHttp(env, logger) {
             if (typeof _resp.body === "string") {
                 try {
                     _resp.body = JSON.parse(_resp.body);
-                } catch {}
+                } catch { }
             }
             delete _resp.data;
             return _resp;
@@ -599,13 +659,13 @@ function MagicHttp(env, logger) {
     let synchronousRequestInterceptors = true;
     function interceptConfig(config) {
         config = paramsToQueryString(config);
-        logger.debug(`HTTP ${config["method"].toUpperCase()}:`+'\n'+`${JSON.stringify(config)}`);
+        logger.debug(`HTTP ${config["method"].toUpperCase()}:` + '\n' + `${JSON.stringify(config)}`);
         return config;
     }
     function interceptResponse(resp) {
         try {
             resp = !!resp ? modifyResponse(resp) : resp;
-            logger.sniffer(`HTTP ${resp.config["method"].toUpperCase()}:`+'\n'+`${JSON.stringify(resp.config)}`+'\n'+`STATUS CODE:`+'\n'+`${resp.status}`+'\n'+`RESPONSE:`+'\n'+`${typeof resp.body === "object" ? JSON.stringify(resp.body) : resp.body}`);
+            logger.sniffer(`HTTP ${resp.config["method"].toUpperCase()}:` + '\n' + `${JSON.stringify(resp.config)}` + '\n' + `STATUS CODE:` + '\n' + `${resp.status}` + '\n' + `RESPONSE:` + '\n' + `${typeof resp.body === "object" ? JSON.stringify(resp.body) : resp.body}`);
             const err = raiseExceptionByStatusCode(resp);
             if (!!err) {
                 return Promise.reject(err);
@@ -688,11 +748,11 @@ function MagicHttp(env, logger) {
         }
         let promise;
         registerInterceptors(config);
-        const defaultRequestInterceptors = [ interceptConfig, undefined ];
-        const defaultResponseInterceptors = [ interceptResponse, undefined ];
+        const defaultRequestInterceptors = [interceptConfig, undefined];
+        const defaultResponseInterceptors = [interceptResponse, undefined];
         if (!synchronousRequestInterceptors) {
             logger.debug("Interceptors are executed in asynchronous mode");
-            let chain = [ dispatchRequest, undefined ];
+            let chain = [dispatchRequest, undefined];
             Array.prototype.unshift.apply(chain, defaultRequestInterceptors);
             Array.prototype.unshift.apply(chain, requestInterceptorChain);
             chain = chain.concat(defaultResponseInterceptors);
@@ -720,7 +780,7 @@ function MagicHttp(env, logger) {
         } else {
             logger.debug("Interceptors are executed in synchronous mode");
             Array.prototype.unshift.apply(requestInterceptorChain, defaultRequestInterceptors);
-            requestInterceptorChain = requestInterceptorChain.concat([ interceptConfig, undefined ]);
+            requestInterceptorChain = requestInterceptorChain.concat([interceptConfig, undefined]);
             while (requestInterceptorChain.length) {
                 let onFulfilled = requestInterceptorChain.shift();
                 let onRejected = requestInterceptorChain.shift();
@@ -763,7 +823,7 @@ function MagicHttp(env, logger) {
                         reject(err);
                     }, config["timeout"]);
                 });
-                return Promise.race([ dispatchRequest(config), timer ]);
+                return Promise.race([dispatchRequest(config), timer]);
             } catch (err) {
                 logger.error(`Request Timeout exception: ${err}.`);
             }
@@ -849,7 +909,7 @@ function MagicData(env, logger) {
         if (typeof val === "string" && val !== "null") {
             try {
                 val = JSON.parse(val);
-            } catch {}
+            } catch { }
         }
         if (read_no_session === false && !!val && val["magic_session"] === true) {
             val = null;
@@ -869,7 +929,7 @@ function MagicData(env, logger) {
                 if (type !== "object" || data instanceof Array || type === "bool" || data === null) {
                     data = {};
                 }
-            } catch {}
+            } catch { }
             return data;
         } else if (obj instanceof Array || obj === null || typeof obj === "undefined" || obj !== obj || typeof obj === "boolean") {
             return {};
@@ -899,7 +959,7 @@ function MagicData(env, logger) {
             }
             val = _valConvertor(val, default_, session, read_no_session);
         }
-        logger.debug(`READ DATA [${key}]${!!session ? `[${session}]` : ""} <${typeof val}>`+'\n'+`${JSON.stringify(val)}`);
+        logger.debug(`READ DATA [${key}]${!!session ? `[${session}]` : ""} <${typeof val}>` + '\n' + `${JSON.stringify(val)}`);
         return val;
     };
     const writeForNode = (key, val, session = "", externalData = null) => {
@@ -945,7 +1005,7 @@ function MagicData(env, logger) {
         if (!!data && typeof data === "object") {
             data = JSON.stringify(data, null, 4);
         }
-        logger.debug(`WRITE DATA [${key}]${session ? `[${session}]` : ""} <${typeof val}>`+'\n'+`${JSON.stringify(val)}`);
+        logger.debug(`WRITE DATA [${key}]${session ? `[${session}]` : ""} <${typeof val}>` + '\n' + `${JSON.stringify(val)}`);
         if (!externalData) {
             if (env.isSurgeLike) {
                 return $persistentStore.write(data, key);
@@ -1033,7 +1093,7 @@ function MagicData(env, logger) {
         } else {
             _sessions = Object.keys(data).filter(key => key !== "magic_session");
         }
-        logger.debug(`READ ALL SESSIONS [${key}] <${typeof _sessions}>`+'\n'+`${JSON.stringify(_sessions, null, 4)}`);
+        logger.debug(`READ ALL SESSIONS [${key}] <${typeof _sessions}>` + '\n' + `${JSON.stringify(_sessions, null, 4)}`);
         return _sessions;
     };
     const allSessions = (key, externalData = null) => {
@@ -1046,7 +1106,7 @@ function MagicData(env, logger) {
             };
             delete _sessions["magic_session"];
         }
-        logger.debug(`READ ALL SESSIONS [${key}] <${typeof _sessions}>`+'\n'+`${JSON.stringify(_sessions, null, 4)}`);
+        logger.debug(`READ ALL SESSIONS [${key}] <${typeof _sessions}>` + '\n' + `${JSON.stringify(_sessions, null, 4)}`);
         return _sessions;
     };
     return {
@@ -1089,20 +1149,20 @@ function MagicNotification(scriptName, env, logger, http) {
 
     function msg(subtitle, message, openUrl, mediaUrl) {
         let opts = {};
-        if(openUrl){
+        if (openUrl) {
             opts["open-url"] = openUrl;
         }
-        if(mediaUrl){
+        if (mediaUrl) {
             opts["media-url"] = mediaUrl;
         }
-        if(!message || message.length == 0){
+        if (!message || message.length == 0) {
             if (Array.isArray(notifyInfo)) {
                 message = notifyInfo.join("\n");
             } else {
                 message = notifyInfo;
             }
         }
-        if(message && message.length > 0){
+        if (message && message.length > 0) {
             post(scriptName, "", message, opts);
         }
     }
@@ -1111,16 +1171,16 @@ function MagicNotification(scriptName, env, logger, http) {
             try {
                 let newOpts = {};
                 if (typeof _opts === "string") {
-                    if(_opts.length > 0){
-                        if (env.isLoon){
+                    if (_opts.length > 0) {
+                        if (env.isLoon) {
                             newOpts = {
                                 openUrl: _opts
                             };
-                        }else if (env.isQuanX){
+                        } else if (env.isQuanX) {
                             newOpts = {
                                 "open-url": _opts
                             };
-                        }else if (env.isSurge){
+                        } else if (env.isSurge) {
                             newOpts = {
                                 url: _opts
                             };
@@ -1150,7 +1210,7 @@ function MagicNotification(scriptName, env, logger, http) {
             title = scriptName;
             subTitle = "", body = arguments[0];
         }
-        logger.notify('\n'+`title:${title}`+'\n'+`subTitle:${subTitle}`+'\n'+`body:${body}`+'\n'+`options:${typeof opts === "object" ? JSON.stringify(opts) : opts}`);
+        logger.notify('\n' + `title:${title}` + '\n' + `subTitle:${subTitle}` + '\n' + `body:${body}` + '\n' + `options:${typeof opts === "object" ? JSON.stringify(opts) : opts}`);
         if (env.isSurge) {
             $notification.post(title, subTitle, body, opts);
         } else if (env.isLoon) {
@@ -1183,7 +1243,7 @@ function MagicNotification(scriptName, env, logger, http) {
             },
             body: {
                 title: title,
-                body: subTitle ? `${subTitle}`+'\n'+`${body}` : body,
+                body: subTitle ? `${subTitle}` + '\n' + `${body}` : body,
                 device_key: _barkKey
             }
         };
@@ -1302,7 +1362,7 @@ function MagicQingLong(env, data, logger) {
     function readQingLongConfig(config) {
         qlUrl = qlUrl || data.read("magic_qlurl");
         qlToken = qlToken || data.read("magic_qltoken");
-        logger.debug(`QingLong url: ${qlUrl}`+'\n'+`QingLong token: ${qlToken}`);
+        logger.debug(`QingLong url: ${qlUrl}` + '\n' + `QingLong token: ${qlToken}`);
         return config;
     }
     function setBaseUrlAndTimeout(config) {
@@ -1399,7 +1459,7 @@ function MagicQingLong(env, data, logger) {
                     throw new Error("Get QingLong Panel token failed.");
                 }
             }).catch(err => {
-                logger.error(`Error logging in to QingLong Panel.`+'\n'+`${err.message || err}`);
+                logger.error(`Error logging in to QingLong Panel.` + '\n' + `${err.message || err}`);
             });
         } else if (qlUrl && qlName && qlPwd) {
             await http.post({
@@ -1416,7 +1476,7 @@ function MagicQingLong(env, data, logger) {
                 qlToken = resp.body.data.token;
                 data.write("magic_qltoken", qlToken);
             }).catch(err => {
-                logger.error(`Error logging in to QingLong Panel.`+'\n'+`${err.message || err}`);
+                logger.error(`Error logging in to QingLong Panel.` + '\n' + `${err.message || err}`);
             });
         }
         return qlToken;
@@ -1424,10 +1484,10 @@ function MagicQingLong(env, data, logger) {
     async function setEnv(name, value, id = null) {
         qlUrl = qlUrl || data.read("magic_qlurl");
         if (id === null) {
-            let envIds = await setEnvs([ {
+            let envIds = await setEnvs([{
                 name: name,
                 value: value
-            } ]);
+            }]);
             if (!!envIds && envIds.length === 1) {
                 return envIds[0];
             }
@@ -1444,13 +1504,13 @@ function MagicQingLong(env, data, logger) {
                 }
             }).then(resp => {
                 if (resp.body.code === 200) {
-                    logger.debug(`QINGLONG UPDATE ENV ${name} <${typeof value}> (${id})`+'\n'+`${JSON.stringify(value)}`);
+                    logger.debug(`QINGLONG UPDATE ENV ${name} <${typeof value}> (${id})` + '\n' + `${JSON.stringify(value)}`);
                     return true;
                 } else {
-                    logger.error(`Error adding environment variable from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                    logger.error(`Error adding environment variable from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
                 }
             }).catch(err => {
-                logger.error(`Error adding environment variable from QingLong Panel.`+'\n'+`${err.message || err}`);
+                logger.error(`Error adding environment variable from QingLong Panel.` + '\n' + `${err.message || err}`);
                 return false;
             });
         }
@@ -1466,14 +1526,14 @@ function MagicQingLong(env, data, logger) {
         }).then(resp => {
             if (resp.body.code === 200) {
                 resp.body.data.forEach(element => {
-                    logger.debug(`QINGLONG ADD ENV ${element.name} <${typeof element.value}> (${element.id})`+'\n'+`${JSON.stringify(element)}`);
+                    logger.debug(`QINGLONG ADD ENV ${element.name} <${typeof element.value}> (${element.id})` + '\n' + `${JSON.stringify(element)}`);
                     envIds.push(element.id);
                 });
             } else {
-                logger.error(`Error adding environments variable from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                logger.error(`Error adding environments variable from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
             }
         }).catch(err => {
-            logger.error(`Error adding environments variable from QingLong Panel.`+'\n'+`${err.message || err}`);
+            logger.error(`Error adding environments variable from QingLong Panel.` + '\n' + `${err.message || err}`);
         });
         return envIds;
     }
@@ -1493,11 +1553,11 @@ function MagicQingLong(env, data, logger) {
                 logger.debug(`QINGLONG DELETE ENV IDS: ${ids}`);
                 return true;
             } else {
-                logger.error(`Error deleting environments variable from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                logger.error(`Error deleting environments variable from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
                 return false;
             }
         }).catch(err => {
-            logger.error(`Error deleting environments variable from QingLong Panel.`+'\n'+`${err.message || err}`);
+            logger.error(`Error deleting environments variable from QingLong Panel.` + '\n' + `${err.message || err}`);
         });
     }
     async function getEnvs(name = null, searchValue = "", retired = 0) {
@@ -1524,10 +1584,10 @@ function MagicQingLong(env, data, logger) {
                 }
                 envs = allEnvs;
             } else {
-                throw new Error(`Error reading environment variable from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                throw new Error(`Error reading environment variable from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
             }
         }).catch(err => {
-            throw new Error(`Error reading environments variable from QingLong Panel.`+'\n'+`${err.message || err}`);
+            throw new Error(`Error reading environments variable from QingLong Panel.` + '\n' + `${err.message || err}`);
         });
         return envs;
     }
@@ -1559,10 +1619,10 @@ function MagicQingLong(env, data, logger) {
                 logger.debug(`QINGLONG DISABLED ENV IDS: ${ids}`);
                 result = true;
             } else {
-                logger.error(`Error disabling environments variable from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                logger.error(`Error disabling environments variable from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
             }
         }).catch(err => {
-            logger.error(`Error disabling environments variable from QingLong Panel.`+'\n'+`${err.message || err}`);
+            logger.error(`Error disabling environments variable from QingLong Panel.` + '\n' + `${err.message || err}`);
         });
         return result;
     }
@@ -1583,10 +1643,10 @@ function MagicQingLong(env, data, logger) {
                 logger.debug(`QINGLONG ENABLED ENV IDS: ${ids}`);
                 result = true;
             } else {
-                logger.error(`Error enabling environments variable from Qilong panel.`+'\n'+`${JSON.stringify(resp)}`);
+                logger.error(`Error enabling environments variable from Qilong panel.` + '\n' + `${JSON.stringify(resp)}`);
             }
         }).catch(err => {
-            logger.error(`Error enabling environments variable from Qilong panel.`+'\n'+`${err.message || err}`);
+            logger.error(`Error enabling environments variable from Qilong panel.` + '\n' + `${err.message || err}`);
         });
         return result;
     }
@@ -1606,10 +1666,10 @@ function MagicQingLong(env, data, logger) {
             if (resp.body.code === 200) {
                 result = true;
             } else {
-                logger.error(`Error reading data from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                logger.error(`Error reading data from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
             }
         }).catch(err => {
-            logger.error(`Error reading data from QingLong Panel.`+'\n'+`${err.message || err}`);
+            logger.error(`Error reading data from QingLong Panel.` + '\n' + `${err.message || err}`);
         });
         return result;
     }
@@ -1624,10 +1684,10 @@ function MagicQingLong(env, data, logger) {
             if (resp.body.code === 200) {
                 content = resp.body.data;
             } else {
-                throw new Error(`Error reading data from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                throw new Error(`Error reading data from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
             }
         }).catch(err => {
-            throw new Error(`Error reading data from QingLong Panel.`+'\n'+`${err.message || err}`);
+            throw new Error(`Error reading data from QingLong Panel.` + '\n' + `${err.message || err}`);
         });
         return content;
     }
@@ -1647,10 +1707,10 @@ function MagicQingLong(env, data, logger) {
             if (resp.body.code === 200) {
                 result = true;
             } else {
-                logger.error(`Error reading data from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                logger.error(`Error reading data from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
             }
         }).catch(err => {
-            logger.error(`Error reading data from QingLong Panel.`+'\n'+`${err.message || err}`);
+            logger.error(`Error reading data from QingLong Panel.` + '\n' + `${err.message || err}`);
         });
         return result;
     }
@@ -1669,10 +1729,10 @@ function MagicQingLong(env, data, logger) {
             if (resp.body.code === 200) {
                 result = true;
             } else {
-                logger.error(`Error reading data from QingLong Panel.`+'\n'+`${JSON.stringify(resp)}`);
+                logger.error(`Error reading data from QingLong Panel.` + '\n' + `${JSON.stringify(resp)}`);
             }
         }).catch(err => {
-            logger.error(`Error reading data from QingLong Panel.`+'\n'+`${err.message || err}`);
+            logger.error(`Error reading data from QingLong Panel.` + '\n' + `${err.message || err}`);
         });
         return result;
     }