@ikenxuan/amagi 4.0.1 → 4.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/business/bilibili/API.d.ts +8 -1
- package/lib/business/bilibili/API.js +5 -2
- package/lib/business/bilibili/getdata.js +97 -80
- package/lib/business/bilibili/getid.d.ts +1 -1
- package/lib/business/bilibili/getid.js +7 -6
- package/lib/business/bilibili/qtparam.js +1 -1
- package/lib/business/bilibili/result.js +4 -4
- package/lib/business/bilibili/sign/CorrespondPath.js +1 -1
- package/lib/business/bilibili/sign/bv2av.js +1 -1
- package/lib/business/bilibili/sign/wbi.js +1 -1
- package/lib/business/douyin/API.js +2 -2
- package/lib/business/douyin/getdata.js +4 -4
- package/lib/business/douyin/index.d.ts +1 -1
- package/lib/business/douyin/index.js +2 -2
- package/lib/business/douyin/result.js +1 -1
- package/lib/business/douyin/sign/a_bogus.js +11 -10
- package/lib/business/douyin/sign/index.js +12 -4
- package/lib/business/kuaishou/API.d.ts +2 -2
- package/lib/business/kuaishou/API.js +3 -3
- package/lib/business/kuaishou/index.d.ts +1 -1
- package/lib/business/kuaishou/index.js +2 -2
- package/lib/business/kuaishou/result.d.ts +1 -1
- package/lib/index.d.ts +7 -7
- package/lib/index.js +8 -8
- package/lib/model/DataFetchers.d.ts +1 -1
- package/lib/model/DataFetchers.js +2 -2
- package/lib/model/index.d.ts +2 -2
- package/lib/model/index.js +3 -3
- package/lib/model/logger.js +2 -2
- package/lib/model/networks.d.ts +1 -1
- package/lib/model/networks.js +7 -7
- package/lib/server/client.d.ts +1 -1
- package/lib/server/client.js +9 -9
- package/lib/server/listen.d.ts +2 -2
- package/lib/server/listen.js +3 -3
- package/lib/test.js +2 -2
- package/lib/types/BilibiliAPIParams.d.ts +86 -16
- package/lib/types/DouyinAPIParams.d.ts +14 -14
- package/lib/types/KuaishouAPIParams.d.ts +3 -3
- package/lib/types/index.d.ts +4 -4
- package/package.json +11 -12
|
@@ -9,9 +9,16 @@ declare class BiLiBiLiAPI {
|
|
|
9
9
|
id_type: 'bvid';
|
|
10
10
|
id: string;
|
|
11
11
|
}): string;
|
|
12
|
-
视频流信息(data:
|
|
12
|
+
视频流信息(data: {
|
|
13
|
+
url: string;
|
|
14
|
+
}): string;
|
|
15
|
+
视频流信息(data: {
|
|
16
|
+
avid: number;
|
|
17
|
+
cid: number;
|
|
18
|
+
}): string;
|
|
13
19
|
/** type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
|
|
14
20
|
评论区明细(data: BilibiliAPIOptionsMap['CommentParams']): string;
|
|
21
|
+
评论区状态(data: BilibiliAPIOptionsMap['CommentParams']): string;
|
|
15
22
|
表情列表(): string;
|
|
16
23
|
番剧明细(data: BilibiliAPIOptionsMap['BangumiInfoParams']): string;
|
|
17
24
|
番剧视频流信息(data: BilibiliAPIOptionsMap['BangumiStreamParams']): string;
|
|
@@ -10,7 +10,10 @@ class BiLiBiLiAPI {
|
|
|
10
10
|
}
|
|
11
11
|
/** type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
|
|
12
12
|
评论区明细(data) {
|
|
13
|
-
return `https://api.bilibili.com/x/v2/reply?sort=1&ps=${data.number
|
|
13
|
+
return `https://api.bilibili.com/x/v2/reply/subject/description?sort=1&ps=${data.number ?? 20}&type=${data.type}&oid=${data.oid}&pn=${data.pn}`;
|
|
14
|
+
}
|
|
15
|
+
评论区状态(data) {
|
|
16
|
+
return `https://api.bilibili.com/x/v2/reply/subject/description?type=${data.type}&oid=${data.oid}`;
|
|
14
17
|
}
|
|
15
18
|
表情列表() {
|
|
16
19
|
return 'https://api.bilibili.com/x/emote/user/panel/web?business=reply&web_location=0.0';
|
|
@@ -51,4 +54,4 @@ class BiLiBiLiAPI {
|
|
|
51
54
|
}
|
|
52
55
|
/** 该类下的所有方法只会返回拼接好参数后的 Url 地址,需要手动请求该地址以获取数据 */
|
|
53
56
|
export const bilibiliAPI = new BiLiBiLiAPI();
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQVBJLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2J1c2luZXNzL2JpbGliaWxpL0FQSS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLFdBQVc7SUFDZixNQUFNO1FBQ0osT0FBTyw4Q0FBOEMsQ0FBQTtJQUN2RCxDQUFDO0lBSUQsTUFBTSxDQUFFLElBQThDO1FBQ3BELE9BQU8saURBQWlELElBQUksQ0FBQyxPQUFPLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQyxFQUFFLEVBQUUsQ0FBQTtJQUMxSCxDQUFDO0lBSUQsS0FBSyxDQUFFLElBQWdEO1FBQ3JELE9BQU8sa0RBQWtELElBQUksQ0FBQyxJQUFJLFFBQVEsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFBO0lBQ3RGLENBQUM7SUFFRCxnSEFBZ0g7SUFDaEgsS0FBSyxDQUFFLElBQTRDO1FBQ2pELE9BQU8scUVBQXFFLElBQUksQ0FBQyxNQUFNLElBQUksRUFBRSxTQUFTLElBQUksQ0FBQyxJQUFJLFFBQVEsSUFBSSxDQUFDLEdBQUcsT0FBTyxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUE7SUFDakosQ0FBQztJQUVELEtBQUssQ0FBRSxJQUE0QztRQUNqRCxPQUFPLGdFQUFnRSxJQUFJLENBQUMsSUFBSSxRQUFRLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQTtJQUNwRyxDQUFDO0lBRUQsSUFBSTtRQUNGLE9BQU8saUZBQWlGLENBQUE7SUFDMUYsQ0FBQztJQUVELElBQUksQ0FBRSxJQUFnRDtRQUNwRCxPQUFPLGdEQUFnRCxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLFdBQVcsSUFBSSxJQUFJLENBQUMsRUFBRSxFQUFFLENBQUE7SUFDdkcsQ0FBQztJQUVELE9BQU8sQ0FBRSxJQUFrRDtRQUN6RCxPQUFPLHVEQUF1RCxJQUFJLENBQUMsR0FBRyxVQUFVLElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQTtJQUM5RixDQUFDO0lBRUQsTUFBTSxDQUFFLElBQXlDO1FBQy9DLE9BQU8seUVBQXlFLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQTtJQUNqRyxDQUFDO0lBRUQsSUFBSSxDQUFFLElBQTRDO1FBQ2hELE9BQU8sK0RBQStELElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQTtJQUN6RixDQUFDO0lBRUQsTUFBTSxDQUFFLElBQTRDO1FBQ2xELE9BQU8sd0ZBQXdGLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQTtJQUNsSCxDQUFDO0lBRUQsTUFBTSxDQUFFLElBQXlDO1FBQy9DLE9BQU8scURBQXFELElBQUksQ0FBQyxRQUFRLGFBQWEsQ0FBQTtJQUN4RixDQUFDO0lBRUQsS0FBSyxDQUFFLElBQTZDO1FBQ2xELE9BQU8sK0RBQStELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUN0RixDQUFDO0lBRUQsUUFBUSxDQUFFLElBQTZDO1FBQ3JELE9BQU8sMkRBQTJELElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNsRixDQUFDO0lBRUQsS0FBSztRQUNILE9BQU8sb0VBQW9FLENBQUE7SUFDN0UsQ0FBQztJQUVELEtBQUssQ0FBRSxJQUEyQztRQUNoRCxPQUFPLDZFQUE2RSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUE7SUFDdkcsQ0FBQztJQUVELFNBQVMsQ0FBRSxJQUF5QztRQUNsRCxPQUFPLCtDQUErQyxJQUFJLENBQUMsUUFBUSxFQUFFLENBQUE7SUFDdkUsQ0FBQztDQUNGO0FBQ0QsZ0RBQWdEO0FBQ2hELE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFBIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { bilibiliAPI, qtparam } from '../../business/bilibili/index.js';
|
|
2
|
-
import {
|
|
2
|
+
import { logger, Networks } from '../../model/index.js';
|
|
3
3
|
export class BilibiliData {
|
|
4
4
|
type;
|
|
5
5
|
headers;
|
|
@@ -7,10 +7,10 @@ export class BilibiliData {
|
|
|
7
7
|
constructor(type, cookie) {
|
|
8
8
|
this.type = type;
|
|
9
9
|
this.headers = {
|
|
10
|
-
|
|
10
|
+
accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
|
|
11
11
|
'accept-language': 'zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6',
|
|
12
12
|
'cache-control': 'max-age=0',
|
|
13
|
-
|
|
13
|
+
priority: 'u=0, i',
|
|
14
14
|
'sec-ch-ua': '\'Microsoft Edge\';v=\'131\', \'Chromium\';v=\'131\', \'Not_A Brand\';v=\'24\'',
|
|
15
15
|
'sec-ch-ua-mobile': '?0',
|
|
16
16
|
'sec-ch-ua-platform': '\'Windows\'',
|
|
@@ -32,7 +32,7 @@ export class BilibiliData {
|
|
|
32
32
|
}
|
|
33
33
|
case '单个视频下载信息数据': {
|
|
34
34
|
const BASEURL = bilibiliAPI.视频流信息({ avid: data.avid, cid: data.cid });
|
|
35
|
-
const SIGN = await qtparam(BASEURL, this.headers.
|
|
35
|
+
const SIGN = await qtparam(BASEURL, this.headers.cookie);
|
|
36
36
|
const DATA = await this.GlobalGetData({
|
|
37
37
|
url: bilibiliAPI.视频流信息({ avid: data.avid, cid: data.cid }) + SIGN.QUERY,
|
|
38
38
|
headers: this.headers
|
|
@@ -48,79 +48,90 @@ export class BilibiliData {
|
|
|
48
48
|
let stabilizedCount = 0; // 连续几次请求评论增长相同的计数器
|
|
49
49
|
let requestCount = 0; // 初始化请求计数器
|
|
50
50
|
let tmpresp;
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
51
|
+
let isOpen = true;
|
|
52
|
+
try {
|
|
53
|
+
if (!data.bvid) {
|
|
54
|
+
while (fetchedComments.length < Number(data.number || 20) && requestCount < maxRequestCount) {
|
|
55
|
+
if (data.number === 0) {
|
|
56
|
+
// 如果请求的评论数量为0,那么不需要进行请求
|
|
57
|
+
requestCount = 0;
|
|
58
|
+
}
|
|
59
|
+
else {
|
|
60
|
+
// 否则,计算需要请求的评论数量
|
|
61
|
+
requestCount = Math.min(20, Number(data.number) - fetchedComments.length);
|
|
62
|
+
}
|
|
63
|
+
const url = bilibiliAPI.评论区明细({
|
|
64
|
+
type: data.type,
|
|
65
|
+
oid: data.oid,
|
|
66
|
+
number: requestCount,
|
|
67
|
+
pn
|
|
68
|
+
});
|
|
69
|
+
const checkStatusUrl = bilibiliAPI.评论区状态({ oid: data.oid, type: data.type });
|
|
70
|
+
const checkStatusRes = await this.GlobalGetData({ url: checkStatusUrl, headers: this.headers });
|
|
71
|
+
if (checkStatusRes.data === null) {
|
|
72
|
+
throw new Error('评论区未开放');
|
|
73
|
+
}
|
|
74
|
+
const response = await this.GlobalGetData({
|
|
75
|
+
url,
|
|
76
|
+
headers: this.headers
|
|
77
|
+
});
|
|
78
|
+
tmpresp = response;
|
|
79
|
+
// 当请求0条评论的时候,replies为null,需额外判断
|
|
80
|
+
const currentCount = response.data.replies ? response.data.replies.length : 0;
|
|
81
|
+
fetchedComments.push(...(response.data.replies || []));
|
|
82
|
+
// 检查评论增长是否稳定
|
|
83
|
+
if (currentCount === lastFetchedCount) {
|
|
84
|
+
stabilizedCount++;
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
stabilizedCount = 0;
|
|
88
|
+
}
|
|
89
|
+
lastFetchedCount = currentCount;
|
|
90
|
+
// 如果增长稳定,并且增长量为0,或者请求次数达到最大值,则停止请求
|
|
91
|
+
if (stabilizedCount >= commentGrowthStabilized || requestCount >= maxRequestCount) {
|
|
92
|
+
break;
|
|
93
|
+
}
|
|
94
|
+
pn++;
|
|
95
|
+
requestCount++;
|
|
56
96
|
}
|
|
57
|
-
|
|
58
|
-
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
const INFODATA = await this.GlobalGetData({ url: bilibiliAPI.视频详细信息({ id_type: 'bvid', id: data.bvid }) });
|
|
100
|
+
while (fetchedComments.length < Number(data.number || 20) && requestCount < maxRequestCount) {
|
|
59
101
|
requestCount = Math.min(20, Number(data.number) - fetchedComments.length);
|
|
102
|
+
const url = bilibiliAPI.评论区明细({
|
|
103
|
+
type: data.type,
|
|
104
|
+
oid: INFODATA.data.oid,
|
|
105
|
+
number: requestCount,
|
|
106
|
+
pn
|
|
107
|
+
});
|
|
108
|
+
const response = await this.GlobalGetData({
|
|
109
|
+
url,
|
|
110
|
+
headers: this.headers
|
|
111
|
+
});
|
|
112
|
+
tmpresp = response;
|
|
113
|
+
// 当请求0条评论的时候,replies为null,需额外判断
|
|
114
|
+
const currentCount = response.data.replies ? response.data.replies.length : 0;
|
|
115
|
+
fetchedComments.push(...(response.data.replies || []));
|
|
116
|
+
// 检查评论增长是否稳定
|
|
117
|
+
if (currentCount === lastFetchedCount) {
|
|
118
|
+
stabilizedCount++;
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
stabilizedCount = 0;
|
|
122
|
+
}
|
|
123
|
+
lastFetchedCount = currentCount;
|
|
124
|
+
// 如果增长稳定,并且增长量为0,或者请求次数达到最大值,则停止请求
|
|
125
|
+
if (stabilizedCount >= commentGrowthStabilized || requestCount >= maxRequestCount) {
|
|
126
|
+
break;
|
|
127
|
+
}
|
|
128
|
+
pn++;
|
|
129
|
+
requestCount++;
|
|
60
130
|
}
|
|
61
|
-
const url = bilibiliAPI.评论区明细({
|
|
62
|
-
type: data.type,
|
|
63
|
-
oid: data.oid,
|
|
64
|
-
number: requestCount,
|
|
65
|
-
pn
|
|
66
|
-
});
|
|
67
|
-
const response = await this.GlobalGetData({
|
|
68
|
-
url: url,
|
|
69
|
-
headers: this.headers
|
|
70
|
-
});
|
|
71
|
-
tmpresp = response;
|
|
72
|
-
// 当请求0条评论的时候,replies为null,需额外判断
|
|
73
|
-
const currentCount = response.data.replies ? response.data.replies.length : 0;
|
|
74
|
-
fetchedComments.push(...(response.data.replies || []));
|
|
75
|
-
// 检查评论增长是否稳定
|
|
76
|
-
if (currentCount === lastFetchedCount) {
|
|
77
|
-
stabilizedCount++;
|
|
78
|
-
}
|
|
79
|
-
else {
|
|
80
|
-
stabilizedCount = 0;
|
|
81
|
-
}
|
|
82
|
-
lastFetchedCount = currentCount;
|
|
83
|
-
// 如果增长稳定,并且增长量为0,或者请求次数达到最大值,则停止请求
|
|
84
|
-
if (stabilizedCount >= commentGrowthStabilized || requestCount >= maxRequestCount) {
|
|
85
|
-
break;
|
|
86
|
-
}
|
|
87
|
-
pn++;
|
|
88
|
-
requestCount++;
|
|
89
131
|
}
|
|
90
132
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
while (fetchedComments.length < Number(data.number || 20) && requestCount < maxRequestCount) {
|
|
94
|
-
let requestCount = Math.min(20, Number(data.number) - fetchedComments.length);
|
|
95
|
-
const url = bilibiliAPI.评论区明细({
|
|
96
|
-
type: data.type,
|
|
97
|
-
oid: INFODATA.data.oid,
|
|
98
|
-
number: requestCount,
|
|
99
|
-
pn
|
|
100
|
-
});
|
|
101
|
-
const response = await this.GlobalGetData({
|
|
102
|
-
url: url,
|
|
103
|
-
headers: this.headers
|
|
104
|
-
});
|
|
105
|
-
tmpresp = response;
|
|
106
|
-
// 当请求0条评论的时候,replies为null,需额外判断
|
|
107
|
-
const currentCount = response.data.replies ? response.data.replies.length : 0;
|
|
108
|
-
fetchedComments.push(...(response.data.replies || []));
|
|
109
|
-
// 检查评论增长是否稳定
|
|
110
|
-
if (currentCount === lastFetchedCount) {
|
|
111
|
-
stabilizedCount++;
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
stabilizedCount = 0;
|
|
115
|
-
}
|
|
116
|
-
lastFetchedCount = currentCount;
|
|
117
|
-
// 如果增长稳定,并且增长量为0,或者请求次数达到最大值,则停止请求
|
|
118
|
-
if (stabilizedCount >= commentGrowthStabilized || requestCount >= maxRequestCount) {
|
|
119
|
-
break;
|
|
120
|
-
}
|
|
121
|
-
pn++;
|
|
122
|
-
requestCount++;
|
|
123
|
-
}
|
|
133
|
+
catch {
|
|
134
|
+
return false;
|
|
124
135
|
}
|
|
125
136
|
const finalResponse = {
|
|
126
137
|
...tmpresp,
|
|
@@ -132,8 +143,9 @@ export class BilibiliData {
|
|
|
132
143
|
};
|
|
133
144
|
return finalResponse;
|
|
134
145
|
}
|
|
135
|
-
case 'Emoji数据':
|
|
146
|
+
case 'Emoji数据': {
|
|
136
147
|
return await this.GlobalGetData({ url: bilibiliAPI.表情列表() });
|
|
148
|
+
}
|
|
137
149
|
case '番剧基本信息数据': {
|
|
138
150
|
let cleanedId, isep;
|
|
139
151
|
if (data.ep_id) {
|
|
@@ -150,8 +162,9 @@ export class BilibiliData {
|
|
|
150
162
|
});
|
|
151
163
|
return INFO;
|
|
152
164
|
}
|
|
153
|
-
case '番剧下载信息数据':
|
|
165
|
+
case '番剧下载信息数据': {
|
|
154
166
|
return await this.GlobalGetData({ url: bilibiliAPI.番剧视频流信息({ cid: data.cid, ep_id: data.ep_id }) });
|
|
167
|
+
}
|
|
155
168
|
case '用户主页动态列表数据':
|
|
156
169
|
delete this.headers.Referer;
|
|
157
170
|
result = await this.GlobalGetData({
|
|
@@ -230,14 +243,18 @@ export class BilibiliData {
|
|
|
230
243
|
}
|
|
231
244
|
async GlobalGetData(options) {
|
|
232
245
|
const result = await new Networks(options).getData();
|
|
233
|
-
if (result && result.code
|
|
234
|
-
|
|
235
|
-
logger.warn(`获取响应数据失败!\n请求接口类型:${this.type}\n请求URL:${options.url}\n错误代码:${result.code},\n含义:${errorMessage}`);
|
|
236
|
-
return false;
|
|
246
|
+
if (result && result.code === 0) {
|
|
247
|
+
return result;
|
|
237
248
|
}
|
|
238
|
-
else {
|
|
249
|
+
else if (result.code === 12061) {
|
|
250
|
+
logger.warn(`获取响应数据失败!\n请求接口类型:${this.type}\n请求URL:${options.url}\n错误代码:${result.code},\n含义:${result.message}`);
|
|
239
251
|
return result;
|
|
240
252
|
}
|
|
253
|
+
else {
|
|
254
|
+
const errorMessage = errorMap[result.code] || result.message || '未知错误';
|
|
255
|
+
logger.warn(`获取响应数据失败!\n请求接口类型:${this.type}\n请求URL:${options.url}\n错误代码:${result.code},\n含义:${errorMessage}`);
|
|
256
|
+
return false;
|
|
257
|
+
}
|
|
241
258
|
}
|
|
242
259
|
}
|
|
243
260
|
const errorMap = {
|
|
@@ -291,4 +308,4 @@ const errorMap = {
|
|
|
291
308
|
'-799': '请求过于频繁,请稍后再试',
|
|
292
309
|
'-8888': '对不起,服务器开小差了~ (ಥ﹏ಥ)'
|
|
293
310
|
};
|
|
294
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getdata.js","sourceRoot":"","sources":["../../../src/business/bilibili/getdata.ts"],"names":[],"mappings":"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"}
|
|
311
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getdata.js","sourceRoot":"","sources":["../../../src/business/bilibili/getdata.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { logger, Networks } from '../../model/index.js';
|
|
2
2
|
/**
|
|
3
3
|
* return aweme_id
|
|
4
|
-
* @param
|
|
4
|
+
* @param url 分享连接
|
|
5
5
|
* @returns
|
|
6
6
|
*/
|
|
7
7
|
export async function getBilibiliID(url) {
|
|
@@ -18,7 +18,8 @@ export async function getBilibiliID(url) {
|
|
|
18
18
|
}
|
|
19
19
|
case /play\/(\S+?)\??/.test(longLink): {
|
|
20
20
|
const playMatch = longLink.match(/play\/(\w+)/);
|
|
21
|
-
let id = playMatch ? playMatch[1] : ''
|
|
21
|
+
let id = playMatch ? playMatch[1] : '';
|
|
22
|
+
let realid = '';
|
|
22
23
|
if (id.startsWith('ss')) {
|
|
23
24
|
realid = 'season_id';
|
|
24
25
|
}
|
|
@@ -31,10 +32,10 @@ export async function getBilibiliID(url) {
|
|
|
31
32
|
};
|
|
32
33
|
break;
|
|
33
34
|
}
|
|
34
|
-
case /^https:\/\/t\.bilibili\.com\/(\d+)/.test(longLink)
|
|
35
|
+
case /^https:\/\/t\.bilibili\.com\/(\d+)/.test(longLink) ?? /^https:\/\/www\.bilibili\.com\/opus\/(\d+)/.test(longLink): {
|
|
35
36
|
const tMatch = longLink.match(/^https:\/\/t\.bilibili\.com\/(\d+)/);
|
|
36
37
|
const opusMatch = longLink.match(/^https:\/\/www\.bilibili\.com\/opus\/(\d+)/);
|
|
37
|
-
const dynamic_id = tMatch
|
|
38
|
+
const dynamic_id = tMatch ?? opusMatch;
|
|
38
39
|
result = {
|
|
39
40
|
type: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType.动态详情数据 */,
|
|
40
41
|
dynamic_id: dynamic_id ? dynamic_id[1] : ''
|
|
@@ -47,4 +48,4 @@ export async function getBilibiliID(url) {
|
|
|
47
48
|
logger.mark(result);
|
|
48
49
|
return result;
|
|
49
50
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0aWQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYnVzaW5lc3MvYmlsaWJpbGkvZ2V0aWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxRQUFRLEVBQUUsTUFBTSxhQUFhLENBQUE7QUE4QjlDOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGFBQWEsQ0FBRSxHQUFXO0lBQzlDLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxRQUFRLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFBO0lBQzFELElBQUksTUFBTSxHQUFHLEVBQWlCLENBQUE7SUFFOUIsUUFBUSxJQUFJLEVBQUUsQ0FBQztRQUNiLEtBQUssdUJBQXVCLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM1QyxNQUFNLFdBQVcsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUE7WUFDM0QsTUFBTSxHQUFHO2dCQUNQLElBQUksb0ZBQTJCO2dCQUMvQixFQUFFLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7YUFDdEMsQ0FBQTtZQUNELE1BQUs7UUFDUCxDQUFDO1FBQ0QsS0FBSyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3RDLE1BQU0sU0FBUyxHQUFHLFFBQVEsQ0FBQyxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUE7WUFDL0MsSUFBSSxFQUFFLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztZQUFDLElBQUksTUFBTSxHQUFHLEVBQUUsQ0FBQTtZQUN2RCxJQUFJLEVBQUUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztnQkFDeEIsTUFBTSxHQUFHLFdBQVcsQ0FBQTtZQUN0QixDQUFDO2lCQUFNLElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUMvQixNQUFNLEdBQUcsT0FBTyxDQUFBO1lBQ2xCLENBQUM7WUFDRCxNQUFNLEdBQUc7Z0JBQ1AsSUFBSSxvRkFBMkI7Z0JBQy9CLENBQUMsTUFBTSxDQUFDLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7YUFDeEMsQ0FBQTtZQUNELE1BQUs7UUFDUCxDQUFDO1FBQ0QsS0FBSyxvQ0FBb0MsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksNENBQTRDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUN4SCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLG9DQUFvQyxDQUFDLENBQUE7WUFDbkUsTUFBTSxTQUFTLEdBQUcsUUFBUSxDQUFDLEtBQUssQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFBO1lBQzlFLE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxTQUFTLENBQUE7WUFDdEMsTUFBTSxHQUFHO2dCQUNQLElBQUksc0VBQXlCO2dCQUM3QixVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUU7YUFDNUMsQ0FBQTtZQUNELE1BQUs7UUFDUCxDQUFDO1FBQ0Q7WUFDRSxNQUFLO0lBQ1QsQ0FBQztJQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDbkIsT0FBTyxNQUFNLENBQUE7QUFDZixDQUFDIn0=
|
|
@@ -14,4 +14,4 @@ export async function qtparam(BASEURL, cookie) {
|
|
|
14
14
|
else
|
|
15
15
|
return { QUERY: `&qn=${qn[3]}&fnval=16`, STATUS: 'isLogin', isvip };
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXRwYXJhbS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9idXNpbmVzcy9iaWxpYmlsaS9xdHBhcmFtLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxXQUFXLEVBQUUsUUFBUSxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDL0QsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUV0QyxNQUFNLENBQUMsS0FBSyxVQUFVLE9BQU8sQ0FBRSxPQUFlLEVBQUUsTUFBYztJQUM1RCxJQUFJLE1BQU0sS0FBSyxFQUFFO1FBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLENBQUE7SUFDMUUsTUFBTSxTQUFTLEdBQUcsTUFBTSxJQUFJLFFBQVEsQ0FBQyxFQUFFLEdBQUcsRUFBRSxXQUFXLENBQUMsTUFBTSxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUMxRyxNQUFNLElBQUksR0FBRyxNQUFNLFFBQVEsQ0FBQyxPQUFPLEVBQUUsTUFBTSxDQUFDLENBQUE7SUFFNUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0lBQ2hFLElBQUksS0FBSyxDQUFBO0lBQ1QsU0FBUyxDQUFDLElBQUksQ0FBQyxTQUFTLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUE7SUFDakUsSUFBSSxLQUFLLEVBQUUsQ0FBQztRQUNWLE9BQU8sRUFBRSxLQUFLLEVBQUUscUJBQXFCLElBQUksRUFBRSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLENBQUE7SUFDekUsQ0FBQzs7UUFBTSxPQUFPLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsQ0FBQTtBQUM1RSxDQUFDIn0=
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { av2bv, BilibiliData, bv2av, getBilibiliID } from '../../business/bilibili/index.js';
|
|
2
2
|
/**
|
|
3
3
|
*
|
|
4
4
|
* @param options
|
|
@@ -46,7 +46,7 @@ export async function bilibiliResult(config = { cookie: '' }, options = {}) {
|
|
|
46
46
|
break;
|
|
47
47
|
}
|
|
48
48
|
case "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧基本信息数据 */: {
|
|
49
|
-
const hasid = options?.ep_id
|
|
49
|
+
const hasid = options?.ep_id ?? options?.season_id;
|
|
50
50
|
const id = options?.hasOwnProperty('ep_id') ? { ep_id: options?.ep_id } : { season_id: options?.season_id };
|
|
51
51
|
const ivad = Object.keys(id)[0];
|
|
52
52
|
const values = Object.values(id)[0];
|
|
@@ -65,7 +65,7 @@ export async function bilibiliResult(config = { cookie: '' }, options = {}) {
|
|
|
65
65
|
break;
|
|
66
66
|
}
|
|
67
67
|
case 'BV转AV': {
|
|
68
|
-
const bvid = options?.bvid
|
|
68
|
+
const bvid = options?.bvid ?? '';
|
|
69
69
|
data = 'av' + bv2av(bvid);
|
|
70
70
|
break;
|
|
71
71
|
}
|
|
@@ -79,4 +79,4 @@ export async function bilibiliResult(config = { cookie: '' }, options = {}) {
|
|
|
79
79
|
data: data !== '' ? data : null
|
|
80
80
|
};
|
|
81
81
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2J1c2luZXNzL2JpbGliaWxpL3Jlc3VsdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsS0FBSyxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFVbkY7Ozs7O0dBS0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGNBQWMsQ0FDbEMsU0FBUyxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQWtCLEVBQ3ZDLFVBQVUsRUFBeUI7SUFDbkMsSUFBSSxJQUFTLENBQUE7SUFDYixRQUFRLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNwQiwwRUFBNkI7UUFDN0Isd0RBQThCO1FBQzlCLDREQUEyQjtRQUMzQix3RkFBK0I7UUFDL0Isc0dBQWlDO1FBQ2pDLDBFQUE2QjtRQUM3QiwwRUFBNkI7UUFDN0IsbUVBQTRCO1FBQzVCLHdGQUErQjtRQUMvQixtRUFBNEI7UUFDNUIsbUVBQTRCO1FBQzVCLDBFQUE2QjtRQUM3QixvRkFBK0IsQ0FBQyxDQUFDLENBQUM7WUFDaEMsSUFBSSxHQUFHLE1BQU0sSUFBSSxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsTUFBZ0IsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtZQUNwRixNQUFLO1FBQ1AsQ0FBQztRQUNELHFHQUFnQyxDQUFDLENBQUMsQ0FBQztZQUNqQyxJQUFJLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDO2dCQUNsQixJQUFJLEdBQUcsTUFBTSxJQUFJLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxNQUFnQixDQUFDLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFBO1lBQ3RGLENBQUM7aUJBQU0sQ0FBQztnQkFDTixNQUFNLE1BQU0sR0FBRyxNQUFNLGFBQWEsQ0FBQyxP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
|
|
@@ -9,4 +9,4 @@ export default async function getCorrespondPath(timestamp) {
|
|
|
9
9
|
const encrypted = new Uint8Array(await crypto.subtle.encrypt({ name: 'RSA-OAEP' }, publicKey, data));
|
|
10
10
|
return encrypted.reduce((str, c) => str + c.toString(16).padStart(2, '0'), '');
|
|
11
11
|
}
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29ycmVzcG9uZFBhdGguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYnVzaW5lc3MvYmlsaWJpbGkvc2lnbi9Db3JyZXNwb25kUGF0aC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUE7QUFFM0IsTUFBTSxTQUFTLEdBQUcsTUFBTSxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FDN0MsS0FBSyxFQUNMO0lBQ0UsR0FBRyxFQUFFLEtBQUs7SUFDVixDQUFDLEVBQUUsNktBQTZLO0lBQ2hMLENBQUMsRUFBRSxNQUFNO0NBQ1YsRUFDRCxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxFQUNyQyxJQUFJLEVBQ0osQ0FBQyxTQUFTLENBQUMsQ0FDWixDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLFVBQVUsaUJBQWlCLENBQUUsU0FBaUI7SUFDaEUsTUFBTSxJQUFJLEdBQUcsSUFBSSxXQUFXLEVBQUUsQ0FBQyxNQUFNLENBQUMsV0FBVyxTQUFTLEVBQUUsQ0FBQyxDQUFBO0lBQzdELE1BQU0sU0FBUyxHQUFHLElBQUksVUFBVSxDQUFDLE1BQU0sTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsRUFBRSxJQUFJLEVBQUUsVUFBVSxFQUFFLEVBQUUsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUE7SUFDcEcsT0FBTyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQTtBQUNoRixDQUFDIn0=
|
|
@@ -24,4 +24,4 @@ export function bv2av(bvid) {
|
|
|
24
24
|
const tmp = bvidArr.reduce((pre, bvidChar) => pre * BASE + BigInt(data.indexOf(bvidChar)), 0n);
|
|
25
25
|
return Number((tmp & MASK_CODE) ^ XOR_CODE);
|
|
26
26
|
}
|
|
27
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnYyYXYuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYnVzaW5lc3MvYmlsaWJpbGkvc2lnbi9idjJhdi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLFFBQVEsR0FBRyxlQUFlLENBQUE7QUFDaEMsTUFBTSxTQUFTLEdBQUcsaUJBQWlCLENBQUE7QUFDbkMsTUFBTSxPQUFPLEdBQUcsRUFBRSxJQUFJLEdBQUcsQ0FBQTtBQUN6QixNQUFNLElBQUksR0FBRyxHQUFHLENBQUE7QUFFaEIsTUFBTSxJQUFJLEdBQUcsNERBQTRELENBQUE7QUFFekUsTUFBTSxVQUFVLEtBQUssQ0FBRSxHQUFXO0lBQ2hDLE1BQU0sS0FBSyxHQUFHLENBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUMsQ0FBQTtJQUMxRSxJQUFJLE9BQU8sR0FBRyxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQTtJQUM5QixJQUFJLEdBQUcsR0FBRyxDQUFDLE9BQU8sR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxRQUFRLENBQUE7SUFDNUMsT0FBTyxHQUFHLEdBQUcsQ0FBQyxFQUFFLENBQUM7UUFDZixLQUFLLENBQUMsT0FBTyxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNqRCxHQUFHLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQTtRQUNoQixPQUFPLElBQUksQ0FBQyxDQUFBO0lBQ2QsQ0FBQztJQUNELENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzNDLE9BQU8sS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQW1CLENBQUE7QUFDekMsQ0FBQztBQUVELE1BQU0sVUFBVSxLQUFLLENBQUUsSUFBWTtJQUNqQyxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2pDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BELENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ25ELE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBQ3BCLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQyxHQUFHLEVBQUUsUUFBUSxFQUFFLEVBQUUsQ0FBQyxHQUFHLEdBQUcsSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUE7SUFDOUYsT0FBTyxNQUFNLENBQUMsQ0FBQyxHQUFHLEdBQUcsU0FBUyxDQUFDLEdBQUcsUUFBUSxDQUFDLENBQUE7QUFDN0MsQ0FBQyJ9
|
|
@@ -53,4 +53,4 @@ export async function wbi_sign(BASEURL, cookie) {
|
|
|
53
53
|
const query = encWbi(params, web_keys.img_key, web_keys.sub_key);
|
|
54
54
|
return query;
|
|
55
55
|
}
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2JpLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2J1c2luZXNzL2JpbGliaWxpL3NpZ24vd2JpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxNQUFNLE9BQU8sQ0FBQTtBQUN6QixPQUFPLE1BQU0sTUFBTSxRQUFRLENBQUE7QUFFM0IsTUFBTSxjQUFjLEdBQUc7SUFDckIsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUU7SUFDNUosRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUU7Q0FDdkYsQ0FBQTtBQUVELCtCQUErQjtBQUMvQixNQUFNLFdBQVcsR0FBRyxDQUFD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
|
|
@@ -5,7 +5,7 @@ class DouyinAPI {
|
|
|
5
5
|
return `https://www.douyin.com/aweme/v1/web/aweme/detail/?device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=${data.aweme_id}&update_version_code=170400&pc_client_type=1&version_code=190500&version_name=19.5.0&cookie_enabled=true&screen_width=2328&screen_height=1310&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=150&webid=7351848354471872041&msToken=${douyinSign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
|
|
6
6
|
}
|
|
7
7
|
评论(data) {
|
|
8
|
-
return `https://www.douyin.com/aweme/v1/web/comment/list/?device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=${data.aweme_id}&cursor=${data.cursor
|
|
8
|
+
return `https://www.douyin.com/aweme/v1/web/comment/list/?device_platform=webapp&aid=6383&channel=channel_pc_web&aweme_id=${data.aweme_id}&cursor=${data.cursor ?? 0}&count=${data.number ?? 50}&item_type=0&insert_ids=&whale_cut_token=&cut_version=1&rcFT=&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=125.0.0.0&browser_online=true&engine_name=Blink&engine_version=125.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&msToken=${douyinSign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
|
|
9
9
|
}
|
|
10
10
|
二级评论(data) {
|
|
11
11
|
return `https://www.douyin.com/aweme/v1/web/comment/list/reply/?device_platform=webapp&aid=6383&channel=channel_pc_web&item_id=${data.aweme_id}&comment_id=${data.comment_id}&cut_version=1&cursor=0&count=10&item_type=0&pc_client_type=1&version_code=170400&version_name=17.4.0&cookie_enabled=true&screen_width=1552&screen_height=970&browser_language=zh-CN&browser_platform=Win32&browser_name=Chrome&browser_version=126.0.0.0&browser_online=true&engine_name=Blink&engine_version=126.0.0.0&os_name=Windows&os_version=10&cpu_core_num=16&device_memory=8&platform=PC&downlink=10&effective_type=4g&round_trip_time=0&webid=7326516708850599434&msToken=${douyinSign.Mstoken(116)}&verifyFp=${fp}&fp=${fp}`;
|
|
@@ -43,4 +43,4 @@ class DouyinAPI {
|
|
|
43
43
|
}
|
|
44
44
|
/** 该类下的所有方法只会返回拼接好参数后的 Url 地址,需要手动请求该地址以获取数据 */
|
|
45
45
|
export const douyinAPI = new DouyinAPI();
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQVBJLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2J1c2luZXNzL2RvdXlpbi9BUEkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxVQUFVLE1BQU0sUUFBUSxDQUFBO0FBRS9CLE1BQU0sRUFBRSxHQUFHLFVBQVUsQ0FBQyxlQUFlLEVBQUUsQ0FBQTtBQUN2QyxNQUFNLFNBQVM7SUFDYixLQUFLLENBQUUsSUFBdUM7UUFDNUMsT0FBTyxxSEFBcUgsSUFBSSxDQUFDLFFBQVEsMGNBQTBjLFVBQVUsQ0FBQyxPQUFPLENBQ25tQixHQUFHLENBQ0osYUFBYSxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUE7SUFDN0IsQ0FBQztJQUVELEVBQUUsQ0FBRSxJQUEwQztRQUM1QyxPQUFPLHFIQUFxSCxJQUFJLENBQUMsUUFBUSxXQUFXLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxVQUFVLElBQUksQ0FBQyxNQUFNLElBQUksRUFBRSw2YkFBNmIsVUFBVSxDQUFDLE9BQU8sQ0FDNW9CLEdBQUcsQ0FBQyxhQUFhLEVBQUUsT0FBTyxFQUFFLEVBQUUsQ0FBQTtJQUNsQyxDQUFDO0lBRUQsSUFBSSxDQUFFLElBQStDO1FBQ25ELE9BQU8sMEhBQTBILElBQUksQ0FBQyxRQUFRLGVBQWUsSUFBSSxDQUFDLFVBQVUsd2RBQXdkLFVBQVUsQ0FBQyxPQUFPLENBQ3BwQixHQUFHLENBQ0osYUFBYSxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUE7SUFDN0IsQ0FBQztJQUVELEVBQUUsQ0FBRSxJQUF1QztRQUN6QyxPQUFPLHdKQUF3SixJQUFJLENBQUMsUUFBUSxnQ0FBZ0MsVUFBVSxDQUFDLE9BQU8sQ0FDNU4sR0FBRyxDQUFDLGFBQWEsRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFBO0lBQ2xDLENBQUM7SUFFRCxFQUFFO1FBQ0EsT0FBTyxnREFBZ0QsQ0FBQTtJQUN6RCxDQUFDO0lBRUQsTUFBTSxDQUFFLElBQXVDO1FBQzdDLE9BQU8sc0hBQXNILElBQUksQ0FBQyxPQUFPLGtsQkFBa2xCLFVBQVUsQ0FBQyxPQUFPLENBQzN1QixHQUFHLENBQUMsYUFBYSxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUE7SUFDbEMsQ0FBQztJQUVELE1BQU0sQ0FBRSxJQUF1QztRQUM3QyxPQUFPLGtMQUFrTCxJQUFJLENBQUMsT0FBTyx1Y0FBdWMsVUFBVSxDQUFDLE9BQU8sQ0FDNXBCLEdBQUcsQ0FBQyxhQUFhLEVBQUUsT0FBTyxFQUFFLEVBQUUsQ0FBQTtJQUNsQyxDQUFDO0lBRUQsR0FBRyxDQUFFLElBQXlDO1FBQzVDLE9BQU8sdUhBQXVILElBQUksQ0FBQyxLQUFLLG1lQUFtZSxVQUFVLENBQUMsT0FBTyxDQUMzbkIsR0FBRyxDQUFDLGFBQWEsRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFBO0lBQ2xDLENBQUM7SUFFRCxFQUFFLENBQUUsSUFBeUM7UUFDM0MsT0FBTyxxTEFBcUwsSUFBSSxDQUFDLEtBQUssa2hCQUFraEIsVUFBVSxDQUFDLE9BQU8sQ0FDeHVCLEdBQUcsQ0FBQyxhQUFhLEVBQUUsT0FBTyxFQUFFLEVBQUUsQ0FBQTtJQUNsQyxDQUFDO0lBRUQsSUFBSTtRQUNGLE9BQU8sNG1CQUE0bUIsVUFBVSxDQUFDLE9BQU8sQ0FDbm9CLEdBQUcsQ0FDSixhQUFhLEVBQUUsT0FBTyxFQUFFLEVBQUUsQ0FBQTtJQUM3QixDQUFDO0lBRUQsSUFBSSxDQUFFLElBQXdDO1FBQzVDLE9BQU8scUhBQXFILElBQUksQ0FBQyxRQUFRLHdiQUF3YixVQUFVLENBQUMsT0FBTyxDQUNqbEIsR0FBRyxDQUNKLGFBQWEsRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFBO0lBQzdCLENBQUM7SUFFRCxLQUFLLENBQUUsSUFBMkM7UUFDaEQsT0FBTyxvVEFBb1QsSUFBSSxDQUFDLE9BQU8sZ0JBQWdCLElBQUksQ0FBQyxPQUFPLG1GQUFtRixVQUFVLENBQUMsT0FBTyxDQUN0YyxHQUFHLENBQUMsYUFBYSxFQUFFLE9BQU8sRUFBRSxFQUFFLENBQUE7SUFDbEMsQ0FBQztJQUVELEtBQUssQ0FBRSxJQUF5QztRQUM5QyxPQUFPLCtDQUErQyxJQUFJLENBQUMsU0FBUyxPQUFPLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQTtJQUM3RixDQUFDO0NBQ0Y7QUFFRCxnREFBZ0Q7QUFDaEQsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLElBQUksU0FBUyxFQUFFLENBQUEifQ==
|
|
@@ -28,14 +28,14 @@ export class DouyinData {
|
|
|
28
28
|
return VideoData;
|
|
29
29
|
}
|
|
30
30
|
case '评论数据': {
|
|
31
|
-
let cursor = data.cursor
|
|
31
|
+
let cursor = data.cursor ?? 0; // 初始游标值
|
|
32
32
|
const maxPageSize = 50; // 接口单次请求的最大评论数量
|
|
33
33
|
let fetchedComments = []; // 用于存储实际获取的所有评论
|
|
34
34
|
let tmpresp = {};
|
|
35
35
|
// 循环直到获取到足够数量的评论
|
|
36
|
-
while (fetchedComments.length < Number(data.number
|
|
36
|
+
while (fetchedComments.length < Number(data.number ?? 50)) {
|
|
37
37
|
// 计算本次请求需要获取的评论数量,确保不超过剩余需要获取的数量
|
|
38
|
-
const requestCount = Math.min(Number(data.number
|
|
38
|
+
const requestCount = Math.min(Number(data.number ?? 50) - fetchedComments.length, maxPageSize);
|
|
39
39
|
// 构建请求URL
|
|
40
40
|
const url = douyinAPI.评论({
|
|
41
41
|
aweme_id: data.aweme_id,
|
|
@@ -64,7 +64,7 @@ export class DouyinData {
|
|
|
64
64
|
// 使用最后一次请求的接口响应格式,替换其中的评论数据
|
|
65
65
|
const finalResponse = {
|
|
66
66
|
...tmpresp,
|
|
67
|
-
comments: data.number === 0 ? [] : fetchedComments.slice(0, Number(data.number
|
|
67
|
+
comments: data.number === 0 ? [] : fetchedComments.slice(0, Number(data.number ?? 50)),
|
|
68
68
|
cursor: data.number === 0 ? 0 : fetchedComments.length
|
|
69
69
|
};
|
|
70
70
|
return finalResponse;
|
|
@@ -3,4 +3,4 @@ import { DouyinData } from './getdata.js';
|
|
|
3
3
|
import { getDouyinID } from './getid.js';
|
|
4
4
|
import { douyinResult } from './result.js';
|
|
5
5
|
import douyinSign from './sign/index.js';
|
|
6
|
-
export { douyinAPI, DouyinData, douyinResult,
|
|
6
|
+
export { douyinAPI, DouyinData, douyinResult, douyinSign, getDouyinID };
|
|
@@ -3,5 +3,5 @@ import { DouyinData } from './getdata.js';
|
|
|
3
3
|
import { getDouyinID } from './getid.js';
|
|
4
4
|
import { douyinResult } from './result.js';
|
|
5
5
|
import douyinSign from './sign/index.js';
|
|
6
|
-
export { douyinAPI, DouyinData, douyinResult,
|
|
7
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
6
|
+
export { douyinAPI, DouyinData, douyinResult, douyinSign, getDouyinID };
|
|
7
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYnVzaW5lc3MvZG91eWluL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxPQUFPLENBQUE7QUFDakMsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUN0QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sU0FBUyxDQUFBO0FBQ3JDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxVQUFVLENBQUE7QUFDdkMsT0FBTyxVQUFVLE1BQU0sUUFBUSxDQUFBO0FBRS9CLE9BQU8sRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLFlBQVksRUFBRSxVQUFVLEVBQUUsV0FBVyxFQUFFLENBQUEifQ==
|
|
@@ -47,4 +47,4 @@ export async function douyinResult(config = { cookie: '' }, options = {}) {
|
|
|
47
47
|
data: result !== false && result !== '' ? result : null
|
|
48
48
|
};
|
|
49
49
|
}
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzdWx0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2J1c2luZXNzL2RvdXlpbi9yZXN1bHQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQVEvRCxNQUFNLENBQUMsS0FBSyxVQUFVLFlBQVksQ0FDaEMsU0FBdUIsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFrQixFQUNyRCxVQUFVLEVBQXVCO0lBQ2pDLElBQUksTUFBVyxDQUFBO0lBQ2YsUUFBUSxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDcEIsd0VBQTJCO1FBQzNCLHdFQUEyQjtRQUMzQixvR0FBK0I7UUFDL0IsaUVBQTBCO1FBQzFCLDBEQUF5QjtRQUN6QixzREFBNEI7UUFDNUIsd0VBQTJCO1FBQzNCLDBEQUF5QjtRQUN6QiwrRUFBNEI7UUFDNUIsOEVBQTJCLENBQUMsQ0FBQyxDQUFDO1lBQzVCLE1BQU0sR0FBRyxNQUFNLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtZQUMxRSxNQUFLO1FBQ1AsQ0FBQztRQUNELHlEQUF3QixDQUFDLENBQUMsQ0FBQztZQUN6QixJQUFJLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRSxDQUFDO2dCQUNsQixNQUFNLEdBQUcsTUFBTSxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUE7WUFDNUUsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE1BQU0sTUFBTSxHQUFHLE1BQU0sV0FBVyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtnQkFDckQsTUFBTSxHQUFHLE1BQU0sSUFBSSxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsR0FBRyxPQUFPLEVBQUUsR0FBRyxNQUFNLEVBQUUsQ0FBQyxDQUFBO1lBQzlGLENBQUM7WUFDRCxNQUFLO1FBQ1AsQ0FBQztRQUNELHNGQUE2QjtRQUM3QixzRkFBNkI7UUFDN0IsdUVBQTBCLENBQUMsQ0FBQyxDQUFDO1lBQzNCLElBQUksQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUM7Z0JBQ2xCLE1BQU0sR0FBRyxNQUFNLElBQUksVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQTtZQUM1RSxDQUFDO2lCQUFNLENBQUM7Z0JBQ04sTUFBTSxNQUFNLEdBQUcsTUFBTSxXQUFXLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO2dCQUNyRCxNQUFNLEdBQUcsTUFBTSxJQUFJLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyxPQUFPLENBQUMsRUFBRSxHQUFHLE9BQU8sRUFBRSxHQUFHLE1BQU0sRUFBRSxDQUFDLENBQUE7WUFDOUYsQ0FBQztZQUNELE1BQUs7UUFDUCxDQUFDO1FBQ0Q7WUFDRSxNQUFNLEdBQUcsRUFBRSxDQUFBO1lBQ1gsTUFBSztJQUNULENBQUM7SUFDRCxPQUFPO1FBQ0wsSUFBSSxFQUFFLE1BQU0sS0FBSyxLQUFLLElBQUksTUFBTSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHO1FBQ25ELE9BQU8sRUFBRSxNQUFNLEtBQUssS0FBSyxJQUFJLE1BQU0sS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsT0FBTztRQUNoRSxJQUFJLEVBQUUsTUFBTSxLQUFLLEtBQUssSUFBSSxNQUFNLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUk7S0FDeEQsQ0FBQTtBQUNILENBQUMifQ==
|