tkserver 1.7.13 → 1.7.15

package/index.js

@@ -43,6 +43,13 @@ const {
   checkCommentOwnership,
   isValidEmail
 } = require('twikoo-func/utils')
+const {
+  createCap,
+  lokiStorage,
+  createChallenge,
+  redeemChallenge,
+  isBuiltinCap
+} = require('twikoo-func/utils/cap')
 const {
   jsonParse,
   commentImportValine,
@@ -157,6 +164,12 @@ module.exports = async (request, response) => {
       case 'COMMENT_EXPORT_FOR_ADMIN': // >= 1.6.13
         res = await commentExportForAdmin(event)
         break
+      case 'CAP_CHALLENGE':
+        res = await capChallenge()
+        break
+      case 'CAP_REDEEM':
+        res = await capRedeem(event)
+        break
       default:
         if (event.event) {
           res.code = RES_CODE.EVENT_NOT_EXIST
@@ -801,6 +814,14 @@ async function checkCaptcha (comment, request) {
       geeTestPassToken: comment.geeTestPassToken,
       geeTestGenTime: comment.geeTestGenTime
     })
+  } else if (provider === 'Cap' && isBuiltinCap(config)) {
+    if (!comment.capToken) {
+      throw new Error('验证码 token 缺失，请刷新页面重试')
+    }
+    await checkCapCaptcha({
+      capToken: comment.capToken,
+      cap: createCap(lokiStorage(db))
+    })
   } else if (provider === 'Cap' && config.CAP_API_ENDPOINT && config.CAP_SECRET_KEY) {
     if (!comment.capToken) {
       throw new Error('验证码 token 缺失，请刷新页面重试')
@@ -811,7 +832,7 @@ async function checkCaptcha (comment, request) {
       capApiEndpoint: config.CAP_API_ENDPOINT
     })
   } else if (provider === 'Cap') {
-    throw new Error('Cap 验证码配置不完整，请联系管理员')
+    throw new Error('Cap 验证码配置不完整：内嵌模式无需额外配置，外部模式需填写 CAP_API_ENDPOINT 与 CAP_SECRET_KEY')
   } else if (provider) {
     throw new Error(`不支持的验证码类型: ${provider}`)
   }
@@ -1047,7 +1068,7 @@ function isAdmin (accessToken) {
 
 // 建立数据库 collections
 async function createCollections () {
-  const collections = ['comment', 'config', 'counter']
+  const collections = ['comment', 'config', 'counter', 'cap_challenges', 'cap_tokens']
   const res = {}
   for (const collection of collections) {
     if (db.getCollection(collection) === null) {
@@ -1057,6 +1078,22 @@ async function createCollections () {
   return res
 }
 
+async function capChallenge () {
+  if (!isBuiltinCap(config)) {
+    return { code: RES_CODE.FAIL, message: '内嵌 Cap 未启用' }
+  }
+  const data = await createChallenge(createCap(lokiStorage(db)))
+  return { code: RES_CODE.SUCCESS, ...data }
+}
+
+async function capRedeem (event) {
+  if (!isBuiltinCap(config)) {
+    return { code: RES_CODE.FAIL, message: '内嵌 Cap 未启用' }
+  }
+  const data = await redeemChallenge(createCap(lokiStorage(db)), event)
+  return { code: RES_CODE.SUCCESS, ...data }
+}
+
 function getIp (request) {
   try {
     const { TWIKOO_IP_HEADERS } = process.env

package/mongo.js

@@ -39,6 +39,13 @@ const {
   validate,
   checkCommentOwnership
 } = require('twikoo-func/utils')
+const {
+  createCap,
+  mongoStorage,
+  createChallenge,
+  redeemChallenge,
+  isBuiltinCap
+} = require('twikoo-func/utils/cap')
 const {
   jsonParse,
   commentImportValine,
@@ -150,6 +157,12 @@ module.exports = async (request, response) => {
       case 'COMMENT_EXPORT_FOR_ADMIN': // >= 1.6.13
         res = await commentExportForAdmin(event)
         break
+      case 'CAP_CHALLENGE':
+        res = await capChallenge()
+        break
+      case 'CAP_REDEEM':
+        res = await capRedeem(event)
+        break
       default:
         if (event.event) {
           res.code = RES_CODE.EVENT_NOT_EXIST
@@ -777,6 +790,14 @@ async function checkCaptcha (comment, request) {
       geeTestPassToken: comment.geeTestPassToken,
       geeTestGenTime: comment.geeTestGenTime
     })
+  } else if (provider === 'Cap' && isBuiltinCap(config)) {
+    if (!comment.capToken) {
+      throw new Error('验证码 token 缺失，请刷新页面重试')
+    }
+    await checkCapCaptcha({
+      capToken: comment.capToken,
+      cap: createCap(mongoStorage(db))
+    })
   } else if (provider === 'Cap' && config.CAP_API_ENDPOINT && config.CAP_SECRET_KEY) {
     if (!comment.capToken) {
       throw new Error('验证码 token 缺失，请刷新页面重试')
@@ -787,7 +808,7 @@ async function checkCaptcha (comment, request) {
       capApiEndpoint: config.CAP_API_ENDPOINT
     })
   } else if (provider === 'Cap') {
-    throw new Error('Cap 验证码配置不完整，请联系管理员')
+    throw new Error('Cap 验证码配置不完整：内嵌模式无需额外配置，外部模式需填写 CAP_API_ENDPOINT 与 CAP_SECRET_KEY')
   } else if (provider) {
     throw new Error(`不支持的验证码类型: ${provider}`)
   }
@@ -1016,7 +1037,7 @@ function isAdmin (accessToken) {
 
 // 建立数据库 collections
 async function createCollections () {
-  const collections = ['comment', 'config', 'counter']
+  const collections = ['comment', 'config', 'counter', 'cap_challenges', 'cap_tokens']
   const res = {}
   for (const collection of collections) {
     try {
@@ -1028,6 +1049,22 @@ async function createCollections () {
   return res
 }
 
+async function capChallenge () {
+  if (!isBuiltinCap(config)) {
+    return { code: RES_CODE.FAIL, message: '内嵌 Cap 未启用' }
+  }
+  const data = await createChallenge(createCap(mongoStorage(db)))
+  return { code: RES_CODE.SUCCESS, ...data }
+}
+
+async function capRedeem (event) {
+  if (!isBuiltinCap(config)) {
+    return { code: RES_CODE.FAIL, message: '内嵌 Cap 未启用' }
+  }
+  const data = await redeemChallenge(createCap(mongoStorage(db)), event)
+  return { code: RES_CODE.SUCCESS, ...data }
+}
+
 function getIp (request) {
   try {
     const { TWIKOO_IP_HEADERS } = process.env

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tkserver",
-  "version": "1.7.13",
+  "version": "1.7.15",
   "description": "A simple comment system.",
   "keywords": [
     "twikoo",
@@ -31,7 +31,7 @@
     "get-user-ip": "^1.0.1",
     "lokijs": "^1.5.12",
     "mongodb": "^6.3.0",
-    "twikoo-func": "1.7.13",
+    "twikoo-func": "1.7.15",
     "uuid": "^8.3.2"
   }
 }