docs: 更新CHANGELOG

Fixed #369

.github/workflows/docker.yml

@@ -31,4 +31,4 @@ jobs:
         with:
           push: true
           tags: ${{ secrets.DOCKERHUB_REPO }}
-          platforms: "linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x"
+          platforms: "linux/amd64,linux/arm64"

CHANGELOG.md

@@ -1,5 +1,45 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.8.17)
+* 5b33ae3 fix: 读取uid出错 (#369)
+* 7e4650c feat: env可自定义UA (#371)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.8.16)
+* 469a6dc fix: add getOneDynamicByDyid v1
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.8.15)
+* 7b6356a fix:  风控导致动态全为过时
+* d337fb2 fix: 查询动态详情的接口失效 (#349)
+* d9dba6f fix: Cannot read properties of null (reading 'is_liked')
+* eafa7c7 fix:  Cannot read properties of null (reading 'length') (#360)
+* e2976cc docs: 文档更新cookie获取方式 (#357)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.8.14)
+* f5bdd28 fix: update api getOneDynamicByDyid
+* cb6fad0 fix: get_dynamic_detail api  (#351)
+* 780a3a9 fix: update get_dynamic_detail api (#350)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.8.13)
+* addb9c6 fix: ghproxy.com->mirror.ghproxy.com (#333)
+* b86e756 fix: at错位
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.8.12)
+* 5d30178 ci: docker构建
+* 0c61070 fix: 评论并转发 (#259)
+* 6dfee7e fix: 出现帐号未登录错误时自动跳转下一个帐号
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
 ## 主要变化(2.8.11)
 * 6496a8f fix: fs.close
 

README.md

@@ -64,6 +64,35 @@
 
 #### 手动获取
 
+第一种
+进入[B站主页](https://www.bilibili.com/)点击个人头像进入个人主页获取Cookie用于登录
+
+Chrome浏览器:
+
+进入个人主页后
+1. `F12`打开控制台
+
+2. F5刷新
+
+3. 根据图中找到network/网络 搜索nav,点击找到的nav,点标头，下滑，找到COOKIE全部复制
+![image](doc/pic/getCookies2.png)
+
+注意！！！！！！！！！！！
+
+注意！！！！！！！！！！！
+
+注意！！！！！！！！！！！
+
+所有网页端获取的COOKIE，每次打开网页端时，都会有概率刷新COOKIE，点击退出账号则会退出当前COOKIE。可以利用Chrome内核的浏览器创建多用户，专门用于获取COOKIE。
+
+注意！！！！！！！！！！！
+
+注意！！！！！！！！！！！
+
+注意！！！！！！！！！！！
+
+
+第二种
 进入[B站主页](https://www.bilibili.com/)获取Cookie用于登录
 
 Chrome浏览器:

env.example.js

@@ -5,6 +5,7 @@ module.exports = Object.freeze({
      * - `NOTE` 帐号备注
      * - `NUMBER` 表示是第几个账号
      * - `CLEAR` 是否启用清理功能
+     * - `ACCOUNT_UA` 账号UA, 可在浏览器控制台输入 navigator.userAgent 查看
      * ## 高级功能
      * - `ENABLE_CHAT_CAPTCHA_OCR` 开启评论验证码识别 使用方法见README
      * - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
@@ -25,6 +26,7 @@ module.exports = Object.freeze({
         NOTE: "",
         NUMBER: 1,
         CLEAR: true,
+        ACCOUNT_UA: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
 
         ENABLE_CHAT_CAPTCHA_OCR: "",
         ENABLE_MULTIPLE_ACCOUNT: false,
@@ -59,7 +61,8 @@ module.exports = Object.freeze({
             NOTE: "",
             NUMBER: 1,
             CLEAR: true,
-            WAIT: 60 * 1000
+            WAIT: 60 * 1000,
+            ACCOUNT_UA: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36"
         }
     ],
 

lib/core/monitor.js

@@ -56,6 +56,9 @@ class Monitor extends Searcher {
             case 1001:
                 event_bus.emit('Turn_off_the_Monitor', '评论失败')
                 break;
+            case 1010:
+                event_bus.emit('Turn_off_the_Monitor', '已掉号')
+                break;
             case 1004:
                 event_bus.emit('Turn_off_the_Monitor', '需要输入验证码')
                 break
@@ -194,7 +197,6 @@ class Monitor extends Searcher {
                     case 1007:
                     case 1008:
                     case 1009:
-                    case 1010:
                     case 1011:
                     case 2002:
                     case 2003:
@@ -217,6 +219,7 @@ class Monitor extends Searcher {
                         is_outof_maxfollow = 2005
                         break;
                     case 1001:
+                    case 1010:
                     case 1004:
                     case 2001:
                     case 3001:
@@ -367,7 +370,7 @@ class Monitor extends Searcher {
             }
 
             /* 超过指定时间退出 */
-            if (now_ts - create_time > max_create_time * 86400) {
+            if (create_time && now_ts - create_time > max_create_time * 86400) {
                 log.info("筛选动态", `过时动态(https://t.bilibili.com/${dyid})`)
                 return false
             }
@@ -593,6 +596,10 @@ class Monitor extends Searcher {
                     .replace(
                         new RegExp(copy_chat[0], 'g'),
                         global_var.get("myUNAME") || '')
+            } else {
+                if (is_repost_then_chat) {
+                    chat = chat + relay_chat
+                }
             }
 
             status = await retryfn(
@@ -600,7 +607,7 @@ class Monitor extends Searcher {
                 [4],
                 () => bili.sendChatWithOcr(
                     rid,
-                    is_repost_then_chat ? relay_chat.split('//')[0] : chat,
+                    chat,
                     chat_type
                 )
             )
@@ -668,7 +675,11 @@ class Monitor extends Searcher {
             status = await retryfn(
                 5,
                 [3, 4],
-                () => bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)
+                () => bili.autoRelay(
+                    global_var.get("myUID"),
+                    dyid,
+                    relay_chat,
+                    ctrl)
             )
 
             if (status) {

lib/core/searcher.js

@@ -63,11 +63,11 @@ function parseDynamicCard(dynamic_detail_card) {
     /**临时储存单个动态中的信息 */
     let obj = {};
     const { desc, card, extension, extend_json = "{}", display = {} } = dynamic_detail_card
-        , { is_liked = 1, user_profile = {} } = desc
+        , { is_liked = 1, user_profile = {} } = desc || {}
         , { info = {} } = user_profile
         , cardToJson = strToJson(card)
         , extendjsonToJson = strToJson(extend_json)
-        , { add_on_card_info = [] } = display
+        , { add_on_card_info = [] } = display || {}
         , { item } = cardToJson;
     const dy_type2chat_type = new Map([[1, 17], [2, 11], [4, 17], [8, 1], [64, 12]]);
     /* 转发者的UID */
@@ -192,14 +192,14 @@ function parseDynamicCard(dynamic_detail_card) {
 function modifyDynamicRes(res) {
     const
         { data, code } = utils.strToJson(res),
-        { cards = [], has_more, offset } = data || {};
+        { cards, has_more, offset } = data || {};
 
     if (code !== 0) {
         log.error('处理动态数据', '获取动态数据出错,可能是访问太频繁 \n' + res);
         return null;
     }
 
-    if (!cards.length) {
+    if (cards == null || !cards || !cards.lengh) {
         log.warn('处理动态数据', '未找到任何动态信息')
     }
 

lib/net/api.bili.js

@@ -5,12 +5,7 @@ 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_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_GET_DYNAMIC_DETAIL_V: 'https://api.vc.bilibili.com/dynamic_svr/v{{v}}/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',
@@ -43,4 +38,4 @@ module.exports = Object.freeze({
     WEB_INTERFACE_CARD: 'https://api.bilibili.com/x/web-interface/card',
     WEB_INTERFACE_NAV_STAT: "https://api.bilibili.com/x/web-interface/nav/stat",
     WEB_INTERFACE_SEARCH_TYPE: 'https://api.bilibili.com/x/web-interface/search/type',
-})
+})

lib/net/bili.js

@@ -412,67 +412,45 @@ const bili_client = {
             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, `动态不存在`];
+    _getOneDynamicByDyid: new Line(
+        '获取一个动态的细节',
+        [
+            (dynamic_id) => get({
+                url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V.replace('{{v}}', 1),
+                config: { retry: false },
+                query: {
+                    dynamic_id
                 }
-            case 500207:
-                return [false, undefined, `该动态为包月充电专属可以给UP主充电后观看`];
-            default:
-                return [true, undefined, `获取动态数据出错:\n${responseText}`]
-        }
-    }),
+            }),
+            ...Array(10)
+                .fill(
+                    (dynamic_id) => get({
+                        url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL_V.replace('{{v}}', Math.floor(Math.random() * 10 ** 10)),
+                        config: { retry: false },
+                        query: {
+                            dynamic_id
+                        }
+                    })
+                )
+        ]
+        , responseText => {
+            const
+                res = strToJson(responseText),
+                { code, data } = res,
+                { card } = data || {};
+            switch (code) {
+                case 0:
+                    if (card && responseText.length > 100) {
+                        return [false, card, `ok`];
+                    } else {
+                        return [false, undefined, `获取动态数据异常:\n${responseText}`];
+                    }
+                case 500207:
+                    return [false, undefined, `该动态为包月充电专属可以给UP主充电后观看`];
+                default:
+                    return [true, undefined, `获取动态数据出错:\n${responseText}`]
+            }
+        }),
     /**
      * 获取一个动态的细节
      * @param {string} dynamic_id

lib/net/http.js

@@ -56,7 +56,7 @@ const DEFAULT_REDIRECT = false;
 /**错误尝试次数 */
 const DEFAULT_RETRY_TIMES = 6;
 /**Google Chrome */
-const DEFAULT_UA = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36';
+const DEFAULT_UA = process.env.ACCOUNT_UA || 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36';
 /**默认url编码 */
 const DEFAULT_CONTENT_TYPE = 'application/x-www-form-urlencoded; charset=UTF-8';
 /**

lib/update.js

@@ -68,7 +68,7 @@ async function update(isDdownload) {
             if (download_url.length) {
                 if (isDdownload) {
                     await try_for_each(download_url.entries(), async ([i, url]) => {
-                        let proxy_url = "https://ghproxy.com/";
+                        let proxy_url = "https://mirror.ghproxy.com/";
                         proxy_url += url
                         log.warn('自动下载', `切换代理${proxy_url}`)
                         await download(proxy_url, `latest_version${i}.zip`)

lib/utils.js

@@ -45,7 +45,7 @@ const utils = {
                     const obj = JSON.parse(str);
                     return typeof obj === 'object' ? obj : false
                 } catch (e) {
-                    utils.log.error("json解析", e)
+                    utils.log.error("json解析", e + "\n" + params)
                     return false;
                 }
             } else {

main.js

@@ -37,6 +37,7 @@ async function main() {
             process.env.NUMBER = acco.NUMBER;
             process.env.CLEAR = acco.CLEAR;
             process.env.NOTE = acco.NOTE;
+            process.env.ACCOUNT_UA = acco.ACCOUNT_UA;
             const err_msg = await main();
             if (err_msg) {
                 return err_msg

package.json

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