KingRan 2022-03-06 22:10:58 +08:00
parent 04fe7656ac
commit 3f9bba537c
2 changed files with 102 additions and 100 deletions

View File

@ -31,7 +31,7 @@ const querystring = require('querystring');
const exec = require('child_process').exec; const exec = require('child_process').exec;
const $ = new Env(); const $ = new Env();
const timeout = 15000; //超时时间(单位毫秒) const timeout = 15000; //超时时间(单位毫秒)
console.log("加载sendNotify当前版本: 20220302"); console.log("加载sendNotify当前版本: 20220306");
// =======================================go-cqhttp通知设置区域=========================================== // =======================================go-cqhttp通知设置区域===========================================
//gobot_url 填写请求地址http://127.0.0.1/send_private_msg //gobot_url 填写请求地址http://127.0.0.1/send_private_msg
//gobot_token 填写在go-cqhttp文件设置的访问密钥 //gobot_token 填写在go-cqhttp文件设置的访问密钥
@ -1989,57 +1989,58 @@ function BarkNotify(text, desp, params = {}) {
} }
function tgBotNotify(text, desp) { function tgBotNotify(text, desp) {
return new Promise((resolve) => { return new Promise(resolve => {
if (TG_BOT_TOKEN && TG_USER_ID) { if (TG_BOT_TOKEN && TG_USER_ID) {
const options = { const options = {
url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`, url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`,
body: `chat_id=${TG_USER_ID}&text=${text}\n\n${desp}&disable_web_page_preview=true`, json: {
headers: { chat_id: `${TG_USER_ID}`,
'Content-Type': 'application/x-www-form-urlencoded', text: `${text}\n\n${desp}`,
disable_web_page_preview:true,
}, },
timeout, headers: {
}; 'Content-Type': 'application/json',
},
timeout
}
if (TG_PROXY_HOST && TG_PROXY_PORT) { if (TG_PROXY_HOST && TG_PROXY_PORT) {
const tunnel = require('tunnel'); const tunnel = require("tunnel");
const agent = { const agent = {
https: tunnel.httpsOverHttp({ https: tunnel.httpsOverHttp({
proxy: { proxy: {
host: TG_PROXY_HOST, host: TG_PROXY_HOST,
port: TG_PROXY_PORT * 1, port: TG_PROXY_PORT * 1,
proxyAuth: TG_PROXY_AUTH, proxyAuth: TG_PROXY_AUTH
}, }
}), })
}; }
Object.assign(options, { Object.assign(options, {agent})
agent
});
} }
$.post(options, (err, resp, data) => { $.post(options, (err, resp, data) => {
try { try {
if (err) { if (err) {
console.log('telegram发送通知消息失败\n'); console.log('telegram发送通知消息失败\n')
console.log(err); console.log(err);
} else { } else {
data = JSON.parse(data); data = JSON.parse(data);
if (data.ok) { if (data.ok) {
console.log('Telegram发送通知消息成功🎉。\n'); console.log('Telegram发送通知消息成功<EFBFBD>。\n')
} else if (data.error_code === 400) { } else if (data.error_code === 400) {
console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n'); console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n')
} else if (data.error_code === 401) { } else if (data.error_code === 401) {
console.log('Telegram bot token 填写错误。\n'); console.log('Telegram bot token 填写错误。\n')
} }
} }
} catch (e) { } catch (e) {
$.logErr(e, resp); $.logErr(e, resp);
} } finally {
finally {
resolve(data); resolve(data);
} }
}); })
} else { } else {
resolve(); resolve()
} }
}); })
} }
function ddBotNotify(text, desp) { function ddBotNotify(text, desp) {

View File

@ -31,7 +31,7 @@ const querystring = require('querystring');
const exec = require('child_process').exec; const exec = require('child_process').exec;
const $ = new Env(); const $ = new Env();
const timeout = 15000; //超时时间(单位毫秒) const timeout = 15000; //超时时间(单位毫秒)
console.log("加载sendNotify当前版本: 20220302"); console.log("加载sendNotify当前版本: 20220306");
// =======================================go-cqhttp通知设置区域=========================================== // =======================================go-cqhttp通知设置区域===========================================
//gobot_url 填写请求地址http://127.0.0.1/send_private_msg //gobot_url 填写请求地址http://127.0.0.1/send_private_msg
//gobot_token 填写在go-cqhttp文件设置的访问密钥 //gobot_token 填写在go-cqhttp文件设置的访问密钥
@ -1989,57 +1989,58 @@ function BarkNotify(text, desp, params = {}) {
} }
function tgBotNotify(text, desp) { function tgBotNotify(text, desp) {
return new Promise((resolve) => { return new Promise(resolve => {
if (TG_BOT_TOKEN && TG_USER_ID) { if (TG_BOT_TOKEN && TG_USER_ID) {
const options = { const options = {
url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`, url: `https://${TG_API_HOST}/bot${TG_BOT_TOKEN}/sendMessage`,
body: `chat_id=${TG_USER_ID}&text=${text}\n\n${desp}&disable_web_page_preview=true`, json: {
headers: { chat_id: `${TG_USER_ID}`,
'Content-Type': 'application/x-www-form-urlencoded', text: `${text}\n\n${desp}`,
disable_web_page_preview:true,
}, },
timeout, headers: {
}; 'Content-Type': 'application/json',
},
timeout
}
if (TG_PROXY_HOST && TG_PROXY_PORT) { if (TG_PROXY_HOST && TG_PROXY_PORT) {
const tunnel = require('tunnel'); const tunnel = require("tunnel");
const agent = { const agent = {
https: tunnel.httpsOverHttp({ https: tunnel.httpsOverHttp({
proxy: { proxy: {
host: TG_PROXY_HOST, host: TG_PROXY_HOST,
port: TG_PROXY_PORT * 1, port: TG_PROXY_PORT * 1,
proxyAuth: TG_PROXY_AUTH, proxyAuth: TG_PROXY_AUTH
}, }
}), })
}; }
Object.assign(options, { Object.assign(options, {agent})
agent
});
} }
$.post(options, (err, resp, data) => { $.post(options, (err, resp, data) => {
try { try {
if (err) { if (err) {
console.log('telegram发送通知消息失败\n'); console.log('telegram发送通知消息失败\n')
console.log(err); console.log(err);
} else { } else {
data = JSON.parse(data); data = JSON.parse(data);
if (data.ok) { if (data.ok) {
console.log('Telegram发送通知消息成功🎉。\n'); console.log('Telegram发送通知消息成功<EFBFBD>。\n')
} else if (data.error_code === 400) { } else if (data.error_code === 400) {
console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n'); console.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n')
} else if (data.error_code === 401) { } else if (data.error_code === 401) {
console.log('Telegram bot token 填写错误。\n'); console.log('Telegram bot token 填写错误。\n')
} }
} }
} catch (e) { } catch (e) {
$.logErr(e, resp); $.logErr(e, resp);
} } finally {
finally {
resolve(data); resolve(data);
} }
}); })
} else { } else {
resolve(); resolve()
} }
}); })
} }
function ddBotNotify(text, desp) { function ddBotNotify(text, desp) {