tkserver 1.6.4 → 1.6.7

package/index.js

@@ -5,13 +5,14 @@
  */
 
 const { version: VERSION } = require('./package.json')
+const fs = require('fs')
+const path = require('path')
 const Loki = require('lokijs')
 const Lfsa = require('lokijs/src/loki-fs-structured-adapter')
 const { v4: uuidv4 } = require('uuid') // 用户 id 生成
 const {
   $,
   JSDOM,
-  axios,
   createDOMPurify,
   md5,
   xml2js
@@ -99,9 +100,6 @@ module.exports = async (request, response) => {
       case 'COMMENT_SUBMIT':
         res = await commentSubmit(event, request)
         break
-      case 'POST_SUBMIT':
-        res = await postSubmit(event.comment, request)
-        break
       case 'COUNTER_GET':
         res = await counterGet(event)
         break
@@ -168,6 +166,7 @@ function allowCors (request, response) {
       'Access-Control-Allow-Headers',
       'X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version'
     )
+    response.setHeader('Access-Control-Max-Age', '600')
   }
 }
 
@@ -195,9 +194,14 @@ function anonymousSignIn (request) {
 
 async function connectToDatabase () {
   if (db) return db
+  const dataDir = path.resolve(process.cwd(), process.env.TWIKOO_DATA || './data')
+  if (!fs.existsSync(dataDir)) {
+    fs.mkdirSync(dataDir)
+  }
+  console.log(`Twikoo database stored at ${dataDir}`)
   await new Promise((resolve) => {
     console.log('Connecting to database...')
-    db = new Loki('data/db.json', {
+    db = new Loki(path.resolve(dataDir, './db.json'), {
       adapter: new Lfsa(),
       autoload: true,
       autoloadCallback: resolve,
@@ -396,17 +400,17 @@ async function commentSetForAdmin (event) {
   const isAdminUser = isAdmin(event.accessToken)
   if (isAdminUser) {
     validate(event, ['id', 'set'])
-    const data = db
+    db
       .getCollection('comment')
       .findAndUpdate({ _id: event.id }, (obj) => {
-        return {
-          ...obj,
-          ...event.set,
-          updated: Date.now()
+        for (const key of Object.keys(event.set)) {
+          obj[key] = event.set[key]
         }
+        obj.updated = Date.now()
+        return obj
       })
     res.code = RES_CODE.SUCCESS
-    res.updated = data
+    res.updated = 1
   } else {
     res.code = RES_CODE.NEED_LOGIN
     res.message = '请先登录'
@@ -420,11 +424,11 @@ async function commentDeleteForAdmin (event) {
   const isAdminUser = isAdmin(event.accessToken)
   if (isAdminUser) {
     validate(event, ['id'])
-    const data = db
+    db
       .getCollection('comment')
       .findAndRemove({ _id: event.id })
     res.code = RES_CODE.SUCCESS
-    res.deleted = data.deletedCount
+    res.deleted = 1
   } else {
     res.code = RES_CODE.NEED_LOGIN
     res.message = '请先登录'
@@ -566,21 +570,9 @@ async function commentSubmit (event, request) {
   const comment = await save(data)
   res.id = comment.id
   // 异步垃圾检测、发送评论通知
-  try {
-    console.log('开始异步垃圾检测、发送评论通知')
-    console.time('POST_SUBMIT')
-    await Promise.race([
-      axios.post(`http://${request.headers.host}`, {
-        event: 'POST_SUBMIT',
-        comment
-      }, { headers: { 'x-twikoo-recursion': config.ADMIN_PASS || 'true' } }),
-      // 如果超过 5 秒还没收到异步返回，直接继续，减少用户等待的时间
-      new Promise((resolve) => setTimeout(resolve, 5000))
-    ])
-    console.timeEnd('POST_SUBMIT')
-  } catch (e) {
-    console.log('POST_SUBMIT 失败', e)
-  }
+  console.log('开始异步垃圾检测、发送评论通知')
+  // 私有部署支持直接异步调用
+  postSubmit(comment)
   return res
 }
 
@@ -601,14 +593,17 @@ async function getParentComment (currentComment) {
 }
 
 // 异步垃圾检测、发送评论通知
-async function postSubmit (comment, request) {
-  if (!isRecursion(request)) return { code: RES_CODE.FORBIDDEN }
-  // 垃圾检测
-  const isSpam = await postCheckSpam(comment, config)
-  await saveSpamCheckResult(comment, isSpam)
-  // 发送通知
-  await sendNotice(comment, config, getParentComment)
-  return { code: RES_CODE.SUCCESS }
+async function postSubmit (comment) {
+  try {
+    console.log('POST_SUBMIT')
+    // 垃圾检测
+    const isSpam = await postCheckSpam(comment, config)
+    await saveSpamCheckResult(comment, isSpam)
+    // 发送通知
+    await sendNotice(comment, config, getParentComment)
+  } catch (e) {
+    console.log('POST_SUBMIT 失败', e)
+  }
 }
 
 // 将评论转为数据库存储格式
@@ -885,11 +880,6 @@ function isAdmin (accessToken) {
   return config.ADMIN_PASS === md5(accessToken)
 }
 
-// 判断是否为递归调用（即云函数调用自身）
-function isRecursion (request) {
-  return request.headers['x-twikoo-recursion'] === (config.ADMIN_PASS || 'true')
-}
-
 // 建立数据库 collections
 async function createCollections () {
   const collections = ['comment', 'config', 'counter']
@@ -910,4 +900,4 @@ function clearRequestTimes () {
   requestTimes = {}
 }
 
-setTimeout(clearRequestTimes, TWIKOO_REQ_TIMES_CLEAR_TIME)
+setInterval(clearRequestTimes, TWIKOO_REQ_TIMES_CLEAR_TIME)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tkserver",
-  "version": "1.6.4",
+  "version": "1.6.7",
   "description": "A simple comment system.",
   "keywords": [
     "twikoo",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "lokijs": "^1.5.12",
-    "twikoo-func": "1.6.4",
+    "twikoo-func": "1.6.7",
     "uuid": "^8.3.2"
   }
 }

package/server.js

@@ -1,15 +1,6 @@
 #!/usr/bin/env node
 
-const fs = require('fs')
-const path = require('path')
 const http = require('http')
-
-const dataDir = path.resolve(process.cwd(), process.env.TWIKOO_DATA || './data')
-if (!fs.existsSync(dataDir)) {
-  fs.mkdirSync(dataDir)
-}
-console.log(`Twikoo database stored at ${dataDir}`)
-
 const twikoo = require('./index')
 const server = http.createServer()