npm/wo-base-messenger
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace deprecated 'request' with 'http.get' so that no more external dependencies

Browse Source
This commit is contained in:
陆柯 2021-12-11 09:43:41 +08:00
parent 1146a72d25
commit 2be5befb79
2 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
index.js → messenger.js
View File

@ -1,7 +1,8 @@
//const Bluebird=require('bluebird'); // http://bluebirdjs.com/
const util = require('util') const util = require('util')
const RequestPromise = require('request-promise-native') // request-promise/-native。https://www.npmjs.com/package/request-promise. 还看到一个方法：Bluebird.promisifyAll(require("request")); //const RequestPromise = require('request-promise-native') // request-promise/-native。https://www.npmjs.com/package/request-promise. 还看到一个方法：Bluebird.promisifyAll(require("request"));
const http = require('http')
const NodeMailer = require('nodemailer') // 或者 const smtpTransporter=require('nodemailer').createTransport({host:'', port:25, auth:{user:'',pass:''}}) const NodeMailer = require('nodemailer') // 或者 const smtpTransporter=require('nodemailer').createTransport({host:'', port:25, auth:{user:'',pass:''}})
let smtpTransporter = null let smtpTransporter = null
let smsClient = null // 在调用时，才创建 smsClient，防止 wo.envi 还没有建立好。 let smsClient = null // 在调用时，才创建 smsClient，防止 wo.envi 还没有建立好。
@ -38,8 +39,15 @@ module.exports = {
smsUrl = wo.envi.SMS.dxton.urlWorld // 国际短信不需要签名、模板，可发送任意内容。 smsUrl = wo.envi.SMS.dxton.urlWorld // 国际短信不需要签名、模板，可发送任意内容。
smsNumber = matches[0] + matches[1] smsNumber = matches[0] + matches[1]
} }
// return Bluebird.promisify(Http.get)(smsUrl+'&mobile='+smsNumber+"&content="+encodeURIComponent(msg)); // let returnValue = await RequestPromise.get(smsUrl + '&mobile=' + smsNumber + '&content=' + encodeURIComponent(msg))
let returnValue = await RequestPromise.get(smsUrl + '&mobile=' + smsNumber + '&content=' + encodeURIComponent(msg)) // let returnValue = await axios.get(smsUrl + '&mobile=' + smsNumber + '&content=' + encodeURIComponent(msg))
// following code with http.get is untested:
return util.promisify(http.get)(smsUrl + '&mobile=' + smsNumber + '&content=' + encodeURIComponent(msg))
.then((resp)=>{
let data = ''
resp.on('data', (chunk) => { data += chunk })
resp.on('end', () => {
let returnValue = JSON.parse(data)
let result = { _state: 'SMS_SEND_FAIL', code: returnValue } let result = { _state: 'SMS_SEND_FAIL', code: returnValue }
switch (parseInt(returnValue)) { switch (parseInt(returnValue)) {
// 短信接口代码：http://www.dxton.com/help_detail/2.html // 短信接口代码：http://www.dxton.com/help_detail/2.html
@ -71,6 +79,8 @@ module.exports = {
console.error(result) console.error(result)
return result return result
} }
})
})
}, },
async sendSmsAliyun (phone, msgParam, templateCode, signName) { async sendSmsAliyun (phone, msgParam, templateCode, signName) {

6
package.json
View File

@ -1,14 +1,12 @@
{ {
"name": "base.messenger", "name": "base.messenger",
"main": "messenger.js",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alicloud/sms-sdk": "^1.1.3", "@alicloud/sms-sdk": "^1.1.3",
"nodemailer": "^4.4.1", "nodemailer": "^4.4.1"
"request": "^2.88.2",
"request-promise-native": "^1.0.9"
}, },
"devDependencies": {},
"scripts": { "scripts": {
"setup": "npm install" "setup": "npm install"
}, },