twikoo-vercel 1.4.3 → 1.4.7

package/api/index.js

@@ -1,5 +1,5 @@
 /*!
- * Twikoo vercel function v1.4.3
+ * Twikoo vercel function v1.4.7
  * (c) 2020-present iMaeGoo
  * Released under the MIT License.
  */
@@ -27,7 +27,7 @@ const window = new JSDOM('').window
 const DOMPurify = createDOMPurify(window)
 
 // 常量 / constants
-const VERSION = '1.4.3'
+const VERSION = '1.4.7'
 const RES_CODE = {
   SUCCESS: 0,
   NO_PARAM: 100,
@@ -123,6 +123,9 @@ module.exports = async (requestArg, responseArg) => {
       case 'GET_RECENT_COMMENTS': // >= 0.2.7
         res = await getRecentComments(event)
         break
+      case 'EMAIL_TEST': // >= 1.4.6
+        res = await emailTest(event)
+        break
       default:
         if (event.event) {
           res.code = RES_CODE.EVENT_NOT_EXIST
@@ -177,6 +180,7 @@ async function connectToDatabase (uri) {
   if (db) return db
   if (!uri) throw new Error('未设置环境变量 MONGODB_URI')
   // If no connection is cached, create a new one
+  console.log('Connecting to database...')
   const client = await MongoClient.connect(uri, {
     useNewUrlParser: true,
     useUnifiedTopology: true
@@ -185,6 +189,7 @@ async function connectToDatabase (uri) {
   // using the database path of the connection string
   db = await client.db((new URL(uri)).pathname.substr(1))
   // Cache the database connection and return the connection
+  console.log('Connected to database')
   return db
 }
 
@@ -577,13 +582,19 @@ function jsonParse (content) {
 
 // Valine 导入
 async function commentImportValine (valineDb, log) {
-  if (!valineDb || !valineDb.results) {
+  let arr
+  if (valineDb instanceof Array) {
+    arr = valineDb
+  } else if (valineDb && valineDb.results) {
+    arr = valineDb.results
+  }
+  if (!arr) {
     log('Valine 评论文件格式有误')
     return
   }
   const comments = []
-  log(`共 ${valineDb.results.length} 条评论`)
-  for (const comment of valineDb.results) {
+  log(`共 ${arr.length} 条评论`)
+  for (const comment of arr) {
     try {
       const parsed = {
         _id: comment.objectId,
@@ -835,12 +846,19 @@ async function commentSubmit (event) {
   res.id = comment.id
   // 异步垃圾检测、发送评论通知
   try {
-    await axios.post(`${request.headers['x-forwarded-proto']}://${request.headers.host}`, {
-      event: 'POST_SUBMIT',
-      comment
-    }, { headers: { 'x-twikoo-recursion': 'true' }, timeout: 300 }) // 设置较短的 timeout 来实现异步
-  } catch (e) {
     console.log('开始异步垃圾检测、发送评论通知')
+    console.time('POST_SUBMIT')
+    await Promise.race([
+      axios.post(`https://${process.env.VERCEL_URL}`, {
+        event: 'POST_SUBMIT',
+        comment
+      }, { headers: { 'x-twikoo-recursion': 'true' } }),
+      // 如果超过 5 秒还没收到异步返回，直接继续，减少用户等待的时间
+      new Promise((resolve) => setTimeout(resolve, 5000))
+    ])
+    console.timeEnd('POST_SUBMIT')
+  } catch (e) {
+    console.log('POST_SUBMIT 失败', e)
   }
   return res
 }
@@ -872,13 +890,14 @@ async function sendNotice (comment) {
     noticeReply(comment),
     noticeWeChat(comment),
     noticePushPlus(comment),
+    noticeWeComPush(comment),
     noticeQQ(comment)
   ]).catch(console.error)
   return { code: RES_CODE.SUCCESS }
 }
 
 // 初始化邮件插件
-async function initMailer () {
+async function initMailer ({ throwErr = false } = {}) {
   try {
     if (!config || !config.SMTP_USER || !config.SMTP_PASS) {
       throw new Error('数据库配置不存在')
@@ -899,13 +918,16 @@ async function initMailer () {
       throw new Error('SMTP 服务器没有配置')
     }
     transporter = nodemailer.createTransport(transportConfig)
-    transporter.verify(function (error, success) {
-      if (error) throw new Error('SMTP 邮箱配置异常：', error)
-      else if (success) console.log('SMTP 邮箱配置正常')
-    })
+    try {
+      const success = await transporter.verify()
+      if (success) console.log('SMTP 邮箱配置正常')
+    } catch (error) {
+      throw new Error('SMTP 邮箱配置异常：', error)
+    }
     return true
   } catch (e) {
     console.error('邮件初始化异常：', e.message)
+    if (throwErr) throw e
     return false
   }
 }
@@ -917,7 +939,8 @@ async function noticeMaster (comment) {
   const IM_PUSH_CONFIGS = [
     'SC_SENDKEY',
     'QM_SENDKEY',
-    'PUSH_PLUS_TOKEN'
+    'PUSH_PLUS_TOKEN',
+    'WECOM_API_URL'
   ]
   // 判断是否存在即时消息推送配置
   const hasIMPushConfig = IM_PUSH_CONFIGS.some(item => !!config[item])
@@ -1008,6 +1031,21 @@ async function noticePushPlus (comment) {
   console.log('pushplus 通知结果：', sendResult)
 }
 
+// 自定义WeCom企业微信api通知
+async function noticeWeComPush (comment) {
+  if (!config.WECOM_API_URL) {
+    console.log('未配置 WECOM_API_URL，跳过企业微信推送')
+    return
+  }
+  if (config.BLOGGER_EMAIL === comment.mail) return
+  const SITE_URL = config.SITE_URL
+  const WeComContent = config.SITE_NAME + '有新评论啦！🎉🎉' + '\n\n' + '@' + comment.nick + '说：' + $(comment.comment).text() + '\n' + 'E-mail: ' + comment.mail + '\n' + 'IP: ' + comment.ip + '\n' + '点此查看完整内容：' + appendHashToUrl(comment.href || SITE_URL + comment.url, comment.id)
+  const WeComApiContent = encodeURIComponent(WeComContent)
+  const WeComApiUrl = config.WECOM_API_URL
+  const sendResult = await axios.get(WeComApiUrl + WeComApiContent)
+  console.log('WinxinPush 通知结果：', sendResult)
+}
+
 // QQ通知
 async function noticeQQ (comment) {
   if (!config.QM_SENDKEY) {
@@ -1047,12 +1085,13 @@ function getIMPushContent (comment) {
 async function noticeReply (currentComment) {
   if (!currentComment.pid) return
   if (!transporter) if (!await initMailer()) return
-  let parentComment = await db
+  const parentComment = await db
     .collection('comment')
     .findOne({ _id: currentComment.pid })
-  parentComment = parentComment.data[0]
   // 回复给博主，因为会发博主通知邮件，所以不再重复通知
   if (config.BLOGGER_EMAIL === parentComment.mail) return
+  // 回复自己的评论，不邮件通知
+  if (currentComment.mail === parentComment.mail) return
   const PARENT_NICK = parentComment.nick
   const SITE_NAME = config.SITE_NAME
   const NICK = currentComment.nick
@@ -1116,7 +1155,7 @@ function appendHashToUrl (url, hash) {
 async function parse (comment) {
   const timestamp = Date.now()
   const isAdminUser = await isAdmin()
-  const isBloggerMail = comment.mail === config.BLOGGER_EMAIL
+  const isBloggerMail = comment.mail && comment.mail === config.BLOGGER_EMAIL
   if (isBloggerMail && !isAdminUser) throw new Error('请先登录管理面板，再使用博主身份发送评论')
   const commentDo = {
     _id: uuidv4().replace(/-/g, ''),
@@ -1390,6 +1429,31 @@ async function getRecentComments (event) {
   return res
 }
 
+async function emailTest (event) {
+  const res = {}
+  const isAdminUser = await isAdmin()
+  if (isAdminUser) {
+    try {
+      if (!transporter) {
+        await initMailer({ throwErr: true })
+      }
+      const sendResult = await transporter.sendMail({
+        from: config.SENDER_EMAIL,
+        to: event.mail || config.BLOGGER_EMAIL || config.SENDER_EMAIL,
+        subject: 'Twikoo 邮件通知测试邮件',
+        html: '如果您收到这封邮件，说明 Twikoo 邮件功能配置正确'
+      })
+      res.result = sendResult
+    } catch (e) {
+      res.message = e.message
+    }
+  } else {
+    res.code = RES_CODE.NEED_LOGIN
+    res.message = '请先登录'
+  }
+  return res
+}
+
 function getAvatar (comment) {
   if (comment.avatar) {
     return comment.avatar

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-vercel",
-  "version": "1.4.3",
+  "version": "1.4.7",
   "description": "A simple comment system based on Tencent CloudBase (tcb).",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",