From 0aa6169c02e9fceed4da4fd6dc371ea781f0fb50 Mon Sep 17 00:00:00 2001
From: iMaeGoo <mail1st@qq.com>
Date: Tue, 2 Aug 2022 15:58:19 +0800
Subject: [PATCH] fix: several bugs of self-hosted server (#416)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 改进 更新 IP 属地数据库
* 修复 私有部署批量获取文章评论数 API 异常
* 修复 私有部署访问量统计功能异常
* 修复 私有部署 IP 限流功能异常
---
 docs/.vuepress/theme/layouts/Layout.vue    |  2 +-
 docs/en/quick-start.md                     | 12 ++--
 docs/quick-start.md                        | 12 ++--
 package.json                               |  2 +-
 src/client/version.js                      |  2 +-
 src/server/function/twikoo/package.json    |  4 +-
 src/server/function/twikoo/utils/import.js |  6 ++
 src/server/function/twikoo/utils/lib.js    |  2 +-
 src/server/self-hosted/index.js            | 66 ++++++++++------------
 src/server/self-hosted/package.json        |  4 +-
 src/server/vercel-min/package.json         |  2 +-
 src/server/vercel/package.json             |  4 +-
 12 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/docs/.vuepress/theme/layouts/Layout.vue b/docs/.vuepress/theme/layouts/Layout.vue
index a583672db..af025b895 100644
--- a/docs/.vuepress/theme/layouts/Layout.vue
+++ b/docs/.vuepress/theme/layouts/Layout.vue
@@ -13,7 +13,7 @@
 
         <!-- Twikoo -->
         <div id="twikoo"></div>
-        <component :is="'script'" src="https://cdn.jsdelivr.net/npm/twikoo@1.6.0/dist/twikoo.all.min.js" ref="twikooJs"></component>
+        <component :is="'script'" src="https://cdn.jsdelivr.net/npm/twikoo@1.6.1/dist/twikoo.all.min.js" ref="twikooJs"></component>
       </div>
     </template>
   </ParentLayout>
diff --git a/docs/en/quick-start.md b/docs/en/quick-start.md
index 6b0fddc8d..681123ac7 100644
--- a/docs/en/quick-start.md
+++ b/docs/en/quick-start.md
@@ -49,7 +49,7 @@ exports.main = require('twikoo-func').main
 8. 创建完成后，点击“twikoo"进入云函数详情页，进入“函数代码”标签，点击“文件 - 新建文件”，输入 `package.json`，回车
 9. 复制以下代码、粘贴到代码框中，点击“保存并安装依赖”
 ``` json
-{ "dependencies": { "twikoo-func": "1.6.0" } }
+{ "dependencies": { "twikoo-func": "1.6.1" } }
 ```
 
 ### 命令行部署
@@ -206,7 +206,7 @@ twikoo:
 
 ``` html
 <div id="tcomment"></div>
-<script src="https://cdn.jsdelivr.net/npm/twikoo@1.6.0/dist/twikoo.all.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/twikoo@1.6.1/dist/twikoo.all.min.js"></script>
 <script>
 twikoo.init({
   envId: '您的环境id', // 腾讯云环境填 envId；Vercel 环境填地址（https://xxx.vercel.app）
@@ -224,10 +224,10 @@ twikoo.init({
 
 如果遇到默认 CDN 加载速度缓慢，可更换其他 CDN 镜像。以下为可供选择的公共 CDN，其中一些 CDN 可能需要数天时间同步最新版本：
 
-* `https://cdn.staticfile.org/twikoo/1.6.0/twikoo.all.min.js`
-* `https://lib.baomitu.com/twikoo/1.6.0/twikoo.all.min.js`
-* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.0/twikoo.all.min.js`
-* `https://cdn.jsdelivr.net/npm/twikoo@1.6.0/dist/twikoo.all.min.js`
+* `https://cdn.staticfile.org/twikoo/1.6.1/twikoo.all.min.js`
+* `https://lib.baomitu.com/twikoo/1.6.1/twikoo.all.min.js`
+* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.1/twikoo.all.min.js`
+* `https://cdn.jsdelivr.net/npm/twikoo@1.6.1/dist/twikoo.all.min.js`
 
 ## 开启管理面板（腾讯云环境）
 
diff --git a/docs/quick-start.md b/docs/quick-start.md
index e43489df0..502031e24 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -45,7 +45,7 @@ exports.main = require('twikoo-func').main
 8. 创建完成后，点击“twikoo"进入云函数详情页，进入“函数代码”标签，点击“文件 - 新建文件”，输入 `package.json`，回车
 9. 复制以下代码、粘贴到代码框中，点击“保存并安装依赖”
 ``` json
-{ "dependencies": { "twikoo-func": "1.6.0" } }
+{ "dependencies": { "twikoo-func": "1.6.1" } }
 ```
 
 ### 命令行部署
@@ -208,7 +208,7 @@ twikoo:
 
 ``` html
 <div id="tcomment"></div>
-<script src="https://cdn.staticfile.org/twikoo/1.6.0/twikoo.all.min.js"></script>
+<script src="https://cdn.staticfile.org/twikoo/1.6.1/twikoo.all.min.js"></script>
 <script>
 twikoo.init({
   envId: '您的环境id', // 腾讯云环境填 envId；Vercel 环境填地址（https://xxx.vercel.app）
@@ -226,10 +226,10 @@ twikoo.init({
 
 如果遇到默认 CDN 加载速度缓慢，可更换其他 CDN 镜像。以下为可供选择的公共 CDN，其中一些 CDN 可能需要数天时间同步最新版本：
 
-* `https://cdn.staticfile.org/twikoo/1.6.0/twikoo.all.min.js`
-* `https://lib.baomitu.com/twikoo/1.6.0/twikoo.all.min.js`
-* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.0/twikoo.all.min.js`
-* `https://cdn.jsdelivr.net/npm/twikoo@1.6.0/dist/twikoo.all.min.js`
+* `https://cdn.staticfile.org/twikoo/1.6.1/twikoo.all.min.js`
+* `https://lib.baomitu.com/twikoo/1.6.1/twikoo.all.min.js`
+* `https://cdn.bootcdn.net/ajax/libs/twikoo/1.6.1/twikoo.all.min.js`
+* `https://cdn.jsdelivr.net/npm/twikoo@1.6.1/dist/twikoo.all.min.js`
 
 ## 开启管理面板（腾讯云环境）
 
diff --git a/package.json b/package.json
index 64a2fff47..ece279218 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A simple comment system.",
   "keywords": [
     "twikoojs",
diff --git a/src/client/version.js b/src/client/version.js
index 50bb08464..2d246d058 100644
--- a/src/client/version.js
+++ b/src/client/version.js
@@ -1,3 +1,3 @@
-const version = '1.6.0'
+const version = '1.6.1'
 
 export { version }
diff --git a/src/server/function/twikoo/package.json b/src/server/function/twikoo/package.json
index 2529bb198..c758e7949 100644
--- a/src/server/function/twikoo/package.json
+++ b/src/server/function/twikoo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo-func",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
@@ -13,6 +13,7 @@
   "dependencies": {
     "@cloudbase/manager-node": "^3.9.0",
     "@cloudbase/node-sdk": "^2.5.0",
+    "@imaegoo/node-ip2region": "^2.1.1",
     "akismet-api": "^5.1.0",
     "axios": "^0.21.1",
     "blueimp-md5": "^2.18.0",
@@ -20,7 +21,6 @@
     "cheerio": "1.0.0-rc.5",
     "crypto-js": "^4.0.0",
     "dompurify": "^2.2.6",
-    "dy-node-ip2region": "^1.0.1",
     "form-data": "^4.0.0",
     "jsdom": "^16.4.0",
     "marked": "^4.0.12",
diff --git a/src/server/function/twikoo/utils/import.js b/src/server/function/twikoo/utils/import.js
index f6a72a346..fd640f9f8 100644
--- a/src/server/function/twikoo/utils/import.js
+++ b/src/server/function/twikoo/utils/import.js
@@ -196,6 +196,12 @@ const fn = {
           // 解决 id 历史数据问题
           parsed._id = comment._id.$oid
         }
+        if (comment.pid === null) {
+          delete comment.pid
+        }
+        if (comment.rid === null) {
+          delete comment.rid
+        }
         comments.push(parsed)
         log(`${comment._id} 解析成功`)
       } catch (e) {
diff --git a/src/server/function/twikoo/utils/lib.js b/src/server/function/twikoo/utils/lib.js
index db93d1d83..0a3fc00b3 100644
--- a/src/server/function/twikoo/utils/lib.js
+++ b/src/server/function/twikoo/utils/lib.js
@@ -6,7 +6,7 @@ const { JSDOM } = require('jsdom') // document.window 服务器版
 const axios = require('axios') // 发送 REST 请求
 const bowser = require('bowser') // UserAgent 格式化
 const createDOMPurify = require('dompurify') // 反 XSS
-const ipToRegion = require('dy-node-ip2region') // IP 属地查询
+const ipToRegion = require('@imaegoo/node-ip2region') // IP 属地查询
 const marked = require('marked') // Markdown 解析
 const md5 = require('blueimp-md5') // MD5 加解密
 const nodemailer = require('nodemailer') // 发送邮件
diff --git a/src/server/self-hosted/index.js b/src/server/self-hosted/index.js
index 2741a1479..b885456b3 100644
--- a/src/server/self-hosted/index.js
+++ b/src/server/self-hosted/index.js
@@ -49,11 +49,12 @@ const DOMPurify = createDOMPurify(window)
 
 // 常量 / constants
 const { RES_CODE, MAX_REQUEST_TIMES } = require('twikoo-func/utils/constants')
+const TWIKOO_REQ_TIMES_CLEAR_TIME = parseInt(process.env.TWIKOO_REQ_TIMES_CLEAR_TIME) || 10 * 60 * 1000
 
 // 全局变量 / variables
 let db = null
 let config
-const requestTimes = {}
+let requestTimes = {}
 
 connectToDatabase()
 
@@ -468,8 +469,8 @@ async function commentImportForAdmin (event) {
         default:
           throw new Error(`不支持 ${event.source} 的导入，请更新 Twikoo 云函数至最新版本`)
       }
-      const insertedCount = await bulkSaveComments(comments).length
-      log(`导入成功 ${insertedCount} 条评论`)
+      await bulkSaveComments(comments)
+      log('导入成功')
     } catch (e) {
       log(e.message)
     }
@@ -503,10 +504,9 @@ async function readFile (file, type, log) {
 
 // 批量导入评论
 async function bulkSaveComments (comments) {
-  const batchRes = db
+  db
     .getCollection('comment')
     .insert(comments)
-  return batchRes
 }
 
 // 点赞 / 取消点赞
@@ -531,11 +531,11 @@ async function like (id, uid) {
     // 取消赞
     likes = likes.filter((item) => item !== uid)
   }
-  const result = await record.findAndUpdate({ _id: id }, (obj) => {
+  await record.findAndUpdate({ _id: id }, (obj) => {
     obj.like = likes
     return obj
   })
-  return result
+  return 1
 }
 
 /**
@@ -720,26 +720,23 @@ async function readCounter (url) {
  * @param {String} event.title 文章标题
  */
 async function incCounter (event) {
-  let result
-  result = db
-    .getCollection('counter')
-    .findAndUpdate({ url: event.url }, (obj) => {
-      obj.time = obj.time ? obj.time + 1 : 1
-      obj.title = event.title
-      obj.updated = Date.now()
+  const counter = db.getCollection('counter')
+  const result = counter.find({ url: event.url })[0]
+  if (result) {
+    result.time = result.time ? result.time + 1 : 1
+    result.title = event.title
+    result.updated = Date.now()
+    counter.update(result)
+  } else {
+    counter.insert({
+      url: event.url,
+      title: event.title,
+      time: 1,
+      created: Date.now(),
+      updated: Date.now()
     })
-  if (result.modifiedCount === 0) {
-    result = db
-      .getCollection('counter')
-      .insert({
-        url: event.url,
-        title: event.title,
-        time: 1,
-        created: Date.now(),
-        updated: Date.now()
-      })
   }
-  return result.modifiedCount || result.insertedCount
+  return 1
 }
 
 /**
@@ -757,20 +754,13 @@ async function getCommentsCount (event) {
     if (!event.includeReply) {
       query.rid = { $exists: false }
     }
-    const result = db
-      .getCollection('comment')
-      .chain()
-      .aggregate([
-        { $match: query },
-        { $group: { _id: '$url', count: { $sum: 1 } } }
-      ])
-      .data()
     res.data = []
+    const commentCollection = db.getCollection('comment')
     for (const url of event.urls) {
-      const record = result.find((item) => item._id === url)
+      const record = commentCollection.count({ ...query, url })
       res.data.push({
         url,
-        count: record ? record.count : 0
+        count: record || 0
       })
     }
   } catch (e) {
@@ -915,3 +905,9 @@ async function createCollections () {
 function getIp (request) {
   return request.headers['x-forwarded-for'] || request.socket.remoteAddress || ''
 }
+
+function clearRequestTimes () {
+  requestTimes = {}
+}
+
+setTimeout(clearRequestTimes, TWIKOO_REQ_TIMES_CLEAR_TIME)
diff --git a/src/server/self-hosted/package.json b/src/server/self-hosted/package.json
index 3ef51685c..939bf0d5f 100644
--- a/src/server/self-hosted/package.json
+++ b/src/server/self-hosted/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tkserver",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A simple comment system.",
   "keywords": [
     "twikoo",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "lokijs": "^1.5.12",
-    "twikoo-func": "1.6.0",
+    "twikoo-func": "1.6.1",
     "uuid": "^8.3.2"
   }
 }
diff --git a/src/server/vercel-min/package.json b/src/server/vercel-min/package.json
index f1c45bc52..af9dc3c1c 100644
--- a/src/server/vercel-min/package.json
+++ b/src/server/vercel-min/package.json
@@ -1 +1 @@
-{ "dependencies": { "twikoo-vercel": "1.6.0" } }
+{ "dependencies": { "twikoo-vercel": "1.6.1" } }
diff --git a/src/server/vercel/package.json b/src/server/vercel/package.json
index cc477aced..196d4783e 100644
--- a/src/server/vercel/package.json
+++ b/src/server/vercel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twikoo-vercel",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A simple comment system.",
   "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
   "license": "MIT",
@@ -12,7 +12,7 @@
   "homepage": "https://twikoo.js.org",
   "dependencies": {
     "mongodb": "^3.6.3",
-    "twikoo-func": "1.6.0",
+    "twikoo-func": "1.6.1",
     "uuid": "^8.3.2"
   }
 }