docs: 更新CHANGELOG

Fixed #185

.dockerignore

@@ -1,4 +1,9 @@
 **/**
 !lib/
+!script/
+!test/
+!main.js
 !package.json
-!main.js
+!env.example.js
+!my_config.example.js
+!README.md

.github/workflows/docker.yml

@@ -8,6 +8,7 @@ on:
       - "lib/**"
       - "*.js"
       - "*.json"
+      - ".github/workflows/docker.yml"
   workflow_dispatch:
 
 jobs:
@@ -16,13 +17,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Build and push
-        env:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          repo: ${{ secrets.DOCKERHUB_REPO }}
-        run: |
-          curl -fsSL https://get.docker.com | bash -s docker
-          docker build -t $repo .
-          docker login -p $password -u $username
-          docker push $repo
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          tags: ${{ secrets.DOCKERHUB_REPO }}
+          platforms: "linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/riscv64"

.github/workflows/mirror.yml

@@ -0,0 +1,20 @@
+name: Mirror and run GitLab CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Mirror + trigger CI
+      uses: SvanBoxel/gitlab-mirror-and-ci-action@master
+      with:
+        args: "https://gitlab.com/shanmiteko/LotteryAutoScript"
+      env:
+        FORCE_PUSH: "true"
+        GITLAB_HOSTNAME: "gitlab.com"
+        GITLAB_USERNAME: "shanmiteko"
+        GITLAB_PASSWORD: ${{ secrets.GITLAB_PASSWORD }}
+        GITLAB_PROJECT_ID: "36365601"
+        GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/pkg.yml

@@ -2,34 +2,69 @@ name: "Package Node.js project into an executable"
 
 on:
   push:
-    branches:
-      - main
     paths:
       - "lib/**"
       - "*.js"
       - "*.json"
+      - ".github/workflows/pkg.yml"
+      - "script/build/pkg.sh"
   workflow_dispatch:
 
 jobs:
-  build_all:
+  x64:
     runs-on: ubuntu-latest
+    name: node${{ matrix.nodev }}-${{ matrix.platform }}-x64
+    strategy:
+      matrix:
+        include:
+          - platform: linux
+            nodev: 18
+          - platform: macos
+            nodev: 18
+          - platform: win
+            nodev: 18
+          - platform: win
+            nodev: 12
     steps:
       - name: "Checkout codes"
         uses: actions/checkout@v2
       - name: "Use Node.js"
         uses: actions/setup-node@v1
         with:
-          node-version: "16"
+          node-version: "*"
       - name: "Pkg this"
         run: |
-          sudo apt install zip unzip
           npm install
-          npm run build_all
+          npm run pkg "node${{ matrix.nodev }}-${{ matrix.platform }}-x64"
       - name: "Upload to artifact"
         uses: actions/upload-artifact@v2
         with:
-          name: all_platform
-          path: dist/
+          name: node${{ matrix.nodev }}-${{ matrix.platform }}-x64
+          path: "dist/*.zip"
+      - name: "Upload to release draft"
+        uses: xresloader/upload-to-github-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        with:
+          file: "dist/*.zip"
+          delete_file: "dist/*.zip"
+          tag_name: "v2"
+          overwrite: true
+  arm64:
+    runs-on: ubuntu-latest
+    name: arm64
+    steps:
+      - name: "Checkout codes"
+        uses: actions/checkout@v2
+      - name: "Pkg this"
+        run: |
+          sudo podman run --rm --privileged multiarch/qemu-user-static --reset -p yes
+          npm run pkg arm
+      - name: "Upload to artifact"
+        uses: actions/upload-artifact@v2
+        with:
+          name: arm64
+          path: "dist/*.zip"
       - name: "Upload to release draft"
         uses: xresloader/upload-to-github-release@v1
         env:

CHANGELOG.md

@@ -1,5 +1,38 @@
 <!-- markdownlint-disable MD036 MD024-->
 # CHANGELOG
+## 主要变化(2.6.1)
+* 82efbb4 ci: pkg arm64 use podman
+* 886ccff fix: cookie缺少`buvid3`导致412(#182)(#185)
+* 0d5f5ec ci(docker): support more platforms
+* f75d2b6 fix: `checkAllDynamic`重试与`null`检测
+* 29bf439 fix: 中途掉号账号未登录(#179)
+* d3a8b86 fix: 重复评论(#184)
+* d205cb5 fix: 未知错误1004(#175)
+* 223a6e1 fix: 获取推荐412(#182)
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.6.0)
+* 5a7b672 fix: `LotteryOrder`设置(#176)
+* aae3de8 fix: 仅在评论需要验证码时退出(#175)
+* 3491888 feat: 抽奖顺序可调`LotteryOrder`(#176)
+* f6aa0d0 fix: 未知错误带状态码(#175)
+* 1415f18 fix: 无屏蔽词时全屏蔽
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
+## 主要变化(2.5.9)
+* 292b8e0 fix: 动态数据为null时异常退出
+* ca6549d feat:  程序在请求多次输入验证码时切换下一个账号 (#167)
+* e03b483 fix: 远程设置换源gitee
+* 3e01e42 feat: 预约抽奖奖品屏蔽词 (#159)
+* 00b5310 feat: 自动点赞且检索本地(#162)
+* ba100e0 docs: 更新docker运行说明(#160)
+* 29676d5 ci: mirror to gitlab
+* dd9ff1b docs: 修改changelog.sh使用http链接
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
+
 ## 主要变化(2.5.8)
 * 4238ee5 fix: 预约验重(#158)
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:lts-alpine
+FROM --platform=$BUILDPLATFORM node:lts-alpine
 
 LABEL author="shanmite" version="1.1" description="自动参与B站动态抽奖"
 

Dockerfile.pkg-arm64

@@ -0,0 +1,22 @@
+FROM arm64v8/node
+
+WORKDIR /root/lottery
+
+COPY . .
+
+RUN npm config set registry https://registry.npm.taobao.org && npm i
+
+ENV DOWNLOAD_HOST=https://download.fastgit.org \
+RELEASE_TAG=v3.4 \
+NODEV=18.5.0 \
+PKG_CACHE_PATH=/root/.pkg-cache \
+PKG_IGNORE_TAG=true
+
+RUN mkdir -p "${PKG_CACHE_PATH}" && \
+curl -L "$DOWNLOAD_HOST/vercel/pkg-fetch/releases/download/$RELEASE_TAG/node-v$NODEV-linux-arm64" -o \
+"${PKG_CACHE_PATH}/fetched-v$NODEV-linux-arm64" && \
+curl -L "$DOWNLOAD_HOST/vercel/pkg-fetch/releases/download/$RELEASE_TAG/node-v$NODEV-linuxstatic-arm64" -o \
+"${PKG_CACHE_PATH}/fetched-v$NODEV-linuxstatic-arm64"
+
+CMD ["bash", "-c", "npx pkg -t node$NODEV-linuxstatic-arm64 -o dist/lottery-auto-script-node$NODEV-linuxstatic-arm64 . && \
+npx pkg -t node$NODEV-linux-arm64 -o dist/lottery-auto-script-node$NODEV-linux-arm64 ."]

README.md

@@ -18,10 +18,14 @@
 
 [Github仓库链接](https://github.com/shanmiteko/LotteryAutoScript)
 
-[![Package Node.js project into an executable](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml)<br>
-[![Build and push Docker images](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml)<br>
+[![Package Node.js project into an executable](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml)
+
+[![Build and push Docker images](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml)
+
 [![Publishing to NPM](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/npmp.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/npmp.yml)
 
+[![Mirror and run GitLab CI](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/mirror.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/mirror.yml)
+
 已实现功能:
 
 - 监控用户转发
@@ -220,19 +224,23 @@ cd lottery
 ```
 $ tree
 .
-├── check.sh
-├── clear.sh
+├── check.sh 检查中奖
+├── clear.sh 清理动态
 ├── debug.sh 进入临时容器查看内容
 ├── env.js
 ├── my_config.js
 ├── new_env.js
 ├── new_my_config.js
 ├── remove_all.sh 移除对应docker镜像和所有相关容器
-└── start.sh 
+└── start.sh 启动抽奖
 ```
-
 [![asciicast](https://asciinema.org/a/453237.svg)](https://asciinema.org/a/453237)
 
+完成配置后
+
+```sh
+$ ./start.sh
+```
 3.更新
 
 进入lottery上一级目录

lib/clear.js

@@ -65,11 +65,11 @@ async function clear() {
 
         for (const page of infiniteNumber()) {
             log.info('清理动态', `开始读取第${page + 1}页`);
-            const { allModifyDynamicResArray = [], offset = '0' } = await retryfn(
+            const { allModifyDynamicResArray, offset } = (await retryfn(
                 3,
                 [null],
                 () => Searcher.checkAllDynamic(MY_UID, 1, search_wait, next_offset)
-            );
+            )) || { allModifyDynamicResArray: [], offset: '0' };
             next_offset = offset;
             for (const [index, dyinfo] of allModifyDynamicResArray.entries()) {
                 log.info('清理动态', `第${page + 1}页中的第${index + 1}个动态`)

lib/core/monitor.js

@@ -46,13 +46,17 @@ class Monitor extends Searcher {
         }
         /** 关注列表初始化 */
         this.attentionList = await bili.getAttentionList(global_var.get("myUID"));
-        switch (await this.startLottery()) {
+        const status = await this.startLottery();
+        switch (status) {
             case 0:
                 event_bus.emit('Turn_on_the_Monitor')
                 break;
             case 1001:
                 event_bus.emit('Turn_off_the_Monitor', '评论失败')
                 break;
+            case 1004:
+                event_bus.emit('Turn_off_the_Monitor', '需要输入验证码')
+                break
             case 2001:
                 event_bus.emit('Turn_off_the_Monitor', '关注出错')
                 break;
@@ -86,7 +90,7 @@ class Monitor extends Searcher {
                 event_bus.emit('Turn_off_the_Monitor', '获取关注数失败')
                 break
             default:
-                event_bus.emit('Turn_off_the_Monitor', '??? 未知错误')
+                event_bus.emit('Turn_off_the_Monitor', `??? 未知错误: ${status}`)
                 break;
         }
     }
@@ -106,8 +110,10 @@ class Monitor extends Searcher {
                 status = 0,
                 is_exception = 0,
                 is_outof_maxfollow = 0,
-                relayed_nums = 0;
+                relayed_nums = 0,
+                total_nums = 0;
             for (const [index, lottery] of shuffle(allLottery).entries()) {
+                total_nums += 1;
                 let is_shutdown = false;
                 if (
                     is_outof_maxfollow
@@ -172,10 +178,12 @@ class Monitor extends Searcher {
                         break;
                     case 1002:
                     case 1003:
-                    case 1004:
                     case 1005:
                     case 1006:
                     case 1007:
+                    case 1008:
+                    case 1009:
+                    case 1010:
                     case 2002:
                     case 2003:
                     case 4001:
@@ -193,6 +201,7 @@ class Monitor extends Searcher {
                         is_outof_maxfollow = 2005
                         break;
                     case 1001:
+                    case 1004:
                     case 2001:
                     case 3001:
                     case 5001:
@@ -206,7 +215,7 @@ class Monitor extends Searcher {
 
                 await delay(wait * (Math.random() + 0.5));
             }
-            log.info('抽奖', `本轮共转发${relayed_nums}条`);
+            log.info('抽奖', `本轮共处理${total_nums}条,成功参与${relayed_nums}条`);
             return is_exception
                 || is_outof_maxfollow
                 || status
@@ -266,7 +275,7 @@ class Monitor extends Searcher {
         log.info('筛选动态', `去重后(${protoLotteryInfo.length})`);
 
         /**并发查询dyid */
-        if (check_if_duplicated === 1 || check_if_duplicated === 2) {
+        if (check_if_duplicated >= 1) {
             await Promise.all(
                 [...dyids_map.keys()]
                     .map(it => d_storage
@@ -303,7 +312,7 @@ class Monitor extends Searcher {
         await try_for_each(protoLotteryInfo, async function (lottery_info) {
             const {
                 lottery_info_type, is_liked,
-                uids, uname, dyid, reserve_id, create_time,
+                uids, uname, dyid, reserve_id, reserve_lottery_text, create_time,
                 ctrl, rid, des, type,
                 hasOfficialLottery
             } = lottery_info;
@@ -315,8 +324,8 @@ class Monitor extends Searcher {
             } else {
                 /* 遇到转发过就退出 */
                 if (
-                    ((!check_if_duplicated || check_if_duplicated === 2) && is_liked)
-                    || ((check_if_duplicated === 1 || check_if_duplicated === 2) && dyids_map.get(dyid))
+                    ((!check_if_duplicated || check_if_duplicated >= 2) && is_liked)
+                    || ((check_if_duplicated >= 1) && dyids_map.get(dyid))
                 ) {
                     log.info("筛选动态", `已转发(https://t.bilibili.com/${dyid})`)
                     return false
@@ -342,7 +351,7 @@ class Monitor extends Searcher {
                 needTopic = [...new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#|(?<=[带加上])#.+?#(?=话题|tag)/ig) || [])].join(' '),
                 isRelayDynamic = type === 1,
                 has_key_words = key_words.every(it => new RegExp(it).test(description)),
-                isBlock = new RegExp(blockword.join('|')).test(description),
+                isBlock = blockword.length && new RegExp(blockword.join('|')).test(description + reserve_lottery_text),
                 isLottery =
                     (is_imitator && lottery_info_type === 'uid' && model !== '00')
                     || (hasOfficialLottery && model[0] === '1')
@@ -368,43 +377,6 @@ class Monitor extends Searcher {
 
             log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, type, isRelayDynamic, key_words, has_key_words, blockword, isBlock, isLottery, isSendChat })
 
-            if (block_dynamic_type.includes(type)) {
-                log.warn("筛选动态", `屏蔽动态类型 ${type}`)
-                return false
-            }
-
-            if (reserve_id) {
-                if (disable_reserve_lottery) {
-                    log.info("已关闭预约抽奖功能")
-                } else {
-                    log.info("预约抽奖", "开始");
-                    if (hasEnv('NOT_GO_LOTTERY')) {
-                        log.info('NOT_GO_LOTTERY', 'ON');
-                    } else {
-                        await bili.reserve_lottery(reserve_id)
-                    }
-                }
-            }
-
-            if (!has_key_words && description) {
-                log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n')}`)
-                return false
-            }
-
-            /**屏蔽词 */
-            if (isBlock) {
-                log.info("筛选动态", `包含屏蔽词(https://t.bilibili.com/${dyid})`)
-                return false
-            }
-
-            /**若勾选只转已关注 */
-            if (only_followed
-                && (!mIsFollowed || !oriIsFollowed)
-            ) {
-                log.info("筛选动态", `只转已关注(https://t.bilibili.com/${dyid})`)
-                return false
-            }
-
             if (
                 new_blacklist.some(id => keys.some(key => {
                     if (key + '' === id) {
@@ -418,6 +390,44 @@ class Monitor extends Searcher {
                 return false
             }
 
+            if (block_dynamic_type.includes(type)) {
+                log.warn("筛选动态", `屏蔽动态类型 ${type}`)
+                return false
+            }
+
+            /**屏蔽词 */
+            if (isBlock) {
+                log.info("筛选动态", `包含屏蔽词(https://t.bilibili.com/${dyid})`)
+                return false
+            }
+
+            if (reserve_id) {
+                if (disable_reserve_lottery) {
+                    log.info("已关闭预约抽奖功能")
+                } else {
+                    log.info("预约抽奖", "开始");
+                    log.info("预约抽奖", `奖品: ${reserve_lottery_text}`);
+                    if (hasEnv('NOT_GO_LOTTERY')) {
+                        log.info('NOT_GO_LOTTERY', 'ON');
+                    } else {
+                        await bili.reserve_lottery(reserve_id)
+                    }
+                }
+            }
+
+            if (!has_key_words && description) {
+                log.warn("筛选动态", `无关键词动态的描述: ${description}\n\n考虑是否修改设置key_words:\n${key_words.join('\n且满足: ')}`)
+                return false
+            }
+
+            /**若勾选只转已关注 */
+            if (only_followed
+                && (!mIsFollowed || !oriIsFollowed)
+            ) {
+                log.info("筛选动态", `只转已关注(https://t.bilibili.com/${dyid})`)
+                return false
+            }
+
             if (isLottery) {
                 const { uname_map = {} } = global_var.get("remoteconfig")
                 let onelotteryinfo = {};
@@ -519,6 +529,9 @@ class Monitor extends Searcher {
      * - 评论 已被对方拉入黑名单 1005
      * - 评论 黑名单用户无法互动 1006
      * - 评论 UP主已关闭评论区 1007
+     * - 评论 内容包含敏感信息 1008
+     * - 评论 重复评论 1009
+     * - 评论 帐号未登录 1010
      * - 关注 未知错误 2001
      * - 关注 您已被对方拉入黑名单 2002
      * - 关注 黑名单用户无法关注 2003
@@ -549,7 +562,7 @@ class Monitor extends Searcher {
         if (rid && chat_type) {
 
             status = await retryfn(
-                5,
+                6,
                 [1, 4],
                 () => bili.sendChat(
                     rid,
@@ -558,10 +571,11 @@ class Monitor extends Searcher {
                 )
             )
 
-            if (status === 8) {
+            if (status === 8 ||
+                status === 9) {
                 status = await bili.sendChat(
                     rid,
-                    "[doge]",
+                    "[doge][doge][doge][doge][doge]",
                     chat_type
                 )
             }
@@ -592,7 +606,7 @@ class Monitor extends Searcher {
         }
 
         /* 点赞 */
-        if (!check_if_duplicated) {
+        if (!check_if_duplicated || check_if_duplicated === 3) {
             status = await retryfn(
                 5,
                 [1, 2, 3],

lib/core/searcher.js

@@ -18,7 +18,8 @@ const { log } = utils
  * @property {string} dynamic_id
  * @property {number} type
  * @property {string} description
- * @property {number} reserve_id
+ * @property {string} reserve_id
+ * @property {string} reserve_lottery_text
  * @property {boolean} hasOfficialLottery
  * @property {Array<Object.<string,string|number>>} ctrl
  * @property {number} origin_create_time 10
@@ -28,7 +29,8 @@ const { log } = utils
  * @property {string} origin_dynamic_id
  * @property {number} orig_type
  * @property {string} origin_description
- * @property {number} origin_reserve_id
+ * @property {string} origin_reserve_id
+ * @property {string} origin_reserve_lottery_text
  * @property {boolean} origin_hasOfficialLottery
  * 
  * 整理后的抽奖信息
@@ -40,7 +42,8 @@ const { log } = utils
  * @property {string} uname
  * @property {Array<{}>} ctrl
  * @property {string} dyid
- * @property {number} reserve_id
+ * @property {string} reserve_id
+ * @property {string} reserve_lottery_text
  * @property {string} rid
  * @property {string} des
  * @property {number} type
@@ -53,12 +56,12 @@ function parseDynamicCard(dynamic_detail_card) {
     const { strToJson } = utils;
     /**临时储存单个动态中的信息 */
     let obj = {};
-    const { desc, card, extension, extend_json } = dynamic_detail_card
+    const { desc, card, extension, extend_json, display = {} } = dynamic_detail_card
         , { is_liked = 1, user_profile = {} } = desc
         , { info = {} } = user_profile
-        , extendjsonToJson = strToJson(extend_json)
-        , extendjsonToJsonHidden = extendjsonToJson[""] || {}
         , cardToJson = strToJson(card)
+        , extendjsonToJson = strToJson(extend_json)
+        , { add_on_card_info = [] } = display
         , { item } = cardToJson;
     /* 转发者的UID */
     obj.uid = desc.uid
@@ -79,17 +82,18 @@ function parseDynamicCard(dynamic_detail_card) {
     /* 定位@信息 */
     obj.ctrl = (extendjsonToJson.ctrl) || [];
     /* 预约抽奖信息 */
-    if (extendjsonToJsonHidden.reserve) {
-        let status = (((dynamic_detail_card || {})
-            .display || {})
-            .add_on_card_info || [])
-            .map(it => (((it || {})
-                .reserve_attach_card || {})
-                .reserve_button || {})
-                .status || 2)[0];
+    if (add_on_card_info.length > 0) {
+        const [status, oid_str, text] = add_on_card_info
+            .filter(it => typeof it.reserve_attach_card !== 'undefined'
+                && typeof it.reserve_attach_card.reserve_lottery !== 'undefined'
+                && typeof it.reserve_attach_card.reserve_button !== 'undefined')
+            .map(({ reserve_attach_card }) => [
+                reserve_attach_card.reserve_button.status,
+                reserve_attach_card.oid_str,
+                reserve_attach_card.reserve_lottery.text])[0] || [];
         if (status === 1) {
-            let { reserve_id } = extendjsonToJsonHidden.reserve;
-            obj.reserve_id = reserve_id || 0;
+            obj.reserve_id = oid_str;
+            obj.reserve_lottery_text = text;
         }
     }
     /* 是否有官方抽奖 */
@@ -100,9 +104,9 @@ function parseDynamicCard(dynamic_detail_card) {
         || (cardToJson.dynamic || '' + cardToJson.desc || '')
         || '';
     if (obj.type === 1) {
-        const { origin_extension, origin, origin_extend_json } = cardToJson
+        const { origin_extension, origin } = cardToJson
             , originToJson = strToJson(origin)
-            , originextendjsonToJson = strToJson(origin_extend_json)
+            , { add_on_card_info = [] } = display.origin || {}
             , { user, item } = originToJson;
         /* 源动态的ts10 */
         obj.origin_create_time = desc.origin.timestamp;
@@ -113,9 +117,19 @@ function parseDynamicCard(dynamic_detail_card) {
         /* 被转发者的动态的ID !!!!此为大数需使用字符串值,不然JSON.parse()会有丢失精度 */
         obj.origin_dynamic_id = desc.orig_dy_id_str;
         /* 预约抽奖信息 */
-        if (originextendjsonToJson.reserve) {
-            let { reserve_id, reserve_lottery } = originextendjsonToJson.reserve;
-            obj.origin_reserve_id = reserve_lottery === 1 ? reserve_id : 0;
+        if (add_on_card_info.length > 0) {
+            const [status, oid_str, text] = add_on_card_info
+                .filter(it => typeof it.reserve_attach_card !== 'undefined'
+                    && typeof it.reserve_attach_card.reserve_lottery !== 'undefined'
+                    && typeof it.reserve_attach_card.reserve_button !== 'undefined')
+                .map(({ reserve_attach_card }) => [
+                    reserve_attach_card.reserve_button.status,
+                    reserve_attach_card.oid_str,
+                    reserve_attach_card.reserve_lottery.text])[0] || [];
+            if (status === 1) {
+                obj.origin_reserve_id = oid_str;
+                obj.origin_reserve_lottery_text = text;
+            }
         }
         /* 是否有官方抽奖 */
         obj.origin_hasOfficialLottery = origin_extension && origin_extension.lott;
@@ -250,9 +264,12 @@ class Searcher {
      */
     async getLotteryInfoByUID(UID) {
         log.info('获取动态', `开始获取用户${UID}的动态信息`);
-        const { allModifyDynamicResArray } = await Searcher.checkAllDynamic(UID, uid_scan_page, search_wait);
+        const AllDynamic = await Searcher.checkAllDynamic(UID, uid_scan_page, search_wait);
 
-        let { length } = allModifyDynamicResArray
+        if (AllDynamic === null) return null
+
+        let { allModifyDynamicResArray } = AllDynamic,
+            { length } = allModifyDynamicResArray;
 
         if (!length) return null;
 
@@ -271,7 +288,7 @@ class Searcher {
                     { origin_dynamic_id } = cur,
                     is_liked = false;
 
-                if (!check_if_duplicated || check_if_duplicated === 2) {
+                if (!check_if_duplicated || check_if_duplicated >= 2) {
                     const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
                     log.info('获取动态', `查看源动态(${origin_dynamic_id})是否点赞 (${length--})`)
                     if (card) {
@@ -289,6 +306,7 @@ class Searcher {
                     ctrl: [],
                     dyid: cur.origin_dynamic_id,
                     reserve_id: cur.origin_reserve_id,
+                    reserve_lottery_text: cur.origin_reserve_lottery_text,
                     rid: cur.origin_rid_str,
                     des: cur.origin_description,
                     type: cur.orig_type,
@@ -348,6 +366,7 @@ class Searcher {
                 ctrl: o.ctrl,
                 dyid: o.dynamic_id,
                 reserve_id: o.reserve_id,
+                reserve_lottery_text: o.reserve_lottery_text,
                 rid: o.rid_str,
                 des: o.description,
                 type: o.type,
@@ -404,9 +423,9 @@ class Searcher {
                             , { is_liked } = parsed_card;
 
                         if (
-                            ((!check_if_duplicated || check_if_duplicated === 2)
+                            ((!check_if_duplicated || check_if_duplicated >= 2)
                                 && is_liked)
-                            || ((check_if_duplicated === 1 || check_if_duplicated === 2)
+                            || ((check_if_duplicated >= 1)
                                 && await d_storage.searchDyid(dyid))
                         ) {
                             log.info('获取动态', `动态(${dyid})已转发过`)
@@ -437,6 +456,7 @@ class Searcher {
                 ctrl: o.ctrl,
                 dyid: o.dynamic_id,
                 reserve_id: o.reserve_id,
+                reserve_lottery_text: o.reserve_lottery_text,
                 rid: o.rid_str,
                 des: o.description,
                 type: o.type,
@@ -479,7 +499,7 @@ class Searcher {
                                             let results = await pre
                                                 , { dyid } = cur;
 
-                                            if (!check_if_duplicated || check_if_duplicated === 2) {
+                                            if (!check_if_duplicated || check_if_duplicated >= 2) {
                                                 log.info('获取动态', `查看动态(${dyid})是否点赞 (${length--})`)
                                                 const card = await bili.getOneDynamicByDyid(dyid)
 

lib/data/config.js

@@ -6,16 +6,16 @@ const config = {
      */
     UIDs: [],
 
+    /**
+     * 监视的tag
+     */
+
+    TAGs: [],
     /**
      * 监视的专栏关键词
      */
     Articles: [],
 
-    /**
-     * 监视的tag
-     */
-    TAGs: [],
-
     /**
      * 从API接口中获取抽奖信息
      * @typedef {object} LotteryInfo
@@ -26,6 +26,8 @@ const config = {
      * @property {string} uname
      * @property {Array<{}>} ctrl
      * @property {string} dyid
+     * @property {string} reserve_id
+     * @property {string} reserve_lottery_text
      * @property {string} rid
      * @property {string} des
      * @property {number} type
@@ -38,6 +40,18 @@ const config = {
      */
     APIs: [],
 
+    /**
+     * 抽奖参与顺序组合
+     * * 0 - UIDs
+     * * 1 - TAGs
+     * * 2 - Articles
+     * * 3 - APIs
+     * @example
+     * [3,2,1,0]
+     * [1,2,1,2,1]
+     */
+    LotteryOrder: [2, 0, 1, 3],
+
     /**
      * API发送数据类型 {LotteryInfo[]}
      * 上传抽奖信息的链接字符串
@@ -74,12 +88,14 @@ const config = {
      */
     disable_reserve_lottery: false,
 
+
     /**
      * 检查是否重复转发
      * - 不检查 -1
-     * - 通过是否点赞判断 0
+     * - 通过是否点赞判断(自动点赞) 0
      * - 检索本地dyids文件 1
-     * - 通过是否点赞判断+检索本地dyids文件 2
+     * - 通过是否点赞判断(不自动点赞)+检索本地dyids文件 2
+     * - 通过是否点赞判断(自动点赞)+检索本地dyids文件 3
      */
     check_if_duplicated: 1,
 

lib/data/global_var.js

@@ -1,8 +1,6 @@
 const { getRemoteConfig, createDir, createFile } = require("../utils");
 const config = require("../data/config");
 
-const key_map = new Map([['DedeUserID', 'myUID'], ['bili_jct', 'csrf']]);
-
 let global_var = {
     inner: {},
     get(key) {
@@ -19,9 +17,19 @@ let global_var = {
      */
     async init(cookie, num) {
         if (cookie) {
+            const
+                key_map = new Map([
+                    ['DedeUserID', 'myUID'],
+                    ['bili_jct', 'csrf']]),
+                LotteryOrderMap = new Map([
+                    [0, "UIDs"],
+                    [1, "TAGs"],
+                    [2, "Articles"],
+                    [3, "APIs"]]);
+
             config.updata(num);
 
-            this.set('cookie', cookie);
+            this.set('cookie', cookie + ';buvid3=AAAAAAAA-BBBB-CCCC-DDDD-DDDDDDDDDDDDDDDDDinfoc');
 
             cookie.split(/\s*;\s*/).forEach(item => {
                 const _item = item.split('=');
@@ -29,13 +37,13 @@ let global_var = {
                     this.set(key_map.get(_item[0]), _item[1]);
             });
 
-            const { UIDs = [], TAGs = [], Articles = [], APIs = [] } = config;
-            this.set('Lottery', [
-                ...UIDs.map(it => ['UIDs', it]),
-                ...TAGs.map(it => ['TAGs', it]),
-                ...Articles.map(it => ['Articles', it]),
-                ...APIs.map(it => ['APIs', it])
-            ]);
+            const { LotteryOrder } = config;
+            this.set('Lottery',
+                LotteryOrder
+                    .map(it => LotteryOrderMap.get(it))
+                    .filter(it => typeof it === "string")
+                    .flatMap(lottery_option => config[lottery_option]
+                        .map(it => [lottery_option, it])));
             this.set('remoteconfig', await getRemoteConfig());
         }
         await createDir('dyids');

lib/lottery.js

@@ -12,7 +12,11 @@ async function createRandomDynamic(num) {
     if (config.create_dy) {
         log.info('随机动态', `准备创建${num}条随机动态`);
         const
-            { allModifyDynamicResArray } = await Searcher.checkAllDynamic(global_var.get("myUID"), 1),
+            { allModifyDynamicResArray } = (await utils.retryfn(
+                3,
+                [null],
+                () => Searcher.checkAllDynamic(global_var.get("myUID"), 1)
+            )) || { allModifyDynamicResArray: [] },
             { type, orig_type } = allModifyDynamicResArray[0] || {};
         if (type === 1 && orig_type !== 8) {
             await randomDynamic(num)

lib/net/api.bili.js

@@ -30,6 +30,7 @@ module.exports = Object.freeze({
     SPACE_MYINFO: 'https://api.bilibili.com/x/space/myinfo',
     TAG_INFO: 'https://api.bilibili.com/x/tag/info',
     TOP_RCMD: "https://api.bilibili.com/x/web-interface/index/top/rcmd",
+    TOP_FEED_RCMD: "https://api.bilibili.com/x/web-interface/index/top/feed/rcmd",
     TOPIC_SVR_TOPIC_HISTORY: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_history',
     TOPIC_SVR_TOPIC_NEW: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_new',
     WEB_INTERFACE_CARD: 'https://api.bilibili.com/x/web-interface/card',

lib/net/bili.js

@@ -888,27 +888,29 @@ const bili_client = {
             return true
         }
     },
+    _getTopRcmd: new Line('获取推荐', [
+        () => get({
+            url: API.TOP_RCMD
+        }),
+        () => get({
+            url: API.TOP_FEED_RCMD
+        })
+    ], responseText => {
+        const res = strToJson(responseText);
+        if (res.code === 0) {
+            return [false, res.data.item.map(it => {
+                return [it.owner.mid, it.id];
+            }), "成功"];
+        } else {
+            return [true, [], `获取推荐失败\n${responseText}`];
+        }
+    }),
     /**
      * 获取推荐
      * @returns {Promise<Array<[number, number]>>}
      */
     async getTopRcmd() {
-        const
-            responseText = await get(
-                {
-                    url: API.TOP_RCMD,
-                }
-            ),
-            res = strToJson(responseText);
-        if (res.code === 0) {
-            log.info('获取推荐', `成功`);
-            return res.data.item.map(it => {
-                return [it.owner.mid, it.id];
-            });
-        } else {
-            log.error('获取推荐', `获取推荐失败\n${responseText}`);
-            return [];
-        }
+        return this._getTopRcmd.run()
     },
     /**
      * 分享视频
@@ -980,6 +982,8 @@ const bili_client = {
      * - 黑名单用户无法互动 6
      * - UP主已关闭评论区 7
      * - 评论内容包含敏感信息 8
+     * - 重复评论 9
+     * - 帐号未登录 10
      */
     async sendChat(rid, msg, type) {
         const
@@ -1018,6 +1022,12 @@ const bili_client = {
             case 12016:
                 log.error('自动评论', '评论内容包含敏感信息');
                 return 8;
+            case 12051:
+                log.error('自动评论', '重复评论');
+                return 9;
+            case -101:
+                log.error('自动评论', '帐号未登录');
+                return 10;
             default:
                 log.error('自动评论', `未知错误\n${responseText}`);
                 return 1;

lib/utils.js

@@ -292,13 +292,13 @@ const utils = {
         return new Promise((resolve) => {
             send({
                 method: 'GET',
-                url: 'https://gitlab.com/shanmiteko/lottery-notice/-/raw/master/notice.json',
+                url: 'https://gitee.com/shanmite/lottery-notice/raw/master/notice.json',
                 headers: {
                     'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36',
                 },
                 success: res => {
                     try {
-                        const body = JSON.parse(res.body);
+                        const body = JSON.parse(Buffer.from(res.body, "base64").toString());
                         if (body.node_msg) utils.log.info('公告', '\n' + body.node_msg + '\n');
                         resolve(body.config)
                     } catch (error) {

my_config.example.js

@@ -11,13 +11,6 @@ module.exports = Object.freeze({
             241675899
         ],
 
-        /**
-         * 监视的专栏关键词
-         */
-        Articles: [
-            '抽奖合集'
-        ],
-
         /**
          * 监视的tag
          */
@@ -28,6 +21,13 @@ module.exports = Object.freeze({
             '抽奖',
         ],
 
+        /**
+         * 监视的专栏关键词
+         */
+        Articles: [
+            '抽奖合集'
+        ],
+
         /**
          * 从API接口中获取抽奖信息
          * @typedef {object} LotteryInfo
@@ -38,7 +38,8 @@ module.exports = Object.freeze({
          * @property {string} uname
          * @property {Array<{}>} ctrl
          * @property {string} dyid
-         * @property {number} reserve_id
+         * @property {string} reserve_id
+         * @property {string} reserve_lottery_text
          * @property {string} rid
          * @property {string} des
          * @property {number} type
@@ -53,6 +54,18 @@ module.exports = Object.freeze({
          */
         APIs: [],
 
+        /**
+         * 抽奖参与顺序组合
+         * * 0 - UIDs
+         * * 1 - TAGs
+         * * 2 - Articles
+         * * 3 - APIs
+         * @example
+         * [3,2,1,0]
+         * [1,2,1,2,1]
+         */
+        LotteryOrder: [2, 0, 1, 3],
+
         /**
          * API发送数据类型 {LotteryInfo[]}
          * 上传抽奖信息的链接字符串
@@ -92,9 +105,10 @@ module.exports = Object.freeze({
         /**
          * 检查是否重复转发
          * - 不检查 -1
-         * - 通过是否点赞判断 0
+         * - 通过是否点赞判断(自动点赞) 0
          * - 检索本地dyids文件 1
-         * - 通过是否点赞判断+检索本地dyids文件 2
+         * - 通过是否点赞判断(不自动点赞)+检索本地dyids文件 2
+         * - 通过是否点赞判断(自动点赞)+检索本地dyids文件 3
          */
         check_if_duplicated: 1,
 

package.json

@@ -1,14 +1,15 @@
 {
   "name": "lottery-auto-script",
-  "version": "2.5.8",
+  "version": "2.6.1",
   "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {
     "start": "node main.js start",
+    "test": "node test/index.js",
     "clear": "node main.js clear",
     "check": "node main.js check",
     "update": "node main.js update",
-    "build_all": "bash script/build/pkg.sh",
+    "pkg": "bash script/build/pkg.sh",
     "changelog": "bash script/build/changelog.sh"
   },
   "files": [
@@ -21,17 +22,6 @@
     "README.md"
   ],
   "bin": "main.js",
-  "pkg": {
-    "targets": [
-      "node12-win-x64",
-      "node16-win-x64",
-      "node16-linux-x64",
-      "node16-macos-x64",
-      "node16-linuxstatic-arm64",
-      "node16-linuxstatic-armv7"
-    ],
-    "outputPath": "dist"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/shanmiteko/AutoScript.git"

script/build/pkg.sh

@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 
+set -e
+
 ROOT=$PWD
 README="README.md"
 TEMPLATE_CONFIG_FILE="my_config.example.js"
 TEMPLATE_ENV_FILE="env.example.js"
 CONFIG_FILE="my_config.js"
 ENV_FILE="env.js"
-TARGET_DIR="./dist"
+TARGET_DIR="dist"
 BIN_NAME="lottery"
 
 create_win_bat() {
@@ -17,28 +19,39 @@ if [ -d "$TARGET_DIR" ]; then
 	rm -rf "$TARGET_DIR"
 fi
 
-npx pkg .
+if [[ -z "$1" ]]; then
+	$1=node18-linux-x64
+fi
+
+mkdir -p $TARGET_DIR
+
+if [[ "$1" == *"arm"* ]]; then
+	podman build -f Dockerfile.pkg-arm64 -t pkg-arm64
+	podman run -it --rm -v ${PWD}/dist:/root/lottery/dist pkg-arm64
+elif [[ "$1" == *"x64"* ]]; then
+	OUTFILE="$TARGET_DIR/lottery-auto-script-$1"
+	npx pkg -t "$1" -o $OUTFILE .
+fi
 
-# Searching in the current directory
 for file in "$TARGET_DIR/"*; do
 	TMPDIR="${file%.exe}"
 	TMPDIR_NAME="${TMPDIR##*/}"
 	REMANE_FILE="$TARGET_DIR/$BIN_NAME"
 	mv $file $REMANE_FILE
-	mkdir -p "$TMPDIR/"
-	mv $REMANE_FILE "$TMPDIR/"
-	cp $README "$TMPDIR/"
-	cp $TEMPLATE_CONFIG_FILE "$TMPDIR/$CONFIG_FILE"
-	cp $TEMPLATE_ENV_FILE "$TMPDIR/$ENV_FILE"
+	mkdir -p "$TMPDIR.d/"
+	mv $REMANE_FILE "$TMPDIR.d/"
+	cp $README "$TMPDIR.d/"
+	cp $TEMPLATE_CONFIG_FILE "$TMPDIR.d/$CONFIG_FILE"
+	cp $TEMPLATE_ENV_FILE "$TMPDIR.d/$ENV_FILE"
 	if [ "$(echo $file | grep '.exe')" ]; then
 		BATS=("start" "check" "clear" "update")
 		for item in "${BATS[@]}"; do
-			create_win_bat "${item}" >"$TMPDIR/$item.bat"
+			create_win_bat "${item}" >"$TMPDIR.d/$item.bat"
 		done
-		mv "$TMPDIR/$BIN_NAME" "$TMPDIR/$BIN_NAME.exe"
+		mv "$TMPDIR.d/$BIN_NAME" "$TMPDIR.d/$BIN_NAME.exe"
 	else
 		ZIP_NAME=latest_version0
-		cat >"$TMPDIR/update.sh" <<-EOF
+		cat >"$TMPDIR.d/update.sh" <<-EOF
 			#!/bin/bash
 			./lottery update
 			ZIP_NAME=$ZIP_NAME
@@ -49,7 +62,7 @@ for file in "$TARGET_DIR/"*; do
 			fi
 		EOF
 	fi
-	cd $TMPDIR
+	cd $TMPDIR.d
 	zip -r "$TMPDIR_NAME.zip" .
 	mv "$TMPDIR_NAME.zip" ../
 	cd $ROOT

test/api.test.js

@@ -0,0 +1,33 @@
+const assert = require('assert');
+const bili_client = require("../lib/net/bili");
+const util = require('./util');
+
+(async () => {
+    assert(await bili_client.getMyinfo());
+
+    await util.par_run([
+        async () => {
+            assert.equal((await bili_client.getTopRcmd()).length, 10)
+        },
+        async () => {
+            assert.equal(await bili_client.sendChat(
+                (await bili_client.getOneDynamicByDyid("692193323569381399")).desc.rid,
+                "test",
+                11),
+                7
+            )
+        },
+        async () => {
+            assert.equal(await bili_client.sendChat(
+                (await bili_client.getOneDynamicByDyid("11229466874154064")).desc.rid,
+                "test",
+                1),
+                3
+            )
+        }, async () => {
+            assert.notEqual((await bili_client.searchArticlesByKeyword("专栏")).length, 0)
+        }
+    ])
+
+    console.log("api.test ... ok!");
+})()

test/index.js

@@ -0,0 +1,12 @@
+const env = require("../lib/data/env");
+const global_var = require("../lib/data/global_var");
+const { log } = require('../lib/utils');
+const fs = require('fs');
+
+log._level = 0
+env.init()
+global_var.init(process.env["COOKIE"], 1)
+
+fs.readdirSync(module.path)
+    .filter(file => file.endsWith(".test.js"))
+    .forEach(file => require(`${module.path}/${file}`))

test/util.js

@@ -0,0 +1,10 @@
+/**
+ * @param {Array<()=>any>} fns
+ */
+function par_run(fns) {
+    return Promise.all((fns.map(fn => fn())))
+}
+
+module.exports = {
+    par_run
+}