doc: 增加徽标

修改了Linux 定时使用的操作文档

.github/workflows/docker.yml

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

.github/workflows/pkg.yml

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

.github/workflows/sync.yml

@@ -1,27 +0,0 @@
-name: 'Automatic sync'
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-  watch:
-    types: started
-  repository_dispatch:
-    types: repo-sync
-jobs:
-  repo-sync:
-    env:
-      PAT: ${{ github.event.client_payload.PAT || secrets.PAT }}
-    runs-on: ubuntu-latest
-    if: github.event.repository.owner.id == github.event.sender.id
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-      - name: 开始自动同步
-        uses: repo-sync/github-sync@v2
-        if: env.PAT
-        with:
-          source_repo: "https://github.com/shanmite/LotteryAutoScript.git"
-          source_branch: "main"
-          destination_branch: "main"
-          github_token: ${{ github.event.client_payload.PAT || secrets.PAT }}

.vscode/httpRequest.code-snippets

@@ -1,123 +0,0 @@
-{
-	"HttpRequest-get": {
-		"scope": "javascript,typescript",
-		"prefix": "hrget",
-		"body": [
-			"HttpRequest({",
-			"    method: 'GET',",
-			"    url: '$1',",
-			"    query: {",
-			"        $2",
-			"    },",
-			"    headers: {",
-			"        accept: 'application/json, text/plain, */*',",
-			"        cookie: '$3',",
-			"    },",
-			"    success: res => {",
-			"        $4",
-			"    },",
-			"    failure: err => {",
-			"        $5",
-			"    }",
-			"})$6"
-		],
-		"description": "简化http-get请求"
-	},
-	"HttpRequest-post": {
-		"scope": "javascript,typescript",
-		"prefix": "hrpost",
-		"body": [
-			"HttpRequest({",
-			"    method: 'POST',",
-			"    url: '$1',",
-			"    contents: {",
-			"        $2",
-			"    },",
-			"    headers: {",
-			"        accept: 'application/json, text/plain, */*',",
-			"        'content-type': 'application/x-www-form-urlencoded; charset=utf-8',",
-			"        cookie: '$3',",
-			"    },",
-			"    success: res => {",
-			"        $4",
-			"    },",
-			"    failure: err => {",
-			"        $5",
-			"    }",
-			"})$6"
-		],
-		"description": "简化http-post请求"
-	},
-	"CORSajax-get": {
-		"scope": "javascript,typescript",
-		"prefix": "corsget",
-		"body": [
-			"CORSajax.get({",
-			"    proxy_link: '$1',",
-			"    proxy_querystring: {",
-			"        $2",
-			"    },",
-			"    proxy_headers: {",
-			"        Cookie: '$3'",
-			"    },",
-			"},chunk => {",
-			"    $4",
-			"})$5"
-		],
-		"description": "简化跨域Ajax本地nodejsのget代理"
-	},
-	"CORSajax-post": {
-		"scope": "javascript,typescript",
-		"prefix": "corspost",
-		"body": [
-			"CORSajax.post({",
-			"    proxy_link: '$1',",
-			"    proxy_headers: {",
-			"        'content-type': 'application/x-www-form-urlencoded; charset=utf-8',",
-			"        cookie: '$2'",
-			"    },",
-			"    proxy_body: {",
-			"        $3",
-			"    },",
-			"},chunk => {",
-			"    $4",
-			"})$5"
-		],
-		"description": "简化跨域Ajax本地nodejsのpost代理"
-	},
-	"Ajax-get": {
-		"scope": "javascript,typescript",
-		"prefix": "myget",
-		"body": [
-			"Ajax.get({",
-			"    url: '$1',",
-			"    queryStringsObj: {",
-			"        $2",
-			"    },",
-			"    hasCookies: true,",
-			"    success: responseText => {",
-			"        $3",
-			"    }",
-			"})",
-		],
-		"description": "简化AjaxのGet请求"
-	},
-	"Ajax-post": {
-		"scope": "javascript,typescript",
-		"prefix": "mypost",
-		"body": [
-			"Ajax.post({",
-			"    url: '$1',",
-			"    hasCookies: true,",
-			"    dataType: 'application/x-www-form-urlencoded',",
-			"    data: {",
-			"        $2",
-			"    },",
-			"    success: responseText => {",
-			"        $3",
-			"    }",
-			"})",
-		],
-		"description": "简化Ajaxのpost请求"
-	},
-}

.vscode/launch.json

@@ -1,14 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "启动程序",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${file}"
-        }
-    ]
-}

README.md

@@ -1,5 +1,4 @@
 # AutoScript
-
 - [AutoScript](#autoscript)
   - [操作步骤](#操作步骤)
     - [获取COOKIE](#获取cookie)
@@ -17,6 +16,9 @@
 
 [Github仓库链接](https://github.com/shanmiteko/LotteryAutoScript)
 
+[![Package Node.js project into an executable](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml)<br>
+[![Build and push Docker images](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml)
+
 已实现功能:
 - 监控用户转发
 - 监控话题页面
@@ -24,13 +26,17 @@
 - 自动点赞、评论、乱序转发、@好友、带话题、可选随机动态
 - 检测是否中奖
 - 清理动态关注
+- 检查更新
+- 更多功能设置请参考配置文件
 
 **声明**: 此脚本仅用于学习和测试，作者本人并不对其负责，请于运行测试完成后自行删除，请勿滥用！
 
-----------------------------------------
+---------------------------------
 
 ## 操作步骤
 
+**使用前务必阅读此教程和配置文件内注释**
+
 右上角<kbd>★ Star</kbd>
 
 ↓↓
@@ -47,7 +53,7 @@ Chrome浏览器:
 
     (此步骤是为了方便后续采用JS获取Cookies,获取完毕后应再次勾选)
 
-![取消httponly](doc/pic/getCookies.png)
+![取消httponly](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/getCookies.png)
 
 3. 在Console中复制以下代码回车  
 
@@ -75,20 +81,29 @@ 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 自定义设置文件
+    ~/nlts-linux-x64
+    => tree
+    .
+    ├── dyids           (自动生成的dyid存储)
+    │   └── dyid.txt
+    ├── env.js          (便捷设置环境变量和多账号参数)
+    ├── lottery         (可执行文件)
+    ├── my_config.js    (自定义设置文件) (!使用前必读)
+    └── README.md       (说明文件)
    ```
 2. 用记事本或其他编辑器修改`env.js`和`my_config.js`文件(右键选择用记事本打开)
 3. 在`env.js`中填入`COOKIE`和推送参数
 4. 在`my_config.js`中自定义设置
 5. 在当前目录下**打开终端**运行可执行文件`lottery`(勿直接点击`lottery`)
-6. 键入`lottery start`启动抽奖|`lottery check`检测中奖|`lottery clear`清理动态
-   > 或者新建文本文档写入`lottery start`然后更改扩展名为.bat点击运行
+   - `lottery start` 启动抽奖
+   - `lottery check` 检测中奖
+   - `lottery clear` 清理动态
+
+    或者 新建文本文档写入`lottery start`然后更改扩展名为.bat点击运行(已自带start.bat可直接点击)
 7. 运行截图
-  ![lottery_start](doc/pic/lottery_start.png)
+  ![lottery_start](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/lottery_start.png)
 
 #### 以源码方式运行
 
@@ -102,7 +117,7 @@ step1: 下载代码到本地
 
 [点此下载](https://github.com/shanmiteko/LotteryAutoScript/archive/refs/heads/main.zip)或如图示下载↓
 
-![点我加载下载操作图示](doc/pic/download.png)
+![点我加载下载操作图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/download.png)
 
 下载的压缩包解压后修改env.example.js文件，详见step3
 
@@ -110,7 +125,7 @@ step2: 下载并安装Node.js
 
 [点此进入nodejs下载页面](http://nodejs.cn/download)
 
-![点我加载下载nodejs操作图示](doc/pic/nodejs.png)
+![点我加载下载nodejs操作图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/nodejs.png)
 
 step3：修改env.example.js文件及创建运行文件(打开扩展名显示)
 
@@ -222,14 +237,14 @@ rm -rf lottery/
 | :---------------: | :--------------------------------------------------------------------------------: | ------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 |      `SCKEY`      |                          微信server酱推送(于2021/4月下线)                          | 非必须 | server酱的微信通知[官方文档](http://sc.ftqq.com/3.version)                                                                                                                                                                  |
 |     `SENDKEY`     |                             微信server酱(Turbo版)推送                              | 非必须 | [获取SENDKEY](https://sct.ftqq.com/sendkey) [选择消息通道](https://sct.ftqq.com/forward)                                                                                                                                    |
-|    `BARK_PUSH`    | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | 非必须 | IOS用户下载BARK这个APP,填写内容是app提供的`设备码`，例如：https://api.day.app/123 ，那么此处的设备码就是`123`，再不懂看 [这个图](doc/pic/bark.jpg)（注：支持自建填完整链接即可）                                            |
+|    `BARK_PUSH`    | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | 非必须 | IOS用户下载BARK这个APP,填写内容是app提供的`设备码`，例如：https://api.day.app/123 ，那么此处的设备码就是`123`，再不懂看 [这个图](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/bark.jpg)（注：支持自建填完整链接即可）                                            |
 |   `BARK_SOUND`    | [BARK推送](https://apps.apple.com/us/app/bark-customed-notifications/id1403753865) | 非必须 | bark推送声音设置，例如`choo`,具体值请在`bark`-`推送铃声`-`查看所有铃声`                                                                                                                                                     |
 |  `TG_BOT_TOKEN`   |                                    telegram推送                                    | 非必须 | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写自己申请[@BotFather](https://t.me/BotFather)的Token,如`10xxx4:AAFcqxxxxgER5uw` , [具体教程](doc/TG_PUSH.md)                                               |
 |   `TG_USER_ID`    |                                    telegram推送                                    | 非必须 | tg推送(需设备可连接外网),`TG_BOT_TOKEN`和`TG_USER_ID`两者必需,填写[@getuseridbot](https://t.me/getuseridbot)中获取到的纯数字ID, [具体教程](doc/TG_PUSH.md)                                                                  |
 |  `TG_PROXY_HOST`  |                                 Telegram 代理的 IP                                 | 非必须 | 代理类型为 http。例子：http代理 http://127.0.0.1:1080 则填写 127.0.0.1                                                                                                                                                      |
 |  `TG_PROXY_PORT`  |                                Telegram 代理的端口                                 | 非必须 | 例子：http代理 http://127.0.0.1:1080 则填写 1080                                                                                                                                                                            |
 |  `DD_BOT_TOKEN`   |                                      钉钉推送                                      | 非必须 | 钉钉推送(`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需)[官方文档](https://ding-doc.dingtalk.com/doc#/serverapi2/qf2nxq) ,只需`https://oapi.dingtalk.com/robot/send?access_token=XXX` 等于`=`符号后面的XXX即可                     |
-|  `DD_BOT_SECRET`  |                                      钉钉推送                                      | 非必须 | (`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需) ,密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的`SECXXXXXXXXXX`等字符 , 注:钉钉机器人安全设置只需勾选`加签`即可，其他选项不要勾选,再不懂看 [这个图](doc/pic/DD_bot.png)     |
+|  `DD_BOT_SECRET`  |                                      钉钉推送                                      | 非必须 | (`DD_BOT_TOKEN`和`DD_BOT_SECRET`两者必需) ,密钥，机器人安全设置页面，加签一栏下面显示的SEC开头的`SECXXXXXXXXXX`等字符 , 注:钉钉机器人安全设置只需勾选`加签`即可，其他选项不要勾选,再不懂看 [这个图](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/DD_bot.png)     |
 |  `IGOT_PUSH_KEY`  |                                      iGot推送                                      | 非必须 | iGot聚合推送，支持多方式推送，确保消息可达。 [参考文档](https://wahao.github.io/Bark-MP-helper )                                                                                                                            |
 |     `QQ_SKEY`     |                                酷推(Cool Push)推送                                 | 非必须 | 推送所需的Skey,登录后获取Skey [参考文档](https://cp.xuthus.cc/)                                                                                                                                                             |
 |     `QQ_MODE`     |                                酷推(Cool Push)推送                                 | 非必须 | 推送方式(send或group或者wx，默认send) [参考文档](https://cp.xuthus.cc/)                                                                                                                                                     |
@@ -247,4 +262,4 @@ rm -rf lottery/
 ## 设置说明
 详见[env.example.js](./env.example.js)文件内部注释
 
-详见[my_config.example.js](./my_config.example.js)文件内部注释
+详见[my_config.example.js](./my_config.example.js)文件内部注释

doc/TG_PUSH.md

@@ -4,16 +4,16 @@
 
 Ⅰ.首先在Telegram上搜索[BotFather](https://t.me/BotFather)机器人<br>
 
-![TG_PUSH1](pic/TG_PUSH1.png)
+![TG_PUSH1](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/TG_PUSH1.png)
 
 Ⅱ.利用[BotFather](https://t.me/BotFather)创建一个属于自己的通知机器人，按照下图中的1、2、3步骤拿到token，格式形如```10xxx4:AAFcqxxxxgER5uw```。填入```TG_BOT_TOKEN```<br>
 
-![TG_PUSH2](pic/TG_PUSH2.png)<br>
+![TG_PUSH2](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/TG_PUSH2.png)<br>
 
 **新创建的机器人需要跟它发一条消息来开启对话，否则可能会遇到secret填对了但是收不到消息的情况**<br>
 
 Ⅲ.再次在Telegram上搜索[getuserIDbot](https://t.me/getuserIDbot)机器人，获取UserID。填入```TG_USER_ID```<br>
 
-![TG_PUSH3](pic/TG_PUSH3.png)
+![TG_PUSH3](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/TG_PUSH3.png)
 
 至此，获取**TG_BOT_TOKEN**以及**TG_USER_ID**的教程结束

doc/linux_schedule.md

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

doc/win_schedule.md

@@ -16,13 +16,13 @@
 
 7.在`操作`页面中点击`新建`，选择操作为`启动程序`，在设置里点击浏览找到`start.bat`文件并选择，在`起始于(可选)(T)：`中的空白框里输入`start.bat`文件的目录地址，也就是`程序或脚本(P)：`里`start.bat`的前面那一串目录地址，最后是以`\`结尾的 ，填好东西后按下面`确认`              
 
-![点我加载步骤7结果图示](pic/step_menu.png)             
+![点我加载步骤7结果图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/step_menu.png)             
 
 8.在`条件`页面中选择`网络`，设定启动条件为任何连接            
 
 9.在`设置`页面中选择如图示选项，或者不修改默认设置           
 
-![点我加载步骤9结果图示](pic/shezhi_renwu.png)            
+![点我加载步骤9结果图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/shezhi_renwu.png)            
 
 10.最后按`确定`          
 
@@ -30,6 +30,6 @@
 
 最后你可以在任务列表中选择已有的任务，右边的操作框中选择`运行`点击，启动计划的任务，如下图所示
 
-![点我加载运行图示](pic/start_renwu.png)
+![点我加载运行图示](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/start_renwu.png)
 
 具体看任务是否正常执行，你可以看看自己的账号动态的最新转发，运行成功每几分钟自动转发抽奖动态

lib/check.js

@@ -2,19 +2,19 @@ const { log, delay, infiniteNumber, judge } = require('./utils')
 const { sendNotify } = require('./helper/notify')
 const config = require('./data/config')
 const global_var = require('./data/global_var')
-const bili_client = require('./net/bili')
+const bili = require('./net/bili')
 
 /**
  * 是否中奖
  */
 async function isMe() {
     let desp = '';
-    const UnreadAtNum = await bili_client.getUnreadAtNum();
-    const UnreadSessionNum = await bili_client.getUnreadSessionNum();
+    const UnreadAtNum = await bili.getUnreadAtNum();
+    const UnreadSessionNum = await bili.getUnreadSessionNum();
     const { follow_unread, unfollow_unread } = UnreadSessionNum || { unfollow_unread: 0, follow_unread: 0 };
     if (UnreadAtNum > 0) {
         log.info('中奖检测', '<-- 正在检查at');
-        const MyAtInfo = await bili_client.getMyAtInfo();
+        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`
@@ -29,13 +29,13 @@ async function isMe() {
     if (follow_unread + unfollow_unread > 0) {
         const check = async (type) => {
             let session_t = '';
-            let MySession = await bili_client.getSessionInfo(type)
+            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;
                     session_t = session_ts;
                     if (unread_count) {
-                        bili_client.updateSessionStatus(talker_id, type, msg_seqno);
+                        bili.updateSessionStatus(talker_id, type, msg_seqno);
                         await delay(1000);
                         if (judge(content, config.notice_key_words)) {
                             desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}  \n\n`
@@ -48,7 +48,7 @@ async function isMe() {
                 }
                 if (MySession.has_more && index < 16) {
                     await delay(3e3);
-                    MySession = await bili_client.getSessionInfo(type, session_t)
+                    MySession = await bili.getSessionInfo(type, session_t)
                 } else {
                     break
                 }
@@ -69,7 +69,7 @@ async function isMe() {
         log.info('可能中奖了', desp);
         await sendNotify('可能中奖了', desp);
     } else {
-        log.info('中奖检测', "未中奖");
+        log.info('中奖检测', "暂未中奖");
     }
     return;
 }

lib/core/monitor.js

@@ -55,10 +55,11 @@ class Monitor extends Searcher {
                 event_bus.emit('Turn_on_the_Monitor')
                 break
             case 22:
+                log.warn('账号异常', `UID(${global_var.get('myUID')})异常号只会对部分UP出现关注异常`)
                 if (!config.is_exception) {
-                    config.is_exception = true;
-                    await sendNotify('[动态抽奖]账号异常通知', `UID: ${global_var.get('myUID')}\n\n已自动跳过异常关注(异常号只会对部分UP出现关注异常)\n\n可在设置中令is_exception为true关闭此推送`)
+                    await sendNotify('[动态抽奖]账号异常通知', `UID: ${global_var.get('myUID')}\n\n异常号只会对部分UP出现关注异常\n\n可在设置中令is_exception为true关闭此推送`)
                 }
+                config.is_exception = true;
                 event_bus.emit('Turn_on_the_Monitor')
                 break
             case 31:
@@ -86,6 +87,7 @@ class Monitor extends Searcher {
         log.info('筛选动态', `筛选完毕(${len})`);
 
         if (len) {
+            let is_exception = false;
             for (const Lottery of utils.shuffle(allLottery)) {
                 let status = 0;
                 if (Lottery.isOfficialLottery) {
@@ -116,14 +118,24 @@ class Monitor extends Searcher {
                     }
                 }
                 status = await this.go(Lottery)
-                if (status % 2 !== 0) {
-                    return status
+                switch (status) {
+                    case 0:
+                        break;
+                    case 22:
+                        is_exception = true
+                        break;
+                    default:
+                        return status
                 }
-                d_storage.updateDyid(Lottery.dyid);
+                d_storage.updateDyid(Lottery.dyid)
                 await utils.delay(config.wait * (Math.random() + 0.5));
             }
             log.info('抽奖', '开始转发下一组动态');
-            return 0
+            if (is_exception) {
+                return 22
+            } else {
+                return 0
+            }
         } else {
             log.info('抽奖', '无未转发抽奖');
             return 0
@@ -191,20 +203,20 @@ class Monitor extends Searcher {
 
             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 = [...(new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#/ig) || []))].join(' ')
-                , 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 =
+                uid = lottery_info_type === 'uid' ? uids[1] : uids[0],
+                isFollowed = (new RegExp(uid)).test(attentionList),
+                description = typeof des === 'string' ? des : '',
+                needAt = /(?:@|艾特)[^@|(艾特)]*?好友/.test(description),
+                needTopic = [...new Set(description.match(/(?<=[带加上](?:话题|tag).*)#.+?#|(?<=[带加上])#.+?#(?=话题|tag)/ig) || [])].join(' '),
+                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 =
                     (is_imitator && lottery_info_type === 'uid' && model !== '00')
                     || (hasOfficialLottery && model[0] === '1')
-                    || (!hasOfficialLottery && model[1] === '1' && !isTwoLevelDynamic && has_key_words)
-                , isSendChat =
+                    || (!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');
@@ -326,9 +338,14 @@ class Monitor extends Searcher {
             const max_retry_times = 5;
             for (let times = 0; times < max_retry_times; times++) {
                 status = await bili.sendChat(rid, utils.getRandomOne(config.chat), chat_type)
+                if (status === -1) {
+                    log.warn('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                    return 0
+                }
                 if (!status) {
                     break
                 }
+                log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
                 log.info('自动评论', `将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
                 await utils.delay(60 * 1000 * (times + 1))
             }
@@ -339,15 +356,27 @@ class Monitor extends Searcher {
         const [u1, u2] = uid
         if (u1) {
             let status = await bili.autoAttention(u1)
-            if (status) return 20 + status;
+            if (status) {
+                log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                return 20 + status
+            };
             status = await bili.movePartition(u1, this.tagid)
-            if (status) return 20 + status;
+            if (status) {
+                log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                return 20 + status
+            };
             if (u2) {
                 utils.delay(5000)
                 status = await bili.autoAttention(u2)
-                if (status) return 20 + status;
+                if (status) {
+                    log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                    return 20 + status
+                };
                 status = await bili.movePartition(u2, this.tagid)
-                if (status) return 20 + status;
+                if (status) {
+                    log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                    return 20 + status
+                };
             }
         }
 

lib/core/searcher.js

@@ -86,8 +86,8 @@ function parseDynamicCard(dynamic_detail_card) {
  */
 function modifyDynamicRes(res) {
     const
-        { data = {}, code } = utils.strToJson(res),
-        { cards = [], has_more, offset } = data;
+        { data, code } = utils.strToJson(res),
+        { cards = [], has_more, offset } = data || {};
 
     if (code !== 0) {
         log.error('处理动态数据', '获取动态数据出错,可能是访问太频繁 \n' + res);
@@ -294,7 +294,9 @@ class Searcher {
         log.info('获取动态', `开始获取含关键词${key_words}的专栏信息`);
         const cvs = (await bili.searchArticlesByKeyword(key_words)).slice(0, config.article_scan_page);
 
+        /**存储所有专栏中的dyid */
         let dyinfos = [];
+        /**遍历专栏s */
         for (const cv of cvs) {
             const
                 content = await bili.getOneArticleByCv(cv),
@@ -304,8 +306,12 @@ class Searcher {
                 weight = dyids_set.length / 2;
 
             let { length } = dyids_set,
-                _weight = 0;
+                /**初始权重 */
+                _weight = 0,
+                /**单个专栏中的dyid */
+                _dyinfos = [];
             log.info('获取动态', `提取专栏(${cv})中提及的dyid(${length})`)
+            /**遍历某专栏中的dyids */
             for (const dyid of dyids_set) {
                 const isRelayed = await d_storage.searchDyid(dyid);
                 if (isRelayed) {
@@ -313,15 +319,15 @@ class Searcher {
                 }
                 if (_weight >= weight) {
                     log.warn('获取动态', `1/2动态曾经转过,该专栏或已查看,故中止`)
-                    dyinfos = []
+                    _dyinfos = []
                     break
                 }
                 if (dyid.length === utils.dyid_length) {
                     if (!isRelayed) {
                         log.info('获取动态', `查看动态(${dyid})的细节 (${length--})`)
                         const res = await bili.getOneDynamicByDyid(dyid)
-                            , { code, data = {} } = utils.strToJson(res)
-                            , { card } = data;
+                            , { code, data } = utils.strToJson(res)
+                            , { card } = data || {};
 
                         if (code !== 0) {
                             log.error('获取动态', '获取动态数据出错,可能是访问太频繁 \n' + res)
@@ -331,7 +337,7 @@ class Searcher {
                         await utils.delay(2000)
 
                         if (card) {
-                            dyinfos.push(parseDynamicCard(card));
+                            _dyinfos.push(parseDynamicCard(card));
                         }
                     } else {
                         log.info('获取动态', `动态(${dyid})已转发过 (${length--})`)
@@ -340,6 +346,7 @@ class Searcher {
                     log.warn('获取动态', `动态(${dyid})无效 (${length--})`)
                 }
             }
+            dyinfos.push(..._dyinfos)
         }
         const fomatdata = dyinfos.map(o => {
             return {

lib/helper/notify.js

@@ -202,10 +202,10 @@ function serverNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.errno === 0) {
-                            log.info('发送通知', 'server酱发送通知消息成功\n')
+                            log.info('发送通知', 'server酱发送通知消息成功')
                         } else if (data.errno === 1024) {
                             // 一分钟内发送相同的内容会触发
-                            log.error('发送通知', `server酱发送通知消息异常: ${data.errmsg}\n`)
+                            log.error('发送通知', `server酱发送通知消息异常: ${data.errmsg}`)
                         } else {
                             log.error('发送通知', `server酱发送通知消息异常\n${JSON.stringify(data)}`)
                         }
@@ -216,12 +216,12 @@ function serverNotify(text, desp) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', 'server酱 发送通知调用API失败！！\n')
+                    log.error('发送通知', 'server酱 发送通知调用API失败！！')
                     throw new Error(err);
                 }
             })
         } else {
-            log.warn('发送通知', '您未提供server酱的SCKEY，取消微信推送消息通知\n');
+            log.debug('发送通知', '您未提供server酱的SCKEY，取消微信推送消息通知');
             resolve()
         }
     })
@@ -247,7 +247,7 @@ function serverNotifyTurbo(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.code === 0) {
-                            log.info('发送通知', 'server酱(Turbo版)发送通知消息成功\n')
+                            log.info('发送通知', 'server酱(Turbo版)发送通知消息成功')
                         } else {
                             log.error('发送通知', `server酱(Turbo版)发送通知消息异常\n${JSON.stringify(data)}`)
                         }
@@ -258,12 +258,12 @@ function serverNotifyTurbo(text, desp) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', 'server酱(Turbo版) 发送通知调用API失败！！\n')
+                    log.error('发送通知', 'server酱(Turbo版) 发送通知调用API失败！！')
                     throw new Error(err);
                 }
             })
         } else {
-            log.warn('发送通知', '您未提供server酱(Turbo版)的SCKEY，取消微信推送消息通知\n');
+            log.debug('发送通知', '您未提供server酱(Turbo版)的SCKEY，取消微信推送消息通知');
             resolve()
         }
     })
@@ -301,9 +301,9 @@ function coolPush(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.code === 200) {
-                            log.info('发送通知', `酷推发送${pushMode(QQ_MODE)}通知消息成功\n`)
+                            log.info('发送通知', `酷推发送${pushMode(QQ_MODE)}通知消息成功`)
                         } else if (data.code === 400) {
-                            log.error('发送通知', `QQ酷推(Cool Push)发送${pushMode(QQ_MODE)}推送失败：${data}\n`)
+                            log.error('发送通知', `QQ酷推(Cool Push)发送${pushMode(QQ_MODE)}推送失败：${data}`)
                         } else {
                             log.error('发送通知', `酷推推送异常: ${data.msg}`);
                         }
@@ -314,12 +314,12 @@ function coolPush(text, desp) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', `酷推 发送${pushMode(QQ_MODE)}通知调用API失败！！\n`)
+                    log.error('发送通知', `酷推 发送${pushMode(QQ_MODE)}通知调用API失败！！`)
                     throw new Error(err);
                 }
             })
         } else {
-            log.warn('发送通知', '您未提供酷推的SKEY，取消QQ推送消息通知\n');
+            log.debug('发送通知', '您未提供酷推的SKEY，取消QQ推送消息通知');
             resolve()
         }
     })
@@ -345,9 +345,9 @@ function barkNotify(text, desp, params = {}) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.code === 200) {
-                            log.info('发送通知', 'Bark APP发送通知消息成功\n')
+                            log.info('发送通知', 'Bark APP发送通知消息成功')
                         } else {
-                            log.error('发送通知', `${data.message}\n`);
+                            log.error('发送通知', `${data.message}`);
                         }
                     } catch (error) {
                         log.error('发送通知', error);
@@ -356,13 +356,13 @@ function barkNotify(text, desp, params = {}) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', 'Bark APP发送通知调用API失败！！\n');
+                    log.error('发送通知', 'Bark APP发送通知调用API失败！！');
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            log.warn('发送通知', '您未提供Bark的APP推送BARK_PUSH，取消Bark推送消息通知\n');
+            log.debug('发送通知', '您未提供Bark的APP推送BARK_PUSH，取消Bark推送消息通知');
             resolve()
         }
     })
@@ -391,11 +391,11 @@ function tgBotNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.ok) {
-                            log.info('发送通知', 'Telegram发送通知消息完成。\n')
+                            log.info('发送通知', 'Telegram发送通知消息完成。')
                         } else if (data.error_code === 400) {
-                            log.error('发送通知', '请主动给bot发送一条消息并检查接收用户ID是否正确。\n')
+                            log.error('发送通知', '请主动给bot发送一条消息并检查接收用户ID是否正确。')
                         } else if (data.error_code === 401) {
-                            log.error('发送通知', 'Telegram bot token 填写错误。\n')
+                            log.error('发送通知', 'Telegram bot token 填写错误。')
                         }
                     } catch (error) {
                         log.error('发送通知', error);
@@ -404,7 +404,7 @@ function tgBotNotify(text, desp) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', 'telegram发送通知消息失败！！\n')
+                    log.error('发送通知', 'telegram发送通知消息失败！！')
                     resolve()
                     throw new Error(err)
                 }
@@ -417,7 +417,7 @@ function tgBotNotify(text, desp) {
             }
             send(options)
         } else {
-            log.warn('发送通知', '您未提供telegram机器人推送所需的TG_BOT_TOKEN和TG_USER_ID，取消telegram推送消息通知\n');
+            log.debug('发送通知', '您未提供telegram机器人推送所需的TG_BOT_TOKEN和TG_USER_ID，取消telegram推送消息通知');
             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('Util64'));
+            const result = encodeURIComponent(hmac.digest().toString('base64'));
             send({
                 method: 'POST',
                 url: `https://oapi.dingtalk.com/robot/send`,
@@ -456,9 +456,9 @@ function ddBotNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.errcode === 0) {
-                            log.info('发送通知', '钉钉发送通知消息完成。\n')
+                            log.info('发送通知', '钉钉发送通知消息完成。')
                         } else {
-                            log.error('发送通知', `${data.errmsg}\n`)
+                            log.error('发送通知', `${data.errmsg}`)
                         }
                     } catch (e) {
                         log.error('发送通知', e);
@@ -467,7 +467,7 @@ function ddBotNotify(text, desp) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', '钉钉发送通知消息失败！！\n')
+                    log.error('发送通知', '钉钉发送通知消息失败！！')
                     throw new Error(err);
                 }
             })
@@ -495,9 +495,9 @@ function ddBotNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.errcode === 0) {
-                            log.info('发送通知', '钉钉发送通知消息完成。\n')
+                            log.info('发送通知', '钉钉发送通知消息完成。')
                         } else {
-                            log.error('发送通知', `${data.errmsg}\n`)
+                            log.error('发送通知', `${data.errmsg}`)
                         }
                     } catch (e) {
                         log.error('发送通知', e);
@@ -506,13 +506,13 @@ function ddBotNotify(text, desp) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', '钉钉发送通知消息失败！！\n');
+                    log.error('发送通知', '钉钉发送通知消息失败！！');
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            log.warn('发送通知', '您未提供钉钉机器人推送所需的DD_BOT_TOKEN或者DD_BOT_SECRET，取消钉钉推送消息通知\n');
+            log.debug('发送通知', '您未提供钉钉机器人推送所需的DD_BOT_TOKEN或者DD_BOT_SECRET，取消钉钉推送消息通知');
             resolve()
         }
     })
@@ -541,9 +541,9 @@ function qywxBotNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.errcode === 0) {
-                            log.info('发送通知', '企业微信发送通知消息完成。\n');
+                            log.info('发送通知', '企业微信发送通知消息完成。');
                         } else {
-                            log.error('发送通知', `${data.errmsg}\n`);
+                            log.error('发送通知', `${data.errmsg}`);
                         }
                     } catch (e) {
                         log.error('发送通知', e);
@@ -552,13 +552,13 @@ function qywxBotNotify(text, desp) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', '企业微信发送通知消息失败！！\n');
+                    log.error('发送通知', '企业微信发送通知消息失败！！');
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            log.warn('发送通知', '您未提供企业微信机器人推送所需的QYWX_KEY，取消企业微信推送消息通知\n');
+            log.debug('发送通知', '您未提供企业微信机器人推送所需的QYWX_KEY，取消企业微信推送消息通知');
             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)) {
-                log.error('发送通知', '您所提供的IGOT_PUSH_KEY无效\n')
+                log.error('发送通知', '您所提供的IGOT_PUSH_KEY无效')
                 resolve()
                 return
             }
@@ -593,9 +593,9 @@ function iGotNotify(text, desp, params = {}) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.ret === 0) {
-                            log.info('发送通知', 'iGot发送通知消息成功\n')
+                            log.info('发送通知', 'iGot发送通知消息成功')
                         } else {
-                            log.error('发送通知', `iGot发送通知消息失败：${data.errMsg}\n`)
+                            log.error('发送通知', `iGot发送通知消息失败：${data.errMsg}`)
                         }
                     } catch (e) {
                         log.error('发送通知', e);
@@ -604,13 +604,13 @@ function iGotNotify(text, desp, params = {}) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', 'iGot 发送通知调用API失败！！\n')
+                    log.error('发送通知', 'iGot 发送通知调用API失败！！')
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            log.warn('发送通知', '您未提供iGot的推送IGOT_PUSH_KEY，取消iGot推送消息通知\n');
+            log.debug('发送通知', '您未提供iGot的推送IGOT_PUSH_KEY，取消iGot推送消息通知');
             resolve()
         }
     })
@@ -639,9 +639,9 @@ function pushPlusNotify(text, desp) {
                     try {
                         const data = JSON.parse(res.body);
                         if (data.code === 200) {
-                            log.info('发送通知', `push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息完成。\n`)
+                            log.info('发送通知', `push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息完成。`)
                         } else {
-                            log.error('发送通知', `push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败：${data.msg}\n`)
+                            log.error('发送通知', `push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败：${data.msg}`)
                         }
                     } catch (e) {
                         log.error('发送通知', e);
@@ -650,13 +650,13 @@ function pushPlusNotify(text, desp) {
                     }
                 },
                 failure: err => {
-                    log.error('发送通知', `push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败！！\n`)
+                    log.error('发送通知', `push+发送${PUSH_PLUS_USER ? '一对多' : '一对一'}通知消息失败！！`)
                     resolve();
                     throw new Error(err)
                 }
             })
         } else {
-            log.warn('发送通知', '您未提供push+推送所需的PUSH_PLUS_TOKEN，取消push+推送消息通知\n');
+            log.debug('发送通知', '您未提供push+推送所需的PUSH_PLUS_TOKEN，取消push+推送消息通知');
             resolve()
         }
     })
@@ -684,7 +684,7 @@ async function email(text, desp) {
         }
         log.info('发送通知', 'email发送成功');
     } else {
-        log.warn('发送通知', '您未提供email推送所需的所有参数故取消email推送消息通知\n');
+        log.debug('发送通知', '您未提供email推送所需的所有参数故取消email推送消息通知');
     }
 }
 

lib/index.js

@@ -1,10 +1,11 @@
 const { isMe } = require('./check');
 const { clear } = require('./clear');
 const { start } = require('./lottery');
+const { update } = require('./update');
 const global_var = require('./data/global_var')
 const bili = require('./net/bili')
 const { log } = require('./utils')
-const { sendNotify } = require('./helper/notify')
+const { sendNotify } = require('./helper/notify');
 
 /**
  * 检查cookie是否有效
@@ -23,4 +24,4 @@ async function checkCookie(num) {
 }
 
 
-module.exports = { start, isMe, clear, checkCookie }
+module.exports = { start, isMe, clear, update, checkCookie }

lib/net/api.bili.js

@@ -1,4 +1,4 @@
-module.exports = {
+module.exports = Object.freeze({
     DYNAMIC_LIKE_THUMB: 'https://api.vc.bilibili.com/dynamic_like/v1/dynamic_like/thumb',
     DYNAMIC_REPOST_REPOST: 'https://api.vc.bilibili.com/dynamic_repost/v1/dynamic_repost/repost',
     DYNAMIC_SVR_CREATE_DRAW: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create_draw',
@@ -29,4 +29,4 @@ module.exports = {
     TOPIC_SVR_TOPIC_NEW: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_new',
     WEB_INTERFACE_CARD: 'https://api.bilibili.com/x/web-interface/card',
     WEB_INTERFACE_SEARCH_TYPE: 'https://api.bilibili.com/x/web-interface/search/type',
-}
+})

lib/net/bili.js

@@ -161,8 +161,8 @@ const bili_client = {
                 const sessions = res.data.session_list || [];
                 const has_more = res.data.has_more;
                 const data = sessions.map(session => {
-                    const { session_ts, last_msg = {}, unread_count, talker_id } = session;
-                    const { content = '', timestamp = 0, sender_uid = 0, msg_seqno } = last_msg;
+                    const { session_ts, last_msg, unread_count, talker_id } = session;
+                    const { content = '', timestamp = 0, sender_uid = 0, msg_seqno } = last_msg || {};
                     return { session_ts, content, timestamp, sender_uid, unread_count, talker_id, msg_seqno }
                 })
                 return { has_more, data }
@@ -185,7 +185,7 @@ const bili_client = {
         }).then(responseText => {
             let res = strToJson(responseText);
             if (res.code === 0) {
-                const { unfollow_unread, follow_unread } = res.data;
+                const { unfollow_unread = 0, follow_unread = 0 } = res.data;
                 log.info('获取未读私信', `成功 已关注未读数: ${follow_unread}, 未关注未读数 ${unfollow_unread}`);
                 return { unfollow_unread, follow_unread }
             } else {
@@ -218,7 +218,7 @@ const bili_client = {
             if (res.code === 0) {
                 log.info('私信已读', `成功 -> talker_id: ${talker_id}`);
             } else {
-                log.error('私信已读', `失败 -> talker_id: ${talker_id}`);
+                log.error('私信已读', `失败 -> talker_id: ${talker_id}\n${responseText}`);
             }
         })
     },
@@ -349,8 +349,15 @@ const bili_client = {
         }).then(responseText => {
             const res = JSON.parse(responseText);
             if (res.code === 0) {
-                log.info('搜索专栏', '成功 关键词: ' + keyword)
-                return res.data.result.map(it => it.id)
+                let cv_arr = []
+                try {
+                    log.info('搜索专栏', '成功 关键词: ' + keyword)
+                    cv_arr = res.data.result.map(it => it.id)
+                } catch (error) {
+                    log.error('搜索专栏', '失败 原因:\n' + responseText)
+                    cv_arr = []
+                }
+                return cv_arr
             } else {
                 log.error('搜索专栏', '失败 原因:\n' + responseText)
                 return []
@@ -476,23 +483,23 @@ const bili_client = {
             contents: {
                 fid: uid,
                 act: 1,
-                re_src: 11,
+                re_src: 0,
                 csrf: GlobalVar.get("csrf")
             }
         }).then(responseText => {
+            let _responseText = ''
             /* 重复关注code also equal 0  */
             const res = strToJson(responseText)
+            _responseText += responseText
             if (res.code === 0) {
                 log.info('自动关注', '关注+1');
                 return 0
             } else if (res.code === 22002) {
                 log.error('自动关注', '您已被对方拉入黑名单');
                 return 1
-            } else if (res.code === 22015) {
-                log.error('自动关注', '您的账号异常无法关注');
-                return 2
             } else {
                 log.warn('自动关注', `失败 尝试切换线路\n${responseText}`);
+                _responseText += responseText
                 return post({
                     url: API.FEED_SETUSERFOLLOW,
                     contents: {
@@ -506,12 +513,13 @@ const bili_client = {
                         return 0
                     } else {
                         log.warn('自动关注', `失败 尝试切换另一条线路\n${responseText}`);
+                        _responseText += responseText
                         return post({
                             url: API.RELATION_BATCH_MODIFY,
                             contents: {
                                 fid: uid,
                                 act: 1,
-                                re_src: 11,
+                                re_src: 0,
                                 csrf: GlobalVar.get("csrf")
                             }
                         }).then(responseText => {
@@ -520,6 +528,10 @@ const bili_client = {
                                 return 0
                             } else {
                                 log.error('自动关注', `失败\n${responseText}`);
+                                _responseText += responseText
+                                if (_responseText.includes(22015)) {
+                                    return 2
+                                }
                                 return 1
                             }
                         })
@@ -569,7 +581,7 @@ const bili_client = {
             contents: {
                 fid: uid,
                 act: 2,
-                re_src: 11,
+                re_src: 0,
                 csrf: GlobalVar.get("csrf")
             }
         }).then(responseText => {
@@ -724,8 +736,9 @@ const bili_client = {
      * 11(有图)
      * 17(无图)
      * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
+     * - 成功 0
+     * - 失败 1
+     * - 黑名单 -1
      */
     sendChat(rid, msg, type, show = true) {
         return post({
@@ -750,6 +763,12 @@ const bili_client = {
             } else if (res.code === 12015) {
                 show && log.error('自动评论', '需要输入验证码');
                 return 1
+            } else if (res.code === 12035) {
+                show && log.error('自动评论', `已被对方拉入黑名单`);
+                return -1
+            } else if (res.code === 12053) {
+                show && log.error('自动评论', '黑名单用户无法互动');
+                return -1
             } else {
                 show && log.error('自动评论', `评论失败\n${responseText}`);
                 return 1

lib/update.js

@@ -0,0 +1,84 @@
+const { send } = require('./net/http')
+const { strToJson, download } = require('./utils')
+const { version, checkVersion, log } = require('./utils')
+
+/**
+ * 获取下载链接
+ * @param {string} owner
+ * @param {string} repo
+ * @returns {Promise<{ download_url: string, text: string }>}
+ */
+function getLatestReleaseDownloadUrl(owner, repo) {
+    return new Promise((resolve, reject) => {
+        send({
+            url: `https://api.github.com/repos/${owner}/${repo}/releases/latest`,
+            headers: {
+                "accept": 'application/vnd.github.v3+json'
+            },
+            config: {
+                retry: false
+            },
+            success: ({ body }) => {
+                const { tag_name, assets, body: text } = strToJson(body)
+                if (tag_name) {
+                    if (checkVersion(version) < checkVersion(tag_name)) {
+                        const platform = new Map([
+                            ['win32', 'win'],
+                            ['linux', 'linux'],
+                            ['darwin', 'macos']
+                        ]).get(process.platform)
+                        const arch = new Map([
+                            ['x64', 'x64']
+                            ['arm', 'armv7'],
+                            ['arm64', 'arm64']
+                        ]).get(process.arch)
+                        if (platform && arch) {
+                            try {
+                                const download_url = assets
+                                    .filter(({ name }) => name.includes(platform) && name.includes(arch))
+                                    .map(({ browser_download_url }) => browser_download_url)[0]
+                                if (!download_url) {
+                                    reject(`未找到能在此平台(${process.platform})-(${process.arch})上运行的版本`)
+                                }
+                                resolve({ download_url, text })
+                            } catch (err) {
+                                reject(err)
+                            }
+                        } else {
+                            reject(`未找到能在此平台(${process.platform})-(${process.arch})上运行的版本`)
+                        }
+                    } else {
+                        reject('当前已是最新版本')
+                    }
+                } else {
+                    reject(body)
+                }
+            },
+            failure: error => {
+                reject(error)
+            }
+        })
+    });
+}
+
+/**
+ * 半自动更新
+ */
+async function update() {
+    try {
+        const { download_url, text } = await getLatestReleaseDownloadUrl('shanmiteko', 'LotteryAutoScript')
+
+        let proxy_url = new URL(download_url)
+        proxy_url.host = 'download.fastgit.org'
+
+        await download(proxy_url.href, 'latest_version.zip')
+
+        log.info('自动下载', '成功下载到当前目录')
+        log.info('更新说明', '\n' + text + '\n')
+    } catch (error) {
+        log.error('更新脚本', error)
+    }
+}
+
+
+module.exports = { update }

lib/utils.js

@@ -2,11 +2,13 @@ const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
 const { send } = require("./net/http");
+const { version } = require('../package.json');
 
 /**
  * 基础工具
  */
 const utils = {
+    version,
     /**环境变量设置文件 */
     env_file: path.join(process.cwd(), "env.js"),
     /**配置文件 */
@@ -15,6 +17,16 @@ const utils = {
     dyids_dir: path.join(process.cwd(), "dyids"),
     /**dyid长度 */
     dyid_length: 18,
+    /**
+     * 将版本号转为数字
+     * @example
+     * 1.2.3 => 1.0203
+     * @param {string} version
+     * @returns {Number}
+     */
+    checkVersion(version) {
+        return (version.match(/\d.*/)[0]).split('.').reduce((a, v, i) => a + (0.01 ** i) * Number(v), 0)
+    },
     /**
      * 安全的将JSON字符串转为对象
      * 超出精度的数转为字符串
@@ -154,7 +166,7 @@ const utils = {
     },
     /**日志 */
     log: {
-        level: 0,
+        level: 3,
         /**
          * 初始化默认level为3
          */
@@ -172,22 +184,59 @@ const utils = {
         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]`)])
+                this.proPrint([chalk.hex('#64B3FF')(`[${new Date(Date.now() + 288e5).toISOString()}]`), chalk.grey("[Debug]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#0070BB')(`[\n${msg}\n]`)])
             }
         },
         info(context, msg) {
             if (this.level > 2)
-                this.proPrint([chalk.hex('#64B3FF')(`[${Date()}]`), chalk.grey("[Info]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#48BB31')(`[${msg}]`)])
+                this.proPrint([chalk.hex('#64B3FF')(`[${new Date(Date.now() + 288e5).toISOString()}]`), 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}]`)])
+                this.proPrint([chalk.hex('#64B3FF')(`[${new Date(Date.now() + 288e5).toISOString()}]`), chalk.grey("[Warn]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#BBBB23')(`[\n${msg}\n]`)])
         },
         error(context, msg) {
             if (this.level > 0)
-                this.proPrint([chalk.hex('#64B3FF')(`[${Date()}]`), chalk.grey("[Error]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#FF0006')(`[${msg}]`)])
+                this.proPrint([chalk.hex('#64B3FF')(`[${new Date(Date.now() + 288e5).toISOString()}]`), chalk.grey("[Error]"), chalk.hex('#FFA500')(`[${context}]`), chalk.hex('#FF0006')(`[\n${msg}\n]`)])
         }
     },
+    /**
+     * 下载文件
+     * @param {string} url
+     * @param {string} file_name
+     * @returns {Promise<void | string>}
+     */
+    download(url, file_name) {
+        return new Promise((resolve, reject) => {
+            send({
+                url,
+                stream: true,
+                config: {
+                    redirect: true,
+                    retry: false
+                },
+                success: ({ resStream }) => {
+                    let recv_length = 0;
+                    const wtbs = fs.createWriteStream(file_name);
+                    resStream.on('data', chuck => {
+                        recv_length += chuck.length
+                        utils.log.proPrint(`已收到:${recv_length} Bytes`)
+                    })
+                    resStream.pipe(wtbs)
+                    wtbs.on('finish', () => {
+                        utils.log.proPrint('下载完成')
+                        resolve()
+                    }).on('error', error => {
+                        wtbs.destroy()
+                        resolve(error)
+                    })
+                },
+                failure: error => {
+                    reject(error)
+                }
+            })
+        });
+    },
     /**
      * 获取远程设置
      * @returns {Promise<JSON>}

main.js

@@ -1,4 +1,4 @@
-const { env_file, config_file, log, delay, hasFileOrDir } = require("./lib/utils");
+const { version: ve, env_file, config_file, log, hasEnv, delay, hasFileOrDir } = require("./lib/utils");
 
 const metainfo = [
     `  _           _   _                   _____           _       _   `,
@@ -10,8 +10,8 @@ const metainfo = [
     `                                __/ |                  | |        `,
     `                               |___/                   |_|        `,
     `                                                                  `,
-    `                                                 Verison:   v2.0.4`,
-    `                                               Written by shanmite`,
+    `                                               Verison:   v${ve}`,
+    `                                               Written By shanmite`,
 ]
 /**多账号存储 */
 let multiple_account = [];
@@ -44,21 +44,19 @@ async function main() {
 
         /**多账号状态还原 */
         process.env.ENABLE_MULTIPLE_ACCOUNT = ENABLE_MULTIPLE_ACCOUNT;
-    } else {
-        if (!COOKIE) {
-            return '请查看README文件, 在env.js指定位置填入cookie'
-        }
+    } else if (COOKIE) {
         const global_var = require("./lib/data/global_var");
         await global_var.init(COOKIE, Number(NUMBER));
 
-        const { start, isMe, clear, checkCookie } = require("./lib/index");
+        /**引入基础功能 */
+        const { start, isMe, clear, update, checkCookie } = require("./lib/index");
 
         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 帮助信息";
-            const { lottery_loop_wait, check_loop_wait, clear_loop_wait } = require("./lib/data/config");
+            const help_msg = "用法: lottery [OPTIONS]\n\nOPTIONS:\n\tstart 启动抽奖\n\tcheck 中奖检查\n\tclear 清理动态和关注\n\tupdate 检查更新\n\thelp 帮助信息";
+            const { lottery_loop_wait, check_loop_wait, clear_loop_wait, update_loop_wait } = require("./lib/data/config");
             switch (mode) {
                 case 'start':
                     log.info('抽奖', '开始运行');
@@ -77,6 +75,11 @@ async function main() {
                         await clear();
                     }
                     break;
+                case 'update':
+                    log.info('检查更新', '开始')
+                    loop_wait = update_loop_wait;
+                    await update()
+                    break;
                 case 'help':
                     return help_msg
                 case undefined:
@@ -84,7 +87,11 @@ async function main() {
                 default:
                     return `提供了错误的[OPTIONS] -> ${mode}\n\n` + help_msg
             }
+        } else {
+            return 'Cookie已失效, 切换账号时不要点击退出账号而应直接删除Cookie退出'
         }
+    } else {
+        return '请查看README文件, 在env.js指定位置填入cookie'
     }
 }
 
@@ -99,9 +106,12 @@ async function main() {
         initEnv();
         log.init();
         log.info('环境变量初始化', '成功加载env.js文件');
+    } else if (hasEnv('COOKIE') || hasEnv('MULTIPLE_ACCOUNT_PARM')) {
+        log.init();
+        log.info('环境变量初始化', '成功从环境变量中读取COOKIE设置');
     } else {
         log.init();
-        log.warn('环境变量初始化', '未在当前目录下找到env.js文件 也可在环境变量中设置所需参数');
+        log.error('环境变量初始化', '未在当前目录下找到env.js文件或者在环境变量中设置所需参数');
         return
     }
 
@@ -118,7 +128,7 @@ async function main() {
 
     const err_msg = await main();
     if (err_msg) {
-        log.error('错误', '\n' + err_msg + '\n');
+        log.error('错误', err_msg);
         log.warn('结束运行', '5秒后自动退出');
         await delay(5 * 1000);
     } else {
@@ -127,7 +137,7 @@ async function main() {
             await delay(loop_wait)
             await main()
         }
-        log.info('结束运行', '未设置休眠时间')
+        log.info('结束运行', '未在config.js中设置休眠时间')
     }
 
     process.exit(0);

my_config.example.js

@@ -87,6 +87,7 @@ module.exports = {
         lottery_loop_wait: 0,
         check_loop_wait: 0,
         clear_loop_wait: 0,
+        update_loop_wait: 0,
 
         /**
          * - 转发间隔时间
@@ -140,7 +141,7 @@ 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: '',

package.json

@@ -1,17 +1,26 @@
 {
-  "name": "lottery-in-bili",
-  "version": "3.0.0",
-  "description": "自动抽奖",
+  "name": "lottery-auto-script",
+  "version": "2.1.4",
+  "description": "自动参与B站动态抽奖",
   "main": "main.js",
   "scripts": {
     "start": "node main.js start",
     "clear": "node main.js clear",
     "check": "node main.js check",
-    "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"
+    "update": "node main.js update",
+    "pkg_x64": "PowerShell .\\script\\pkg\\pkg.ps1",
+    "pkg_arm64": "npx pkg -t node16-linux-arm64 -o dist/lottery main.js && cp my_config.example.js dist/my_config.js && cp env.example.js dist/env.js",
+    "pkg_armv7": "npx pkg -t node16-linuxstatic-armv7 -o dist/lottery main.js && cp my_config.example.js dist/my_config.js && cp env.example.js dist/env.js"
   },
+  "files": [
+    "lib",
+    "main.js",
+    "package.js",
+    "my_config.example.js",
+    "env.example.js",
+    "LICENSE",
+    "README.md"
+  ],
   "bin": "main.js",
   "pkg": {
     "targets": [
@@ -43,4 +52,4 @@
     "chalk": "^4.1.1",
     "nodemailer": "^6.5.0"
   }
-}
+}

script/pkg/pkg.ps1

@@ -7,12 +7,20 @@ $ENV_FILE = "env.js"
 
 $TARGET_DIR = ".\dist"
 
+$NAME = 'lottery-auto-script'
+
 $TRIARR = @(
-    @("lottery-in-bili-win.exe", "lottery.exe", "nlts-win-x64"),
-    @("lottery-in-bili-linux", "lottery", "nlts-linux-x64"),
-    @("lottery-in-bili-macos", "lottery", "nlts-macos-x64")
+    @("$NAME-win.exe", "lottery.exe", "nlts-win-x64"),
+    @("$NAME-linux", "lottery", "nlts-linux-x64"),
+    @("$NAME-macos", "lottery", "nlts-macos-x64")
 )
 
+if((Test-Path $TARGET_DIR) -eq "True") {
+    Remove-Item -Path $TARGET_DIR -Recurse
+}
+
+npx pkg .
+
 Copy-Item -Path $TEMPLATE_ENV_FILE -Destination $TARGET_DIR -Force
 Copy-Item -Path $TEMPLATE_CONFIG_FILE -Destination $TARGET_DIR -Force
 Copy-Item -Path $README -Destination $TARGET_DIR -Force
@@ -38,9 +46,10 @@ foreach ($TRI in $TRIARR) {
         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
+        New-Item -Path $DIR -Name "update.bat" -ItemType File -Value "@echo off && lottery update && pause" -Force
     }
 
-    Compress-Archive -Path $DIR -DestinationPath "$($DIR)-$(Get-Date -Format "yyyyMMd")" -Force
+    Compress-Archive -Path $DIR -DestinationPath $DIR -Force
 }
 
 Remove-Item -Path $ENV_FILE