使twikoo支持Cloudflare worker的兼容性改动

src/server/function/twikoo/index.js

@@ -8,7 +8,6 @@ const { version: VERSION } = require('./package.json')
 const tcb = require('@cloudbase/node-sdk') // 云开发 SDK
 const {
  $,
- getDomPurify,
  md5,
  xml2js
 } = require('./utils/lib')
@@ -44,6 +43,7 @@ const { postCheckSpam } = require('./utils/spam')
 const { sendNotice, emailTest } = require('./utils/notify')
 const { uploadImage } = require('./utils/image')
 const logger = require('./utils/logger')
+const { getDomPurify } = require('./utils/dom')
 
 // 云函数 SDK / tencent cloudbase sdk
 const app = tcb.init({ env: tcb.SYMBOL_CURRENT_ENV })

src/server/function/twikoo/package.json

@@ -1,6 +1,6 @@
 {
  "name": "twikoo-func",
- "version": "1.6.32",
+ "version": "1.6.33",
  "description": "A simple comment system.",
  "author": "imaegoo <hello@imaegoo.com> (https://github.com/imaegoo)",
  "license": "MIT",
@@ -27,6 +27,7 @@
  "nodemailer": "^6.4.17",
  "pushoo": "latest",
  "tencentcloud-sdk-nodejs": "^4.0.65",
- "xml2js": "^0.6.0"
+ "xml2js": "^0.6.0",
+ "xss": "^1.0.15"
  }
 }

src/server/function/twikoo/utils/cloudflare.js

@@ -0,0 +1,7 @@
+function isInCloudflare () {
+ return typeof addEventListener === "function"
+}
+
+module.exports = {
+ isInCloudflare
+}

src/server/function/twikoo/utils/dom.js

@@ -0,0 +1,32 @@
+const { isInCloudflare } = require('./cloudflare')
+const xss = require('xss')
+
+let createDOMPurify, JSDOM
+
+if (!isInCloudflare()) {
+ createDOMPurify = require('dompurify') // 反 XSS
+ JSDOM = require('jsdom') // document.window 服务器版
+}
+
+function getXssPurify () {
+ return {
+ sanitize(input) {
+ return xss(input)
+ }
+ }
+}
+
+function getDomPurify () {
+ if (createDOMPurify) {
+ // 初始化反 XSS
+ const window = new JSDOM('').window
+ const DOMPurify = createDOMPurify(window)
+ return DOMPurify
+ } else {
+ return getXssPurify()
+ }
+}
+
+module.exports = {
+ getDomPurify
+}

src/server/function/twikoo/utils/import.js

@@ -1,5 +1,6 @@
 const { getRelativeUrl, normalizeMail } = require('.')
-const { marked, getDomPurify, md5 } = require('./lib')
+const { marked, md5 } = require('./lib')
+const { getDomPurify } = require('./dom')
 
 const fn = {
  // 兼容 Leancloud 两种 JSON 导出格式

src/server/function/twikoo/utils/index.js

@@ -1,9 +1,15 @@
 const { URL } = require('url')
-const { axios, FormData, bowser, ipToRegion, md5 } = require('./lib')
+const { axios, FormData, bowser, md5 } = require('./lib')
 const { RES_CODE } = require('./constants')
-const ipRegionSearcher = ipToRegion.create() // 初始化 IP 属地
 const logger = require('./logger')
 
+let ipRegionSearcher
+
+// IP 属地查询
+function getIpRegionSearcher () {
+ return ipRegionSearcher ?? (ipRegionSearcher = require('@imaegoo/node-ip2region').create())
+}
+
 const fn = {
  // 获取 Twikoo 云函数版本
  getFuncVersion (VERSION) {
@@ -119,7 +125,7 @@ const fn = {
  ip = ip.replace(/^::ffff:/, '')
  // Zeabur 返回的地址带端口号，去掉端口号。TODO: 不知道该怎么去掉 IPv6 地址后面的端口号
  ip = ip.replace(/:[0-9]*$/, '')
- const { region } = ipRegionSearcher.binarySearchSync(ip)
+ const { region } = getIpRegionSearcher().binarySearchSync(ip)
  const [country,, province, city, isp] = region.split('|')
  // 有省显示省，没有省显示国家
  const area = province.trim() && province !== '0' ? province : country

src/server/function/twikoo/utils/lib.js

@@ -2,38 +2,22 @@ const $ = require('cheerio') // jQuery 服务器版
 const { AkismetClient } = require('akismet-api') // 反垃圾 API
 const CryptoJS = require('crypto-js') // 编解码
 const FormData = require('form-data') // 图片上传
-const { JSDOM } = require('jsdom') // document.window 服务器版
 const axios = require('axios') // 发送 REST 请求
 const bowser = require('bowser') // UserAgent 格式化
-const createDOMPurify = require('dompurify') // 反 XSS
-const ipToRegion = require('@imaegoo/node-ip2region') // IP 属地查询
 const marked = require('marked') // Markdown 解析
 const md5 = require('blueimp-md5') // MD5 加解密
-const nodemailer = require('nodemailer') // 发送邮件
 const pushoo = require('pushoo').default // 即时消息通知
-const tencentcloud = require('tencentcloud-sdk-nodejs') // 腾讯云 API NODEJS SDK
 const xml2js = require('xml2js') // XML 解析
 
-function getDomPurify () {
- // 初始化反 XSS
- const window = new JSDOM('').window
- const DOMPurify = createDOMPurify(window)
- return DOMPurify
-}
-
 module.exports = {
  $,
  AkismetClient,
  CryptoJS,
  FormData,
  axios,
  bowser,
- getDomPurify,
- ipToRegion,
  marked,
  md5,
- nodemailer,
  pushoo,
- tencentcloud,
  xml2js
 }

src/server/function/twikoo/utils/spam.js

@@ -1,9 +1,19 @@
 const {
  AkismetClient,
  CryptoJS,
- tencentcloud
 } = require('./lib')
 const logger = require('./logger')
+let tencentcloud
+
+function getTencentCloud () {
+ if (tencentcloud) return tencentcloud
+ try {
+ tencentcloud = require('tencentcloud-sdk-nodejs') // 腾讯云 API NODEJS SDK
+ } catch (e) {
+ logger.log('加载 "tencentcloud-sdk-nodejs" 失败', e)
+ }
+ return tencentcloud
+}
 
 const fn = {
  // 后垃圾评论检测
@@ -15,7 +25,7 @@
  isSpam = true
  } else if (config.QCLOUD_SECRET_ID && config.QCLOUD_SECRET_KEY) {
  // 腾讯云内容安全
- const client = new tencentcloud.tms.v20200713.Client({
+ const client = new getTencentCloud().tms.v20200713.Client({
  credential: { secretId: config.QCLOUD_SECRET_ID, secretKey: config.QCLOUD_SECRET_KEY },
  region: 'ap-shanghai',
  profile: { httpProfile: { endpoint: 'tms.tencentcloudapi.com' } }

src/server/self-hosted/index.js

@@ -13,7 +13,6 @@ const Lfsa = require('lokijs/src/loki-fs-structured-adapter')
 const { v4: uuidv4 } = require('uuid') // 用户 id 生成
 const {
  $,
- getDomPurify,
  md5,
  xml2js
 } = require('twikoo-func/utils/lib')
@@ -49,6 +48,7 @@ const { postCheckSpam } = require('twikoo-func/utils/spam')
 const { sendNotice, emailTest } = require('twikoo-func/utils/notify')
 const { uploadImage } = require('twikoo-func/utils/image')
 const logger = require('twikoo-func/utils/logger')
+const { getDomPurify } = require('twikoo-func/utils/dom')
 
 const DOMPurify = getDomPurify()
 

src/server/vercel/api/index.js

@@ -12,7 +12,6 @@ const { v4: uuidv4 } = require('uuid') // 用户 id 生成
 const {
  $,
  axios,
- getDomPurify,
  md5,
  xml2js
 } = require('twikoo-func/utils/lib')
@@ -48,6 +47,7 @@ const { postCheckSpam } = require('twikoo-func/utils/spam')
 const { sendNotice, emailTest } = require('twikoo-func/utils/notify')
 const { uploadImage } = require('twikoo-func/utils/image')
 const logger = require('twikoo-func/utils/logger')
+const { getDomPurify } = require('twikoo-func/utils/dom')
 
 const DOMPurify = getDomPurify()