twikoo-vercel 1.6.7 → 1.6.8

package/api/index.js

@@ -6,6 +6,7 @@
 
 const { version: VERSION } = require('../package.json')
 const MongoClient = require('mongodb').MongoClient
+const getUserIP = require('get-user-ip')
 const { URL } = require('url')
 const { v4: uuidv4 } = require('uuid') // 用户 id 生成
 const {
@@ -22,6 +23,7 @@ const {
   getUrlsQuery,
   parseComment,
   parseCommentForAdmin,
+  getMailMd5,
   getAvatar,
   isQQ,
   addQQMailSuffix,
@@ -58,7 +60,7 @@ const requestTimes = {}
 
 module.exports = async (request, response) => {
   const event = request.body || {}
-  console.log('请求 IP：', request.headers['x-real-ip'])
+  console.log('请求 IP：', getIp(request))
   console.log('请求函数：', event.event)
   console.log('请求参数：', event)
   let res = {}
@@ -623,7 +625,7 @@ async function parse (comment, request) {
     mailMd5: comment.mail ? md5(comment.mail) : '',
     link: comment.link ? comment.link : '',
     ua: comment.ua,
-    ip: request.headers['x-real-ip'],
+    ip: getIp(request),
     master: isBloggerMail,
     url: comment.url,
     href: comment.href,
@@ -651,7 +653,7 @@ async function limitFilter (request) {
     const count = await db
       .collection('comment')
       .countDocuments({
-        ip: request.headers['x-real-ip'],
+        ip: getIp(request),
         created: { $gt: Date.now() - 600000 }
       })
     if (count > limitPerMinute) {
@@ -803,7 +805,7 @@ async function getRecentComments (event) {
         url: comment.url,
         nick: comment.nick,
         avatar: getAvatar(comment, config),
-        mailMd5: comment.mailMd5 || md5(comment.mail),
+        mailMd5: getMailMd5(comment),
         link: comment.link,
         comment: comment.comment,
         commentText: $(comment.comment).text(),
@@ -835,7 +837,7 @@ async function setConfig (event) {
 
 function protect (request) {
   // 防御
-  const ip = request.headers['x-real-ip']
+  const ip = getIp(request)
   requestTimes[ip] = (requestTimes[ip] || 0) + 1
   if (requestTimes[ip] > MAX_REQUEST_TIMES) {
     console.log(`${ip} 当前请求次数为 ${requestTimes[ip]}，已超过最大请求次数`)
@@ -915,3 +917,14 @@ async function createCollections () {
   }
   return res
 }
+
+function getIp (request) {
+  try {
+    const { TWIKOO_IP_HEADERS } = process.env
+    const headers = TWIKOO_IP_HEADERS ? JSON.parse(TWIKOO_IP_HEADERS) : []
+    return getUserIP(request, headers)
+  } catch (e) {
+    console.error('获取 IP 错误信息：', e)
+  }
+  return getUserIP(request)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twikoo-vercel",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
@@ -11,8 +11,9 @@
   },
   "homepage": "https://twikoo.js.org",
   "dependencies": {
+    "get-user-ip": "^1.0.1",
     "mongodb": "^3.6.3",
-    "twikoo-func": "1.6.7",
+    "twikoo-func": "1.6.8",
     "uuid": "^8.3.2"
   }
 }