pixivflow 2.0.41 → 2.1.0
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/LICENSE +21 -674
- package/README.md +67 -574
- package/README_EN.md +71 -1523
- package/dist/commands/SchedulerCommand.d.ts.map +1 -1
- package/dist/commands/SchedulerCommand.js +5 -1
- package/dist/commands/SchedulerCommand.js.map +1 -1
- package/dist/download/DownloadManager.d.ts +9 -0
- package/dist/download/DownloadManager.d.ts.map +1 -1
- package/dist/download/DownloadManager.js +27 -0
- package/dist/download/DownloadManager.js.map +1 -1
- package/dist/download/pipeline/DownloadPipeline.d.ts +6 -0
- package/dist/download/pipeline/DownloadPipeline.d.ts.map +1 -1
- package/dist/download/pipeline/DownloadPipeline.js +4 -2
- package/dist/download/pipeline/DownloadPipeline.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/scheduler/Scheduler.d.ts +17 -4
- package/dist/scheduler/Scheduler.d.ts.map +1 -1
- package/dist/scheduler/Scheduler.js +58 -20
- package/dist/scheduler/Scheduler.js.map +1 -1
- package/dist/utils/errors.d.ts +9 -0
- package/dist/utils/errors.d.ts.map +1 -1
- package/dist/utils/errors.js +17 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/webui/package.json +1 -1
- package/dist/webui/routes/handlers/download-basic-handlers.d.ts.map +1 -1
- package/dist/webui/routes/handlers/download-basic-handlers.js +6 -20
- package/dist/webui/routes/handlers/download-basic-handlers.js.map +1 -1
- package/dist/webui/routes/handlers/download-url-handlers.d.ts +3 -6
- package/dist/webui/routes/handlers/download-url-handlers.d.ts.map +1 -1
- package/dist/webui/routes/handlers/download-url-handlers.js +72 -138
- package/dist/webui/routes/handlers/download-url-handlers.js.map +1 -1
- package/dist/webui/server/server-routes.d.ts.map +1 -1
- package/dist/webui/server/server-routes.js +6 -2
- package/dist/webui/server/server-routes.js.map +1 -1
- package/dist/webui/server/server.d.ts.map +1 -1
- package/dist/webui/server/server.js +25 -3
- package/dist/webui/server/server.js.map +1 -1
- package/dist/webui/services/DownloadTaskManager.d.ts +12 -0
- package/dist/webui/services/DownloadTaskManager.d.ts.map +1 -1
- package/dist/webui/services/DownloadTaskManager.js +119 -51
- package/dist/webui/services/DownloadTaskManager.js.map +1 -1
- package/dist/webui/utils/task-serialize.d.ts +31 -0
- package/dist/webui/utils/task-serialize.d.ts.map +1 -0
- package/dist/webui/utils/task-serialize.js +40 -0
- package/dist/webui/utils/task-serialize.js.map +1 -0
- package/dist/webui/websocket/DownloadStatus.d.ts +19 -0
- package/dist/webui/websocket/DownloadStatus.d.ts.map +1 -0
- package/dist/webui/websocket/DownloadStatus.js +61 -0
- package/dist/webui/websocket/DownloadStatus.js.map +1 -0
- package/package.json +11 -10
|
@@ -13,6 +13,7 @@ const Database_1 = require("../../../storage/Database");
|
|
|
13
13
|
const config_1 = require("../../../config");
|
|
14
14
|
const path_1 = require("path");
|
|
15
15
|
const error_codes_1 = require("../../utils/error-codes");
|
|
16
|
+
const task_serialize_1 = require("../../utils/task-serialize");
|
|
16
17
|
/**
|
|
17
18
|
* Convert host file path to container path if needed
|
|
18
19
|
* This handles the case where database contains host paths but we're running in Docker
|
|
@@ -49,22 +50,7 @@ function convertFilePathToContainerPath(filePath, config) {
|
|
|
49
50
|
// The file preview route will handle the error
|
|
50
51
|
return filePath;
|
|
51
52
|
}
|
|
52
|
-
|
|
53
|
-
* Helper function to serialize TaskStatus for JSON response
|
|
54
|
-
*/
|
|
55
|
-
function serializeTaskStatus(task) {
|
|
56
|
-
if (!task)
|
|
57
|
-
return null;
|
|
58
|
-
return {
|
|
59
|
-
...task,
|
|
60
|
-
startTime: task.startTime instanceof Date ? task.startTime.toISOString() : task.startTime,
|
|
61
|
-
endTime: task.endTime instanceof Date ? task.endTime.toISOString() : task.endTime,
|
|
62
|
-
logs: task.logs?.map((log) => ({
|
|
63
|
-
...log,
|
|
64
|
-
timestamp: log.timestamp instanceof Date ? log.timestamp.toISOString() : log.timestamp,
|
|
65
|
-
})),
|
|
66
|
-
};
|
|
67
|
-
}
|
|
53
|
+
// serializeTaskStatus is provided by ../../utils/task-serialize (shared with websocket layer)
|
|
68
54
|
/**
|
|
69
55
|
* POST /api/download/start
|
|
70
56
|
* Start a download task
|
|
@@ -159,7 +145,7 @@ async function getDownloadStatus(req, res) {
|
|
|
159
145
|
const status = DownloadTaskManager_1.downloadTaskManager.getTaskStatus(taskId);
|
|
160
146
|
if (status) {
|
|
161
147
|
res.json({
|
|
162
|
-
data: serializeTaskStatus(status),
|
|
148
|
+
data: (0, task_serialize_1.serializeTaskStatus)(status),
|
|
163
149
|
});
|
|
164
150
|
return;
|
|
165
151
|
}
|
|
@@ -172,7 +158,7 @@ async function getDownloadStatus(req, res) {
|
|
|
172
158
|
if (historyRecord) {
|
|
173
159
|
const historyStatus = deserializeTaskHistory(historyRecord);
|
|
174
160
|
res.json({
|
|
175
|
-
data: serializeTaskStatus(historyStatus),
|
|
161
|
+
data: (0, task_serialize_1.serializeTaskStatus)(historyStatus),
|
|
176
162
|
});
|
|
177
163
|
database.close();
|
|
178
164
|
database = null;
|
|
@@ -218,8 +204,8 @@ async function getDownloadStatus(req, res) {
|
|
|
218
204
|
database = null;
|
|
219
205
|
res.json({
|
|
220
206
|
data: {
|
|
221
|
-
activeTask: serializeTaskStatus(activeTask),
|
|
222
|
-
allTasks: mergedTasks.map(serializeTaskStatus),
|
|
207
|
+
activeTask: (0, task_serialize_1.serializeTaskStatus)(activeTask),
|
|
208
|
+
allTasks: mergedTasks.map(task_serialize_1.serializeTaskStatus),
|
|
223
209
|
hasActiveTask: DownloadTaskManager_1.downloadTaskManager.hasActiveTask(),
|
|
224
210
|
},
|
|
225
211
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-basic-handlers.js","sourceRoot":"","sources":["../../../../src/webui/routes/handlers/download-basic-handlers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"download-basic-handlers.js","sourceRoot":"","sources":["../../../../src/webui/routes/handlers/download-basic-handlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,20 +1,17 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
2
|
/**
|
|
3
3
|
* POST /api/download/url
|
|
4
|
-
* Download from Pixiv URL or ID
|
|
5
|
-
* Body: { url: string }
|
|
4
|
+
* Download from Pixiv URL or ID. Body: { url: string }
|
|
6
5
|
*/
|
|
7
6
|
export declare function downloadFromUrl(req: Request, res: Response): Promise<void>;
|
|
8
7
|
/**
|
|
9
8
|
* POST /api/download/batch-url
|
|
10
|
-
* Download multiple URLs at once
|
|
11
|
-
* Body: { urls: string[] }
|
|
9
|
+
* Download multiple URLs at once. Body: { urls: string[] }
|
|
12
10
|
*/
|
|
13
11
|
export declare function downloadFromBatchUrls(req: Request, res: Response): Promise<void>;
|
|
14
12
|
/**
|
|
15
13
|
* POST /api/download/parse-url
|
|
16
|
-
* Parse Pixiv URL without downloading (for preview)
|
|
17
|
-
* Body: { url: string }
|
|
14
|
+
* Parse Pixiv URL without downloading (for preview). Body: { url: string }
|
|
18
15
|
*/
|
|
19
16
|
export declare function parseUrl(req: Request, res: Response): Promise<void>;
|
|
20
17
|
//# sourceMappingURL=download-url-handlers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-url-handlers.d.ts","sourceRoot":"","sources":["../../../../src/webui/routes/handlers/download-url-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"download-url-handlers.d.ts","sourceRoot":"","sources":["../../../../src/webui/routes/handlers/download-url-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AA8C5C;;;GAGG;AACH,wBAAsB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDhF;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAoEtF;AAED;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAiEzE"}
|
|
@@ -6,85 +6,38 @@ exports.parseUrl = parseUrl;
|
|
|
6
6
|
const logger_1 = require("../../../logger");
|
|
7
7
|
const DownloadTaskManager_1 = require("../../services/DownloadTaskManager");
|
|
8
8
|
const error_codes_1 = require("../../utils/error-codes");
|
|
9
|
+
const pixiv_url_parser_1 = require("../../../utils/pixiv-url-parser");
|
|
9
10
|
/**
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
* -
|
|
15
|
-
*
|
|
16
|
-
* - https://pixiv.net/artworks/123456
|
|
17
|
-
* - https://pixiv.net/i/123456 (short format)
|
|
18
|
-
* - Direct ID: 123456
|
|
11
|
+
* Convert a shared-parser result into a target config plus a human label.
|
|
12
|
+
* Delegates to the SAME parser used by the CLI (`pixivflow download --url`)
|
|
13
|
+
* so WebUI and CLI accept an identical set of URL forms:
|
|
14
|
+
*
|
|
15
|
+
* artworks / en-artworks / i-short / member_illust legacy / novel show /
|
|
16
|
+
* novel series / users/{uid} / users/{uid}/artworks|novels/{id} / bare ID.
|
|
19
17
|
*/
|
|
20
|
-
function
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
urlObj = new URL(trimmedUrl);
|
|
31
|
-
}
|
|
32
|
-
catch {
|
|
33
|
-
// If URL parsing fails, try adding https://
|
|
34
|
-
try {
|
|
35
|
-
urlObj = new URL(`https://${trimmedUrl}`);
|
|
36
|
-
}
|
|
37
|
-
catch {
|
|
38
|
-
// If still fails, it's not a valid URL format
|
|
39
|
-
return null;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
// Check if it's a Pixiv domain (support www.pixiv.net, pixiv.net, etc.)
|
|
43
|
-
const hostname = urlObj.hostname.toLowerCase();
|
|
44
|
-
if (!hostname.includes('pixiv.net') && !hostname.includes('pixiv.org')) {
|
|
45
|
-
return null;
|
|
46
|
-
}
|
|
47
|
-
// Extract ID from different URL formats
|
|
48
|
-
const pathname = urlObj.pathname.toLowerCase();
|
|
49
|
-
const searchParams = urlObj.searchParams;
|
|
50
|
-
// Format: /artworks/123456 or /en/artworks/123456 or /zh-cn/artworks/123456
|
|
51
|
-
const artworksMatch = pathname.match(/\/artworks\/(\d+)/);
|
|
52
|
-
if (artworksMatch) {
|
|
53
|
-
return { id: artworksMatch[1], type: 'illustration' };
|
|
54
|
-
}
|
|
55
|
-
// Format: /i/123456 (short format for illustrations)
|
|
56
|
-
const shortIllustMatch = pathname.match(/^\/i\/(\d+)$/);
|
|
57
|
-
if (shortIllustMatch) {
|
|
58
|
-
return { id: shortIllustMatch[1], type: 'illustration' };
|
|
59
|
-
}
|
|
60
|
-
// Format: /member_illust.php?illust_id=123456 or ?mode=medium&illust_id=123456
|
|
61
|
-
const illustId = searchParams.get('illust_id');
|
|
62
|
-
if (illustId && /^\d+$/.test(illustId)) {
|
|
63
|
-
return { id: illustId, type: 'illustration' };
|
|
64
|
-
}
|
|
65
|
-
// Format: /novel/show.php?id=123456
|
|
66
|
-
if (pathname.includes('/novel/')) {
|
|
67
|
-
const novelId = searchParams.get('id');
|
|
68
|
-
if (novelId && /^\d+$/.test(novelId)) {
|
|
69
|
-
return { id: novelId, type: 'novel' };
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
// Format: /users/123456/artworks/789012 (user's artwork page)
|
|
73
|
-
const userArtworkMatch = pathname.match(/\/users\/\d+\/artworks\/(\d+)/);
|
|
74
|
-
if (userArtworkMatch) {
|
|
75
|
-
return { id: userArtworkMatch[1], type: 'illustration' };
|
|
76
|
-
}
|
|
77
|
-
return null;
|
|
18
|
+
function toTarget(parsed) {
|
|
19
|
+
return (0, pixiv_url_parser_1.parsedUrlToTargetConfig)(parsed);
|
|
20
|
+
}
|
|
21
|
+
function describeTarget(target) {
|
|
22
|
+
if (target.userId) {
|
|
23
|
+
return {
|
|
24
|
+
workId: target.userId,
|
|
25
|
+
workType: target.type,
|
|
26
|
+
label: `user ${target.userId} (${target.type} works)`,
|
|
27
|
+
};
|
|
78
28
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
29
|
+
if (target.seriesId) {
|
|
30
|
+
return {
|
|
31
|
+
workType: 'novel',
|
|
32
|
+
label: `novel series ${target.seriesId}`,
|
|
33
|
+
};
|
|
82
34
|
}
|
|
35
|
+
const id = String(target.illustId ?? target.novelId ?? '');
|
|
36
|
+
return { workId: id || undefined, workType: target.type, label: `${target.type} ${id}` };
|
|
83
37
|
}
|
|
84
38
|
/**
|
|
85
39
|
* POST /api/download/url
|
|
86
|
-
* Download from Pixiv URL or ID
|
|
87
|
-
* Body: { url: string }
|
|
40
|
+
* Download from Pixiv URL or ID. Body: { url: string }
|
|
88
41
|
*/
|
|
89
42
|
async function downloadFromUrl(req, res) {
|
|
90
43
|
try {
|
|
@@ -96,16 +49,14 @@ async function downloadFromUrl(req, res) {
|
|
|
96
49
|
});
|
|
97
50
|
return;
|
|
98
51
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
if (!parsed) {
|
|
52
|
+
const parsed = (0, pixiv_url_parser_1.parsePixivUrl)(url);
|
|
53
|
+
if (!parsed || (!parsed.id && !parsed.seriesId && !parsed.userId)) {
|
|
102
54
|
res.status(400).json({
|
|
103
55
|
errorCode: error_codes_1.ErrorCode.INVALID_REQUEST,
|
|
104
|
-
message: 'Invalid Pixiv URL or ID. Supported formats
|
|
56
|
+
message: 'Invalid Pixiv URL or ID. Supported formats include https://www.pixiv.net/artworks/123456, https://www.pixiv.net/novel/series/123456, https://www.pixiv.net/users/123456 or a bare ID such as 123456',
|
|
105
57
|
});
|
|
106
58
|
return;
|
|
107
59
|
}
|
|
108
|
-
// Check if there's already an active task
|
|
109
60
|
if (DownloadTaskManager_1.downloadTaskManager.hasActiveTask()) {
|
|
110
61
|
res.status(409).json({
|
|
111
62
|
errorCode: error_codes_1.ErrorCode.DOWNLOAD_TASK_ALREADY_RUNNING,
|
|
@@ -114,30 +65,18 @@ async function downloadFromUrl(req, res) {
|
|
|
114
65
|
return;
|
|
115
66
|
}
|
|
116
67
|
const taskId = `url_task_${Date.now()}`;
|
|
117
|
-
|
|
118
|
-
const tempConfig = {
|
|
119
|
-
|
|
120
|
-
parsed.type === 'illustration'
|
|
121
|
-
? {
|
|
122
|
-
type: 'illustration',
|
|
123
|
-
illustId: parseInt(parsed.id, 10),
|
|
124
|
-
}
|
|
125
|
-
: {
|
|
126
|
-
type: 'novel',
|
|
127
|
-
novelId: parseInt(parsed.id, 10),
|
|
128
|
-
},
|
|
129
|
-
],
|
|
130
|
-
};
|
|
131
|
-
// Start task in background
|
|
68
|
+
const target = toTarget(parsed);
|
|
69
|
+
const tempConfig = { targets: [target] };
|
|
70
|
+
const info = describeTarget(target);
|
|
132
71
|
DownloadTaskManager_1.downloadTaskManager.startTask(taskId, undefined, tempConfig).catch((error) => {
|
|
133
72
|
logger_1.logger.error('Background URL download task error', { error, taskId, url, parsed });
|
|
134
73
|
});
|
|
135
74
|
res.json({
|
|
136
75
|
success: true,
|
|
137
76
|
taskId,
|
|
138
|
-
workId:
|
|
139
|
-
workType:
|
|
140
|
-
message: `Started downloading ${
|
|
77
|
+
...(info.workId ? { workId: info.workId } : {}),
|
|
78
|
+
workType: info.workType,
|
|
79
|
+
message: `Started downloading ${info.label}`,
|
|
141
80
|
errorCode: error_codes_1.ErrorCode.DOWNLOAD_START_SUCCESS,
|
|
142
81
|
});
|
|
143
82
|
}
|
|
@@ -151,8 +90,7 @@ async function downloadFromUrl(req, res) {
|
|
|
151
90
|
}
|
|
152
91
|
/**
|
|
153
92
|
* POST /api/download/batch-url
|
|
154
|
-
* Download multiple URLs at once
|
|
155
|
-
* Body: { urls: string[] }
|
|
93
|
+
* Download multiple URLs at once. Body: { urls: string[] }
|
|
156
94
|
*/
|
|
157
95
|
async function downloadFromBatchUrls(req, res) {
|
|
158
96
|
try {
|
|
@@ -164,18 +102,20 @@ async function downloadFromBatchUrls(req, res) {
|
|
|
164
102
|
});
|
|
165
103
|
return;
|
|
166
104
|
}
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
105
|
+
const items = urls.map((url) => ({
|
|
106
|
+
url: url,
|
|
107
|
+
parsed: typeof url === 'string'
|
|
108
|
+
? (0, pixiv_url_parser_1.parsePixivUrl)(url)
|
|
109
|
+
: null,
|
|
110
|
+
}));
|
|
111
|
+
const valid = items.filter((item) => item.parsed && (item.parsed.id || item.parsed.seriesId || item.parsed.userId));
|
|
112
|
+
if (valid.length === 0) {
|
|
172
113
|
res.status(400).json({
|
|
173
114
|
errorCode: error_codes_1.ErrorCode.INVALID_REQUEST,
|
|
174
115
|
message: 'No valid Pixiv URLs found',
|
|
175
116
|
});
|
|
176
117
|
return;
|
|
177
118
|
}
|
|
178
|
-
// Check if there's already an active task
|
|
179
119
|
if (DownloadTaskManager_1.downloadTaskManager.hasActiveTask()) {
|
|
180
120
|
res.status(409).json({
|
|
181
121
|
errorCode: error_codes_1.ErrorCode.DOWNLOAD_TASK_ALREADY_RUNNING,
|
|
@@ -184,23 +124,8 @@ async function downloadFromBatchUrls(req, res) {
|
|
|
184
124
|
return;
|
|
185
125
|
}
|
|
186
126
|
const taskId = `batch_url_task_${Date.now()}`;
|
|
187
|
-
|
|
188
|
-
const
|
|
189
|
-
const parsedItem = item.parsed;
|
|
190
|
-
return parsedItem.type === 'illustration'
|
|
191
|
-
? {
|
|
192
|
-
type: 'illustration',
|
|
193
|
-
illustId: parseInt(parsedItem.id, 10),
|
|
194
|
-
}
|
|
195
|
-
: {
|
|
196
|
-
type: 'novel',
|
|
197
|
-
novelId: parseInt(parsedItem.id, 10),
|
|
198
|
-
};
|
|
199
|
-
});
|
|
200
|
-
const tempConfig = {
|
|
201
|
-
targets,
|
|
202
|
-
};
|
|
203
|
-
// Start task in background
|
|
127
|
+
const targets = valid.map((item) => toTarget(item.parsed));
|
|
128
|
+
const tempConfig = { targets };
|
|
204
129
|
DownloadTaskManager_1.downloadTaskManager.startTask(taskId, undefined, tempConfig).catch((error) => {
|
|
205
130
|
logger_1.logger.error('Background batch URL download task error', { error, taskId, urls });
|
|
206
131
|
});
|
|
@@ -208,14 +133,14 @@ async function downloadFromBatchUrls(req, res) {
|
|
|
208
133
|
success: true,
|
|
209
134
|
taskId,
|
|
210
135
|
totalUrls: urls.length,
|
|
211
|
-
validUrls:
|
|
212
|
-
invalidUrls: urls.length -
|
|
213
|
-
targets:
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
})
|
|
218
|
-
message: `Started downloading ${
|
|
136
|
+
validUrls: valid.length,
|
|
137
|
+
invalidUrls: urls.length - valid.length,
|
|
138
|
+
targets: valid.map((item) => {
|
|
139
|
+
const t = toTarget(item.parsed);
|
|
140
|
+
const info = describeTarget(t);
|
|
141
|
+
return { url: item.url, workId: info.workId, workType: info.workType };
|
|
142
|
+
}),
|
|
143
|
+
message: `Started downloading ${valid.length} works`,
|
|
219
144
|
errorCode: error_codes_1.ErrorCode.DOWNLOAD_START_SUCCESS,
|
|
220
145
|
});
|
|
221
146
|
}
|
|
@@ -229,14 +154,12 @@ async function downloadFromBatchUrls(req, res) {
|
|
|
229
154
|
}
|
|
230
155
|
/**
|
|
231
156
|
* POST /api/download/parse-url
|
|
232
|
-
* Parse Pixiv URL without downloading (for preview)
|
|
233
|
-
* Body: { url: string }
|
|
157
|
+
* Parse Pixiv URL without downloading (for preview). Body: { url: string }
|
|
234
158
|
*/
|
|
235
159
|
async function parseUrl(req, res) {
|
|
236
160
|
try {
|
|
237
161
|
const { url } = req.body;
|
|
238
162
|
if (!url || typeof url !== 'string') {
|
|
239
|
-
// 返回 200 状态码,但 success: false,以便前端统一处理
|
|
240
163
|
res.status(200).json({
|
|
241
164
|
data: {
|
|
242
165
|
success: false,
|
|
@@ -246,9 +169,8 @@ async function parseUrl(req, res) {
|
|
|
246
169
|
});
|
|
247
170
|
return;
|
|
248
171
|
}
|
|
249
|
-
const parsed = parsePixivUrl(url);
|
|
250
|
-
if (!parsed) {
|
|
251
|
-
// 返回 200 状态码,但 success: false,以便前端统一处理
|
|
172
|
+
const parsed = (0, pixiv_url_parser_1.parsePixivUrl)(url);
|
|
173
|
+
if (!parsed || (!parsed.id && !parsed.seriesId && !parsed.userId)) {
|
|
252
174
|
res.status(200).json({
|
|
253
175
|
data: {
|
|
254
176
|
success: false,
|
|
@@ -257,25 +179,37 @@ async function parseUrl(req, res) {
|
|
|
257
179
|
'- https://www.pixiv.net/artworks/123456\n' +
|
|
258
180
|
'- https://www.pixiv.net/en/artworks/123456\n' +
|
|
259
181
|
'- https://www.pixiv.net/member_illust.php?illust_id=123456\n' +
|
|
182
|
+
'- https://www.pixiv.net/i/123456\n' +
|
|
260
183
|
'- https://www.pixiv.net/novel/show.php?id=123456\n' +
|
|
261
|
-
'- https://pixiv.net/
|
|
184
|
+
'- https://www.pixiv.net/novel/series/123456\n' +
|
|
185
|
+
'- https://www.pixiv.net/users/123456\n' +
|
|
262
186
|
'- Direct ID: 123456',
|
|
263
187
|
},
|
|
264
188
|
});
|
|
265
189
|
return;
|
|
266
190
|
}
|
|
191
|
+
let target;
|
|
192
|
+
try {
|
|
193
|
+
target = toTarget(parsed);
|
|
194
|
+
}
|
|
195
|
+
catch (error) {
|
|
196
|
+
target = undefined;
|
|
197
|
+
logger_1.logger.warn('Parsed URL could not be converted to a target', { url, error });
|
|
198
|
+
}
|
|
199
|
+
const info = target ? describeTarget(target) : undefined;
|
|
267
200
|
res.status(200).json({
|
|
268
201
|
data: {
|
|
269
202
|
success: true,
|
|
270
|
-
|
|
271
|
-
|
|
203
|
+
type: parsed.type,
|
|
204
|
+
...(info?.workId ? { workId: info.workId } : {}),
|
|
205
|
+
workType: info?.workType,
|
|
206
|
+
identifier: info?.label,
|
|
272
207
|
originalUrl: url,
|
|
273
208
|
},
|
|
274
209
|
});
|
|
275
210
|
}
|
|
276
211
|
catch (error) {
|
|
277
212
|
logger_1.logger.error('Failed to parse URL', { error });
|
|
278
|
-
// 返回 200 状态码,但 success: false,以便前端统一处理
|
|
279
213
|
res.status(200).json({
|
|
280
214
|
data: {
|
|
281
215
|
success: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"download-url-handlers.js","sourceRoot":"","sources":["../../../../src/webui/routes/handlers/download-url-handlers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"download-url-handlers.js","sourceRoot":"","sources":["../../../../src/webui/routes/handlers/download-url-handlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-routes.d.ts","sourceRoot":"","sources":["../../../src/webui/server/server-routes.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAU9D;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"server-routes.d.ts","sourceRoot":"","sources":["../../../src/webui/server/server-routes.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAC;AAU9D;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAkB9C"}
|
|
@@ -16,9 +16,13 @@ const files_1 = __importDefault(require("../routes/files"));
|
|
|
16
16
|
*/
|
|
17
17
|
function setupRoutes(app) {
|
|
18
18
|
// Health check
|
|
19
|
-
|
|
19
|
+
// Both /api/health and /health are provided: the alias keeps container
|
|
20
|
+
// healthchecks and reverse proxies simple (same payload on both).
|
|
21
|
+
const healthHandler = (req, res) => {
|
|
20
22
|
res.json({ status: 'ok', timestamp: new Date().toISOString() });
|
|
21
|
-
}
|
|
23
|
+
};
|
|
24
|
+
app.get('/api/health', healthHandler);
|
|
25
|
+
app.get('/health', healthHandler);
|
|
22
26
|
// API routes
|
|
23
27
|
app.use('/api/auth', auth_1.default);
|
|
24
28
|
app.use('/api/config', config_1.default);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-routes.js","sourceRoot":"","sources":["../../../src/webui/server/server-routes.ts"],"names":[],"mappings":";;;;;AAaA,
|
|
1
|
+
{"version":3,"file":"server-routes.js","sourceRoot":"","sources":["../../../src/webui/server/server-routes.ts"],"names":[],"mappings":";;;;;AAaA,kCAkBC;AA7BD,SAAS;AACT,0DAAwC;AACxC,8DAA4C;AAC5C,kEAAgD;AAChD,4DAA0C;AAC1C,0DAAwC;AACxC,4DAA0C;AAE1C;;GAEG;AACH,SAAgB,WAAW,CAAC,GAAY;IACtC,eAAe;IACf,uEAAuE;IACvE,kEAAkE;IAClE,MAAM,aAAa,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;QACpD,GAAG,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IACtC,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IAElC,aAAa;IACb,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,cAAU,CAAC,CAAC;IACjC,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,gBAAY,CAAC,CAAC;IACrC,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,kBAAc,CAAC,CAAC;IACzC,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,eAAW,CAAC,CAAC;IACnC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,cAAU,CAAC,CAAC;IACjC,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,eAAW,CAAC,CAAC;AACrC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/webui/server/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAgB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/webui/server/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,OAAgB,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,MAAM,IAAI,YAAY,EAAE,MAAM,WAAW,CAAC;AAgBnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE7C,qBAAa,WAAW;IACtB,OAAO,CAAC,GAAG,CAAU;IACrB,OAAO,CAAC,MAAM,CAAkC;IAChD,OAAO,CAAC,EAAE,CAAe;IACzB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,IAAI,CAAS;IAEd,OAAO,IAAI,MAAM;gBAIZ,OAAO,GAAE,kBAAuB;IAmC/B,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IA4C9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrB,MAAM,IAAI,OAAO;IAIjB,KAAK,IAAI,YAAY;CAG7B;AAED;;GAEG;AACH,wBAAsB,UAAU,CAC9B,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,MAAM,CAAC,CA8CjB"}
|
|
@@ -40,6 +40,7 @@ const Database_1 = require("../../storage/Database");
|
|
|
40
40
|
const config_1 = require("../../config");
|
|
41
41
|
// WebSocket handlers
|
|
42
42
|
const LogStream_1 = require("../websocket/LogStream");
|
|
43
|
+
const DownloadStatus_1 = require("../websocket/DownloadStatus");
|
|
43
44
|
// Server setup modules
|
|
44
45
|
const server_middleware_1 = require("./server-middleware");
|
|
45
46
|
const server_routes_1 = require("./server-routes");
|
|
@@ -79,18 +80,39 @@ class WebUIServer {
|
|
|
79
80
|
});
|
|
80
81
|
// Setup WebSocket handlers
|
|
81
82
|
(0, LogStream_1.setupLogStream)(this.io);
|
|
83
|
+
(0, DownloadStatus_1.setupDownloadStatus)(this.io);
|
|
82
84
|
}
|
|
83
85
|
async start() {
|
|
84
86
|
return new Promise(async (resolve, reject) => {
|
|
85
87
|
let actualPort = this.port;
|
|
86
|
-
//
|
|
87
|
-
|
|
88
|
+
// Opt-in automatic port fallback: PIXIV_WEBUI_AUTO_PORT=true picks the
|
|
89
|
+
// next free port instead of failing on EADDRINUSE.
|
|
90
|
+
if (process.env.PIXIV_WEBUI_AUTO_PORT === 'true') {
|
|
91
|
+
try {
|
|
92
|
+
const available = await (0, server_utils_1.findAvailablePort)(this.port, this.host);
|
|
93
|
+
if (available !== this.port) {
|
|
94
|
+
logger_1.logger.warn(`Port ${this.port} busy; falling back to ${available} (PIXIV_WEBUI_AUTO_PORT)`, {
|
|
95
|
+
requestedPort: this.port,
|
|
96
|
+
actualPort: available,
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
actualPort = available;
|
|
100
|
+
this.port = available;
|
|
101
|
+
}
|
|
102
|
+
catch (error) {
|
|
103
|
+
(0, server_utils_1.logServerError)(error instanceof Error ? error.message : String(error));
|
|
104
|
+
reject(error);
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
// Try to start on the resolved port
|
|
109
|
+
this.server.listen(actualPort, this.host, () => {
|
|
88
110
|
(0, server_utils_1.logServerStart)(this.host, actualPort);
|
|
89
111
|
resolve(actualPort);
|
|
90
112
|
});
|
|
91
113
|
this.server.on('error', (err) => {
|
|
92
114
|
if (err.code === 'EADDRINUSE') {
|
|
93
|
-
const errorMsg = `Port ${this.port} is already in use.
|
|
115
|
+
const errorMsg = `Port ${this.port} is already in use. Free the port, pass --port/-e PORT, or set PIXIV_WEBUI_AUTO_PORT=true to pick the next free port automatically.`;
|
|
94
116
|
logger_1.logger.error(errorMsg);
|
|
95
117
|
(0, server_utils_1.logServerError)(errorMsg);
|
|
96
118
|
reject(new Error(errorMsg));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/webui/server/server.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;;;;;;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/webui/server/server.ts"],"names":[],"mappings":"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"}
|