tkserver 1.7.8 → 1.7.10

package/README.md

@@ -19,6 +19,7 @@ tkserver
 | `MONGODB_URI` | MongoDB 数据库连接字符串，不传则使用 lokijs | `null` |
 | `MONGO_URL` | MongoDB 数据库连接字符串，不传则使用 lokijs | `null` |
 | `TWIKOO_DATA` | lokijs 数据库存储路径 | `./data` |
+| `TWIKOO_HOST` | 自定义监听的主机名或IP地址（例如 0.0.0.0 或 127.0.0.1）,设置该值则会忽略 TWIKOO_LOCALHOST_ONLY，默认值为 null 但实际行为会回退到 `::` | `null` |
 | `TWIKOO_PORT` | 端口号 | `8080` |
 | `TWIKOO_THROTTLE` | IP 请求限流，当同一 IP 短时间内请求次数超过阈值将对该 IP 返回错误 | `250` |
 | `TWIKOO_LOCALHOST_ONLY` | 为`true`时只监听本地请求，使得 nginx 等服务器反代之后不暴露原始端口 | `null` |

package/index.js

@@ -39,7 +39,8 @@ const {
   checkCapCaptcha,
   getConfig,
   getConfigForAdmin,
-  validate
+  validate,
+  checkCommentOwnership
 } = require('twikoo-func/utils')
 const {
   jsonParse,
@@ -68,6 +69,7 @@ const TWIKOO_REQ_TIMES_CLEAR_TIME = parseInt(process.env.TWIKOO_REQ_TIMES_CLEAR_
 let db = null
 let config
 let requestTimes = {}
+let requestTimesTimer = null
 
 connectToDatabase()
 
@@ -103,6 +105,9 @@ module.exports = async (request, response) => {
       case 'COMMENT_DELETE_FOR_ADMIN':
         res = await commentDeleteForAdmin(event)
         break
+      case 'COMMENT_DELETE_FOR_USER':
+        res = await commentDeleteForUser(event)
+        break
       case 'COMMENT_IMPORT_FOR_ADMIN':
         res = await commentImportForAdmin(event)
         break
@@ -474,6 +479,24 @@ async function commentDeleteForAdmin (event) {
   return res
 }
 
+// 用户删除自己的评论
+async function commentDeleteForUser (event) {
+  const res = {}
+  try {
+    const uid = event.accessToken
+    await checkCommentOwnership(event.id, uid, (id) => {
+      return db.getCollection('comment').findOne({ _id: id })
+    })
+    db.getCollection('comment').findAndRemove({ _id: event.id })
+    res.code = RES_CODE.SUCCESS
+    res.deleted = 1
+  } catch (e) {
+    res.code = RES_CODE.FAIL
+    res.message = e.message
+  }
+  return res
+}
+
 // 管理员导入评论
 async function commentImportForAdmin (event) {
   const res = {}
@@ -1043,8 +1066,36 @@ function getIp (request) {
   return getUserIP(request)
 }
 
+async function closeDatabase () {
+  if (!db) return
+  try {
+    await new Promise((resolve, reject) => {
+      db.saveDatabase((err) => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve()
+        }
+      })
+    })
+  } finally {
+    db.close()
+    db = null
+  }
+}
+
+async function shutdown () {
+  if (requestTimesTimer) {
+    clearInterval(requestTimesTimer)
+    requestTimesTimer = null
+  }
+  await closeDatabase()
+}
+
 function clearRequestTimes () {
   requestTimes = {}
 }
 
-setInterval(clearRequestTimes, TWIKOO_REQ_TIMES_CLEAR_TIME)
+requestTimesTimer = setInterval(clearRequestTimes, TWIKOO_REQ_TIMES_CLEAR_TIME)
+
+module.exports.shutdown = shutdown

package/mongo.js

@@ -36,7 +36,8 @@ const {
   checkCapCaptcha,
   getConfig,
   getConfigForAdmin,
-  validate
+  validate,
+  checkCommentOwnership
 } = require('twikoo-func/utils')
 const {
   jsonParse,
@@ -65,6 +66,8 @@ const TWIKOO_REQ_TIMES_CLEAR_TIME = parseInt(process.env.TWIKOO_REQ_TIMES_CLEAR_
 let db = null
 let config
 let requestTimes = {}
+let client = null
+let requestTimesTimer = null
 
 module.exports = async (request, response) => {
   let accessToken
@@ -99,6 +102,9 @@ module.exports = async (request, response) => {
       case 'COMMENT_DELETE_FOR_ADMIN':
         res = await commentDeleteForAdmin(event)
         break
+      case 'COMMENT_DELETE_FOR_USER':
+        res = await commentDeleteForUser(event)
+        break
       case 'COMMENT_IMPORT_FOR_ADMIN':
         res = await commentImportForAdmin(event)
         break
@@ -221,7 +227,7 @@ async function connectToDatabase (uri) {
   if (!uri) throw new Error('未设置环境变量 MONGODB_URI | MONGO_URL')
   // If no connection is cached, create a new one
   logger.info('Connecting to database...')
-  const client = await MongoClient.connect(uri, {})
+  client = await MongoClient.connect(uri, {})
   // Select the database through the connection,
   // using the database path of the connection string
   const dbName = (new URL(uri)).pathname.substring(1) || 'twikoo'
@@ -460,6 +466,24 @@ async function commentDeleteForAdmin (event) {
   return res
 }
 
+// 用户删除自己的评论
+async function commentDeleteForUser (event) {
+  const res = {}
+  try {
+    const uid = event.accessToken
+    await checkCommentOwnership(event.id, uid, async (id) => {
+      return db.collection('comment').findOne({ _id: id })
+    })
+    const data = await db.collection('comment').deleteOne({ _id: event.id })
+    res.code = RES_CODE.SUCCESS
+    res.deleted = data.deletedCount
+  } catch (e) {
+    res.code = RES_CODE.FAIL
+    res.message = e.message
+  }
+  return res
+}
+
 // 管理员导入评论
 async function commentImportForAdmin (event) {
   const res = {}
@@ -1015,8 +1039,22 @@ function getIp (request) {
   return getUserIP(request)
 }
 
+async function shutdown () {
+  if (requestTimesTimer) {
+    clearInterval(requestTimesTimer)
+    requestTimesTimer = null
+  }
+  if (client) {
+    await client.close()
+    client = null
+    db = null
+  }
+}
+
 function clearRequestTimes () {
   requestTimes = {}
 }
 
-setInterval(clearRequestTimes, TWIKOO_REQ_TIMES_CLEAR_TIME)
+requestTimesTimer = setInterval(clearRequestTimes, TWIKOO_REQ_TIMES_CLEAR_TIME)
+
+module.exports.shutdown = shutdown

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tkserver",
-  "version": "1.7.8",
+  "version": "1.7.10",
   "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.8",
+    "twikoo-func": "1.7.10",
     "uuid": "^8.3.2"
   }
 }

package/server.js

@@ -6,8 +6,20 @@ const logger = require('twikoo-func/utils/logger')
 const dbUrl = process.env.MONGODB_URI || process.env.MONGO_URL || null
 const twikoo = dbUrl ? require('./mongo') : require('./index')
 const server = http.createServer()
+const sockets = new Set()
+const TWIKOO_SHUTDOWN_TIMEOUT = parseInt(process.env.TWIKOO_SHUTDOWN_TIMEOUT) || 5000
+let isShuttingDown = false
+let shuttingDownPromise = null
 
 server.on('request', async function (request, response) {
+  if (isShuttingDown) {
+    response.writeHead(503, {
+      Connection: 'close',
+      'Content-Type': 'application/json'
+    })
+    response.end(JSON.stringify({ code: 503, message: 'Twikoo server is shutting down' }))
+    return
+  }
   try {
     const buffers = []
     for await (const chunk of request) {
@@ -31,10 +43,83 @@ server.on('request', async function (request, response) {
   return await twikoo(request, response)
 })
 
+server.on('connection', (socket) => {
+  sockets.add(socket)
+  socket.on('close', () => sockets.delete(socket))
+})
+
 const port = parseInt(process.env.TWIKOO_PORT) || 8080
-const host = process.env.TWIKOO_LOCALHOST_ONLY === 'true' ? 'localhost' : '::'
+const host = process.env.TWIKOO_HOST || (process.env.TWIKOO_LOCALHOST_ONLY === 'true' ? 'localhost' : '::')
 
 server.listen(port, host, function () {
   logger.info(`Twikoo is using ${dbUrl ? 'mongo' : 'loki'} database`)
   logger.info(`Twikoo function started on host ${host} port ${port}`)
 })
+
+function closeServer () {
+  return new Promise((resolve, reject) => {
+    server.close((err) => {
+      if (err) {
+        reject(err)
+      } else {
+        resolve()
+      }
+    })
+  })
+}
+
+function destroySockets () {
+  for (const socket of sockets) {
+    socket.destroy()
+  }
+}
+
+async function shutdownWithTimeout () {
+  let timeoutId
+  const closeTask = closeServer()
+  const timeoutTask = new Promise((resolve) => {
+    timeoutId = setTimeout(() => {
+      logger.warn(`Twikoo server shutdown timed out after ${TWIKOO_SHUTDOWN_TIMEOUT}ms, destroying open connections`)
+      destroySockets()
+      resolve()
+    }, TWIKOO_SHUTDOWN_TIMEOUT)
+  })
+  await Promise.race([closeTask, timeoutTask])
+  clearTimeout(timeoutId)
+  await closeTask
+}
+
+async function runShutdown (signal) {
+  isShuttingDown = true
+  logger.info(`Received ${signal}, shutting down Twikoo server...`)
+  try {
+    await shutdownWithTimeout()
+  } catch (e) {
+    logger.error('Twikoo HTTP server shutdown failed:', e)
+  } finally {
+    if (typeof twikoo.shutdown === 'function') {
+      await twikoo.shutdown()
+    }
+  }
+  logger.info('Twikoo server stopped')
+}
+
+async function shutdown (signal) {
+  if (!shuttingDownPromise) {
+    shuttingDownPromise = runShutdown(signal)
+  }
+  return await shuttingDownPromise
+}
+
+async function handleSignal (signal) {
+  try {
+    await shutdown(signal)
+    process.exitCode = 0
+  } catch (e) {
+    logger.error('Twikoo server shutdown failed:', e)
+    process.exitCode = 1
+  }
+}
+
+process.on('SIGTERM', () => handleSignal('SIGTERM'))
+process.on('SIGINT', () => handleSignal('SIGINT'))