feat: FlareSolverr

close #493

Author: Tsuk1ko

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## 2025
 
+### 10-01 v3.21.0
+
+- 方舟公招计职业 tag 没有显示干员两个字
+- 增大九宫图合并图片长宽上限
+- 支持使用 [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) 解决 ascii2d 或 nHentai 的 cf challenge [#493](../../issues/493)
+- 移除 `bot.cfTLSVersion` 配置及相关能力
+- 配置项变更
+  - A `flaresolverr`
+  - M `bot.getDoujinDetailFromNhentaiMirrorSite` 默认值 `"https://nhentai.xxx"` -> `""`
+  - D `bot.cfTLSVersion`
+
 ### 06-08 v3.20.2
 
 - 修复方舟公招计算漏掉了职业 tag 的问题

config.default.jsonc

@@ -74,13 +74,17 @@
     "useAscii2dWhenFailed": false,
     // 是否优先从本地上传图片到 ascii2d 搜索（否时使用 ascii2d 的 URL API）
     "ascii2dLocalUpload": false,
-    // 是否使用 Puppeteer 请求 ascii2d 以绕过 cf js challenge，详情请看“wiki-配置文件说明-使用 Puppeteer 绕过 cf js challenge”（启用时 ascii2dLocalUpload 配置将不生效）
+    // 是否使用 Puppeteer 请求 ascii2d 以绕过 cf js challenge，启用时 `ascii2dLocalUpload` 不生效，详情请看“wiki-配置文件说明-使用 Puppeteer 绕过 cf js challenge”
+    // 不再建议使用，建议使用 FlareSolverr，见设置项 `flaresolverr`
     "ascii2dUsePuppeteer": false,
     // saucenao 搜到本子时是否进一步去 nHentai 搜索
     "getDoujinDetailFromNhentai": true,
-    // nHentai 主站有 cf js challenge 无法直接搜索，可以配置使用镜像站搜索，但需注意镜像站收录本子的进度通常落后于主站，设置空字符串则去主站搜索
-    "getDoujinDetailFromNhentaiMirrorSite": "https://nhentai.xxx",
+    // 若 nHentai 主站有 cf js challenge 无法直接搜索，可以配置使用镜像站搜索，如 https://nhentai.xxx
+    // 但需注意镜像站收录本子的进度通常落后于主站，设置空字符串则去主站搜索
+    // 不再建议使用，建议使用 FlareSolverr，见设置项 `flaresolverr`
+    "getDoujinDetailFromNhentaiMirrorSite": "",
     // 是否使用 Puppeteer 请求 nHentai 以绕过 cf js challenge，试验阶段，目前可能不解决问题，使用 getDoujinDetailFromNhentaiMirrorSite 时该配置不生效，详情请看“wiki-配置文件说明-使用 Puppeteer 绕过 cf js challenge”
+    // 不再建议使用，建议使用 FlareSolverr，见设置项 `flaresolverr`
     "nHentaiUsePuppeteer": false,
     // 是否开启搜图反馈，成功接收图片会回复 bot.replys.searchFeedback，可用于判断图片是否被屏蔽
     "searchFeedback": false,
@@ -394,6 +398,19 @@
       "whiteGroup": []
     }
   },
+  // https://github.com/FlareSolverr/FlareSolverr
+  "flaresolverr": {
+    // API 地址
+    "url": "http://127.0.0.1:8191",
+    // 会话名，用于持久化，为空则不使用，不建议为空
+    "session": "cqps",
+    // 代理，见 FlareSolverr 文档；注意：请求缩略图会使用 `bot.proxy` 代理而不是这个代理
+    "proxy": null,
+    // 为 ascii2d 请求使用，启用时 `ascii2dLocalUpload` 不生效
+    "enableForAscii2d": false,
+    // 为 nHentai 请求使用
+    "enableForNHentai": false
+  },
   // saucenao 自定义 host，格式：[protocol://]host[:port]，不写明协议默认为 https
   "saucenaoHost": "saucenao.com",
   // saucenao APIKEY，必填，否则无法使用 saucenao 搜图

package.json

@@ -45,6 +45,7 @@
     "deep-freeze": "^0.0.1",
     "dotenv": "^16.3.1",
     "escape-string-regexp": "^5.0.0",
+    "flaresolverr-client": "^1.2.0",
     "form-data": "^3.0.1",
     "fs-extra": "^11.2.0",
     "get-stream": "^6.0.1",
@@ -71,12 +72,14 @@
     "random-seed": "^0.3.0",
     "remove-markdown": "^0.5.0",
     "socks-proxy-agent": "^7.0.0",
+    "tough-cookie": "^6.0.0",
     "url-join": "^5.0.0"
   },
   "devDependencies": {
     "@tsuk1ko/postversion": "^1.0.2",
     "@types/fs-extra": "^11.0.4",
     "@types/lodash-es": "^4.17.12",
+    "@types/node": "^22.18.8",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",

src/plugin/ascii2d.mjs

@@ -4,7 +4,9 @@ import FormData from 'form-data';
 import _ from 'lodash-es';
 import Axios from '../utils/axiosProxy.mjs';
 import CQ from '../utils/CQcode.mjs';
+import { flareSolverr } from '../utils/flaresolverr.mjs';
 import { getCqImg64FromUrl, getAntiShieldedCqImg64FromUrl } from '../utils/image.mjs';
+import { imgAntiShieldingFromArrayBuffer } from '../utils/imgAntiShielding.mjs';
 import logError from '../utils/logError.mjs';
 import { retryAsync } from '../utils/retry.mjs';
 import { confuseURL } from '../utils/url.mjs';
@@ -21,10 +23,9 @@ async function doSearch(img, snLowAcc = false) {
   const hosts = global.config.ascii2dHost;
   let host = hosts[hostsI++ % hosts.length];
   if (!/^https?:\/\//.test(host)) host = `https://${host}`;
-  const callApi = global.config.bot.ascii2dUsePuppeteer ? callAscii2dUrlApiWithPuppeteer : callAscii2dApi;
   const { colorURL, colorDetail } = await retryAsync(
     async () => {
-      const ret = await callApi(host, img);
+      const ret = await callAscii2dApi(host, img);
       const colorURL = ret.request.res.responseUrl;
       if (!colorURL.includes('/color/')) {
         const $ = Cheerio.load(ret.data, { decodeEntities: false });
@@ -41,9 +42,7 @@ async function doSearch(img, snLowAcc = false) {
     e => typeof e !== 'string' && String(_.get(e, 'response.data')).trim() === 'first byte timeout',
   );
   const bovwURL = colorURL.replace('/color/', '/bovw/');
-  const bovwDetail = await (global.config.bot.ascii2dUsePuppeteer ? getAscii2dWithPuppeteer : Axios.get)(bovwURL).then(
-    r => getDetail(r, host),
-  );
+  const bovwDetail = await requestGet(bovwURL).then(r => getDetail(r, host));
   const colorRet = await getResult(colorDetail, snLowAcc);
   const bovwRet = await getResult(bovwDetail, snLowAcc);
   return {
@@ -53,10 +52,26 @@ async function doSearch(img, snLowAcc = false) {
   };
 }
 
+function throwDeviceImageError() {
+  // eslint-disable-next-line no-throw-literal
+  throw '部分图片无法获取，如为转发请尝试保存后再手动发送，或使用其他设备手动发送';
+}
+
 /**
+ * @param {string} host
  * @param {MsgImage} img
  */
 async function callAscii2dApi(host, img) {
+  if (global.config.flaresolverr.enableForAscii2d) {
+    if (!img.isUrlValid) throwDeviceImageError();
+    return flareSolverr.get(`${host}/search/url/${img.url}`);
+  }
+
+  if (global.config.bot.ascii2dUsePuppeteer) {
+    if (!img.isUrlValid) throwDeviceImageError();
+    return getAscii2dWithPuppeteer(`${host}/search/url/${img.url}`);
+  }
+
   if (global.config.bot.ascii2dLocalUpload || !img.isUrlValid) {
     const path = await img.getPath();
     if (path) {
@@ -70,19 +85,17 @@ async function callAscii2dApi(host, img) {
     return Axios.get(`${host}/search/url/${img.url}`);
   }
 
-  // eslint-disable-next-line no-throw-literal
-  throw '部分图片无法获取，如为转发请尝试保存后再手动发送，或使用其他设备手动发送';
+  throwDeviceImageError();
 }
 
-/**
- * @param {MsgImage} img
- */
-function callAscii2dUrlApiWithPuppeteer(host, img) {
-  if (!img.isUrlValid) {
-    // eslint-disable-next-line no-throw-literal
-    throw '部分图片无法获取，如为转发请尝试保存后再手动发送，或使用其他设备手动发送';
+function requestGet(url) {
+  if (global.config.flaresolverr.enableForAscii2d) {
+    return flareSolverr.get(url);
   }
-  return getAscii2dWithPuppeteer(`${host}/search/url/${img.url}`);
+  if (global.config.bot.ascii2dUsePuppeteer) {
+    return getAscii2dWithPuppeteer(url);
+  }
+  return Axios.get(url);
 }
 
 async function getAscii2dWithPuppeteer(url) {
@@ -140,8 +153,12 @@ async function getResult({ url, title, author, thumbnail, author_url }, snLowAcc
   const texts = [CQ.escape(author ? `「${title}」/「${author}」` : title)];
   if (thumbnail && !(global.config.bot.hideImg || (snLowAcc && global.config.bot.hideImgWhenLowAcc))) {
     const mode = global.config.bot.antiShielding;
-    if (mode > 0) texts.push(await getAntiShieldedCqImg64FromUrl(thumbnail, mode));
-    else texts.push(await getCqImg64FromUrl(thumbnail));
+    if (global.config.flaresolverr.enableForAscii2d) {
+      const img = await flareSolverr.getImage(thumbnail);
+      texts.push(CQ.img64(mode > 0 ? await imgAntiShieldingFromArrayBuffer(img, mode) : img));
+    } else {
+      texts.push(mode > 0 ? await getAntiShieldedCqImg64FromUrl(thumbnail, mode) : await getCqImg64FromUrl(thumbnail));
+    }
   }
   if (url) texts.push(CQ.escape(confuseURL(url)));
   if (author_url) texts.push(`Author: ${CQ.escape(confuseURL(author_url))}`);

src/plugin/nhentai.mjs

@@ -1,6 +1,7 @@
 import * as Cheerio from 'cheerio';
 import NHentaiApi from 'nhentai-api';
 import Axios from '../utils/axiosProxy.mjs';
+import { flareSolverr } from '../utils/flaresolverr.mjs';
 
 const exts = {
   j: 'jpg',
@@ -29,7 +30,11 @@ async function getJsonWithPuppeteer(url) {
 }
 
 async function getDetailFromNHentaiAPI(name) {
-  const get = global.config.bot.nHentaiUsePuppeteer ? getJsonWithPuppeteer : Axios.get;
+  const get = global.config.flaresolverr.enableForNHentai
+    ? flareSolverr.getJSON
+    : global.config.bot.nHentaiUsePuppeteer
+      ? getJsonWithPuppeteer
+      : Axios.get;
   let json = await get(getSearchURL(`${name} chinese`)).then(r => r.data);
   if (json.result.length === 0) {
     json = await get(getSearchURL(name)).then(r => r.data);
@@ -48,7 +53,9 @@ async function getDetailFromWebsite(origin, name) {
 }
 
 async function _getDetailFromWebsite(origin, name) {
-  const { data } = await Axios.get(`${origin}/search/?q=${encodeURIComponent(name)}`, { responseType: 'text' });
+  const get = global.config.flaresolverr.enableForNHentai ? flareSolverr.get : Axios.get;
+
+  const { data } = await get(`${origin}/search/?q=${encodeURIComponent(name)}`, { responseType: 'text' });
   const $ = Cheerio.load(data);
 
   const gallery = $('.gallery').get(0);

src/setup/config.mjs

@@ -43,6 +43,7 @@ const noCheckPaths = new Set([
   'bot.chatgpt.prependMessages',
   'bot.chatgpt.additionParams',
   'bot.chatgpt.overrides',
+  'flaresolverr.proxy',
 ]);
 
 function recursiveCopy(c, dc, cc, dcc, parentPath = '') {

src/types/config.d.ts

@@ -2,6 +2,7 @@ export declare interface Config {
     autoUpdateConfig: boolean;
     cqws: Cqw;
     bot: Bot;
+    flaresolverr: Flaresolverr;
     saucenaoHost: string;
     saucenaoApiKey: string;
     whatanimeHost: string;
@@ -10,6 +11,14 @@ export declare interface Config {
     setuApiHost: string;
 }
 
+declare interface Flaresolverr {
+    url: string;
+    session: string;
+    proxy: object;
+    enableForAscii2d: boolean;
+    enableForNHentai: boolean;
+}
+
 declare interface Bot {
     debug: boolean;
     admin: number;

src/utils/CQcode.mjs

@@ -166,10 +166,13 @@ export default class CQ {
 
   /**
    * CQ码 Base64 图片
-   * @param {string} base64 图片 Base64
+   * @param {string|ArrayBuffer} base64 图片 Base64
    * @param {'flash'|'show'} [type] 类型
    */
   static img64(base64, type) {
+    if (typeof base64 !== 'string') {
+      base64 = Buffer.from(base64).toString('base64');
+    }
     return new CQ('image', { file: `base64://${base64}`, type }).toString();
   }