fix: article模式下uid无法获取

feat: 专栏转发率达一半以上时跳过

README.md

@@ -79,7 +79,9 @@ Chrome浏览器:
 2. `env.js`中填入`COOKIE`和推送参数
 3. `my_config.js`中自定义设置
 4. 在当前目录下打开终端运行可执行文件`lottery`
-5. 运行截图
+5. 输入`lottery start`启动抽奖|`lottery check`检测中奖|`lottery clear`清理动态
+   > 或者新建文本文档写入`lottery start`然后更改扩展名为.bat点击运行
+6. 运行截图
   ![lottery_start](doc/pic/lottery_start.png)
 
 #### 以源码方式运行

lib/BiliAPI.js

@@ -1,5 +1,5 @@
 const Ajax = require('./Ajax');
-const { strToJson, log } = require('./Base');
+const { strToJson, log } = require('./Util');
 const GlobalVar = require('./GlobalVar');
 
 /**
@@ -74,7 +74,6 @@ const BiliAPI = {
         return new Promise((resolve) => {
             Ajax.get({
                 url: 'https://api.bilibili.com/x/msgfeed/unread',
-                hasCookies: true,
                 success: responseText => {
                     let res = strToJson(responseText);
                     if (res.code === 0) {
@@ -148,7 +147,6 @@ const BiliAPI = {
         return new Promise((resolve) => {
             Ajax.get({
                 url: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/single_unread',
-                hasCookies: true,
                 success: responseText => {
                     let res = strToJson(responseText);
                     if (res.code === 0) {
@@ -213,6 +211,24 @@ const BiliAPI = {
             });
         });
     },
+    /**
+     * 获取一个动态的细节
+     * @param {string} dyid
+     * @return {Promise<string>}
+     */
+    getOneDynamicByDyid(dyid) {
+        return new Promise((resolve) => {
+            Ajax.get({
+                url: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/get_dynamic_detail',
+                queryStringsObj: {
+                    dynamic_id: dyid
+                },
+                success: responseText => {
+                    resolve(responseText)
+                }
+            })
+        });
+    },
     /**
      * 获取一组动态的信息
      * @param {number} UID
@@ -254,7 +270,6 @@ const BiliAPI = {
                 queryStringsObj: {
                     tag_name: tagename
                 },
-                hasCookies: false,
                 success: responseText => {
                     const res = strToJson(responseText);
                     if (res.code !== 0) {
@@ -306,6 +321,49 @@ const BiliAPI = {
             });
         });
     },
+    /**
+     * 搜索专栏
+     * @param {string} keyword
+     * @return {Promise<Array<number>>}
+     */
+    searchArticlesByKeyword(keyword) {
+        return new Promise((resolve) => {
+            Ajax.get({
+                url: 'https://api.bilibili.com/x/web-interface/search/type',
+                queryStringsObj: {
+                    keyword,
+                    page: 1,
+                    order: 'pubdate',
+                    search_type: 'article'
+                },
+                success: responseText => {
+                    const res = JSON.parse(responseText);
+                    if (res.code === 0) {
+                        log.info('搜索专栏', '成功 关键词: ' + keyword)
+                        resolve(res.data.result.map(it => it.id))
+                    } else {
+                        log.error('搜索专栏', '失败 原因:\n' + responseText)
+                        resolve([])
+                    }
+                }
+            })
+        });
+    },
+    /**
+     * 获取专栏内容
+     * @param {number} cv
+     * @returns {Promise<string>}
+     */
+    getOneArticleByCv(cv) {
+        return new Promise((resolve) => {
+            Ajax.get({
+                url: `https://www.bilibili.com/read/cv${cv}`,
+                success: responseText => {
+                    resolve(responseText)
+                }
+            })
+        });
+    },
     /**
      * 获取粉丝数
      * @param {number} uid
@@ -365,7 +423,6 @@ const BiliAPI = {
                 queryStringsObj: {
                     dynamic_id: dyid
                 },
-                hasCookies: false,
                 success: responseText => {
                     const res = strToJson(responseText);
                     /(?<=_prize_cmt":").*(?=")/.exec();

lib/GithubAPI.js

@@ -1,157 +0,0 @@
-const { createReadStream, createWriteStream } = require('fs')
-const unzip = require('unzipper');
-const { strToJson, tooltip } = require("./Base")
-const { HttpRequest } = require("./HttpRequest")
-
-const { GITHUB_REPOSITORY } = process.env;
-
-
-const GihubAPI = {
-    /**
-     * 列出第一个构件
-     * @returns {Promise<{id: number, size_in_bytes: number}>}
-     */
-    listArtifacts() {
-        return new Promise((resolve) => {
-            HttpRequest({
-                method: 'GET',
-                url: `https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/artifacts`,
-                config: {
-                    retry: false
-                },
-                query: {
-                    page: 1,
-                    per_page: 5
-                },
-                headers: {
-                    Accept: 'application/json, text/plain, */*',
-                },
-                success: res => {
-                    const data = strToJson(res.body);
-                    if (data.total_count) {
-                        resolve(data.artifacts[0])
-                    } else {
-                        resolve({})
-                        tooltip.log('之前无构件');
-                    }
-                },
-                failure: err => {
-                    tooltip.log(err);
-                    resolve({})
-                }
-            })
-        });
-    },
-    /**
-     * 下载构件
-     * @param {number} id 
-     * @returns {Promise<boolean>} success: true
-     */
-    downloadArtifacts(id) {
-        return new Promise((resolve) => {
-            HttpRequest({
-                method: 'GET',
-                url: `https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/artifacts/${id}/zip`,
-                headers: {
-                    accept: 'application/vnd.github.v3+json',
-                    authorization: `token ${process.env.PAT}`
-                },
-                config: {
-                    redirect: true,
-                },
-                stream: true,
-                success: res => {
-                    let recv_length = 0;
-                    const wtbs = createWriteStream('dyid.zip');
-                    res.resStream.on('data', chuck => {
-                        recv_length += chuck.length
-                        tooltip.log(`已收到:${recv_length} Bytes`)
-                    })
-                    res.resStream.pipe(wtbs)
-                    wtbs.on('finish', () => {
-                        tooltip.log('下载完成开始解压')
-                        createReadStream('dyid.zip').pipe(unzip.Extract({
-                            path: 'lib',
-                        }).on('close', () => {
-                            tooltip.log('解压完成')
-                            resolve(true)
-                        }))
-                    }).on('error', () => {
-                        wtbs.destroy()
-                        resolve(false)
-                    })
-                },
-                failure: err => {
-                    tooltip.log(err);
-                    resolve(false)
-                }
-            })
-        });
-    },
-    /**
-     * 检查是否正在抽奖或取关
-     * @returns {Promise<boolean>}
-     */
-    hasLotteryRun() {
-        return new Promise((resolve) => {
-            HttpRequest({
-                method: 'GET',
-                url: `https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/runs`,
-                query: {
-                    status: "in_progress"
-                },
-                headers: {
-                    accept: 'application/vnd.github.v3+json',
-                },
-                success: res => {
-                    const { workflow_runs } = strToJson(res.body);
-                    if (workflow_runs instanceof Array) {
-                        workflow_runs.filter(wr => /sweepstakes|clear/.test(wr.name)).length > 1 ?
-                            resolve(true) : resolve(false)
-                    } else {
-                        resolve(true)
-                    }
-                },
-                failure: err => {
-                    tooltip.log(err);
-                    resolve(true)
-                }
-            })
-        });
-    },
-    /**
-     * 触发一个workflow
-     * @param {string} yaml_file
-     */
-    trigger(yaml_file) {
-        return new Promise((resolve) => {
-            HttpRequest({
-                method: 'POST',
-                url: `https://api.github.com/repos/${GITHUB_REPOSITORY}/actions/workflows/${yaml_file}/dispatches`,
-                contents: {
-                    ref: 'main'
-                },
-                headers: {
-                    accept: 'application/vnd.github.v3+json',
-                    'content-type': 'application/json',
-                    authorization: `token ${process.env.PAT}`
-                },
-                success: res => {
-                    if (res.body === '') {
-                        tooltip.log('成功触发'+yaml_file);
-                    } else {
-                        tooltip.log(`触发${yaml_file}失败 响应:\n${res.body}`);
-                    }
-                    resolve()
-                },
-                failure: err => {
-                    tooltip.log(err);
-                    resolve()
-                }
-            })
-        });
-    }
-}
-
-
-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,7 +6,7 @@ const Public = require('./Public');
 const GlobalVar = require("./GlobalVar");
 const config = require("./config");
 const MyStorage = require('./MyStorage');
-const { log, hasEnv } = Base;
+const { log, hasEnv } = Util;
 
 /**
  * 监视器
@@ -14,13 +14,18 @@ const { log, hasEnv } = Base;
 class Monitor extends Public {
     /**
      * @constructor
-     * @param {number | string} param
+     * @param {[string, number | string]} lottery_param
      */
-    constructor(param) {
+    constructor(lottery_param) {
         super();
-        typeof param === 'number' ? this.UID = param : this.tag_name = param;
+        this.lottery_param = lottery_param
         this.tagid = config.partition_id; /* tagid初始化 */
         this.attentionList = ''; /* 转为字符串的所有关注的up主uid */
+        this.LotteryInfoMap = new Map([
+            ['UIDs', this.getLotteryInfoByUID.bind(this)],
+            ['TAGs', this.getLotteryInfoByTag.bind(this)],
+            ['Articles', this.getLotteryInfoByArticle.bind(this)],
+        ]);
     }
     /**
      * 初始化
@@ -37,7 +42,8 @@ class Monitor extends Public {
                 return
             }
         }
-        this.attentionList = await BiliAPI.getAttentionList(GlobalVar.get("myUID")); /* 获取关注列表 */
+        /** 关注列表初始化 */
+        this.attentionList = await BiliAPI.getAttentionList(GlobalVar.get("myUID"));
         switch (await this.startLottery()) {
             case 0:
                 eventBus.emit('Turn_on_the_Monitor')
@@ -87,11 +93,17 @@ class Monitor extends Public {
                 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 > (Date.now() / 1000) + config.maxday * 864e5) {
-                        log.info('过滤', '开奖时间晚于指定时间')
+                    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
                     }
@@ -111,6 +123,7 @@ class Monitor extends Public {
                     return status
                 }
                 MyStorage.updateDyid(Lottery.dyid);
+                await Util.delay(config.wait * (Math.random() + 0.5));
             }
             log.info('抽奖', '开始转发下一组动态');
             return 0
@@ -126,19 +139,17 @@ class Monitor extends Public {
      * @property {number[]} uid 用户标识
      * @property {string} dyid 动态标识
      * @property {boolean} isOfficialLottery 是否官方抽奖
-     * @property {number} type 动态类型
-     * @property {string} relay_chat 动态类型
+     * @property {string} relay_chat 转发词
      * @property {string} ctrl 定位@
-     * @property {string} rid 评论类型
+     * @property {string} rid 评论标识
+     * @property {number} chat_type 评论类型
      */
     /**
      * @returns {Promise<LotteryOptions[]>}
      */
     async filterLotteryInfo() {
-        let self = this,
-            protoLotteryInfo = typeof self.UID === 'number'
-                ? await self.getLotteryInfoByUID(self.UID)
-                : await self.getLotteryInfoByTag(self.tag_name);
+        const { lottery_param, LotteryInfoMap, attentionList } = this;
+        let protoLotteryInfo = await LotteryInfoMap.get(lottery_param[0])(lottery_param[1]);
 
         if (protoLotteryInfo === null)
             return [];
@@ -172,7 +183,7 @@ class Monitor extends Public {
         )
 
         /* 检查动态是否满足要求 */
-        await Base.try_for_each(protoLotteryInfo, async function ({
+        await Util.try_for_each(protoLotteryInfo, async function ({
             lottery_info_type, uids,
             uname, dyid,
             ctrl, rid, des, type,
@@ -181,9 +192,10 @@ class Monitor extends Public {
             /* 遇到转发过就退出 */
             if (dyids_map.get(dyid)) return false;
 
-            /**判断是转发源动态还是现动态 */
-            const uid = lottery_info_type === 'tag' ? uids[0] : uids[1]
-                , isFollowed = (new RegExp(uid)).test(self.attentionList)
+            const
+                /**判断是转发源动态还是现动态 */
+                uid = lottery_info_type === 'uid' ? uids[1] : uids[0]
+                , isFollowed = (new RegExp(uid)).test(attentionList)
                 , description = typeof des === 'string' ? des : ''
                 , needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description)
                 , needTopic = (/(?<=[带加上](?:话题|tag))#.*#/i.exec(description) || [])[0]
@@ -192,7 +204,7 @@ class Monitor extends Public {
                 , 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')
+                    (is_imitator && lottery_info_type === 'uid' && model !== '00')
                     || (hasOfficialLottery && model[0] === '1')
                     || (!hasOfficialLottery && model[1] === '1' && !isTwoLevelDynamic && has_key_words)
                 , isSendChat =
@@ -230,7 +242,7 @@ class Monitor extends Public {
 
                 let
                     /**转发评语 */
-                    RandomStr = Base.getRandomOne(config.relay),
+                    RandomStr = Util.getRandomOne(config.relay),
                     /**控制字段 */
                     new_ctrl = [];
 
@@ -267,7 +279,7 @@ class Monitor extends Public {
                         item.location += addlength;
                         return item;
                     }).forEach(it => new_ctrl.push(it))
-                    if (!(new RegExp(uids[1])).test(self.attentionList))
+                    if (!(new RegExp(uids[1])).test(attentionList))
                         onelotteryinfo.uid.push(uids[1]);
                 } else {
                     onelotteryinfo.relay_chat = RandomStr;
@@ -276,10 +288,14 @@ class Monitor extends Public {
                 onelotteryinfo.ctrl = JSON.stringify(new_ctrl);
 
                 /* 根据动态的类型决定评论的类型 */
-                onelotteryinfo.type = type === 2 ?
-                    11 : type === 4 || type === 1 ?
-                        17 : type === 8 ?
-                            1 : 0;
+                onelotteryinfo.chat_type =
+                    type === 2
+                        ? 11
+                        : type === 4 || type === 1
+                            ? 17
+                            : type === 8
+                                ? 1
+                                : 0;
 
                 /* 是否评论 */
                 if (isSendChat) onelotteryinfo.rid = rid;
@@ -307,34 +323,36 @@ class Monitor extends Public {
             log.info('NOT_GO_LOTTERY', 'ON');
             return 0
         }
-        let status = 1;
-        const { uid, dyid, type, rid, relay_chat, ctrl } = option;
+        const { uid, dyid, chat_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 && chat_type) {
+            let status = 0;
             const max_retry_times = 5;
-            for (let times = 0; times < max_retry_times && status; times++) {
-                status = await send();
-                if (status) {
-                    log.info('自动评论', `将在 ${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), 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;
+            }
         }
 
         /* 点赞 */
@@ -343,9 +361,6 @@ 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
     }
 }

lib/MyStorage.js

@@ -1,5 +1,5 @@
-const Base = require("./Base");
-const { log } = Base;
+const Util = require("./Util");
+const { log } = Util;
 
 const MyStorage = {
     /**
@@ -10,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)) {
@@ -32,8 +32,11 @@ const MyStorage = {
      */
     updateDyid: (dyid) => {
         log.info('更新dyid', `写入${dyid}`);
+        if (dyid.length !== Util.dyid_length) {
+            log.error('更新dyid', `dyid(${dyid})长度不为18 若出现此问题请即时通知开发者`)
+        }
         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()

lib/Public.js

@@ -1,173 +1,136 @@
-const Base = require('./Base');
+const Util = require('./Util');
 const BiliAPI = require('./BiliAPI');
 const config = require("./config");
-const { log } = Base
+const MyStorage = require('./MyStorage');
+
+const { log } = Util
+
+/**
+ * 解析dynamic_detail_card
+ * 提取出的有用动态信息
+ * @typedef {object} UsefulDynamicInfo
+ * @property {number} uid
+ * @property {string} uname
+ * @property {number} createtime 10
+ * @property {string} rid_str
+ * @property {string} dynamic_id
+ * @property {number} type
+ * @property {string} description
+ * @property {boolean} hasOfficialLottery
+ * @property {Array<Object.<string,string|number>>} ctrl
+ * 
+ * @property {number} origin_uid
+ * @property {string} origin_uname
+ * @property {string} origin_rid_str
+ * @property {string} origin_dynamic_id
+ * @property {number} orig_type
+ * @property {string} origin_description
+ * @property {boolean} origin_hasOfficialLottery
+ * 
+ * @param {object} dynamic_detail_card
+ * @return {UsefulDynamicInfo}
+ */
+function parseDynamicCard(dynamic_detail_card) {
+    const { strToJson } = Util;
+    /**临时储存单个动态中的信息 */
+    let obj = {};
+    const { desc, card, extension, extend_json } = dynamic_detail_card
+        , { info } = desc.user_profile
+        , cardToJson = strToJson(card)
+        , { item } = cardToJson;
+    /* 转发者的UID */
+    obj.uid = info.uid;
+    /* 转发者的name */
+    obj.uname = info.uname;
+    /* 动态的ts10 */
+    obj.createtime = desc.timestamp
+    /* 动态类型 */
+    obj.type = desc.type
+    /* 用于发送评论 */
+    obj.rid_str = desc.rid_str.length > 12 ? desc.dynamic_id_str : desc.rid_str;
+    /* 源动态类型 */
+    obj.orig_type = desc.orig_type
+    /* 转发者的动态ID !!!!此为大数需使用字符串值,不然JSON.parse()会有丢失精度 */
+    obj.dynamic_id = desc.dynamic_id_str;
+    /* 定位@信息 */
+    obj.ctrl = (extend_json && strToJson(extend_json).ctrl) || [];
+    /* 是否有官方抽奖 */
+    obj.hasOfficialLottery = extension && extension.lott && true;
+    /* 转发者的描述 后两个分别是视频动态的描述和视频本身的描述*/
+    obj.description = (item && (item.content || item.description || cardToJson.dynamic || cardToJson.desc)) || '';
+    if (obj.type === 1) {
+        const { origin_extension, origin } = cardToJson
+            , originToJson = strToJson(origin)
+            , { user, item } = originToJson;
+        /* 被转发者的UID */
+        obj.origin_uid = desc.origin.uid;
+        /* 被转发者的rid(用于发评论) */
+        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;
+        /* 是否有官方抽奖 */
+        obj.origin_hasOfficialLottery = origin_extension && origin_extension.lott;
+        /* 被转发者的name */
+        obj.origin_uname = (user && (user.name || user.uname)) || '';
+        /* 被转发者的描述 */
+        obj.origin_description = (item && (item.content || item.description || originToJson.dynamic || originToJson.desc)) || '';
+    }
+
+    return obj
+}
+
+/**
+ * 处理来自个人动态或话题页面的一组动态数据
+ * @param {String} res
+ * @returns {{modifyDynamicResArray: UsefulDynamicInfo[], nextinfo: {has_more: number, next_offset: string}} | UsefulDynamicInfo |null}
+ */
+function modifyDynamicRes(res) {
+    const
+        strToJson = Util.strToJson
+        , { data, code } = strToJson(res)
+        , { cards = [], has_more, offset } = data;
+
+    if (code !== 0) {
+        log.error('处理动态数据', '获取动态数据出错,可能是访问太频繁 \n' + res);
+        return null;
+    }
+
+    if (!cards.length) {
+        log.warn('处理动态数据', '未找到任何动态信息')
+    }
+
+    const
+        /**
+         * 字符串offset防止损失精度
+         */
+        next = {
+            has_more,
+            next_offset: typeof offset === 'string'
+                ? offset
+                : /(?<=next_offset":)[0-9]+/.exec(res)[0]
+        },
+        /**
+         * 储存获取到的一组动态中的信息
+         */
+        array = next.has_more === 0
+            ? []
+            : cards.map(parseDynamicCard)
+
+    log.info('处理动态数据', `动态数据读取完毕(${cards.length})(${next.has_more})`);
+
+    return {
+        modifyDynamicResArray: array,
+        nextinfo: next
+    }
+}
+
 /**
  * 基础功能
  */
 class Public {
     constructor() { }
     /**
-     * 提取出的有用动态信息
-     * @typedef {object} UsefulDynamicInfo
-     * @property {number} uid
-     * @property {string} uname
-     * @property {number} createtime 10
-     * @property {string} rid_str
-     * @property {string} dynamic_id
-     * @property {number} type
-     * @property {string} description
-     * @property {boolean} hasOfficialLottery
-     * @property {Array<Object.<string,string|number>>} ctrl
-     * 
-     * @property {number} origin_uid
-     * @property {string} origin_uname
-     * @property {string} origin_rid_str
-     * @property {string} origin_dynamic_id
-     * @property {number} orig_type
-     * @property {string} origin_description
-     * @property {boolean} origin_hasOfficialLottery
-     */
-    /**
-     * 检查所有的动态信息
-     * @param {string} UID 指定的用户UID
-     * @param {number} pages 读取页数
-     * @param {number} time 时延
-     * @param {string} [_offset] 默认'0'
-     * @returns {Promise<{allModifyDynamicResArray: UsefulDynamicInfo[];offset: string}>} 获取前 `pages*12` 个动态信息
-     */
-    async checkAllDynamic(hostuid, pages, time = 0, _offset = '0') {
-        log.info('检查所有动态', `准备读取${pages}页动态`);
-        const mDR = this.modifyDynamicRes,
-            getOneDynamicInfoByUID = BiliAPI.getOneDynamicInfoByUID,
-            curriedGetOneDynamicInfoByUID = Base.curryify(getOneDynamicInfoByUID); /* 柯里化的请求函数 */
-        /**
-         * 储存了特定UID的请求函数
-         */
-        let hadUidGetOneDynamicInfoByUID = curriedGetOneDynamicInfoByUID(hostuid);
-        /**
-         * 储存所有经过整理后信息
-         * [{}{}...{}]
-         */
-        let allModifyDynamicResArray = [];
-        let offset = _offset;
-        for (let i = 0; i < pages; i++) {
-            log.info('检查所有动态', `正在读取其中第${i + 1}页动态`);
-            let OneDynamicInfo = await hadUidGetOneDynamicInfoByUID(offset);
-            const mDRdata = mDR(OneDynamicInfo);
-            if (mDRdata === null) {
-                break;
-            }
-            /**
-             * 储存一片动态信息
-             * [{}{}...{}]
-             */
-            const mDRArry = mDRdata.modifyDynamicResArray,
-                nextinfo = mDRdata.nextinfo;
-            if (nextinfo.has_more === 0) {
-                offset = nextinfo.next_offset;
-                log.info('检查所有动态', `成功读取${i + 1}页信息(已经是最后一页了故无法读取更多)`);
-                break;
-            } else {
-                allModifyDynamicResArray.push.apply(allModifyDynamicResArray, mDRArry);
-                i + 1 < pages
-                    ? log.info('检查所有动态', `开始读取第${i + 2}页动态信息`)
-                    : log.info('检查所有动态', `${pages}页信息全部成功读取完成`);
-                offset = nextinfo.next_offset;
-            }
-            await Base.delay(time);
-        }
-        return ({ allModifyDynamicResArray, offset });
-    }
-    /**
-     * 互动抽奖  
-     * 处理来自动态页面的数据
-     * @param {String} res
-     * @returns {{modifyDynamicResArray: UsefulDynamicInfo[];nextinfo: {has_more: number;next_offset: string;};} | null}
-     */
-    modifyDynamicRes(res) {
-        const strToJson = Base.strToJson,
-            { data, code } = strToJson(res);
-        if (code !== 0) {
-            log.error('处理动态数据', '获取动态数据出错,可能是访问太频繁 \n' + res);
-            return null;
-        }
-        /* 字符串offset防止损失精度 */
-        const offset = typeof data.offset === 'string' ? data.offset : /(?<=next_offset":)[0-9]*/.exec(res)[0]
-            , next = {
-                has_more: data.has_more,
-                next_offset: offset
-            };
-        /**
-         * 储存获取到的一组动态中的信息
-         */
-        let array = [];
-        if (next.has_more === 0) {
-            log.info('处理动态数据', '动态数据读取完毕');
-        } else {
-            /**
-             * 空动态无cards
-             */
-            const Cards = data.cards || [];
-            Cards.forEach(onecard => {
-                /**临时储存单个动态中的信息 */
-                let obj = {};
-                const { desc, card } = onecard
-                    , { info } = desc.user_profile
-                    , cardToJson = strToJson(card);
-                /* 转发者的UID */
-                obj.uid = info.uid;
-                /* 转发者的name */
-                obj.uname = info.uname;
-                /* 动态的ts10 */
-                obj.createtime = desc.timestamp
-                /* 动态类型 */
-                obj.type = desc.type
-                /* 用于发送评论 */
-                obj.rid_str = desc.rid_str.length > 12 ? desc.dynamic_id_str : desc.rid_str;
-                /* 源动态类型 */
-                obj.orig_type = desc.orig_type
-                /* 转发者的动态ID !!!!此为大数需使用字符串值,不然JSON.parse()会有丢失精度 */
-                obj.dynamic_id = desc.dynamic_id_str;
-                const { extension, extend_json } = onecard;
-                /* 定位@信息 */
-                obj.ctrl = (typeof extend_json === 'undefined') ? [] : strToJson(extend_json).ctrl || [];
-                /* 是否有官方抽奖 */
-                obj.hasOfficialLottery = (typeof extension === 'undefined') ? false : typeof extension.lott === 'undefined' ? false : true;
-                const { item = {} } = cardToJson;
-                /* 转发者的描述 后两个分别是视频动态的描述和视频本身的描述*/
-                obj.description = item.content || item.description || cardToJson.dynamic || cardToJson.desc || '';
-                if (obj.type === 1) {
-                    /* 被转发者的UID */
-                    obj.origin_uid = desc.origin.uid;
-                    /* 被转发者的rid(用于发评论) */
-                    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 } = cardToJson;
-                    /* 是否有官方抽奖 */
-                    obj.origin_hasOfficialLottery = typeof origin_extension === 'undefined' ?
-                        false : typeof origin_extension.lott === 'undefined' ?
-                            false : true;
-                    const origin = cardToJson.origin || '{}';
-                    const originToJson = strToJson(origin);
-                    const { user, item } = originToJson;
-                    /* 被转发者的name */
-                    obj.origin_uname = typeof user === 'undefined'
-                        ? '' : user.name || user.uname || '';
-                    /* 被转发者的描述 */
-                    obj.origin_description = typeof item === 'undefined'
-                        ? '' : item.content || item.description || originToJson.dynamic || originToJson.desc || '';
-                }
-                array.push(obj);
-            });
-        }
-        return {
-            modifyDynamicResArray: array,
-            nextinfo: next
-        };
-    }
-    /**
+     * 整理后的抽奖信息
      * @typedef {object} LotteryInfo
      * @property {string} lottery_info_type
      * @property {number[]} uids `[uid,ouid]`
@@ -179,6 +142,98 @@ class Public {
      * @property {number} type
      * @property {boolean} hasOfficialLottery 是否官方
      */
+    /**
+     * 检查指定用户的所有的动态信息
+     * @param {string} UID 指定的用户UID
+     * @param {number} pages 读取页数
+     * @param {number} time 时延
+     * @param {string} [offset] 默认'0'
+     * @returns {Promise<{allModifyDynamicResArray: UsefulDynamicInfo[], offset: string}>} 获取前 `pages*12` 个动态信息
+     */
+    async checkAllDynamic(hostuid, pages, time = 0, offset = '0') {
+        log.info('检查所有动态', `准备读取${pages}页动态`);
+
+        const { getOneDynamicInfoByUID } = BiliAPI,
+            /**
+             * 柯里化请求函数
+             */
+            curriedGetOneDynamicInfoByUID = Util.curryify(getOneDynamicInfoByUID),
+            /**
+             * 储存了特定UID的请求函数
+             */
+            hadUidGetOneDynamicInfoByUID = curriedGetOneDynamicInfoByUID(hostuid);
+
+        /**
+         * 储存所有经过整理后信息
+         * @type { UsefulDynamicInfo[] }
+         */
+        let allModifyDynamicResArray = [];
+
+        for (let i = 0; i < pages; i++) {
+            log.info('检查所有动态', `正在读取其中第${i + 1}页动态`);
+
+            const
+                OneDynamicInfo = await hadUidGetOneDynamicInfoByUID(offset),
+                mDRdata = modifyDynamicRes(OneDynamicInfo);
+
+            if (mDRdata === null) {
+                break;
+            }
+
+            const
+                /**
+                 * 一片动态
+                 */
+                mDRArry = mDRdata.modifyDynamicResArray,
+                nextinfo = mDRdata.nextinfo;
+
+            if (nextinfo.has_more === 0) {
+                offset = nextinfo.next_offset;
+                log.info('检查所有动态', `成功读取${i + 1}页信息(已经是最后一页了故无法读取更多)`);
+                break;
+            } else {
+                /**合并 */
+                allModifyDynamicResArray.push.apply(allModifyDynamicResArray, mDRArry);
+                log.info('检查所有动态', `开始读取第${i + 2}页动态信息`)
+                offset = nextinfo.next_offset;
+            }
+
+            await Util.delay(time);
+        }
+
+        log.info('检查所有动态', `第${pages}页信息读取完成`)
+
+        return ({ allModifyDynamicResArray, offset });
+    }
+    /**
+     * 获取最新动态信息(转发子动态)
+     * 并初步整理
+     * @param {string} UID
+     * @returns {Promise<LotteryInfo[] | null>}
+     */
+    async getLotteryInfoByUID(UID) {
+        log.info('获取动态', `开始获取用户${UID}的动态信息`);
+        const { allModifyDynamicResArray } = await this.checkAllDynamic(UID, config.uid_scan_page, config.search_wait);
+
+        if (!allModifyDynamicResArray.length) return null;
+
+        const fomatdata = allModifyDynamicResArray.map(o => {
+            return {
+                lottery_info_type: 'uid',
+                uids: [o.uid, o.origin_uid],
+                uname: o.origin_uname,
+                ctrl: [],
+                dyid: o.origin_dynamic_id,
+                rid: o.origin_rid_str,
+                des: o.origin_description,
+                type: o.orig_type,
+                hasOfficialLottery: o.origin_hasOfficialLottery
+            }
+        }).filter(a => a.type != 0)
+        log.info('获取动态', `成功获取用户${UID}的动态信息`);
+
+        return fomatdata;
+    }
     /**
      * 获取tag下的抽奖信息(转发母动态)  
      * 并初步整理
@@ -186,23 +241,34 @@ class Public {
      * @returns {Promise<LotteryInfo[] | null>}
      */
     async getLotteryInfoByTag(tag_name) {
-        const self = this,
+        const
             tag_id = await BiliAPI.getTagIDByTagName(tag_name),
             hotdy = await BiliAPI.getHotDynamicInfoByTagID(tag_id),
-            modDR = self.modifyDynamicRes(hotdy);
+            modDR = modifyDynamicRes(hotdy);
+
         if (modDR === null) return null;
+
         log.info('获取动态', `开始获取带话题#${tag_name}#的动态信息`);
         log.info('获取动态', '成功获取热门动态');
-        let mDRdata = modDR.modifyDynamicResArray; /* 热门动态 */
+
+        /**
+         * 热门动态
+         */
+        let mDRdata = modDR.modifyDynamicResArray;
         let next_offset = modDR.nextinfo.next_offset;
-        for (let index = 0; index < config.scan_page_num; index++) {
-            log.info('获取动态', `成功读取${index + 1}页动态`);
-            const newdy = await BiliAPI.getOneDynamicInfoByTag(tag_name, next_offset);
-            const _modify = self.modifyDynamicRes(newdy);
+
+        for (let index = 0; index < config.tag_scan_page; index++) {
+            log.info('获取动态', `读取第${index + 1}页动态`);
+            const
+                newdy = await BiliAPI.getOneDynamicInfoByTag(tag_name, next_offset),
+                _modify = 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 => {
             return {
@@ -218,33 +284,81 @@ class Public {
             };
         })
         log.info('获取动态', `成功获取带话题#${tag_name}#的动态信息`);
+
         return fomatdata
     }
     /**
-     * 获取最新动态信息(转发子动态)  
-     * 并初步整理
-     * @param {string} UID
+     * 从专栏中获取抽奖信息
+     * @param {string} key_words
      * @returns {Promise<LotteryInfo[] | null>}
      */
-    async getLotteryInfoByUID(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 => {
-            return {
-                lottery_info_type: 'uid',
-                uids: [o.uid, o.origin_uid],
-                uname: o.origin_uname,
-                ctrl: [],
-                dyid: o.origin_dynamic_id,
-                rid: o.origin_rid_str,
-                des: o.origin_description,
-                type: o.orig_type,
-                hasOfficialLottery: o.origin_hasOfficialLottery
+    async getLotteryInfoByArticle(key_words) {
+        log.info('获取动态', `开始获取含关键词${key_words}的专栏信息`);
+        const cvs = (await BiliAPI.searchArticlesByKeyword(key_words)).slice(0, config.article_scan_page);
+
+        let dyinfos = [];
+        for (const cv of cvs) {
+            const
+                content = await BiliAPI.getOneArticleByCv(cv),
+                dyids = content.match(/(?<=t.bilibili.com\/)[0-9]+/g) || [],
+                /**判断此专栏是否查看过的权重 */
+                weight = dyids.length / 2;
+
+            let { length } = dyids;
+
+            log.info('获取动态', `提取专栏(${cv})中提及的dyid(${length})`)
+            for (const dyid of dyids) {
+                let _weight = 0;
+                const isRelayed = await MyStorage.searchDyid(dyid);
+                if (isRelayed) {
+                    _weight += 1;
+                }
+                if (_weight >= weight) {
+                    log.info('获取动态', `1/2动态曾经转过,该专栏或已查看,故中止`)
+                    dyinfos = []
+                    break
+                }
+                if (dyid.length === Util.dyid_length) {
+                    if (!isRelayed) {
+                        log.info('获取动态', `查看动态(${dyid})的细节 (${length--})`)
+                        const res = await BiliAPI.getOneDynamicByDyid(dyid)
+                            , { code, data } = Util.strToJson(res)
+                            , { card } = data;
+
+                        if (code !== 0) {
+                            log.error('获取动态', '获取动态数据出错,可能是访问太频繁 \n' + res)
+                            break
+                        }
+
+                        await Util.delay(2000)
+
+                        if (card) {
+                            dyinfos.push(parseDynamicCard(card));
+                        }
+                    } else {
+                        log.info('获取动态', `动态(${dyid})已转发过 (${length--})`)
+                    }
+                } else {
+                    log.warn('获取动态', `动态(${dyid})无效 (${length--})`)
+                }
             }
-        }).filter(a => a.type === 0 ? false : true)
-        log.info('获取动态', `成功获取用户${UID}的动态信息`);
-        return fomatdata;
+        }
+        const fomatdata = dyinfos.map(o => {
+            return {
+                lottery_info_type: 'article',
+                uids: [o.uid, o.origin_uid],
+                uname: o.uname,
+                ctrl: o.ctrl,
+                dyid: o.dynamic_id,
+                rid: o.rid_str,
+                des: o.description,
+                type: o.type,
+                hasOfficialLottery: o.hasOfficialLottery
+            };
+        })
+        log.info('获取动态', `成功获取含关键词${key_words}的专栏信息`);
+
+        return fomatdata
     }
 }
 

lib/Util.js

@@ -6,7 +6,7 @@ const { HttpRequest } = require("./HttpRequest");
 /**
  * 基础工具
  */
-const Base = {
+const Util = {
     /**环境变量设置文件 */
     env_file: path.join(process.cwd(), "env.js"),
     /**配置文件 */
@@ -18,7 +18,7 @@ const Base = {
      * 超出精度的数转为字符串
      * @param {string} params
      * @return {object}
-     * 返回对象
+     * 返回对象 解析失败返回 `{}`
      */
     strToJson(params) {
         const isJSON = (str => {
@@ -47,9 +47,10 @@ const Base = {
     },
     /**
      * 函数柯里化
-     * @param {function} func
+     * @template T
+     * @param {(arg, arg) => T} func
      * 要被柯里化的函数
-     * @returns {function}
+     * @returns {(arg) => (arg) => T)}
      * 一次接受一个参数并返回一个接受余下参数的函数
      */
     curryify(func) {
@@ -68,7 +69,7 @@ const Base = {
      * @returns {Promise<void>}
      */
     delay(time) {
-        Base.log.info('时延', `${time}ms`);
+        Util.log.info('时延', `${time}ms`);
         return new Promise(resolve => {
             setTimeout(() => {
                 resolve();
@@ -94,12 +95,13 @@ 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
@@ -127,71 +129,22 @@ const Base = {
         debug(context, msg) {
             if (this.level > 3) {
                 if (msg instanceof Object) msg = JSON.stringify(msg, null, 4);
-                this.proPrint([`[${Date()}]`, chalk.grey("[Debug]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#0070BB')(`[\n${msg}\n]`)])
+                this.proPrint([chalk.hex('#64B3FF')(`[${Date()}]`), chalk.grey("[Debug]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#0070BB')(`[\n${msg}\n]`)])
             }
         },
         info(context, msg) {
             if (this.level > 2)
-                this.proPrint([`[${Date()}]`, chalk.grey("[Info]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#48BB31')(`[${msg}]`)])
+                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([`[${Date()}]`, chalk.grey("[Warn]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#BBBB23')(`[${msg}]`)])
+                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([`[${Date()}]`, chalk.grey("[Error]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#FF0006')(`[${msg}]`)])
+                this.proPrint([chalk.hex('#64B3FF')(`[${Date()}]`), chalk.grey("[Error]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#FF0006')(`[${msg}]`)])
         }
     },
-    /**
-     * 提取开奖信息
-     * @param {string} des 描述
-     * @returns {
-            {
-                ts: number|0;
-                text:string|'开奖时间: 未填写开奖时间';
-                item:string|'请自行查看';
-                isMe:string|'请自行查看';
-            }
-     * }
-     */
-    getLotteryNotice(des) {
-        const r = /([\d零一二两三四五六七八九十]+)[.月]([\d零一二两三四五六七八九十]+)[日号]?/;
-        if (des === '') return {
-            ts: 0,
-            text: `开奖时间: 未填写开奖时间`,
-            item: '请自行查看',
-            isMe: '请自行查看'
-        }
-        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>}
@@ -276,6 +229,10 @@ const Base = {
             })
         });
     },
+    /**
+     * dyid长度
+     */
+    dyid_length: 18,
     /**
      * 读取dyid文件
      * @param {number} num
@@ -283,7 +240,7 @@ const Base = {
      */
     readDyidFile(num) {
         const fpath = num < 2 ? path.join(this.dyids_dir, 'dyid.txt') : path.join(this.dyids_dir, `dyid${num}.txt`);
-        return fs.createReadStream(fpath, { encoding: 'utf8', highWaterMark: 19 * 1000 })
+        return fs.createReadStream(fpath, { encoding: 'utf8', highWaterMark: (this.dyid_length + 1) * 1000 })
     },
     /**
      * 追加dyid
@@ -297,4 +254,4 @@ const Base = {
 };
 
 
-module.exports = Base;
+module.exports = Util;

lib/clear.js

@@ -1,4 +1,4 @@
-const { log, delay } = require("./Base");
+const { log, delay } = require("./Util");
 const BiliAPI = require("./BiliAPI");
 const Public = require("./Public");
 const GlobalVar = require('./GlobalVar');
@@ -52,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;
-            log.info('清理动态', `开始读取第${index + 1}页(12条)`);
             for (let index = 0; index < allModifyDynamicResArray.length; index++) {
                 const res = allModifyDynamicResArray[index];
                 const { type, dynamic_id, createtime } = res;
@@ -86,7 +86,7 @@ async function clear() {
                     }
                 }
             }
-            log.info('清理动态', `第${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,7 +6,7 @@ const Public = require('./Public');
 const Monitor = require('./Monitor');
 const { sendNotify } = require('./sendNotify');
 const config = require('./config');
-const { log } = Base;
+const { log } = Util;
 
 async function createRandomDynamic(num) {
     if (config.create_dy) {
@@ -14,8 +14,8 @@ async function createRandomDynamic(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 {
             log.info('随机动态', '已有非抽奖动态故无需创建');
@@ -30,7 +30,7 @@ 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");
@@ -47,8 +47,8 @@ function start() {
                 return;
             }
             const lottery = lotterys[times.next()];
-            const nlottery = Number(lottery);
-            await (new Monitor(isNaN(nlottery) ? lottery : nlottery)).init();
+
+            await (new Monitor(lottery)).init();
         });
         eventBus.on('Turn_off_the_Monitor', async (msg) => {
             await createRandomDynamic(config.create_dy_num);
@@ -93,8 +93,8 @@ async function isMe() {
                     session_t = session_ts;
                     if (talker_id) {
                         BiliAPI.updateSessionStatus(talker_id);
-                        await Base.delay(1000);
-                        if (/中奖|获得|填写|写上|提供|地址|支付宝账号|码|大会员/.test(content)) {
+                        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`
@@ -104,7 +104,7 @@ async function isMe() {
                     }
                 }
                 if (MySession.has_more) {
-                    await Base.delay(3e3);
+                    await Util.delay(3e3);
                     MySession = await BiliAPI.getSessionInfo(type, session_t)
                 }
                 max++

lib/sendNotify.js

@@ -1,4 +1,4 @@
-const { log } = require("./Base");
+const { log } = require("./Util");
 const { HttpRequest } = require("./HttpRequest");
 const { createTransport } = require("nodemailer");
 
@@ -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`,

lib/setVariable.js

@@ -1,4 +1,4 @@
-const Base = require("./Base");
+const Util = require("./Util");
 const GlobalVar = require("./GlobalVar");
 const config = require("./config");
 
@@ -15,16 +15,24 @@ async function setVariable(cookie, n) {
         config.updata(process.env.NUMBER);
 
         GlobalVar.set('cookie', cookie);
+
         cookie.split(/\s*;\s*/).forEach(item => {
             const _item = item.split('=');
             if (key_map.has(_item[0]))
                 GlobalVar.set(key_map.get(_item[0]), _item[1]);
         });
-        GlobalVar.set('Lottery', [...config.UIDs, ...config.TAGs]);
-        GlobalVar.set('remoteconfig', await Base.getRemoteConfig());
+
+        const { UIDs = [], TAGs = [], Articles = [] } = config;
+        GlobalVar.set('Lottery', [
+            ...UIDs.map(it => ['UIDs', it]),
+            ...TAGs.map(it => ['TAGs', it]),
+            ...Articles.map(it => ['Articles', it])
+        ]);
+
+        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,4 +1,4 @@
-const { env_file, config_file, log, delay, hasFileOrDir } = require("./lib/Base");
+const { env_file, config_file, log, delay, hasFileOrDir } = require("./lib/Util");
 
 const metainfo = [
     `  _           _   _                   _____           _       _   `,
@@ -10,7 +10,7 @@ const metainfo = [
     `                                __/ |                  | |        `,
     `                               |___/                   |_|        `,
     `                                                                  `,
-    `                                                     by shanmite  `,
+    `                                              v1.9.7   by shanmite`,
 ]
 /**多账号存储 */
 let multiple_account = [];
@@ -36,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'
@@ -110,18 +113,18 @@ async function main() {
     process.env.lottery_mode = process.argv[2]
 
     const err_msg = await main();
-
     if (err_msg) {
         log.error('错误', '\n' + err_msg + '\n');
         log.warn('结束运行', '5秒后自动退出');
         await delay(5 * 1000);
     } else {
-        if (loop_wait > 0) {
+        while (loop_wait) {
             log.info('程序休眠', `${loop_wait / 1000}秒后再次启动`)
-            await delay(loop_wait);
-        } else {
-            log.info('结束运行', '未设置休眠时间')
+            await delay(loop_wait)
+            await main()
         }
+        log.info('结束运行', '未设置休眠时间')
     }
+
     process.exit(0);
 })()

my_config.example.js

@@ -12,6 +12,13 @@ module.exports = {
             241675899
         ],
 
+        /**
+         * 监视的专栏关键词
+         */
+        Articles: [
+            '抽奖合集'
+        ],
+
         /**
          * 监视的tag
          */
@@ -53,9 +60,19 @@ module.exports = {
         is_imitator: false,
 
         /**
-         * - 在uid或tag里检索的页数
+         * - 在uid里检索的页数
          */
-        scan_page_num: 3,
+        uid_scan_page: 3,
+
+        /**
+         * - 在tag里检索的页数
+         */
+        tag_scan_page: 3,
+
+        /**
+         * - 获取专栏数量
+         */
+        article_scan_page: 3,
 
         /**
          * - 开奖时间距离现在的最大天数

package.json

@@ -23,7 +23,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/shanmite/AutoScript.git"
+    "url": "https://github.com/shanmiteko/AutoScript.git"
   },
   "keywords": [
     "auto",
@@ -32,16 +32,15 @@
   "author": "shanmite",
   "license": "GPL-3.0-or-later",
   "bugs": {
-    "url": "https://github.com/shanmite/AutoScript/issues"
+    "url": "https://github.com/shanmiteko/AutoScript/issues"
   },
-  "homepage": "https://github.com/shanmite/AutoScript#readme",
+  "homepage": "https://github.com/shanmiteko/AutoScript#readme",
   "devDependencies": {
     "eslint": "^7.17.0",
     "pkg": "^5.2.1"
   },
   "dependencies": {
     "chalk": "^4.1.1",
-    "nodemailer": "^6.5.0",
-    "unzipper": "^0.10.11"
+    "nodemailer": "^6.5.0"
   }
-}
+}

script/pkg/pkg.ps1

@@ -17,7 +17,6 @@ Copy-Item -Path $TEMPLATE_CONFIG_FILE -Destination $TARGET_DIR -Force
 
 Set-Location -Path $TARGET_DIR
 
-# 重命名文件
 Move-Item -Path $TEMPLATE_ENV_FILE -Destination $ENV_FILE -Force
 Move-Item -Path $TEMPLATE_CONFIG_FILE -Destination $CONFIG_FILE -Force
 
@@ -31,6 +30,11 @@ foreach ($TRI in $TRIARR) {
     Move-Item -Path $BIN -Destination $DIR -Force
     Copy-Item -Path $ENV_FILE -Destination $DIR -Force
     Copy-Item -Path $CONFIG_FILE -Destination $DIR -Force
+    if ($DIR -eq "nlts-win-x64") {
+        New-Item -Path $DIR -Name "start.bat" -ItemType File -Value "@echo off && lottery start && pause" -Force
+        New-Item -Path $DIR -Name "check.bat" -ItemType File -Value "@echo off && lottery check && pause" -Force
+        New-Item -Path $DIR -Name "clear.bat" -ItemType File -Value "@echo off && lottery clear && pause" -Force
+    }
 
     Compress-Archive -Path $DIR -DestinationPath "$($DIR)-$(Get-Date -Format "yyyyMMd")" -Force
 }