tkserver 1.6.7 → 1.6.8

package/README.md

@@ -19,3 +19,5 @@ tkserver
 | `TWIKOO_DATA` | 数据库存储路径 | `./data` |
 | `TWIKOO_PORT` | 端口号 | `8080` |
 | `TWIKOO_THROTTLE` | IP 请求限流，当同一 IP 短时间内请求次数超过阈值将对该 IP 返回错误 | `250` |
+| `TWIKOO_LOCALHOST_ONLY` | 为`true`时只监听本地请求，使得 nginx 等服务器反代之后不暴露原始端口 | `null` |
+| `TWIKOO_IP_HEADERS` | 在一些特殊情况下使用，如使用了`CloudFlare CDN` 它会将请求 IP 写到请求头的 `cf-connecting-ip` 字段上，为了能够正确的获取请求 IP 你可以写成 `['headers.cf-connecting-ip']` | `[]` |

package/index.js

@@ -8,6 +8,7 @@ const { version: VERSION } = require('./package.json')
 const fs = require('fs')
 const path = require('path')
 const Loki = require('lokijs')
+const getUserIP = require('get-user-ip')
 const Lfsa = require('lokijs/src/loki-fs-structured-adapter')
 const { v4: uuidv4 } = require('uuid') // 用户 id 生成
 const {
@@ -23,6 +24,7 @@ const {
   getUrlsQuery,
   parseComment,
   parseCommentForAdmin,
+  getMailMd5,
   getAvatar,
   isQQ,
   addQQMailSuffix,
@@ -789,7 +791,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(),
@@ -893,7 +895,14 @@ async function createCollections () {
 }
 
 function getIp (request) {
-  return request.headers['x-forwarded-for'] || request.socket.remoteAddress || ''
+  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)
 }
 
 function clearRequestTimes () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tkserver",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "A simple comment system.",
   "keywords": [
     "twikoo",
@@ -24,8 +24,9 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
+    "get-user-ip": "^1.0.1",
     "lokijs": "^1.5.12",
-    "twikoo-func": "1.6.7",
+    "twikoo-func": "1.6.8",
     "uuid": "^8.3.2"
   }
 }

package/server.js

@@ -30,7 +30,8 @@ server.on('request', async function (request, response) {
 })
 
 const port = parseInt(process.env.TWIKOO_PORT) || 8080
+const host = process.env.TWIKOO_LOCALHOST_ONLY === 'true' ? 'localhost' : '::'
 
-server.listen(port, function () {
-  console.log(`Twikoo function started on port ${port}`)
+server.listen(port, host, function () {
+  console.log(`Twikoo function started on host ${host} port ${port}`)
 })