docs: 更新CHANGELOG

Fixed #293

.github/workflows/pkg.yml

@@ -49,7 +49,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           file: "dist/*.zip"
-          delete_file: "dist/*.zip"
           tag_name: "v2"
           overwrite: true
   arm64:
@@ -78,6 +77,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
         with:
           file: "dist/*.zip"
-          delete_file: "dist/*.zip"
           tag_name: "v2"
           overwrite: true

CHANGELOG.md

@@ -1,5 +1,55 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.8.0)
+* 2f935bb chore: update env.js
+* eec22ff feat: 验证码自动识别
+* 909fb83 chore: update qinglong script
+* 41b0369 ci: fix pkg.yml
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.11)
+* 5a3c16d fix: 专栏获取内容不正确，需要排除推荐内容 (#293)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.10)
+* 29645bc fixed: 话题搜索功能已失效 #285
+* d950a59 fix: is_imitator导致错误评论
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.9)
+* 3828a0f fix: Cannot read properties of null (#284)
+* 67313f4 feat: 专栏里的动态链接识别优化 (#283)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.8)
+* ad6af97 feat: 专栏短链接识别 (#263)
+* b6c56c5 feat:  取关分区支持设置多分区 (#281)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.7)
+* 2426fe2 fix: 动态详情获取接口412频繁 (#279)
+* d370fef fix: 获取动态详情出现undefined (#271)
+* 00174b0 fix(monitor): L615
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.6)
+* 881923b fix: 开奖时间和粉丝数判断逻辑 (#253)
+* 097e2d6 fix: 筛选掉置顶的评论，与该动态UP的评论 (#252)
+* 82d285e fix:  充电专属动态 (#251)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.7.5)
+* 9c9bc18 fix:  查询评论报错 (#250)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
 ## 主要变化(2.7.4)
 * 0630c89 feat: 新增设置抄热评屏蔽词 (#239)
 * 7b9d251 feat: 热评包含发送热评的人的昵称换成自己的昵称 (#239)

README.md

@@ -8,11 +8,12 @@
       - [以源码方式运行](#以源码方式运行)
     - [Docker](#docker)
     - [青龙面板](#青龙面板)
-  - [防重复转发(可选)](#防重复转发可选)
   - [检测中奖](#检测中奖)
     - [检测未读信息, 已读未读信息](#检测未读信息-已读未读信息)
-    - [中奖推送(可选)](#中奖推送可选)
+    - [中奖推送](#中奖推送)
   - [设置说明](#设置说明)
+    - [评论验证码识别](#评论验证码识别)
+    - [其他](#其他)
   - [Awesome](#awesome)
 
 [Github仓库链接](https://github.com/shanmiteko/LotteryAutoScript)
@@ -145,14 +146,6 @@ Chrome浏览器:
 
 ----------------------------------------
 
-## 防重复转发(可选)
-
-- 脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中
-
-- 是否点赞
-
-----------------------------------------
-
 ## 检测中奖
 
 ### 检测未读信息, 已读未读信息
@@ -165,7 +158,7 @@ Chrome浏览器:
 
 关键词有限 可能会有**漏掉**的或**误报**
 
-### 中奖推送(可选)
+### 中奖推送
 
 > 填写在env.js内
 
@@ -204,6 +197,12 @@ Chrome浏览器:
 
 ## 设置说明
 
+### 评论验证码识别
+
+[点击跳转](doc/chat_captcha_orc.md)
+
+### 其他
+
 详见[env.example.js](./env.example.js)文件内部注释
 
 详见[my_config.example.js](./my_config.example.js)文件内部注释

doc/chat_captcha_orc.md

@@ -0,0 +1,13 @@
+使用此功能前需启动OCR服务
+
+## 拉取镜像
+```
+docker pull shanmite/ocr_api_server
+```
+## 启动容器
+```
+docker run -p 9898:9898 -d ocr_api_server
+```
+
+### 非docker启动方式
+[ocr_api_server](https://github.com/shanmiteko/ocr_api_server)

env.example.js

@@ -5,11 +5,14 @@ module.exports = Object.freeze({
      * - `NOTE` 帐号备注
      * - `NUMBER` 表示是第几个账号
      * - `CLEAR` 是否启用清理功能
+     * ## 高级功能
+     * - `ENABLE_CHAT_CAPTCHA_OCR` 开启评论验证码识别 使用方法见README
      * - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
-     * - `MULTIPLE_ACCOUNT_PARM` 多账号参数(JSON格式)
+     * - `MULTIPLE_ACCOUNT_PARM` 多账号参数(JSON格式) <不推荐使用
      * ## 调试相关
      * - `LOTTERY_LOG_LEVEL` 输出日志等级 Error<Warn<Info<Debug 1<2<3<4
      * - `NOT_GO_LOTTERY` 关闭抽奖行为
+     * 
      * ## 多账号
      * 1. 将 ENABLE_MULTIPLE_ACCOUNT 的值改为true
      * 2. 将账号信息依次填写于 multiple_account_parm 中, 参考例子类推
@@ -23,6 +26,7 @@ module.exports = Object.freeze({
         NUMBER: 1,
         CLEAR: true,
 
+        ENABLE_CHAT_CAPTCHA_OCR: "",
         ENABLE_MULTIPLE_ACCOUNT: false,
 
         MULTIPLE_ACCOUNT_PARM: "",

lib/clear.js

@@ -6,12 +6,13 @@ const config = require("./data/config");
 
 /**
  * 获取关注分区里的uid
+ * @param {string} partition
  * @returns { Promise<number[]> }
  */
-async function getFollowList() {
+async function getFollowList(partition) {
     const
-        { clear_partition, clear_white_list, get_partition_wait } = config,
-        tagid = await bili.checkMyPartition(clear_partition);
+        { clear_white_list, get_partition_wait } = config,
+        tagid = await bili.checkMyPartition(partition);
     let rmup = [];
     if (typeof tagid === 'undefined') {
         log.info('获取关注列表', '未能成功获取关注分区id');
@@ -32,9 +33,9 @@ async function getFollowList() {
  * 清理动态和关注
  */
 async function clear() {
-    const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type } = config;
+    const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type, clear_partition } = config;
     let success = true;
-    const uid_list = await getFollowList();
+    const uid_list = (await Promise.all(clear_partition.split(',').map(getFollowList))).flat();
     if (!uid_list.length) {
         log.info('清理关注', `关注为空`)
     } else {

lib/core/monitor.js

@@ -91,12 +91,6 @@ class Monitor extends Searcher {
             case 5001:
                 event_bus.emit('Turn_off_the_Monitor', '转发失败')
                 break
-            case 6001:
-                event_bus.emit('Turn_off_the_Monitor', '获取开奖时间失败')
-                break
-            case 7001:
-                event_bus.emit('Turn_off_the_Monitor', '获取关注数失败')
-                break
             default:
                 event_bus.emit('Turn_off_the_Monitor', `??? 未知错误: ${status}`)
                 break;
@@ -135,9 +129,16 @@ class Monitor extends Searcher {
                 if (lottery.isOfficialLottery) {
                     let { ts } = await bili.getLotteryNotice(lottery.dyid);
                     const ts_10 = Date.now() / 1000;
-                    if (ts < 0) {
-                        status = 6001
-                        break;
+                    if (ts === -1) {
+                        log.warn('过滤', '无法判断开奖时间')
+                        await delay(filter_wait)
+                        continue
+                    }
+                    if (ts === -9999) {
+                        log.info('过滤', '已撤销抽奖')
+                        d_storage.updateDyid(lottery.dyid)
+                        await delay(filter_wait)
+                        continue
                     }
                     if (ts < ts_10) {
                         log.info('过滤', '已过开奖时间')
@@ -155,9 +156,10 @@ class Monitor extends Searcher {
                     const { minfollower } = config
                     if (minfollower > 0) {
                         const followerNum = await bili.getUserInfo(lottery.uid[0]);
-                        if (followerNum < 0) {
-                            status = 7001
-                            break;
+                        if (followerNum === -1) {
+                            log.warn('过滤', `粉丝数(${followerNum})获取失败`)
+                            await delay(filter_wait)
+                            continue
                         }
                         if (followerNum < minfollower) {
                             log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
@@ -394,8 +396,7 @@ class Monitor extends Searcher {
                     || (hasOfficialLottery && model[0] === '1')
                     || (!hasOfficialLottery && model[1] === '1' && has_key_words),
                 isSendChat =
-                    (is_imitator && lottery_info_type === 'uid' && chatmodel !== '00')
-                    || (hasOfficialLottery && chatmodel[0] === '1')
+                    (hasOfficialLottery && chatmodel[0] === '1')
                     || (!hasOfficialLottery && chatmodel[1] === '1'),
                 { blacklist: remote_blacklist } = use_public_blacklist === false
                     ? { blacklist: "" }
@@ -486,7 +487,7 @@ class Monitor extends Searcher {
 
                 let
                     /**转发评语 */
-                    RandomStr = getRandomOne(relays)
+                    RandomStr = (getRandomOne(relays) || "!!!")
                         .replace(/\$\{uname\}/g, uname_map[real_uid] || uname),
                     /**控制字段 */
                     new_ctrl = [];
@@ -539,7 +540,7 @@ class Monitor extends Searcher {
                 /* 是否评论 */
                 if (isSendChat) {
                     onelotteryinfo.rid = rid
-                    onelotteryinfo.chat = getRandomOne(chats)
+                    onelotteryinfo.chat = (getRandomOne(chats) || "!!!")
                         .replace(/\$\{uname\}/g, uname_map[real_uid] || uname)
                 }
 
@@ -601,18 +602,17 @@ class Monitor extends Searcher {
                 const copy_chat = getRandomOne(
                     (await bili.getChat(rid, chat_type))
                         .filter(it => !(new RegExp(copy_blockword.join('|')).test(it[1])))
-                );
+                ) || [";;;;;;;;;", chat || "!!!"];
                 chat = copy_chat[1]
                     .replace(
                         new RegExp(copy_chat[0], 'g'),
                         global_var.get("myUNAME") || '')
-                    || "!!!"
             }
 
             status = await retryfn(
                 6,
-                [4, 8, 9],
-                () => bili.sendChat(
+                [4],
+                () => bili.sendChatWithOcr(
                     rid,
                     is_repost_then_chat ? relay_chat.split('//')[0] : chat,
                     chat_type
@@ -621,7 +621,7 @@ class Monitor extends Searcher {
 
             if (status === 8 ||
                 status === 9) {
-                status = await bili.sendChat(
+                status = await bili.sendChatWithOcr(
                     rid,
                     "[doge][doge][doge][doge][doge]",
                     chat_type

lib/core/searcher.js

@@ -110,8 +110,12 @@ function parseDynamicCard(dynamic_detail_card) {
     obj.hasOfficialLottery = extension && extension.lott && true;
     /* 转发者的描述 纯文字内容 图片动态描述 后两个分别是视频动态的描述和视频本身的描述*/
     obj.description =
-        (item && (item.content || '' + item.description || ''))
-        || (cardToJson.dynamic || '' + cardToJson.desc || '')
+        (item && ((item.content || '') + (item.description || '')))
+        || (
+            (cardToJson.dynamic || '')
+            + (cardToJson.desc || '')
+            + (cardToJson.vest && cardToJson.vest.content || '')
+        )
         || '';
     /* 转发 */
     if (obj.type === 1) {
@@ -182,6 +186,12 @@ function modifyDynamicRes(res) {
         log.warn('处理动态数据', '未找到任何动态信息')
     }
 
+    if (typeof has_more === "undefined"
+        && typeof offset === "undefined") {
+        log.error('处理动态数据', '该功能已失效');
+        return null;
+    }
+
     const
         /**
          * 字符串offset防止损失精度
@@ -349,6 +359,8 @@ class Searcher {
      * @returns {Promise<LotteryInfo[] | null>}
      */
     async getLotteryInfoByTag(tag_name) {
+        log.info('获取动态', `开始获取带话题#${tag_name}#的动态信息`);
+
         const
             tag_id = await bili.getTagIDByTagName(tag_name),
             hotdy = await bili.getHotDynamicInfoByTagID(tag_id),
@@ -356,7 +368,6 @@ class Searcher {
 
         if (modDR === null) return null;
 
-        log.info('获取动态', `开始获取带话题#${tag_name}#的动态信息`);
         log.info('获取动态', '成功获取热门动态');
 
         /**
@@ -421,13 +432,16 @@ class Searcher {
                 continue
             }
             const
-                content = await bili.getOneArticleByCv(id),
-                dyids = content.match(/(?<=t.bilibili.com\/)[0-9]+/g) || [],
-                dyids_set = [...new Set(dyids)],
+                content = (await bili.getOneArticleByCv(id) || "").split("推荐文章")[0],
+                dyids = content.match(/[0-9]{18}/g) || [],
+                short_ids = content.match(/(?<=b23.tv\/)[a-zA-Z0-9]{7}/g) || [],
+                short_id_set = [...new Set(short_ids)],
+                short_ids_to_dyids = await Promise.all(short_id_set.map(bili.shortDynamicIdToDyid)),
+                dyid_set = [...new Set([...dyids, ...short_ids_to_dyids])],
                 /**判断此专栏是否查看过的权重 */
-                weight = dyids_set.length / 2;
+                weight = dyid_set.length / 2;
 
-            let { length } = dyids_set,
+            let { length } = dyid_set,
                 /**初始权重 */
                 _weight = 0,
                 /**单个专栏中的dyid */
@@ -435,8 +449,9 @@ class Searcher {
             log.info('获取动态', `提取专栏(${id})中提及的dyid(${length})`)
 
             /**遍历某专栏中的dyids */
-            for (const dyid of dyids_set) {
-                if (dyid.length === utils.dyid_length) {
+            for (const dyid of dyid_set) {
+                if (typeof dyid === "string"
+                    && dyid.length === utils.dyid_length) {
 
                     log.info('获取动态', `查看专栏中所提及动态(${dyid}) (${length--})`)
                     const card = await bili.getOneDynamicByDyid(dyid)

lib/net/api.bili.js

@@ -5,7 +5,12 @@ module.exports = Object.freeze({
     DYNAMIC_REPOST_SHARE: 'https://api.vc.bilibili.com/dynamic_repost/v1/dynamic_repost/share',
     DYNAMIC_SVR_CREATE_DRAW: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create_draw',
     DYNAMIC_SVR_CREATE: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create',
-    DYNAMIC_SVR_GET_DYNAMIC_DETAIL: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V2: 'https://api.vc.bilibili.com/dynamic_svr/v2/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V3: 'https://api.vc.bilibili.com/dynamic_svr/v3/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V4: 'https://api.vc.bilibili.com/dynamic_svr/v4/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V5: 'https://api.vc.bilibili.com/dynamic_svr/v5/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V6: 'https://api.vc.bilibili.com/dynamic_svr/v6/dynamic_svr/get_dynamic_detail',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V7: 'https://api.vc.bilibili.com/dynamic_svr/v7/dynamic_svr/get_dynamic_detail',
     DYNAMIC_SVR_RM_DYNAMIC: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/rm_dynamic',
     DYNAMIC_SVR_SPACE_HISTORY: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history',
     FEED_GET_ATTENTION_LIST: 'https://api.vc.bilibili.com/feed/v1/feed/get_attention_list',
@@ -27,6 +32,7 @@ module.exports = Object.freeze({
     SESSION_SVR_GET_SESSIONS: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions',
     SESSION_SVR_SINGLE_UNREAD: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/single_unread',
     SESSION_SVR_UPDATE_ACK: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack',
+    SHORTLINK: 'https://b23.tv/{{short_id}}',
     SPACE_MYINFO: 'https://api.bilibili.com/x/space/myinfo',
     TAG_INFO: 'https://api.bilibili.com/x/tag/info',
     TOP_FEED_RCMD: "https://api.bilibili.com/x/web-interface/index/top/feed/rcmd",

lib/net/bili.js

@@ -1,5 +1,5 @@
 const GlobalVar = require('../data/global_var');
-const { strToJson, log } = require('../utils');
+const { strToJson, log, ocr, hasEnv } = require('../utils');
 const { send } = require('./http');
 const API = require('./api.bili');
 
@@ -117,7 +117,7 @@ function post({ url, config, contents, query }) {
             config,
             headers: {
                 "accept": 'application/json, text/plain, */*',
-                "content-type": 'application/x-www-form-urlencoded; charset=utf-8',
+                "content-type": 'application/x-www-form-urlencoded; charset=UTF-8',
                 "cookie": GlobalVar.get("cookie")
             },
             query,
@@ -378,31 +378,90 @@ const bili_client = {
             return null;
         }
     },
+    /**
+     * @param {string} short_id 
+     * @returns {Promise<string>}
+     */
+    async shortDynamicIdToDyid(short_id) {
+        return get({
+            url: API.SHORTLINK.replace('{{short_id}}', short_id),
+            config: {
+                redirect: false,
+            }
+        }).then(a => {
+            const dyid = (a.match(/[0-9]{18}/) || [])[0];
+            log.info("短连接转换", `${short_id} -> ${dyid}`)
+            return dyid
+        })
+    },
+    _getOneDynamicByDyid: new Line('获取一个动态的细节', [
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V2,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V3,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V4,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V5,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V6,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+        (dynamic_id) => get({
+            url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V7,
+            config: { retry: false },
+            query: {
+                dynamic_id
+            }
+        }),
+    ], responseText => {
+        const
+            res = strToJson(responseText),
+            { code, data } = res,
+            { card } = data || {};
+        switch (code) {
+            case 0:
+                if (card) {
+                    return [false, card, `ok`];
+                } else {
+                    return [false, undefined, `动态不存在`];
+                }
+            case 500207:
+                return [false, undefined, `该动态为包月充电专属可以给UP主充电后观看`];
+            default:
+                return [true, undefined, `获取动态数据出错:\n${responseText}`]
+        }
+    }),
     /**
      * 获取一个动态的细节
      * @param {string} dynamic_id
      * @return {Promise<JSON>} 失败返回undefined
      */
     async getOneDynamicByDyid(dynamic_id) {
-        const
-            responseText = await get({
-                url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL,
-                query: {
-                    dynamic_id
-                }
-            }),
-            { code, data } = strToJson(responseText),
-            { card } = data || {};
-        if (code !== 0) {
-            log.error('获取一个动态的细节', `获取动态(${dynamic_id})数据出错:\n${responseText}`);
-            return;
-        }
-        if (!card) {
-            log.warn('获取一个动态的细节', `动态(${dynamic_id})不存在`);
-            return;
-        }
-        log.info('获取一个动态的细节', `动态id(${dynamic_id})`);
-        return card;
+        return this._getOneDynamicByDyid.run(dynamic_id)
     },
     /**
      * 获取一组动态的信息
@@ -572,7 +631,7 @@ const bili_client = {
         if (res.code === 0) {
             return [false, res.data.follower, 'ok'];
         } else {
-            return [true, 1, `出错 可能是访问过频繁\n${responseText}`]
+            return [true, -1, `出错 可能是访问过频繁\n${responseText}`]
         }
     }),
     /**
@@ -588,7 +647,7 @@ const bili_client = {
      * @param {string} dyid
      * 动态id
      * @typedef LotteryNotice
-     * @property {number | -1} ts
+     * @property {number} ts
      * @returns {Promise<LotteryNotice>} 开奖时间
      */
     async getLotteryNotice(dyid) {
@@ -600,15 +659,21 @@ const bili_client = {
                 }
             }),
             res = strToJson(responseText);
-        if (res.code === 0) {
-            return {
-                ts: res.data.lottery_time
-            };
-        } else {
-            log.error('获取开奖信息', `失败\n${responseText}`);
-            return {
-                ts: -1
-            };
+        switch (res.code) {
+            case 0:
+                return {
+                    ts: res.data.lottery_time
+                };
+            case -9999:
+                log.warn('获取开奖信息', `${dyid}已撤销抽奖`);
+                return {
+                    ts: -9999
+                };
+            default:
+                log.error('获取开奖信息', `${dyid}失败\n${responseText}`);
+                return {
+                    ts: -1
+                };
         }
     },
     _autoAttention: new Line('自动关注', [
@@ -985,15 +1050,16 @@ const bili_client = {
      * cid_str
      * @param {string} msg
      * @param {number} type
+     * @param {string} code
      * 1(视频)
      * 11(有图)
      * 17(无图)
-     * @returns {Promise<number>}
+     * @returns {Promise<number|string>}
      * - 成功 0
      * - 未知错误 1
      * - 原动态已删除 2
      * - 评论区已关闭 3
-     * - 需要输入验证码 4
+     * - 需要输入验证码 4 -> url
      * - 已被对方拉入黑名单 5
      * - 黑名单用户无法互动 6
      * - UP主已关闭评论区 7
@@ -1001,8 +1067,9 @@ const bili_client = {
      * - 重复评论 9
      * - 帐号未登录 10
      * - 关注UP主7天以上的人可发评论 11
+     * - 验证码错误 12
      */
-    async sendChat(rid, msg, type) {
+    async sendChat(rid, msg, type, code) {
         const
             responseText = await post({
                 url: API.REPLY_ADD,
@@ -1010,6 +1077,7 @@ const bili_client = {
                     oid: rid,
                     type: type,
                     message: msg,
+                    code,
                     csrf: GlobalVar.get("csrf")
                 }
             }),
@@ -1026,7 +1094,7 @@ const bili_client = {
                 return 3;
             case 12015:
                 log.error('自动评论', '需要输入验证码');
-                return 4;
+                return res.data.url;
             case 12035:
                 log.error('自动评论', `已被对方拉入黑名单`);
                 return 5;
@@ -1048,11 +1116,77 @@ const bili_client = {
             case 12078:
                 log.error('自动评论', '关注UP主7天以上的人可发评论');
                 return 11;
+            case 12073:
+                log.error('自动评论', '验证码错误');
+                return 12;
             default:
                 log.error('自动评论', `未知错误\n${responseText}`);
                 return 1;
         }
     },
+    /**
+     * 发送评论 自动识别验证码
+     * @param {string} rid
+     * cid_str
+     * @param {string} msg
+     * @param {number} type
+     * 1(视频)
+     * 11(有图)
+     * 17(无图)
+     * @returns {Promise<number>}
+     * - 成功 0
+     * - 未知错误 1
+     * - 原动态已删除 2
+     * - 评论区已关闭 3
+     * - 需要输入验证码 4 -> url
+     * - 已被对方拉入黑名单 5
+     * - 黑名单用户无法互动 6
+     * - UP主已关闭评论区 7
+     * - 评论内容包含敏感信息 8
+     * - 重复评论 9
+     * - 帐号未登录 10
+     * - 关注UP主7天以上的人可发评论 11
+     * - 验证码错误 12
+     */
+    async sendChatWithOcr(rid, msg, type) {
+        let need_captcha = false;
+        let url = "";
+        let status = 0;
+        do {
+            if (need_captcha) {
+                const code = await ocr(url);
+                if (code) {
+                    log.info("验证码识别", `${url} -> ${code}`);
+                    status = await bili_client.sendChat(
+                        rid,
+                        msg,
+                        type,
+                        code
+                    );
+                    if (status === 0) {
+                        need_captcha = false
+                    } else if (status === 12) {
+                        need_captcha = true
+                    } else {
+                        need_captcha = false
+                    }
+                }
+            } else {
+                url = await bili_client.sendChat(
+                    rid,
+                    msg,
+                    type
+                )
+                if (typeof url === "string"
+                    && hasEnv("ENABLE_CHAT_CAPTCHA_OCR")) {
+                    need_captcha = true
+                } else {
+                    status = url
+                }
+            }
+        } while (need_captcha);
+        return status;
+    },
     /**
      * 查询评论
      * @param {*} rid
@@ -1073,7 +1207,10 @@ const bili_client = {
             case 0:
                 log.info('查询评论', `成功`);
                 try {
-                    return res.data.replies.map(it => [it.member.uname, it.content.message]);
+                    const upmid = res.data.upper.mid;
+                    return res.data.replies
+                        .filter(it => it.mid !== upmid)
+                        .map(it => [it.member.uname, it.content.message]);
                 } catch (_) {
                     return []
                 }
@@ -1100,7 +1237,7 @@ const bili_client = {
         if (res.code === 0) {
             const data = res.data.filter((it) => it.name === name);
             if (data.length) {
-                log.info('获取分区id', '成功');
+                log.info('获取分区id', `成功 ${name}`);
                 tagid = data[0].tagid;
             } else {
                 log.warn('获取分区id', `失败 无指定分区名${name}`);
@@ -1167,10 +1304,10 @@ const bili_client = {
             res.data.forEach(d => {
                 uids.push(d.mid);
             });
-            log.info(`获取分组${tagid}`, `成功获取取关分区列表${n}`);
+            log.info(`获取分组id${tagid}`, `成功获取取关分区列表${n}`);
             return uids;
         } else {
-            log.error(`获取分组${tagid}`, `获取取关分区列表失败\n${responseText}`);
+            log.error(`获取分组id${tagid}`, `获取取关分区列表失败\n${responseText}`);
             return uids;
         }
     }

lib/utils.js

@@ -275,6 +275,29 @@ const utils = {
             }
         }
     },
+    /**
+     * 验证码识别
+     * @param {string} url 
+     * @returns {Promise<string>}
+     */
+    ocr(url) {
+        return new Promise((resolve) => {
+            send({
+                method: 'POST',
+                url: 'http://127.0.0.1:9898/ocr/url/text',
+                headers: {
+                    "content-type": 'application/x-www-form-urlencoded; charset=UTF-8',
+                },
+                contents: { url },
+                success: res => {
+                    resolve(res.body)
+                },
+                failure: () => {
+                    resolve()
+                }
+            })
+        })
+    },
     /**
      * 下载文件
      * @param {string} url

my_config.example.js

@@ -403,6 +403,7 @@ module.exports = Object.freeze({
         /**
          * - 取关分区
          * - 默认为: 此处存放因抽奖临时关注的up
+         * - 可用逗号分割以取关多分区
          */
         clear_partition: '',
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottery-auto-script",
-  "version": "2.7.4",
+  "version": "2.8.0",
   "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {

script/build/changelog.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # version: <major.minor.patch>
-level=patch
+level=minor
 
 npm version $level \
     --no-commit-hooks \

script/docker/init.sh

@@ -82,6 +82,7 @@ if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
     docker run \\
         -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
         -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --network host \\
         --name \$NAME \\
         $DOCKER_REPO \\
         start
@@ -103,6 +104,7 @@ if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
     docker run \\
         -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
         -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --network host \\
         --name \$NAME \\
         $DOCKER_REPO \\
         check
@@ -124,6 +126,7 @@ if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
     docker run \\
         -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
         -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
+        --network host \\
         --name \$NAME \\
         $DOCKER_REPO \\
         clear
@@ -144,6 +147,7 @@ NAME=shanmite-lottery-debug
 echo "create temporary debug container"
 docker run \\
     -it \\
+    --network host \\
     --name \$NAME \\
     --entrypoint /bin/bash \\
     $DOCKER_REPO -c bash

script/qinglong/init.sh

@@ -2,6 +2,7 @@
 set -e
 
 NAME=LotteryAutoScript
+BRABCH=main
 
 # 视网络情况选择链接
 GIT_REPO=https://github.com/shanmiteko/${NAME}.git
@@ -12,7 +13,7 @@ if [ -d "$NAME" ]; then
     git pull
     cd ..
 else
-    git clone $GIT_REPO $NAME --depth=1
+    git clone -b $BRABCH $GIT_REPO $NAME
 fi
 
 if [ -f "$NAME/my_config.js" ]; then

test/api.test.js

@@ -1,11 +1,12 @@
 const assert = require('assert');
 const bili_client = require("../lib/net/bili");
 const util = require('./util');
+const { parseDynamicCard } = require('../lib/core/searcher');
 
 (async () => {
     assert(await bili_client.getMyinfo());
 
-    await util.par_run([0, 1, 2, 3, 4, 6], [
+    await util.par_run([0, 3], [
         // 0
         async () => {
             assert.equal((await bili_client.getTopRcmd()).length, 10)
@@ -13,7 +14,7 @@ const util = require('./util');
         // 1
         async () => {
             assert.equal(await bili_client.sendChat(
-                (await bili_client.getOneDynamicByDyid("692193323569381399")).desc.rid,
+                parseDynamicCard(await bili_client.getOneDynamicByDyid("692193323569381399")).rid_str,
                 "test",
                 11),
                 7
@@ -22,7 +23,7 @@ const util = require('./util');
         // 2
         async () => {
             assert.equal(await bili_client.sendChat(
-                (await bili_client.getOneDynamicByDyid("11229466874154064")).desc.rid,
+                parseDynamicCard(await bili_client.getOneDynamicByDyid("11229466874154064")).rid_str,
                 "test",
                 1),
                 3
@@ -43,7 +44,7 @@ const util = require('./util');
         // 6
         async () => {
             assert.equal(await bili_client.autolike("761391835139538967"), 4)
-        }
+        },
     ])
 
     console.log("api.test ... ok!");

test/article.test.js

@@ -0,0 +1,15 @@
+const assert = require('assert');
+const bili_client = require("../lib/net/bili");
+const util = require('./util');
+
+(async () => {
+    await util.par_run([], [
+        // 0
+        async () => {
+            let info = await bili_client.getOneArticleByCv(22112353);
+            let short_ids = [...new Set(info.match(/(?<=b23.tv\/)[a-zA-Z0-9]{7}/g) || [])];
+            assert.equal((await Promise.all(short_ids.map(bili_client.shortDynamicIdToDyid)))[0], "767357823884460033");
+        },
+    ])
+    console.log("article.test ... ok!");
+})()

test/dynamic_card.test.js

@@ -4,7 +4,7 @@ const searcher = require("../lib/core/searcher");
 const util = require('./util');
 
 (async () => {
-    await util.par_run([0, 1, 2, 3], [
+    await util.par_run([0, 1, 2, 3, 4, 5, 6], [
         // 0
         async () => {
             let info = await bili_client.getOneDynamicByDyid("728424890210713624");
@@ -29,10 +29,28 @@ const util = require('./util');
             assert(card.chat_type == 17)
             assert(card.origin_chat_type == 11)
         },
+        // 4
+        async () => {
+            assert.equal(await bili_client.getOneDynamicByDyid("111111111111111111"), undefined);
+            assert.notEqual(await bili_client.getOneDynamicByDyid("746824225190314008"), undefined);
+            assert.equal(await bili_client.getOneDynamicByDyid("761475750233636886"), undefined);
+        },
+        // 5
+        async () => {
+            let card = searcher.parseDynamicCard(await bili_client.getOneDynamicByDyid("762591475338838053"));
+            let chats = await bili_client.getChat(card.rid_str, card.chat_type)
+            assert.equal(chats.length, 19)
+            card = searcher.parseDynamicCard(await bili_client.getOneDynamicByDyid("762502724122050647"));
+            chats = await bili_client.getChat(card.rid_str, card.chat_type)
+            assert.equal(chats.filter(it => it[0] === '六的月').length, 0)
+        },
+        // 6
+        async () => {
+            const dy = await bili_client.getOneDynamicByDyid("774973685666676768");
+            const card = searcher.parseDynamicCard(dy)
+            assert.notEqual(card.description + "", undefined + "");
+        },
     ])
 
-
-
-
     console.log("dynamic_card.test ... ok!");
 })()

test/index.js

@@ -3,7 +3,7 @@ const global_var = require("../lib/data/global_var");
 const { log } = require('../lib/utils');
 const fs = require('fs');
 
-log._level = 1
+log._level = 4
 env.init()
 global_var.init(process.env["COOKIE"], 1)
 

test/ocr.test.js

@@ -0,0 +1,23 @@
+const assert = require('assert');
+const bili_client = require("../lib/net/bili");
+const util = require('./util');
+const { parseDynamicCard } = require('../lib/core/searcher');
+
+(async () => {
+    await util.par_run([], [
+        // 0
+        async () => {
+            assert(await bili_client.getMyinfo());
+
+            const rid = parseDynamicCard(await bili_client.getOneDynamicByDyid("551416252543796684")).rid_str;
+
+            for (let index = 0; index < 100; index++) {
+                console.log(index);
+                await bili_client.sendChatWithOcr(
+                    rid,
+                    Date.now().toString(),
+                    17,
+                )
+            }
+        },]);
+})()