更新readme

- 分离动态筛选部分的网络请求和数据处理
- 优化部分ifelse判断
feat:
- 新增NOT_GO_LOTTERY环境变量
- 边转边存dyid
- 滤除的dyid也进行存储
fix: 修复部分bug

.gitignore

@@ -1,5 +1,6 @@
 node_modules/
 dyids/
 dist/
+package-lock.json
 env.js
 my_config.js

README.md

@@ -15,6 +15,8 @@
     - [中奖推送(可选)](#中奖推送可选)
   - [设置说明](#设置说明)
 
+[Github仓库链接](https://github.com/shanmiteko/LotteryAutoScript)
+
 已实现功能:  
   > 点赞 评论 转发 @好友 带话题 随机动态 检测开奖 清理
 
@@ -68,15 +70,19 @@ Chrome浏览器:
 ### 本地运行
 
 #### 可执行文件
-1. [[下载](https://github.com/shanmiteko/LotteryAutoScript/releases)|[cnpmjs镜像下载](https://github.com.cnpmjs.org/shanmiteko/LotteryAutoScript/releases)|[Fastgit镜像下载](https://hub.fastgit.org/shanmiteko/LotteryAutoScript/releases)]压缩包并解压
+1. [[下载](https://github.com/shanmiteko/LotteryAutoScript/releases)|[cnpmjs镜像下载](https://github.com.cnpmjs.org/shanmiteko/LotteryAutoScript/releases)|[Fastgit镜像下载](https://hub.fastgit.org/shanmiteko/LotteryAutoScript/releases)]压缩包并解压后有三个文件
    ```
-    env.js
-    lottery.exe
-    my_config.js
+    env.js 便捷设置环境变量和多账号参数
+    lottery.exe 可执行文件
+    my_config.js 自定义设置文件
    ```
 2. `env.js`中填入`COOKIE`和推送参数
 3. `my_config.js`中自定义设置
 4. 在当前目录下打开终端运行可执行文件`lottery`
+5. 输入`lottery start`启动抽奖|`lottery check`检测中奖|`lottery clear`清理动态
+   > 或者新建文本文档写入`lottery start`然后更改扩展名为.bat点击运行
+6. 运行截图
+  ![lottery_start](doc/pic/lottery_start.png)
 
 #### 以源码方式运行
 
@@ -136,7 +142,9 @@ npm i && npm run clear
 
 注: **本地运行时可在设置中增大扫描页数**
 
-> [windows系统定时运行](./doc/win_schedule.md)
+> ~~[windows系统定时运行](./doc/win_schedule.md)~~
+
+脚本已内置定时运行功能
 
 ##### Linux
 [linux系统配置与定时运行](./doc/linux_schedule.md)
@@ -185,9 +193,7 @@ rm -rf lottery/
 ----------------------------------------
 
 ## 防重复转发
-脚本将所转发过的动态都写入`dyids/dyid*.txt`文件中
-
-完整转发一轮后才会进行写入操作, 勿过早关闭运行
+脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中
 
 ----------------------------------------
 

doc/linux_schedule.md

@@ -45,7 +45,8 @@ vim env.js
 `"PAT"`和`"GITHUB_REPOSITORY"`不填也行  
 
 
-5.设置定时工作  
+~~5.设置定时工作~~
+
 > [linux系统定时运行](https://zhuanlan.zhihu.com/p/58719487)  
 
 输入:

env.example.js

@@ -1,17 +1,13 @@
 /**
- * 使用时请将此文件命名为env.js
- * RELEASE内可执行文件包中已有env.js文件
- * 注: 请打开扩展名显示
- */
-
-/**
- * ## 账号相关参数
+ * ## 账号相关
  * - `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 中, 参考例子类推
@@ -24,7 +20,9 @@ const account_parm = {
     NUMBER: 1,
     CLEAR: true,
     ENABLE_MULTIPLE_ACCOUNT: false,
-    MULTIPLE_ACCOUNT_PARM: ""
+    MULTIPLE_ACCOUNT_PARM: "",
+    LOTTERY_LOG_LEVEL: 3,
+    NOT_GO_LOTTERY: ""
 }
 
 /**

lib/BiliAPI.js

@@ -1,5 +1,5 @@
 const Ajax = require('./Ajax');
-const { strToJson, tooltip } = require('./Base');
+const { strToJson, log } = require('./Util');
 const GlobalVar = require('./GlobalVar');
 
 /**
@@ -80,10 +80,10 @@ const BiliAPI = {
                     if (res.code === 0) {
                         const { at } = res.data;
                         resolve(at)
-                        tooltip.log(`[获取未读@]成功 数量: ${at}`)
+                        log.info('获取未读@', `成功 数量: ${at}`)
                     } else {
                         resolve(-1)
-                        tooltip.log(`[获取未读@]失败\n${responseText}`)
+                        log.error('获取未读@', `失败\n${responseText}`)
                     }
                 }
             })
@@ -122,7 +122,7 @@ const BiliAPI = {
                 success: responseText => {
                     let res = strToJson(responseText);
                     if (res.code === 0) {
-                        tooltip.log('[获取一页私信](20)成功 ' + (ts_16 ? 'end_ts->' + ts_16 : '第一页'));
+                        log.info('获取一页私信(20)', '成功 ' + (ts_16 ? 'end_ts->' + ts_16 : '第一页'));
                         /**@type {Array} */
                         const sessions = res.data.session_list || [];
                         const has_more = res.data.has_more;
@@ -133,7 +133,7 @@ const BiliAPI = {
                         })
                         resolve({ has_more, data })
                     } else {
-                        tooltip.log(`[获取私信]失败\n${responseText}`);
+                        log.error('获取私信', `失败\n${responseText}`);
                         resolve({ has_more: 0, data: [] });
                     }
                 }
@@ -154,10 +154,10 @@ const BiliAPI = {
                     if (res.code === 0) {
                         const { unfollow_unread, follow_unread } = res.data;
                         resolve({ unfollow_unread, follow_unread });
-                        tooltip.log(`[获取未读私信]成功 已关注未读数: ${follow_unread}, 未关注未读数 ${unfollow_unread}`);
+                        log.info('获取未读私信', `成功 已关注未读数: ${follow_unread}, 未关注未读数 ${unfollow_unread}`);
                     } else {
                         resolve(null);
-                        tooltip.log(`[获取未读私信]失败\n${responseText}`);
+                        log.error('获取未读私信', `失败\n${responseText}`);
                     }
                 }
             })
@@ -181,9 +181,9 @@ const BiliAPI = {
             success: responseText => {
                 let res = strToJson(responseText);
                 if (res.code === 0) {
-                    tooltip.log(`[私信已读]成功 -> talker_id: ${talker_id}`);
+                    log.info('私信已读', `成功 -> talker_id: ${talker_id}`);
                 } else {
-                    tooltip.log(`[私信已读]失败 -> talker_id: ${talker_id}`);
+                    log.error('私信已读', `失败 -> talker_id: ${talker_id}`);
                 }
             }
         })
@@ -203,10 +203,10 @@ const BiliAPI = {
                 success: responseText => {
                     let res = strToJson(responseText);
                     if (res.code === 0) {
-                        tooltip.log('[获取关注列表]成功');
+                        log.info('获取关注列表', '成功');
                         resolve(res.data.list.toString());
                     } else {
-                        tooltip.log(`[获取关注列表]失败\n${responseText}`);
+                        log.error('获取关注列表', `失败\n${responseText}`);
                         resolve(null);
                     }
                 }
@@ -258,7 +258,7 @@ const BiliAPI = {
                 success: responseText => {
                     const res = strToJson(responseText);
                     if (res.code !== 0) {
-                        tooltip.log('获取TagID失败');
+                        log.error('获取TagID', '失败');
                         resolve(-1);
                     } else {
                         resolve(res.data.tag_id);
@@ -325,7 +325,7 @@ const BiliAPI = {
                     if (res.code === 0) {
                         resolve(res.data.follower);
                     } else {
-                        tooltip.warn(`[获取粉丝数]尝试切换线路`);
+                        log.warn('获取粉丝数', '尝试切换线路');
                         Ajax.get({
                             url: 'https://api.bilibili.com/x/relation/stat',
                             queryStringsObj: {
@@ -334,10 +334,10 @@ const BiliAPI = {
                             success: responseText => {
                                 const res = strToJson(responseText);
                                 if (res.code === 0) {
+                                    log.info('获取粉丝数', 'ok');
                                     resolve(res.data.follower);
-                                    tooltip.log(`[获取粉丝数]ok`);
                                 } else {
-                                    tooltip.warn(`获取粉丝数出错,可能是访问过频繁\n${responseText}`);
+                                    log.error('获取粉丝数', `出错 可能是访问过频繁\n${responseText}`);
                                     resolve(-1);
                                 }
                             }
@@ -389,7 +389,7 @@ const BiliAPI = {
                             isMe: isMe
                         });
                     } else {
-                        tooltip.log(`获取开奖信息失败\n${responseText}`);
+                        log.error('获取开奖信息', `失败\n${responseText}`);
                         resolve({
                             ts: -1,
                             text: '获取开奖信息失败',
@@ -427,16 +427,16 @@ const BiliAPI = {
                     /* 重复关注code also equal 0  */
                     const res = strToJson(responseText)
                     if (res.code === 0) {
-                        tooltip.log('[自动关注]关注+1');
+                        log.info('自动关注', '关注+1');
                         resolve(0);
                     } else if (res.code === 22002) {
-                        tooltip.log('[自动关注]您已被对方拉入黑名单');
+                        log.error('自动关注', '您已被对方拉入黑名单');
                         resolve(1);
                     } else if (res.code === 22015) {
-                        tooltip.log('[自动关注]您的账号异常无法关注');
+                        log.error('自动关注', '您的账号异常无法关注');
                         resolve(2);
                     } else {
-                        tooltip.log(`[自动关注]失败 尝试切换线路\n${responseText}`);
+                        log.warn('自动关注', `失败 尝试切换线路\n${responseText}`);
                         Ajax.post({
                             url: 'https://api.vc.bilibili.com/feed/v1/feed/SetUserFollow',
                             data: {
@@ -446,10 +446,10 @@ const BiliAPI = {
                             },
                             success: responseText => {
                                 if (/^{"code":0/.test(responseText)) {
-                                    tooltip.log('[自动关注]关注+1');
+                                    log.info('自动关注', '关注+1');
                                     resolve(0);
                                 } else {
-                                    tooltip.log(`[自动关注]失败 尝试切换另一条线路\n${responseText}`);
+                                    log.warn('自动关注', `失败 尝试切换另一条线路\n${responseText}`);
                                     Ajax.post({
                                         url: 'https://api.bilibili.com/x/relation/batch/modify',
                                         data: {
@@ -460,10 +460,10 @@ const BiliAPI = {
                                         },
                                         success: responseText => {
                                             if (/^{"code":0/.test(responseText)) {
-                                                tooltip.log('[自动关注]关注+1');
+                                                log.info('自动关注', '关注+1');
                                                 resolve(0);
                                             } else {
-                                                tooltip.log(`[自动关注]失败\n${responseText}`);
+                                                log.error('自动关注', `失败\n${responseText}`);
                                                 resolve(1);
                                             }
                                         }
@@ -496,10 +496,10 @@ const BiliAPI = {
                 success: responseText => {
                     /* 重复移动code also equal 0 */
                     if (/^{"code":0/.test(responseText)) {
-                        tooltip.log('[移动分区]up主分区移动成功');
+                        log.info('移动分区', 'up主分区移动成功');
                         resolve(0);
                     } else {
-                        tooltip.log(`[移动分区]up主分区移动失败\n${responseText}`);
+                        log.error('移动分区', `up主分区移动失败\n${responseText}`);
                         resolve(1);
                     }
                 }
@@ -525,10 +525,10 @@ const BiliAPI = {
                 success: responseText => {
                     const res = strToJson(responseText);
                     if (res.code === 0) {
-                        tooltip.log('[自动取关]取关成功');
+                        log.info('自动取关', '取关成功');
                         resolve(true)
                     } else {
-                        tooltip.log(`[自动取关]取关失败\n${responseText}`);
+                        log.error('自动取关', `取关失败\n${responseText}`);
                         resolve(false)
                     }
                 }
@@ -554,10 +554,10 @@ const BiliAPI = {
                 },
                 success: responseText => {
                     if (/^{"code":0/.test(responseText)) {
-                        tooltip.log('[自动点赞]点赞成功');
+                        log.info('自动点赞', '点赞成功');
                         resolve(0);
                     } else {
-                        tooltip.log(`[转发动态]点赞失败\n${responseText}`);
+                        log.error('自动点赞', `点赞失败\n${responseText}`);
                         resolve(1);
                     }
                 }
@@ -594,10 +594,10 @@ const BiliAPI = {
                 },
                 success: responseText => {
                     if (/^{"code":0/.test(responseText)) {
-                        tooltip.log('[转发动态]成功转发一条动态');
+                        log.info('转发动态', '成功转发一条动态');
                         resolve(0);
                     } else {
-                        tooltip.log(`[转发动态]转发动态失败\n${responseText}`);
+                        log.error('转发动态', `转发动态失败\n${responseText}`);
                         resolve(1);
                     }
                 }
@@ -640,9 +640,9 @@ const BiliAPI = {
                 data,
                 success: responseText => {
                     if (/^{"code":0/.test(responseText)) {
-                        tooltip.log('[发布动态]成功创建一条随机内容的动态');
+                        log.info('发布动态', '成功创建一条随机内容的动态');
                     } else {
-                        tooltip.warn(`[发布动态]发布动态失败\n${responseText}`);
+                        log.error('发布动态', `发布动态失败\n${responseText}`);
                     }
                     resolve()
                 }
@@ -665,10 +665,10 @@ const BiliAPI = {
                 retry: false,
                 success: responseText => {
                     if (/^{"code":0/.test(responseText)) {
-                        tooltip.log('[删除动态]成功删除一条动态');
+                        log.info('删除动态', '成功删除一条动态');
                         resolve(true);
                     } else {
-                        tooltip.log(`[删除动态]删除动态失败\n${responseText}`);
+                        log.error('删除动态', `删除动态失败\n${responseText}`);
                         resolve(false);
                     }
                 }
@@ -701,19 +701,19 @@ const BiliAPI = {
                 success: responseText => {
                     const res = strToJson(responseText);
                     if (res.code === 0) {
-                        show ? tooltip.log('[自动评论]评论成功') : void 0;
+                        show && log.info('自动评论', '评论成功');
                         resolve(0);
                     } else if (res.code === -404) {
-                        show ? tooltip.log('[自动评论]原动态已删除') : void 0;
+                        show && log.error('自动评论', '原动态已删除');
                         resolve(0);
                     } else if (res.code === 12002) {
-                        show ? tooltip.log('[自动评论]评论区已关闭') : void 0;
+                        show && log.error('自动评论', '评论区已关闭');
                         resolve(0);
                     } else if (res.code === 12015) {
-                        show ? tooltip.log('[自动评论]需要输入验证码') : void 0;
+                        show && log.error('自动评论', '需要输入验证码');
                         resolve(1);
                     } else {
-                        show ? tooltip.log(`[自动评论]评论失败\n${responseText}`) : void 0;
+                        show && log.error('自动评论', `评论失败\n${responseText}`);
                         resolve(0);
                     }
                 }
@@ -738,10 +738,10 @@ const BiliAPI = {
                     if (res.code === 0) {
                         const data = res.data.filter((it) => it.name === name);
                         if (data.length) {
-                            tooltip.log('[获取分区id]成功');
+                            log.info('获取分区id', '成功');
                             tagid = data[0].tagid
                         } else {
-                            tooltip.log('[获取分区id]失败 无指定分区');
+                            log.warn('获取分区id', '失败 无指定分区');
                         }
                         if (name === '此处存放因抽奖临时关注的up') {
                             if (typeof tagid === 'undefined') {
@@ -753,7 +753,7 @@ const BiliAPI = {
                             resolve(tagid)
                         }
                     } else {
-                        tooltip.warn(`[获取分区id]访问出错 可在my_config里手动填入\n${responseText}`)
+                        log.error('获取分区id', `访问出错 可在my_config里手动填入\n${responseText}`)
                         resolve(tagid)
                     }
                 }
@@ -776,11 +776,11 @@ const BiliAPI = {
                 success: responseText => {
                     let obj = strToJson(responseText);
                     if (obj.code === 0) {
-                        tooltip.log('[新建分区]分区新建成功')
+                        log.info('新建分区', '分区新建成功')
                         let { tagid } = obj.data /* 获取tagid */
                         resolve(tagid)
                     } else {
-                        tooltip.warn(`[新建分区]分区新建失败\n${responseText}`);
+                        log.error('新建分区', `分区新建失败\n${responseText}`);
                         resolve(undefined);
                     }
                 }
@@ -810,10 +810,10 @@ const BiliAPI = {
                         res.data.forEach(d => {
                             uids.push(d.mid);
                         })
-                        tooltip.log(`[获取分组${tagid}]成功获取取关分区列表${n}`);
+                        log.info(`获取分组${tagid}`, `成功获取取关分区列表${n}`);
                         resolve(uids)
                     } else {
-                        tooltip.warn(`[获取分组]获取取关分区列表失败\n${responseText}`);
+                        log.error(`获取分组${tagid}`, `获取取关分区列表失败\n${responseText}`);
                         resolve(uids)
                     }
                 }
@@ -822,4 +822,5 @@ const BiliAPI = {
     }
 };
 
+
 module.exports = BiliAPI;

lib/GithubAPI.js

@@ -1,6 +1,6 @@
 const { createReadStream, createWriteStream } = require('fs')
 const unzip = require('unzipper');
-const { strToJson, tooltip } = require("./Base")
+const { strToJson, tooltip } = require("./Util")
 const { HttpRequest } = require("./HttpRequest")
 
 const { GITHUB_REPOSITORY } = process.env;
@@ -153,4 +153,5 @@ const GihubAPI = {
     }
 }
 
+
 module.exports = GihubAPI;

lib/Monitor.js

@@ -1,4 +1,4 @@
-const Base = require('./Base');
+const Util = require('./Util');
 const BiliAPI = require('./BiliAPI');
 const { sendNotify } = require('./sendNotify');
 const eventBus = require('./eventBus');
@@ -6,6 +6,7 @@ const Public = require('./Public');
 const GlobalVar = require("./GlobalVar");
 const config = require("./config");
 const MyStorage = require('./MyStorage');
+const { log, hasEnv } = Util;
 
 /**
  * 监视器
@@ -37,31 +38,7 @@ class Monitor extends Public {
             }
         }
         this.attentionList = await BiliAPI.getAttentionList(GlobalVar.get("myUID")); /* 获取关注列表 */
-        await this.startLottery();
-    }
-    /**
-     * 启动
-     * @returns {Promise<boolean>}
-     */
-    async startLottery() {
-        const allLottery = await this.filterLotteryInfo();
-        let status = 1;
-        if (allLottery instanceof Array) {
-            if (allLottery.length) {
-                let dyids = [];
-                for (const Lottery of allLottery) {
-                    status = await this.go(Lottery);
-                    if (status % 2) break
-                    dyids.push(Lottery.dyid);
-                }
-                if (dyids.length) MyStorage.updateDyid(dyids.toString())
-                Base.tooltip.log('开始转发下一组动态');
-            } else {
-                status = 0;
-                Base.tooltip.log('无未转发抽奖');
-            }
-        }
-        switch (status) {
+        switch (await this.startLottery()) {
             case 0:
                 eventBus.emit('Turn_on_the_Monitor')
                 break;
@@ -84,26 +61,88 @@ class Monitor extends Public {
             case 41:
                 eventBus.emit('Turn_off_the_Monitor', '转发失败')
                 break
+            case 51:
+                eventBus.emit('Turn_off_the_Monitor', '获取开奖时间失败')
+                break
+            case 61:
+                eventBus.emit('Turn_off_the_Monitor', '获取关注数失败')
+                break
             default:
-                eventBus.emit('Turn_off_the_Monitor', '出错 status:' + status)
+                eventBus.emit('Turn_off_the_Monitor', '未知错误')
                 break;
         }
     }
+    /**
+     * 启动
+     * @returns {Promise<number>}
+     */
+    async startLottery() {
+        const allLottery = await this.filterLotteryInfo()
+            , len = allLottery.length;
+
+        log.info('筛选动态', `筛选完毕(${len})`);
+
+        if (len) {
+            for (const Lottery of allLottery) {
+                let status = 0;
+                if (Lottery.isOfficialLottery) {
+                    let { ts } = await BiliAPI.getLotteryNotice(Lottery.dyid);
+                    const ts_10 = Date.now() / 1000;
+                    if (ts < 0) {
+                        return 51
+                    }
+                    if (ts < ts_10) {
+                        log.info('过滤', '已过开奖时间')
+                        MyStorage.updateDyid(Lottery.dyid)
+                        continue
+                    }
+                    if (ts > ts_10 + config.maxday * 86400) {
+                        log.info('过滤', '超过指定开奖时间')
+                        MyStorage.updateDyid(Lottery.dyid)
+                        continue
+                    }
+                } else if (Lottery.uid[0]) {
+                    const followerNum = await BiliAPI.getUserInfo(Lottery.uid[0]);
+                    if (followerNum < 0) {
+                        return 61
+                    }
+                    if (followerNum < config.minfollower) {
+                        log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
+                        MyStorage.updateDyid(Lottery.dyid)
+                        continue
+                    }
+                }
+                status = await this.go(Lottery)
+                if (status % 2 !== 0) {
+                    return status
+                }
+                MyStorage.updateDyid(Lottery.dyid);
+                await Util.delay(config.wait * (Math.random() + 0.5));
+            }
+            log.info('抽奖', '开始转发下一组动态');
+            return 0
+        } else {
+            log.info('抽奖', '无未转发抽奖');
+            return 0
+        }
+    }
+
     /**
      * 抽奖配置
      * @typedef {object} LotteryOptions
      * @property {number[]} uid 用户标识
      * @property {string} dyid 动态标识
+     * @property {boolean} isOfficialLottery 是否官方抽奖
      * @property {number} type 动态类型
      * @property {string} relay_chat 动态类型
      * @property {string} ctrl 定位@
      * @property {string} rid 评论类型
      */
     /**
-     * @returns {Promise<LotteryOptions[] | null>}
+     * @returns {Promise<LotteryOptions[]>}
      */
     async filterLotteryInfo() {
-        const self = this,
+        let self = this,
             protoLotteryInfo = typeof self.UID === 'number'
                 ? await self.getLotteryInfoByUID(self.UID)
                 : await self.getLotteryInfoByTag(self.tag_name);
@@ -111,126 +150,151 @@ class Monitor extends Public {
         if (protoLotteryInfo === null)
             return [];
 
+        log.info('筛选动态', `开始筛选(${protoLotteryInfo.length})`);
+
+        log.debug('未进行筛选的动态信息', protoLotteryInfo);
+
         /** 所有抽奖信息 */
         let alllotteryinfo = [];
-        const { key_words, model, chatmodel, is_imitator, maxday: _maxday, minfollower, skip_official_verify, only_followed, at_users, blockword, blacklist } = config;
-        const maxday = _maxday * 86400
-        let dyids_set = new Set();
-        for (const info of protoLotteryInfo) {
-            const { lottery_info_type, uids, uname, dyid, official_verify, ctrl, befilter, rid, des, type, hasOfficialLottery } = info;
+        const { key_words, model, chatmodel, is_imitator, only_followed, at_users, blockword, blacklist } = config;
+        /**Map<String, Boolean> */
+        let dyids_map = new Map();
 
-            /**dyid去重 */
-            if (dyids_set.has(dyid)) continue;
-            dyids_set.add(dyid);
+        /**去重 */
+        protoLotteryInfo = protoLotteryInfo.filter(({ dyid }) => {
+            if (dyids_map.has(dyid)) {
+                return false
+            }
+            dyids_map.set(dyid, false);
+            return true
+        });
+
+        /**并发查询dyid */
+        await Promise.all(
+            [...dyids_map.keys()]
+                .map(it => MyStorage
+                    .searchDyid(it)
+                    .then(hasIt => dyids_map.set(it, hasIt))
+                )
+        )
+
+        /* 检查动态是否满足要求 */
+        await Util.try_for_each(protoLotteryInfo, async function ({
+            lottery_info_type, uids,
+            uname, dyid,
+            ctrl, rid, des, type,
+            hasOfficialLottery
+        }) {
+            /* 遇到转发过就退出 */
+            if (dyids_map.get(dyid)) return false;
 
             /**判断是转发源动态还是现动态 */
-            const uid = lottery_info_type === 'tag' ? uids[0] : uids[1];
+            const uid = lottery_info_type === 'tag' ? uids[0] : uids[1]
+                , isFollowed = (new RegExp(uid)).test(self.attentionList)
+                , description = typeof des === 'string' ? des : ''
+                , needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description)
+                , needTopic = (/(?<=[带加上](?:话题|tag))#.*#/i.exec(description) || [])[0]
+                , isRelayDynamic = type === 1
+                , isTwoLevelDynamic = /\/\/@/.test(description)
+                , has_key_words = key_words.every(it => new RegExp(it).test(description))
+                , isBlock = new RegExp(blockword.join('|')).test(description)
+                , isLottery =
+                    (lottery_info_type === 'uid' && is_imitator && model !== '00')
+                    || (hasOfficialLottery && model[0] === '1')
+                    || (!hasOfficialLottery && model[1] === '1' && !isTwoLevelDynamic && has_key_words)
+                , isSendChat =
+                    (is_imitator && lottery_info_type === 'uid' && chatmodel !== '00')
+                    || (hasOfficialLottery && chatmodel[0] === '1')
+                    || (!hasOfficialLottery && chatmodel[1] === '1');
 
-            const now_ts_10 = Date.now() / 1000;
-            let onelotteryinfo = {};
-            let isLottery = false;
-            let isSendChat = false;
-            let isBlock = false;
-            let ts = 0;
-            const description = typeof des === 'string' ? des : '';
-            for (let index = 0; index < blockword.length; index++) {
-                const word = blockword[index];
-                const reg = new RegExp(word);
-                isBlock = reg.test(description) ? true : false;
-                if (isBlock) break;
-            }
-            if (isBlock) continue;
-            const needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description);
-            const needTopic = (/(?<=[带加上](?:话题|tag))#.*#/i.exec(description) || [])[0];
-            const isTwoLevelRelay = /\/\/@/.test(description);
+            /**屏蔽词 */
+            if (isBlock) return false;
 
-            /**是否包含关键词 */
-            const has_key_words = key_words.map(it => new RegExp(it)).every(it => it.test(description))
+            /**若勾选只转已关注 */
+            if (only_followed && !isFollowed) return false;
+
+            /* 获取黑名单并去重合并 */
+            const { blacklist: remote_blacklist } = GlobalVar.get("remoteconfig")
+                , new_blacklist = remote_blacklist
+                    ? [...new Set([...blacklist.split(','), ...remote_blacklist.split(',')])].join()
+                    : blacklist;
+            if ((new RegExp(dyid + '|' + uid)).test(new_blacklist)) return false;
 
-            if (lottery_info_type === 'uid' && is_imitator) {
-                isLottery = true;
-                isSendChat = chatmodel[1] === '1' || chatmodel[1] === '1';
-            } else if (hasOfficialLottery && model[0] === '1') {
-                ({ ts } = await BiliAPI.getLotteryNotice(dyid));
-                if (ts < 0) { alllotteryinfo = null; break }
-                isLottery = ts > now_ts_10 && ts < now_ts_10 + maxday;
-                isSendChat = chatmodel[0] === '1';
-            } else if (!hasOfficialLottery && model[1] === '1' && has_key_words && !isTwoLevelRelay) {
-                ({ ts } = Base.getLotteryNotice(description));
-                if (official_verify && skip_official_verify) {
-                    isLottery = ts === 0 || (ts > now_ts_10 && ts < now_ts_10 + maxday);
-                } else {
-                    const followerNum = await BiliAPI.getUserInfo(uid);
-                    if (followerNum < 0) { alllotteryinfo = null; break }
-                    if (followerNum < minfollower) continue;
-                    isLottery = !befilter && (ts === 0 || (ts > now_ts_10 && ts < now_ts_10 + maxday));
-                }
-                isSendChat = chatmodel[1] === '1';
-            }
 
             if (isLottery) {
-                /* 判断是否关注过 */
-                const isFollowed = (new RegExp(uid)).test(self.attentionList);
-                if (only_followed && !isFollowed) continue;
-                /* 判断是否转发过 */
-                const isRelayed = await MyStorage.searchDyid(dyid);
-                /* 获取黑名单并去重合并 */
-                const { blacklist: remote_blacklist } = GlobalVar.get("remoteconfig");
-                const new_blacklist = remote_blacklist ?
-                    Array.from(new Set([...blacklist.split(','), ...remote_blacklist.split(',')])).toString() : blacklist;
-                /* 进行判断 */
-                if ((new RegExp(dyid + '|' + uid)).test(new_blacklist)) continue;
-                onelotteryinfo.uid = [] /**初始化待关注列表 */
-                if (!isFollowed) onelotteryinfo.uid.push(uid);
-                if (!isRelayed) {
-                    onelotteryinfo.dyid = dyid;
-                    let RandomStr = Base.getRandomOne(config.relay);
-                    let new_ctrl = [];
-                    if (needTopic) {
-                        RandomStr += needTopic
-                    }
-                    if (needAt) {
-                        at_users.forEach(it => {
-                            new_ctrl.push({
-                                data: String(it[1]),
-                                location: RandomStr.length,
-                                length: it[0].length + 1,
-                                type: 1
-                            })
-                            RandomStr += '@' + it[0]
-                        })
-                    }
-                    if (type === 1) {
-                        /* 转发内容长度+'//'+'@'+用户名+':'+源内容 */
-                        const addlength = RandomStr.length + 2 + uname.length + 1 + 1;
-                        onelotteryinfo.relay_chat = RandomStr + `//@${uname}:` + des;
+                let onelotteryinfo = {};
+
+                onelotteryinfo.isOfficialLottery = hasOfficialLottery;
+
+                /**初始化待关注列表 */
+                onelotteryinfo.uid = []
+
+                if (!isFollowed) {
+                    onelotteryinfo.uid.push(uid);
+                }
+
+                onelotteryinfo.dyid = dyid;
+
+                let
+                    /**转发评语 */
+                    RandomStr = Util.getRandomOne(config.relay),
+                    /**控制字段 */
+                    new_ctrl = [];
+
+                /* 是否需要带话题 */
+                if (needTopic) {
+                    RandomStr += needTopic
+                }
+
+                /* 是否需要@ */
+                if (needAt) {
+                    at_users.forEach(it => {
                         new_ctrl.push({
-                            data: String(uid),
-                            location: RandomStr.length + 2,
-                            length: uname.length + 1,
+                            data: String(it[1]),
+                            location: RandomStr.length,
+                            length: it[0].length + 1,
                             type: 1
                         })
-                        ctrl.map(item => {
-                            item.location += addlength;
-                            return item;
-                        }).forEach(it => new_ctrl.push(it))
-                        if (!(new RegExp(uids[1])).test(self.attentionList))
-                            onelotteryinfo.uid.push(uids[1]);
-                    } else {
-                        onelotteryinfo.relay_chat = RandomStr;
-                    }
-                    onelotteryinfo.ctrl = JSON.stringify(new_ctrl);
+                        RandomStr += '@' + it[0]
+                    })
                 }
+
+                /* 是否是转发的动态 */
+                if (isRelayDynamic) {
+                    /* 转发内容长度+'//'+'@'+用户名+':'+源内容 */
+                    const addlength = RandomStr.length + 2 + uname.length + 1 + 1;
+                    onelotteryinfo.relay_chat = RandomStr + `//@${uname}:` + des;
+                    new_ctrl.push({
+                        data: String(uid),
+                        location: RandomStr.length + 2,
+                        length: uname.length + 1,
+                        type: 1
+                    })
+                    ctrl.map(item => {
+                        item.location += addlength;
+                        return item;
+                    }).forEach(it => new_ctrl.push(it))
+                    if (!(new RegExp(uids[1])).test(self.attentionList))
+                        onelotteryinfo.uid.push(uids[1]);
+                } else {
+                    onelotteryinfo.relay_chat = RandomStr;
+                }
+
+                onelotteryinfo.ctrl = JSON.stringify(new_ctrl);
+
                 /* 根据动态的类型决定评论的类型 */
                 onelotteryinfo.type = type === 2 ?
                     11 : type === 4 || type === 1 ?
                         17 : type === 8 ?
                             1 : 0;
+
                 /* 是否评论 */
                 if (isSendChat) onelotteryinfo.rid = rid;
-                if (onelotteryinfo.dyid) alllotteryinfo.push(onelotteryinfo);
+
+                alllotteryinfo.push(onelotteryinfo);
             }
-        }
+        })
+
         return alllotteryinfo;
     }
     /**
@@ -245,34 +309,41 @@ class Monitor extends Public {
      * 41 - 转发失败  
      */
     async go(option) {
-        let status = 1;
+        log.debug('正在转发的动态信息', option);
+        if (hasEnv('NOT_GO_LOTTERY')) {
+            log.info('NOT_GO_LOTTERY', 'ON');
+            return 0
+        }
         const { uid, dyid, type, rid, relay_chat, ctrl } = option;
         /* 评论 */
-        if (typeof rid === 'string' && type !== 0) {
-            const send = () => BiliAPI.sendChat(rid, Base.getRandomOne(config.chat) || relay_chat, type);
+        if (rid && type) {
+            let status = 0;
             const max_retry_times = 5;
-            for (let times = 0; times < max_retry_times && status; times++) {
-                status = await send();
-                if (status) {
-                    Base.tooltip.log(`将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
-                    await Base.delay(60 * 1000 * (times + 1))
+            for (let times = 0; times < max_retry_times; times++) {
+                status = await BiliAPI.sendChat(rid, Util.getRandomOne(config.chat), type)
+                if (!status) {
+                    break
                 }
+                log.info('自动评论', `将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
+                await Util.delay(60 * 1000 * (times + 1))
             }
             if (status) return 11;
         }
 
         /* 关注 */
-        if (uid.length) {
-            status = 0
-            for (let index = 0; index < uid.length && !status; index++) {
-                const one_uid = uid[index];
-                if (typeof one_uid === 'number') {
-                    status = await BiliAPI.autoAttention(uid);
-                    await Base.delay(5000);
-                    if (!status) await BiliAPI.movePartition(uid, this.tagid);
-                }
-            }
+        const [u1, u2] = uid
+        if (u1) {
+            let status = await BiliAPI.autoAttention(u1)
             if (status) return 20 + status;
+            status = await BiliAPI.movePartition(u1, this.tagid)
+            if (status) return 20 + status;
+            if (u2) {
+                Util.delay(5000)
+                status = await BiliAPI.autoAttention(u2)
+                if (status) return 20 + status;
+                status = await BiliAPI.movePartition(u2, this.tagid)
+                if (status) return 20 + status;
+            }
         }
 
         /* 点赞 */
@@ -281,11 +352,9 @@ class Monitor extends Public {
         /* 转发 */
         if (await BiliAPI.autoRelay(GlobalVar.get("myUID"), dyid, relay_chat, ctrl)) return 41;
 
-        /* 延时 */
-        await Base.delay(config.wait * (Math.random() + 0.5));
-
         return 0
     }
 }
 
+
 module.exports = Monitor;

lib/MyStorage.js

@@ -1,4 +1,5 @@
-const Base = require("./Base");
+const Util = require("./Util");
+const { log } = Util;
 
 const MyStorage = {
     /**
@@ -9,7 +10,7 @@ const MyStorage = {
     searchDyid: (dyid) => {
         return new Promise((resolve) => {
             const Rdyid = new RegExp(dyid);
-            const rs = Base.readDyidFile(Number(process.env.NUMBER));
+            const rs = Util.readDyidFile(Number(process.env.NUMBER));
             let status = false;
             rs.on('data', chunk => {
                 if (Rdyid.test(chunk)) {
@@ -20,7 +21,7 @@ const MyStorage = {
                 resolve(status)
             })
             rs.on('error', err => {
-                Base.tooltip.log(err)
+                log.error('搜索dyid', err)
                 resolve(status)
             })
         })
@@ -30,19 +31,20 @@ const MyStorage = {
      * @param {string} dyid
      */
     updateDyid: (dyid) => {
-        Base.tooltip.log('写入已转发过的动态信息');
+        log.info('更新dyid', `写入${dyid}`);
         return new Promise((resolve) => {
-            const ws = Base.writeDyidFile(Number(process.env.NUMBER));
+            const ws = Util.writeDyidFile(Number(process.env.NUMBER));
             ws.write(dyid + ',', () => {
                 ws.destroy();
                 resolve()
             })
             ws.on('error', err => {
-                Base.tooltip.log(err)
+                log.error('更新dyid', err)
                 resolve()
             })
         });
     }
 }
 
+
 module.exports = MyStorage;

lib/Public.js

@@ -1,6 +1,7 @@
-const Base = require('./Base');
+const Util = require('./Util');
 const BiliAPI = require('./BiliAPI');
 const config = require("./config");
+const { log } = Util
 /**
  * 基础功能
  */
@@ -11,7 +12,6 @@ class Public {
      * @typedef {object} UsefulDynamicInfo
      * @property {number} uid
      * @property {string} uname
-     * @property {boolean} official_verify
      * @property {number} createtime 10
      * @property {string} rid_str
      * @property {string} dynamic_id
@@ -22,7 +22,6 @@ class Public {
      * 
      * @property {number} origin_uid
      * @property {string} origin_uname
-     * @property {boolean} origin_official_verify
      * @property {string} origin_rid_str
      * @property {string} origin_dynamic_id
      * @property {number} orig_type
@@ -38,10 +37,10 @@ class Public {
      * @returns {Promise<{allModifyDynamicResArray: UsefulDynamicInfo[];offset: string}>} 获取前 `pages*12` 个动态信息
      */
     async checkAllDynamic(hostuid, pages, time = 0, _offset = '0') {
-        Base.tooltip.log(`准备读取${pages}页动态`);
+        log.info('检查所有动态', `准备读取${pages}页动态`);
         const mDR = this.modifyDynamicRes,
             getOneDynamicInfoByUID = BiliAPI.getOneDynamicInfoByUID,
-            curriedGetOneDynamicInfoByUID = Base.curryify(getOneDynamicInfoByUID); /* 柯里化的请求函数 */
+            curriedGetOneDynamicInfoByUID = Util.curryify(getOneDynamicInfoByUID); /* 柯里化的请求函数 */
         /**
          * 储存了特定UID的请求函数
          */
@@ -53,7 +52,7 @@ class Public {
         let allModifyDynamicResArray = [];
         let offset = _offset;
         for (let i = 0; i < pages; i++) {
-            Base.tooltip.log(`正在读取其中第${i + 1}页动态`);
+            log.info('检查所有动态', `正在读取其中第${i + 1}页动态`);
             let OneDynamicInfo = await hadUidGetOneDynamicInfoByUID(offset);
             const mDRdata = mDR(OneDynamicInfo);
             if (mDRdata === null) {
@@ -67,14 +66,16 @@ class Public {
                 nextinfo = mDRdata.nextinfo;
             if (nextinfo.has_more === 0) {
                 offset = nextinfo.next_offset;
-                Base.tooltip.log(`成功读取${i + 1}页信息(已经是最后一页了故无法读取更多)`);
+                log.info('检查所有动态', `成功读取${i + 1}页信息(已经是最后一页了故无法读取更多)`);
                 break;
             } else {
                 allModifyDynamicResArray.push.apply(allModifyDynamicResArray, mDRArry);
-                i + 1 < pages ? Base.tooltip.log(`开始读取第${i + 2}页动态信息`) : Base.tooltip.log(`${pages}页信息全部成功读取完成`);
+                i + 1 < pages
+                    ? log.info('检查所有动态', `开始读取第${i + 2}页动态信息`)
+                    : log.info('检查所有动态', `第${pages}页信息读取完成`);
                 offset = nextinfo.next_offset;
             }
-            await Base.delay(time);
+            await Util.delay(time);
         }
         return ({ allModifyDynamicResArray, offset });
     }
@@ -85,10 +86,10 @@ class Public {
      * @returns {{modifyDynamicResArray: UsefulDynamicInfo[];nextinfo: {has_more: number;next_offset: string;};} | null}
      */
     modifyDynamicRes(res) {
-        const strToJson = Base.strToJson,
+        const strToJson = Util.strToJson,
             { data, code } = strToJson(res);
         if (code !== 0) {
-            Base.tooltip.warn('获取动态数据出错,可能是访问太频繁 \n' + res);
+            log.error('处理动态数据', '获取动态数据出错,可能是访问太频繁 \n' + res);
             return null;
         }
         /* 字符串offset防止损失精度 */
@@ -102,7 +103,7 @@ class Public {
          */
         let array = [];
         if (next.has_more === 0) {
-            Base.tooltip.log('动态数据读取完毕');
+            log.info('处理动态数据', '动态数据读取完毕');
         } else {
             /**
              * 空动态无cards
@@ -112,15 +113,12 @@ class Public {
                 /**临时储存单个动态中的信息 */
                 let obj = {};
                 const { desc, card } = onecard
-                    , { info, card: user_profile_card } = desc.user_profile
-                    , { official_verify } = user_profile_card
+                    , { info } = desc.user_profile
                     , cardToJson = strToJson(card);
                 /* 转发者的UID */
                 obj.uid = info.uid;
                 /* 转发者的name */
                 obj.uname = info.uname;
-                /* 是否官方号 */
-                obj.official_verify = official_verify.type > -1 ? true : false;
                 /* 动态的ts10 */
                 obj.createtime = desc.timestamp
                 /* 动态类型 */
@@ -146,15 +144,7 @@ class Public {
                     obj.origin_rid_str = desc.origin.rid_str.length > 12 ? desc.origin.dynamic_id_str : desc.origin.rid_str;
                     /* 被转发者的动态的ID !!!!此为大数需使用字符串值,不然JSON.parse()会有丢失精度 */
                     obj.origin_dynamic_id = desc.orig_dy_id_str;
-                    const { origin_extension, origin_user } = cardToJson;
-                    try {
-                        /* 是否官方号 */
-                        obj.origin_official_verify = typeof origin_user === 'undefined' ?
-                            false : origin_user.card.official_verify.type < 0 ?
-                                false : true;
-                    } catch (_) {
-                        obj.origin_official_verify = false;
-                    }
+                    const { origin_extension } = cardToJson;
                     /* 是否有官方抽奖 */
                     obj.origin_hasOfficialLottery = typeof origin_extension === 'undefined' ?
                         false : typeof origin_extension.lott === 'undefined' ?
@@ -184,8 +174,6 @@ class Public {
      * @property {string} uname
      * @property {Array<{}>} ctrl
      * @property {string} dyid
-     * @property {boolean} befilter
-     * @property {boolean} official_verify 官方认证
      * @property {string} rid
      * @property {string} des
      * @property {number} type
@@ -203,36 +191,33 @@ class Public {
             hotdy = await BiliAPI.getHotDynamicInfoByTagID(tag_id),
             modDR = self.modifyDynamicRes(hotdy);
         if (modDR === null) return null;
-        Base.tooltip.log(`开始获取带话题#${tag_name}#的动态信息`);
-        Base.tooltip.log('成功获取热门动态');
+        log.info('获取动态', `开始获取带话题#${tag_name}#的动态信息`);
+        log.info('获取动态', '成功获取热门动态');
         let mDRdata = modDR.modifyDynamicResArray; /* 热门动态 */
         let next_offset = modDR.nextinfo.next_offset;
         for (let index = 0; index < config.scan_page_num; index++) {
-            Base.tooltip.log(`成功读取${index + 1}页动态`);
+            log.info('获取动态', `成功读取${index + 1}页动态`);
             const newdy = await BiliAPI.getOneDynamicInfoByTag(tag_name, next_offset);
             const _modify = self.modifyDynamicRes(newdy);
             if (_modify === null) return null;
             mDRdata.push.apply(mDRdata, _modify.modifyDynamicResArray);
             next_offset = _modify.nextinfo.next_offset;
-            await Base.delay(config.search_wait);
+            await Util.delay(config.search_wait);
         }
         const fomatdata = mDRdata.map(o => {
-            const hasOrigin = o.type === 1;
             return {
                 lottery_info_type: 'tag',
                 uids: [o.uid, o.origin_uid],
                 uname: o.uname,
                 ctrl: o.ctrl,
                 dyid: o.dynamic_id,
-                official_verify: o.official_verify,
-                befilter: hasOrigin,
                 rid: o.rid_str,
                 des: o.description,
                 type: o.type,
                 hasOfficialLottery: o.hasOfficialLottery
             };
         })
-        Base.tooltip.log(`成功获取带话题#${tag_name}#的动态信息`);
+        log.info('获取动态', `成功获取带话题#${tag_name}#的动态信息`);
         return fomatdata
     }
     /**
@@ -242,7 +227,7 @@ class Public {
      * @returns {Promise<LotteryInfo[] | null>}
      */
     async getLotteryInfoByUID(UID) {
-        Base.tooltip.log(`开始获取用户${UID}的动态信息`);
+        log.info('获取动态', `开始获取用户${UID}的动态信息`);
         const { allModifyDynamicResArray: aMDRA } = await this.checkAllDynamic(UID, config.scan_page_num, config.search_wait);
         if (!aMDRA.length) return null;
         const fomatdata = aMDRA.map(o => {
@@ -252,15 +237,13 @@ class Public {
                 uname: o.origin_uname,
                 ctrl: [],
                 dyid: o.origin_dynamic_id,
-                official_verify: o.origin_official_verify,
-                befilter: false,
                 rid: o.origin_rid_str,
                 des: o.origin_description,
                 type: o.orig_type,
                 hasOfficialLottery: o.origin_hasOfficialLottery
             }
         }).filter(a => a.type === 0 ? false : true)
-        Base.tooltip.log(`成功获取用户${UID}的动态信息`);
+        log.info('获取动态', `成功获取用户${UID}的动态信息`);
         return fomatdata;
     }
 }

lib/Util.js

@@ -1,3 +1,4 @@
+const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
 const { HttpRequest } = require("./HttpRequest");
@@ -5,7 +6,7 @@ const { HttpRequest } = require("./HttpRequest");
 /**
  * 基础工具
  */
-const Base = {
+const Util = {
     /**环境变量设置文件 */
     env_file: path.join(process.cwd(), "env.js"),
     /**配置文件 */
@@ -34,6 +35,16 @@ const Base = {
         })(params);
         return isJSON ? isJSON : {}
     },
+    /**
+     * @template T
+     * @param {Array<T>} iter
+     * @param {(value: T) => Promise<Boolean>} fn 返回true整体退出
+     */
+    async try_for_each(iter, fn) {
+        for (const item of iter) {
+            if (await fn(item)) break
+        }
+    },
     /**
      * 函数柯里化
      * @param {function} func
@@ -57,6 +68,7 @@ const Base = {
      * @returns {Promise<void>}
      */
     delay(time) {
+        Util.log.info('时延', `${time}ms`);
         return new Promise(resolve => {
             setTimeout(() => {
                 resolve();
@@ -82,108 +94,99 @@ const Base = {
     },
     /**
      * 随机获取数组中的一个元素
-     * @param {any[]} arr
-     * @returns {any}
+     * @template T
+     * @param {T[]} arr
+     * @returns {T}
      */
     getRandomOne(arr) {
         let RandomOne = null;
-        if (arr instanceof Array && arr.length) {
+        if (Array.isArray(arr) && arr.length) {
             RandomOne = arr[parseInt(Math.random() * arr.length)];
         }
         return RandomOne
     },
-    /**提示信息 */
-    tooltip: {
-        log: (msg) => {
-            console.log("%s: %s", new Date().toLocaleString(), msg)
-        },
-        warn: (msg) => {
-            console.log("%s: %s", new Date().toLocaleString(), msg)
-        }
+    hasEnv(env_name) {
+        return process.env[env_name] ? true : false;
     },
-    /**
-     * 提取开奖信息
-     * @param {string} des 描述
-     * @returns {
-            {
-                ts: number|0;
-                text:string|'开奖时间: 未填写开奖时间';
-                item:string|'请自行查看';
-                isMe:string|'请自行查看';
+    /**日志 */
+    log: {
+        level: 0,
+        /**
+         * 初始化默认level为3
+         */
+        init() {
+            let _level = Number(process.env.LOTTERY_LOG_LEVEL);
+            this.level = isNaN(_level) ? 3 : _level;
+        },
+        /**
+         * @param {String|Array<String>} msg
+         * @param {String} [split] 分隔符
+         */
+        proPrint(msg, split = ' ') {
+            console.log([msg].flat().join(split))
+        },
+        debug(context, msg) {
+            if (this.level > 3) {
+                if (msg instanceof Object) msg = JSON.stringify(msg, null, 4);
+                this.proPrint([chalk.hex('#64B3FF')(`[${Date()}]`), chalk.grey("[Debug]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#0070BB')(`[\n${msg}\n]`)])
             }
-     * }
-     */
-    getLotteryNotice(des) {
-        const r = /([\d零一二两三四五六七八九十]+)[.月]([\d零一二两三四五六七八九十]+)[日号]?/;
-        if (des === '') return {
-            ts: 0,
-            text: `开奖时间: 未填写开奖时间`,
-            item: '请自行查看',
-            isMe: '请自行查看'
+        },
+        info(context, msg) {
+            if (this.level > 2)
+                this.proPrint([chalk.hex('#64B3FF')(`[${Date()}]`), chalk.grey("[Info]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#48BB31')(`[${msg}]`)])
+        },
+        warn(context, msg) {
+            if (this.level > 1)
+                this.proPrint([chalk.hex('#64B3FF')(`[${Date()}]`), chalk.grey("[Warn]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#BBBB23')(`[${msg}]`)])
+        },
+        error(context, msg) {
+            if (this.level > 0)
+                this.proPrint([chalk.hex('#64B3FF')(`[${Date()}]`), chalk.grey("[Error]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#FF0006')(`[${msg}]`)])
         }
-        const _date = r.exec(des) || [];
-        const timestamp10 = ((month, day) => {
-            if (month && day) {
-                let date = new Date(`${new Date(Date.now()).getFullYear()}-${month}-${day} 23:59:59`).getTime()
-                if (!isNaN(date)) return date / 1000;
-            }
-            return 0
-        })(_date[1], _date[2])
-        if (timestamp10 === 0) return {
-            ts: 0,
-            text: `开奖时间: 未填写开奖时间`,
-            item: '请自行查看',
-            isMe: '请自行查看'
-        }
-        const timestamp13 = timestamp10 * 1000,
-            time = new Date(timestamp13);
-        const remain = (() => {
-            const timestr = ((timestamp13 - Date.now()) / 86400000).toString()
-                , timearr = timestr.replace(/(\d+)\.(\d+)/, "$1,0.$2").split(',');
-            const text = timearr[0][0] === '-' ? `开奖时间已过${timearr[0].substring(1)}天余${parseInt(timearr[1] * 24)}小时` : `还有${timearr[0]}天余${parseInt(timearr[1] * 24)}小时`;
-            return text
-        })();
-        return {
-            ts: timestamp10,
-            text: `开奖时间: ${time.toLocaleString()} ${remain}`,
-            item: '请自行查看',
-            isMe: '请自行查看'
-        };
     },
     /**
      * 获取远程设置
      * @returns {Promise<JSON>}
      */
-    getRemoteConfig: () => new Promise((resolve) => {
-        HttpRequest({
-            method: 'GET',
-            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',
-                accept: 'text/plain; charset=utf-8',
-                referer: 'https://gitee.com/shanmite/lottery-notice/blob/master/notice.json',
-            },
-            success: res => {
-                try {
-                    const body = JSON.parse(res.body);
-                    if (body.node_msg) console.log(body.node_msg);
-                    resolve(body.config)
-                } catch (error) {
-                    resolve(JSON.parse('{}'))
+    getRemoteConfig() {
+        return new Promise((resolve) => {
+            HttpRequest({
+                method: 'GET',
+                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',
+                    accept: 'text/plain; charset=utf-8',
+                    referer: 'https://gitee.com/shanmite/lottery-notice/blob/master/notice.json',
+                },
+                success: res => {
+                    try {
+                        const body = JSON.parse(res.body);
+                        if (body.node_msg) this.log.info('公告', '\n' + body.node_msg + '\n');
+                        resolve(body.config)
+                    } catch (error) {
+                        resolve(JSON.parse('{}'))
+                    }
+                },
+                failure: err => {
+                    this.log.error('获取远程设置', '获取远程设置错误: ' + err);
+                    resolve(JSON.parse('{}'));
                 }
-            },
-            failure: err => {
-                console.log('获取远程设置错误: ' + err);
-                resolve(JSON.parse('{}'));
-            }
+            })
         })
-    }),
+    },
     /**
-     * 
-     * @param {string} ts 13位时间戳
-     * @param {number} zoneOffset 东时区记做正数
+     * 是否存在文件或目录
+     * @param {string} path
+     * @returns 
      */
-    transformTimeZone: (ts, zoneOffset) => new Date(new Date(ts).getTime() + zoneOffset * 60 * 60 * 1000).toLocaleString(),
+    hasFileOrDir(path) {
+        try {
+            fs.accessSync(path, fs.constants.F_OK)
+        } catch (_) {
+            return false
+        }
+        return true
+    },
     /**
      * 生成文件夹
      * @param {string} dirname
@@ -245,4 +248,5 @@ const Base = {
     }
 };
 
-module.exports = Base;
+
+module.exports = Util;

lib/clear.js

@@ -1,8 +1,7 @@
-const Base = require("./Base");
+const { log, delay } = require("./Util");
 const BiliAPI = require("./BiliAPI");
 const Public = require("./Public");
 const GlobalVar = require('./GlobalVar');
-const { followWhiteList } = require("./config");
 const config = require("./config");
 
 /**动态偏移量 */
@@ -14,16 +13,19 @@ let offset = '0';
  */
 async function getFollowList() {
     const tagid = await BiliAPI.checkMyPartition(config.clear_partition);
-    if (typeof tagid === 'undefined') { Base.tooltip.log('未能成功获取关注分区id'); return }
+    if (typeof tagid === 'undefined') {
+        log.info('获取关注列表', '未能成功获取关注分区id');
+        return
+    }
     let rmup = [];
     for (let index = 1; index < 42; index++) {
         const uids = await BiliAPI.getPartitionUID(tagid, index);
-        await Base.delay(2e3);
+        await delay(2e3);
         if (!uids.length) break;
         rmup.push(...uids)
     }
-    return followWhiteList.length
-        ? rmup.filter(uid => followWhiteList.split(',').indexOf(String(uid)) === -1)
+    return config.clear_white_list.length
+        ? rmup.filter(uid => config.clear_white_list.split(',').indexOf(String(uid)) === -1)
         : rmup;
 }
 
@@ -31,7 +33,7 @@ async function getFollowList() {
  * 清理动态和关注
  */
 async function clear() {
-    const { clear_max_day, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type } = config;
+    const { clear_white_list, clear_max_day, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type } = config;
     let success = true;
     const uid_list = await getFollowList();
     if (!clear_remove_dynamic && clear_remove_attention) {
@@ -41,7 +43,7 @@ async function clear() {
             /* 取消关注 */
             success = await BiliAPI.cancelAttention(uid);
             /* 延时 */
-            await Base.delay(clear_remove_delay);
+            await delay(clear_remove_delay);
 
             if (!success) break;
         }
@@ -50,9 +52,9 @@ async function clear() {
         let before_separate = [];
         const MY_UID = Number(GlobalVar.get('myUID'));
         for (let index = 0; ; index++) {
+            log.info('清理动态', `开始读取第${index + 1}页(12条)`);
             const { allModifyDynamicResArray, offset: _offset } = await Public.prototype.checkAllDynamic(GlobalVar.get("myUID"), 1, 5 * 1000, offset);
             offset = _offset;
-            Base.tooltip.log(`开始读取第${index + 1}页(12条)`);
             for (let index = 0; index < allModifyDynamicResArray.length; index++) {
                 const res = allModifyDynamicResArray[index];
                 const { type, dynamic_id, createtime } = res;
@@ -61,7 +63,8 @@ async function clear() {
                     if ((now - createtime) > 86400 * clear_max_day) {
                         /* 移除动态 */
                         if (dynamic_id
-                            && clear_remove_dynamic) {
+                            && clear_remove_dynamic
+                            && !(new RegExp(dynamic_id).test(clear_white_list))) {
                             success = await BiliAPI.rmDynamic(dynamic_id)
                         }
 
@@ -75,7 +78,7 @@ async function clear() {
                         }
 
                         /* 延时 */
-                        await Base.delay(clear_remove_delay);
+                        await delay(clear_remove_delay);
 
                         if (!success) break;
                     } else {
@@ -83,7 +86,7 @@ async function clear() {
                     }
                 }
             }
-            Base.tooltip.log(`第${index}页中的转发动态与关注全部处理成功`)
+            log.info('清理动态', `第${index + 1}页中的转发动态与关注全部处理成功`)
             if (offset === '0' || !success) break;
         }
     }

lib/config.js

@@ -1,4 +1,4 @@
-const { config_file } = require('./Base');
+const { config_file } = require('./Util');
 const my_config = require(config_file);
 
 const config = {

lib/lottery-in-nodejs.js

@@ -1,4 +1,4 @@
-const Base = require('./Base');
+const Util = require('./Util');
 const BiliAPI = require('./BiliAPI');
 const eventBus = require('./eventBus');
 const GlobalVar = require('./GlobalVar');
@@ -6,18 +6,19 @@ const Public = require('./Public');
 const Monitor = require('./Monitor');
 const { sendNotify } = require('./sendNotify');
 const config = require('./config');
+const { log } = Util;
 
 async function createRandomDynamic(num) {
     if (config.create_dy) {
-        Base.tooltip.log(`准备创建${num}条随机动态`);
+        log.info('随机动态', `准备创建${num}条随机动态`);
         const Dynamic = await Public.prototype.checkAllDynamic(GlobalVar.get("myUID"), 1);
         if ((Dynamic.allModifyDynamicResArray[0] || { type: 0 }).type === 1) {
             for (let index = 0; index < num; index++) {
-                await BiliAPI.createDynamic(Base.getRandomOne(config.dy_contents));
-                await Base.delay(2000);
+                await BiliAPI.createDynamic(Util.getRandomOne(config.dy_contents));
+                await Util.delay(2000);
             }
         } else {
-            Base.tooltip.log('已有非抽奖动态故无需创建');
+            log.info('随机动态', '已有非抽奖动态故无需创建');
         }
     }
 }
@@ -29,18 +30,18 @@ async function createRandomDynamic(num) {
  */
 function start() {
     return new Promise(resolve => {
-        let times = Base.counter();
+        let times = Util.counter();
         /* 注册事件 */
         eventBus.on('Turn_on_the_Monitor', async () => {
             const lotterys = GlobalVar.get("Lottery");
             if (lotterys.length === 0) {
-                Base.tooltip.log('抽奖信息为空');
+                log.info('抽奖', '抽奖信息为空');
                 resolve();
                 return;
             }
             if (times.value() === lotterys.length) {
                 await createRandomDynamic(config.create_dy_num);
-                Base.tooltip.log('所有动态转发完毕');
+                log.info('抽奖', '所有动态转发完毕');
                 times.clear();
                 eventBus.emit('Turn_off_the_Monitor', '目前无抽奖信息,过一会儿再来看看吧')
                 return;
@@ -51,7 +52,7 @@ function start() {
         });
         eventBus.on('Turn_off_the_Monitor', async (msg) => {
             await createRandomDynamic(config.create_dy_num);
-            Base.tooltip.log('[运行结束]程序自动关闭 原因: ' + msg);
+            log.info('结束抽奖', '原因: ' + msg);
             eventBus.flush();
             resolve();
         })
@@ -68,18 +69,18 @@ async function isMe() {
     const UnreadSessionNum = await BiliAPI.getUnreadSessionNum();
     const { follow_unread, unfollow_unread } = UnreadSessionNum || { unfollow_unread: 0, follow_unread: 0 };
     if (UnreadAtNum > 0) {
-        Base.tooltip.log('<-- 正在检查at');
+        log.info('中奖检测', '<-- 正在检查at');
         const MyAtInfo = await BiliAPI.getMyAtInfo();
         MyAtInfo.forEach(async AtInfo => {
             const { at_time, up_uname, business, source_content, url } = AtInfo
-            desp += `发生时间: ${Base.transformTimeZone(at_time * 1000, 8)}  \n\n`
+            desp += `发生时间: ${new Date(at_time * 1000).toLocaleString()}  \n\n`
             desp += `用户: ${up_uname}  \n\n`
             desp += `在${business}中@了你(${GlobalVar.get("myUID")})  \n\n`
             desp += `原内容为: ${source_content}  \n\n`
             desp += `[直达链接](${url})  \n\n`
             desp += `\n\n\n\n`
         });
-        Base.tooltip.log('--> OK');
+        log.info('中奖检测', '--> OK');
     }
     if (follow_unread + unfollow_unread > 0) {
         const check = async (type) => {
@@ -92,9 +93,9 @@ async function isMe() {
                     session_t = session_ts;
                     if (talker_id) {
                         BiliAPI.updateSessionStatus(talker_id);
-                        await Base.delay(1000);
-                        if (/中奖|获得|填写|写上|提供|地址|支付宝账号|码|大会员/.test(content)) {
-                            desp += `发生时间: ${Base.transformTimeZone(timestamp * 1000, 8)}  \n\n`
+                        await Util.delay(1000);
+                        if (/中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员/.test(content)) {
+                            desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}  \n\n`
                             desp += `用户: ${sender_uid}  \n\n`
                             desp += `私信你(${GlobalVar.get("myUID")})说: ${content}  \n\n`
                             desp += `[直达链接](https://message.bilibili.com/#/whisper/mid${sender_uid})  \n\n`
@@ -103,27 +104,27 @@ async function isMe() {
                     }
                 }
                 if (MySession.has_more) {
-                    await Base.delay(3e3);
+                    await Util.delay(3e3);
                     MySession = await BiliAPI.getSessionInfo(type, session_t)
                 }
                 max++
             } while (MySession.has_more && max < 10);
         }
         if (follow_unread) {
-            Base.tooltip.log('<-- 正在检查已关注者的私信')
+            log.info('中奖检测', '<-- 正在检查已关注者的私信')
             await check(1)
         }
         if (unfollow_unread) {
-            Base.tooltip.log('<-- 正在检查未关注者的私信')
+            log.info('中奖检测', '<-- 正在检查未关注者的私信')
             await check(2)
         }
-        Base.tooltip.log('--> OK');
+        log.info('中奖检测', '--> OK');
     }
     if (desp) {
-        Base.tooltip.log(desp);
+        log.info(desp);
         await sendNotify('可能中奖了', desp);
     } else {
-        Base.tooltip.log("未中奖");
+        log.info('中奖检测', "未中奖");
     }
     return;
 }
@@ -134,10 +135,10 @@ async function isMe() {
  */
 async function checkCookie(num) {
     if (await BiliAPI.getMyinfo()) {
-        Base.tooltip.log('成功登录');
+        log.info('Cookie有效性检测', '成功登录');
         return true;
     } else {
-        Base.tooltip.log(`登录失败 COOKIE${num} 已失效 UID:${GlobalVar.get("myUID")}`);
+        log.error('Cookie有效性检测', `登录失败 COOKIE${num} 已失效 UID:${GlobalVar.get("myUID")}`);
         await sendNotify('动态抽奖出错-登录失败', `COOKIE${num} 已失效 UID:${GlobalVar.get("myUID")}`)
         return false;
     }

lib/sendNotify.js

@@ -1,4 +1,4 @@
-const { tooltip } = require("./Base");
+const { log } = require("./Util");
 const { HttpRequest } = require("./HttpRequest");
 const { createTransport } = require("nodemailer");
 
@@ -202,26 +202,26 @@ function serverNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.errno === 0) {
-                            tooltip.log('server酱发送通知消息成功\n')
+                            log.info('发送通知','server酱发送通知消息成功\n')
                         } else if (data.errno === 1024) {
                             // 一分钟内发送相同的内容会触发
-                            tooltip.log(`server酱发送通知消息异常: ${data.errmsg}\n`)
+                            log.error('发送通知',`server酱发送通知消息异常: ${data.errmsg}\n`)
                         } else {
-                            tooltip.log(`server酱发送通知消息异常\n${JSON.stringify(data)}`)
+                            log.error('发送通知',`server酱发送通知消息异常\n${JSON.stringify(data)}`)
                         }
                     } catch (error) {
-                        tooltip.log(error);
+                        log.error('发送通知',error);
                     } finally {
                         resolve()
                     }
                 },
                 failure: err => {
-                    tooltip.log('server酱 发送通知调用API失败！！\n')
+                    log.error('发送通知','server酱 发送通知调用API失败！！\n')
                     throw new Error(err);
                 }
             })
         } else {
-            tooltip.log('您未提供server酱的SCKEY，取消微信推送消息通知\n');
+            log.warn('发送通知','您未提供server酱的SCKEY，取消微信推送消息通知\n');
             resolve()
         }
     })
@@ -247,23 +247,23 @@ function serverNotifyTurbo(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.code === 0) {
-                            tooltip.log('server酱(Turbo版)发送通知消息成功\n')
+                            log.info('发送通知','server酱(Turbo版)发送通知消息成功\n')
                         } else {
-                            tooltip.log(`server酱(Turbo版)发送通知消息异常\n${JSON.stringify(data)}`)
+                            log.error('发送通知',`server酱(Turbo版)发送通知消息异常\n${JSON.stringify(data)}`)
                         }
                     } catch (error) {
-                        tooltip.log(error);
+                        log.error('发送通知',error);
                     } finally {
                         resolve()
                     }
                 },
                 failure: err => {
-                    tooltip.log('server酱(Turbo版) 发送通知调用API失败！！\n')
+                    log.error('发送通知','server酱(Turbo版) 发送通知调用API失败！！\n')
                     throw new Error(err);
                 }
             })
         } else {
-            tooltip.log('您未提供server酱(Turbo版)的SCKEY，取消微信推送消息通知\n');
+            log.warn('发送通知','您未提供server酱(Turbo版)的SCKEY，取消微信推送消息通知\n');
             resolve()
         }
     })
@@ -301,25 +301,25 @@ function coolPush(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.code === 200) {
-                            tooltip.log(`酷推发送${pushMode(QQ_MODE)}通知消息成功\n`)
+                            log.info('发送通知',`酷推发送${pushMode(QQ_MODE)}通知消息成功\n`)
                         } else if (data.code === 400) {
-                            tooltip.log(`QQ酷推(Cool Push)发送${pushMode(QQ_MODE)}推送失败：${data}\n`)
+                            log.error('发送通知',`QQ酷推(Cool Push)发送${pushMode(QQ_MODE)}推送失败：${data}\n`)
                         } else {
-                            tooltip.log(`酷推推送异常: ${data.msg}`);
+                            log.error('发送通知',`酷推推送异常: ${data.msg}`);
                         }
                     } catch (error) {
-                        tooltip.log(error);
+                        log.error('发送通知',error);
                     } finally {
                         resolve()
                     }
                 },
                 failure: err => {
-                    tooltip.log(`酷推 发送${pushMode(QQ_MODE)}通知调用API失败！！\n`)
+                    log.error('发送通知',`酷推 发送${pushMode(QQ_MODE)}通知调用API失败！！\n`)
                     throw new Error(err);
                 }
             })
         } else {
-            tooltip.log('您未提供酷推的SKEY，取消QQ推送消息通知\n');
+            log.warn('发送通知','您未提供酷推的SKEY，取消QQ推送消息通知\n');
             resolve()
         }
     })
@@ -345,24 +345,24 @@ function barkNotify(text, desp, params = {}) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.code === 200) {
-                            tooltip.log('Bark APP发送通知消息成功\n')
+                            log.info('发送通知','Bark APP发送通知消息成功\n')
                         } else {
-                            tooltip.log(`${data.message}\n`);
+                            log.error('发送通知',`${data.message}\n`);
                         }
                     } catch (error) {
-                        tooltip.log(error);
+                        log.error('发送通知',error);
                     } finally {
                         resolve()
                     }
                 },
                 failure: err => {
-                    tooltip.log('Bark APP发送通知调用API失败！！\n');
+                    log.error('发送通知','Bark APP发送通知调用API失败！！\n');
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            tooltip.log('您未提供Bark的APP推送BARK_PUSH，取消Bark推送消息通知\n');
+            log.warn('发送通知','您未提供Bark的APP推送BARK_PUSH，取消Bark推送消息通知\n');
             resolve()
         }
     })
@@ -391,20 +391,20 @@ function tgBotNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.ok) {
-                            tooltip.log('Telegram发送通知消息完成。\n')
+                            log.info('发送通知','Telegram发送通知消息完成。\n')
                         } else if (data.error_code === 400) {
-                            tooltip.log('请主动给bot发送一条消息并检查接收用户ID是否正确。\n')
+                            log.error('发送通知','请主动给bot发送一条消息并检查接收用户ID是否正确。\n')
                         } else if (data.error_code === 401) {
-                            tooltip.log('Telegram bot token 填写错误。\n')
+                            log.error('发送通知','Telegram bot token 填写错误。\n')
                         }
                     } catch (error) {
-                        tooltip.log(error);
+                        log.error('发送通知',error);
                     } finally {
                         resolve()
                     }
                 },
                 failure: err => {
-                    tooltip.log('telegram发送通知消息失败！！\n')
+                    log.error('发送通知','telegram发送通知消息失败！！\n')
                     resolve()
                     throw new Error(err)
                 }
@@ -417,7 +417,7 @@ function tgBotNotify(text, desp) {
             }
             HttpRequest(options)
         } else {
-            tooltip.log('您未提供telegram机器人推送所需的TG_BOT_TOKEN和TG_USER_ID，取消telegram推送消息通知\n');
+            log.warn('发送通知','您未提供telegram机器人推送所需的TG_BOT_TOKEN和TG_USER_ID，取消telegram推送消息通知\n');
             resolve()
         }
     })
@@ -430,7 +430,7 @@ function ddBotNotify(text, desp) {
             const dateNow = Date.now();
             const hmac = crypto.createHmac('sha256', DD_BOT_SECRET);
             hmac.update(`${dateNow}\n${DD_BOT_SECRET}`);
-            const result = encodeURIComponent(hmac.digest('base64'));
+            const result = encodeURIComponent(hmac.digest('Util64'));
             HttpRequest({
                 method: 'POST',
                 url: `https://oapi.dingtalk.com/robot/send`,
@@ -456,18 +456,18 @@ function ddBotNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.errcode === 0) {
-                            tooltip.log('钉钉发送通知消息完成。\n')
+                            log.info('发送通知','钉钉发送通知消息完成。\n')
                         } else {
-                            tooltip.log(`${data.errmsg}\n`)
+                            log.error('发送通知',`${data.errmsg}\n`)
                         }
                     } catch (e) {
-                        tooltip.log(e);
+                        log.error('发送通知',e);
                     } finally {
                         resolve();
                     }
                 },
                 failure: err => {
-                    tooltip.log('钉钉发送通知消息失败！！\n')
+                    log.error('发送通知','钉钉发送通知消息失败！！\n')
                     throw new Error(err);
                 }
             })
@@ -495,24 +495,24 @@ function ddBotNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.errcode === 0) {
-                            tooltip.log('钉钉发送通知消息完成。\n')
+                            log.info('发送通知','钉钉发送通知消息完成。\n')
                         } else {
-                            tooltip.log(`${data.errmsg}\n`)
+                            log.error('发送通知',`${data.errmsg}\n`)
                         }
                     } catch (e) {
-                        tooltip.log(e);
+                        log.error('发送通知',e);
                     } finally {
                         resolve();
                     }
                 },
                 failure: err => {
-                    tooltip.log('钉钉发送通知消息失败！！\n');
+                    log.error('发送通知','钉钉发送通知消息失败！！\n');
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            tooltip.log('您未提供钉钉机器人推送所需的DD_BOT_TOKEN或者DD_BOT_SECRET，取消钉钉推送消息通知\n');
+            log.warn('发送通知','您未提供钉钉机器人推送所需的DD_BOT_TOKEN或者DD_BOT_SECRET，取消钉钉推送消息通知\n');
             resolve()
         }
     })
@@ -541,24 +541,24 @@ function qywxBotNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.errcode === 0) {
-                            tooltip.log('企业微信发送通知消息完成。\n');
+                            log.info('发送通知','企业微信发送通知消息完成。\n');
                         } else {
-                            tooltip.log(`${data.errmsg}\n`);
+                            log.error('发送通知',`${data.errmsg}\n`);
                         }
                     } catch (e) {
-                        tooltip.log(e);
+                        log.error('发送通知',e);
                     } finally {
                         resolve();
                     }
                 },
                 failure: err => {
-                    tooltip.log('企业微信发送通知消息失败！！\n');
+                    log.error('发送通知','企业微信发送通知消息失败！！\n');
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            tooltip.log('您未提供企业微信机器人推送所需的QYWX_KEY，取消企业微信推送消息通知\n');
+            log.warn('发送通知','您未提供企业微信机器人推送所需的QYWX_KEY，取消企业微信推送消息通知\n');
             resolve();
         }
     });
@@ -570,7 +570,7 @@ function iGotNotify(text, desp, params = {}) {
             // 校验传入的IGOT_PUSH_KEY是否有效
             const IGOT_PUSH_KEY_REGX = new RegExp("^[a-zA-Z0-9]{24}$")
             if (!IGOT_PUSH_KEY_REGX.test(IGOT_PUSH_KEY)) {
-                tooltip.log('您所提供的IGOT_PUSH_KEY无效\n')
+                log.error('发送通知','您所提供的IGOT_PUSH_KEY无效\n')
                 resolve()
                 return
             }
@@ -593,24 +593,24 @@ function iGotNotify(text, desp, params = {}) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.ret === 0) {
-                            tooltip.log('iGot发送通知消息成功\n')
+                            log.info('发送通知','iGot发送通知消息成功\n')
                         } else {
-                            tooltip.log(`iGot发送通知消息失败：${data.errMsg}\n`)
+                            log.error('发送通知',`iGot发送通知消息失败：${data.errMsg}\n`)
                         }
                     } catch (e) {
-                        tooltip.log(e);
+                        log.error('发送通知',e);
                     } finally {
                         resolve();
                     }
                 },
                 failure: err => {
-                    tooltip.log('iGot 发送通知调用API失败！！\n')
+                    log.error('发送通知','iGot 发送通知调用API失败！！\n')
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            tooltip.log('您未提供iGot的推送IGOT_PUSH_KEY，取消iGot推送消息通知\n');
+            log.warn('发送通知','您未提供iGot的推送IGOT_PUSH_KEY，取消iGot推送消息通知\n');
             resolve()
         }
     })
@@ -639,24 +639,24 @@ function pushPlusNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.code === 200) {
-                            tooltip.log(`push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息完成。\n`)
+                            log.info('发送通知',`push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息完成。\n`)
                         } else {
-                            tooltip.log(`push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败：${data.msg}\n`)
+                            log.error('发送通知',`push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败：${data.msg}\n`)
                         }
                     } catch (e) {
-                        tooltip.log(e);
+                        log.error('发送通知',e);
                     } finally {
                         resolve();
                     }
                 },
                 failure: err => {
-                    tooltip.log(`push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败！！\n`)
+                    log.error('发送通知',`push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败！！\n`)
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            tooltip.log('您未提供push+推送所需的PUSH_PLUS_TOKEN，取消push+推送消息通知\n');
+            log.warn('发送通知','您未提供push+推送所需的PUSH_PLUS_TOKEN，取消push+推送消息通知\n');
             resolve()
         }
     })
@@ -679,12 +679,12 @@ async function email(text, desp) {
                 text: desp,
             })
         } catch (e) {
-            tooltip.log(`email发送失败 原因: ${e.message}`);
+            log.error('发送通知',`email发送失败 原因: ${e.message}`);
             return
         }
-        tooltip.log('email发送成功');
+        log.info('发送通知','email发送成功');
     } else {
-        tooltip.log('您未提供email推送所需的所有参数故取消email推送消息通知\n');
+        log.warn('发送通知','您未提供email推送所需的所有参数故取消email推送消息通知\n');
     }
 }
 

lib/setVariable.js

@@ -1,4 +1,4 @@
-const Base = require("./Base");
+const Util = require("./Util");
 const GlobalVar = require("./GlobalVar");
 const config = require("./config");
 
@@ -6,6 +6,7 @@ const key_map = new Map([['DedeUserID', 'myUID'], ['bili_jct', 'csrf']]);
 
 /**
  * 生成全局变量文件
+ * 更新config
  * @param {string} cookie
  * @param {number} n
  */
@@ -20,10 +21,10 @@ async function setVariable(cookie, n) {
                 GlobalVar.set(key_map.get(_item[0]), _item[1]);
         });
         GlobalVar.set('Lottery', [...config.UIDs, ...config.TAGs]);
-        GlobalVar.set('remoteconfig', await Base.getRemoteConfig());
+        GlobalVar.set('remoteconfig', await Util.getRemoteConfig());
     }
-    await Base.createDir('dyids');
-    await Base.createFile(n < 2 ? 'dyid.txt' : `dyid${n}.txt`, '', 'a')
+    await Util.createDir('dyids');
+    await Util.createFile(n < 2 ? 'dyid.txt' : `dyid${n}.txt`, '', 'a')
     return
 }
 

main.js

@@ -1,16 +1,21 @@
-const { env_file, tooltip, delay } = require("./lib/Base");
-const { loop_wait } = require("./lib/config");
+const { env_file, config_file, log, delay, hasFileOrDir } = require("./lib/Util");
 
+const metainfo = [
+    `  _           _   _                   _____           _       _   `,
+    ` | |         | | | |                 / ____|         (_)     | |  `,
+    ` | |     ___ | |_| |_ ___ _ __ _   _| (___   ___ _ __ _ _ __ | |_ `,
+    ` | |    / _ \\| __| __/ _ \\ '__| | | |\\___ \\ / __| '__| | '_ \\| __|`,
+    ` | |___| (_) | |_| ||  __/ |  | |_| |____) | (__| |  | | |_) | |_ `,
+    ` |______\\___/ \\__|\\__\\___|_|   \\__, |_____/ \\___|_|  |_| .__/ \\__|`,
+    `                                __/ |                  | |        `,
+    `                               |___/                   |_|        `,
+    `                                                                  `,
+    `                                              v1.9.0   by shanmite`,
+]
 /**多账号存储 */
 let multiple_account = [];
-
-if (!process.env.CI) {
-    const { initEnv, multiple_account_parm } = require(env_file);
-    if (multiple_account_parm) {
-        multiple_account = multiple_account_parm;
-    }
-    initEnv()
-}
+/**循环等待时间 */
+let loop_wait = 0;
 
 /**
  * @returns {Promise<string>} 错误信息
@@ -31,6 +36,9 @@ async function main() {
             await main();
             await delay(acco.WAIT);
         }
+
+        /**多账号状态还原 */
+        process.env.ENABLE_MULTIPLE_ACCOUNT = ENABLE_MULTIPLE_ACCOUNT;
     } else {
         if (!COOKIE) {
             return '请查看README文件, 在env.js指定位置填入cookie'
@@ -41,61 +49,82 @@ async function main() {
         const { start, isMe, checkCookie } = require("./lib/lottery-in-nodejs");
         const { clear } = require("./lib/clear");
 
-        tooltip.log('[LotteryAutoScript] 账号' + NUMBER);
+        log.info('main', '当前为第' + NUMBER + '个账号');
 
         if (await checkCookie(NUMBER)) {
             const mode = process.env.lottery_mode;
-            const help_msg = "用法: lottery [OPTIONS]\n\nOPTIONS:\n\tstart 启动抽奖\n\tcheck 中奖检查\n\tclear 清理动态和关注\n\thelp 帮助信息\n";
+            const help_msg = "用法: lottery [OPTIONS]\n\nOPTIONS:\n\tstart 启动抽奖\n\tcheck 中奖检查\n\tclear 清理动态和关注\n\thelp 帮助信息";
+            const { lottery_loop_wait, check_loop_wait, clear_loop_wait } = require("./lib/config");
             switch (mode) {
                 case 'start':
-                    tooltip.log('开始参与抽奖');
+                    log.info('抽奖', '开始运行');
+                    loop_wait = lottery_loop_wait;
                     await start();
                     break;
                 case 'check':
-                    tooltip.log('检查是否中奖');
+                    log.info('中奖检测', '检查是否中奖');
+                    loop_wait = check_loop_wait;
                     await isMe();
                     break;
                 case 'clear':
                     if (CLEAR) {
-                        tooltip.log('开始清理动态');
+                        log.info('清理动态', '开始运行');
+                        loop_wait = clear_loop_wait;
                         await clear();
-                        tooltip.log('清理动态完毕');
                     }
                     break;
                 case 'help':
                     return help_msg
                 case undefined:
-                    return "错误: 未提供以下参数\n\t[OPTIONS]\n\n" + help_msg
+                    return "未提供以下参数\n\t[OPTIONS]\n\n" + help_msg
                 default:
-                    return `错误: 提供了错误的[OPTIONS] -> ${mode}\n\n` + help_msg
+                    return `提供了错误的[OPTIONS] -> ${mode}\n\n` + help_msg
             }
         }
     }
 }
 
 (async function () {
-    let metainfo = '';
-    metainfo += `  _           _   _                   _____           _       _   \n`;
-    metainfo += ` | |         | | | |                 / ____|         (_)     | |  \n`;
-    metainfo += ` | |     ___ | |_| |_ ___ _ __ _   _| (___   ___ _ __ _ _ __ | |_ \n`;
-    metainfo += ` | |    / _ \\| __| __/ _ \\ '__| | | |\\___ \\ / __| '__| | '_ \\| __|\n`;
-    metainfo += ` | |___| (_) | |_| ||  __/ |  | |_| |____) | (__| |  | | |_) | |_ \n`;
-    metainfo += ` |______\\___/ \\__|\\__\\___|_|   \\__, |_____/ \\___|_|  |_| .__/ \\__|\n`;
-    metainfo += `                                __/ |                  | |        \n`;
-    metainfo += `                               |___/                   |_|        \n`;
-    metainfo += `                                                                  \n`;
-    metainfo += `                                                       by shanmite\n`;
-    console.log(metainfo);
+    log.proPrint(metainfo, '\n')
+
+    if (hasFileOrDir(env_file)) {
+        const { initEnv, multiple_account_parm } = require(env_file);
+        if (multiple_account_parm) {
+            multiple_account = multiple_account_parm;
+        }
+        initEnv();
+        log.init();
+        log.info('环境变量初始化', '成功加载env.js文件');
+    } else {
+        log.init();
+        log.warn('环境变量初始化', '未在当前目录下找到env.js文件 也可在环境变量中设置所需参数');
+        return
+    }
+
+    if (hasFileOrDir(config_file)) {
+        require("./lib/config");
+        log.info('配置文件初始化', '成功加载my_config.js文件');
+    } else {
+        log.error('配置文件初始化', '未在当前目录下找到my_config.js文件');
+        return
+    }
+
     /**OPTIONS */
     process.env.lottery_mode = process.argv[2]
+
     const err_msg = await main();
     if (err_msg) {
-        console.log(err_msg);
+        log.error('错误', '\n' + err_msg + '\n');
+        log.warn('结束运行', '5秒后自动退出');
+        await delay(5 * 1000);
     } else {
-        tooltip.log(`休眠${loop_wait / 1000}秒后再次启动`)
-        await delay(loop_wait);
+        while (loop_wait) {
+            log.info('程序休眠', `${loop_wait / 1000}秒后再次启动`)
+            await delay(loop_wait)
+            await main()
+        }
+        log.info('结束运行', '未设置休眠时间')
     }
-    tooltip.log('5秒后自动退出');
-    await delay(5 * 1000);
+
     process.exit(0);
 })()

my_config.example.js

@@ -8,7 +8,8 @@ module.exports = {
          */
         UIDs: [
             31252386,
-            689277291
+            689277291,
+            241675899
         ],
 
         /**
@@ -16,9 +17,9 @@ module.exports = {
          */
         TAGs: [
             '互动抽奖',
-            '抽奖',
             '转发抽奖',
             '动态抽奖',
+            '抽奖',
         ],
 
         /**
@@ -63,17 +64,19 @@ module.exports = {
         maxday: Infinity,
 
         /**
-         *  - 整体循环等待时间(指所有转发完毕后的休眠时间)
+         *  - 循环等待时间(指所有操作完毕后的休眠时间)
          *  - 单位毫秒
          */
-        loop_wait: 60 * 60 * 1000,
+        lottery_loop_wait: 60 * 60 * 1000,
+        check_loop_wait: 0,
+        clear_loop_wait: 0,
 
         /**
          * - 转发间隔时间
          * - 单位毫秒
          * - 上下浮动50%
          */
-        wait: 100 * 1000,
+        wait: 30 * 1000,
 
         /**
          * - 检索动态间隔
@@ -86,11 +89,6 @@ module.exports = {
          */
         minfollower: 1000,
 
-        /**
-         * 粉丝数限制是否跳过有官方认证的up
-         */
-        skip_official_verify: true,
-
         /**
          * - 只转发已关注的
          */
@@ -125,19 +123,15 @@ module.exports = {
         at_users: [['转发抽奖娘', 294887687], ['你的工具人老公', 100680137]],
 
         /**
-         * 同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
+         * - 同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
+         * - 英文逗号分隔 如: 1,2,3
          */
-        blacklist: '1,2',
+        blacklist: '',
 
         /**
          * 屏蔽词
          */
-        blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号", "钓鱼"],
-
-        /**
-         * 取关白名单
-         */
-        followWhiteList: '1,2',
+        blockword: ["脚本抽奖", "恭喜", "结果", "抽奖号", "钓鱼", "涨粉"],
 
         /**
          * 转发评语
@@ -166,6 +160,12 @@ module.exports = {
          */
         is_exception: false,
 
+        /**
+         * - 清理白名单uid或dyid
+         * - 英文逗号分隔 如: 1,2,3
+         */
+        clear_white_list: '',
+
         /**
          * - 取关分区
          * - 默认为: 此处存放因抽奖临时关注的up
@@ -173,7 +173,7 @@ module.exports = {
         clear_partition: '',
 
         /**
-         * 清理多少天内的动态或关注
+         * 清理多少天之前的动态或关注
          */
         clear_max_day: 30,
 

package.json

@@ -7,8 +7,10 @@
     "start": "node main.js start",
     "clear": "node main.js clear",
     "check": "node main.js check",
-    "pkg": "npx pkg . && powershell .\\script\\pkg\\pkg.ps1",
-    "pkg_arm": "npx pkg -t linux-arm -o dist/lottery-in-bili-linux-arm main.js"
+    "pkg_x86": "npx pkg . && PowerShell .\\script\\pkg\\pkg.ps1",
+    "pkg_clean_dist": "PowerShell -Command \"& {Remove-Item -Path .\\dist\\ -Recurse}\"",
+    "pkg_arm64": "npx pkg -t linux-arm64 -o dist/lottery main.js && cp my_config.example.js my_config.js && cp env.example.js dist/env.js",
+    "pkg_armv7": "npx pkg -t linux-armv7 -o dist/lottery main.js && cp my_config.example.js my_config.js && cp env.example.js dist/env.js"
   },
   "bin": "main.js",
   "pkg": {
@@ -38,7 +40,8 @@
     "pkg": "^5.2.1"
   },
   "dependencies": {
+    "chalk": "^4.1.1",
     "nodemailer": "^6.5.0",
     "unzipper": "^0.10.11"
   }
-}
+}

test/getDyid.js

@@ -1,6 +0,0 @@
-const { getDyid } = require("../lib/MyStorage");
-
-(async () => {
-    let alldyid = await getDyid();
-    console.log(alldyid);
-})()

test/getHiToKoTo.js

@@ -1,5 +0,0 @@
-const { getHiToKoTo } = require("../lib/Base");
-
-getHiToKoTo().then(h => {
-    console.log(h);
-})

test/getZhihuBillBoard.js

@@ -1,5 +0,0 @@
-const { getZhihuBillBoard } = require("../lib/Base");
-
-getZhihuBillBoard().then(x => {
-    console.log(x);
-})

test/httpreq.js

@@ -1,19 +0,0 @@
-const { HttpRequest } = require("../lib/HttpRequest");
-
-HttpRequest({
-    method: 'GET',
-    url: 'https://www.www.www',
-    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',
-        accept: 'application/json, text/plain, */*',
-    },
-    config: {
-        wait: 1000
-    },
-    success: res => {
-        console.log(res.body);
-    },
-    failure: err => {
-        console.log(err);
-    }
-})

test/huge_file/read.js

@@ -1,26 +0,0 @@
-const { createReadStream, createWriteStream } = require('fs');
-
-const file = 'test/huge_file/dyid.txt';
-const test = 'test/huge_file/test.txt';
-
-const ws = createReadStream(file, { encoding: 'utf8', highWaterMark: 19 * 1000 })
-
-const rs = createWriteStream(test, { flags: 'a' })
-
-rs.write(Date.now() + '->', () => {
-    console.log('写入完毕');
-    rs.destroy()
-})
-
-let i = 0;
-ws.on('data', chunk => {
-    i++;
-    if (/000000000000000000/.test(chunk)) {
-        console.log('success')
-        console.log('in ' + i)
-        // 14764824 bytes
-        // success
-        // in 778
-        // [Done] exited with code=0 in 0.331 seconds
-    }
-})

test/huge_file/test.txt

@@ -1 +0,0 @@
-===1614266851666->