mirror of
https://github.com/shanmiteko/LotteryAutoScript.git
synced 2026-07-22 21:13:47 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
77245c0391 | ||
|
|
c0dbdee343 | ||
|
|
a0a2502148 |
@@ -31,4 +31,4 @@ jobs:
|
||||
with:
|
||||
push: true
|
||||
tags: ${{ secrets.DOCKERHUB_REPO }}
|
||||
platforms: "linux/amd64,linux/arm64"
|
||||
platforms: "linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x"
|
||||
|
||||
@@ -26,8 +26,8 @@ jobs:
|
||||
nodev: 18
|
||||
- platform: win
|
||||
nodev: 18
|
||||
# - platform: win
|
||||
# nodev: 12
|
||||
- platform: win
|
||||
nodev: 12
|
||||
steps:
|
||||
- name: "Checkout codes"
|
||||
uses: actions/checkout@v3
|
||||
|
||||
@@ -3,7 +3,6 @@ node_modules/
|
||||
tests/
|
||||
dyids/
|
||||
lottery_info/
|
||||
lottery_dyids/
|
||||
dist/
|
||||
.env
|
||||
*.log
|
||||
|
||||
@@ -1,93 +1,5 @@
|
||||
<!-- markdownlint-disable MD036 MD024-->
|
||||
# CHANGELOG
|
||||
## 主要变化(2.8.12)
|
||||
* 5d30178 ci: docker构建
|
||||
* 0c61070 fix: 评论并转发 (#259)
|
||||
* 6dfee7e fix: 出现帐号未登录错误时自动跳转下一个帐号
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.11)
|
||||
* 6496a8f fix: fs.close
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.10)
|
||||
* e32c3c9 fix: 已经关注用户未转发
|
||||
* 3bd77b3 fix: fs.close
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.9)
|
||||
* 588feba docs: update readme
|
||||
* 5d5858f fix: 无法已读未关注未读私信
|
||||
* 1526519 docs: 添加gotify推送说明
|
||||
* 69c297e feat: 添加Gotify推送
|
||||
* 2017705 feat: autoAttention API增加对重复关注的处理
|
||||
* 16c113f docs: update readme
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.8)
|
||||
* 54af844 fix: 专栏无法获取
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.7)
|
||||
* 62768dd fix: 修改win脚本
|
||||
* 101df0a fix: login等待时间过长
|
||||
* f8829b5 fix: 清理动态检索动态延时
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.6)
|
||||
* 83e19d4 docs: 扫码登陆使用说明
|
||||
* c238c27 fix:多账号login添加时延进行间隔
|
||||
* 8addc90 fix:登录跳过执行正常状态的账号
|
||||
* 288851b feat: 扫码登录获取移动端的CK更新账号,带sid可减小掉号频率
|
||||
* ddcfcee fix: 移除公共黑名单设置
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.5)
|
||||
* 0024b19 feat: 移除远程设置启用自动更新
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.4)
|
||||
* 9ab605a feat: 新增本地dyids抽奖新信息获取方式 (#311)(#287)
|
||||
* a83c5ab fix: extend_json undefined
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.3)
|
||||
* 2f2eaab fix: 预约抽奖包月抽奖识别异常 (#288)
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.2)
|
||||
* 3825be4 feat: 查看帐号信息
|
||||
* 248c78d feat: 快速移除关注模式新增粉丝数限制 (#305)
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.1)
|
||||
* d44981b fix: 随机cookie参数buvid3
|
||||
* 3bfc93f fix: 目前回复无法正常推送 (#302)
|
||||
* ef8366b fix: tg推送代理设置出错 (#298)
|
||||
* a7e31b4 docs: update
|
||||
* f4f45c5 fix: cookie参数buvid3错误导致专栏获取滞后
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.8.0)
|
||||
* 2f935bb chore: update env.js
|
||||
* eec22ff feat: 验证码自动识别
|
||||
* 909fb83 chore: update qinglong script
|
||||
* 41b0369 ci: fix pkg.yml
|
||||
|
||||
_如果之前版本小于上一版本,请查看[CHANGELOG](https://github.com/shanmiteko/LotteryAutoScript/blob/main/CHANGELOG.md)变更说明_
|
||||
|
||||
## 主要变化(2.7.11)
|
||||
* 5a3c16d fix: 专栏获取内容不正确,需要排除推荐内容 (#293)
|
||||
|
||||
|
||||
@@ -3,19 +3,16 @@
|
||||
- [AutoScript](#autoscript)
|
||||
- [操作步骤](#操作步骤)
|
||||
- [获取COOKIE](#获取cookie)
|
||||
- [扫码登陆](#扫码登陆)
|
||||
- [手动获取](#手动获取)
|
||||
- [本地运行](#本地运行)
|
||||
- [可执行文件](#可执行文件)
|
||||
- [以源码方式运行](#以源码方式运行)
|
||||
- [Docker](#docker)
|
||||
- [青龙面板](#青龙面板)
|
||||
- [防重复转发(可选)](#防重复转发可选)
|
||||
- [检测中奖](#检测中奖)
|
||||
- [检测未读信息, 已读未读信息](#检测未读信息-已读未读信息)
|
||||
- [中奖推送](#中奖推送)
|
||||
- [中奖推送(可选)](#中奖推送可选)
|
||||
- [设置说明](#设置说明)
|
||||
- [评论验证码识别](#评论验证码识别)
|
||||
- [其他](#其他)
|
||||
- [Awesome](#awesome)
|
||||
|
||||
[Github仓库链接](https://github.com/shanmiteko/LotteryAutoScript)
|
||||
@@ -56,14 +53,6 @@
|
||||
|
||||
### 获取COOKIE
|
||||
|
||||
#### 扫码登陆
|
||||
|
||||
在`env.js`文件填`COOKIE`的对应位置写入`"DedeUserID=你的UID"`即可使用`lottery login`扫码自动获取Cookie
|
||||
|
||||
`COOKIE`中包含`DedeUserID=你的UID`的都会被自动替换
|
||||
|
||||
#### 手动获取
|
||||
|
||||
进入[B站主页](https://www.bilibili.com/)获取Cookie用于登录
|
||||
|
||||
Chrome浏览器:
|
||||
@@ -84,7 +73,7 @@ Chrome浏览器:
|
||||
.cookie
|
||||
.split(/\s*;\s*/)
|
||||
.map(it => it.split('='))
|
||||
.filter(it => ['DedeUserID','bili_jct', 'SESSDATA', 'buvid3'].indexOf(it[0]) > -1)
|
||||
.filter(it => ['DedeUserID','bili_jct', 'SESSDATA'].indexOf(it[0]) > -1)
|
||||
.map(it => it.join('='))
|
||||
.join('; ')
|
||||
.split()
|
||||
@@ -93,9 +82,7 @@ Chrome浏览器:
|
||||
|
||||
也可以采用**其他方式获取**所需的Cookie
|
||||
|
||||
只需含有 `DedeUserID=...;SESSDATA=...;bili_jct=...;buvid3=...` 即可
|
||||
|
||||
buvid3亦可不填 使用随机生成值
|
||||
只需含有 `DedeUserID=...;SESSDATA=...;bili_jct=...` 三项即可
|
||||
|
||||
(分号分割, 不要换行, 顺序随意)
|
||||
|
||||
@@ -122,22 +109,23 @@ buvid3亦可不填 使用随机生成值
|
||||
4. 在`my_config.js`中自定义设置
|
||||
5. 在当前目录下**打开终端**运行可执行文件`lottery`(勿直接点击`lottery`)
|
||||
- windows 可直接点击对应的`*.bat`文件
|
||||
|
||||
```
|
||||
用法: lottery [OPTIONS]
|
||||
|
||||
OPTIONS:
|
||||
start 启动抽奖
|
||||
check 中奖检查
|
||||
acount 查看帐号信息
|
||||
clear 清理动态和关注
|
||||
update 检查更新
|
||||
login 扫码登录更新CK
|
||||
help 帮助信息
|
||||
- unix-like
|
||||
```sh
|
||||
## 进入脚本所在目录
|
||||
## 授予执行权限
|
||||
$ chmod u+x lottery
|
||||
## 启动脚本
|
||||
$ ./lottery start
|
||||
## 检测中奖
|
||||
$ ./lottery check
|
||||
## 清理关注动态
|
||||
$ ./lottery clear
|
||||
## 下载最新版本
|
||||
$ ./lottery update
|
||||
```
|
||||
|
||||
1. 运行截图
|
||||

|
||||
7. 运行截图
|
||||

|
||||
|
||||
#### 以源码方式运行
|
||||
|
||||
@@ -157,6 +145,14 @@ buvid3亦可不填 使用随机生成值
|
||||
|
||||
----------------------------------------
|
||||
|
||||
## 防重复转发(可选)
|
||||
|
||||
- 脚本将转发过的动态和被过滤的动态都写入`dyids/dyid*.txt`文件中
|
||||
|
||||
- 是否点赞
|
||||
|
||||
----------------------------------------
|
||||
|
||||
## 检测中奖
|
||||
|
||||
### 检测未读信息, 已读未读信息
|
||||
@@ -169,7 +165,7 @@ buvid3亦可不填 使用随机生成值
|
||||
|
||||
关键词有限 可能会有**漏掉**的或**误报**
|
||||
|
||||
### 中奖推送
|
||||
### 中奖推送(可选)
|
||||
|
||||
> 填写在env.js内
|
||||
|
||||
@@ -203,19 +199,11 @@ buvid3亦可不填 使用随机生成值
|
||||
| `SMTP_USER` | 电子邮件 | 发送方的电子邮件 如: `xxxxxxxxx@qq.com` |
|
||||
| `SMTP_PASS` | 电子邮件 | smtp服务对应的授权码 |
|
||||
| `SMTP_TO_USER` | 电子邮件 | 接收方电子邮件 |
|
||||
| `GOTIFY_URL` | gotify推送 | gotify消息推送地址(例如 http://localhost:8008/message),[官方文档](https://gotify.net/docs/) |
|
||||
| `GOTIFY_APPKEY` | gotify推送 | 一个gotify application的token,[官方文档](https://gotify.net/docs/) |
|
||||
|
||||
----------------------------------------
|
||||
|
||||
## 设置说明
|
||||
|
||||
### 评论验证码识别
|
||||
|
||||
[点击跳转](doc/chat_captcha_orc.md)
|
||||
|
||||
### 其他
|
||||
|
||||
详见[env.example.js](./env.example.js)文件内部注释
|
||||
|
||||
详见[my_config.example.js](./my_config.example.js)文件内部注释
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
使用此功能前需启动OCR服务
|
||||
|
||||
## 拉取镜像
|
||||
```
|
||||
docker pull shanmite/ocr_api_server
|
||||
```
|
||||
## 启动容器
|
||||
```
|
||||
docker run -p 9898:9898 -d ocr_api_server
|
||||
```
|
||||
|
||||
### 非docker启动方式
|
||||
|
||||

|
||||
|
||||
[ocr_api_server](https://github.com/shanmiteko/ocr_api_server)
|
||||
|
||||

|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 328 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 292 KiB |
@@ -1,7 +1,7 @@
|
||||
1.初始化
|
||||
|
||||
```bash
|
||||
curl -fsSL https://ghproxy.com/https://raw.githubusercontent.com/shanmiteko/LotteryAutoScript/main/script/docker/init.sh | sudo bash
|
||||
curl -fsSL https://cdn.staticaly.com/gh/shanmiteko/LotteryAutoScript/main/script/docker/init.sh | sudo sh
|
||||
```
|
||||
|
||||
进入`lottery`文件夹
|
||||
|
||||
+13
-11
@@ -5,19 +5,20 @@ module.exports = Object.freeze({
|
||||
* - `NOTE` 帐号备注
|
||||
* - `NUMBER` 表示是第几个账号
|
||||
* - `CLEAR` 是否启用清理功能
|
||||
* ## 高级功能
|
||||
* - `ENABLE_CHAT_CAPTCHA_OCR` 开启评论验证码识别 使用方法见README
|
||||
* - `ENABLE_MULTIPLE_ACCOUNT` 是否启用多账号
|
||||
* - `MULTIPLE_ACCOUNT_PARM` 多账号参数(JSON格式) <不推荐使用
|
||||
* - `MULTIPLE_ACCOUNT_PARM` 多账号参数(JSON格式)
|
||||
* ## 代理相关
|
||||
* - `ENABLE_PROXY` 启用代理
|
||||
* - `XMDL_ORDERNNO` 熊猫动态代理订单号
|
||||
* - `XMDL_SECRET` 熊猫动态代理密钥
|
||||
* ## 调试相关
|
||||
* - `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: {
|
||||
@@ -26,9 +27,12 @@ module.exports = Object.freeze({
|
||||
NUMBER: 1,
|
||||
CLEAR: true,
|
||||
|
||||
ENABLE_CHAT_CAPTCHA_OCR: "",
|
||||
ENABLE_MULTIPLE_ACCOUNT: false,
|
||||
|
||||
ENABLE_PROXY: "",
|
||||
XMDL_ORDERNNO: "",
|
||||
XMDL_SECRET: "",
|
||||
|
||||
MULTIPLE_ACCOUNT_PARM: "",
|
||||
LOTTERY_LOG_LEVEL: 3,
|
||||
NOT_GO_LOTTERY: ""
|
||||
@@ -37,7 +41,7 @@ module.exports = Object.freeze({
|
||||
/**
|
||||
* 为防止环境变量过长, 请将多账号填在此处
|
||||
* 以 **大括号内容** 为模板依次复制(包含大括号),逗号分割
|
||||
*
|
||||
*
|
||||
* ```txt
|
||||
* [
|
||||
* {
|
||||
@@ -92,8 +96,6 @@ module.exports = Object.freeze({
|
||||
SMTP_PORT: "",
|
||||
SMTP_USER: "",
|
||||
SMTP_PASS: "",
|
||||
SMTP_TO_USER: "",
|
||||
GOTIFY_URL: "",
|
||||
GOTIFY_APPKEY: ""
|
||||
SMTP_TO_USER: ""
|
||||
}
|
||||
})
|
||||
})
|
||||
@@ -1,15 +0,0 @@
|
||||
const bili = require('./net/bili')
|
||||
const { log } = require('./utils')
|
||||
|
||||
async function account() {
|
||||
const my_info = await bili.getMyinfo();
|
||||
const stat = await bili.getStat();
|
||||
if (my_info && stat) {
|
||||
log.info("帐号信息", `${my_info.name} Lv${my_info.level} ${my_info.silence ? "已封禁" : "未封禁"} 升级还需${my_info.level_exp.next_exp - my_info.level_exp.current_exp}经验`)
|
||||
log.info("帐号信息", `当前关注数:${stat.following} 粉丝数:${stat.follower} 动态数量:${stat.dynamic_count}`)
|
||||
} else {
|
||||
log.error("帐号信息", "获取失败");
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { account }
|
||||
+2
-1
@@ -84,11 +84,12 @@ async function isMe(num) {
|
||||
}
|
||||
if (follow_unread) {
|
||||
log.info('中奖检测', '<-- 正在检查已关注者的私信')
|
||||
await check(1)
|
||||
}
|
||||
if (unfollow_unread) {
|
||||
log.info('中奖检测', '<-- 正在检查未关注者的私信')
|
||||
await check(2)
|
||||
}
|
||||
await check("1")
|
||||
log.info('中奖检测', '--> OK');
|
||||
}
|
||||
if (desp) {
|
||||
|
||||
+8
-15
@@ -33,7 +33,7 @@ async function getFollowList(partition) {
|
||||
* 清理动态和关注
|
||||
*/
|
||||
async function clear() {
|
||||
const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_quick_remove_attention_fans_number_smallest, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type, clear_partition } = config;
|
||||
const { search_wait, clear_white_list, clear_max_day, clear_quick_remove_attention, clear_remove_dynamic, clear_remove_attention, clear_remove_delay, clear_dynamic_type, clear_partition } = config;
|
||||
let success = true;
|
||||
const uid_list = (await Promise.all(clear_partition.split(',').map(getFollowList))).flat();
|
||||
if (!uid_list.length) {
|
||||
@@ -45,17 +45,13 @@ async function clear() {
|
||||
log.info('清理关注', '进入只清理关注模式')
|
||||
/* 专清关注 */
|
||||
for (const [index, uid] of uid_list.entries()) {
|
||||
const fannumber = await bili.getUserInfo(uid);
|
||||
log.info('清理关注', `粉丝数${fannumber}`)
|
||||
if (fannumber !== -1 && fannumber < clear_quick_remove_attention_fans_number_smallest) {
|
||||
log.info('清理关注', `(${index}) (${uid})`)
|
||||
/* 取消关注 */
|
||||
if (await retryfn(3, [false], () => bili.cancelAttention(uid))) {
|
||||
log.info('清理关注', '成功')
|
||||
} else {
|
||||
log.error('清理关注', '失败')
|
||||
break
|
||||
}
|
||||
log.info('清理关注', `(${index}) (${uid})`)
|
||||
/* 取消关注 */
|
||||
if (await retryfn(3, [false], () => bili.cancelAttention(uid))) {
|
||||
log.info('清理关注', '成功')
|
||||
} else {
|
||||
log.error('清理关注', '失败')
|
||||
break
|
||||
}
|
||||
/* 延时 */
|
||||
await delay(clear_remove_delay);
|
||||
@@ -108,7 +104,6 @@ async function clear() {
|
||||
log.error("清理失败", "出现错误")
|
||||
break
|
||||
}
|
||||
|
||||
/* 延时 */
|
||||
await delay(clear_remove_delay);
|
||||
} else {
|
||||
@@ -125,8 +120,6 @@ async function clear() {
|
||||
log.info('清理动态', `此动态类型为${type} != 要清理的动态类型${clear_dynamic_type}`)
|
||||
}
|
||||
}
|
||||
/* 延时 */
|
||||
await delay(clear_remove_delay);
|
||||
log.info('清理动态', `第${page + 1}页(${allModifyDynamicResArray.length})中的转发动态与关注全部处理成功`)
|
||||
if (next_offset === '0' || !success) break;
|
||||
}
|
||||
|
||||
+25
-21
@@ -26,8 +26,7 @@ class Monitor extends Searcher {
|
||||
['UIDs', this.getLotteryInfoByUID.bind(this)],
|
||||
['TAGs', this.getLotteryInfoByTag.bind(this)],
|
||||
['Articles', this.getLotteryInfoByArticle.bind(this)],
|
||||
['APIs', this.getLotteryInfoByAPI.bind(this)],
|
||||
['TxT', this.getLotteryInfoByTxT.bind(this)]
|
||||
['APIs', this.getLotteryInfoByAPI.bind(this)]
|
||||
]);
|
||||
}
|
||||
/**
|
||||
@@ -56,9 +55,6 @@ class Monitor extends Searcher {
|
||||
case 1001:
|
||||
event_bus.emit('Turn_off_the_Monitor', '评论失败')
|
||||
break;
|
||||
case 1010:
|
||||
event_bus.emit('Turn_off_the_Monitor', '已掉号')
|
||||
break;
|
||||
case 1004:
|
||||
event_bus.emit('Turn_off_the_Monitor', '需要输入验证码')
|
||||
break
|
||||
@@ -66,7 +62,7 @@ class Monitor extends Searcher {
|
||||
event_bus.emit('Turn_off_the_Monitor', '关注出错')
|
||||
break;
|
||||
case 3001:
|
||||
event_bus.emit('Turn_off_the_Monitor', '分区移动出错 可于设置处关闭移动分区')
|
||||
event_bus.emit('Turn_off_the_Monitor', '分区移动出错')
|
||||
break;
|
||||
case 2004:
|
||||
case 4005:
|
||||
@@ -197,6 +193,7 @@ class Monitor extends Searcher {
|
||||
case 1007:
|
||||
case 1008:
|
||||
case 1009:
|
||||
case 1010:
|
||||
case 1011:
|
||||
case 2002:
|
||||
case 2003:
|
||||
@@ -219,7 +216,6 @@ class Monitor extends Searcher {
|
||||
is_outof_maxfollow = 2005
|
||||
break;
|
||||
case 1001:
|
||||
case 1010:
|
||||
case 1004:
|
||||
case 2001:
|
||||
case 3001:
|
||||
@@ -284,6 +280,7 @@ class Monitor extends Searcher {
|
||||
model, chatmodel, chat: chats, relay: relays,
|
||||
block_dynamic_type, max_create_time, is_imitator,
|
||||
only_followed, at_users, blockword, blacklist,
|
||||
use_public_blacklist
|
||||
} = config,
|
||||
now_ts = Date.now() / 1000;
|
||||
|
||||
@@ -401,12 +398,25 @@ class Monitor extends Searcher {
|
||||
isSendChat =
|
||||
(hasOfficialLottery && chatmodel[0] === '1')
|
||||
|| (!hasOfficialLottery && chatmodel[1] === '1'),
|
||||
{ blacklist: remote_blacklist } = use_public_blacklist === false
|
||||
? { blacklist: "" }
|
||||
: global_var.get("remoteconfig"),
|
||||
/**
|
||||
* 获取黑名单并去重合并
|
||||
* @type {string[]}
|
||||
*/
|
||||
new_blacklist = remote_blacklist
|
||||
? [
|
||||
...new Set([...blacklist.split(','),
|
||||
...remote_blacklist.split(',')])
|
||||
]
|
||||
: blacklist.split(','),
|
||||
keys = [dyid, m_uid, ori_uid];
|
||||
|
||||
log.debug("筛选动态", { real_uid, mIsFollowed, oriIsFollowed, realIsFollowed, needAt, needTopic, type, isRelayDynamic, key_words, has_key_words, blockword, isBlock, isLottery, isSendChat })
|
||||
|
||||
if (
|
||||
blacklist.split(',').some(id => keys.some(key => {
|
||||
new_blacklist.some(id => keys.some(key => {
|
||||
if (key + '' === id) {
|
||||
log.info("筛选动态", `黑名单匹配(${id})(https://t.bilibili.com/${dyid})`)
|
||||
return true
|
||||
@@ -461,6 +471,7 @@ class Monitor extends Searcher {
|
||||
}
|
||||
|
||||
if (isLottery) {
|
||||
const { uname_map = {} } = global_var.get("remoteconfig")
|
||||
let onelotteryinfo = {};
|
||||
|
||||
onelotteryinfo.isOfficialLottery = hasOfficialLottery;
|
||||
@@ -477,7 +488,7 @@ class Monitor extends Searcher {
|
||||
let
|
||||
/**转发评语 */
|
||||
RandomStr = (getRandomOne(relays) || "!!!")
|
||||
.replace(/\$\{uname\}/g, uname),
|
||||
.replace(/\$\{uname\}/g, uname_map[real_uid] || uname),
|
||||
/**控制字段 */
|
||||
new_ctrl = [];
|
||||
|
||||
@@ -530,7 +541,7 @@ class Monitor extends Searcher {
|
||||
if (isSendChat) {
|
||||
onelotteryinfo.rid = rid
|
||||
onelotteryinfo.chat = (getRandomOne(chats) || "!!!")
|
||||
.replace(/\$\{uname\}/g, uname)
|
||||
.replace(/\$\{uname\}/g, uname_map[real_uid] || uname)
|
||||
}
|
||||
|
||||
alllotteryinfo.push(onelotteryinfo);
|
||||
@@ -601,16 +612,16 @@ class Monitor extends Searcher {
|
||||
status = await retryfn(
|
||||
6,
|
||||
[4],
|
||||
() => bili.sendChatWithOcr(
|
||||
() => bili.sendChat(
|
||||
rid,
|
||||
chat,
|
||||
is_repost_then_chat ? relay_chat.split('//')[0] : chat,
|
||||
chat_type
|
||||
)
|
||||
)
|
||||
|
||||
if (status === 8 ||
|
||||
status === 9) {
|
||||
status = await bili.sendChatWithOcr(
|
||||
status = await bili.sendChat(
|
||||
rid,
|
||||
"[doge][doge][doge][doge][doge]",
|
||||
chat_type
|
||||
@@ -627,10 +638,6 @@ class Monitor extends Searcher {
|
||||
if (uid.length) {
|
||||
await try_for_each(uid, async (u) => {
|
||||
status = await bili.autoAttention(u)
|
||||
if (status === 6) {
|
||||
status = 0;
|
||||
return false
|
||||
}
|
||||
if (status) {
|
||||
log.warn("抽奖信息", `dyid: ${dyid}, uid: ${u}`)
|
||||
return true
|
||||
@@ -671,10 +678,7 @@ class Monitor extends Searcher {
|
||||
status = await retryfn(
|
||||
5,
|
||||
[3, 4],
|
||||
() => bili.autoRelay(
|
||||
global_var.get("myUID"), dyid,
|
||||
is_repost_then_chat ? chat + relay_chat : relay_chat
|
||||
, ctrl)
|
||||
() => bili.autoRelay(global_var.get("myUID"), dyid, relay_chat, ctrl)
|
||||
)
|
||||
|
||||
if (status) {
|
||||
|
||||
+4
-86
@@ -62,7 +62,7 @@ function parseDynamicCard(dynamic_detail_card) {
|
||||
const { strToJson } = utils;
|
||||
/**临时储存单个动态中的信息 */
|
||||
let obj = {};
|
||||
const { desc, card, extension, extend_json = "{}", display = {} } = dynamic_detail_card
|
||||
const { desc, card, extension, extend_json, display = {} } = dynamic_detail_card
|
||||
, { is_liked = 1, user_profile = {} } = desc
|
||||
, { info = {} } = user_profile
|
||||
, cardToJson = strToJson(card)
|
||||
@@ -103,15 +103,7 @@ function parseDynamicCard(dynamic_detail_card) {
|
||||
obj.reserve_lottery_text = text;
|
||||
}
|
||||
}
|
||||
if (extendjsonToJson[""]) {
|
||||
let r = extendjsonToJson[""].reserve || {};
|
||||
let { reserve_id, reserve_lottery } = r;
|
||||
if (reserve_lottery === 1) {
|
||||
obj.reserve_id = reserve_id + "";
|
||||
obj.reserve_lottery_text = "信息丢失";
|
||||
}
|
||||
}
|
||||
if (extend_json.match(/"":\{"lottery/)) {
|
||||
if (JSON.stringify(add_on_card_info).match(/充电专属抽奖/)) {
|
||||
obj.is_charge_lottery = true
|
||||
}
|
||||
/* 是否有官方抽奖 */
|
||||
@@ -127,10 +119,9 @@ function parseDynamicCard(dynamic_detail_card) {
|
||||
|| '';
|
||||
/* 转发 */
|
||||
if (obj.type === 1) {
|
||||
const { origin_extension, origin, origin_extend_json = "{}" } = cardToJson
|
||||
const { origin_extension, origin } = cardToJson
|
||||
, originToJson = strToJson(origin)
|
||||
, { add_on_card_info = [] } = display.origin || {}
|
||||
, originExtendjsonToJson = strToJson(origin_extend_json)
|
||||
, { user, item } = originToJson;
|
||||
/* 源动态的ts10 */
|
||||
obj.origin_create_time = desc.origin.timestamp;
|
||||
@@ -159,15 +150,7 @@ function parseDynamicCard(dynamic_detail_card) {
|
||||
obj.origin_reserve_lottery_text = text;
|
||||
}
|
||||
}
|
||||
if (originExtendjsonToJson[""]) {
|
||||
let r = originExtendjsonToJson[""].reserve || {};
|
||||
let { reserve_id, reserve_lottery } = r;
|
||||
if (reserve_lottery === 1) {
|
||||
obj.origin_reserve_id = reserve_id + "";
|
||||
obj.origin_reserve_lottery_text = "信息丢失";
|
||||
}
|
||||
}
|
||||
if (origin_extend_json.match(/"":\{"lottery/)) {
|
||||
if (JSON.stringify(add_on_card_info).match(/充电专属抽奖/)) {
|
||||
obj.origin_is_charge_lottery = true
|
||||
}
|
||||
/* 是否有官方抽奖 */
|
||||
@@ -605,71 +588,6 @@ class Searcher {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 从本地文件中获取抽奖信息
|
||||
* @param {string} txt
|
||||
* @returns {Promise<LotteryInfo[] | null>}
|
||||
*/
|
||||
async getLotteryInfoByTxT(txt) {
|
||||
log.info('获取动态', `开始获取${utils.lottery_dyids}`);
|
||||
const dyids = await utils.getLocalLotteryTxt(txt);
|
||||
let
|
||||
length = dyids.length,
|
||||
dyinfos = [];
|
||||
|
||||
for (const dyid of dyids) {
|
||||
if (typeof dyid === "string"
|
||||
&& dyid.length === utils.dyid_length) {
|
||||
|
||||
log.info('获取动态', `查看Txt中所提及动态(${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 (
|
||||
((!check_if_duplicated || check_if_duplicated >= 2)
|
||||
&& is_liked)
|
||||
|| ((check_if_duplicated >= 1)
|
||||
&& await d_storage.searchDyid(dyid))
|
||||
) {
|
||||
log.info('获取动态', `动态(${dyid})已转发过`)
|
||||
continue
|
||||
}
|
||||
|
||||
dyinfos.push(parsed_card);
|
||||
}
|
||||
} else {
|
||||
log.warn('获取动态', `动态(${dyid})无效 (${length--})`)
|
||||
}
|
||||
}
|
||||
const fomatdata = dyinfos.map(o => {
|
||||
return {
|
||||
lottery_info_type: 'txt',
|
||||
create_time: o.create_time,
|
||||
is_liked: o.is_liked,
|
||||
uids: [o.uid, o.origin_uid],
|
||||
uname: o.uname,
|
||||
ctrl: o.ctrl,
|
||||
dyid: o.dynamic_id,
|
||||
reserve_id: o.reserve_id,
|
||||
reserve_lottery_text: o.reserve_lottery_text,
|
||||
is_charge_lottery: o.is_charge_lottery,
|
||||
rid: o.rid_str,
|
||||
chat_type: o.chat_type,
|
||||
des: o.description,
|
||||
type: o.type,
|
||||
hasOfficialLottery: o.hasOfficialLottery
|
||||
};
|
||||
})
|
||||
log.info('获取动态', `成功获取txt信息`);
|
||||
|
||||
return fomatdata
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { Searcher, parseDynamicCard };
|
||||
|
||||
+7
-15
@@ -47,19 +47,12 @@ const config = {
|
||||
*/
|
||||
APIs: [],
|
||||
|
||||
/**
|
||||
* lottery_dyids目录下抽奖动态文件名(如dyids.txt)
|
||||
* 一行一个dyids
|
||||
*/
|
||||
TxT: [],
|
||||
|
||||
/**
|
||||
* 抽奖参与顺序组合
|
||||
* * 0 - UIDs
|
||||
* * 1 - TAGs
|
||||
* * 2 - Articles
|
||||
* * 3 - APIs
|
||||
* * 4 - TxT
|
||||
* @example
|
||||
* [3,2,1,0]
|
||||
* [1,2,1,2,1]
|
||||
@@ -305,6 +298,12 @@ const config = {
|
||||
*/
|
||||
blacklist: '',
|
||||
|
||||
/**
|
||||
* - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
|
||||
* - 使用公共黑名单
|
||||
*/
|
||||
use_public_blacklist: true,
|
||||
|
||||
/**
|
||||
* 屏蔽词
|
||||
*/
|
||||
@@ -409,13 +408,6 @@ const config = {
|
||||
*/
|
||||
clear_quick_remove_attention: false,
|
||||
|
||||
/**
|
||||
* - 快速移除关注
|
||||
* - 不加判断只去除关注
|
||||
* - 移除粉丝数小于指定数量的
|
||||
*/
|
||||
clear_quick_remove_attention_fans_number_smallest: Infinity,
|
||||
|
||||
/**
|
||||
* 是否移除动态
|
||||
*/
|
||||
@@ -427,7 +419,7 @@ const config = {
|
||||
clear_remove_attention: true,
|
||||
|
||||
/**
|
||||
* 清除延时(毫秒)
|
||||
* 清除动态延时(毫秒)
|
||||
*/
|
||||
clear_remove_delay: 8000,
|
||||
|
||||
|
||||
+5
-21
@@ -1,4 +1,4 @@
|
||||
const { getRandomOne, createDir, createFile, dyids_dir } = require("../utils");
|
||||
const { getRemoteConfig, createDir, createFile, dyids_dir } = require("../utils");
|
||||
const config = require("../data/config");
|
||||
|
||||
let global_var = {
|
||||
@@ -25,28 +25,11 @@ let global_var = {
|
||||
[0, "UIDs"],
|
||||
[1, "TAGs"],
|
||||
[2, "Articles"],
|
||||
[3, "APIs"],
|
||||
[4, "TxT"],
|
||||
]);
|
||||
[3, "APIs"]]);
|
||||
|
||||
config.updata(num);
|
||||
|
||||
if (!/buvid3/.test(cookie)) {
|
||||
const charset = "0123456789ABCDEF".split("");
|
||||
const buvid3 = "x".repeat(8).split("").map(() => getRandomOne(charset)).join("")
|
||||
+ "-"
|
||||
+ "x".repeat(4).split("").map(() => getRandomOne(charset)).join("")
|
||||
+ "-"
|
||||
+ "x".repeat(4).split("").map(() => getRandomOne(charset)).join("")
|
||||
+ "-"
|
||||
+ "x".repeat(4).split("").map(() => getRandomOne(charset)).join("")
|
||||
+ "-"
|
||||
+ "x".repeat(17).split("").map(() => getRandomOne(charset)).join("")
|
||||
+ "infoc";
|
||||
this.set('cookie', cookie + ";" + buvid3);
|
||||
} else {
|
||||
this.set('cookie', cookie);
|
||||
}
|
||||
this.set('cookie', cookie + ';buvid3=AAAAAAAA-BBBB-CCCC-DDDD-DDDDDDDDDDDDDDDDDinfoc');
|
||||
|
||||
cookie.split(/\s*;\s*/).forEach(item => {
|
||||
const _item = item.split('=');
|
||||
@@ -62,6 +45,7 @@ let global_var = {
|
||||
.map(lottery_option => config[lottery_option].map(it => [lottery_option, it]))
|
||||
.flat()
|
||||
);
|
||||
this.set('remoteconfig', await getRemoteConfig());
|
||||
}
|
||||
await createDir('dyids');
|
||||
await createFile(dyids_dir, num < 2 ? 'dyid.txt' : `dyid${num}.txt`, '', 'a')
|
||||
@@ -69,4 +53,4 @@ let global_var = {
|
||||
};
|
||||
|
||||
|
||||
module.exports = global_var;
|
||||
module.exports = global_var;
|
||||
+4
-55
@@ -80,13 +80,6 @@ let SMTP_USER = '';
|
||||
let SMTP_PASS = '';
|
||||
let SMTP_TO_USER = '';
|
||||
|
||||
// ====================================Gotify======================================
|
||||
// 官方文档:https://gotify.net/docs/pushmsg
|
||||
// 此处填你的Gotify消息推送地址(例如:http://localhost/message)
|
||||
let GOTIFY_URL = '';
|
||||
// 此处填你想推送的Application的Token(不包含推送时额外添加的前缀 Bearer )
|
||||
let GOTIFY_APPKEY = '';
|
||||
|
||||
//==========================云端环境变量的判断与接收=========================
|
||||
if (process.env.SCKEY) {
|
||||
SCKEY = process.env.SCKEY;
|
||||
@@ -197,13 +190,6 @@ if (process.env.SMTP_TO_USER) {
|
||||
SMTP_TO_USER = process.env.SMTP_TO_USER;
|
||||
}
|
||||
|
||||
if (process.env.GOTIFY_URL) {
|
||||
GOTIFY_URL = process.env.GOTIFY_URL;
|
||||
if (process.env.GOTIFY_APPKEY) {
|
||||
GOTIFY_APPKEY = process.env.GOTIFY_APPKEY
|
||||
}
|
||||
}
|
||||
|
||||
//==========================云端环境变量的判断与接收=========================
|
||||
|
||||
async function sendNotify(text, desp, params = {}) {
|
||||
@@ -237,9 +223,7 @@ async function sendNotify(text, desp, params = {}) {
|
||||
// Qmsg
|
||||
qmsg(text, desp),
|
||||
//电子邮件
|
||||
email(text, desp),
|
||||
// Gotify
|
||||
gotifyNotify(text, desp)
|
||||
email(text, desp)
|
||||
])
|
||||
}
|
||||
|
||||
@@ -511,8 +495,8 @@ function tgBotNotify(text, desp) {
|
||||
}
|
||||
if (TG_PROXY_HOST && TG_PROXY_PORT) {
|
||||
options.proxy = {
|
||||
url: "http://" + TG_PROXY_HOST + ":" + TG_PROXY_PORT,
|
||||
auth_headers: []
|
||||
hostname: TG_PROXY_HOST,
|
||||
port: TG_PROXY_PORT * 1
|
||||
}
|
||||
}
|
||||
send(options)
|
||||
@@ -836,41 +820,6 @@ function pushPlusNotify(text, desp) {
|
||||
})
|
||||
}
|
||||
|
||||
function gotifyNotify(text, desp) {
|
||||
return new Promise(resolve => {
|
||||
if (GOTIFY_APPKEY) {
|
||||
send({
|
||||
method: 'POST',
|
||||
url: GOTIFY_URL,
|
||||
contents: {
|
||||
title: text,
|
||||
message: desp,
|
||||
},
|
||||
config: {
|
||||
retry: false
|
||||
},
|
||||
headers: {
|
||||
accept: 'application/json, text/plain, */*',
|
||||
'content-type': 'application/json',
|
||||
'authorization': 'Bearer ' + GOTIFY_APPKEY
|
||||
},
|
||||
success: () => {
|
||||
// HTTP 响应码 200 就说明成功了
|
||||
log.info('发送通知', 'Gotify 发送通知消息成功')
|
||||
resolve();
|
||||
},
|
||||
failure: err => {
|
||||
log.error('发送通知', 'Gotify 发送通知调用API失败!!' + err)
|
||||
resolve();
|
||||
}
|
||||
})
|
||||
} else {
|
||||
log.debug('发送通知', '您未提供Gotify推送所需的GOTIFY_APPKEY,取消Gotify推送消息通知');
|
||||
resolve()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
async function qmsg(text, desp) {
|
||||
return new Promise(resolve => {
|
||||
if (QMSG_KEY) {
|
||||
@@ -940,4 +889,4 @@ async function email(text, desp) {
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { sendNotify }
|
||||
module.exports = { sendNotify }
|
||||
@@ -0,0 +1,26 @@
|
||||
const { log } = require('../utils');
|
||||
const crypto = require('crypto');
|
||||
|
||||
/**
|
||||
* [熊猫代理](http://www.xiongmaodaili.com)
|
||||
* @returns {import("../net/http").ProxyConfig}
|
||||
*/
|
||||
function xiongmaodaili() {
|
||||
log.info("熊猫代理", "开始")
|
||||
let timestamp = parseInt(new Date().getTime() / 1000);
|
||||
let orderno = process.env["XMDL_ORDERNNO"];
|
||||
let secret = process.env["XMDL_SECRET"];
|
||||
|
||||
let txt = 'orderno=' + orderno + ',secret=' + secret + ',timestamp=' + timestamp;
|
||||
let md5 = crypto.createHash('md5');
|
||||
let sign = md5.update(txt).digest('hex').toUpperCase();
|
||||
|
||||
return {
|
||||
url: "http://dtan.xiongmaodaili.com:8088",
|
||||
auth_headers: [
|
||||
["Proxy-Authorization", 'sign=' + sign + '&orderno=' + orderno + "×tamp=" + timestamp]
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = { xiongmaodaili }
|
||||
+1
-3
@@ -1,8 +1,6 @@
|
||||
const { login } = require('./login');
|
||||
const { isMe } = require('./check');
|
||||
const { clear } = require('./clear');
|
||||
const { start } = require('./lottery');
|
||||
const { account } = require("./account");
|
||||
const global_var = require('./data/global_var')
|
||||
const bili = require('./net/bili')
|
||||
const { log } = require('./utils')
|
||||
@@ -25,4 +23,4 @@ async function checkCookie(num) {
|
||||
}
|
||||
|
||||
|
||||
module.exports = { login, start, isMe, clear, checkCookie, account }
|
||||
module.exports = { start, isMe, clear, checkCookie }
|
||||
@@ -1,58 +0,0 @@
|
||||
const { readFileSync, writeFileSync } = require('fs');
|
||||
const { log, env_file } = require("./utils");
|
||||
|
||||
/**
|
||||
* 扫码登陆
|
||||
* @param {string} num
|
||||
*/
|
||||
async function login(num) {
|
||||
try {
|
||||
const { pcLogin } = require('@catlair/blogin');
|
||||
const loginInfo = await pcLogin();
|
||||
if (!loginInfo) {
|
||||
log.error("扫码登陆", "失败/取消");
|
||||
return;
|
||||
}
|
||||
log.info("扫码登陆", "登录成功");
|
||||
JSON.stringify(loginInfo, null, 2);
|
||||
const uid = `${loginInfo.mid}`;
|
||||
const cookie = `${loginInfo.cookie}`;
|
||||
log.info("账号UID", uid);
|
||||
log.info("Cookie", cookie);
|
||||
if (replaceCookie(env_file, uid, cookie)) {
|
||||
log.info("扫码登陆", `账号${num}已进行cookie自动更新,如未能生效请手动复制在env.js内替换。路径:${env_file}`);
|
||||
}
|
||||
} catch (error) {
|
||||
log.error(error);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 正则检索uid更新cookie
|
||||
* @param {string} filePath
|
||||
* @param {string} uid
|
||||
* @param {string} oldCK
|
||||
*/
|
||||
function replaceCookie(filePath, uid, oldCK) {
|
||||
try {
|
||||
const content = readFileSync(filePath, 'utf-8');
|
||||
const DedeUserID = `DedeUserID=${uid}`;
|
||||
const reg = new RegExp(`['"]?COOKIE['"]?:\\s?['"](.*${DedeUserID}.*)['"]`, 'g');
|
||||
const newCK = content.replaceAll(reg, substring => {
|
||||
let quote = substring.at(0) || '';
|
||||
/['"]/.test(quote) || (quote = '');
|
||||
const quote2 = oldCK.includes("'")
|
||||
? '"'
|
||||
: substring.match(/^['"]?COOKIE['"]?:\s?(['"])/)?.[1] || '"';
|
||||
return `${quote}COOKIE${quote}: ${quote2}${oldCK}${quote2}`;
|
||||
});
|
||||
if (content === newCK) return false;
|
||||
writeFileSync(filePath, newCK);
|
||||
return true;
|
||||
} catch (error) {
|
||||
log.error("扫码登陆", error);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
module.exports = { login }
|
||||
+1
-2
@@ -20,7 +20,7 @@ module.exports = Object.freeze({
|
||||
MSGFEED_AT: 'https://api.bilibili.com/x/msgfeed/at',
|
||||
MSGFEED_REPLAY: 'https://api.bilibili.com/x/msgfeed/reply',
|
||||
MSGFEED_UNREAD: 'https://api.bilibili.com/x/msgfeed/unread',
|
||||
READ_CV: 'https://www.bilibili.com/read/cv{{cv}}/',
|
||||
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',
|
||||
@@ -41,6 +41,5 @@ module.exports = Object.freeze({
|
||||
TOPIC_SVR_TOPIC_NEW: 'https://api.vc.bilibili.com/topic_svr/v1/topic_svr/topic_new',
|
||||
V2_REPLAY: "https://api.bilibili.com/x/v2/reply",
|
||||
WEB_INTERFACE_CARD: 'https://api.bilibili.com/x/web-interface/card',
|
||||
WEB_INTERFACE_NAV_STAT: "https://api.bilibili.com/x/web-interface/nav/stat",
|
||||
WEB_INTERFACE_SEARCH_TYPE: 'https://api.bilibili.com/x/web-interface/search/type',
|
||||
})
|
||||
+46
-127
@@ -1,7 +1,8 @@
|
||||
const GlobalVar = require('../data/global_var');
|
||||
const { strToJson, log, ocr, hasEnv } = require('../utils');
|
||||
const { strToJson, log, hasEnv } = require('../utils');
|
||||
const { send } = require('./http');
|
||||
const API = require('./api.bili');
|
||||
const proxies = require("../helper/proxies");
|
||||
|
||||
class Line {
|
||||
/**
|
||||
@@ -88,7 +89,7 @@ class Line {
|
||||
*/
|
||||
function get({ url, config, contents, query }) {
|
||||
return new Promise((resolve) => {
|
||||
send({
|
||||
let ro = {
|
||||
url,
|
||||
method: 'GET',
|
||||
config,
|
||||
@@ -100,7 +101,11 @@ function get({ url, config, contents, query }) {
|
||||
contents,
|
||||
success: res => resolve(res.body),
|
||||
failure: err => resolve(err)
|
||||
})
|
||||
}
|
||||
if (hasEnv("ENABLE_PROXY")) {
|
||||
ro.proxy = proxies.xiongmaodaili();
|
||||
}
|
||||
send(ro)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -111,20 +116,24 @@ function get({ url, config, contents, query }) {
|
||||
*/
|
||||
function post({ url, config, contents, query }) {
|
||||
return new Promise((resolve) => {
|
||||
send({
|
||||
let ro = {
|
||||
url,
|
||||
method: 'POST',
|
||||
config,
|
||||
headers: {
|
||||
"accept": 'application/json, text/plain, */*',
|
||||
"content-type": 'application/x-www-form-urlencoded; charset=UTF-8',
|
||||
"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)
|
||||
})
|
||||
};
|
||||
if (hasEnv("ENABLE_PROXY")) {
|
||||
ro.proxy = proxies.xiongmaodaili();
|
||||
}
|
||||
send(ro)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -134,7 +143,7 @@ function post({ url, config, contents, query }) {
|
||||
const bili_client = {
|
||||
/**
|
||||
* 判断是否成功登录
|
||||
* @returns {Promise<Object?>}
|
||||
* @returns {Promise<boolean>}
|
||||
*/
|
||||
async getMyinfo() {
|
||||
const
|
||||
@@ -144,25 +153,9 @@ const bili_client = {
|
||||
res = strToJson(responseText);
|
||||
if (res.code === 0) {
|
||||
GlobalVar.set("myUNAME", res.data.name)
|
||||
return res.data;
|
||||
return true;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 帐号统计
|
||||
* @returns {Promise<Object?>}
|
||||
*/
|
||||
async getStat() {
|
||||
const
|
||||
responseText = await get({
|
||||
url: API.WEB_INTERFACE_NAV_STAT
|
||||
}),
|
||||
res = strToJson(responseText);
|
||||
if (res.code === 0) {
|
||||
return res.data;
|
||||
} else {
|
||||
return null;
|
||||
return false;
|
||||
}
|
||||
},
|
||||
/**
|
||||
@@ -234,9 +227,7 @@ const bili_client = {
|
||||
items = data.items || [];
|
||||
log.info('获取一页回复', `成功(${items.length})`);
|
||||
return items
|
||||
.filter(it => it.item !== undefined
|
||||
&& it.user !== undefined
|
||||
&& it.reply_time !== undefined)
|
||||
.filter(it => it.item.type === 'reply')
|
||||
.map(it => {
|
||||
return {
|
||||
nickname: it.user.nickname,
|
||||
@@ -259,11 +250,11 @@ const bili_client = {
|
||||
* @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>}
|
||||
@@ -397,7 +388,7 @@ const bili_client = {
|
||||
}
|
||||
},
|
||||
/**
|
||||
* @param {string} short_id
|
||||
* @param {string} short_id
|
||||
* @returns {Promise<string>}
|
||||
*/
|
||||
async shortDynamicIdToDyid(short_id) {
|
||||
@@ -737,8 +728,6 @@ const bili_client = {
|
||||
return [false, 4, '账号异常']
|
||||
case 22009:
|
||||
return [false, 5, '关注已达上限']
|
||||
case 22014:
|
||||
return [false, 6, '已经关注用户,无法重复关注']
|
||||
default:
|
||||
return [true, 1, `未知错误\n${responseText}`]
|
||||
}
|
||||
@@ -750,13 +739,12 @@ const bili_client = {
|
||||
* @param {Number} uid
|
||||
* 被关注者的UID
|
||||
* @returns {Promise<number>}
|
||||
* - 成功 0
|
||||
* - 未知错误 1
|
||||
* - 您已被对方拉入黑名单 2
|
||||
* - 黑名单用户无法关注 3
|
||||
* - 账号异常 4
|
||||
* - 关注已达上限 5
|
||||
* - 已经关注用户 6
|
||||
* - 成功 0
|
||||
* - 未知错误 1
|
||||
* - 您已被对方拉入黑名单 2
|
||||
* - 黑名单用户无法关注 3
|
||||
* - 账号异常 4
|
||||
* - 关注已达上限 5
|
||||
*/
|
||||
autoAttention(uid) {
|
||||
return this._autoAttention.run(uid)
|
||||
@@ -766,8 +754,8 @@ const bili_client = {
|
||||
* @param {number} uid
|
||||
* @param {number} tagid 关注分区的ID
|
||||
* @returns {Promise<number>}
|
||||
* - 成功 0
|
||||
* - 失败 1
|
||||
* - 成功 0
|
||||
* - 失败 1
|
||||
*/
|
||||
async movePartition(uid, tagid) {
|
||||
const responseText = await post({
|
||||
@@ -819,7 +807,7 @@ const bili_client = {
|
||||
* 动态自动点赞
|
||||
* @param {string} dyid
|
||||
* @returns {Promise<number>}
|
||||
* - 成功 0
|
||||
* - 成功 0
|
||||
* - 未知错误 1
|
||||
* - 点赞异常 2
|
||||
* - 点赞频繁 3
|
||||
@@ -868,11 +856,11 @@ const bili_client = {
|
||||
* @param {string} [msg]
|
||||
* 动态的ID
|
||||
* @returns {Promise<number>}
|
||||
* - 成功 0
|
||||
* - 未知错误 1
|
||||
* - 该动态不能转发分享 2
|
||||
* - 请求数据发生错误,请刷新或稍后重试 3
|
||||
* - 操作太频繁了,请稍后重试 4
|
||||
* - 成功 0
|
||||
* - 未知错误 1
|
||||
* - 该动态不能转发分享 2
|
||||
* - 请求数据发生错误,请刷新或稍后重试 3
|
||||
* - 操作太频繁了,请稍后重试 4
|
||||
*/
|
||||
async autoRelay(uid, dyid, msg = '转发动态', ctrl = '[]') {
|
||||
const len = msg.length;
|
||||
@@ -914,8 +902,8 @@ const bili_client = {
|
||||
},
|
||||
/**
|
||||
* 预约抽奖
|
||||
* @param {string} reserve_id
|
||||
* @returns
|
||||
* @param {number} reserve_id
|
||||
* @returns
|
||||
*/
|
||||
async reserve_lottery(reserve_id) {
|
||||
const
|
||||
@@ -1071,16 +1059,15 @@ const bili_client = {
|
||||
* cid_str
|
||||
* @param {string} msg
|
||||
* @param {number} type
|
||||
* @param {string} code
|
||||
* 1(视频)
|
||||
* 11(有图)
|
||||
* 17(无图)
|
||||
* @returns {Promise<number|string>}
|
||||
* @returns {Promise<number>}
|
||||
* - 成功 0
|
||||
* - 未知错误 1
|
||||
* - 原动态已删除 2
|
||||
* - 评论区已关闭 3
|
||||
* - 需要输入验证码 4 -> url
|
||||
* - 需要输入验证码 4
|
||||
* - 已被对方拉入黑名单 5
|
||||
* - 黑名单用户无法互动 6
|
||||
* - UP主已关闭评论区 7
|
||||
@@ -1088,9 +1075,8 @@ const bili_client = {
|
||||
* - 重复评论 9
|
||||
* - 帐号未登录 10
|
||||
* - 关注UP主7天以上的人可发评论 11
|
||||
* - 验证码错误 12
|
||||
*/
|
||||
async sendChat(rid, msg, type, code) {
|
||||
async sendChat(rid, msg, type) {
|
||||
const
|
||||
responseText = await post({
|
||||
url: API.REPLY_ADD,
|
||||
@@ -1098,7 +1084,6 @@ const bili_client = {
|
||||
oid: rid,
|
||||
type: type,
|
||||
message: msg,
|
||||
code,
|
||||
csrf: GlobalVar.get("csrf")
|
||||
}
|
||||
}),
|
||||
@@ -1115,7 +1100,7 @@ const bili_client = {
|
||||
return 3;
|
||||
case 12015:
|
||||
log.error('自动评论', '需要输入验证码');
|
||||
return res.data.url;
|
||||
return 4;
|
||||
case 12035:
|
||||
log.error('自动评论', `已被对方拉入黑名单`);
|
||||
return 5;
|
||||
@@ -1137,77 +1122,11 @@ const bili_client = {
|
||||
case 12078:
|
||||
log.error('自动评论', '关注UP主7天以上的人可发评论');
|
||||
return 11;
|
||||
case 12073:
|
||||
log.error('自动评论', '验证码错误');
|
||||
return 12;
|
||||
default:
|
||||
log.error('自动评论', `未知错误\n${responseText}`);
|
||||
return 1;
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 发送评论 自动识别验证码
|
||||
* @param {string} rid
|
||||
* cid_str
|
||||
* @param {string} msg
|
||||
* @param {number} type
|
||||
* 1(视频)
|
||||
* 11(有图)
|
||||
* 17(无图)
|
||||
* @returns {Promise<number>}
|
||||
* - 成功 0
|
||||
* - 未知错误 1
|
||||
* - 原动态已删除 2
|
||||
* - 评论区已关闭 3
|
||||
* - 需要输入验证码 4 -> url
|
||||
* - 已被对方拉入黑名单 5
|
||||
* - 黑名单用户无法互动 6
|
||||
* - UP主已关闭评论区 7
|
||||
* - 评论内容包含敏感信息 8
|
||||
* - 重复评论 9
|
||||
* - 帐号未登录 10
|
||||
* - 关注UP主7天以上的人可发评论 11
|
||||
* - 验证码错误 12
|
||||
*/
|
||||
async sendChatWithOcr(rid, msg, type) {
|
||||
let need_captcha = false;
|
||||
let url = "";
|
||||
let status = 0;
|
||||
do {
|
||||
if (need_captcha) {
|
||||
const code = await ocr(url);
|
||||
if (code) {
|
||||
log.info("验证码识别", `${url} -> ${code}`);
|
||||
status = await bili_client.sendChat(
|
||||
rid,
|
||||
msg,
|
||||
type,
|
||||
code
|
||||
);
|
||||
if (status === 0) {
|
||||
need_captcha = false
|
||||
} else if (status === 12) {
|
||||
need_captcha = true
|
||||
} else {
|
||||
need_captcha = false
|
||||
}
|
||||
}
|
||||
} else {
|
||||
url = await bili_client.sendChat(
|
||||
rid,
|
||||
msg,
|
||||
type
|
||||
)
|
||||
if (typeof url === "string"
|
||||
&& hasEnv("ENABLE_CHAT_CAPTCHA_OCR")) {
|
||||
need_captcha = true
|
||||
} else {
|
||||
status = url
|
||||
}
|
||||
}
|
||||
} while (need_captcha);
|
||||
return status;
|
||||
},
|
||||
/**
|
||||
* 查询评论
|
||||
* @param {*} rid
|
||||
@@ -1241,9 +1160,9 @@ const bili_client = {
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 检查分区
|
||||
* 不存在指定分区时创建
|
||||
* 获取到tagid添加为对象的属性
|
||||
* 检查分区
|
||||
* 不存在指定分区时创建
|
||||
* 获取到tagid添加为对象的属性
|
||||
* @param {string} [name]
|
||||
* @returns {Promise<number>}
|
||||
*/
|
||||
@@ -1335,4 +1254,4 @@ const bili_client = {
|
||||
};
|
||||
|
||||
|
||||
module.exports = bili_client
|
||||
module.exports = bili_client
|
||||
+16
-20
@@ -56,9 +56,8 @@ function checkPlatform(releases) {
|
||||
|
||||
/**
|
||||
* 半自动更新
|
||||
* @param {boolean} isDdownload
|
||||
*/
|
||||
async function update(isDdownload) {
|
||||
async function update() {
|
||||
try {
|
||||
const { tag_name, assets, body: text } = await getLatestRelease('shanmiteko', 'LotteryAutoScript')
|
||||
if (checkVersion(version) < checkVersion(tag_name)) {
|
||||
@@ -66,23 +65,20 @@ async function update(isDdownload) {
|
||||
.filter(({ name }) => checkPlatform(name))
|
||||
.map(({ browser_download_url }) => browser_download_url)
|
||||
if (download_url.length) {
|
||||
if (isDdownload) {
|
||||
await try_for_each(download_url.entries(), async ([i, url]) => {
|
||||
let proxy_url = "https://ghproxy.com/";
|
||||
proxy_url += url
|
||||
log.warn('自动下载', `切换代理${proxy_url}`)
|
||||
await download(proxy_url, `latest_version${i}.zip`)
|
||||
.catch(async err => {
|
||||
log.error('自动下载', err)
|
||||
proxy_url = url
|
||||
log.warn('自动下载', `使用原始链接${proxy_url}`)
|
||||
await download(proxy_url, `latest_version${i}.zip`)
|
||||
})
|
||||
return false
|
||||
})
|
||||
log.info('自动下载', '成功下载到当前目录')
|
||||
log.info('检查更新', '请手动解压替换可执行文件');
|
||||
}
|
||||
await try_for_each(download_url.entries(), async ([i, url]) => {
|
||||
let proxy_url = "https://ghproxy.com/";
|
||||
proxy_url += url
|
||||
log.warn('自动下载', `切换代理${proxy_url}`)
|
||||
await download(proxy_url, `latest_version${i}.zip`)
|
||||
.catch(async err => {
|
||||
log.error('自动下载', err)
|
||||
proxy_url = url
|
||||
log.warn('自动下载', `使用原始链接${proxy_url}`)
|
||||
await download(proxy_url, `latest_version${i}.zip`)
|
||||
})
|
||||
return false
|
||||
})
|
||||
log.info('自动下载', '成功下载到当前目录')
|
||||
log.info('更新说明', '\n' + text + '\n')
|
||||
} else {
|
||||
throw `未找到能在此平台(${process.platform})-(${process.arch})上运行的版本,建议以源码运行`
|
||||
@@ -91,7 +87,7 @@ async function update(isDdownload) {
|
||||
throw '当前已是最新版本'
|
||||
}
|
||||
} catch (error) {
|
||||
log.warn('更新脚本', error)
|
||||
log.error('更新脚本', error)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+30
-44
@@ -17,8 +17,6 @@ const utils = {
|
||||
dyids_dir: path.join(process.cwd(), "dyids"),
|
||||
/**lottery_info存放目录 */
|
||||
lottery_info_dir: path.join(process.cwd(), "lottery_info"),
|
||||
/**本地抽奖信息存放目录 */
|
||||
lottery_dyids: path.join(process.cwd(), "lottery_dyids"),
|
||||
/**dyid长度 */
|
||||
dyid_length: 18,
|
||||
/**
|
||||
@@ -44,8 +42,7 @@ const utils = {
|
||||
try {
|
||||
const obj = JSON.parse(str);
|
||||
return typeof obj === 'object' ? obj : false
|
||||
} catch (e) {
|
||||
utils.log.error("json解析", e)
|
||||
} catch (_) {
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
@@ -278,29 +275,6 @@ const utils = {
|
||||
}
|
||||
}
|
||||
},
|
||||
/**
|
||||
* 验证码识别
|
||||
* @param {string} url
|
||||
* @returns {Promise<string>}
|
||||
*/
|
||||
ocr(url) {
|
||||
return new Promise((resolve) => {
|
||||
send({
|
||||
method: 'POST',
|
||||
url: 'http://127.0.0.1:9898/ocr/url/text',
|
||||
headers: {
|
||||
"content-type": 'application/x-www-form-urlencoded; charset=UTF-8',
|
||||
},
|
||||
contents: { url },
|
||||
success: res => {
|
||||
resolve(res.body)
|
||||
},
|
||||
failure: () => {
|
||||
resolve()
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 下载文件
|
||||
* @param {string} url
|
||||
@@ -339,6 +313,35 @@ const utils = {
|
||||
})
|
||||
});
|
||||
},
|
||||
/**
|
||||
* 获取远程设置
|
||||
* @returns {Promise<JSON>}
|
||||
*/
|
||||
getRemoteConfig() {
|
||||
return new Promise((resolve) => {
|
||||
send({
|
||||
method: 'GET',
|
||||
url: 'https://gitee.com/shanmite/lottery-notice/raw/master/notice.json',
|
||||
headers: {
|
||||
'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36',
|
||||
},
|
||||
success: res => {
|
||||
try {
|
||||
const body = JSON.parse(Buffer.from(res.body, "base64").toString());
|
||||
if (body.node_msg) utils.log.info('公告', '\n' + body.node_msg + '\n');
|
||||
resolve(body.config)
|
||||
} catch (error) {
|
||||
utils.log.error('获取远程设置', '获取远程设置错误: ' + error);
|
||||
resolve({})
|
||||
}
|
||||
},
|
||||
failure: err => {
|
||||
utils.log.error('获取远程设置', '获取远程设置错误: ' + err);
|
||||
resolve({})
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 是否存在文件或目录
|
||||
* @param {string} path
|
||||
@@ -384,7 +387,6 @@ const utils = {
|
||||
rejects(err)
|
||||
} else {
|
||||
fs.write(fd, buffer, 0, buffer.length, 0, err => {
|
||||
fs.close(fd)
|
||||
if (err) {
|
||||
rejects(err)
|
||||
} else {
|
||||
@@ -457,22 +459,6 @@ const utils = {
|
||||
async clearLotteryInfo() {
|
||||
await utils.createDir(utils.lottery_info_dir);
|
||||
await utils.createFile(utils.lottery_info_dir, `lottery_info_${Number(process.env.NUMBER)}.json`, "{}", "w")
|
||||
},
|
||||
/**
|
||||
* 获取含抽奖dyids
|
||||
* @param {string} filename
|
||||
* @returns {Promise<Array<String>>}
|
||||
*/
|
||||
getLocalLotteryTxt(filename) {
|
||||
return new Promise((resolve) => {
|
||||
fs.readFile(path.join(utils.lottery_dyids, filename), (err, data) => {
|
||||
if (err) {
|
||||
resolve([])
|
||||
} else {
|
||||
resolve(data.toString("utf8").split(/[^0123456789]+/))
|
||||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -16,9 +16,6 @@ const metainfo = [
|
||||
let multiple_account = [];
|
||||
/**循环等待时间 */
|
||||
let loop_wait = 0;
|
||||
/**账号状态标记 1正常 -1失效 */
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
let ck_flag = 0
|
||||
|
||||
/**
|
||||
* @returns {Promise<string>} 错误信息
|
||||
@@ -41,11 +38,7 @@ async function main() {
|
||||
if (err_msg) {
|
||||
return err_msg
|
||||
} else {
|
||||
if (ck_flag === 1) {
|
||||
await delay(acco.WAIT);
|
||||
} else {
|
||||
await delay(3 * 1000);
|
||||
}
|
||||
await delay(acco.WAIT);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,16 +49,15 @@ async function main() {
|
||||
await global_var.init(COOKIE, NUMBER);
|
||||
|
||||
/**引入基础功能 */
|
||||
const { start, isMe, clear, account, checkCookie, login } = require("./lib/index");
|
||||
const { start, isMe, clear, checkCookie } = require("./lib/index");
|
||||
|
||||
log.info('main', '当前为第' + NUMBER + '个账号');
|
||||
log._cache.length = 0
|
||||
|
||||
const mode = process.env.lottery_mode;
|
||||
const help_msg = "用法: lottery [OPTIONS]\n\nOPTIONS:\n\tstart 启动抽奖\n\tcheck 中奖检查\n\tacount 查看帐号信息\n\tclear 清理动态和关注\n\tlogin 扫码登录更新CK\n\tupdate 检查更新\n\thelp 帮助信息";
|
||||
if (await checkCookie(NUMBER)) {
|
||||
const mode = process.env.lottery_mode;
|
||||
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, save_lottery_info_to_file } = require("./lib/data/config");
|
||||
ck_flag = 1;
|
||||
switch (mode) {
|
||||
case 'start':
|
||||
log.info('抽奖', '开始运行');
|
||||
@@ -87,15 +79,8 @@ async function main() {
|
||||
await clear();
|
||||
}
|
||||
break;
|
||||
case 'login':
|
||||
log.info('登录状态', '正常,跳过扫码');
|
||||
break;
|
||||
case 'help':
|
||||
return help_msg
|
||||
case 'account':
|
||||
log.info('检查帐号信息', '开始运行');
|
||||
await account();
|
||||
break;
|
||||
case undefined:
|
||||
return "未提供以下参数\n\t[OPTIONS]\n\n" + help_msg
|
||||
default:
|
||||
@@ -103,12 +88,7 @@ async function main() {
|
||||
}
|
||||
} else {
|
||||
log.error('Cookie已失效', '切换账号时不要点击退出账号而应直接删除Cookie退出')
|
||||
ck_flag = -1;
|
||||
if (mode === "login") {
|
||||
log.info('登陆', '开始扫码');
|
||||
await login(NUMBER);
|
||||
await delay(1000);
|
||||
}
|
||||
return
|
||||
}
|
||||
} else {
|
||||
return '请查看README文件, 在env.js指定位置填入cookie'
|
||||
@@ -169,13 +149,11 @@ function initConfig() {
|
||||
/**OPTIONS */
|
||||
process.env.lottery_mode = process.argv[2]
|
||||
|
||||
log.info('检查更新', '开始')
|
||||
|
||||
if (process.env.lottery_mode === "update") {
|
||||
await require("./lib/update").update(true)
|
||||
log.info('检查更新', '开始')
|
||||
await require("./lib/update").update()
|
||||
log.info('检查更新', '请手动解压替换可执行文件')
|
||||
return
|
||||
} else {
|
||||
await require("./lib/update").update(false)
|
||||
}
|
||||
|
||||
const err_msg = await main();
|
||||
@@ -190,7 +168,7 @@ function initConfig() {
|
||||
if (initEnv() || initConfig()) return;
|
||||
await main()
|
||||
}
|
||||
log.info('结束运行', '未在my_config.js中设置休眠时间')
|
||||
log.info('结束运行', '未在config.js中设置休眠时间')
|
||||
}
|
||||
|
||||
process.exit(0);
|
||||
|
||||
+7
-15
@@ -51,19 +51,12 @@ module.exports = Object.freeze({
|
||||
*/
|
||||
APIs: ["file://lottery_info_1.json"],
|
||||
|
||||
/**
|
||||
* lottery_dyids目录下抽奖动态文件名(如dyids.txt)
|
||||
* 一行一个dyids(非数字字符分割即可)
|
||||
*/
|
||||
TxT: ["dyids.txt"],
|
||||
|
||||
/**
|
||||
* 抽奖参与顺序组合
|
||||
* * 0 - UIDs
|
||||
* * 1 - TAGs
|
||||
* * 2 - Articles
|
||||
* * 3 - APIs
|
||||
* * 4 - TxT
|
||||
* @example
|
||||
* [3,2,1,0]
|
||||
* [1,2,1,2,1]
|
||||
@@ -310,6 +303,12 @@ module.exports = Object.freeze({
|
||||
*/
|
||||
blacklist: '',
|
||||
|
||||
/**
|
||||
* - 自动同步 https://gitee.com/shanmite/lottery-notice/raw/master/notice.json
|
||||
* - 使用公共黑名单
|
||||
*/
|
||||
use_public_blacklist: true,
|
||||
|
||||
/**
|
||||
* 屏蔽词
|
||||
*/
|
||||
@@ -419,13 +418,6 @@ module.exports = Object.freeze({
|
||||
*/
|
||||
clear_quick_remove_attention: false,
|
||||
|
||||
/**
|
||||
* - 快速移除关注
|
||||
* - 不加判断只去除关注
|
||||
* - 移除粉丝数小于指定数量的
|
||||
*/
|
||||
clear_quick_remove_attention_fans_number_smallest: Infinity,
|
||||
|
||||
/**
|
||||
* 是否移除动态
|
||||
*/
|
||||
@@ -437,7 +429,7 @@ module.exports = Object.freeze({
|
||||
clear_remove_attention: true,
|
||||
|
||||
/**
|
||||
* 清除延时(毫秒)
|
||||
* 清除动态延时(毫秒)
|
||||
*/
|
||||
clear_remove_delay: 8000,
|
||||
|
||||
|
||||
+2
-6
@@ -1,17 +1,14 @@
|
||||
{
|
||||
"name": "lottery-auto-script",
|
||||
"version": "2.8.12",
|
||||
"version": "2.7.11",
|
||||
"description": "自动参与B站动态抽奖",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
"login": "node main.js login",
|
||||
"start": "node main.js start",
|
||||
"test": "node test/index.js",
|
||||
"clear": "node main.js clear",
|
||||
"check": "node main.js check",
|
||||
"update": "node main.js update",
|
||||
"account": "node main.js account",
|
||||
"help": "node main.js help",
|
||||
"pkg": "bash script/build/pkg.sh",
|
||||
"changelog": "bash script/build/changelog.sh"
|
||||
},
|
||||
@@ -47,7 +44,6 @@
|
||||
"chalk": "^4.1.2",
|
||||
"http-proxy-agent": "^7.0.0",
|
||||
"https-proxy-agent": "^7.0.0",
|
||||
"nodemailer": "^6.7.0",
|
||||
"@catlair/blogin": "^0.0.8"
|
||||
"nodemailer": "^6.7.0"
|
||||
}
|
||||
}
|
||||
|
||||
+3
-4
@@ -12,8 +12,7 @@ TARGET_DIR="dist"
|
||||
BIN_NAME="lottery"
|
||||
|
||||
create_win_bat() {
|
||||
echo "set NODE_SKIP_PLATFORM_CHECK=1" >>$2
|
||||
echo "lottery $1 & pause" >>$2
|
||||
echo "@echo off && lottery $1 && pause"
|
||||
}
|
||||
|
||||
if [ -d "$TARGET_DIR" ]; then
|
||||
@@ -50,9 +49,9 @@ for file in "$TARGET_DIR/"*; do
|
||||
cp $TEMPLATE_CONFIG_FILE "$TMPDIR.d/$CONFIG_FILE"
|
||||
cp $TEMPLATE_ENV_FILE "$TMPDIR.d/$ENV_FILE"
|
||||
if [ "$(echo $file | grep '.exe')" ]; then
|
||||
BATS=("start" "check" "clear" "account" "update" "login")
|
||||
BATS=("start" "check" "clear" "update")
|
||||
for item in "${BATS[@]}"; do
|
||||
create_win_bat "${item}" "$TMPDIR.d/$item.bat"
|
||||
create_win_bat "${item}" >"$TMPDIR.d/$item.bat"
|
||||
done
|
||||
mv "$TMPDIR.d/$BIN_NAME" "$TMPDIR.d/$BIN_NAME.exe"
|
||||
else
|
||||
|
||||
+6
-54
@@ -8,7 +8,7 @@ PACKAGE_UPDATE=("! apt-get update && apt-get --fix-broken install -y && apt-get
|
||||
PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed")
|
||||
PACKAGE_REMOVE=("apt-get -y remove" "apt-get -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "pacman -Rsc --noconfirm")
|
||||
PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "")
|
||||
CMD=("$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)" "$(hostnamectl 2>/dev/null | grep -i system | cut -d : -f2)" "$(lsb_release -sd 2>/dev/null)" "$(grep -i description /etc/lsb-release 2>/dev/null | cut -d \" -f2)" "$(grep . /etc/redhat-release 2>/dev/null)" "$(grep . /etc/issue 2>/dev/null | cut -d \\ -f1 | sed '/^[ ]*$/d')" "$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)")
|
||||
CMD=("$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)" "$(hostnamectl 2>/dev/null | grep -i system | cut -d : -f2)" "$(lsb_release -sd 2>/dev/null)" "$(grep -i description /etc/lsb-release 2>/dev/null | cut -d \" -f2)" "$(grep . /etc/redhat-release 2>/dev/null)" "$(grep . /etc/issue 2>/dev/null | cut -d \\ -f1 | sed '/^[ ]*$/d')" "$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)")
|
||||
SYS="${CMD[0]}"
|
||||
[[ -n $SYS ]] || exit 1
|
||||
for ((int = 0; int < ${#REGEX[@]}; int++)); do
|
||||
@@ -19,12 +19,12 @@ for ((int = 0; int < ${#REGEX[@]}; int++)); do
|
||||
done
|
||||
if ! systemctl is-active docker >/dev/null 2>&1; then
|
||||
if [ $SYSTEM = "CentOS" ]; then
|
||||
${PACKAGE_INSTALL[int]} yum-utils
|
||||
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo &&
|
||||
${PACKAGE_INSTALL[int]} docker-ce docker-ce-cli containerd.io
|
||||
systemctl enable --now docker
|
||||
${PACKAGE_INSTALL[int]} yum-utils
|
||||
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo &&
|
||||
${PACKAGE_INSTALL[int]} docker-ce docker-ce-cli containerd.io
|
||||
systemctl enable --now docker
|
||||
else
|
||||
${PACKAGE_INSTALL[int]} docker.io
|
||||
${PACKAGE_INSTALL[int]} docker.io
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -82,7 +82,6 @@ if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
|
||||
docker run \\
|
||||
-v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
|
||||
-v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
|
||||
--network host \\
|
||||
--name \$NAME \\
|
||||
$DOCKER_REPO \\
|
||||
start
|
||||
@@ -104,7 +103,6 @@ if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
|
||||
docker run \\
|
||||
-v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
|
||||
-v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
|
||||
--network host \\
|
||||
--name \$NAME \\
|
||||
$DOCKER_REPO \\
|
||||
check
|
||||
@@ -118,28 +116,6 @@ fi
|
||||
EOF
|
||||
chmod +x check.sh
|
||||
|
||||
echo "create account.sh"
|
||||
cat >account.sh <<EOF
|
||||
#!$(which env) bash
|
||||
NAME=shanmite-lottery-account
|
||||
if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
|
||||
docker run \\
|
||||
-v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
|
||||
-v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
|
||||
--network host \\
|
||||
--name \$NAME \\
|
||||
$DOCKER_REPO \\
|
||||
account
|
||||
else
|
||||
echo "container \$NAME already existed"
|
||||
echo "history logs -> docker logs \$NAME"
|
||||
echo "close this -> docker stop \$NAME"
|
||||
echo "start \$NAME"
|
||||
docker start \$NAME
|
||||
fi
|
||||
EOF
|
||||
chmod +x account.sh
|
||||
|
||||
echo "create clear.sh"
|
||||
cat >clear.sh <<EOF
|
||||
#!$(which env) bash
|
||||
@@ -148,7 +124,6 @@ if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
|
||||
docker run \\
|
||||
-v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
|
||||
-v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
|
||||
--network host \\
|
||||
--name \$NAME \\
|
||||
$DOCKER_REPO \\
|
||||
clear
|
||||
@@ -169,7 +144,6 @@ NAME=shanmite-lottery-debug
|
||||
echo "create temporary debug container"
|
||||
docker run \\
|
||||
-it \\
|
||||
--network host \\
|
||||
--name \$NAME \\
|
||||
--entrypoint /bin/bash \\
|
||||
$DOCKER_REPO -c bash
|
||||
@@ -188,25 +162,3 @@ docker image rm -f shanmite/lottery_auto_docker
|
||||
echo "see you next time!"
|
||||
EOF
|
||||
chmod +x remove_all.sh
|
||||
|
||||
echo "create login.sh"
|
||||
cat >login.sh <<EOF
|
||||
#!$(which env) bash
|
||||
NAME=shanmite-lottery-login
|
||||
if [[ -z "\$(docker ps -a | grep \$NAME)" ]]; then
|
||||
docker run \\
|
||||
-v $PWD/$ENV_FILE:/lottery/$ENV_FILE \\
|
||||
-v $PWD/$CONFIG_FILE:/lottery/$CONFIG_FILE \\
|
||||
--network host \\
|
||||
--name \$NAME \\
|
||||
$DOCKER_REPO \\
|
||||
login
|
||||
else
|
||||
echo "container \$NAME already existed"
|
||||
echo "history logs -> docker logs \$NAME"
|
||||
echo "close this -> docker stop \$NAME"
|
||||
echo "login \$NAME"
|
||||
docker login \$NAME
|
||||
fi
|
||||
EOF
|
||||
chmod +x login.sh
|
||||
@@ -2,7 +2,6 @@
|
||||
set -e
|
||||
|
||||
NAME=LotteryAutoScript
|
||||
BRABCH=main
|
||||
|
||||
# 视网络情况选择链接
|
||||
GIT_REPO=https://github.com/shanmiteko/${NAME}.git
|
||||
@@ -13,7 +12,7 @@ if [ -d "$NAME" ]; then
|
||||
git pull
|
||||
cd ..
|
||||
else
|
||||
git clone -b $BRABCH $GIT_REPO $NAME
|
||||
git clone $GIT_REPO $NAME --depth=1
|
||||
fi
|
||||
|
||||
if [ -f "$NAME/my_config.js" ]; then
|
||||
@@ -39,8 +38,6 @@ EOF
|
||||
create start
|
||||
create check
|
||||
create clear
|
||||
create account
|
||||
create login
|
||||
|
||||
cd $NAME
|
||||
npm i
|
||||
|
||||
+2
-6
@@ -4,9 +4,9 @@ const util = require('./util');
|
||||
const { parseDynamicCard } = require('../lib/core/searcher');
|
||||
|
||||
(async () => {
|
||||
assert.notEqual(await bili_client.getMyinfo(), null);
|
||||
assert(await bili_client.getMyinfo());
|
||||
|
||||
await util.par_run([0, 3], [
|
||||
await util.par_run([0, 1, 2, 3, 4, 5], [
|
||||
// 0
|
||||
async () => {
|
||||
assert.equal((await bili_client.getTopRcmd()).length, 10)
|
||||
@@ -45,10 +45,6 @@ const { parseDynamicCard } = require('../lib/core/searcher');
|
||||
async () => {
|
||||
assert.equal(await bili_client.autolike("761391835139538967"), 4)
|
||||
},
|
||||
// 7
|
||||
async () => {
|
||||
assert(await bili_client.rmDynamic("835102428771647513"))
|
||||
},
|
||||
])
|
||||
|
||||
console.log("api.test ... ok!");
|
||||
|
||||
@@ -4,7 +4,7 @@ const searcher = require("../lib/core/searcher");
|
||||
const util = require('./util');
|
||||
|
||||
(async () => {
|
||||
await util.par_run([0, 1, 2, 3, 4, 5, 6, 7, 8], [
|
||||
await util.par_run([0, 1, 2, 3, 4, 5, 6], [
|
||||
// 0
|
||||
async () => {
|
||||
let info = await bili_client.getOneDynamicByDyid("728424890210713624");
|
||||
@@ -12,7 +12,7 @@ const util = require('./util');
|
||||
},
|
||||
// 1
|
||||
async () => {
|
||||
let info = await bili_client.getOneDynamicByDyid("768874900850999300");
|
||||
let info = await bili_client.getOneDynamicByDyid("728455586333589522");
|
||||
assert(searcher.parseDynamicCard(info).origin_is_charge_lottery);
|
||||
},
|
||||
// 2
|
||||
@@ -50,18 +50,6 @@ const util = require('./util');
|
||||
const card = searcher.parseDynamicCard(dy)
|
||||
assert.notEqual(card.description + "", undefined + "");
|
||||
},
|
||||
// 7
|
||||
async () => {
|
||||
const dy = await bili_client.getOneDynamicByDyid("832208853440397352");
|
||||
const card = searcher.parseDynamicCard(dy)
|
||||
assert.equal(card.reserve_id, "3106984");
|
||||
},
|
||||
// 8
|
||||
async () => {
|
||||
const dy = await bili_client.getOneDynamicByDyid("832966468497834066");
|
||||
const card = searcher.parseDynamicCard(dy)
|
||||
assert.equal(card.origin_reserve_id, "3106984");
|
||||
},
|
||||
])
|
||||
|
||||
console.log("dynamic_card.test ... ok!");
|
||||
|
||||
+2
-1
@@ -3,10 +3,11 @@ const global_var = require("../lib/data/global_var");
|
||||
const { log } = require('../lib/utils');
|
||||
const fs = require('fs');
|
||||
|
||||
log._level = 4
|
||||
log._level = 2
|
||||
env.init()
|
||||
global_var.init(process.env["COOKIE"], 1)
|
||||
|
||||
|
||||
fs.readdirSync(module.path)
|
||||
.filter(file => file.endsWith(".test.js"))
|
||||
.forEach(file => require(`${module.path}/${file}`))
|
||||
@@ -1,23 +0,0 @@
|
||||
const assert = require('assert');
|
||||
const bili_client = require("../lib/net/bili");
|
||||
const util = require('./util');
|
||||
const { parseDynamicCard } = require('../lib/core/searcher');
|
||||
|
||||
(async () => {
|
||||
await util.par_run([], [
|
||||
// 0
|
||||
async () => {
|
||||
assert.notEqual(await bili_client.getMyinfo(), null);
|
||||
|
||||
const rid = parseDynamicCard(await bili_client.getOneDynamicByDyid("551416252543796684")).rid_str;
|
||||
|
||||
for (let index = 0; index < 100; index++) {
|
||||
console.log(index);
|
||||
await bili_client.sendChatWithOcr(
|
||||
rid,
|
||||
Date.now().toString(),
|
||||
17,
|
||||
)
|
||||
}
|
||||
},]);
|
||||
})()
|
||||
@@ -0,0 +1,38 @@
|
||||
const util = require('./util');
|
||||
const crypto = require('crypto');
|
||||
const { send } = require('../lib/net/http');
|
||||
|
||||
(async () => {
|
||||
await util.par_run([], [
|
||||
// 0
|
||||
async () => {
|
||||
let timestamp = parseInt(new Date().getTime() / 1000);
|
||||
let orderno = process.env["XMDL_ORDERNNO"];
|
||||
let secret = process.env["XMDL_SECRET"];
|
||||
|
||||
if (orderno && secret) {
|
||||
let txt = 'orderno=' + orderno + ',secret=' + secret + ',timestamp=' + timestamp;
|
||||
let md5 = crypto.createHash('md5');
|
||||
let sign = md5.update(txt).digest('hex').toUpperCase();
|
||||
|
||||
console.log(await new Promise((resolve) => {
|
||||
send({
|
||||
url: "https://api.bilibili.com/client_info",
|
||||
proxy: {
|
||||
url: "http://dtan.xiongmaodaili.com:8088",
|
||||
auth_headers: [
|
||||
["Proxy-Authorization", 'sign=' + sign + '&orderno=' + orderno + "×tamp=" + timestamp]
|
||||
]
|
||||
},
|
||||
config: {
|
||||
retry: false
|
||||
},
|
||||
success: (res) => { resolve(JSON.parse(res.body)) },
|
||||
failure: resolve
|
||||
})
|
||||
}));
|
||||
console.log("proxy.test ... ok!");
|
||||
}
|
||||
},
|
||||
])
|
||||
})()
|
||||
Reference in New Issue
Block a user