docs: 更新CHANGELOG

.gitignore

@@ -1,4 +1,6 @@
 node_modules/
+.vscode/
+tests/
 dyids/
 dist/
 package-lock.json

CHANGELOG.md

@@ -1,3 +1,34 @@
+## 主要变化(2.2.9)
+- 检查动态创建时间(#57)(#58)
+- 简单整理(#56)
+## 问题修复
+- 非转发动态无源用户(#54)
+## 较上一版本变化
+- `env.js`无
+- `my_config.js`增加`max_create_time`
+
+**替换可执行文件和更改配置文件(建议修改)**
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.2.8...v2.2.9
+
+
+## 主要变化(2.2.8)
+- 遇到过期的cookie跳过(#51)
+## 问题修复
+- UP关闭评论区(#52)
+## 较上一版本变化
+- `env.js`无
+- `my_config.js`无
+
+**替换可执行文件**
+
+_如果之前版本小于上一版本,请查看[CHANGELOG](CHANGELOG.md)变更说明_
+
+**Full Changelog**: https://github.com/shanmiteko/LotteryAutoScript/compare/v2.2.7...v2.2.8
+
+
 ## 主要变化(2.2.7)
 ## 问题修复
 - 未移动分区(#50)

lib/check.js

@@ -19,12 +19,14 @@ async function isMe() {
         const MyAtInfo = await bili.getMyAtInfo();
         MyAtInfo.forEach(async AtInfo => {
             const { at_time, up_uname, business, source_content, url } = AtInfo
-            desp += `发生时间: ${new Date(at_time * 1000).toLocaleString()}  \n\n`
-            desp += `用户: ${up_uname}  \n\n`
-            desp += `在${business}中@了你(${global_var.get("myUID")})  \n\n`
-            desp += `原内容为: ${source_content}  \n\n`
-            desp += `[直达链接](${url})  \n\n`
-            desp += `\n\n`
+            desp += '## [at]检测结果\n\n'
+            desp += '----------------------------------------------------------------\n\n'
+            desp += `发生时间: ${new Date(at_time * 1000).toLocaleString()}\n\n`
+            desp += `用户: ${up_uname}\n\n`
+            desp += `在${business}中@了你(${global_var.get("myUID")})\n\n`
+            desp += `原内容为: ${source_content}\n\n`
+            desp += `[直达链接](${url})\n\n`
+            desp += '----------------------------------------------------------------\n\n'
         });
         log.info('中奖检测', '--> OK');
     }
@@ -34,18 +36,21 @@ async function isMe() {
             let MySession = await bili.getSessionInfo(type)
             for (const index of infiniteNumber()) {
                 for (const Session of MySession.data) {
-                    const { content, sender_uid, session_ts, timestamp, unread_count, talker_id, msg_seqno } = Session;
+                    const { sender_uid, session_ts, timestamp, unread_count, talker_id, msg_seqno } = Session;
                     session_t = session_ts;
                     if (unread_count) {
-                        bili.updateSessionStatus(talker_id, type, msg_seqno);
-                        await delay(update_session_wait);
+                        const content = await bili.fetch_session_msgs(talker_id, unread_count);
                         if (judge(content, notice_key_words)) {
-                            desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}  \n\n`
-                            desp += `用户: ${sender_uid}  \n\n`
-                            desp += `私信你(${global_var.get("myUID")})说: ${content}  \n\n`
-                            desp += `[直达链接](https://message.bilibili.com/#/whisper/mid${sender_uid})  \n\n`
-                            desp += `\n\n`
+                            desp += '## 私信检测结果\n\n'
+                            desp += '----------------------------------------------------------------\n\n'
+                            desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}\n\n`
+                            desp += `用户: ${sender_uid}\n\n`
+                            desp += `私信你(${global_var.get("myUID")})说:\n${content}\n\n`
+                            desp += `[直达链接](https://message.bilibili.com/#/whisper/mid${sender_uid})\n\n`
+                            desp += '----------------------------------------------------------------\n\n'
                         }
+                        await bili.updateSessionStatus(talker_id, type, msg_seqno);
+                        await delay(update_session_wait);
                     }
                 }
                 if (MySession.has_more && index < 16) {

lib/clear.js

@@ -32,7 +32,7 @@ async function getFollowList() {
  * 清理动态和关注
  */
 async function clear() {
-    const { clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type } = config;
+    const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type } = config;
     let success = true;
     const uid_list = await getFollowList();
     if (!uid_list.length) {
@@ -65,19 +65,17 @@ async function clear() {
 
         for (const page of infiniteNumber()) {
             log.info('清理动态', `开始读取第${page + 1}页`);
-            const { allModifyDynamicResArray, offset } = await Searcher.checkAllDynamic(MY_UID, 1, 5 * 1000, next_offset);
+            const { allModifyDynamicResArray, offset } = await Searcher.checkAllDynamic(MY_UID, 1, search_wait, next_offset);
             next_offset = offset;
             for (const [index, dyinfo] of allModifyDynamicResArray.entries()) {
                 log.info('清理动态', `第${page + 1}页中的第${index + 1}个动态`)
-                const { type, dynamic_id, createtime } = dyinfo || {};
+                const { type, dynamic_id, create_time, origin_uid } = dyinfo || {};
                 if (typeof type !== 'undefined'
                     && clear_dynamic_type instanceof Array
                     ? clear_dynamic_type.includes(type)
                     : clear_dynamic_type === type
                 ) {
-                    const
-                        { origin_uid } = dyinfo,
-                        days_ago = (Now - createtime) / 86400;
+                    const days_ago = (Now - create_time) / 86400;
 
                     if (days_ago > clear_max_day) {
                         /* 移除动态 */
@@ -96,13 +94,21 @@ async function clear() {
                             success = await bili.cancelAttention(origin_uid);
                         }
 
-                        if (!success) break;
+                        if (!success) {
+                            log.error("清理失败", "出现错误")
+                            break
+                        }
                         /* 延时 */
                         await delay(clear_remove_delay);
                     } else {
-                        log.info('清理动态', `已设置跳过${clear_max_day}天 当前动态发布时间: ${~~days_ago}天前`)
-                        log.info('清理动态', `储存用户(${origin_uid})防止误删`)
-                        before_separate.push(origin_uid)
+                        log.info('清理动态', `已设置跳过${clear_max_day}天 当前动态(${dynamic_id})发布时间: ${~~days_ago}天前`)
+
+                        if (origin_uid) {
+                            log.info('清理动态', `储存用户(${origin_uid})防止误删`)
+                            before_separate.push(origin_uid)
+                        } else {
+                            log.info('清理动态', `非转发动态`)
+                        }
                     }
                 } else {
                     log.info('清理动态', `此动态类型为${type} != 要清理的动态类型${clear_dynamic_type}`)

lib/core/monitor.js

@@ -171,6 +171,9 @@ class Monitor extends Searcher {
      */
     async filterLotteryInfo() {
         const { lottery_param, LotteryInfoMap, attentionList } = this;
+        /**
+         * @type {import("./searcher").LotteryInfo}
+         */
         let protoLotteryInfo = await LotteryInfoMap.get(lottery_param[0])(lottery_param[1]);
 
         if (protoLotteryInfo === null)
@@ -182,9 +185,13 @@ class Monitor extends Searcher {
 
         /** 所有抽奖信息 */
         let alllotteryinfo = [];
-        const { key_words, model, chatmodel, is_imitator, only_followed, at_users, blockword, blacklist } = config;
+        const
+            { key_words, model, chatmodel, max_create_time, is_imitator, only_followed, at_users, blockword, blacklist } = config,
+            now_ts = Date.now() / 1000;
 
-        /**Map<String, Boolean> */
+        /**
+         * @type {Map<String, Boolean>}
+         */
         let dyids_map = new Map();
 
         /**去重 */
@@ -199,13 +206,16 @@ class Monitor extends Searcher {
         /* 检查动态是否满足要求 */
         await try_for_each(protoLotteryInfo, async function ({
             lottery_info_type, is_liked,
-            uids, uname, dyid,
+            uids, uname, dyid, create_time,
             ctrl, rid, des, type,
             hasOfficialLottery
         }) {
             /* 遇到转发过就退出 */
             if (is_liked) return false;
 
+            /* 超过指定时间退出 */
+            if (now_ts - create_time > max_create_time * 86400) return false;
+
             const
                 /**判断是转发源动态还是现动态 */
                 uid = lottery_info_type === 'uid' ? uids[1] : uids[0],

lib/core/searcher.js

@@ -11,14 +11,14 @@ const { log } = utils
  * @property {number} uid
  * @property {string} uname
  * @property {boolean} is_liked
- * @property {number} createtime 10
+ * @property {number} create_time 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_create_time 10
  * @property {number} origin_uid
  * @property {string} origin_uname
  * @property {string} origin_rid_str
@@ -27,6 +27,20 @@ const { log } = utils
  * @property {string} origin_description
  * @property {boolean} origin_hasOfficialLottery
  * 
+ * 整理后的抽奖信息
+ * @typedef {object} LotteryInfo
+ * @property {string} lottery_info_type
+ * @property {number} create_time
+ * @property {boolean} is_liked
+ * @property {number[]} uids `[uid,ouid]`
+ * @property {string} uname
+ * @property {Array<{}>} ctrl
+ * @property {string} dyid
+ * @property {string} rid
+ * @property {string} des
+ * @property {number} type
+ * @property {boolean} hasOfficialLottery 是否官方
+ * 
  * @param {object} dynamic_detail_card
  * @return {UsefulDynamicInfo}
  */
@@ -46,7 +60,7 @@ function parseDynamicCard(dynamic_detail_card) {
     /* 动态是否点过赞 */
     obj.is_liked = is_liked > 0
     /* 动态的ts10 */
-    obj.createtime = desc.timestamp
+    obj.create_time = desc.timestamp
     /* 动态类型 */
     obj.type = desc.type
     /* 用于发送评论 */
@@ -65,6 +79,8 @@ function parseDynamicCard(dynamic_detail_card) {
         const { origin_extension, origin } = cardToJson
             , originToJson = strToJson(origin)
             , { user, item } = originToJson;
+        /* 源动态的ts10 */
+        obj.origin_create_time = desc.origin.timestamp;
         /* 被转发者的UID */
         obj.origin_uid = desc.origin.uid;
         /* 被转发者的rid(用于发评论) */
@@ -131,20 +147,6 @@ function modifyDynamicRes(res) {
  */
 class Searcher {
     constructor() { }
-    /**
-     * 整理后的抽奖信息
-     * @typedef {object} LotteryInfo
-     * @property {string} lottery_info_type
-     * @property {boolean} is_liked
-     * @property {number[]} uids `[uid,ouid]`
-     * @property {string} uname
-     * @property {Array<{}>} ctrl
-     * @property {string} dyid
-     * @property {string} rid
-     * @property {string} des
-     * @property {number} type
-     * @property {boolean} hasOfficialLottery 是否官方
-     */
     /**
      * 检查指定用户的所有的动态信息
      * @param {number} hostuid 指定的用户UID
@@ -247,6 +249,7 @@ class Searcher {
 
                     return [...results, {
                         lottery_info_type: 'uid',
+                        create_time: cur.origin_create_time,
                         is_liked,
                         uids: [cur.uid, cur.origin_uid],
                         uname: cur.origin_uname,
@@ -307,6 +310,7 @@ class Searcher {
         const fomatdata = mDRdata.map(o => {
             return {
                 lottery_info_type: 'tag',
+                create_time: o.create_time,
                 is_liked: o.is_liked,
                 uids: [o.uid, o.origin_uid],
                 uname: o.uname,
@@ -386,6 +390,7 @@ class Searcher {
         const fomatdata = dyinfos.map(o => {
             return {
                 lottery_info_type: 'article',
+                create_time: o.create_time,
                 is_liked: o.is_liked,
                 uids: [o.uid, o.origin_uid],
                 uname: o.uname,

lib/data/config.js

@@ -41,6 +41,12 @@ const config = {
      */
     chatmodel: '01',
 
+    /**
+     * - 动态创建时间
+     * - 多少天前
+     */
+    max_create_time: 60,
+
     /**
      * 不加判断的转发所监视的uid转发的动态
      */
@@ -93,7 +99,7 @@ const config = {
      * - 检索动态间隔
      * - 单位毫秒
      */
-    search_wait: 1000,
+    search_wait: 2000,
 
     /**
      * - 读取下一页私信间隔

lib/net/api.bili.js

@@ -7,6 +7,7 @@ module.exports = Object.freeze({
     DYNAMIC_SVR_GET_DYNAMIC_DETAIL: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/get_dynamic_detail',
     DYNAMIC_SVR_RM_DYNAMIC: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/rm_dynamic',
     DYNAMIC_SVR_SPACE_HISTORY: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history',
+    FETCH_SESSION_MSGS: 'https://api.vc.bilibili.com/svr_sync/v1/svr_sync/fetch_session_msgs',
     FEED_GET_ATTENTION_LIST: 'https://api.vc.bilibili.com/feed/v1/feed/get_attention_list',
     FEED_SETUSERFOLLOW: 'https://api.vc.bilibili.com/feed/v1/feed/SetUserFollow',
     LOTTERY_SVR_LOTTERY_NOTICE: 'https://api.vc.bilibili.com/lottery_svr/v1/lottery_svr/lottery_notice',

lib/net/bili.js

@@ -204,10 +204,9 @@ const bili_client = {
         }
     },
     /**
-     * 获取私信
+     * 获取一页私信
      * @typedef SessionData
      * @property {string} session_ts
-     * @property {string} content
      * @property {number} timestamp
      * @property {number} unread_count
      * @property {number} sender_uid
@@ -241,8 +240,8 @@ const bili_client = {
                 data = sessions.map(session => {
                     const
                         { session_ts, last_msg, unread_count, talker_id } = session,
-                        { content = '', timestamp = 0, sender_uid = 0, msg_seqno } = last_msg || {};
-                    return { session_ts, content, timestamp, sender_uid, unread_count, talker_id, msg_seqno };
+                        { timestamp = 0, sender_uid = 0, msg_seqno } = last_msg || {};
+                    return { session_ts, timestamp, sender_uid, unread_count, talker_id, msg_seqno };
                 });
             return { has_more, data };
         } else if (res.code === 2) {
@@ -253,6 +252,34 @@ const bili_client = {
             return { has_more: 0, data: [] };
         }
     },
+    /**
+     * 获取私信细节
+     * @param {number} talker_id
+     * @param {number} size
+     */
+    async fetch_session_msgs(talker_id, size) {
+        const
+            responseText = await get({
+                url: API.FETCH_SESSION_MSGS,
+                query: {
+                    talker_id,
+                    session_type: 1,
+                    size
+                }
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            const msgs = res.data.messages
+            if (msgs instanceof Array) {
+                log.info('私信细节', `${talker_id}有${size}条未读私信`)
+                return msgs.map(it => it.content).join('\n')
+            } else {
+                log.warn('私信细节', `${talker_id}无私信`)
+            }
+        }
+        log.error('私信细节', `获取失败`)
+        return ''
+    },
     /**
      * 获取未读私信数量
      * @returns {Promise<{ unfollow_unread: number, follow_unread: number }>}

lib/net/http.js

@@ -26,7 +26,7 @@
  * @property {string} url 完整链接
  * @property {boolean} [stream] 是否流式数据
  * @property {RequestConfig} [config] 设置
- * @property {string} [proxy] 代理 IP:PORT
+ * @property {string} [proxy] HTTP代理 IP:PORT
  * @property {Object.<string, string|number>} [query] 查询选项
  * @property {Object.<string, string|number> | string} [contents] 内容
  * @property {HttpHeaders} [headers] 请求头
@@ -65,7 +65,7 @@ function send(detail) {
     const { timeout, wait, retry, redirect, retry_times } = config;
     const thisURL = new URL(url)
         , content = formatContents(headers["content-type"], contents)
-        , request = thisURL.protocol === 'https:' ? https_request : http_request;
+        , request = (thisURL.protocol === 'https:') && !proxy ? https_request : http_request;
     let options = {
         timeout,
         method: method.toUpperCase(),
@@ -82,7 +82,7 @@ function send(detail) {
     if (proxy) {
         options.headers.host = thisURL.host;
         options.path = thisURL.href;
-        [options.hostname, options.port] = proxy.split(':');
+        [options.host, options.port] = proxy.split(':');
     }
     const req = request(options, res => {
         let protodata = '';

my_config.example.js

@@ -53,6 +53,12 @@ module.exports = Object.freeze({
          */
         chatmodel: '01',
 
+        /**
+         * - 动态创建时间
+         * - 多少天前
+         */
+        max_create_time: 60,
+
         /**
          * 不加判断的转发所监视的uid转发的动态
          */
@@ -105,7 +111,7 @@ module.exports = Object.freeze({
          * - 检索动态间隔
          * - 单位毫秒
          */
-        search_wait: 1000,
+        search_wait: 2000,
 
         /**
          * - 读取下一页私信间隔

package.json

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