feat: 内置默认设置

perf: 重构部分代码
fix: 清理动态时关注列表获取失败

.eslintrc.json

@@ -6,7 +6,7 @@
     },
     "extends": "eslint:recommended",
     "parserOptions": {
-        "ecmaVersion": 12
+        "ecmaVersion": "latest"
     },
     "rules": {
     }

.github/workflows/docker.yml

@@ -0,0 +1,40 @@
+name: "Build and push Docker images"
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "lib/**"
+      - "main.js"
+  pull_request:
+    branches:
+      - main
+    paths:
+      - "lib/**"
+      - "main.js"
+  workflow_dispatch:
+
+jobs:
+  path-context:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: shanmite/lottery_auto_docker:latest

.github/workflows/npmp.yml

@@ -0,0 +1,18 @@
+name: "Publishing to NPM"
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "package.json"
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ secrets.NPM_TOKEN }}

.github/workflows/pkg.yml

@@ -1,17 +1,17 @@
-name: 'Package Node.js project into an executable'
+name: "Package Node.js project into an executable"
 on:
   push:
     branches:
       - main
     paths:
-      - 'lib/**'
-      - 'main.js'
+      - "lib/**"
+      - "main.js"
   pull_request:
     branches:
       - main
     paths:
-      - 'lib/**'
-      - 'main.js'
+      - "lib/**"
+      - "main.js"
   workflow_dispatch:
     branches:
       - main
@@ -19,35 +19,45 @@ jobs:
   pkg_x64:
     runs-on: windows-latest
     steps:
-      - name: 'Checkout codes'
+      - name: "Checkout codes"
         uses: actions/checkout@v2
-      - name: 'Use Node.js'
+      - name: "Use Node.js"
         uses: actions/setup-node@v1
         with:
-          node-version: '16'
-      - name: 'Pkg this'
+          node-version: "16"
+      - name: "Pkg this"
         run: |
           npm install
           npm run pkg_x64
-      - name: 'Upload to artifact'
+      - name: "Upload to artifact(win)"
         uses: actions/upload-artifact@v2
         with:
-          name: dist_x64
-          path: dist/
+          name: nlts-win-x64
+          path: dist/nlts-win-x64/
+      - name: "Upload to artifact(linux)"
+        uses: actions/upload-artifact@v2
+        with:
+          name: nlts-linux-x64
+          path: dist/nlts-linux-x64/
+      - name: "Upload to artifact(macos)"
+        uses: actions/upload-artifact@v2
+        with:
+          name: nlts-macos-x64
+          path: dist/nlts-macos-x64/
   pkg_arm64:
     runs-on: ubuntu-latest
     steps:
-      - name: 'Checkout codes'
+      - name: "Checkout codes"
         uses: actions/checkout@v2
-      - name: 'Use Node.js'
+      - name: "Use Node.js"
         uses: actions/setup-node@v1
         with:
-          node-version: '16'
-      - name: 'Pkg this'
+          node-version: "16"
+      - name: "Pkg this"
         run: |
           npm install
           npm run pkg_arm64
-      - name: 'Upload to artifact'
+      - name: "Upload to artifact"
         uses: actions/upload-artifact@v2
         with:
           name: nlts-linux-arm64
@@ -55,18 +65,18 @@ jobs:
   pkg_armv7:
     runs-on: ubuntu-latest
     steps:
-      - name: 'Checkout codes'
+      - name: "Checkout codes"
         uses: actions/checkout@v2
-      - name: 'Use Node.js'
+      - name: "Use Node.js"
         uses: actions/setup-node@v1
         with:
-          node-version: '16'
-      - name: 'Pkg this'
+          node-version: "16"
+      - name: "Pkg this"
         run: |
           npm install
           npm run pkg_armv7
-      - name: 'Upload to artifact'
+      - name: "Upload to artifact"
         uses: actions/upload-artifact@v2
         with:
           name: nlts-linux-armv7
-          path: dist/
+          path: dist/

README.md

@@ -1,5 +1,4 @@
 # AutoScript
-
 - [AutoScript](#autoscript)
   - [操作步骤](#操作步骤)
     - [获取COOKIE](#获取cookie)
@@ -17,12 +16,18 @@
 
 [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>
+[![Publishing to NPM](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/npmp.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/npmp.yml)
+
 已实现功能:
 - 监控用户转发
 - 监控话题页面
 - 监控专栏合集
 - 自动点赞、评论、乱序转发、@好友、带话题、可选随机动态
 - 检测是否中奖
+  - 已读@
+  - 已读私信
 - 清理动态关注
 - 检查更新
 - 更多功能设置请参考配置文件
@@ -33,6 +38,8 @@
 
 ## 操作步骤
 
+**使用前务必阅读此教程和配置文件内注释**
+
 右上角<kbd>★ Star</kbd>
 
 ↓↓
@@ -82,8 +89,6 @@ Chrome浏览器:
     ~/nlts-linux-x64
     => tree
     .
-    ├── dyids           (自动生成的dyid存储)
-    │   └── dyid.txt
     ├── env.js          (便捷设置环境变量和多账号参数)
     ├── lottery         (可执行文件)
     ├── my_config.js    (自定义设置文件) (!使用前必读)
@@ -93,8 +98,11 @@ Chrome浏览器:
 3. 在`env.js`中填入`COOKIE`和推送参数
 4. 在`my_config.js`中自定义设置
 5. 在当前目录下**打开终端**运行可执行文件`lottery`(勿直接点击`lottery`)
-6. 键入`lottery start`启动抽奖|`lottery check`检测中奖|`lottery clear`清理动态
-   > 或者新建文本文档写入`lottery start`然后更改扩展名为.bat点击运行
+   - `lottery start` 启动抽奖
+   - `lottery check` 检测中奖
+   - `lottery clear` 清理动态
+
+    或者 新建文本文档写入`lottery start`然后更改扩展名为.bat点击运行(已自带start.bat可直接点击)
 7. 运行截图
   ![lottery_start](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/lottery_start.png)
 
@@ -207,7 +215,12 @@ rm -rf lottery/
 ----------------------------------------
 
 ## 防重复转发
-脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中
+~~存储在专栏草稿~~
+
+~~脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中~~
+
+是否点赞
+
 
 ----------------------------------------
 
@@ -255,4 +268,4 @@ rm -rf lottery/
 ## 设置说明
 详见[env.example.js](./env.example.js)文件内部注释
 
-详见[my_config.example.js](./my_config.example.js)文件内部注释
+详见[my_config.example.js](./my_config.example.js)文件内部注释

doc/linux_schedule.md

@@ -10,15 +10,14 @@
 2.下载脚本到本地  
 
 ```sh
-git clone https://github.com/shanmite/LotteryAutoScript.git
+git clone https://github.com/shanmiteko/LotteryAutoScript.git
 ```
 
-![image_download](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/image_download.png)  
 
 **注意**: github访问下载速度可能很慢, 如果卡住了可以通过Github镜像网站下载  
 
 ```sh
-git clone https://github.com.cnpmjs.org/shanmite/LotteryAutoScript.git
+git clone https://github.com.cnpmjs.org/shanmiteko/LotteryAutoScript.git
 ```
 
 
@@ -26,6 +25,7 @@ git clone https://github.com.cnpmjs.org/shanmite/LotteryAutoScript.git
 
 ```sh
 mv env.example.js env.js
+mv my_config.example.js my_config.js
 ```
 
 
@@ -38,11 +38,10 @@ vim env.js
 # 此处可查阅Vim的使用手册
 ```
 
-![image-envjs](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/image-envjs.png)  
+详见[env.example.js](https://github.com/shanmiteko/LotteryAutoScript/blob/main/env.example.js)文件内部注释
 
-说明: `"CLEAR"`项设置为`true`, 才可以开启自动清理动态功能  
 
-`"PAT"`和`"GITHUB_REPOSITORY"`不填也行  
+[my_config.example.js](https://github.com/shanmiteko/LotteryAutoScript/blob/main/my_config.example.js)同理
 
 
 ~~5.设置定时工作~~
@@ -54,14 +53,14 @@ vim env.js
 ```sh
 crontab -e
 ```
+cd 后的路径修改为你的脚本路径
+```sh
+SHELL=/bin/bash
+PATH=/sbin:/bin:/usr/sbin/:/usr/bin
 
-![crontab](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/crontab.png)  
-
-`SHELL` 和 `PATH`照着填
-
-`MAILTO`不填也行
-
-注意`HOME`后面跟脚本所在的目录, 这样才能到那个目录下去执行命令
+1 */3 * * * cd /root/LotteryAutoScript && npm i && npm run check
+1 */3 * * * cd /root/LotteryAutoScript && npm i && npm run start
+```
 
 
 6.手动运行一波
@@ -83,4 +82,4 @@ crontab -e
 
 ```sh
 git pull
-```
+```

env.example.js

@@ -1,89 +1,70 @@
-/**
- * ## 账号相关
- * - `COOKIE` 是必填项
- * - `NUMBER` 表示是第几个账号
- * - `CLEAR` 是否启用清理功能
- * - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
- * - `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 中, 参考例子类推
- * - `WAIT` 表示下一个账号运行等待时间(毫秒)
- * 
- * **按顺序依次执行, 防止访问频繁封禁IP**
- */
-const account_parm = {
-    COOKIE: "",
-    NUMBER: 1,
-    CLEAR: true,
-    ENABLE_MULTIPLE_ACCOUNT: false,
-    MULTIPLE_ACCOUNT_PARM: "",
-    LOTTERY_LOG_LEVEL: 3,
-    NOT_GO_LOTTERY: ""
-}
-
-/**
- * 为防止环境变量过长, 请将多账号填在此处
- * @example
- * ```js
- * {
- *     COOKIE: "",
- *     NUMBER: 2,
- *     CLEAR: true,
- *     WAIT: 60 * 1000,
- * },
- * ```
- * 请按照以上格式将参数依次填写在下方
- */
-const multiple_account_parm = [
-    {
+module.exports = Object.freeze({
+    /**
+     * ## 账号相关
+     * - `COOKIE` 是必填项
+     * - `NUMBER` 表示是第几个账号
+     * - `CLEAR` 是否启用清理功能
+     * - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
+     * - `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 中, 参考例子类推
+     * - `WAIT` 表示下一个账号运行等待时间(毫秒)
+     * 
+     * **按顺序依次执行, 防止访问频繁封禁IP**
+     */
+    account_parm: {
         COOKIE: "",
         NUMBER: 1,
         CLEAR: true,
-        WAIT: 60 * 1000,
+
+        ENABLE_MULTIPLE_ACCOUNT: false,
+
+        MULTIPLE_ACCOUNT_PARM: "",
+        LOTTERY_LOG_LEVEL: 3,
+        NOT_GO_LOTTERY: ""
     },
-]
 
-/**
- * 推送相关参数
- */
-const push_parm = {
-    SCKEY: "",
-    SENDKEY: "",
-    QQ_SKEY: "",
-    QQ_MODE: "",
-    BARK_PUSH: "",
-    BARK_SOUND: "",
-    TG_BOT_TOKEN: "",
-    TG_USER_ID: "",
-    TG_PROXY_HOST: "",
-    TG_PROXY_PORT: "",
-    DD_BOT_TOKEN: "",
-    DD_BOT_SECRET: "",
-    QYWX_KEY: "",
-    IGOT_PUSH_KEY: "",
-    PUSH_PLUS_TOKEN: "",
-    PUSH_PLUS_USER: "",
-    SMTP_HOST: "",
-    SMTP_PORT: "",
-    SMTP_USER: "",
-    SMTP_PASS: "",
-    SMTP_TO_USER: ""
-}
+    /**
+     * 为防止环境变量过长, 请将多账号填在此处
+     * 以大括号内容为模板依次复制(包含大括号),逗号分割
+     */
+    multiple_account_parm: [
+        {
+            COOKIE: "",
+            NUMBER: 1,
+            CLEAR: true,
+            WAIT: 60 * 1000
+        }
+    ],
 
-/**
- * 初始化环境变量
- */
-function initEnv() {
-    process.env = {
-        ...process.env,
-        ...account_parm,
-        ...push_parm
+    /**
+     * 推送相关参数
+     */
+    push_parm: {
+        SCKEY: "",
+        SENDKEY: "",
+        QQ_SKEY: "",
+        QQ_MODE: "",
+        BARK_PUSH: "",
+        BARK_SOUND: "",
+        TG_BOT_TOKEN: "",
+        TG_USER_ID: "",
+        TG_PROXY_HOST: "",
+        TG_PROXY_PORT: "",
+        DD_BOT_TOKEN: "",
+        DD_BOT_SECRET: "",
+        QYWX_KEY: "",
+        IGOT_PUSH_KEY: "",
+        PUSH_PLUS_TOKEN: "",
+        PUSH_PLUS_USER: "",
+        SMTP_HOST: "",
+        SMTP_PORT: "",
+        SMTP_USER: "",
+        SMTP_PASS: "",
+        SMTP_TO_USER: ""
     }
-}
-
-
-module.exports = { initEnv, multiple_account_parm };
+})

lib/check.js

@@ -9,9 +9,11 @@ const bili = require('./net/bili')
  */
 async function isMe() {
     let desp = '';
-    const UnreadAtNum = await bili.getUnreadAtNum();
-    const UnreadSessionNum = await bili.getUnreadSessionNum();
-    const { follow_unread, unfollow_unread } = UnreadSessionNum || { unfollow_unread: 0, follow_unread: 0 };
+    const
+        { notice_key_words, update_session_wait, get_session_wait } = config,
+        UnreadAtNum = await bili.getUnreadAtNum(),
+        UnreadSessionNum = await bili.getUnreadSessionNum(),
+        { follow_unread, unfollow_unread } = UnreadSessionNum || { unfollow_unread: 0, follow_unread: 0 };
     if (UnreadAtNum > 0) {
         log.info('中奖检测', '<-- 正在检查at');
         const MyAtInfo = await bili.getMyAtInfo();
@@ -36,8 +38,8 @@ async function isMe() {
                     session_t = session_ts;
                     if (unread_count) {
                         bili.updateSessionStatus(talker_id, type, msg_seqno);
-                        await delay(1000);
-                        if (judge(content, config.notice_key_words)) {
+                        await delay(update_session_wait);
+                        if (judge(content, notice_key_words)) {
                             desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}  \n\n`
                             desp += `用户: ${sender_uid}  \n\n`
                             desp += `私信你(${global_var.get("myUID")})说: ${content}  \n\n`
@@ -47,7 +49,7 @@ async function isMe() {
                     }
                 }
                 if (MySession.has_more && index < 16) {
-                    await delay(3e3);
+                    await delay(get_session_wait);
                     MySession = await bili.getSessionInfo(type, session_t)
                 } else {
                     break

lib/clear.js

@@ -9,20 +9,22 @@ const config = require("./data/config");
  * @returns { Promise<number[]> }
  */
 async function getFollowList() {
-    const tagid = await bili.checkMyPartition(config.clear_partition);
+    const
+        { clear_partition, clear_white_list, get_partition_wait } = config,
+        tagid = await bili.checkMyPartition(clear_partition);
+    let rmup = [];
     if (typeof tagid === 'undefined') {
         log.info('获取关注列表', '未能成功获取关注分区id');
-        return
+        return rmup
     }
-    let rmup = [];
     for (let index = 1; index < 42; index++) {
         const uids = await bili.getPartitionUID(tagid, index);
-        await delay(2e3);
+        await delay(get_partition_wait);
         if (!uids.length) break;
         rmup.push(...uids)
     }
-    return config.clear_white_list.length
-        ? rmup.filter(uid => config.clear_white_list.split(',').indexOf(String(uid)) === -1)
+    return clear_white_list.length
+        ? rmup.filter(uid => clear_white_list.split(',').indexOf(String(uid)) === -1)
         : rmup;
 }
 
@@ -68,7 +70,11 @@ async function clear() {
             for (const [index, dyinfo] of allModifyDynamicResArray.entries()) {
                 log.info('清理动态', `第${page + 1}页中的第${index + 1}个动态`)
                 const { type, dynamic_id, createtime } = dyinfo || {};
-                if (type === clear_dynamic_type) {
+                if (typeof type !== 'undefined'
+                    && clear_dynamic_type instanceof Array
+                    ? clear_dynamic_type.includes(type)
+                    : clear_dynamic_type === type
+                ) {
                     const
                         { origin_uid } = dyinfo,
                         days_ago = (Now - createtime) / 86400;

lib/core/monitor.js

@@ -2,10 +2,10 @@ const utils = require('../utils');
 const bili = require('../net/bili');
 const { sendNotify } = require('../helper/notify');
 const event_bus = require('../helper/event_bus');
+const { randomDynamic } = require('../helper/randomDynamic')
 const { Searcher } = require('./searcher');
 const global_var = require("../data/global_var");
 const config = require("../data/config");
-const d_storage = require('../helper/d_storage');
 const { log, hasEnv } = utils;
 
 /**
@@ -82,14 +82,16 @@ class Monitor extends Searcher {
      */
     async startLottery() {
         const allLottery = await this.filterLotteryInfo()
-            , len = allLottery.length;
+            , len = allLottery.length
+            , { create_dy, create_dy_mode, wait } = config;
 
         log.info('筛选动态', `筛选完毕(${len})`);
 
         if (len) {
             let is_exception = false;
-            for (const Lottery of utils.shuffle(allLottery)) {
+            for (const [index, Lottery] of utils.shuffle(allLottery).entries()) {
                 let status = 0;
+
                 if (Lottery.isOfficialLottery) {
                     let { ts } = await bili.getLotteryNotice(Lottery.dyid);
                     const ts_10 = Date.now() / 1000;
@@ -98,12 +100,10 @@ class Monitor extends Searcher {
                     }
                     if (ts < ts_10) {
                         log.info('过滤', '已过开奖时间')
-                        d_storage.updateDyid(Lottery.dyid)
                         continue
                     }
                     if (ts > ts_10 + config.maxday * 86400) {
                         log.info('过滤', '超过指定开奖时间')
-                        d_storage.updateDyid(Lottery.dyid)
                         continue
                     }
                 } else if (Lottery.uid[0]) {
@@ -113,10 +113,19 @@ class Monitor extends Searcher {
                     }
                     if (followerNum < config.minfollower) {
                         log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
-                        d_storage.updateDyid(Lottery.dyid)
                         continue
                     }
                 }
+
+                if (create_dy
+                    && create_dy_mode instanceof Array
+                    && index > 0
+                    && index % utils.getRandomOne(create_dy_mode[0]) === 0
+                ) {
+                    const number = utils.getRandomOne(create_dy_mode[1]) || 0;
+                    randomDynamic(number)
+                }
+
                 status = await this.go(Lottery)
                 switch (status) {
                     case 0:
@@ -127,8 +136,8 @@ class Monitor extends Searcher {
                     default:
                         return status
                 }
-                d_storage.updateDyid(Lottery.dyid)
-                await utils.delay(config.wait * (Math.random() + 0.5));
+
+                await utils.delay(wait * (Math.random() + 0.5));
             }
             log.info('抽奖', '开始转发下一组动态');
             if (is_exception) {
@@ -170,6 +179,7 @@ class Monitor extends Searcher {
         /** 所有抽奖信息 */
         let alllotteryinfo = [];
         const { key_words, model, chatmodel, is_imitator, only_followed, at_users, blockword, blacklist } = config;
+
         /**Map<String, Boolean> */
         let dyids_map = new Map();
 
@@ -182,24 +192,15 @@ class Monitor extends Searcher {
             return true
         });
 
-        /**并发查询dyid */
-        await Promise.all(
-            [...dyids_map.keys()]
-                .map(it => d_storage
-                    .searchDyid(it)
-                    .then(hasIt => dyids_map.set(it, hasIt))
-                )
-        )
-
         /* 检查动态是否满足要求 */
         await utils.try_for_each(protoLotteryInfo, async function ({
-            lottery_info_type, uids,
-            uname, dyid,
+            lottery_info_type, is_liked,
+            uids, uname, dyid,
             ctrl, rid, des, type,
             hasOfficialLottery
         }) {
             /* 遇到转发过就退出 */
-            if (dyids_map.get(dyid)) return false;
+            if (is_liked) return false;
 
             const
                 /**判断是转发源动态还是现动态 */
@@ -331,39 +332,51 @@ class Monitor extends Searcher {
             log.info('NOT_GO_LOTTERY', 'ON');
             return 0
         }
+
         const { uid, dyid, chat_type, rid, relay_chat, ctrl } = option;
+
         /* 评论 */
         if (rid && chat_type) {
-            let status = 0;
-            const max_retry_times = 5;
-            for (let times = 0; times < max_retry_times; times++) {
-                status = await bili.sendChat(rid, utils.getRandomOne(config.chat), chat_type)
-                if (status === -1) {
-                    return 0
+            let status = 0
+            const
+                { chat } = config,
+                retry = [...new Array(5).keys()],
+                max_retry_times = retry.length;
+            await utils.try_for_each(retry, async (times) => {
+                status = await bili.sendChat(rid, utils.getRandomOne(chat), chat_type)
+                switch (status) {
+                    case 0:
+                        return true
+                    case -1:
+                        log.warn('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                        return true
+                    default:
+                        log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                        log.info('自动评论', `将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
+                        await utils.delay(60 * 1000 * (times + 1))
+                        return false
                 }
-                if (!status) {
-                    break
-                }
-                log.info('自动评论', `将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
-                await utils.delay(60 * 1000 * (times + 1))
-            }
-            if (status) return 11;
+            })
+            if (status) return 10 + status;
         }
 
         /* 关注 */
-        const [u1, u2] = uid
-        if (u1) {
-            let status = await bili.autoAttention(u1)
-            if (status) return 20 + status;
-            status = await bili.movePartition(u1, this.tagid)
-            if (status) return 20 + status;
-            if (u2) {
-                utils.delay(5000)
-                status = await bili.autoAttention(u2)
-                if (status) return 20 + status;
-                status = await bili.movePartition(u2, this.tagid)
-                if (status) return 20 + status;
-            }
+        if (uid.length) {
+            let status = 0
+            await utils.try_for_each(uid, async (u) => {
+                status = await bili.autoAttention(u)
+                switch (status) {
+                    case 0:
+                        return false
+                    case -1:
+                        log.warn('抽奖信息', `uid: ${u},dyid: ${dyid}`)
+                        return true
+                    default:
+                        log.error('抽奖信息', `uid: ${u},dyid: ${dyid}`)
+                        return true
+                }
+            })
+            if (status) return 20 + status
         }
 
         /* 点赞 */

lib/core/searcher.js

@@ -1,7 +1,6 @@
 const utils = require('../utils');
 const bili = require('../net/bili');
 const config = require("../data/config");
-const d_storage = require('../helper/d_storage');
 
 const { log } = utils
 
@@ -11,6 +10,7 @@ const { log } = utils
  * @typedef {object} UsefulDynamicInfo
  * @property {number} uid
  * @property {string} uname
+ * @property {boolean} is_liked
  * @property {number} createtime 10
  * @property {string} rid_str
  * @property {string} dynamic_id
@@ -35,13 +35,16 @@ function parseDynamicCard(dynamic_detail_card) {
     /**临时储存单个动态中的信息 */
     let obj = {};
     const { desc, card, extension, extend_json } = dynamic_detail_card
-        , { info } = desc.user_profile
+        , { is_liked = 1, user_profile = {} } = desc
+        , { info = {} } = user_profile
         , cardToJson = strToJson(card)
         , { item } = cardToJson;
     /* 转发者的UID */
-    obj.uid = info.uid;
+    obj.uid = desc.uid
     /* 转发者的name */
-    obj.uname = info.uname;
+    obj.uname = info.uname || ''
+    /* 动态是否点过赞 */
+    obj.is_liked = is_liked > 0
     /* 动态的ts10 */
     obj.createtime = desc.timestamp
     /* 动态类型 */
@@ -132,6 +135,7 @@ class Searcher {
      * 整理后的抽奖信息
      * @typedef {object} LotteryInfo
      * @property {string} lottery_info_type
+     * @property {boolean} is_liked
      * @property {number[]} uids `[uid,ouid]`
      * @property {string} uname
      * @property {Array<{}>} ctrl
@@ -211,23 +215,54 @@ class Searcher {
      */
     async getLotteryInfoByUID(UID) {
         log.info('获取动态', `开始获取用户${UID}的动态信息`);
-        const { allModifyDynamicResArray } = await Searcher.checkAllDynamic(UID, config.uid_scan_page, config.search_wait);
+        const
+            { uid_scan_page, search_wait, get_dynamic_detail_wait } = config,
+            { allModifyDynamicResArray } = await Searcher.checkAllDynamic(UID, uid_scan_page, search_wait);
 
-        if (!allModifyDynamicResArray.length) return null;
+        let { length } = allModifyDynamicResArray
+
+        if (!length) return null;
+
+        const fomatdata = await allModifyDynamicResArray
+            .filter(d => {
+                if (d.type === 1) {
+                    return true
+                } else {
+                    length--
+                    return false
+                }
+            })
+            .reduce(async (pre, cur) => {
+                const results = await pre
+                    , { origin_dynamic_id } = cur;
+
+                log.info('获取动态', `查看源动态(${origin_dynamic_id})的细节 (${length--})`)
+
+                const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
+
+                if (card) {
+                    await utils.delay(get_dynamic_detail_wait)
+
+                    const { is_liked } = parseDynamicCard(card)
+
+                    return [...results, {
+                        lottery_info_type: 'uid',
+                        is_liked,
+                        uids: [cur.uid, cur.origin_uid],
+                        uname: cur.origin_uname,
+                        ctrl: [],
+                        dyid: cur.origin_dynamic_id,
+                        rid: cur.origin_rid_str,
+                        des: cur.origin_description,
+                        type: cur.orig_type,
+                        hasOfficialLottery: cur.origin_hasOfficialLottery
+                    }]
+                }
+
+                return results
+
+            }, Promise.resolve([]))
 
-        const fomatdata = allModifyDynamicResArray.map(o => {
-            return {
-                lottery_info_type: 'uid',
-                uids: [o.uid, o.origin_uid],
-                uname: o.origin_uname,
-                ctrl: [],
-                dyid: o.origin_dynamic_id,
-                rid: o.origin_rid_str,
-                des: o.origin_description,
-                type: o.orig_type,
-                hasOfficialLottery: o.origin_hasOfficialLottery
-            }
-        }).filter(a => a.type != 0)
         log.info('获取动态', `成功获取用户${UID}的动态信息`);
 
         return fomatdata;
@@ -240,6 +275,7 @@ class Searcher {
      */
     async getLotteryInfoByTag(tag_name) {
         const
+            { tag_scan_page, search_wait } = config,
             tag_id = await bili.getTagIDByTagName(tag_name),
             hotdy = await bili.getHotDynamicInfoByTagID(tag_id),
             modDR = modifyDynamicRes(hotdy);
@@ -255,7 +291,7 @@ class Searcher {
         let mDRdata = modDR.modifyDynamicResArray;
         let next_offset = modDR.nextinfo.next_offset;
 
-        for (let index = 0; index < config.tag_scan_page; index++) {
+        for (let index = 0; index < tag_scan_page; index++) {
             log.info('获取动态', `读取第${index + 1}页动态`);
             const
                 newdy = await bili.getOneDynamicInfoByTag(tag_name, next_offset),
@@ -266,11 +302,12 @@ class Searcher {
             mDRdata.push.apply(mDRdata, _modify.modifyDynamicResArray);
             next_offset = _modify.nextinfo.next_offset;
 
-            await utils.delay(config.search_wait);
+            await utils.delay(search_wait);
         }
         const fomatdata = mDRdata.map(o => {
             return {
                 lottery_info_type: 'tag',
+                is_liked: o.is_liked,
                 uids: [o.uid, o.origin_uid],
                 uname: o.uname,
                 ctrl: o.ctrl,
@@ -292,7 +329,9 @@ class Searcher {
      */
     async getLotteryInfoByArticle(key_words) {
         log.info('获取动态', `开始获取含关键词${key_words}的专栏信息`);
-        const cvs = (await bili.searchArticlesByKeyword(key_words)).slice(0, config.article_scan_page);
+        const
+            { article_scan_page, not_check_article, get_dynamic_detail_wait } = config,
+            cvs = (await bili.searchArticlesByKeyword(key_words)).slice(0, article_scan_page);
 
         /**存储所有专栏中的dyid */
         let dyinfos = [];
@@ -311,36 +350,32 @@ class Searcher {
                 /**单个专栏中的dyid */
                 _dyinfos = [];
             log.info('获取动态', `提取专栏(${cv})中提及的dyid(${length})`)
+
             /**遍历某专栏中的dyids */
             for (const dyid of dyids_set) {
-                const isRelayed = await d_storage.searchDyid(dyid);
-                if (isRelayed) {
-                    _weight += 1;
-                }
-                if (_weight >= weight) {
-                    log.warn('获取动态', `1/2动态曾经转过,该专栏或已查看,故中止`)
-                    _dyinfos = []
-                    break
-                }
                 if (dyid.length === utils.dyid_length) {
-                    if (!isRelayed) {
-                        log.info('获取动态', `查看动态(${dyid})的细节 (${length--})`)
-                        const res = await bili.getOneDynamicByDyid(dyid)
-                            , { code, data } = utils.strToJson(res)
-                            , { card } = data || {};
+                    log.info('获取动态', `查看专栏中所提及动态(${dyid})的细节 (${length--})`)
 
-                        if (code !== 0) {
-                            log.error('获取动态', '获取动态数据出错,可能是访问太频繁 \n' + res)
+                    const card = await bili.getOneDynamicByDyid(dyid)
+
+                    if (card) {
+                        await utils.delay(get_dynamic_detail_wait)
+
+                        const parsed_card = parseDynamicCard(card)
+                            , { is_liked } = parsed_card;
+
+                        if (is_liked) {
+                            log.info('获取动态', `动态(${dyid})已转发过`)
+                            _weight += 1;
+                        }
+
+                        if (_weight >= weight && !not_check_article) {
+                            log.warn('获取动态', `1/2动态曾经转过,该专栏或已查看,故中止`)
+                            _dyinfos = []
                             break
                         }
 
-                        await utils.delay(2000)
-
-                        if (card) {
-                            _dyinfos.push(parseDynamicCard(card));
-                        }
-                    } else {
-                        log.info('获取动态', `动态(${dyid})已转发过 (${length--})`)
+                        _dyinfos.push(parsed_card);
                     }
                 } else {
                     log.warn('获取动态', `动态(${dyid})无效 (${length--})`)
@@ -351,6 +386,7 @@ class Searcher {
         const fomatdata = dyinfos.map(o => {
             return {
                 lottery_info_type: 'article',
+                is_liked: o.is_liked,
                 uids: [o.uid, o.origin_uid],
                 uname: o.uname,
                 ctrl: o.ctrl,
@@ -368,4 +404,4 @@ class Searcher {
 }
 
 
-module.exports = { Searcher };
+module.exports = { Searcher };

lib/data/config.js

@@ -1,19 +1,311 @@
 const { config_file } = require('../utils');
-const my_config = require(config_file);
 
 const config = {
-    ...my_config["default_config"],
+    /**
+     * 监视更转的用户uid
+     */
+    UIDs: [],
+
+    /**
+     * 监视的专栏关键词
+     */
+    Articles: [],
+
+    /**
+     * 监视的tag
+     */
+    TAGs: [],
+
+    /**
+     * 动态中的关键词(表示须同时满足以下条件)
+     * 符合js正则表达式的字符串
+     */
+    key_words: [
+        "[抽奖]",
+        "[转关].*[转关]"
+    ],
+
+    /**
+     * - '00' 关闭自动抽奖
+     * - '10' 只转发官方抽奖
+     * - '01' 只转发非官方抽奖
+     * - '11' 都转
+     */
+    model: '11',
+
+    /**
+     * - '00'关闭自动评论
+     * - '10'只评论官抽
+     * - '01'只评论非官抽
+     * - '11'都评论
+     */
+    chatmodel: '01',
+
+    /**
+     * 不加判断的转发所监视的uid转发的动态
+     */
+    is_imitator: false,
+
+    /**
+     * - 在uid里检索的页数
+     */
+    uid_scan_page: 3,
+
+    /**
+     * - 在tag里检索的页数
+     */
+    tag_scan_page: 3,
+
+    /**
+     * - 获取专栏数量
+     */
+    article_scan_page: 3,
+
+    /**
+     * - 不检查专栏是否看过，若选择检查可以提高检测效率
+     * - 默认false(检查)
+     */
+    not_check_article: false,
+
+    /**
+     * - 开奖时间距离现在的最大天数
+     * - 默认不限制
+     */
+    maxday: Infinity,
+
+    /**
+     *  - 循环等待时间(指所有操作完毕后的休眠时间)
+     *  - 单位毫秒
+     */
+    lottery_loop_wait: 0,
+    check_loop_wait: 0,
+    clear_loop_wait: 0,
+    update_loop_wait: 0,
+
+    /**
+     * - 转发间隔时间
+     * - 单位毫秒
+     * - 上下浮动50%
+     */
+    wait: 30 * 1000,
+
+    /**
+     * - 检索动态间隔
+     * - 单位毫秒
+     */
+    search_wait: 1000,
+
+    /**
+     * - 读取下一页私信间隔
+     * - 单位毫秒
+     */
+    get_session_wait: 3000,
+
+    /**
+     * - 已读私信间隔
+     * - 单位毫秒
+     */
+    update_session_wait: 1000,
+
+    /**
+     * - 读取下一页关注列表间隔
+     * - 单位毫秒
+     */
+    get_partition_wait: 2000,
+
+    /**
+     * - 获取动态细节间隔
+     * - 单位毫秒
+     */
+    get_dynamic_detail_wait: 2000,
+
+    /**
+     * - 随机动态间隔
+     * - 单位毫秒
+     */
+    random_dynamic_wait: 2000,
+
+    /**
+     * - up主粉丝数限制
+     */
+    minfollower: 1000,
+
+    /**
+     * - 只转发已关注的
+     */
+    only_followed: false,
+
+    /**
+     * - 是否发送随机动态(防止被开奖机过滤)
+     */
+    create_dy: false,
+
+    /**
+     * 随机动态类型
+     * - 0 自定义文字与图片
+     * - 1 推荐视频
+     * - -1 混合
+     */
+    create_dy_type: 0,
+
+    /**
+     * - 结束运行时发送随机动态的数量
+     */
+    create_dy_num: 1,
+
+    /**
+     * - 随机动态内容
+     * - 类型 `content[]`
+     * @typedef Picture
+     * @property {string} img_src 站内源
+     * @property {number} img_width
+     * @property {number} img_height
+     * @param { string | Picture[] } content
+     */
+    dy_contents: ['[doge]', '[doge][doge]'],
+
+    /**
+     * - 每转发x条抽奖动态就发送x条随机动态
+     * - @example [[10,11,9],[6,8,9]] 每转发9,10,11条抽奖动态就发送6,8,9条随机动态
+     */
+    create_dy_mode: [[0], [0]],
+
+    /**
+     * 转发时[at]的用户
+     */
+    at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],
+
+    /**
+     * - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
+     * - 英文逗号分隔 如: 1,2,3
+     */
+    blacklist: '',
+
+    /**
+     * 屏蔽词
+     */
+    blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号", "钓鱼", "涨粉"],
+
+    /**
+     * 转发评语
+     */
+    relay: ['转发动态'],
+
+    /**
+     * 评论内容
+     */
+    chat: [
+        '[OK]', '[星星眼]', '[歪嘴]', '[喜欢]', '[偷笑]', '[笑]', '[喜极而泣]', '[辣眼睛]', '[吃瓜]', '[奋斗]',
+        '永不缺席 永不中奖 永不放弃！', '万一呢', '在', '冲吖~', '来了', '万一', '[保佑][保佑]', '从未中，从未停', '[吃瓜]', '[抠鼻][抠鼻]',
+        '来力', '秋梨膏', '[呲牙]', '从不缺席', '分子', '可以', '恰', '不会吧', '1', '好',
+        'rush', '来来来', 'ok', '冲', '凑热闹', '我要我要[打call]', '我还能中！让我中！！！', '大家都散了吧，已经抽完了，是我的', '我是天选之子', '给我中一次吧！',
+        '坚持不懈，迎难而上，开拓创新！', '[OK][OK]', '我来抽个奖', '中中中中中中', '[doge][doge][doge]', '我我我',
+    ],
+
+    /**
+     * - 抽奖UP用户分组id(网页端点击分区后地址栏中的tagid)
+     * - 自动获取
+     */
+    partition_id: 0,
+
+    /**
+     * 是否关注异常
+     */
+    is_exception: false,
+
+    /**
+     * - 中奖通知关键词(满足一个就推送)
+     * - 符合js正则表达式的字符串
+     * - 若以 ~ 开头则表示为黑名单规则
+     */
+    notice_key_words: [
+        "中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员",
+        "~有奖预约通知"
+    ],
+
+    /**
+     * - 清理白名单uid或dyid
+     * - 英文逗号分隔 如: 1,2,3
+     */
+    clear_white_list: '',
+
+    /**
+     * - 取关分区
+     * - 默认为: 此处存放因抽奖临时关注的up
+     */
+    clear_partition: '',
+
+    /**
+     * 清理多少天之前的动态或关注
+     */
+    clear_max_day: 30,
+
+    /**
+     * - 快速移除关注
+     * - 不加判断只去除关注
+     */
+    clear_quick_remove_attention: false,
+
+    /**
+     * 是否移除动态
+     */
+    clear_remove_dynamic: true,
+
+    /**
+     * 是否移除关注
+     */
+    clear_remove_attention: true,
+
+    /**
+     * 清除动态延时(毫秒)
+     */
+    clear_remove_delay: 8000,
+
+    /**
+     * 清除动态类型
+     * 
+     * | 动态类型   | type值 |
+     * | :------- |:----- |
+     * | 无        | `0`    |
+     * | 转发       | `1`    |
+     * | 含图片     | `2`    |
+     * | 无图纯文字  | `4`    |
+     * | 视频       | `8`    |
+     * | 番剧       | `512`  |
+     * | 活动       | `2048` |
+     * | 专栏       | `64`   |
+     * 
+     * @example
+     * 1
+     * [1,2,4]
+     */
+    clear_dynamic_type: [1],
+
+    /**
+     * 原始设置
+     * @returns {Object}
+     */
+    raw_config() {
+        delete require.cache[config_file];
+        return require(config_file)
+    },
+
     /**
      * @param {string} n
      */
     updata(n) {
-        const new_config = my_config[`config_${n}`];
+        const new_config = this.raw_config()[`config_${n}`];
         if (new_config) {
-            Object.entries(new_config)
-                .forEach(([k, v]) => this[k] = v)
+            this.setObject(new_config)
         }
     },
-    init () {
+
+    init() {
+        this.setObject(this.raw_config()["default_config"])
+    },
+
+    setObject(o = {}) {
+        Object.entries(o).forEach(([k, v]) => this[k] = v)
     }
 };
 

lib/data/env.js

@@ -0,0 +1,34 @@
+const { env_file } = require("../utils");
+
+const env = {
+    /**
+     * 原始环境
+     * @returns {Object}
+     */
+    raw_env() {
+        delete require.cache[env_file];
+        return require(env_file)
+    },
+    init() {
+        const raw_env = this.raw_env()
+        this.setEnv({
+            ...raw_env["account_parm"],
+            ...raw_env["push_parm"]
+        })
+    },
+    /**
+     * @returns {Object[]}
+     */
+    get_multiple_account() {
+        return this.raw_env()["multiple_account_parm"]
+    },
+    setEnv(o) {
+        process.env = {
+            ...process.env,
+            ...o
+        }
+    }
+}
+
+
+module.exports = env;

lib/data/global_var.js

@@ -1,4 +1,4 @@
-const { getRemoteConfig, createDir, createFile } = require("../utils");
+const { getRemoteConfig } = require("../utils");
 const config = require("../data/config");
 
 const key_map = new Map([['DedeUserID', 'myUID'], ['bili_jct', 'csrf']]);
@@ -15,9 +15,8 @@ let global_var = {
      * 全局变量初始化
      * 更新config
      * @param {string} cookie
-     * @param {number} n
      */
-    async init(cookie, n) {
+    async init(cookie) {
         if (cookie) {
             config.updata(process.env.NUMBER);
 
@@ -37,8 +36,6 @@ let global_var = {
             ]);
             this.set('remoteconfig', await getRemoteConfig());
         }
-        await createDir('dyids');
-        await createFile(n < 2 ? 'dyid.txt' : `dyid${n}.txt`, '', 'a')
     }
 };
 

lib/helper/d_storage.js

@@ -1,52 +0,0 @@
-const { log, readDyidFile, writeDyidFile, dyid_length } = require("../utils");
-
-const d_storage = {
-    /**
-     * 搜索dyid
-     * @param {string} dyid
-     * @returns {Promise<boolean>}
-     */
-    searchDyid: (dyid) => {
-        return new Promise((resolve) => {
-            const Rdyid = new RegExp(dyid);
-            const rs = readDyidFile(Number(process.env.NUMBER));
-            let status = false;
-            rs.on('data', chunk => {
-                if (Rdyid.test(chunk)) {
-                    status = true
-                }
-            })
-            rs.on('end', () => {
-                resolve(status)
-            })
-            rs.on('error', err => {
-                log.error('搜索dyid', err)
-                resolve(status)
-            })
-        })
-    },
-    /**
-     * 更新dyid
-     * @param {string} dyid
-     */
-    updateDyid: (dyid) => {
-        log.info('更新dyid', `写入${dyid}`);
-        if (dyid.length !== dyid_length) {
-            log.error('更新dyid', `dyid(${dyid})长度不为18 若出现此问题请即时通知开发者`)
-        }
-        return new Promise((resolve) => {
-            const ws = writeDyidFile(Number(process.env.NUMBER));
-            ws.write(dyid + ',', () => {
-                ws.destroy();
-                resolve()
-            })
-            ws.on('error', err => {
-                log.error('更新dyid', err)
-                resolve()
-            })
-        });
-    }
-}
-
-
-module.exports = d_storage;

lib/helper/randomDynamic.js

@@ -0,0 +1,39 @@
+const config = require("../data/config");
+const bili = require("../net/bili");
+const utils = require("../utils");
+
+/**
+ * 随机动态
+ * @param {number} num
+ * @returns
+ */
+async function randomDynamic(num) {
+    const { create_dy_type, dy_contents, random_dynamic_wait } = config;
+
+    if (create_dy_type === -1 || create_dy_type === 0 || typeof create_dy_type === 'undefined') {
+        for (let index = 0; index < num; index++) {
+            await bili.createDynamic(utils.getRandomOne(dy_contents));
+            await utils.delay(random_dynamic_wait);
+        }
+    }
+
+    if (create_dy_type === -1 || create_dy_type === 1) {
+        let videos = await bili.getTopRcmd()
+        for (let index = 0; videos.length < num; index++) {
+            videos.push(...await bili.getTopRcmd())
+        }
+
+        await utils.try_for_each(videos, async ([uid, aid]) => {
+            if (num--) {
+                await bili.shareVideo(uid, aid)
+                await utils.delay(random_dynamic_wait)
+                return false
+            } else {
+                return true
+            }
+        })
+    }
+}
+
+
+module.exports = { randomDynamic }

lib/lottery.js

@@ -1,10 +1,10 @@
 const utils = require('./utils');
-const bili = require('./net/bili');
 const event_bus = require('./helper/event_bus');
 const global_var = require('./data/global_var');
 const { Searcher } = require('./core/searcher');
 const { Monitor } = require('./core/monitor');
 const config = require('./data/config');
+const { randomDynamic } = require('./helper/randomDynamic');
 const { log } = utils;
 
 async function createRandomDynamic(num) {
@@ -12,10 +12,7 @@ async function createRandomDynamic(num) {
         log.info('随机动态', `准备创建${num}条随机动态`);
         const Dynamic = await Searcher.checkAllDynamic(global_var.get("myUID"), 1);
         if ((Dynamic.allModifyDynamicResArray[0] || { type: 0 }).type === 1) {
-            for (let index = 0; index < num; index++) {
-                await bili.createDynamic(utils.getRandomOne(config.dy_contents));
-                await utils.delay(2000);
-            }
+            await randomDynamic(num)
         } else {
             log.info('随机动态', '已有非抽奖动态故无需创建');
         }
@@ -39,7 +36,6 @@ function start() {
                 return;
             }
             if (times.value() === lotterys.length) {
-                await createRandomDynamic(config.create_dy_num);
                 log.info('抽奖', '所有动态转发完毕');
                 times.clear();
                 event_bus.emit('Turn_off_the_Monitor', '目前无抽奖信息,过一会儿再来看看吧')

lib/net/api.bili.js

@@ -1,6 +1,7 @@
 module.exports = Object.freeze({
     DYNAMIC_LIKE_THUMB: 'https://api.vc.bilibili.com/dynamic_like/v1/dynamic_like/thumb',
     DYNAMIC_REPOST_REPOST: 'https://api.vc.bilibili.com/dynamic_repost/v1/dynamic_repost/repost',
+    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',
@@ -25,6 +26,7 @@ module.exports = Object.freeze({
     SESSION_SVR_UPDATE_ACK: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack',
     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",
     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/update.js

@@ -28,7 +28,7 @@ function getLatestReleaseDownloadUrl(owner, repo) {
                             ['darwin', 'macos']
                         ]).get(process.platform)
                         const arch = new Map([
-                            ['x64', 'x64']
+                            ['x64', 'x64'],
                             ['arm', 'armv7'],
                             ['arm64', 'arm64']
                         ]).get(process.arch)

lib/utils.js

@@ -13,8 +13,6 @@ const utils = {
     env_file: path.join(process.cwd(), "env.js"),
     /**配置文件 */
     config_file: path.join(process.cwd(), "my_config.js"),
-    /**dyid存储文件 */
-    dyids_dir: path.join(process.cwd(), "dyids"),
     /**dyid长度 */
     dyid_length: 18,
     /**
@@ -79,10 +77,10 @@ const utils = {
     },
     /**
      * 延时函数
-     * @param {number} time ms
+     * @param {number} [time] ms
      * @returns {Promise<void>}
      */
-    delay(time) {
+    delay(time = 1000) {
         utils.log.info('时延', `${~~time}ms`);
         return new Promise(resolve => {
             setTimeout(() => {
@@ -294,50 +292,6 @@ const utils = {
                 resolve()
             })
         });
-    },
-    /**
-     * CreateFile
-     * @param {string} filepath 相对于dyids的文件路径
-     * @param {string} [defaultValue] 写入默认值
-     * @param {string} flag
-     * @returns {Promise<void>}
-     */
-    createFile(filepath, defaultValue, flag) {
-        const fpath = path.join(utils.dyids_dir, filepath);
-        const buffer = Buffer.from(defaultValue);
-        return new Promise((resolve, rejects) => {
-            fs.open(fpath, flag, (err, fd) => {
-                if (err) {
-                    rejects(err)
-                } else {
-                    fs.write(fd, buffer, 0, buffer.length, 0, err => {
-                        if (err) {
-                            rejects(err)
-                        } else {
-                            resolve();
-                        }
-                    })
-                }
-            })
-        });
-    },
-    /**
-     * 读取dyid文件
-     * @param {number} num
-     * @returns {fs.ReadStream}
-     */
-    readDyidFile(num) {
-        const fpath = num < 2 ? path.join(utils.dyids_dir, 'dyid.txt') : path.join(utils.dyids_dir, `dyid${num}.txt`);
-        return fs.createReadStream(fpath, { encoding: 'utf8', highWaterMark: (utils.dyid_length + 1) * 1000 })
-    },
-    /**
-     * 追加dyid
-     * @param {number} num
-     * @returns {fs.WriteStream}
-     */
-    writeDyidFile(num) {
-        const fpath = num < 2 ? path.join(utils.dyids_dir, 'dyid.txt') : path.join(utils.dyids_dir, `dyid${num}.txt`);
-        return fs.createWriteStream(fpath, { flags: 'a' })
     }
 };
 

main.js

@@ -95,15 +95,21 @@ async function main() {
     }
 }
 
-(async function () {
-    log.proPrint(metainfo, '\n')
-
+/**
+ * 初始化环境
+ * @returns {boolean} 出错true
+ */
+function initEnv() {
     if (hasFileOrDir(env_file)) {
-        const { initEnv, multiple_account_parm } = require(env_file);
+        const
+            env = require("./lib/data/env"),
+            multiple_account_parm = env.get_multiple_account();
+
         if (multiple_account_parm) {
             multiple_account = multiple_account_parm;
         }
-        initEnv();
+
+        env.init();
         log.init();
         log.info('环境变量初始化', '成功加载env.js文件');
     } else if (hasEnv('COOKIE') || hasEnv('MULTIPLE_ACCOUNT_PARM')) {
@@ -112,17 +118,34 @@ async function main() {
     } else {
         log.init();
         log.error('环境变量初始化', '未在当前目录下找到env.js文件或者在环境变量中设置所需参数');
-        return
+        return true
     }
 
+    return false
+}
+
+/**
+ * 初始化设置
+ * @returns {boolean} 出错true
+ */
+function initConfig() {
     if (hasFileOrDir(config_file)) {
-        require("./lib/data/config");
+        const config = require("./lib/data/config");
+        config.init();
         log.info('配置文件初始化', '成功加载my_config.js文件');
     } else {
         log.error('配置文件初始化', '未在当前目录下找到my_config.js文件');
-        return
+        return true
     }
 
+    return false
+}
+
+(async function () {
+    log.proPrint(metainfo, '\n')
+
+    if (initEnv() || initConfig()) return;
+
     /**OPTIONS */
     process.env.lottery_mode = process.argv[2]
 
@@ -135,6 +158,7 @@ async function main() {
         while (loop_wait) {
             log.info('程序休眠', `${loop_wait / 1000}秒后再次启动`)
             await delay(loop_wait)
+            if (initEnv() || initConfig()) return;
             await main()
         }
         log.info('结束运行', '未在config.js中设置休眠时间')

my_config.example.js

@@ -1,4 +1,4 @@
-module.exports = {
+module.exports = Object.freeze({
     /** 
      * 默认设置(公用)
      */
@@ -7,7 +7,6 @@ module.exports = {
          * 监视更转的用户uid
          */
         UIDs: [
-            31252386,
             689277291,
             241675899
         ],
@@ -74,6 +73,12 @@ module.exports = {
          */
         article_scan_page: 3,
 
+        /**
+         * - 不检查专栏是否看过，若选择检查可以提高检测效率
+         * - 默认false(检查)
+         */
+        not_check_article: false,
+
         /**
          * - 开奖时间距离现在的最大天数
          * - 默认不限制
@@ -102,6 +107,36 @@ module.exports = {
          */
         search_wait: 1000,
 
+        /**
+         * - 读取下一页私信间隔
+         * - 单位毫秒
+         */
+        get_session_wait: 3000,
+
+        /**
+         * - 已读私信间隔
+         * - 单位毫秒
+         */
+        update_session_wait: 1000,
+
+        /**
+         * - 读取下一页关注列表间隔
+         * - 单位毫秒
+         */
+        get_partition_wait: 2000,
+
+        /**
+         * - 获取动态细节间隔
+         * - 单位毫秒
+         */
+        get_dynamic_detail_wait: 2000,
+
+        /**
+         * - 随机动态间隔
+         * - 单位毫秒
+         */
+        random_dynamic_wait: 2000,
+
         /**
          * - up主粉丝数限制
          */
@@ -118,15 +153,21 @@ module.exports = {
         create_dy: false,
 
         /**
-         * - 发送随机动态的数量
+         * 随机动态类型
+         * - 0 自定义文字与图片
+         * - 1 推荐视频
+         * - -1 混合
+         */
+        create_dy_type: 0,
+
+        /**
+         * - 结束运行时发送随机动态的数量
          */
         create_dy_num: 1,
 
         /**
          * - 随机动态内容
          * - 类型 `content[]`
-         */
-        /**
          * @typedef Picture
          * @property {string} img_src 站内源
          * @property {number} img_width
@@ -135,6 +176,12 @@ module.exports = {
          */
         dy_contents: ['[doge]', '[doge][doge]'],
 
+        /**
+         * - 每转发x条抽奖动态就发送x条随机动态
+         * - @example [[10,11,9],[6,8,9]] 每转发9,10,11条抽奖动态就发送6,8,9条随机动态
+         */
+        create_dy_mode: [[0], [0]],
+
         /**
          * 转发时[at]的用户
          */
@@ -236,10 +283,15 @@ module.exports = {
          * | 含图片     | `2`    |
          * | 无图纯文字  | `4`    |
          * | 视频       | `8`    |
+         * | 番剧       | `512`  |
          * | 活动       | `2048` |
          * | 专栏       | `64`   |
+         * 
+         * @example
+         * 1
+         * [1,2,4]
          */
-        clear_dynamic_type: 1
+        clear_dynamic_type: [1]
     },
 
     /**
@@ -249,4 +301,4 @@ module.exports = {
     config_1: {},
     config_2: {},
     config_3: {}
-}
+})

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lottery-auto-script",
-  "version": "2.1.3",
+  "version": "2.2.4",
   "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {
@@ -52,4 +52,4 @@
     "chalk": "^4.1.1",
     "nodemailer": "^6.5.0"
   }
-}
+}

script/docker/init.sh

@@ -3,8 +3,6 @@ set -e
 
 # 脚本根目录
 SCRIPT_FOLDER=lottery
-# dyid存放目录
-DYID_FOLDER=dyids
 # 设置环境变量文件
 ENV_FILE=env.js
 # 自定义设置文件
@@ -26,14 +24,6 @@ fi
 
 cd $SCRIPT_FOLDER/
 
-# 新建dyid储存目录
-if [ ! -d "$DYID_FOLDER" ]; then
-    echo "create $DYID_FOLDER/"
-    mkdir $DYID_FOLDER
-else
-    echo "$DYID_FOLDER/ exists"
-fi
-
 # 新建环境变量设置文件
 if [ ! -f "$ENV_FILE" ]; then
     echo "create $ENV_FILE"
@@ -58,7 +48,6 @@ echo -e "#!/bin/bash\n\
 docker run \
 -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
 -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
--v $PWD/$DYID_FOLDER/:/lottery/$DYID_FOLDER/ \
 $DOCKER_REPO \
 start" \
 > start.sh
@@ -69,7 +58,6 @@ echo -e "#!/bin/bash\n\
 docker run \
 -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
 -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
--v $PWD/$DYID_FOLDER/:/lottery/$DYID_FOLDER/ \
 $DOCKER_REPO \
 check" \
 > check.sh
@@ -80,7 +68,6 @@ echo -e "#!/bin/bash\n\
 docker run \
 -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
 -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
--v $PWD/$DYID_FOLDER/:/lottery/$DYID_FOLDER/ \
 $DOCKER_REPO \
 clear" \
 > clear.sh