fix: 因黑名单而关注失败(#45 )

feat: 内置默认设置
feat: 增加更多时延自定义值(#44 )
2026-07-22 21:13:47 +08:00 · 2021-10-11 18:46:32 +08:00 · 2021-10-11 09:32:11 +08:00 · 2021-10-10 21:50:45 +08:00 · 2021-10-10 20:48:17 +08:00 · 2021-10-07 12:44:33 +08:00
53 changed files with 2750 additions and 2003 deletions
@@ -6,7 +6,7 @@
    },
    "extends": "eslint:recommended",
    "parserOptions": {
-        "ecmaVersion": 12
+        "ecmaVersion": "latest"
    },
    "rules": {
    }
@@ -1,11 +0,0 @@
---
-name: 新功能请求
-about: 提出你想要的功能或你的建议
-title: ''
-labels: ''
-assignees: ''
-
---
-
-### 清晰而简明地描述
-在此写下你的描述
@@ -1,33 +0,0 @@
---
-name: Bug 反馈
-about: 提出你遇到的问题, 提问之前请检索问题是否重复
-title: ''
-labels: ''
-assignees: ''
-
---
-
-### 在反馈bug之前，请确保你已经认真阅读了本项目的README和脚本的内置说明
-**描述bug**  
-简要描述所遇到的bug
-
-**重现bug**  
-说明您在进行了怎样的操作后出现了bug
-1. xxx
-2. xxx
-
-**预期行为**  
-简要描述进行以上操作后预期的脚本行为
-
-**截图**  
-如果可以，请提供有关截图  
-
-**运行日志**  
-控制台日志。  
-
-**使用环境:**  
- - Github Actions中
- - 本地运行
-
-**其他**  
-若您有其他想要补充的内容，请在此说明
@@ -0,0 +1,107 @@
+name: Bug反馈
+description: 提出你遇到的问题
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **为避免无效问题和冗余问题，提问前请确认**  
+        - 你确定搜索引擎不能解决你的问题  
+        - 你确定提供的Readme文档和Release说明不能解决你的问题  
+        - 你确定已有的issue不能解决你的问题  
+        - 你确定issue的title能简明的描述你的问题  
+        <br />
+
+  - id: describe
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: "描述Bug"
+      description: |
+        简要而清晰的描述你所遇到的bug。
+
+  - id: reproduction
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: "重现Bug"
+      description: |
+        说明您在进行了怎样的操作后出现了Bug.
+      placeholder: |
+        1. xxx
+        2. xxx
+
+  - id: expection
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: "预期行为"
+      description: |
+        简要描述进行以上操作后预期的脚本行为。
+
+  - id: picture
+    type: textarea
+    validations:
+      required: false
+    attributes:
+      label: "截图"
+      description: |
+        如果可以，请提供尽可能多的相关截图。
+      placeholder: |
+        可使用 QQ / Snipaste 等工具截图后在此处 ctrl + v 黏贴。
+
+  - id: log
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: "运行日志"
+      description: |
+        控制台日志。
+      placeholder: |
+        请在此黏贴运行日志。
+
+  - id: system
+    type: input
+    validations:
+      required: true
+    attributes:
+      label: "操作系统"
+      description: |
+        请给出操作系统名称和版本号。
+      placeholder: |
+        eg: Windows 10
+
+  - id: nodejs_version
+    type: input
+    validations:
+      required: false
+    attributes:
+      label: "NodeJs版本"
+      description: |
+        若使用源码运行请在控制台输入`node -v`查看版本号。
+      placeholder: |
+        eg: v16.5.0
+
+  - id: lotteryAutoScript_version
+    type: input
+    validations:
+      required: true
+    attributes:
+      label: "脚本版本"
+      description: |
+        脚本版本。脚本开始运行后会显示版本号。
+      placeholder: |
+        eg: v2.0.2
+
+  - id: extra
+    type: textarea
+    validations:
+      required: false
+    attributes:
+      label: "其他"
+      description: |
+        若您有其他想要补充的内容，请在此说明
@@ -0,0 +1 @@
+blank_issues_enabled: false
@@ -0,0 +1,19 @@
+name: 新功能请求
+description: 提出你想要的功能或你的建议
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## 欢迎
+        请确保你所提出的功能脚本的确没有。
+        <br />
+
+  - id: describe
+    type: textarea
+    validations:
+      required: true
+    attributes:
+      label: "描述"
+      description: |
+        请清晰而简明地描述你想要的功能或你的建议。
@@ -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
@@ -0,0 +1,18 @@
+name: "Publishing to NPM"
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "package.json"
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
@@ -0,0 +1,82 @@
+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(win)"
+        uses: actions/upload-artifact@v2
+        with:
+          name: nlts-win-x64
+          path: dist/nlts-win-x64/
+      - name: "Upload to artifact(linux)"
+        uses: actions/upload-artifact@v2
+        with:
+          name: nlts-linux-x64
+          path: dist/nlts-linux-x64/
+      - name: "Upload to artifact(macos)"
+        uses: actions/upload-artifact@v2
+        with:
+          name: nlts-macos-x64
+          path: dist/nlts-macos-x64/
+  pkg_arm64:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout codes"
+        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/
@@ -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 }}
@@ -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请求"
-	},
-}
@@ -1,14 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "启动程序",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "program": "${file}"
-        }
-    ]
-}
@@ -1,5 +1,4 @@
 # AutoScript
-
 - [AutoScript](#autoscript)
  - [操作步骤](#操作步骤)
    - [获取COOKIE](#获取cookie)
@@ -17,15 +16,30 @@

 [Github仓库链接](https://github.com/shanmiteko/LotteryAutoScript)

-已实现功能:  
-  > 点赞 评论 转发 @好友 带话题 随机动态 检测开奖 清理
+[![Package Node.js project into an executable](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/pkg.yml)<br>
+[![Build and push Docker images](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/docker.yml)<br>
+[![Publishing to NPM](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/npmp.yml/badge.svg)](https://github.com/shanmiteko/LotteryAutoScript/actions/workflows/npmp.yml)

-声明: 此脚本仅用于学习和测试，作者本人并不对其负责，请于运行测试完成后自行删除，请勿滥用！  
+已实现功能:
+- 监控用户转发
+- 监控话题页面
+- 监控专栏合集
+- 自动点赞、评论、乱序转发、@好友、带话题、可选随机动态
+- 检测是否中奖
+  - 已读@
+  - 已读私信
+- 清理动态关注
+- 检查更新
+- 更多功能设置请参考配置文件

----------------------------------------
+**声明**: 此脚本仅用于学习和测试，作者本人并不对其负责，请于运行测试完成后自行删除，请勿滥用！
+
+---------------------------------

 ## 操作步骤

+**使用前务必阅读此教程和配置文件内注释**
+
 右上角<kbd>★ Star</kbd>

 ↓↓
@@ -42,7 +56,7 @@ Chrome浏览器:

    (此步骤是为了方便后续采用JS获取Cookies,获取完毕后应再次勾选)

-![取消httponly](doc/pic/getCookies.png)
+![取消httponly](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/getCookies.png)

 3. 在Console中复制以下代码回车  

@@ -70,20 +84,41 @@ 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
+    .
+    ├── 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点击运行
+   ```sh
+   # unix-like
+   ## 进入脚本所在目录
+   ## 授予执行权限
+   $ chmod u+x lottery
+   ## 启动脚本
+   $ ./lottery start
+   ## 检测中奖
+   $ ./lottery check
+   ## 清理关注动态
+   $ ./lottery clear
+   ## 下载最新版本
+   $ ./lottery clear
+
+   # windows
+   ## 不需要chmod
+   ## 把`./`换成`.\`或去掉
+   ## 已自带*.bat可直接点击
+   ```
 7. 运行截图
-  ![lottery_start](doc/pic/lottery_start.png)
+  ![lottery_start](https://gitee.com/shanmite/LotteryAutoScript/raw/main/doc/pic/lottery_start.png)

 #### 以源码方式运行

@@ -97,7 +132,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

@@ -105,7 +140,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文件及创建运行文件(打开扩展名显示)

@@ -156,12 +191,12 @@ npm i && npm run clear
 1.初始化

 ```bash
-curl -fsSL https://cdn.staticaly.com/gh/shanmiteko/LotteryAutoScript/main/script/docker/init.sh | sh
+$ curl -fsSL https://cdn.staticaly.com/gh/shanmiteko/LotteryAutoScript/main/script/docker/init.sh | sh
 ```

 进入`lottery`文件夹
 ```bash
-cd lottery
+$ cd lottery
 ```

 编辑`env.js`与`my_config.js`文件
@@ -173,7 +208,7 @@ cd lottery

 例如:
 ```bash
-./start.sh
+$ ./start.sh
 ```

 2.更新
@@ -187,14 +222,19 @@ cd lottery
 进入lottery上一级目录

 ```bash
-docker image rm -f shanmite/lottery_auto_docker
-rm -rf lottery/
+$ docker image rm -f shanmite/lottery_auto_docker
+$ rm -rf lottery/
 ```

 ----------------------------------------

 ## 防重复转发
-脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中
+~~存储在专栏草稿~~
+
+~~脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中~~
+
+是否点赞
+

 ----------------------------------------

@@ -217,14 +257,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/)                                                                                                                                                     |
@@ -242,4 +282,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)文件内部注释
@@ -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**的教程结束
@@ -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
-```
+```
@@ -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)

 具体看任务是否正常执行，你可以看看自己的账号动态的最新转发，运行成功每几分钟自动转发抽奖动态
@@ -1,89 +1,70 @@
-/**
- * ## 账号相关
- * - `COOKIE` 是必填项
- * - `NUMBER` 表示是第几个账号
- * - `CLEAR` 是否启用清理功能
- * - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
- * - `MULTIPLE_ACCOUNT_PARM` 多账号参数(JSON格式)
- * ## 调试相关
- * - `LOTTERY_LOG_LEVEL` 输出日志等级 Error<Warn<Info<Debug 1<2<3<4
- * - `NOT_GO_LOTTERY` 关闭抽奖行为
- * ## 多账号
- * 1. 将 ENABLE_MULTIPLE_ACCOUNT 的值改为true
- * 2. 将账号信息依次填写于 multiple_account_parm 中, 参考例子类推
- * - `WAIT` 表示下一个账号运行等待时间(毫秒)
- * 
- * **按顺序依次执行, 防止访问频繁封禁IP**
- */
-const account_parm = {
-    COOKIE: "",
-    NUMBER: 1,
-    CLEAR: true,
-    ENABLE_MULTIPLE_ACCOUNT: false,
-    MULTIPLE_ACCOUNT_PARM: "",
-    LOTTERY_LOG_LEVEL: 3,
-    NOT_GO_LOTTERY: ""
-}
-
-/**
- * 为防止环境变量过长, 请将多账号填在此处
- * @example
- * ```js
- * {
- *     COOKIE: "",
- *     NUMBER: 2,
- *     CLEAR: true,
- *     WAIT: 60 * 1000,
- * },
- * ```
- * 请按照以上格式将参数依次填写在下方
- */
-const multiple_account_parm = [
-    {
+module.exports = Object.freeze({
+    /**
+     * ## 账号相关
+     * - `COOKIE` 是必填项
+     * - `NUMBER` 表示是第几个账号
+     * - `CLEAR` 是否启用清理功能
+     * - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
+     * - `MULTIPLE_ACCOUNT_PARM` 多账号参数(JSON格式)
+     * ## 调试相关
+     * - `LOTTERY_LOG_LEVEL` 输出日志等级 Error<Warn<Info<Debug 1<2<3<4
+     * - `NOT_GO_LOTTERY` 关闭抽奖行为
+     * ## 多账号
+     * 1. 将 ENABLE_MULTIPLE_ACCOUNT 的值改为true
+     * 2. 将账号信息依次填写于 multiple_account_parm 中, 参考例子类推
+     * - `WAIT` 表示下一个账号运行等待时间(毫秒)
+     * 
+     * **按顺序依次执行, 防止访问频繁封禁IP**
+     */
+    account_parm: {
        COOKIE: "",
        NUMBER: 1,
        CLEAR: true,
-        WAIT: 60 * 1000,
+
+        ENABLE_MULTIPLE_ACCOUNT: false,
+
+        MULTIPLE_ACCOUNT_PARM: "",
+        LOTTERY_LOG_LEVEL: 3,
+        NOT_GO_LOTTERY: ""
    },
-]

-/**
- * 推送相关参数
- */
-const push_parm = {
-    SCKEY: "",
-    SENDKEY: "",
-    QQ_SKEY: "",
-    QQ_MODE: "",
-    BARK_PUSH: "",
-    BARK_SOUND: "",
-    TG_BOT_TOKEN: "",
-    TG_USER_ID: "",
-    TG_PROXY_HOST: "",
-    TG_PROXY_PORT: "",
-    DD_BOT_TOKEN: "",
-    DD_BOT_SECRET: "",
-    QYWX_KEY: "",
-    IGOT_PUSH_KEY: "",
-    PUSH_PLUS_TOKEN: "",
-    PUSH_PLUS_USER: "",
-    SMTP_HOST: "",
-    SMTP_PORT: "",
-    SMTP_USER: "",
-    SMTP_PASS: "",
-    SMTP_TO_USER: ""
-}
+    /**
+     * 为防止环境变量过长, 请将多账号填在此处
+     * 以大括号内容为模板依次复制(包含大括号),逗号分割
+     */
+    multiple_account_parm: [
+        {
+            COOKIE: "",
+            NUMBER: 1,
+            CLEAR: true,
+            WAIT: 60 * 1000
+        }
+    ],

-/**
- * 初始化环境变量
- */
-function initEnv() {
-    process.env = {
-        ...process.env,
-        ...account_parm,
-        ...push_parm
+    /**
+     * 推送相关参数
+     */
+    push_parm: {
+        SCKEY: "",
+        SENDKEY: "",
+        QQ_SKEY: "",
+        QQ_MODE: "",
+        BARK_PUSH: "",
+        BARK_SOUND: "",
+        TG_BOT_TOKEN: "",
+        TG_USER_ID: "",
+        TG_PROXY_HOST: "",
+        TG_PROXY_PORT: "",
+        DD_BOT_TOKEN: "",
+        DD_BOT_SECRET: "",
+        QYWX_KEY: "",
+        IGOT_PUSH_KEY: "",
+        PUSH_PLUS_TOKEN: "",
+        PUSH_PLUS_USER: "",
+        SMTP_HOST: "",
+        SMTP_PORT: "",
+        SMTP_USER: "",
+        SMTP_PASS: "",
+        SMTP_TO_USER: ""
    }
-}
-
-
-module.exports = { initEnv, multiple_account_parm };
+})
@@ -1,42 +0,0 @@
-const { HttpRequest } = require('./HttpRequest');
-const GlobalVar = require("./GlobalVar");
-
-/**
- * Ajax请求对象
- */
-module.exports = (() => {
-    const get = ({ url, retry, queryStringsObj, success }) => {
-        HttpRequest({
-            method: 'GET',
-            url,
-            config: {
-                retry
-            },
-            query: queryStringsObj,
-            headers: {
-                "accept": 'application/json, text/plain, */*',
-                "cookie": GlobalVar.get("cookie")
-            },
-            success: res => success(res.body),
-            failure: err => success(err)
-        })
-    };
-    const post = ({ url, retry, data, success }) => {
-        HttpRequest({
-            method: 'POST',
-            url,
-            contents: data,
-            config: {
-                retry
-            },
-            headers: {
-                "accept": 'application/json, text/plain, */*',
-                "content-type": 'application/x-www-form-urlencoded; charset=utf-8',
-                "cookie": GlobalVar.get("cookie")
-            },
-            success: res => success(res.body),
-            failure: err => success(err)
-        })
-    };
-    return { get, post };
-})();
@@ -1,883 +0,0 @@
-const Ajax = require('./Ajax');
-const { strToJson, log } = require('./Util');
-const GlobalVar = require('./GlobalVar');
-
-/**
- * 网络请求
- */
-const BiliAPI = {
-    /**
-     * 判断是否成功登录
-     * @returns {Promise<boolean>}
-     */
-    async getMyinfo() {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.bilibili.com/x/space/myinfo',
-                success: responseText => {
-                    let res = strToJson(responseText);
-                    if (res.code === 0) {
-                        resolve(true);
-                    } else {
-                        resolve(false);
-                    }
-                }
-            })
-        });
-    },
-    /**
-     * 获取被at的信息
-     * @typedef AtInfo
-     * @property {number} at_time
-     * @property {string} up_uname
-     * @property {string} business
-     * @property {string} source_content
-     * @property {string} url
-     * @returns {Promise<AtInfo[]>}
-     */
-    async getMyAtInfo() {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.bilibili.com/x/msgfeed/at',
-                success: responseText => {
-                    const res = strToJson(responseText);
-                    const atInfo = [];
-                    if (res.code === 0) {
-                        const items = res.data.items;
-                        if (items.length !== 0) {
-                            items.forEach(i => {
-                                const { at_time, item, user } = i
-                                    , { nickname: up_uname } = user
-                                    , { business, uri: url, source_content } = item;
-                                atInfo.push({
-                                    at_time,
-                                    up_uname,
-                                    business,
-                                    source_content,
-                                    url
-                                });
-                            });
-                        }
-                        resolve(atInfo);
-                    } else {
-                        resolve(atInfo);
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 获取未读@
-     * @returns {Promise<number>}
-     */
-    async getUnreadAtNum() {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.bilibili.com/x/msgfeed/unread',
-                success: responseText => {
-                    let res = strToJson(responseText);
-                    if (res.code === 0) {
-                        const { at } = res.data;
-                        resolve(at)
-                        log.info('获取未读@', `成功 数量: ${at}`)
-                    } else {
-                        resolve(-1)
-                        log.error('获取未读@', `失败\n${responseText}`)
-                    }
-                }
-            })
-        });
-    },
-    /**
-     * 获取私信
-     * @typedef SessionData
-     * @property {string} session_ts
-     * @property {string} content
-     * @property {number} timestamp
-     * @property {number} sender_uid
-     * @property {number} talker_id
-     * 
-     * @typedef SessionInfo
-     * @property {number} has_more
-     * @property {SessionData[]} data
-     * 
-     * @param {number} session_type 1 已关注 2 未关注
-     * @param {string} [ts_16]
-     * @returns {Promise<SessionInfo>}
-     */
-    async getSessionInfo(session_type, ts_16 = '') {
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions',
-                data: {
-                    session_type,
-                    group_fold: 1,
-                    unfollow_fold: 1,
-                    sort_rule: 2,
-                    build: 0,
-                    mobi_app: 'web',
-                    end_ts: ts_16,
-                },
-                success: responseText => {
-                    let res = strToJson(responseText);
-                    if (res.code === 0) {
-                        log.info('获取一页私信(20)', '成功 ' + (ts_16 ? 'end_ts->' + ts_16 : '第一页'));
-                        /**@type {Array} */
-                        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 } = last_msg;
-                            return { session_ts, content, timestamp, sender_uid, talker_id: unread_count ? talker_id : undefined }
-                        })
-                        resolve({ has_more, data })
-                    } else {
-                        log.error('获取私信', `失败\n${responseText}`);
-                        resolve({ has_more: 0, data: [] });
-                    }
-                }
-            })
-        });
-    },
-    /**
-     * 获取未读私信数量
-     * @returns {Promise<{ unfollow_unread: number, follow_unread: number }>}
-     */
-    async getUnreadSessionNum() {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/single_unread',
-                success: responseText => {
-                    let res = strToJson(responseText);
-                    if (res.code === 0) {
-                        const { unfollow_unread, follow_unread } = res.data;
-                        resolve({ unfollow_unread, follow_unread });
-                        log.info('获取未读私信', `成功 已关注未读数: ${follow_unread}, 未关注未读数 ${unfollow_unread}`);
-                    } else {
-                        resolve(null);
-                        log.error('获取未读私信', `失败\n${responseText}`);
-                    }
-                }
-            })
-        });
-    },
-    /**
-     * 私信已读
-     * @param {number} talker_id
-     */
-    updateSessionStatus(talker_id) {
-        Ajax.post({
-            url: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack',
-            retry: false,
-            data: {
-                talker_id,
-                session_type: 1,
-                ack_seqno: 1,
-                mobi_app: "web",
-                csrf_token: GlobalVar.get("csrf")
-            },
-            success: responseText => {
-                let res = strToJson(responseText);
-                if (res.code === 0) {
-                    log.info('私信已读', `成功 -> talker_id: ${talker_id}`);
-                } else {
-                    log.error('私信已读', `失败 -> talker_id: ${talker_id}`);
-                }
-            }
-        })
-    },
-    /**
-     * 获取关注列表
-     * @param {number} uid
-     * @returns {Promise<string | null>}
-     */
-    getAttentionList(uid) {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.vc.bilibili.com/feed/v1/feed/get_attention_list',
-                queryStringsObj: {
-                    uid: uid
-                },
-                success: responseText => {
-                    let res = strToJson(responseText);
-                    if (res.code === 0) {
-                        log.info('获取关注列表', '成功');
-                        resolve(res.data.list.toString());
-                    } else {
-                        log.error('获取关注列表', `失败\n${responseText}`);
-                        resolve(null);
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 获取一个动态的细节
-     * @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
-     * 被查看者的uid
-     * @param {string} offset
-     * 此动态偏移量
-     * 初始为 0
-     * @returns {Promise<string>}
-     */
-    getOneDynamicInfoByUID(UID, offset) {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history',
-                queryStringsObj: {
-                    visitor_uid: GlobalVar.get("myUID"),
-                    host_uid: UID,
-                    offset_dynamic_id: offset,
-                },
-                retry: false,
-                success: responseText => {
-                    /* 鉴别工作交由modifyDynamicRes完成 */
-                    resolve(responseText);
-                }
-            });
-        });
-    },
-    /**
-     * 通过tag名获取tag的id
-     * @param {string} tagename
-     * tag名
-     * @returns {Promise<number | -1>}
-     * 正确:tag_ID
-     * 错误:-1
-     */
-    getTagIDByTagName(tagename) {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.bilibili.com/x/tag/info',
-                queryStringsObj: {
-                    tag_name: tagename
-                },
-                success: responseText => {
-                    const res = strToJson(responseText);
-                    if (res.code !== 0) {
-                        log.error('获取TagID', '失败');
-                        resolve(-1);
-                    } else {
-                        resolve(res.data.tag_id);
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 获取tag下的热门动态以及一条最新动态
-     * @param {number} tagid
-     * @returns {Promise<string>}
-     */
-    getHotDynamicInfoByTagID(tagid) {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_new',
-                queryStringsObj: {
-                    topic_id: tagid
-                },
-                success: responseText => {
-                    resolve(responseText);
-                }
-            });
-        });
-    },
-    /**
-     * 获取tag下的最新动态
-     * @param {string} tagname
-     * @param {string} offset
-     * @returns {Promise<string>}
-     */
-    getOneDynamicInfoByTag(tagname, offset) {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_history',
-                queryStringsObj: {
-                    topic_name: tagname,
-                    offset_dynamic_id: offset
-                },
-                retry: false,
-                success: responseText => {
-                    resolve(responseText);
-                }
-            });
-        });
-    },
-    /**
-     * 搜索专栏
-     * @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
-     * @returns {Promise<number | -1>}
-     */
-    getUserInfo(uid) {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.bilibili.com/x/web-interface/card',
-                queryStringsObj: {
-                    mid: uid,
-                    photo: false
-                },
-                retry: false,
-                success: responseText => {
-                    const res = strToJson(responseText);
-                    if (res.code === 0) {
-                        resolve(res.data.follower);
-                    } else {
-                        log.warn('获取粉丝数', '尝试切换线路');
-                        Ajax.get({
-                            url: 'https://api.bilibili.com/x/relation/stat',
-                            queryStringsObj: {
-                                vmid: uid
-                            },
-                            success: responseText => {
-                                const res = strToJson(responseText);
-                                if (res.code === 0) {
-                                    log.info('获取粉丝数', 'ok');
-                                    resolve(res.data.follower);
-                                } else {
-                                    log.error('获取粉丝数', `出错 可能是访问过频繁\n${responseText}`);
-                                    resolve(-1);
-                                }
-                            }
-                        })
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 获取开奖信息
-     * @param {string} dyid
-     * 动态id
-     * @typedef LotteryNotice
-     * @property {number | -1} ts
-     * @property {string | "获取开奖信息失败"} text
-     * @property {string | "null"} item
-     * @property {string | "未知"} isMe
-     * @returns {Promise<LotteryNotice>} 开奖时间
-     */
-    getLotteryNotice(dyid) {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.vc.bilibili.com/lottery_svr/v1/lottery_svr/lottery_notice',
-                queryStringsObj: {
-                    dynamic_id: dyid
-                },
-                success: responseText => {
-                    const res = strToJson(responseText);
-                    /(?<=_prize_cmt":").*(?=")/.exec();
-                    if (res.code === 0) {
-                        const timestamp10 = res.data.lottery_time,
-                            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;
-                        })();
-                        let isMeB = (new RegExp(GlobalVar.get("myUID"))).test(responseText);
-                        const isMe = isMeB ? '中奖了！！！' : '未中奖';
-                        const iteminfo = res.data.first_prize_cmt || '' + '  ' + res.data.second_prize_cmt || '' + '  ' + res.data.third_prize_cmt || '';
-                        resolve({
-                            ts: timestamp10,
-                            text: `开奖时间: ${time.toLocaleString()} ${remain}`,
-                            item: iteminfo,
-                            isMe: isMe
-                        });
-                    } else {
-                        log.error('获取开奖信息', `失败\n${responseText}`);
-                        resolve({
-                            ts: -1,
-                            text: '获取开奖信息失败',
-                            item: 'null',
-                            isMe: '未知'
-                        });
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 之前不检查是否重复关注
-     * 自动关注
-     * 并转移分组
-     * @param {Number} uid
-     * 被关注者的UID
-     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
-     * 2 - 异常  
-     */
-    autoAttention(uid) {
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.bilibili.com/x/relation/modify',
-                retry: false,
-                data: {
-                    fid: uid,
-                    act: 1,
-                    re_src: 11,
-                    csrf: GlobalVar.get("csrf")
-                },
-                success: responseText => {
-                    /* 重复关注code also equal 0  */
-                    const res = strToJson(responseText)
-                    if (res.code === 0) {
-                        log.info('自动关注', '关注+1');
-                        resolve(0);
-                    } else if (res.code === 22002) {
-                        log.error('自动关注', '您已被对方拉入黑名单');
-                        resolve(1);
-                    } else if (res.code === 22015) {
-                        log.error('自动关注', '您的账号异常无法关注');
-                        resolve(2);
-                    } else {
-                        log.warn('自动关注', `失败 尝试切换线路\n${responseText}`);
-                        Ajax.post({
-                            url: 'https://api.vc.bilibili.com/feed/v1/feed/SetUserFollow',
-                            data: {
-                                type: 1,
-                                follow: uid,
-                                csrf: GlobalVar.get("csrf")
-                            },
-                            success: responseText => {
-                                if (/^{"code":0/.test(responseText)) {
-                                    log.info('自动关注', '关注+1');
-                                    resolve(0);
-                                } else {
-                                    log.warn('自动关注', `失败 尝试切换另一条线路\n${responseText}`);
-                                    Ajax.post({
-                                        url: 'https://api.bilibili.com/x/relation/batch/modify',
-                                        data: {
-                                            fid: uid,
-                                            act: 1,
-                                            re_src: 11,
-                                            csrf: GlobalVar.get("csrf")
-                                        },
-                                        success: responseText => {
-                                            if (/^{"code":0/.test(responseText)) {
-                                                log.info('自动关注', '关注+1');
-                                                resolve(0);
-                                            } else {
-                                                log.error('自动关注', `失败\n${responseText}`);
-                                                resolve(1);
-                                            }
-                                        }
-                                    })
-                                }
-                            }
-                        })
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 移动分区
-     * @param {number} uid
-     * @param {number} tagid 关注分区的ID
-     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
-     */
-    movePartition(uid, tagid) {
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.bilibili.com/x/relation/tags/addUsers',
-                data: {
-                    fids: uid,
-                    tagids: tagid,
-                    csrf: GlobalVar.get("csrf")
-                },
-                success: responseText => {
-                    /* 重复移动code also equal 0 */
-                    if (/^{"code":0/.test(responseText)) {
-                        log.info('移动分区', 'up主分区移动成功');
-                        resolve(0);
-                    } else {
-                        log.error('移动分区', `up主分区移动失败\n${responseText}`);
-                        resolve(1);
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 取消关注
-     * @param {number} uid
-     * @returns {Promise<boolean>}
-     */
-    cancelAttention(uid) {
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.bilibili.com/x/relation/modify',
-                retry: false,
-                data: {
-                    fid: uid,
-                    act: 2,
-                    re_src: 11,
-                    csrf: GlobalVar.get("csrf")
-                },
-                success: responseText => {
-                    const res = strToJson(responseText);
-                    if (res.code === 0) {
-                        log.info('自动取关', `取关成功(${uid})`);
-                        resolve(true)
-                    } else {
-                        log.error('自动取关', `取关失败(${uid})\n${responseText}`);
-                        resolve(false)
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 动态自动点赞
-     * @param {string} dyid
-     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
-     */
-    autolike(dyid) {
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.vc.bilibili.com/dynamic_like/v1/dynamic_like/thumb',
-                data: {
-                    uid: GlobalVar.get("myUID"),
-                    dynamic_id: dyid,
-                    up: 1,
-                    csrf: GlobalVar.get("csrf")
-                },
-                success: responseText => {
-                    if (/^{"code":0/.test(responseText)) {
-                        log.info('自动点赞', '点赞成功');
-                        resolve(0);
-                    } else {
-                        log.error('自动点赞', `点赞失败\n${responseText}`);
-                        resolve(1);
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 转发前应查看是否重复转发
-     * 自动转发
-     * @param {Number} uid
-     * 自己的UID
-     * @param {string} dyid
-     * @param {string} [msg]
-     * 动态的ID
-     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
-     */
-    autoRelay(uid, dyid, msg = '转发动态', ctrl = '[]') {
-        const len = msg.length;
-        if (len > 233) {
-            msg = msg.slice(0, 233 - len)
-        }
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.vc.bilibili.com/dynamic_repost/v1/dynamic_repost/repost',
-                retry: false,
-                data: {
-                    uid: `${uid}`,
-                    dynamic_id: dyid,
-                    content: msg,
-                    ctrl,
-                    csrf: GlobalVar.get("csrf")
-                },
-                success: responseText => {
-                    if (/^{"code":0/.test(responseText)) {
-                        log.info('转发动态', '成功转发一条动态');
-                        resolve(0);
-                    } else {
-                        log.error('转发动态', `转发动态失败\n${responseText}`);
-                        resolve(1);
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * @typedef Picture
-     * @property {string} img_src
-     * @property {number} img_width
-     * @property {number} img_height
-     * 发布一条动态
-     * @param { string | Picture[] } content
-     * @return {Promise<void>}
-     */
-    createDynamic(content) {
-        let data = {
-            csrf: GlobalVar.get("csrf"),
-            extension: '{"emoji_type":1,"from":{"emoji_type":1},"flag_cfg":{}}'
-        }
-        let url = '';
-        if (content instanceof Array) {
-            url = 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create_draw'
-            data = {
-                ...data,
-                biz: 3,
-                category: 3,
-                pictures: JSON.stringify(content)
-            }
-        } else {
-            url = 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create'
-            data = {
-                ...data,
-                content,
-            }
-        }
-        return new Promise((resolve) => {
-            Ajax.post({
-                url,
-                data,
-                success: responseText => {
-                    if (/^{"code":0/.test(responseText)) {
-                        log.info('发布动态', '成功创建一条随机内容的动态');
-                    } else {
-                        log.error('发布动态', `发布动态失败\n${responseText}`);
-                    }
-                    resolve()
-                }
-            })
-        });
-    },
-    /**
-     * 移除动态
-     * @param {string} dyid
-     * @returns {Promise<boolean>}
-     */
-    rmDynamic(dyid) {
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/rm_dynamic',
-                data: {
-                    dynamic_id: dyid,
-                    csrf: GlobalVar.get("csrf")
-                },
-                retry: false,
-                success: responseText => {
-                    if (/^{"code":0/.test(responseText)) {
-                        log.info('删除动态', `成功删除一条动态(${dyid})`);
-                        resolve(true);
-                    } else {
-                        log.error('删除动态', `删除动态失败(${dyid})\n${responseText}`);
-                        resolve(false);
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 发送评论
-     * @param {string} rid
-     * cid_str
-     * @param {string} msg
-     * @param {number} type
-     * 1(视频)
-     * 11(有图)
-     * 17(无图)
-     * @returns {Promise<number>}
-     * 0 - 成功  
-     * 1 - 失败  
-     */
-    sendChat(rid, msg, type, show = true) {
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.bilibili.com/x/v2/reply/add',
-                data: {
-                    oid: rid,
-                    type: type,
-                    message: msg,
-                    csrf: GlobalVar.get("csrf")
-                },
-                success: responseText => {
-                    const res = strToJson(responseText);
-                    if (res.code === 0) {
-                        show && log.info('自动评论', '评论成功');
-                        resolve(0);
-                    } else if (res.code === -404) {
-                        show && log.error('自动评论', '原动态已删除');
-                        resolve(0);
-                    } else if (res.code === 12002) {
-                        show && log.error('自动评论', '评论区已关闭');
-                        resolve(0);
-                    } else if (res.code === 12015) {
-                        show && log.error('自动评论', '需要输入验证码');
-                        resolve(1);
-                    } else {
-                        show && log.error('自动评论', `评论失败\n${responseText}`);
-                        resolve(0);
-                    }
-                }
-            });
-        });
-    },
-    /**
-     * 检查分区  
-     * 不存在指定分区时创建  
-     * 获取到tagid添加为对象的属性  
-     * @param {string} [name]
-     * @returns {Promise<number>}
-     */
-    checkMyPartition(name) {
-        if (!name) name = '此处存放因抽奖临时关注的up';
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.bilibili.com/x/relation/tags',
-                success: responseText => {
-                    const res = strToJson(responseText);
-                    let tagid = undefined;
-                    if (res.code === 0) {
-                        const data = res.data.filter((it) => it.name === name);
-                        if (data.length) {
-                            log.info('获取分区id', '成功');
-                            tagid = data[0].tagid
-                        } else {
-                            log.warn('获取分区id', '失败 无指定分区');
-                        }
-                        if (name === '此处存放因抽奖临时关注的up') {
-                            if (typeof tagid === 'undefined') {
-                                BiliAPI.createPartition(name).then(id => resolve(id))
-                            } else {
-                                resolve(tagid)
-                            }
-                        } else {
-                            resolve(tagid)
-                        }
-                    } else {
-                        log.error('获取分区id', `访问出错 可在my_config里手动填入\n${responseText}`)
-                        resolve(tagid)
-                    }
-                }
-            })
-        });
-    },
-    /**
-     * 创造分区
-     * @param {string} partition_name
-     * @returns {Promise<number>}
-     */
-    createPartition(partition_name) {
-        return new Promise((resolve) => {
-            Ajax.post({
-                url: 'https://api.bilibili.com/x/relation/tag/create',
-                data: {
-                    tag: partition_name,
-                    csrf: GlobalVar.get("csrf")
-                },
-                success: responseText => {
-                    let obj = strToJson(responseText);
-                    if (obj.code === 0) {
-                        log.info('新建分区', '分区新建成功')
-                        let { tagid } = obj.data /* 获取tagid */
-                        resolve(tagid)
-                    } else {
-                        log.error('新建分区', `分区新建失败\n${responseText}`);
-                        resolve(undefined);
-                    }
-                }
-            })
-        })
-    },
-    /**
-     * 获取一个分区中50个的id
-     * @param {number} tagid
-     * @param {number} n 1->
-     * @returns {Promise<number[]>}
-     */
-    getPartitionUID(tagid, n) {
-        return new Promise((resolve) => {
-            Ajax.get({
-                url: 'https://api.bilibili.com/x/relation/tag',
-                queryStringsObj: {
-                    mid: GlobalVar.get("myUID"),
-                    tagid: tagid,
-                    pn: n,
-                    ps: 50
-                },
-                success: responseText => {
-                    const res = strToJson(responseText);
-                    let uids = [];
-                    if (res.code === 0) {
-                        res.data.forEach(d => {
-                            uids.push(d.mid);
-                        })
-                        log.info(`获取分组${tagid}`, `成功获取取关分区列表${n}`);
-                        resolve(uids)
-                    } else {
-                        log.error(`获取分组${tagid}`, `获取取关分区列表失败\n${responseText}`);
-                        resolve(uids)
-                    }
-                }
-            })
-        });
-    }
-};
-
-
-module.exports = BiliAPI;
@@ -1,12 +0,0 @@
-let GlobalVar = {
-    inner: {},
-    get(key) {
-        return this.inner[key]
-    },
-    set(key, value) {
-        this.inner[key] = value
-    },
-};
-
-
-module.exports = GlobalVar;
@@ -1,53 +0,0 @@
-const Util = require("./Util");
-const { log } = Util;
-
-const MyStorage = {
-    /**
-     * 搜索dyid
-     * @param {string} dyid
-     * @returns {Promise<boolean>}
-     */
-    searchDyid: (dyid) => {
-        return new Promise((resolve) => {
-            const Rdyid = new RegExp(dyid);
-            const rs = Util.readDyidFile(Number(process.env.NUMBER));
-            let status = false;
-            rs.on('data', chunk => {
-                if (Rdyid.test(chunk)) {
-                    status = true
-                }
-            })
-            rs.on('end', () => {
-                resolve(status)
-            })
-            rs.on('error', err => {
-                log.error('搜索dyid', err)
-                resolve(status)
-            })
-        })
-    },
-    /**
-     * 更新dyid
-     * @param {string} dyid
-     */
-    updateDyid: (dyid) => {
-        log.info('更新dyid', `写入${dyid}`);
-        if (dyid.length !== Util.dyid_length) {
-            log.error('更新dyid', `dyid(${dyid})长度不为18 若出现此问题请即时通知开发者`)
-        }
-        return new Promise((resolve) => {
-            const ws = Util.writeDyidFile(Number(process.env.NUMBER));
-            ws.write(dyid + ',', () => {
-                ws.destroy();
-                resolve()
-            })
-            ws.on('error', err => {
-                log.error('更新dyid', err)
-                resolve()
-            })
-        });
-    }
-}
-
-
-module.exports = MyStorage;
@@ -0,0 +1,80 @@
+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 = require('./net/bili')
+
+/**
+ * 是否中奖
+ */
+async function isMe() {
+    let desp = '';
+    const
+        { notice_key_words, update_session_wait, get_session_wait } = config,
+        UnreadAtNum = await bili.getUnreadAtNum(),
+        UnreadSessionNum = await bili.getUnreadSessionNum(),
+        { follow_unread, unfollow_unread } = UnreadSessionNum || { unfollow_unread: 0, follow_unread: 0 };
+    if (UnreadAtNum > 0) {
+        log.info('中奖检测', '<-- 正在检查at');
+        const MyAtInfo = await bili.getMyAtInfo();
+        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`
+        });
+        log.info('中奖检测', '--> OK');
+    }
+    if (follow_unread + unfollow_unread > 0) {
+        const check = async (type) => {
+            let session_t = '';
+            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.updateSessionStatus(talker_id, type, msg_seqno);
+                        await delay(update_session_wait);
+                        if (judge(content, notice_key_words)) {
+                            desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}  \n\n`
+                            desp += `用户: ${sender_uid}  \n\n`
+                            desp += `私信你(${global_var.get("myUID")})说: ${content}  \n\n`
+                            desp += `[直达链接](https://message.bilibili.com/#/whisper/mid${sender_uid})  \n\n`
+                            desp += `\n\n`
+                        }
+                    }
+                }
+                if (MySession.has_more && index < 16) {
+                    await delay(get_session_wait);
+                    MySession = await bili.getSessionInfo(type, session_t)
+                } else {
+                    break
+                }
+            }
+        }
+        if (follow_unread) {
+            log.info('中奖检测', '<-- 正在检查已关注者的私信')
+            await check(1)
+        }
+        if (unfollow_unread) {
+            log.info('中奖检测', '<-- 正在检查未关注者的私信')
+            await check(2)
+        }
+        log.info('中奖检测', '--> OK');
+    }
+    if (desp) {
+        desp += '中奖了别忘给脚本(https://github.com/shanmiteko/LotteryAutoScript)点一个Star哦, 赞助一两块也不是不可以‍‍‍_(:з」∠)_\n\n'
+        log.info('可能中奖了', desp);
+        await sendNotify('可能中奖了', desp);
+    } else {
+        log.info('中奖检测', "暂未中奖");
+    }
+    return;
+}
+
+
+module.exports = { isMe };
@@ -1,28 +1,30 @@
-const { log, delay, infiniteNumber } = require("./Util");
-const BiliAPI = require("./BiliAPI");
-const Public = require("./Public");
-const GlobalVar = require('./GlobalVar');
-const config = require("./config");
+const { log, delay, infiniteNumber } = require("./utils");
+const bili = require("./net/bili");
+const { Searcher } = require("./core/searcher");
+const global_var = require('./data/global_var');
+const config = require("./data/config");

 /**
 * 获取关注分区里的uid
 * @returns { Promise<number[]> }
 */
 async function getFollowList() {
-    const tagid = await BiliAPI.checkMyPartition(config.clear_partition);
+    const
+        { clear_partition, clear_white_list, get_partition_wait } = config,
+        tagid = await bili.checkMyPartition(clear_partition);
+    let rmup = [];
    if (typeof tagid === 'undefined') {
        log.info('获取关注列表', '未能成功获取关注分区id');
-        return
+        return rmup
    }
-    let rmup = [];
    for (let index = 1; index < 42; index++) {
-        const uids = await BiliAPI.getPartitionUID(tagid, index);
-        await delay(2e3);
+        const uids = await bili.getPartitionUID(tagid, index);
+        await delay(get_partition_wait);
        if (!uids.length) break;
        rmup.push(...uids)
    }
-    return config.clear_white_list.length
-        ? rmup.filter(uid => config.clear_white_list.split(',').indexOf(String(uid)) === -1)
+    return clear_white_list.length
+        ? rmup.filter(uid => clear_white_list.split(',').indexOf(String(uid)) === -1)
        : rmup;
 }

@@ -30,7 +32,7 @@ async function getFollowList() {
 * 清理动态和关注
 */
 async function clear() {
-    const { clear_white_list, clear_max_day, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type } = config;
+    const { 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) {
@@ -38,13 +40,13 @@ async function clear() {
    } else {
        log.info('清理关注', `共有${uid_list.length}个关注`)
    }
-    if (!clear_remove_dynamic && clear_remove_attention) {
+    if (clear_quick_remove_attention) {
        log.info('清理关注', '进入只清理关注模式')
        /* 专清关注 */
        for (const [index, uid] of uid_list.entries()) {
            log.info('清理关注', `(${index}) (${uid})`)
            /* 取消关注 */
-            if (await BiliAPI.cancelAttention(uid)) {
+            if (await bili.cancelAttention(uid)) {
                log.info('清理关注', '成功')
            } else {
                log.error('清理关注', '失败')
@@ -56,19 +58,23 @@ async function clear() {
    } else {
        const
            Now = Date.now() / 1000,
-            MY_UID = Number(GlobalVar.get('myUID'));
+            MY_UID = Number(global_var.get('myUID'));

        let next_offset = '0',
            before_separate = [];

        for (const page of infiniteNumber()) {
            log.info('清理动态', `开始读取第${page + 1}页`);
-            const { allModifyDynamicResArray, offset } = await Public.prototype.checkAllDynamic(MY_UID, 1, 5 * 1000, next_offset);
+            const { allModifyDynamicResArray, offset } = await Searcher.checkAllDynamic(MY_UID, 1, 5 * 1000, next_offset);
            next_offset = offset;
            for (const [index, dyinfo] of allModifyDynamicResArray.entries()) {
                log.info('清理动态', `第${page + 1}页中的第${index + 1}个动态`)
                const { type, dynamic_id, createtime } = dyinfo || {};
-                if (type === clear_dynamic_type) {
+                if (typeof type !== 'undefined'
+                    && clear_dynamic_type instanceof Array
+                    ? clear_dynamic_type.includes(type)
+                    : clear_dynamic_type === type
+                ) {
                    const
                        { origin_uid } = dyinfo,
                        days_ago = (Now - createtime) / 86400;
@@ -78,7 +84,7 @@ async function clear() {
                        if (dynamic_id
                            && clear_remove_dynamic
                            && !(new RegExp(dynamic_id).test(clear_white_list))) {
-                            success = await BiliAPI.rmDynamic(dynamic_id)
+                            success = await bili.rmDynamic(dynamic_id)
                        }

                        /* 取消关注 */
@@ -87,7 +93,7 @@ async function clear() {
                            && clear_remove_attention
                            && before_separate.indexOf(origin_uid) === -1
                            && uid_list.indexOf(origin_uid) > -1) {
-                            success = await BiliAPI.cancelAttention(origin_uid);
+                            success = await bili.cancelAttention(origin_uid);
                        }

                        if (!success) break;
@@ -1,19 +0,0 @@
-const { config_file } = require('./Util');
-const my_config = require(config_file);
-
-const config = {
-    ...my_config["default_config"],
-    /**
-     * @param {string} n
-     */
-    updata(n) {
-        const new_config = my_config[`config_${n}`];
-        if (new_config) {
-            Object.entries(new_config)
-                .forEach(([k, v]) => this[k] = v)
-        }
-    }
-};
-
-
-module.exports = config;
@@ -1,17 +1,17 @@
-const Util = require('./Util');
-const BiliAPI = require('./BiliAPI');
-const { sendNotify } = require('./sendNotify');
-const eventBus = require('./eventBus');
-const Public = require('./Public');
-const GlobalVar = require("./GlobalVar");
-const config = require("./config");
-const MyStorage = require('./MyStorage');
-const { log, hasEnv } = Util;
+const utils = require('../utils');
+const bili = require('../net/bili');
+const { sendNotify } = require('../helper/notify');
+const event_bus = require('../helper/event_bus');
+const { randomDynamic } = require('../helper/randomDynamic')
+const { Searcher } = require('./searcher');
+const global_var = require("../data/global_var");
+const config = require("../data/config");
+const { log, hasEnv } = utils;

 /**
 * 监视器
 */
-class Monitor extends Public {
+class Monitor extends Searcher {
    /**
     * @constructor
     * @param {[string, number | string]} lottery_param
@@ -32,49 +32,47 @@ class Monitor extends Public {
     */
    async init() {
        if (config.model === '00') {
-            eventBus.emit('Turn_off_the_Monitor', '已关闭所有转发行为')
+            event_bus.emit('Turn_off_the_Monitor', '已关闭所有转发行为')
            return
        }
        if (!this.tagid) {
-            this.tagid = await BiliAPI.checkMyPartition() /* 检查关注分区 */
+            this.tagid = await bili.checkMyPartition() /* 检查关注分区 */
            if (!this.tagid) {
-                eventBus.emit('Turn_off_the_Monitor', '分区获取失败')
+                event_bus.emit('Turn_off_the_Monitor', '分区获取失败')
                return
            }
        }
        /** 关注列表初始化 */
-        this.attentionList = await BiliAPI.getAttentionList(GlobalVar.get("myUID"));
+        this.attentionList = await bili.getAttentionList(global_var.get("myUID"));
        switch (await this.startLottery()) {
            case 0:
-                eventBus.emit('Turn_on_the_Monitor')
+                event_bus.emit('Turn_on_the_Monitor')
                break;
            case 11:
-                eventBus.emit('Turn_off_the_Monitor', '评论失败')
+                event_bus.emit('Turn_off_the_Monitor', '评论失败')
                break
            case 21:
-                eventBus.emit('Turn_on_the_Monitor')
+                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: ${GlobalVar.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关闭此推送`)
                }
-                eventBus.emit('Turn_on_the_Monitor')
+                config.is_exception = true;
+                event_bus.emit('Turn_on_the_Monitor')
                break
            case 31:
-                eventBus.emit('Turn_on_the_Monitor')
+                event_bus.emit('Turn_off_the_Monitor', '转发失败')
                break
            case 41:
-                eventBus.emit('Turn_off_the_Monitor', '转发失败')
+                event_bus.emit('Turn_off_the_Monitor', '获取开奖时间失败')
                break
            case 51:
-                eventBus.emit('Turn_off_the_Monitor', '获取开奖时间失败')
-                break
-            case 61:
-                eventBus.emit('Turn_off_the_Monitor', '获取关注数失败')
+                event_bus.emit('Turn_off_the_Monitor', '获取关注数失败')
                break
            default:
-                eventBus.emit('Turn_off_the_Monitor', '未知错误')
+                event_bus.emit('Turn_off_the_Monitor', '未知错误')
                break;
        }
    }
@@ -84,49 +82,71 @@ class Monitor extends Public {
     */
    async startLottery() {
        const allLottery = await this.filterLotteryInfo()
-            , len = allLottery.length;
+            , len = allLottery.length
+            , { create_dy, create_dy_mode, wait } = config;

        log.info('筛选动态', `筛选完毕(${len})`);

        if (len) {
-            for (const Lottery of allLottery) {
+            let is_exception = false;
+            for (const [index, Lottery] of utils.shuffle(allLottery).entries()) {
                let status = 0;
+
                if (Lottery.isOfficialLottery) {
-                    let { ts } = await BiliAPI.getLotteryNotice(Lottery.dyid);
+                    let { ts } = await bili.getLotteryNotice(Lottery.dyid);
                    const ts_10 = Date.now() / 1000;
                    if (ts < 0) {
-                        return 51
+                        return 41
                    }
                    if (ts < ts_10) {
                        log.info('过滤', '已过开奖时间')
-                        MyStorage.updateDyid(Lottery.dyid)
                        continue
                    }
                    if (ts > ts_10 + config.maxday * 86400) {
                        log.info('过滤', '超过指定开奖时间')
-                        MyStorage.updateDyid(Lottery.dyid)
                        continue
                    }
                } else if (Lottery.uid[0]) {
-                    const followerNum = await BiliAPI.getUserInfo(Lottery.uid[0]);
+                    const followerNum = await bili.getUserInfo(Lottery.uid[0]);
                    if (followerNum < 0) {
-                        return 61
+                        return 51
                    }
                    if (followerNum < config.minfollower) {
                        log.info('过滤', `粉丝数(${followerNum})小于指定数量`)
-                        MyStorage.updateDyid(Lottery.dyid)
                        continue
                    }
                }
-                status = await this.go(Lottery)
-                if (status % 2 !== 0) {
-                    return status
+
+                if (create_dy
+                    && create_dy_mode instanceof Array
+                    && index > 0
+                    && index % utils.getRandomOne(create_dy_mode[0]) === 0
+                ) {
+                    const number = utils.getRandomOne(create_dy_mode[1]) || 0;
+                    randomDynamic(number)
                }
-                MyStorage.updateDyid(Lottery.dyid);
-                await Util.delay(config.wait * (Math.random() + 0.5));
+
+                status = await this.go(Lottery)
+                switch (status) {
+                    case 0:
+                    case 9:
+                    case 19:
+                        break;
+                    case 22:
+                        is_exception = true
+                        break;
+                    default:
+                        return status
+                }
+
+                await utils.delay(wait * (Math.random() + 0.5));
            }
            log.info('抽奖', '开始转发下一组动态');
-            return 0
+            if (is_exception) {
+                return 22
+            } else {
+                return 0
+            }
        } else {
            log.info('抽奖', '无未转发抽奖');
            return 0
@@ -161,6 +181,7 @@ class Monitor extends Public {
        /** 所有抽奖信息 */
        let alllotteryinfo = [];
        const { key_words, model, chatmodel, is_imitator, only_followed, at_users, blockword, blacklist } = config;
+
        /**Map<String, Boolean> */
        let dyids_map = new Map();

@@ -173,41 +194,32 @@ class Monitor extends Public {
            return true
        });

-        /**并发查询dyid */
-        await Promise.all(
-            [...dyids_map.keys()]
-                .map(it => MyStorage
-                    .searchDyid(it)
-                    .then(hasIt => dyids_map.set(it, hasIt))
-                )
-        )
-
        /* 检查动态是否满足要求 */
-        await Util.try_for_each(protoLotteryInfo, async function ({
-            lottery_info_type, uids,
-            uname, dyid,
+        await utils.try_for_each(protoLotteryInfo, async function ({
+            lottery_info_type, is_liked,
+            uids, uname, dyid,
            ctrl, rid, des, type,
            hasOfficialLottery
        }) {
            /* 遇到转发过就退出 */
-            if (dyids_map.get(dyid)) return false;
+            if (is_liked) return false;

            const
                /**判断是转发源动态还是现动态 */
-                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]
-                , 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');
@@ -219,7 +231,7 @@ class Monitor extends Public {
            if (only_followed && !isFollowed) return false;

            /* 获取黑名单并去重合并 */
-            const { blacklist: remote_blacklist } = GlobalVar.get("remoteconfig")
+            const { blacklist: remote_blacklist } = global_var.get("remoteconfig")
                , new_blacklist = remote_blacklist
                    ? [...new Set([...blacklist.split(','), ...remote_blacklist.split(',')])].join()
                    : blacklist;
@@ -242,7 +254,7 @@ class Monitor extends Public {

                let
                    /**转发评语 */
-                    RandomStr = Util.getRandomOne(config.relay),
+                    RandomStr = utils.getRandomOne(config.relay),
                    /**控制字段 */
                    new_ctrl = [];

@@ -311,11 +323,12 @@ class Monitor extends Public {
     * @param {LotteryOptions} option
     * @returns {Promise<number>}
     * 0 - 成功  
+     * 9 - 评论黑名单  
     * 11 - 评论错误  
+     * 19 - 关注黑名单  
     * 21 - 关注错误  
     * 22 - 关注异常  
-     * 31 - 点赞失败  
-     * 41 - 转发失败  
+     * 31 - 转发失败  
     */
    async go(option) {
        log.debug('正在转发的动态信息', option);
@@ -323,47 +336,62 @@ class Monitor extends Public {
            log.info('NOT_GO_LOTTERY', 'ON');
            return 0
        }
+
        const { uid, dyid, chat_type, rid, relay_chat, ctrl } = option;
+
        /* 评论 */
        if (rid && chat_type) {
-            let status = 0;
-            const max_retry_times = 5;
-            for (let times = 0; times < max_retry_times; times++) {
-                status = await BiliAPI.sendChat(rid, Util.getRandomOne(config.chat), chat_type)
-                if (!status) {
-                    break
+            let status = 0
+            const
+                { chat } = config,
+                retry = [...new Array(5).keys()],
+                max_retry_times = retry.length;
+            await utils.try_for_each(retry, async (times) => {
+                status = await bili.sendChat(rid, utils.getRandomOne(chat), chat_type)
+                switch (status) {
+                    case 0:
+                        return true
+                    case -1:
+                        log.warn('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                        return true
+                    default:
+                        log.error('抽奖信息', `uid: ${uid},dyid: ${dyid}`)
+                        log.info('自动评论', `将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
+                        await utils.delay(60 * 1000 * (times + 1))
+                        return false
                }
-                log.info('自动评论', `将在 ${times + 1} 分钟后再次发送评论(${times + 1}/${max_retry_times})`)
-                await Util.delay(60 * 1000 * (times + 1))
-            }
-            if (status) return 11;
+            })
+            if (status) return 10 + status;
        }

        /* 关注 */
-        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;
-            }
+        if (uid.length) {
+            let status = 0
+            await utils.try_for_each(uid, async (u) => {
+                status = await bili.autoAttention(u)
+                switch (status) {
+                    case 0:
+                        return false
+                    case -1:
+                        log.warn('抽奖信息', `uid: ${u},dyid: ${dyid}`)
+                        return true
+                    default:
+                        log.error('抽奖信息', `uid: ${u},dyid: ${dyid}`)
+                        return true
+                }
+            })
+            if (status) return 20 + status
        }

        /* 点赞 */
-        if (await BiliAPI.autolike(dyid)) return 31;
+        await bili.autolike(dyid)

        /* 转发 */
-        if (await BiliAPI.autoRelay(GlobalVar.get("myUID"), dyid, relay_chat, ctrl)) return 41;
+        if (await bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)) return 31;

        return 0
    }
 }


-module.exports = Monitor;
+module.exports = { Monitor };
@@ -1,9 +1,8 @@
-const Util = require('./Util');
-const BiliAPI = require('./BiliAPI');
-const config = require("./config");
-const MyStorage = require('./MyStorage');
+const utils = require('../utils');
+const bili = require('../net/bili');
+const config = require("../data/config");

-const { log } = Util
+const { log } = utils

 /**
 * 解析dynamic_detail_card
@@ -11,6 +10,7 @@ const { log } = Util
 * @typedef {object} UsefulDynamicInfo
 * @property {number} uid
 * @property {string} uname
+ * @property {boolean} is_liked
 * @property {number} createtime 10
 * @property {string} rid_str
 * @property {string} dynamic_id
@@ -31,17 +31,20 @@ const { log } = Util
 * @return {UsefulDynamicInfo}
 */
 function parseDynamicCard(dynamic_detail_card) {
-    const { strToJson } = Util;
+    const { strToJson } = utils;
    /**临时储存单个动态中的信息 */
    let obj = {};
    const { desc, card, extension, extend_json } = dynamic_detail_card
-        , { info } = desc.user_profile
+        , { is_liked = 1, user_profile = {} } = desc
+        , { info = {} } = user_profile
        , cardToJson = strToJson(card)
        , { item } = cardToJson;
    /* 转发者的UID */
-    obj.uid = info.uid;
+    obj.uid = desc.uid
    /* 转发者的name */
-    obj.uname = info.uname;
+    obj.uname = info.uname || ''
+    /* 动态是否点过赞 */
+    obj.is_liked = is_liked > 0
    /* 动态的ts10 */
    obj.createtime = desc.timestamp
    /* 动态类型 */
@@ -86,8 +89,8 @@ function parseDynamicCard(dynamic_detail_card) {
 */
 function modifyDynamicRes(res) {
    const
-        { data = {}, code } = Util.strToJson(res),
-        { cards = [], has_more, offset } = data;
+        { data, code } = utils.strToJson(res),
+        { cards = [], has_more, offset } = data || {};

    if (code !== 0) {
        log.error('处理动态数据', '获取动态数据出错,可能是访问太频繁 \n' + res);
@@ -124,14 +127,15 @@ function modifyDynamicRes(res) {
 }

 /**
- * 基础功能
+ * 基础搜索功能
 */
-class Public {
+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
@@ -149,14 +153,14 @@ class Public {
     * @param {string} [offset] 默认'0'
     * @returns {Promise<{allModifyDynamicResArray: UsefulDynamicInfo[], offset: string}>} 获取前 `pages*12` 个动态信息
     */
-    async checkAllDynamic(hostuid, pages, time = 0, offset = '0') {
+    static async checkAllDynamic(hostuid, pages, time = 0, offset = '0') {
        log.info('检查所有动态', `准备读取${pages}页动态`);

-        const { getOneDynamicInfoByUID } = BiliAPI,
+        const { getOneDynamicInfoByUID } = bili,
            /**
             * 柯里化请求函数
             */
-            curriedGetOneDynamicInfoByUID = Util.curryify(getOneDynamicInfoByUID),
+            curriedGetOneDynamicInfoByUID = utils.curryify(getOneDynamicInfoByUID),
            /**
             * 储存了特定UID的请求函数
             */
@@ -196,7 +200,7 @@ class Public {
                offset = nextinfo.next_offset;
            }

-            await Util.delay(time);
+            await utils.delay(time);
        }

        log.info('检查所有动态', `${pages}页信息读取完成`)
@@ -211,23 +215,54 @@ class Public {
     */
    async getLotteryInfoByUID(UID) {
        log.info('获取动态', `开始获取用户${UID}的动态信息`);
-        const { allModifyDynamicResArray } = await this.checkAllDynamic(UID, config.uid_scan_page, config.search_wait);
+        const
+            { uid_scan_page, search_wait, get_dynamic_detail_wait } = config,
+            { allModifyDynamicResArray } = await Searcher.checkAllDynamic(UID, uid_scan_page, search_wait);

-        if (!allModifyDynamicResArray.length) return null;
+        let { length } = allModifyDynamicResArray
+
+        if (!length) return null;
+
+        const fomatdata = await allModifyDynamicResArray
+            .filter(d => {
+                if (d.type === 1) {
+                    return true
+                } else {
+                    length--
+                    return false
+                }
+            })
+            .reduce(async (pre, cur) => {
+                const results = await pre
+                    , { origin_dynamic_id } = cur;
+
+                log.info('获取动态', `查看源动态(${origin_dynamic_id})的细节 (${length--})`)
+
+                const card = await bili.getOneDynamicByDyid(origin_dynamic_id)
+
+                if (card) {
+                    await utils.delay(get_dynamic_detail_wait)
+
+                    const { is_liked } = parseDynamicCard(card)
+
+                    return [...results, {
+                        lottery_info_type: 'uid',
+                        is_liked,
+                        uids: [cur.uid, cur.origin_uid],
+                        uname: cur.origin_uname,
+                        ctrl: [],
+                        dyid: cur.origin_dynamic_id,
+                        rid: cur.origin_rid_str,
+                        des: cur.origin_description,
+                        type: cur.orig_type,
+                        hasOfficialLottery: cur.origin_hasOfficialLottery
+                    }]
+                }
+
+                return results
+
+            }, Promise.resolve([]))

-        const fomatdata = allModifyDynamicResArray.map(o => {
-            return {
-                lottery_info_type: 'uid',
-                uids: [o.uid, o.origin_uid],
-                uname: o.origin_uname,
-                ctrl: [],
-                dyid: o.origin_dynamic_id,
-                rid: o.origin_rid_str,
-                des: o.origin_description,
-                type: o.orig_type,
-                hasOfficialLottery: o.origin_hasOfficialLottery
-            }
-        }).filter(a => a.type != 0)
        log.info('获取动态', `成功获取用户${UID}的动态信息`);

        return fomatdata;
@@ -240,8 +275,9 @@ class Public {
     */
    async getLotteryInfoByTag(tag_name) {
        const
-            tag_id = await BiliAPI.getTagIDByTagName(tag_name),
-            hotdy = await BiliAPI.getHotDynamicInfoByTagID(tag_id),
+            { tag_scan_page, search_wait } = config,
+            tag_id = await bili.getTagIDByTagName(tag_name),
+            hotdy = await bili.getHotDynamicInfoByTagID(tag_id),
            modDR = modifyDynamicRes(hotdy);

        if (modDR === null) return null;
@@ -255,10 +291,10 @@ class Public {
        let mDRdata = modDR.modifyDynamicResArray;
        let next_offset = modDR.nextinfo.next_offset;

-        for (let index = 0; index < config.tag_scan_page; index++) {
+        for (let index = 0; index < tag_scan_page; index++) {
            log.info('获取动态', `读取第${index + 1}页动态`);
            const
-                newdy = await BiliAPI.getOneDynamicInfoByTag(tag_name, next_offset),
+                newdy = await bili.getOneDynamicInfoByTag(tag_name, next_offset),
                _modify = modifyDynamicRes(newdy);

            if (_modify === null) return null;
@@ -266,11 +302,12 @@ class Public {
            mDRdata.push.apply(mDRdata, _modify.modifyDynamicResArray);
            next_offset = _modify.nextinfo.next_offset;

-            await Util.delay(config.search_wait);
+            await utils.delay(search_wait);
        }
        const fomatdata = mDRdata.map(o => {
            return {
                lottery_info_type: 'tag',
+                is_liked: o.is_liked,
                uids: [o.uid, o.origin_uid],
                uname: o.uname,
                ctrl: o.ctrl,
@@ -292,59 +329,64 @@ class Public {
     */
    async getLotteryInfoByArticle(key_words) {
        log.info('获取动态', `开始获取含关键词${key_words}的专栏信息`);
-        const cvs = (await BiliAPI.searchArticlesByKeyword(key_words)).slice(0, config.article_scan_page);
+        const
+            { article_scan_page, not_check_article, get_dynamic_detail_wait } = config,
+            cvs = (await bili.searchArticlesByKeyword(key_words)).slice(0, article_scan_page);

+        /**存储所有专栏中的dyid */
        let dyinfos = [];
+        /**遍历专栏s */
        for (const cv of cvs) {
            const
-                content = await BiliAPI.getOneArticleByCv(cv),
+                content = await bili.getOneArticleByCv(cv),
                dyids = content.match(/(?<=t.bilibili.com\/)[0-9]+/g) || [],
                dyids_set = [...new Set(dyids)],
                /**判断此专栏是否查看过的权重 */
                weight = dyids_set.length / 2;

-            let { length } = dyids_set;
-
+            let { length } = dyids_set,
+                /**初始权重 */
+                _weight = 0,
+                /**单个专栏中的dyid */
+                _dyinfos = [];
            log.info('获取动态', `提取专栏(${cv})中提及的dyid(${length})`)
-            for (const dyid of dyids_set) {
-                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)
+            /**遍历某专栏中的dyids */
+            for (const dyid of dyids_set) {
+                if (dyid.length === utils.dyid_length) {
+                    log.info('获取动态', `查看专栏中所提及动态(${dyid})的细节 (${length--})`)
+
+                    const card = await bili.getOneDynamicByDyid(dyid)
+
+                    if (card) {
+                        await utils.delay(get_dynamic_detail_wait)
+
+                        const parsed_card = parseDynamicCard(card)
+                            , { is_liked } = parsed_card;
+
+                        if (is_liked) {
+                            log.info('获取动态', `动态(${dyid})已转发过`)
+                            _weight += 1;
+                        }
+
+                        if (_weight >= weight && !not_check_article) {
+                            log.warn('获取动态', `1/2动态曾经转过,该专栏或已查看,故中止`)
+                            _dyinfos = []
                            break
                        }

-                        await Util.delay(2000)
-
-                        if (card) {
-                            dyinfos.push(parseDynamicCard(card));
-                        }
-                    } else {
-                        log.info('获取动态', `动态(${dyid})已转发过 (${length--})`)
+                        _dyinfos.push(parsed_card);
                    }
                } else {
                    log.warn('获取动态', `动态(${dyid})无效 (${length--})`)
                }
            }
+            dyinfos.push(..._dyinfos)
        }
        const fomatdata = dyinfos.map(o => {
            return {
                lottery_info_type: 'article',
+                is_liked: o.is_liked,
                uids: [o.uid, o.origin_uid],
                uname: o.uname,
                ctrl: o.ctrl,
@@ -362,4 +404,4 @@ class Public {
 }


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


-module.exports = eventBus;
+module.exports = event_bus;
@@ -1,5 +1,5 @@
-const { log } = require("./Util");
-const { HttpRequest } = require("./HttpRequest");
+const { log } = require("../utils");
+const { send } = require("../net/http");
 const { createTransport } = require("nodemailer");

 // =======================================微信server酱通知设置区域===========================================
@@ -185,7 +185,7 @@ async function sendNotify(text, desp, params = {}) {
 function serverNotify(text, desp) {
    return new Promise(resolve => {
        if (SCKEY) {
-            HttpRequest({
+            send({
                method: 'GET',
                url: `https://sc.ftqq.com/${SCKEY}.send`,
                query: {
@@ -202,26 +202,26 @@ 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)}`)
+                            log.error('发送通知', `server酱发送通知消息异常\n${JSON.stringify(data)}`)
                        }
                    } catch (error) {
-                        log.error('发送通知',error);
+                        log.error('发送通知', error);
                    } finally {
                        resolve()
                    }
                },
                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()
        }
    })
@@ -230,7 +230,7 @@ function serverNotify(text, desp) {
 function serverNotifyTurbo(text, desp) {
    return new Promise(resolve => {
        if (SENDKEY) {
-            HttpRequest({
+            send({
                method: 'POST',
                url: `https://sctapi.ftqq.com/${SENDKEY}.send`,
                contents: {
@@ -247,23 +247,23 @@ 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)}`)
+                            log.error('发送通知', `server酱(Turbo版)发送通知消息异常\n${JSON.stringify(data)}`)
                        }
                    } catch (error) {
-                        log.error('发送通知',error);
+                        log.error('发送通知', error);
                    } finally {
                        resolve()
                    }
                },
                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()
        }
    })
@@ -286,7 +286,7 @@ function coolPush(text, desp) {
                        return "未知方式"
                }
            }
-            HttpRequest({
+            send({
                method: 'POST',
                url: `https://push.xuthus.cc/${QQ_MODE}/${QQ_SKEY}`,
                contents: `${text}\n${desp}`,
@@ -301,25 +301,25 @@ 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}`);
+                            log.error('发送通知', `酷推推送异常: ${data.msg}`);
                        }
                    } catch (error) {
-                        log.error('发送通知',error);
+                        log.error('发送通知', error);
                    } finally {
                        resolve()
                    }
                },
                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()
        }
    })
@@ -328,7 +328,7 @@ function coolPush(text, desp) {
 function barkNotify(text, desp, params = {}) {
    return new Promise(resolve => {
        if (BARK_PUSH) {
-            HttpRequest({
+            send({
                method: 'GET',
                url: `${BARK_PUSH}/${encodeURIComponent(text)}/${encodeURIComponent(desp)}`,
                query: {
@@ -345,24 +345,24 @@ 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);
+                        log.error('发送通知', error);
                    } finally {
                        resolve()
                    }
                },
                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,20 +391,20 @@ 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);
+                        log.error('发送通知', error);
                    } finally {
                        resolve()
                    }
                },
                failure: err => {
-                    log.error('发送通知','telegram发送通知消息失败！！\n')
+                    log.error('发送通知', 'telegram发送通知消息失败！！')
                    resolve()
                    throw new Error(err)
                }
@@ -415,9 +415,9 @@ function tgBotNotify(text, desp) {
                    port: TG_PROXY_PORT * 1
                }
            }
-            HttpRequest(options)
+            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,8 +430,8 @@ 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'));
-            HttpRequest({
+            const result = encodeURIComponent(hmac.digest().toString('base64'));
+            send({
                method: 'POST',
                url: `https://oapi.dingtalk.com/robot/send`,
                query: {
@@ -456,23 +456,23 @@ 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);
+                        log.error('发送通知', e);
                    } finally {
                        resolve();
                    }
                },
                failure: err => {
-                    log.error('发送通知','钉钉发送通知消息失败！！\n')
+                    log.error('发送通知', '钉钉发送通知消息失败！！')
                    throw new Error(err);
                }
            })
        } else if (DD_BOT_TOKEN) {
-            HttpRequest({
+            send({
                method: 'POST',
                url: `https://oapi.dingtalk.com/robot/send`,
                query: {
@@ -495,24 +495,24 @@ 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);
+                        log.error('发送通知', e);
                    } finally {
                        resolve();
                    }
                },
                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()
        }
    })
@@ -521,7 +521,7 @@ function ddBotNotify(text, desp) {
 function qywxBotNotify(text, desp) {
    return new Promise(resolve => {
        if (QYWX_KEY) {
-            HttpRequest({
+            send({
                method: 'POST',
                url: `https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${QYWX_KEY}`,
                contents: {
@@ -541,24 +541,24 @@ 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);
+                        log.error('发送通知', e);
                    } finally {
                        resolve();
                    }
                },
                failure: err => {
-                    log.error('发送通知','企业微信发送通知消息失败！！\n');
+                    log.error('发送通知', '企业微信发送通知消息失败！！');
                    resolve();
                    throw new Error(err)
                }
            })
        } else {
-            log.warn('发送通知','您未提供企业微信机器人推送所需的QYWX_KEY，取消企业微信推送消息通知\n');
+            log.debug('发送通知', '您未提供企业微信机器人推送所需的QYWX_KEY，取消企业微信推送消息通知');
            resolve();
        }
    });
@@ -570,11 +570,11 @@ 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
            }
-            HttpRequest({
+            send({
                method: 'POST',
                url: `https://push.hellyw.com/${IGOT_PUSH_KEY.toLowerCase()}`,
                contents: {
@@ -593,24 +593,24 @@ 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);
+                        log.error('发送通知', e);
                    } finally {
                        resolve();
                    }
                },
                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()
        }
    })
@@ -619,7 +619,7 @@ function iGotNotify(text, desp, params = {}) {
 function pushPlusNotify(text, desp) {
    return new Promise(resolve => {
        if (PUSH_PLUS_TOKEN) {
-            HttpRequest({
+            send({
                method: 'POST',
                url: 'https://pushplus.hxtrip.com/send',
                contents: {
@@ -639,24 +639,24 @@ 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);
+                        log.error('发送通知', e);
                    } finally {
                        resolve();
                    }
                },
                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()
        }
    })
@@ -679,15 +679,13 @@ async function email(text, desp) {
                text: desp,
            })
        } catch (e) {
-            log.error('发送通知',`email发送失败 原因: ${e.message}`);
+            log.error('发送通知', `email发送失败 原因: ${e.message}`);
            return
        }
-        log.info('发送通知','email发送成功');
+        log.info('发送通知', 'email发送成功');
    } else {
-        log.warn('发送通知','您未提供email推送所需的所有参数故取消email推送消息通知\n');
+        log.debug('发送通知', '您未提供email推送所需的所有参数故取消email推送消息通知');
    }
 }

-module.exports = {
-    sendNotify
-}
+module.exports = { sendNotify }
@@ -0,0 +1,39 @@
+const config = require("../data/config");
+const bili = require("../net/bili");
+const utils = require("../utils");
+
+/**
+ * 随机动态
+ * @param {number} num
+ * @returns
+ */
+async function randomDynamic(num) {
+    const { create_dy_type, dy_contents, random_dynamic_wait } = config;
+
+    if (create_dy_type === -1 || create_dy_type === 0 || typeof create_dy_type === 'undefined') {
+        for (let index = 0; index < num; index++) {
+            await bili.createDynamic(utils.getRandomOne(dy_contents));
+            await utils.delay(random_dynamic_wait);
+        }
+    }
+
+    if (create_dy_type === -1 || create_dy_type === 1) {
+        let videos = await bili.getTopRcmd()
+        for (let index = 0; videos.length < num; index++) {
+            videos.push(...await bili.getTopRcmd())
+        }
+
+        await utils.try_for_each(videos, async ([uid, aid]) => {
+            if (num--) {
+                await bili.shareVideo(uid, aid)
+                await utils.delay(random_dynamic_wait)
+                return false
+            } else {
+                return true
+            }
+        })
+    }
+}
+
+
+module.exports = { randomDynamic }
@@ -0,0 +1,27 @@
+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');
+
+/**
+ * 检查cookie是否有效
+ * @param {string} num
+ */
+async function checkCookie(num) {
+    const My_UID = global_var.get("myUID");
+    if (await bili.getMyinfo()) {
+        log.info('Cookie有效性检测', `成功登录 UID:${My_UID}`);
+        return true;
+    } else {
+        log.error('Cookie有效性检测', `登录失败 COOKIE${num} 已失效 UID:${My_UID}`);
+        await sendNotify('动态抽奖出错-登录失败', `COOKIE${num} 已失效 UID:${My_UID}`)
+        return false;
+    }
+}
+
+
+module.exports = { start, isMe, clear, update, checkCookie }
@@ -1,153 +0,0 @@
-const Util = require('./Util');
-const BiliAPI = require('./BiliAPI');
-const eventBus = require('./eventBus');
-const GlobalVar = require('./GlobalVar');
-const Public = require('./Public');
-const Monitor = require('./Monitor');
-const { sendNotify } = require('./sendNotify');
-const config = require('./config');
-const { log } = Util;
-
-async function createRandomDynamic(num) {
-    if (config.create_dy) {
-        log.info('随机动态', `准备创建${num}条随机动态`);
-        const Dynamic = await Public.prototype.checkAllDynamic(GlobalVar.get("myUID"), 1);
-        if ((Dynamic.allModifyDynamicResArray[0] || { type: 0 }).type === 1) {
-            for (let index = 0; index < num; index++) {
-                await BiliAPI.createDynamic(Util.getRandomOne(config.dy_contents));
-                await Util.delay(2000);
-            }
-        } else {
-            log.info('随机动态', '已有非抽奖动态故无需创建');
-        }
-    }
-}
-
-/**
- * 抽奖主函数
- * @param {string} cookie
- * @returns {Promise<void>}
- */
-function start() {
-    return new Promise(resolve => {
-        let times = Util.counter();
-        /* 注册事件 */
-        eventBus.on('Turn_on_the_Monitor', async () => {
-            const lotterys = GlobalVar.get("Lottery");
-            if (lotterys.length === 0) {
-                log.info('抽奖', '抽奖信息为空');
-                resolve();
-                return;
-            }
-            if (times.value() === lotterys.length) {
-                await createRandomDynamic(config.create_dy_num);
-                log.info('抽奖', '所有动态转发完毕');
-                times.clear();
-                eventBus.emit('Turn_off_the_Monitor', '目前无抽奖信息,过一会儿再来看看吧')
-                return;
-            }
-            const lottery = lotterys[times.next()];
-
-            await (new Monitor(lottery)).init();
-        });
-        eventBus.on('Turn_off_the_Monitor', async (msg) => {
-            await createRandomDynamic(config.create_dy_num);
-            log.info('结束抽奖', '原因: ' + msg);
-            eventBus.flush();
-            resolve();
-        })
-        eventBus.emit('Turn_on_the_Monitor');
-    });
-}
-
-/**
- * 是否中奖
- */
-async function isMe() {
-    let desp = '';
-    const UnreadAtNum = await BiliAPI.getUnreadAtNum();
-    const UnreadSessionNum = await BiliAPI.getUnreadSessionNum();
-    const { follow_unread, unfollow_unread } = UnreadSessionNum || { unfollow_unread: 0, follow_unread: 0 };
-    if (UnreadAtNum > 0) {
-        log.info('中奖检测', '<-- 正在检查at');
-        const MyAtInfo = await BiliAPI.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}中@了你(${GlobalVar.get("myUID")})  \n\n`
-            desp += `原内容为: ${source_content}  \n\n`
-            desp += `[直达链接](${url})  \n\n`
-            desp += `\n\n\n\n`
-        });
-        log.info('中奖检测', '--> OK');
-    }
-    if (follow_unread + unfollow_unread > 0) {
-        const check = async (type) => {
-            let session_t = '';
-            let MySession = await BiliAPI.getSessionInfo(type)
-            for (const index of Util.infiniteNumber()) {
-                for (const Session of MySession.data) {
-                    const { content, sender_uid, session_ts, timestamp, talker_id } = Session;
-                    session_t = session_ts;
-                    if (talker_id) {
-                        BiliAPI.updateSessionStatus(talker_id);
-                        await Util.delay(1000);
-                        if (/中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员/.test(content)) {
-                            desp += `发生时间: ${new Date(timestamp * 1000).toLocaleString()}  \n\n`
-                            desp += `用户: ${sender_uid}  \n\n`
-                            desp += `私信你(${GlobalVar.get("myUID")})说: ${content}  \n\n`
-                            desp += `[直达链接](https://message.bilibili.com/#/whisper/mid${sender_uid})  \n\n`
-                            desp += `\n\n\n\n`
-                        }
-                    }
-                }
-                if (MySession.has_more && index < 16) {
-                    await Util.delay(3e3);
-                    MySession = await BiliAPI.getSessionInfo(type, session_t)
-                } else {
-                    break
-                }
-            }
-        }
-        if (follow_unread) {
-            log.info('中奖检测', '<-- 正在检查已关注者的私信')
-            await check(1)
-        }
-        if (unfollow_unread) {
-            log.info('中奖检测', '<-- 正在检查未关注者的私信')
-            await check(2)
-        }
-        log.info('中奖检测', '--> OK');
-    }
-    if (desp) {
-        log.info(desp);
-        await sendNotify('可能中奖了', desp);
-    } else {
-        log.info('中奖检测', "未中奖");
-    }
-    return;
-}
-
-/**
- * 检查cookie是否有效
- * @param {string} num
- */
-async function checkCookie(num) {
-    const My_UID = GlobalVar.get("myUID");
-    if (await BiliAPI.getMyinfo()) {
-        log.info('Cookie有效性检测', `成功登录 UID:${My_UID}`);
-        return true;
-    } else {
-        log.error('Cookie有效性检测', `登录失败 COOKIE${num} 已失效 UID:${My_UID}`);
-        await sendNotify('动态抽奖出错-登录失败', `COOKIE${num} 已失效 UID:${My_UID}`)
-        return false;
-    }
-}
-
-
-module.exports = {
-    start,
-    isMe,
-    checkCookie
-}
@@ -0,0 +1,59 @@
+const utils = require('./utils');
+const event_bus = require('./helper/event_bus');
+const global_var = require('./data/global_var');
+const { Searcher } = require('./core/searcher');
+const { Monitor } = require('./core/monitor');
+const config = require('./data/config');
+const { randomDynamic } = require('./helper/randomDynamic');
+const { log } = utils;
+
+async function createRandomDynamic(num) {
+    if (config.create_dy) {
+        log.info('随机动态', `准备创建${num}条随机动态`);
+        const Dynamic = await Searcher.checkAllDynamic(global_var.get("myUID"), 1);
+        if ((Dynamic.allModifyDynamicResArray[0] || { type: 0 }).type === 1) {
+            await randomDynamic(num)
+        } else {
+            log.info('随机动态', '已有非抽奖动态故无需创建');
+        }
+    }
+}
+
+/**
+ * 抽奖主函数
+ * @param {string} cookie
+ * @returns {Promise<void>}
+ */
+function start() {
+    return new Promise(resolve => {
+        let times = utils.counter();
+        /* 注册事件 */
+        event_bus.on('Turn_on_the_Monitor', async () => {
+            const lotterys = global_var.get("Lottery");
+            if (lotterys.length === 0) {
+                log.info('抽奖', '抽奖信息为空');
+                resolve();
+                return;
+            }
+            if (times.value() === lotterys.length) {
+                log.info('抽奖', '所有动态转发完毕');
+                times.clear();
+                event_bus.emit('Turn_off_the_Monitor', '目前无抽奖信息,过一会儿再来看看吧')
+                return;
+            }
+            const lottery = lotterys[times.next()];
+
+            await (new Monitor(lottery)).init();
+        });
+        event_bus.on('Turn_off_the_Monitor', async (msg) => {
+            await createRandomDynamic(config.create_dy_num);
+            log.info('结束抽奖', '原因: ' + msg);
+            event_bus.flush();
+            resolve();
+        })
+        event_bus.emit('Turn_on_the_Monitor');
+    });
+}
+
+
+module.exports = { start }
@@ -0,0 +1,34 @@
+module.exports = Object.freeze({
+    DYNAMIC_LIKE_THUMB: 'https://api.vc.bilibili.com/dynamic_like/v1/dynamic_like/thumb',
+    DYNAMIC_REPOST_REPOST: 'https://api.vc.bilibili.com/dynamic_repost/v1/dynamic_repost/repost',
+    DYNAMIC_REPOST_SHARE: 'https://api.vc.bilibili.com/dynamic_repost/v1/dynamic_repost/share',
+    DYNAMIC_SVR_CREATE_DRAW: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create_draw',
+    DYNAMIC_SVR_CREATE: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/create',
+    DYNAMIC_SVR_GET_DYNAMIC_DETAIL: 'https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/get_dynamic_detail',
+    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',
+    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',
+    MSGFEED_AT: 'https://api.bilibili.com/x/msgfeed/at',
+    MSGFEED_UNREAD: 'https://api.bilibili.com/x/msgfeed/unread',
+    READ_CV: 'https://www.bilibili.com/read/cv{{cv}}',
+    RELATION_BATCH_MODIFY: 'https://api.bilibili.com/x/relation/batch/modify',
+    RELATION_MODIFY: 'https://api.bilibili.com/x/relation/modify',
+    RELATION_STAT: 'https://api.bilibili.com/x/relation/stat',
+    RELATION_TAG_CREATE: 'https://api.bilibili.com/x/relation/tag/create',
+    RELATION_TAG: 'https://api.bilibili.com/x/relation/tag',
+    RELATION_TAGS_ADDUSERS: 'https://api.bilibili.com/x/relation/tags/addUsers',
+    RELATION_TAGS: 'https://api.bilibili.com/x/relation/tags',
+    REPLY_ADD: 'https://api.bilibili.com/x/v2/reply/add',
+    SESSION_SVR_GET_SESSIONS: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/get_sessions',
+    SESSION_SVR_SINGLE_UNREAD: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/single_unread',
+    SESSION_SVR_UPDATE_ACK: 'https://api.vc.bilibili.com/session_svr/v1/session_svr/update_ack',
+    SPACE_MYINFO: 'https://api.bilibili.com/x/space/myinfo',
+    TAG_INFO: 'https://api.bilibili.com/x/tag/info',
+    TOP_RCMD: "https://api.bilibili.com/x/web-interface/index/top/rcmd",
+    TOPIC_SVR_TOPIC_HISTORY: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_history',
+    TOPIC_SVR_TOPIC_NEW: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_new',
+    WEB_INTERFACE_CARD: 'https://api.bilibili.com/x/web-interface/card',
+    WEB_INTERFACE_SEARCH_TYPE: 'https://api.bilibili.com/x/web-interface/search/type',
+})
@@ -0,0 +1,971 @@
+const GlobalVar = require('../data/global_var');
+const { strToJson, log } = require('../utils');
+const { send } = require('./http');
+const API = require('./api.bili');
+
+class Line {
+    /**
+     * 智能线路切换
+     * @typedef {string} ErrorMsg
+     * @typedef {[ErrorMsg, any]} ResResult
+     * @param {any} default_value
+     * @param {string} line_name
+     * @param {Array<(...arg) => Promise<ResResult | string>>} requests
+     * @param {(responseText: string) => ResResult} [pub_handler]
+     */
+    constructor(default_value, line_name, requests, pub_handler) {
+        this.line_name = line_name
+        this.requests = requests
+        this.valid_line = 0
+        this.switch_times = 0
+        this.default_value = default_value
+        if (pub_handler) this.pub_handler = pub_handler
+    }
+
+    /**
+     * 切换线路
+     * @returns {boolean}
+     */
+    switchLine() {
+        const { valid_line, requests: { length }, switch_times } = this
+        this.valid_line = (valid_line + 1) % length
+        this.switch_times += 1
+        if (switch_times > length) {
+            return false
+        } else {
+            return true
+        }
+    }
+
+    /**
+     * 存储当前有效线路
+     * @param {number} line
+     */
+    storeLine(line) {
+        this.valid_line = line
+        this.switch_times = 0
+    }
+
+    /**
+     * 启动
+     * @param  {...any} args
+     * @returns {Promise<any>}
+     */
+    async run(...args) {
+        const
+            { line_name, requests, valid_line, default_value } = this,
+            resp = await requests[valid_line](...args);
+        let err, value;
+        if (typeof resp === 'string') {
+            [err, value] = this.pub_handler(resp)
+        } else {
+            [err, value] = resp
+        }
+        if (!err) {
+            this.storeLine(valid_line)
+            return value
+        }
+        if (this.switchLine()) {
+            log.warn(line_name, err)
+            log.warn(line_name, `切换线路(${valid_line + 1}/${requests.length})`)
+            return await this.run()
+        } else {
+            log.error(line_name, err)
+            log.error(line_name, '所有备用线路均连接失败')
+            return default_value
+        }
+    }
+}
+
+/**
+ * GET请求
+ * @param {import('./http').RequestOptions} param0
+ * @returns {Promise<string>}
+ */
+function get({ url, config, contents, query }) {
+    return new Promise((resolve) => {
+        send({
+            url,
+            method: 'GET',
+            config,
+            headers: {
+                "accept": 'application/json, text/plain, */*',
+                "cookie": GlobalVar.get("cookie")
+            },
+            query,
+            contents,
+            success: res => resolve(res.body),
+            failure: err => resolve(err)
+        })
+    })
+}
+
+/**
+ * POST请求
+ * @param {import('./http').RequestOptions} param0
+ * @returns {Promise<string>}
+ */
+function post({ url, config, contents, query }) {
+    return new Promise((resolve) => {
+        send({
+            url,
+            method: 'POST',
+            config,
+            headers: {
+                "accept": 'application/json, text/plain, */*',
+                "content-type": 'application/x-www-form-urlencoded; charset=utf-8',
+                "cookie": GlobalVar.get("cookie")
+            },
+            query,
+            contents,
+            success: res => resolve(res.body),
+            failure: err => resolve(err)
+        })
+    })
+}
+
+/**
+ * 网络请求
+ */
+const bili_client = {
+    /**
+     * 判断是否成功登录
+     * @returns {Promise<boolean>}
+     */
+    async getMyinfo() {
+        const
+            responseText = await get({
+                url: API.SPACE_MYINFO
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            return true;
+        } else {
+            return false;
+        }
+    },
+    /**
+     * 获取被at的信息
+     * @typedef AtInfo
+     * @property {number} at_time
+     * @property {string} up_uname
+     * @property {string} business
+     * @property {string} source_content
+     * @property {string} url
+     * @returns {Promise<AtInfo[]>}
+     */
+    async getMyAtInfo() {
+        const
+            responseText = await get({
+                url: API.MSGFEED_AT
+            }),
+            res = strToJson(responseText);
+        let atInfo = [];
+        if (res.code === 0) {
+            const items = res.data.items;
+            if (items.length !== 0) {
+                items.forEach(i => {
+                    const { at_time, item, user } = i, { nickname: up_uname } = user, { business, uri: url, source_content } = item;
+                    atInfo.push({
+                        at_time,
+                        up_uname,
+                        business,
+                        source_content,
+                        url
+                    });
+                });
+            }
+            return atInfo;
+        } else {
+            return atInfo;
+        }
+    },
+    /**
+     * 获取未读@
+     * @returns {Promise<number>}
+     */
+    async getUnreadAtNum() {
+        const
+            responseText = await get({
+                url: API.MSGFEED_UNREAD
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            const { at } = res.data;
+            log.info('获取未读@', `成功 数量: ${at}`);
+            return at;
+        } else {
+            log.error('获取未读@', `失败\n${responseText}`);
+            return -1;
+        }
+    },
+    /**
+     * 获取私信
+     * @typedef SessionData
+     * @property {string} session_ts
+     * @property {string} content
+     * @property {number} timestamp
+     * @property {number} unread_count
+     * @property {number} sender_uid
+     * @property {number} talker_id
+     * @property {number} msg_seqno
+     * 
+     * @typedef SessionInfo
+     * @property {number} has_more
+     * @property {SessionData[]} data
+     * 
+     * @param {number} session_type 1 已关注 2 未关注 3 应援团
+     * @param {string} [ts_16]
+     * @returns {Promise<SessionInfo>}
+     */
+    async getSessionInfo(session_type, ts_16 = '') {
+        const
+            responseText = await get({
+                url: API.SESSION_SVR_GET_SESSIONS,
+                query: {
+                    session_type,
+                    end_ts: ts_16,
+                }
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            log.info('获取一页私信(20)', '成功 ' + (ts_16 ? 'end_ts->' + ts_16 : '第一页'));
+            /**@type {Array} */
+            const
+                sessions = res.data.session_list || [],
+                has_more = res.data.has_more,
+                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 };
+                });
+            return { has_more, data };
+        } else if (res.code === 2) {
+            log.error('获取私信', `API抽风...请再次尝试`);
+            return { has_more: 0, data: [] };
+        } else {
+            log.error('获取私信', `失败\n${responseText}`);
+            return { has_more: 0, data: [] };
+        }
+    },
+    /**
+     * 获取未读私信数量
+     * @returns {Promise<{ unfollow_unread: number, follow_unread: number }>}
+     */
+    async getUnreadSessionNum() {
+        const
+            responseText = await get({
+                url: API.SESSION_SVR_SINGLE_UNREAD
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            const { unfollow_unread = 0, follow_unread = 0 } = res.data;
+            log.info('获取未读私信', `成功 已关注未读数: ${follow_unread}, 未关注未读数 ${unfollow_unread}`);
+            return { unfollow_unread, follow_unread };
+        } else {
+            log.error('获取未读私信', `失败\n${responseText}`);
+            return null;
+        }
+    },
+    /**
+     * 私信已读
+     * @param {number} talker_id
+     * @param {number} session_type
+     * @param {number} msg_seqno
+     */
+    async updateSessionStatus(talker_id, session_type, msg_seqno) {
+        const
+            responseText = await post({
+                url: API.SESSION_SVR_UPDATE_ACK,
+                config: {
+                    retry: false
+                },
+                contents: {
+                    talker_id,
+                    session_type,
+                    ack_seqno: msg_seqno,
+                    csrf_token: GlobalVar.get("csrf"),
+                    csrf: GlobalVar.get("csrf")
+                }
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            log.info('私信已读', `成功 -> talker_id: ${talker_id}`);
+        } else {
+            log.error('私信已读', `失败 -> talker_id: ${talker_id}\n${responseText}`);
+        }
+    },
+    /**
+     * 获取关注列表
+     * @param {number} uid
+     * @returns {Promise<string | null>}
+     */
+    async getAttentionList(uid) {
+        const
+            responseText = await get({
+                url: API.FEED_GET_ATTENTION_LIST,
+                query: {
+                    uid
+                }
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            log.info('获取关注列表', '成功');
+            return res.data.list.toString();
+        } else {
+            log.error('获取关注列表', `失败\n${responseText}`);
+            return null;
+        }
+    },
+    /**
+     * 获取一个动态的细节
+     * @param {string} dynamic_id
+     * @return {Promise<JSON>} 失败返回undefined
+     */
+    async getOneDynamicByDyid(dynamic_id) {
+        const
+            responseText = await get({
+                url: API.DYNAMIC_SVR_GET_DYNAMIC_DETAIL,
+                query: {
+                    dynamic_id
+                }
+            }),
+            { code, data } = strToJson(responseText),
+            { card } = data || {};
+        if (code !== 0) {
+            log.error('获取一个动态的细节', `获取动态(${dynamic_id})数据出错:\n${responseText}`);
+            return;
+        }
+        if (!card) {
+            log.warn('获取一个动态的细节', `动态(${dynamic_id})不存在`);
+            return;
+        }
+        return card;
+    },
+    /**
+     * 获取一组动态的信息
+     * @param {number} host_uid 被查看者的uid
+     * @param {string} offset_dynamic_id 此动态偏移量 初始为 0
+     * @returns {Promise<string>}
+     */
+    getOneDynamicInfoByUID(host_uid, offset_dynamic_id) {
+        /* 鉴别工作交由modifyDynamicRes完成 */
+        return get({
+            url: API.DYNAMIC_SVR_SPACE_HISTORY,
+            query: {
+                visitor_uid: GlobalVar.get("myUID"),
+                host_uid,
+                offset_dynamic_id,
+            },
+            config: {
+                retry: false
+            }
+        })
+    },
+    /**
+     * 通过tag名获取tag的id
+     * @param {string} tag_name
+     * tag名
+     * @returns {Promise<number | -1>}
+     * 正确:tag_ID
+     * 错误:-1
+     */
+    async getTagIDByTagName(tag_name) {
+        const
+            responseText = await get({
+                url: API.TAG_INFO,
+                query: {
+                    tag_name
+                }
+            }),
+            res = strToJson(responseText);
+        if (res.code !== 0) {
+            log.error('获取TagID', '失败');
+            return -1;
+        } else {
+            return res.data.tag_id;
+        }
+    },
+    /**
+     * 获取tag下的热门动态以及一条最新动态
+     * @param {number} tagid
+     * @returns {Promise<string>}
+     */
+    getHotDynamicInfoByTagID(tagid) {
+        return get({
+            url: API.TOPIC_SVR_TOPIC_NEW,
+            query: {
+                topic_id: tagid
+            }
+        })
+    },
+    /**
+     * 获取tag下的最新动态
+     * @param {string} tagname
+     * @param {string} offset
+     * @returns {Promise<string>}
+     */
+    getOneDynamicInfoByTag(tagname, offset) {
+        return get({
+            url: API.TOPIC_SVR_TOPIC_HISTORY,
+            query: {
+                topic_name: tagname,
+                offset_dynamic_id: offset
+            },
+            config: {
+                retry: false
+            }
+        })
+    },
+    /**
+     * 搜索专栏
+     * @param {string} keyword
+     * @return {Promise<Array<number>>}
+     */
+    async searchArticlesByKeyword(keyword) {
+        const
+            responseText = await get({
+                url: API.WEB_INTERFACE_SEARCH_TYPE,
+                query: {
+                    keyword,
+                    page: 1,
+                    order: 'pubdate',
+                    search_type: 'article'
+                }
+            }),
+            res = JSON.parse(responseText);
+        if (res.code === 0) {
+            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 [];
+        }
+    },
+    /**
+     * 获取专栏内容
+     * @param {number} cv
+     * @returns {Promise<string>}
+     */
+    getOneArticleByCv(cv) {
+        return get({
+            url: API.READ_CV.replace('{{cv}}', cv)
+        })
+    },
+    /**
+     * 获取粉丝数的所有有效方式
+     */
+    _getUserInfo: new Line(-1, '获取粉丝数', [
+        /**
+         * 线路一
+         * @param {number} uid
+         * @returns {Promise<string>}
+         */
+        (uid) => get({
+            url: API.WEB_INTERFACE_CARD,
+            query: {
+                mid: uid,
+                photo: false
+            },
+            config: {
+                retry: false
+            }
+        }),
+        /**
+         * 线路二
+         * @param {number} uid
+         * @returns {Promise<string>}
+         */
+        (uid) => get({
+            url: API.RELATION_STAT,
+            query: {
+                vmid: uid
+            }
+        })
+    ], responseText => {
+        const res = strToJson(responseText);
+        if (res.code === 0) {
+            return [null, res.data.follower];
+        } else {
+            return [`出错 可能是访问过频繁\n${responseText}`, null]
+        }
+    }),
+    /**
+     * 获取粉丝数
+     * @param {number} uid
+     * @returns {Promise<number | -1>}
+     */
+    getUserInfo(uid) {
+        return this._getUserInfo.run(uid)
+    },
+    /**
+     * 获取开奖信息
+     * @param {string} dyid
+     * 动态id
+     * @typedef LotteryNotice
+     * @property {number | -1} ts
+     * @returns {Promise<LotteryNotice>} 开奖时间
+     */
+    async getLotteryNotice(dyid) {
+        const
+            responseText = await get({
+                url: API.LOTTERY_SVR_LOTTERY_NOTICE,
+                query: {
+                    dynamic_id: dyid
+                }
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            return {
+                ts: res.data.lottery_time
+            };
+        } else {
+            log.error('获取开奖信息', `失败\n${responseText}`);
+            return {
+                ts: -1
+            };
+        }
+    },
+    _autoAttention: new Line(1, '自动关注', [
+        (uid) => post({
+            url: API.RELATION_MODIFY,
+            config: {
+                retry: false
+            },
+            contents: {
+                fid: uid,
+                act: 1,
+                re_src: 0,
+                csrf: GlobalVar.get("csrf")
+            }
+        }),
+        (uid) => post({
+            url: API.FEED_SETUSERFOLLOW,
+            contents: {
+                type: 1,
+                follow: uid,
+                csrf: GlobalVar.get("csrf")
+            }
+        }),
+        (uid) => post({
+            url: API.RELATION_BATCH_MODIFY,
+            contents: {
+                fid: uid,
+                act: 1,
+                re_src: 0,
+                csrf: GlobalVar.get("csrf")
+            }
+        })
+    ], responseText => {
+        const res = strToJson(responseText);
+        switch (res.code) {
+            case 0:
+                log.info('自动关注', '关注+1');
+                return [null, 0]
+            case 22002:
+                return ['您已被对方拉入黑名单', -1]
+            case 22003:
+                return ['黑名单用户无法关注', -1]
+            case 22015:
+                return ['账号异常', 2]
+            default:
+                return [`未知错误\n${responseText}`, 1]
+        }
+    }),
+    /**
+     * 之前不检查是否重复关注
+     * 自动关注
+     * 并转移分组
+     * @param {Number} uid
+     * 被关注者的UID
+     * @returns {Promise<number>}
+     * -1 - 黑名单  
+     * 0 - 成功  
+     * 1 - 失败  
+     * 2 - 异常  
+     */
+    autoAttention(uid) {
+        return this._autoAttention.run(uid)
+    },
+    /**
+     * 移动分区
+     * @param {number} uid
+     * @param {number} tagid 关注分区的ID
+     * @returns {Promise<number>}
+     * 0 - 成功  
+     * 1 - 失败  
+     */
+    async movePartition(uid, tagid) {
+        const responseText = await post({
+            url: API.RELATION_TAGS_ADDUSERS,
+            contents: {
+                fids: uid,
+                tagids: tagid,
+                csrf: GlobalVar.get("csrf")
+            }
+        });
+        /* 重复移动code also equal 0 */
+        if (/^{"code":0/.test(responseText)) {
+            log.info('移动分区', 'up主分区移动成功');
+            return 0;
+        } else {
+            log.error('移动分区', `up主分区移动失败\n${responseText}`);
+            return 1;
+        }
+    },
+    /**
+     * 取消关注
+     * @param {number} uid
+     * @returns {Promise<boolean>}
+     */
+    async cancelAttention(uid) {
+        const
+            responseText = await post({
+                url: API.RELATION_MODIFY,
+                config: {
+                    retry: false
+                },
+                contents: {
+                    fid: uid,
+                    act: 2,
+                    re_src: 0,
+                    csrf: GlobalVar.get("csrf")
+                }
+            }),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            log.info('自动取关', `取关成功(${uid})`);
+            return true;
+        } else {
+            log.error('自动取关', `取关失败(${uid})\n${responseText}`);
+            return false;
+        }
+    },
+    /**
+     * 动态自动点赞
+     * @param {string} dyid
+     * @returns {Promise<number>}
+     * 0 - 成功  
+     * 1 - 失败  
+     */
+    async autolike(dyid) {
+        const responseText = await post({
+            url: API.DYNAMIC_LIKE_THUMB,
+            contents: {
+                uid: GlobalVar.get("myUID"),
+                dynamic_id: dyid,
+                up: 1,
+                csrf: GlobalVar.get("csrf")
+            }
+        });
+        if (/^{"code":0/.test(responseText)) {
+            log.info('自动点赞', '点赞成功');
+            return 0;
+        } else {
+            log.error('自动点赞', `点赞失败\n${responseText}`);
+            return 1;
+        }
+    },
+    /**
+     * 转发前应查看是否重复转发
+     * 自动转发
+     * @param {Number} uid
+     * 自己的UID
+     * @param {string} dyid
+     * @param {string} [msg]
+     * 动态的ID
+     * @returns {Promise<number>}
+     * 0 - 成功  
+     * 1 - 失败  
+     */
+    async autoRelay(uid, dyid, msg = '转发动态', ctrl = '[]') {
+        const len = msg.length;
+        if (len > 233) {
+            msg = msg.slice(0, 233 - len)
+        }
+        const responseText = await post({
+            url: API.DYNAMIC_REPOST_REPOST,
+            config: {
+                retry: false
+            },
+            contents: {
+                uid: `${uid}`,
+                dynamic_id: dyid,
+                content: msg,
+                ctrl,
+                csrf: GlobalVar.get("csrf")
+            }
+        });
+        if (/^{"code":0/.test(responseText)) {
+            log.info('转发动态', '成功转发一条动态');
+            return 0;
+        } else {
+            log.error('转发动态', `转发动态失败\n${responseText}`);
+            return 1;
+        }
+    },
+    /**
+     * @typedef Picture
+     * @property {string} img_src
+     * @property {number} img_width
+     * @property {number} img_height
+     * 发布一条动态
+     * @param { string | Picture[] } content
+     * @return {Promise<void>}
+     */
+    async createDynamic(content) {
+        let
+            contents = {
+                csrf: GlobalVar.get("csrf"),
+                extension: '{"emoji_type":1,"from":{"emoji_type":1},"flag_cfg":{}}'
+            },
+            url = '';
+        if (content instanceof Array) {
+            url = API.DYNAMIC_SVR_CREATE_DRAW
+            contents = {
+                ...contents,
+                biz: 3,
+                category: 3,
+                pictures: JSON.stringify(content)
+            }
+        } else {
+            url = API.DYNAMIC_SVR_CREATE
+            contents = {
+                ...contents,
+                content,
+            }
+        }
+        const responseText = await post({
+            url,
+            contents,
+        });
+        if (/^{"code":0/.test(responseText)) {
+            log.info('发布动态', '成功创建一条随机内容的动态');
+        } else {
+            log.error('发布动态', `发布动态失败\n${responseText}`);
+        }
+    },
+    /**
+     * 获取推荐
+     * @returns {Promise<Array<[number, number]>>}
+     */
+    async getTopRcmd() {
+        const
+            responseText = await get(
+                {
+                    url: API.TOP_RCMD,
+                }
+            ),
+            res = strToJson(responseText);
+        if (res.code === 0) {
+            log.info('获取推荐', `成功`);
+            return res.data.item.map(it => {
+                return [it.owner.mid, it.id];
+            });
+        } else {
+            log.error('获取推荐', `获取推荐失败\n${responseText}`);
+            return [];
+        }
+    },
+    /**
+     * 分享视频
+     * @param {number} uid
+     * @param {number} aid
+     */
+    async shareVideo(uid, aid) {
+        const responseText = await post({
+            url: API.DYNAMIC_REPOST_SHARE,
+            contents: {
+                platform: "pc",
+                uid,
+                type: 8,
+                content: "分享视频",
+                repost_code: 20000,
+                rid: aid,
+                csrf_token: GlobalVar.get("csrf")
+            }
+        });
+        if (/^{"code":0/.test(responseText)) {
+            log.info('转发视频', `成功转发视频(av${aid})`);
+        } else {
+            log.error('转发视频', `转发失败\n${responseText}`);
+        }
+    },
+    /**
+     * 移除动态
+     * @param {string} dyid
+     * @returns {Promise<boolean>}
+     */
+    async rmDynamic(dyid) {
+        const responseText = await post({
+            url: API.DYNAMIC_SVR_RM_DYNAMIC,
+            contents: {
+                dynamic_id: dyid,
+                csrf: GlobalVar.get("csrf")
+            },
+            config: {
+                retry: false
+            }
+        });
+        if (/^{"code":0/.test(responseText)) {
+            log.info('删除动态', `成功删除一条动态(${dyid})`);
+            return true;
+        } else {
+            log.error('删除动态', `删除动态失败(${dyid})\n${responseText}`);
+            return false;
+        }
+    },
+    /**
+     * 发送评论
+     * @param {string} rid
+     * cid_str
+     * @param {string} msg
+     * @param {number} type
+     * 1(视频)
+     * 11(有图)
+     * 17(无图)
+     * @returns {Promise<number>}
+     * - 成功 0
+     * - 失败 1
+     * - 黑名单 -1
+     */
+    async sendChat(rid, msg, type) {
+        const
+            responseText = await post({
+                url: API.REPLY_ADD,
+                contents: {
+                    oid: rid,
+                    type: type,
+                    message: msg,
+                    csrf: GlobalVar.get("csrf")
+                }
+            }),
+            res = strToJson(responseText);
+        switch (res.code) {
+            case 0:
+                log.info('自动评论', '评论成功');
+                return 0;
+            case -404:
+                log.error('自动评论', '原动态已删除');
+                return 0;
+            case 12002:
+                log.error('自动评论', '评论区已关闭');
+                return 0;
+            case 12015:
+                log.error('自动评论', '需要输入验证码');
+                return 1;
+            case 12035:
+                log.error('自动评论', `已被对方拉入黑名单`);
+                return -1;
+            case 12053:
+                log.error('自动评论', '黑名单用户无法互动');
+                return -1;
+            default:
+                log.error('自动评论', `未知错误\n${responseText}`);
+                return 1;
+        }
+    },
+    /**
+     * 检查分区  
+     * 不存在指定分区时创建  
+     * 获取到tagid添加为对象的属性  
+     * @param {string} [name]
+     * @returns {Promise<number>}
+     */
+    async checkMyPartition(name) {
+        if (!name) name = '此处存放因抽奖临时关注的up'
+        const
+            responseText = await get({
+                url: API.RELATION_TAGS
+            }),
+            res = strToJson(responseText);
+        let tagid = undefined;
+        if (res.code === 0) {
+            const data = res.data.filter((it) => it.name === name);
+            if (data.length) {
+                log.info('获取分区id', '成功');
+                tagid = data[0].tagid;
+            } else {
+                log.warn('获取分区id', `失败 无指定分区名${name}`);
+            }
+            if (name === '此处存放因抽奖临时关注的up') {
+                if (typeof tagid === 'undefined') {
+                    return bili_client.createPartition(name);
+                } else {
+                    return tagid;
+                }
+            } else {
+                return tagid;
+            }
+        } else {
+            log.error('获取分区id', `访问出错 可在my_config里手动填入\n${responseText}`);
+            return tagid;
+        }
+    },
+    /**
+     * 创造分区
+     * @param {string} partition_name
+     * @returns {Promise<number>}
+     */
+    async createPartition(partition_name) {
+        const
+            responseText = await post({
+                url: API.RELATION_TAG_CREATE,
+                contents: {
+                    tag: partition_name,
+                    csrf: GlobalVar.get("csrf")
+                }
+            }),
+            obj = strToJson(responseText);
+        if (obj.code === 0) {
+            /* 获取tagid */
+            let { tagid } = obj.data;
+            log.info('新建分区', '分区新建成功');
+            return tagid;
+        } else {
+            log.error('新建分区', `分区新建失败\n${responseText}`);
+            return undefined;
+        }
+    },
+    /**
+     * 获取一个分区中50个的id
+     * @param {number} tagid
+     * @param {number} n 1->
+     * @returns {Promise<number[]>}
+     */
+    async getPartitionUID(tagid, n) {
+        const
+            responseText = await get({
+                url: API.RELATION_TAG,
+                query: {
+                    mid: GlobalVar.get("myUID"),
+                    tagid: tagid,
+                    pn: n,
+                    ps: 50
+                }
+            }),
+            res = strToJson(responseText);
+        let uids = [];
+        if (res.code === 0) {
+            res.data.forEach(d => {
+                uids.push(d.mid);
+            });
+            log.info(`获取分组${tagid}`, `成功获取取关分区列表${n}`);
+            return uids;
+        } else {
+            log.error(`获取分组${tagid}`, `获取取关分区列表失败\n${responseText}`);
+            return uids;
+        }
+    }
+};
+
+
+module.exports = bili_client
@@ -14,11 +14,6 @@
 * @param {string} err
 * @returns {void}
 * 
- * @typedef Proxy
- * @property {string} hostname
- * @property {string} [host]
- * @property {number} port
- * 
 * @typedef RequestConfig
 * @property {number} [timeout] 超时
 * @property {number} [wait] 错误等待
@@ -27,16 +22,16 @@
 * @property {number} [retry_times] 重试次数
 * 
 * @typedef {object} RequestOptions Http请求选项
- * @property {string} method 请求方法
+ * @property {string} [method] 请求方法
 * @property {string} url 完整链接
- * @property {boolean} stream 是否流式数据
+ * @property {boolean} [stream] 是否流式数据
 * @property {RequestConfig} [config] 设置
- * @property {Proxy} [proxy] 代理
+ * @property {string} [proxy] 代理 IP:PORT
 * @property {Object.<string, string|number>} [query] 查询选项
 * @property {Object.<string, string|number> | string} [contents] 内容
 * @property {HttpHeaders} [headers] 请求头
- * @property {SuccessCb} success 成功回调
- * @property {FailureCb} failure 失败回调
+ * @property {SuccessCb} [success] 成功回调
+ * @property {FailureCb} [failure] 失败回调
 */

 const { request: http_request } = require('http');
@@ -64,7 +59,7 @@ const DEFAULT_CONTENT_TYPE = 'application/x-www-form-urlencoded; charset=UTF-8';
 * @param {RequestOptions} detail
 * @returns {void}
 */
-function HttpRequest(detail) {
+function send(detail) {
    detail = setDefault(detail);
    const { method, url, stream, config, proxy, query, contents, headers, success, failure } = detail;
    const { timeout, wait, retry, redirect, retry_times } = config;
@@ -86,9 +81,8 @@ function HttpRequest(detail) {
    }
    if (proxy) {
        options.headers.host = thisURL.host;
-        [options.hostname, options.port] = proxy.host ?
-            proxy.host.split(':') : [proxy.hostname, proxy.port]
        options.path = thisURL.href;
+        [options.hostname, options.port] = proxy.split(':');
    }
    const req = request(options, res => {
        let protodata = '';
@@ -100,7 +94,7 @@ function HttpRequest(detail) {
                detail.url = new URL(thisURL.origin + headers.location).href
            }
            console.log(`[重定向]状态码:${statusCode} location:${detail.url}`);
-            HttpRequest(detail)
+            send(detail)
            return
        }
        if (stream) {
@@ -113,7 +107,7 @@ function HttpRequest(detail) {
                        console.log(`[不期待响应]原因:${err.message} 尝试重新请求中...`);
                        await delay(wait);
                        detail.config.retry_times = retry_times - 1;
-                        HttpRequest(detail);
+                        send(detail);
                    } else {
                        failure(`[响应错误]${err.message} 响应数据:\n${protodata}`)
                    }
@@ -132,7 +126,7 @@ function HttpRequest(detail) {
            console.log(`[请求失败]原因:${err.message} 尝试重新连接中...`);
            await delay(wait);
            detail.config.retry_times = retry_times - 1;
-            HttpRequest(detail);
+            send(detail);
        } else {
            failure(`[请求失败]: ${err.message}`);
        }
@@ -157,12 +151,17 @@ function formatContents(type, contents) {

 /**
 * 设置默认
- * @param {RequestOptions} detail 
+ * @param {RequestOptions} detail
+ * @returns {RequestOptions}
 */
 function setDefault(detail) {
    detail = {
+        method: 'GET',
        stream: false,
+        proxy: '',
        headers: {},
+        success: (res) => { console.log(res.headers) },
+        failure: (err) => { console.log(err) },
        ...detail
    }
    detail.config = {
@@ -190,4 +189,4 @@ function delay(time) {
 }


-module.exports = { HttpRequest }
+module.exports = { send }
@@ -1,40 +0,0 @@
-const Util = require("./Util");
-const GlobalVar = require("./GlobalVar");
-const config = require("./config");
-
-const key_map = new Map([['DedeUserID', 'myUID'], ['bili_jct', 'csrf']]);
-
-/**
- * 生成全局变量文件
- * 更新config
- * @param {string} cookie
- * @param {number} n
- */
-async function setVariable(cookie, n) {
-    if (cookie) {
-        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]);
-        });
-
-        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 Util.createDir('dyids');
-    await Util.createFile(n < 2 ? 'dyid.txt' : `dyid${n}.txt`, '', 'a')
-    return
-}
-
-
-module.exports = { setVariable };
@@ -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 }
@@ -1,18 +1,30 @@
 const chalk = require('chalk');
 const fs = require('fs');
 const path = require('path');
-const { HttpRequest } = require("./HttpRequest");
+const { send } = require("./net/http");
+const { version } = require('../package.json');

 /**
 * 基础工具
 */
-const Util = {
+const utils = {
+    version,
    /**环境变量设置文件 */
    env_file: path.join(process.cwd(), "env.js"),
    /**配置文件 */
    config_file: path.join(process.cwd(), "my_config.js"),
-    /**dyid存储文件 */
-    dyids_dir: path.join(process.cwd(), "dyids"),
+    /**dyid长度 */
+    dyid_length: 18,
+    /**
+     * 将版本号转为数字
+     * @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字符串转为对象
     * 超出精度的数转为字符串
@@ -65,11 +77,11 @@ const Util = {
    },
    /**
     * 延时函数
-     * @param {number} time ms
+     * @param {number} [time] ms
     * @returns {Promise<void>}
     */
-    delay(time) {
-        Util.log.info('时延', `${~~time}ms`);
+    delay(time = 1000) {
+        utils.log.info('时延', `${~~time}ms`);
        return new Promise(resolve => {
            setTimeout(() => {
                resolve();
@@ -115,12 +127,44 @@ const Util = {
        }
        return RandomOne
    },
+    /**
+     * Fisher–Yates shuffle洗牌
+     * @template T
+     * @param {Array<T>} array
+     * @return {Array<T>}
+     */
+    shuffle(array) {
+        for (let i = array.length - 1; i > 0; i--) {
+            const j = Math.floor(Math.random() * (i + 1));
+            [array[i], array[j]] = [array[j], array[i]];
+        }
+        return array;
+    },
+    /**
+     * 关键词判断
+     * @param {string} text
+     * @param {string[]} key_words startwith '~' 表示黑名单
+     * @return {boolean}
+     */
+    judge(text, key_words) {
+        return key_words.reduce((acc, word) => {
+            word.startsWith('~')
+                ? RegExp(word.slice(1)).test(text) && (acc = false)
+                : RegExp(word).test(text) && (acc = true)
+            return acc
+        }, false)
+    },
+    /**
+     * 是否有指定环境变量
+     * @param {string} env_name
+     * @returns 
+     */
    hasEnv(env_name) {
        return process.env[env_name] ? true : false;
    },
    /**日志 */
    log: {
-        level: 0,
+        level: 3,
        /**
         * 初始化默认level为3
         */
@@ -138,29 +182,66 @@ const Util = {
        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>}
     */
    getRemoteConfig() {
        return new Promise((resolve) => {
-            HttpRequest({
+            send({
                method: 'GET',
                url: 'https://gitee.com/shanmite/lottery-notice/raw/master/notice.json',
                headers: {
@@ -171,14 +252,14 @@ const Util = {
                success: res => {
                    try {
                        const body = JSON.parse(res.body);
-                        if (body.node_msg) this.log.info('公告', '\n' + body.node_msg + '\n');
+                        if (body.node_msg) utils.log.info('公告', '\n' + body.node_msg + '\n');
                        resolve(body.config)
                    } catch (error) {
                        resolve(JSON.parse('{}'))
                    }
                },
                failure: err => {
-                    this.log.error('获取远程设置', '获取远程设置错误: ' + err);
+                    utils.log.error('获取远程设置', '获取远程设置错误: ' + err);
                    resolve(JSON.parse('{}'));
                }
            })
@@ -211,56 +292,8 @@ const Util = {
                resolve()
            })
        });
-    },
-    /**
-     * CreateFile
-     * @param {string} filepath 相对于dyids的文件路径
-     * @param {string} [defaultValue] 写入默认值
-     * @param {string} flag
-     * @returns {Promise<void>}
-     */
-    createFile(filepath, defaultValue, flag) {
-        const fpath = path.join(this.dyids_dir, filepath);
-        const buffer = Buffer.from(defaultValue);
-        return new Promise((resolve, rejects) => {
-            fs.open(fpath, flag, (err, fd) => {
-                if (err) {
-                    rejects(err)
-                } else {
-                    fs.write(fd, buffer, 0, buffer.length, 0, err => {
-                        if (err) {
-                            rejects(err)
-                        } else {
-                            resolve();
-                        }
-                    })
-                }
-            })
-        });
-    },
-    /**
-     * dyid长度
-     */
-    dyid_length: 18,
-    /**
-     * 读取dyid文件
-     * @param {number} num
-     * @returns {fs.ReadStream}
-     */
-    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: (this.dyid_length + 1) * 1000 })
-    },
-    /**
-     * 追加dyid
-     * @param {number} num
-     * @returns {fs.WriteStream}
-     */
-    writeDyidFile(num) {
-        const fpath = num < 2 ? path.join(this.dyids_dir, 'dyid.txt') : path.join(this.dyids_dir, `dyid${num}.txt`);
-        return fs.createWriteStream(fpath, { flags: 'a' })
    }
 };


-module.exports = Util;
+module.exports = utils;
@@ -1,4 +1,4 @@
-const { env_file, config_file, log, delay, hasFileOrDir } = require("./lib/Util");
+const { version: ve, env_file, config_file, log, hasEnv, delay, hasFileOrDir } = require("./lib/utils");

 const metainfo = [
    `  _           _   _                   _____           _       _   `,
@@ -10,7 +10,8 @@ const metainfo = [
    `                                __/ |                  | |        `,
    `                               |___/                   |_|        `,
    `                                                                  `,
-    `                                              v1.9.9   by shanmite`,
+    `                                               Verison:   v${ve}`,
+    `                                               Written By shanmite`,
 ]
 /**多账号存储 */
 let multiple_account = [];
@@ -33,28 +34,29 @@ async function main() {
            process.env.COOKIE = acco.COOKIE;
            process.env.NUMBER = acco.NUMBER;
            process.env.CLEAR = acco.CLEAR;
-            await main();
-            await delay(acco.WAIT);
+            const err_msg = await main();
+            if (err_msg) {
+                return err_msg
+            } else {
+                await delay(acco.WAIT);
+            }
        }

        /**多账号状态还原 */
        process.env.ENABLE_MULTIPLE_ACCOUNT = ENABLE_MULTIPLE_ACCOUNT;
-    } else {
-        if (!COOKIE) {
-            return '请查看README文件, 在env.js指定位置填入cookie'
-        }
-        const { setVariable } = require("./lib/setVariable");
-        await setVariable(COOKIE, Number(NUMBER));
+    } else if (COOKIE) {
+        const global_var = require("./lib/data/global_var");
+        await global_var.init(COOKIE, Number(NUMBER));

-        const { start, isMe, checkCookie } = require("./lib/lottery-in-nodejs");
-        const { clear } = require("./lib/clear");
+        /**引入基础功能 */
+        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/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('抽奖', '开始运行');
@@ -73,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:
@@ -80,50 +87,81 @@ async function main() {
                default:
                    return `提供了错误的[OPTIONS] -> ${mode}\n\n` + help_msg
            }
+        } else {
+            return 'Cookie已失效, 切换账号时不要点击退出账号而应直接删除Cookie退出'
        }
+    } else {
+        return '请查看README文件, 在env.js指定位置填入cookie'
    }
 }

+/**
+ * 初始化环境
+ * @returns {boolean} 出错true
+ */
+function initEnv() {
+    if (hasFileOrDir(env_file)) {
+        const
+            env = require("./lib/data/env"),
+            multiple_account_parm = env.get_multiple_account();
+
+        if (multiple_account_parm) {
+            multiple_account = multiple_account_parm;
+        }
+
+        env.init();
+        log.init();
+        log.info('环境变量初始化', '成功加载env.js文件');
+    } else if (hasEnv('COOKIE') || hasEnv('MULTIPLE_ACCOUNT_PARM')) {
+        log.init();
+        log.info('环境变量初始化', '成功从环境变量中读取COOKIE设置');
+    } else {
+        log.init();
+        log.error('环境变量初始化', '未在当前目录下找到env.js文件或者在环境变量中设置所需参数');
+        return true
+    }
+
+    return false
+}
+
+/**
+ * 初始化设置
+ * @returns {boolean} 出错true
+ */
+function initConfig() {
+    if (hasFileOrDir(config_file)) {
+        const config = require("./lib/data/config");
+        config.init();
+        log.info('配置文件初始化', '成功加载my_config.js文件');
+    } else {
+        log.error('配置文件初始化', '未在当前目录下找到my_config.js文件');
+        return true
+    }
+
+    return false
+}
+
 (async function () {
    log.proPrint(metainfo, '\n')

-    if (hasFileOrDir(env_file)) {
-        const { initEnv, multiple_account_parm } = require(env_file);
-        if (multiple_account_parm) {
-            multiple_account = multiple_account_parm;
-        }
-        initEnv();
-        log.init();
-        log.info('环境变量初始化', '成功加载env.js文件');
-    } else {
-        log.init();
-        log.warn('环境变量初始化', '未在当前目录下找到env.js文件 也可在环境变量中设置所需参数');
-        return
-    }
-
-    if (hasFileOrDir(config_file)) {
-        require("./lib/config");
-        log.info('配置文件初始化', '成功加载my_config.js文件');
-    } else {
-        log.error('配置文件初始化', '未在当前目录下找到my_config.js文件');
-        return
-    }
+    if (initEnv() || initConfig()) return;

    /**OPTIONS */
    process.env.lottery_mode = process.argv[2]

    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 {
        while (loop_wait) {
            log.info('程序休眠', `${loop_wait / 1000}秒后再次启动`)
            await delay(loop_wait)
+            if (initEnv() || initConfig()) return;
            await main()
        }
-        log.info('结束运行', '未设置休眠时间')
+        log.info('结束运行', '未在config.js中设置休眠时间')
    }

    process.exit(0);
@@ -1,4 +1,4 @@
-module.exports = {
+module.exports = Object.freeze({
    /** 
     * 默认设置(公用)
     */
@@ -7,7 +7,6 @@ module.exports = {
         * 监视更转的用户uid
         */
        UIDs: [
-            31252386,
            689277291,
            241675899
        ],
@@ -74,6 +73,12 @@ module.exports = {
         */
        article_scan_page: 3,

+        /**
+         * - 不检查专栏是否看过，若选择检查可以提高检测效率
+         * - 默认false(检查)
+         */
+        not_check_article: false,
+
        /**
         * - 开奖时间距离现在的最大天数
         * - 默认不限制
@@ -84,9 +89,10 @@ module.exports = {
         *  - 循环等待时间(指所有操作完毕后的休眠时间)
         *  - 单位毫秒
         */
-        lottery_loop_wait: 60 * 60 * 1000,
+        lottery_loop_wait: 0,
        check_loop_wait: 0,
        clear_loop_wait: 0,
+        update_loop_wait: 0,

        /**
         * - 转发间隔时间
@@ -101,6 +107,36 @@ module.exports = {
         */
        search_wait: 1000,

+        /**
+         * - 读取下一页私信间隔
+         * - 单位毫秒
+         */
+        get_session_wait: 3000,
+
+        /**
+         * - 已读私信间隔
+         * - 单位毫秒
+         */
+        update_session_wait: 1000,
+
+        /**
+         * - 读取下一页关注列表间隔
+         * - 单位毫秒
+         */
+        get_partition_wait: 2000,
+
+        /**
+         * - 获取动态细节间隔
+         * - 单位毫秒
+         */
+        get_dynamic_detail_wait: 2000,
+
+        /**
+         * - 随机动态间隔
+         * - 单位毫秒
+         */
+        random_dynamic_wait: 2000,
+
        /**
         * - up主粉丝数限制
         */
@@ -117,15 +153,21 @@ module.exports = {
        create_dy: false,

        /**
-         * - 发送随机动态的数量
+         * 随机动态类型
+         * - 0 自定义文字与图片
+         * - 1 推荐视频
+         * - -1 混合
+         */
+        create_dy_type: 0,
+
+        /**
+         * - 结束运行时发送随机动态的数量
         */
        create_dy_num: 1,

        /**
         * - 随机动态内容
         * - 类型 `content[]`
-         */
-        /**
         * @typedef Picture
         * @property {string} img_src 站内源
         * @property {number} img_width
@@ -134,13 +176,19 @@ module.exports = {
         */
        dy_contents: ['[doge]', '[doge][doge]'],

+        /**
+         * - 每转发x条抽奖动态就发送x条随机动态
+         * - @example [[10,11,9],[6,8,9]] 每转发9,10,11条抽奖动态就发送6,8,9条随机动态
+         */
+        create_dy_mode: [[0], [0]],
+
        /**
         * 转发时[at]的用户
         */
        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: '',
@@ -177,6 +225,16 @@ module.exports = {
         */
        is_exception: false,

+        /**
+         * - 中奖通知关键词(满足一个就推送)
+         * - 符合js正则表达式的字符串
+         * - 若以 ~ 开头则表示为黑名单规则
+         */
+        notice_key_words: [
+            "中奖|获得|填写|写上|提供|收货地址|支付宝账号|码|大会员",
+            "~有奖预约通知"
+        ],
+
        /**
         * - 清理白名单uid或dyid
         * - 英文逗号分隔 如: 1,2,3
@@ -194,6 +252,12 @@ module.exports = {
         */
        clear_max_day: 30,

+        /**
+         * - 快速移除关注
+         * - 不加判断只去除关注
+         */
+        clear_quick_remove_attention: false,
+
        /**
         * 是否移除动态
         */
@@ -211,17 +275,23 @@ module.exports = {

        /**
         * 清除动态类型
-        | 动态类型   | type值 |
-        | ---------- | ------ |
-        | 无         | `0`    |
-        | 转发       | `1`    |
-        | 含图片     | `2`    |
-        | 无图纯文字 | `4`    |
-        | 视频       | `8`    |
-        | 专栏       | `64`   |
-        | 活动       | `2048` |
+         * 
+         * | 动态类型   | type值 |
+         * | :------- |:----- |
+         * | 无        | `0`    |
+         * | 转发       | `1`    |
+         * | 含图片     | `2`    |
+         * | 无图纯文字  | `4`    |
+         * | 视频       | `8`    |
+         * | 番剧       | `512`  |
+         * | 活动       | `2048` |
+         * | 专栏       | `64`   |
+         * 
+         * @example
+         * 1
+         * [1,2,4]
         */
-        clear_dynamic_type: 1
+        clear_dynamic_type: [1]
    },

    /**
@@ -231,4 +301,4 @@ module.exports = {
    config_1: {},
    config_2: {},
    config_3: {}
-}
+})
@@ -1,17 +1,26 @@
 {
-  "name": "lottery-in-bili",
-  "version": "3.0.0",
-  "description": "自动抽奖",
+  "name": "lottery-auto-script",
+  "version": "2.2.5",
+  "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": [
@@ -1,9 +1,8 @@
 #!/bin/bash
+set -e

 # 脚本根目录
 SCRIPT_FOLDER=lottery
-# dyid存放目录
-DYID_FOLDER=dyids
 # 设置环境变量文件
 ENV_FILE=env.js
 # 自定义设置文件
@@ -25,14 +24,6 @@ fi

 cd $SCRIPT_FOLDER/

-# 新建dyid储存目录
-if [ ! -d "$DYID_FOLDER" ]; then
-    echo "create $DYID_FOLDER/"
-    mkdir $DYID_FOLDER
-else
-    echo "$DYID_FOLDER/ exists"
-fi
-
 # 新建环境变量设置文件
 if [ ! -f "$ENV_FILE" ]; then
    echo "create $ENV_FILE"
@@ -57,30 +48,27 @@ echo -e "#!/bin/bash\n\
 docker run \
 -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
 -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-v $PWD/$DYID_FOLDER/:/lottery/$DYID_FOLDER/ \
 $DOCKER_REPO \
 start" \
 > start.sh
-chmod 777 start.sh
+chmod +x start.sh

 echo "create check.sh"
 echo -e "#!/bin/bash\n\
 docker run \
 -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
 -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-v $PWD/$DYID_FOLDER/:/lottery/$DYID_FOLDER/ \
 $DOCKER_REPO \
 check" \
 > check.sh
-chmod 777 check.sh
+chmod +x check.sh

 echo "create clear.sh"
 echo -e "#!/bin/bash\n\
 docker run \
 -v $PWD/$ENV_FILE:/lottery/$ENV_FILE \
 -v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \
-v $PWD/$DYID_FOLDER/:/lottery/$DYID_FOLDER/ \
 $DOCKER_REPO \
 clear" \
 > clear.sh
-chmod 777 clear.sh
+chmod +x clear.sh
@@ -1,5 +0,0 @@
-#!/bin/bash
-cd ..
-cd ..
-npm i
-npm run check
@@ -1,5 +0,0 @@
-#!/bin/bash
-cd ..
-cd ..
-npm i
-npm run clear
@@ -1,5 +0,0 @@
-#!/bin/bash
-cd ..
-cd ..
-npm i
-npm run start
@@ -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
@@ -0,0 +1,8 @@
+#!/bin/bash
+./lottery update
+
+if [[ -r "latest_version.zip" ]]; then
+    unzip latest_version.zip
+    rm latest_version.zip
+    chmod u+x lottery
+fi
@@ -1,9 +0,0 @@
-chcp 65001
-
-cd ..
-cd ..
-npm i
-npm run check
-
-# 暂停
-pause
@@ -1,9 +0,0 @@
-chcp 65001
-
-cd ..
-cd ..
-npm i
-npm run clear
-
-# 暂停
-pause
@@ -1,9 +0,0 @@
-chcp 65001
-
-cd ..
-cd ..
-npm i
-npm run start
-
-# 暂停
-pause
Author	SHA1	Message	Date
shanmiteko	dd234691ea	fix: 因黑名单而关注失败(#45 )	2021-10-11 18:46:32 +08:00
shanmiteko	c3c8ffba95	feat: 内置默认设置	2021-10-11 09:32:11 +08:00
shanmiteko	ec9a11d5c0	feat: 增加更多时延自定义值(#44 )	2021-10-10 21:50:45 +08:00
shanmiteko	1458c800b8	feat: api线路切换具有记忆功能 perf: 重构部分代码 fix: 清理动态时关注列表获取失败	2021-10-10 20:48:17 +08:00
shanmiteko	b5fdb2d247	feat: clear_dynamic_type类型可以多选(#42 )	2021-10-07 12:44:33 +08:00
shanmiteko	1c8e5915d9	fix: 番剧动态无user_profile(#41 )	2021-10-07 12:29:48 +08:00
shanmiteko	e845e3f7ef	feat: 随机转发热门视频(#40 )	2021-10-06 20:42:22 +08:00
shanmiteko	27eae63762	action: update npmp.yml	2021-10-06 18:16:36 +08:00
shanmiteko	634f45a4c4	action: update pkg.yml	2021-10-06 17:57:21 +08:00
shanmiteko	3c269b2f96	action: update pkg.yml	2021-10-06 14:08:04 +08:00
shanmiteko	3851f51621	fix: 动态不存在时出错(#39 )	2021-10-06 13:26:31 +08:00
shanmiteko	d676a10e56	feat: 可间隔插入随机动态(#33 )	2021-10-05 18:13:00 +08:00
shanmiteko	88d3e97595	feat: 修改转发验重逻辑直接根据是否点赞判断	2021-10-05 17:04:47 +08:00
shanmiteko	88ad8ecfcc	fix(lib/data/env): [23:9]	2021-09-27 19:04:39 +08:00
shanmiteko	478d10d27e	feat: 设置支持热更新(#29 )	2021-09-27 18:40:11 +08:00
shanmite	6fbcf6e0b7	action: Publishing to NPM	2021-09-15 18:20:07 +08:00
jkluio78andshanmiteko	8bf47698ad	feat: 新增设置not_check_article(#25 )	2021-09-14 17:00:01 +08:00
shanmite	c0bc4878e3	fix: 漏了逗号导致无法更新	2021-09-11 07:33:05 +00:00
shanmiteandGitHub	e9b7965a76	doc: 增加徽标	2021-09-09 22:08:20 +08:00
shanmiteandGitHub	0a54cd20db	fix(action): no match for platform in manifest	2021-09-09 22:02:34 +08:00
shanmite	a2591f260a	fix: 黑名单处理(#22 )	2021-09-09 13:57:04 +00:00
shanmiteandGitHub	e6dc9d7abb	Merge pull request #21 from licncnn/main 修改了Linux 定时使用的操作文档	2021-09-09 14:24:00 +08:00
shanmite	179f4d0d41	fix: 错误码变更(#20 )	2021-09-09 04:37:27 +00:00
licncnnandGitHub	5a625dbd12	Update linux_schedule.md	2021-09-09 11:43:12 +08:00
licncnnandGitHub	65fd4b3112	Update linux_schedule.md	2021-09-09 11:39:03 +08:00
licncnnandGitHub	14067ca923	Update linux_schedule.md	2021-09-09 11:38:28 +08:00
shanmite	33e55721f6	chore: 修改打包文件名	2021-08-26 15:25:09 +08:00
shanmite	aa1aad7ddd	fix: copy my_config.js	2021-08-26 15:02:32 +08:00
shanmite	0c0d112aaf	feat: arm平台可更新	2021-08-26 14:55:09 +08:00
shanmite	b4ec45a48d	fix: node16-linuxstatic-armv7	2021-08-26 14:30:31 +08:00
shanmite	1ce8e966e8	fix: 调整arm目标	2021-08-26 14:23:58 +08:00
shanmite	f252365809	chore: arm64,armv7	2021-08-26 14:13:45 +08:00
shanmite	30fee87485	chore: 自动打包	2021-08-26 13:53:37 +08:00
shanmite	214abd449f	feat: 改变账号异常应对策略	2021-08-26 13:25:18 +08:00
shanmiteandGitHub	79b348d37e	Merge pull request #17 from Adamcrg/main fix: 修改dingtalk签名base64问题	2021-08-26 12:13:17 +08:00
ruigangChen	965734c2f2	修改dingtalk签名base64问题	2021-08-26 11:54:52 +08:00
shanmite	3cc42c0fc5	fix: 获取未读私信接口变化	2021-08-21 18:08:13 +08:00
shanmite	b24c32a877	doc: 图片换源	2021-08-20 14:38:14 +08:00
shanmite	ef822df5bf	fix: 两处潜在问题 - 存储专栏获取结果 - 专栏获取为null	2021-08-17 18:43:59 +08:00
shanmite	9842107f52	fix: (#14 )	2021-08-16 13:00:12 +08:00
shanmite	89dea18ae3	feat: 账号异常时切换线路	2021-08-16 12:51:21 +08:00
shanmite	a426eb48f5	fix: 账号异常处理	2021-08-14 20:14:35 +08:00
shanmite	c06f69457a	pref: 时区+8(#13 )	2021-08-14 13:24:54 +08:00
shanmite	155332751f	fix: 解构赋初值异常	2021-08-14 13:02:46 +08:00
shanmite	a28ec20b12	feat: 检查更新 fix: tag在中间的情况	2021-08-13 12:32:54 +08:00
shanmite	35cb1c24c2	fix: lib/main[48:9]	2021-08-09 14:52:41 +08:00
shanmite	4f961250be	feat: 不参与主站黑名单用户抽奖	2021-08-09 13:48:44 +08:00
shanmite	dce1ff61fd	fix: 可从环境变量中读取COOKIE	2021-08-09 11:32:45 +08:00
shanmite	ab6bc97f50	chore: 部分修改	2021-08-09 10:49:33 +08:00
shanmite	da8903944a	doc: 更新readme	2021-08-08 11:46:39 +08:00
shanmite	08f4375c21	feat: 中奖通知设置可设黑名单	2021-08-08 10:34:14 +08:00
shanmite	ec0c5da092	fix: this丢失	2021-08-07 16:01:54 +08:00
shanmite	7d3273611f	refactor: 模块结构调整	2021-08-07 15:32:39 +08:00
shanmite	673b3883a8	fix: 优化截取tag的逻辑	2021-08-06 22:03:31 +08:00
shanmiteandGitHub	f157761f5c	Merge pull request #10 from andywang425/main chore: 更新issue_template	2021-08-04 16:30:45 +08:00
andywang425	c57d21d4cd	chore: 更新issue_template	2021-08-04 15:58:48 +08:00
shanmite	26ae391eee	fix: 私信检测(#9 )	2021-08-04 13:41:00 +08:00
shanmite	a1b055b9de	chore: 更新issue_template	2021-07-31 10:59:52 +08:00
shanmite	d2d9d31ebf	fix: 点赞失败(#7 ) feat: 新增设置	2021-07-30 17:24:51 +08:00
shanmite	fdee933ca4	pref: 对将要转发的动态洗牌乱序防止被看出是抽奖号	2021-07-29 22:38:32 +08:00
shanmite	53ae976caf	fix: 多账号出错回传错误	2021-07-29 20:18:00 +08:00
shanmite	de88467c03	fix: 专栏验重	2021-07-29 13:47:11 +08:00