pixivflow 2.4.0 → 2.6.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/README.md +45 -0
- package/README_EN.md +40 -0
- package/dist/config/types.d.ts +51 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/validation.d.ts.map +1 -1
- package/dist/config/validation.js +41 -0
- package/dist/config/validation.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js.map +1 -1
- package/dist/delivery/DeliveryDispatcher.d.ts +11 -0
- package/dist/delivery/DeliveryDispatcher.d.ts.map +1 -0
- package/dist/delivery/DeliveryDispatcher.js +31 -0
- package/dist/delivery/DeliveryDispatcher.js.map +1 -0
- package/dist/delivery/DeliveryOutbox.d.ts +23 -0
- package/dist/delivery/DeliveryOutbox.d.ts.map +1 -0
- package/dist/delivery/DeliveryOutbox.js +172 -0
- package/dist/delivery/DeliveryOutbox.js.map +1 -0
- package/dist/delivery/HttpMultipartDelivery.d.ts +18 -0
- package/dist/delivery/HttpMultipartDelivery.d.ts.map +1 -0
- package/dist/delivery/HttpMultipartDelivery.js +217 -0
- package/dist/delivery/HttpMultipartDelivery.js.map +1 -0
- package/dist/delivery/types.d.ts +31 -0
- package/dist/delivery/types.d.ts.map +1 -0
- package/dist/delivery/types.js +3 -0
- package/dist/delivery/types.js.map +1 -0
- package/dist/download/DownloadManager.d.ts +2 -0
- package/dist/download/DownloadManager.d.ts.map +1 -1
- package/dist/download/DownloadManager.js +30 -2
- package/dist/download/DownloadManager.js.map +1 -1
- package/dist/download/IllustrationDownloader.d.ts +2 -1
- package/dist/download/IllustrationDownloader.d.ts.map +1 -1
- package/dist/download/IllustrationDownloader.js +29 -4
- package/dist/download/IllustrationDownloader.js.map +1 -1
- package/dist/download/NovelDownloader.d.ts +2 -1
- package/dist/download/NovelDownloader.d.ts.map +1 -1
- package/dist/download/NovelDownloader.js +9 -1
- package/dist/download/NovelDownloader.js.map +1 -1
- package/dist/download/handlers/IllustrationTargetHandler.d.ts +4 -1
- package/dist/download/handlers/IllustrationTargetHandler.d.ts.map +1 -1
- package/dist/download/handlers/IllustrationTargetHandler.js +12 -4
- package/dist/download/handlers/IllustrationTargetHandler.js.map +1 -1
- package/dist/download/handlers/NovelTargetHandler.d.ts +4 -1
- package/dist/download/handlers/NovelTargetHandler.d.ts.map +1 -1
- package/dist/download/handlers/NovelTargetHandler.js +13 -5
- package/dist/download/handlers/NovelTargetHandler.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/utils/config-validator-unified.d.ts.map +1 -1
- package/dist/utils/config-validator-unified.js +56 -0
- package/dist/utils/config-validator-unified.js.map +1 -1
- package/dist/utils/errors.d.ts +8 -0
- package/dist/utils/errors.d.ts.map +1 -1
- package/dist/utils/errors.js +16 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/webui/package.json +1 -1
- package/dist/webui/server/server-utils.d.ts +1 -1
- package/dist/webui/server/server-utils.d.ts.map +1 -1
- package/dist/webui/server/server-utils.js +2 -2
- package/dist/webui/server/server-utils.js.map +1 -1
- package/dist/webui/server/server.d.ts +1 -0
- package/dist/webui/server/server.d.ts.map +1 -1
- package/dist/webui/server/server.js +31 -3
- package/dist/webui/server/server.js.map +1 -1
- package/dist/webui/server/types.d.ts +8 -0
- package/dist/webui/server/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,217 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.HttpMultipartDelivery = void 0;
|
|
37
|
+
const fs = __importStar(require("node:fs"));
|
|
38
|
+
const path = __importStar(require("node:path"));
|
|
39
|
+
const node_crypto_1 = require("node:crypto");
|
|
40
|
+
const node_stream_1 = require("node:stream");
|
|
41
|
+
const logger_1 = require("../logger");
|
|
42
|
+
/** Generic streaming HTTP multipart delivery provider. */
|
|
43
|
+
class HttpMultipartDelivery {
|
|
44
|
+
config;
|
|
45
|
+
dispatcher;
|
|
46
|
+
constructor(config, proxyUrl) {
|
|
47
|
+
this.config = config;
|
|
48
|
+
if (proxyUrl) {
|
|
49
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
50
|
+
const { ProxyAgent } = require('undici');
|
|
51
|
+
this.dispatcher = new ProxyAgent(proxyUrl);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
async deliver(request) {
|
|
55
|
+
if (request.files.length === 0) {
|
|
56
|
+
throw new Error('HTTP multipart delivery requires at least one file');
|
|
57
|
+
}
|
|
58
|
+
const maxAttempts = Math.max(1, this.config.maxAttempts ?? 3);
|
|
59
|
+
const retryDelayMs = Math.max(0, this.config.retryDelayMs ?? 2000);
|
|
60
|
+
let lastError;
|
|
61
|
+
for (let attempt = 1; attempt <= maxAttempts; attempt++) {
|
|
62
|
+
try {
|
|
63
|
+
return await this.attempt(request);
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
lastError = error;
|
|
67
|
+
logger_1.logger.warn(`HTTP multipart delivery attempt ${attempt}/${maxAttempts} failed`, {
|
|
68
|
+
url: this.config.url,
|
|
69
|
+
error: error instanceof Error ? error.message : String(error),
|
|
70
|
+
files: request.files.length,
|
|
71
|
+
});
|
|
72
|
+
if (attempt < maxAttempts) {
|
|
73
|
+
await new Promise((resolve) => setTimeout(resolve, retryDelayMs * attempt));
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
throw new Error(`HTTP multipart delivery failed after ${maxAttempts} attempts: ${lastError instanceof Error ? lastError.message : String(lastError)}`);
|
|
78
|
+
}
|
|
79
|
+
async attempt(request) {
|
|
80
|
+
const fields = this.resolveFields({ ...(this.config.fields ?? {}), ...(request.fields ?? {}) }, request);
|
|
81
|
+
const multipart = await this.createMultipartBody(request.files, fields);
|
|
82
|
+
const headers = {
|
|
83
|
+
...this.resolveHeaders(this.config.headers ?? {}),
|
|
84
|
+
'Content-Type': `multipart/form-data; boundary=${multipart.boundary}`,
|
|
85
|
+
'Content-Length': String(multipart.contentLength),
|
|
86
|
+
};
|
|
87
|
+
const options = {
|
|
88
|
+
method: this.config.method ?? 'POST',
|
|
89
|
+
body: multipart.body,
|
|
90
|
+
headers,
|
|
91
|
+
duplex: 'half',
|
|
92
|
+
};
|
|
93
|
+
if (this.dispatcher)
|
|
94
|
+
options.dispatcher = this.dispatcher;
|
|
95
|
+
const response = await fetch(this.interpolateEnvironment(this.config.url), options);
|
|
96
|
+
const text = await response.text();
|
|
97
|
+
let body = text;
|
|
98
|
+
if (text) {
|
|
99
|
+
try {
|
|
100
|
+
body = JSON.parse(text);
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
// Non-JSON responses are valid when only HTTP status is configured.
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
this.assertSuccess(response, body);
|
|
107
|
+
logger_1.logger.info('HTTP multipart delivery succeeded', {
|
|
108
|
+
url: this.config.url,
|
|
109
|
+
status: response.status,
|
|
110
|
+
files: request.files.length,
|
|
111
|
+
});
|
|
112
|
+
return { status: response.status, body };
|
|
113
|
+
}
|
|
114
|
+
assertSuccess(response, body) {
|
|
115
|
+
const expectedStatuses = this.config.success?.statuses;
|
|
116
|
+
const statusOk = expectedStatuses
|
|
117
|
+
? expectedStatuses.includes(response.status)
|
|
118
|
+
: response.ok;
|
|
119
|
+
if (!statusOk) {
|
|
120
|
+
throw new Error(`delivery endpoint returned HTTP ${response.status}: ${this.preview(body)}`);
|
|
121
|
+
}
|
|
122
|
+
const jsonPath = this.config.success?.jsonPath;
|
|
123
|
+
if (jsonPath) {
|
|
124
|
+
const actual = jsonPath.split('.').reduce((value, key) => {
|
|
125
|
+
if (!value || typeof value !== 'object')
|
|
126
|
+
return undefined;
|
|
127
|
+
return value[key];
|
|
128
|
+
}, body);
|
|
129
|
+
const expected = Object.prototype.hasOwnProperty.call(this.config.success, 'equals')
|
|
130
|
+
? this.config.success?.equals
|
|
131
|
+
: true;
|
|
132
|
+
if (!Object.is(actual, expected)) {
|
|
133
|
+
throw new Error(`delivery response ${jsonPath} did not equal ${JSON.stringify(expected)}: ${this.preview(body)}`);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
resolveHeaders(headers) {
|
|
138
|
+
return Object.fromEntries(Object.entries(headers).map(([key, value]) => [key, this.interpolateEnvironment(value)]));
|
|
139
|
+
}
|
|
140
|
+
resolveFields(fields, request) {
|
|
141
|
+
const variables = {
|
|
142
|
+
title: request.context.title,
|
|
143
|
+
pixivId: request.context.pixivId,
|
|
144
|
+
type: request.context.type,
|
|
145
|
+
tag: request.context.tag ?? '',
|
|
146
|
+
};
|
|
147
|
+
return Object.fromEntries(Object.entries(fields).map(([name, value]) => {
|
|
148
|
+
const values = Array.isArray(value) ? value : [value];
|
|
149
|
+
const rendered = values.map((item) => String(item).replace(/\{\{(title|pixivId|type|tag)\}\}/g, (_, key) => variables[key]));
|
|
150
|
+
switch (this.config.arrayFormat ?? 'comma') {
|
|
151
|
+
case 'repeat':
|
|
152
|
+
return [name, rendered];
|
|
153
|
+
case 'json':
|
|
154
|
+
return [name, [JSON.stringify(rendered)]];
|
|
155
|
+
default:
|
|
156
|
+
return [name, [rendered.join(',')]];
|
|
157
|
+
}
|
|
158
|
+
}));
|
|
159
|
+
}
|
|
160
|
+
interpolateEnvironment(value) {
|
|
161
|
+
return value.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_match, name) => {
|
|
162
|
+
const resolved = process.env[name];
|
|
163
|
+
if (resolved === undefined) {
|
|
164
|
+
throw new Error(`Required delivery environment variable is not set: ${name}`);
|
|
165
|
+
}
|
|
166
|
+
return resolved;
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
async createMultipartBody(files, fields) {
|
|
170
|
+
const boundary = `pixivflow-${(0, node_crypto_1.randomUUID)()}`;
|
|
171
|
+
const fileField = this.escapeDispositionValue(this.config.fileField ?? 'files');
|
|
172
|
+
const fileParts = [];
|
|
173
|
+
let contentLength = 0;
|
|
174
|
+
for (const file of files) {
|
|
175
|
+
const filename = this.escapeDispositionValue(path.basename(file));
|
|
176
|
+
const header = Buffer.from(`--${boundary}\r\n` +
|
|
177
|
+
`Content-Disposition: form-data; name="${fileField}"; filename="${filename}"\r\n` +
|
|
178
|
+
'Content-Type: application/octet-stream\r\n\r\n');
|
|
179
|
+
const stat = await fs.promises.stat(file);
|
|
180
|
+
fileParts.push({ header, path: file, size: stat.size });
|
|
181
|
+
contentLength += header.length + stat.size + 2;
|
|
182
|
+
}
|
|
183
|
+
const fieldParts = [];
|
|
184
|
+
for (const [name, values] of Object.entries(fields)) {
|
|
185
|
+
for (const value of values) {
|
|
186
|
+
const part = Buffer.from(`--${boundary}\r\n` +
|
|
187
|
+
`Content-Disposition: form-data; name="${this.escapeDispositionValue(name)}"\r\n\r\n` +
|
|
188
|
+
`${value}\r\n`);
|
|
189
|
+
fieldParts.push(part);
|
|
190
|
+
contentLength += part.length;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
const closing = Buffer.from(`--${boundary}--\r\n`);
|
|
194
|
+
contentLength += closing.length;
|
|
195
|
+
const body = node_stream_1.Readable.from((async function* () {
|
|
196
|
+
for (const file of fileParts) {
|
|
197
|
+
yield file.header;
|
|
198
|
+
for await (const chunk of fs.createReadStream(file.path))
|
|
199
|
+
yield chunk;
|
|
200
|
+
yield Buffer.from('\r\n');
|
|
201
|
+
}
|
|
202
|
+
for (const part of fieldParts)
|
|
203
|
+
yield part;
|
|
204
|
+
yield closing;
|
|
205
|
+
})());
|
|
206
|
+
return { boundary, body, contentLength };
|
|
207
|
+
}
|
|
208
|
+
escapeDispositionValue(value) {
|
|
209
|
+
return value.replace(/[\r\n]/g, ' ').replace(/"/g, '%22');
|
|
210
|
+
}
|
|
211
|
+
preview(body) {
|
|
212
|
+
const value = typeof body === 'string' ? body : JSON.stringify(body);
|
|
213
|
+
return value.slice(0, 500);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
exports.HttpMultipartDelivery = HttpMultipartDelivery;
|
|
217
|
+
//# sourceMappingURL=HttpMultipartDelivery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HttpMultipartDelivery.js","sourceRoot":"","sources":["../../src/delivery/HttpMultipartDelivery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { DeliveryFieldValue } from '../config';
|
|
2
|
+
export type DeliveryItemType = 'illustration' | 'novel';
|
|
3
|
+
/** Files produced for one Pixiv work and needed by a delivery provider. */
|
|
4
|
+
export interface DownloadedArtifact {
|
|
5
|
+
pixivId: string;
|
|
6
|
+
type: DeliveryItemType;
|
|
7
|
+
title: string;
|
|
8
|
+
/** Files sent to the configured delivery target. */
|
|
9
|
+
files: string[];
|
|
10
|
+
/** Local sidecars deleted with cache files after successful delivery. */
|
|
11
|
+
cleanupFiles?: string[];
|
|
12
|
+
}
|
|
13
|
+
export interface DeliveryContext {
|
|
14
|
+
title: string;
|
|
15
|
+
pixivId: string;
|
|
16
|
+
type: DeliveryItemType;
|
|
17
|
+
tag?: string;
|
|
18
|
+
}
|
|
19
|
+
export interface DeliveryRequest {
|
|
20
|
+
files: string[];
|
|
21
|
+
fields?: Record<string, DeliveryFieldValue>;
|
|
22
|
+
context: DeliveryContext;
|
|
23
|
+
}
|
|
24
|
+
export interface DeliveryResult {
|
|
25
|
+
status?: number;
|
|
26
|
+
body?: unknown;
|
|
27
|
+
}
|
|
28
|
+
export interface DeliveryProvider {
|
|
29
|
+
deliver(request: DeliveryRequest): Promise<DeliveryResult>;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/delivery/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C,MAAM,MAAM,gBAAgB,GAAG,cAAc,GAAG,OAAO,CAAC;AAExD,2EAA2E;AAC3E,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,gBAAgB,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,yEAAyE;IACzE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,gBAAgB,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC5C,OAAO,EAAE,eAAe,CAAC;CAC1B;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CAC5D"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/delivery/types.ts"],"names":[],"mappings":""}
|
|
@@ -43,6 +43,7 @@ export declare class DownloadManager implements IDownloadManager {
|
|
|
43
43
|
private readonly novelHandler;
|
|
44
44
|
private cancelled;
|
|
45
45
|
private cancelReason;
|
|
46
|
+
private readonly deliveryOutbox;
|
|
46
47
|
/**
|
|
47
48
|
* Request cooperative cancellation of the current run. In-flight item
|
|
48
49
|
* finishes; no further targets/items are started. runAllTargets() will
|
|
@@ -56,5 +57,6 @@ export declare class DownloadManager implements IDownloadManager {
|
|
|
56
57
|
runAllTargets(): Promise<void>;
|
|
57
58
|
private dispatchTarget;
|
|
58
59
|
private updateProgress;
|
|
60
|
+
private buildProxyUrl;
|
|
59
61
|
}
|
|
60
62
|
//# sourceMappingURL=DownloadManager.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadManager.d.ts","sourceRoot":"","sources":["../../src/download/DownloadManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAgB,MAAM,WAAW,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"DownloadManager.d.ts","sourceRoot":"","sources":["../../src/download/DownloadManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAgB,MAAM,WAAW,CAAC;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAgB1D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,qBAAa,eAAgB,YAAW,gBAAgB;IAmCpD,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IArC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAChE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkB;IAClD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwB;IACtD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAA4B;IAChE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAGlD,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAEhD;;;;OAIG;IACI,MAAM,CAAC,MAAM,GAAE,MAAoB,GAAG,IAAI;IAQ1C,WAAW,IAAI,OAAO;gBAKV,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,SAAS,EACnB,WAAW,EAAE,YAAY;IAqE5C,mBAAmB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAIlF,UAAU;IAIV,aAAa;YAsDZ,cAAc;IAa5B,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,aAAa;CAetB"}
|
|
@@ -11,6 +11,9 @@ const DownloadExecutor_1 = require("./exec/DownloadExecutor");
|
|
|
11
11
|
const ErrorRecovery_1 = require("./recovery/ErrorRecovery");
|
|
12
12
|
const DownloadPipeline_1 = require("./pipeline/DownloadPipeline");
|
|
13
13
|
const errors_1 = require("../utils/errors");
|
|
14
|
+
const DeliveryDispatcher_1 = require("../delivery/DeliveryDispatcher");
|
|
15
|
+
const DeliveryOutbox_1 = require("../delivery/DeliveryOutbox");
|
|
16
|
+
const node_path_1 = require("node:path");
|
|
14
17
|
const IllustrationTargetHandler_1 = require("./handlers/IllustrationTargetHandler");
|
|
15
18
|
const NovelTargetHandler_1 = require("./handlers/NovelTargetHandler");
|
|
16
19
|
/**
|
|
@@ -54,6 +57,7 @@ class DownloadManager {
|
|
|
54
57
|
// Cooperative cancellation state (see cancel())
|
|
55
58
|
cancelled = false;
|
|
56
59
|
cancelReason = '';
|
|
60
|
+
deliveryOutbox;
|
|
57
61
|
/**
|
|
58
62
|
* Request cooperative cancellation of the current run. In-flight item
|
|
59
63
|
* finishes; no further targets/items are started. runAllTargets() will
|
|
@@ -99,8 +103,11 @@ class DownloadManager {
|
|
|
99
103
|
recovery: this.errorRecovery,
|
|
100
104
|
isCancelled: () => this.cancelled,
|
|
101
105
|
});
|
|
102
|
-
|
|
103
|
-
|
|
106
|
+
const databasePath = config.storage?.databasePath ?? './data/pixiv-downloader.db';
|
|
107
|
+
const deliveryDispatcher = new DeliveryDispatcher_1.DeliveryDispatcher(config.delivery, this.buildProxyUrl(config.network));
|
|
108
|
+
this.deliveryOutbox = new DeliveryOutbox_1.DeliveryOutbox((0, node_path_1.join)((0, node_path_1.dirname)(databasePath), 'delivery-outbox'), deliveryDispatcher, config.delivery?.deleteAfterDelivery !== false);
|
|
109
|
+
this.illustrationHandler = new IllustrationTargetHandler_1.IllustrationTargetHandler(client, database, this.rankingService, this.illustrationDownloader, this.pipeline, this.deliveryOutbox);
|
|
110
|
+
this.novelHandler = new NovelTargetHandler_1.NovelTargetHandler(client, database, this.rankingService, this.pipeline, this.novelDownloader, this.deliveryOutbox);
|
|
104
111
|
}
|
|
105
112
|
setProgressCallback(callback) {
|
|
106
113
|
this.progressReporter.setCallback(callback);
|
|
@@ -109,6 +116,10 @@ class DownloadManager {
|
|
|
109
116
|
await this.fileService.initialise();
|
|
110
117
|
}
|
|
111
118
|
async runAllTargets() {
|
|
119
|
+
const pending = await this.deliveryOutbox.retryPending();
|
|
120
|
+
if (pending.succeeded > 0 || pending.failed > 0) {
|
|
121
|
+
logger_1.logger.info('Processed pending deliveries', { ...pending });
|
|
122
|
+
}
|
|
112
123
|
const totalTargets = this.config.targets.length;
|
|
113
124
|
if (totalTargets === 0) {
|
|
114
125
|
this.progressReporter.complete(0, '所有目标处理完成');
|
|
@@ -163,6 +174,23 @@ class DownloadManager {
|
|
|
163
174
|
updateProgress(current, total, message) {
|
|
164
175
|
this.progressReporter.update(current, total, message);
|
|
165
176
|
}
|
|
177
|
+
buildProxyUrl(network) {
|
|
178
|
+
const proxy = network?.proxy;
|
|
179
|
+
if (!proxy?.enabled) {
|
|
180
|
+
return undefined;
|
|
181
|
+
}
|
|
182
|
+
const protocol = proxy.protocol ?? 'http';
|
|
183
|
+
if (protocol !== 'http' && protocol !== 'https') {
|
|
184
|
+
logger_1.logger.warn(`HTTP multipart delivery does not support ${protocol} proxy through undici; delivering directly`);
|
|
185
|
+
return undefined;
|
|
186
|
+
}
|
|
187
|
+
const url = new URL(`${protocol}://${proxy.host}:${proxy.port}`);
|
|
188
|
+
if (proxy.username)
|
|
189
|
+
url.username = proxy.username;
|
|
190
|
+
if (proxy.password)
|
|
191
|
+
url.password = proxy.password;
|
|
192
|
+
return url.toString();
|
|
193
|
+
}
|
|
166
194
|
}
|
|
167
195
|
exports.DownloadManager = DownloadManager;
|
|
168
196
|
//# sourceMappingURL=DownloadManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadManager.js","sourceRoot":"","sources":["../../src/download/DownloadManager.ts"],"names":[],"mappings":";;;AACA,sCAAmC;AAKnC,qDAAkD;AAClD,qEAAkE;AAClE,uDAAoD;AACpD,gEAA6D;AAC7D,4DAAyD;AACzD,8DAA2D;AAC3D,4DAAuF;AACvF,kEAA+D;AAC/D,4CAA0D;AAC1D,oFAAiF;AACjF,sEAAmE;AAEnE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"DownloadManager.js","sourceRoot":"","sources":["../../src/download/DownloadManager.ts"],"names":[],"mappings":";;;AACA,sCAAmC;AAKnC,qDAAkD;AAClD,qEAAkE;AAClE,uDAAoD;AACpD,gEAA6D;AAC7D,4DAAyD;AACzD,8DAA2D;AAC3D,4DAAuF;AACvF,kEAA+D;AAC/D,4CAA0D;AAC1D,uEAAoE;AACpE,+DAA4D;AAC5D,yCAA0C;AAC1C,oFAAiF;AACjF,sEAAmE;AAEnE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAa,eAAe;IAmCP;IACA;IACA;IACA;IArCF,gBAAgB,CAAmB;IACnC,cAAc,CAAiB;IAC/B,sBAAsB,CAAyB;IAC/C,eAAe,CAAkB;IACjC,OAAO,CAAkB;IACzB,QAAQ,CAAmB;IAC3B,aAAa,CAAwB;IACrC,QAAQ,CAAmB;IAC3B,mBAAmB,CAA4B;IAC/C,YAAY,CAAqB;IAElD,gDAAgD;IACxC,SAAS,GAAG,KAAK,CAAC;IAClB,YAAY,GAAG,EAAE,CAAC;IACT,cAAc,CAAiB;IAEhD;;;;OAIG;IACI,MAAM,CAAC,SAAiB,WAAW;QACxC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC;YAC3B,eAAM,CAAC,IAAI,CAAC,oCAAoC,MAAM,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,YACmB,MAAwB,EACxB,MAAoB,EACpB,QAAmB,EACnB,WAAyB;QAHzB,WAAM,GAAN,MAAM,CAAkB;QACxB,WAAM,GAAN,MAAM,CAAc;QACpB,aAAQ,GAAR,QAAQ,CAAW;QACnB,gBAAW,GAAX,WAAW,CAAc;QAE1C,IAAI,CAAC,gBAAgB,GAAG,IAAI,mCAAgB,EAAE,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,MAAM,CAAC,CAAC;QAEjD,MAAM,mBAAmB,GAAG,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,EAAE,qBAAqB,IAAI,MAAM,CAAC,OAAO,EAAE,iBAAiB,IAAI,aAAa,CAAC;QAEhH,IAAI,CAAC,sBAAsB,GAAG,IAAI,+CAAsB,CACtD,MAAM,EACN,QAAQ,EACR,WAAW,EACX,mBAAmB,EACnB,WAAW,CACZ,CAAC;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,GAAG,IAAI,iCAAe,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,GAAG,IAAI,mCAAgB,EAAE,CAAC;QAEvC,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC7C,MAAM,UAAU,GAAG,cAAc,CAAC,UAAU,IAAI,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,cAAc,CAAC,UAAU,IAAI,IAAI,CAAC;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;QAEtD,IAAI,CAAC,aAAa,GAAG,IAAI,oCAAoB,CAAC;YAC5C,WAAW,EAAE,UAAU;YACvB,WAAW,EAAE,UAAU;YACvB,UAAU,EAAE,QAAQ;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,GAAG,IAAI,mCAAgB,CAAC;YACnC,MAAM;YACN,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,QAAQ,EAAE,IAAI,CAAC,aAAa;YAC5B,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS;SAClC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,EAAE,YAAY,IAAI,4BAA4B,CAAC;QAClF,MAAM,kBAAkB,GAAG,IAAI,uCAAkB,CAC/C,MAAM,CAAC,QAAQ,EACf,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CACnC,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CACtC,IAAA,gBAAI,EAAC,IAAA,mBAAO,EAAC,YAAY,CAAC,EAAE,iBAAiB,CAAC,EAC9C,kBAAkB,EAClB,MAAM,CAAC,QAAQ,EAAE,mBAAmB,KAAK,KAAK,CAC/C,CAAC;QAEF,IAAI,CAAC,mBAAmB,GAAG,IAAI,qDAAyB,CACtD,MAAM,EACN,QAAQ,EACR,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,sBAAsB,EAC3B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,cAAc,CACpB,CAAC;QAEF,IAAI,CAAC,YAAY,GAAG,IAAI,uCAAkB,CACxC,MAAM,EACN,QAAQ,EACR,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,cAAc,CACpB,CAAC;IACJ,CAAC;IAED,mBAAmB,CAAC,QAAoE;QACtF,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzD,IAAI,OAAO,CAAC,SAAS,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChD,eAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAC9D,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;QAEhD,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,MAAM,MAAM,GAA6C,EAAE,CAAC;QAE5D,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACzC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,eAAM,CAAC,IAAI,CAAC,sBAAsB,YAAY,GAAG,aAAa,GAAG,CAAC,eAAe,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;gBACtG,MAAM;YACR,CAAC;YAED,aAAa,EAAE,CAAC;YAChB,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC;YAC/D,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,YAAY,EAAE,SAAS,UAAU,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;YAEzF,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACpC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC5E,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,UAAU,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;gBAC/E,eAAM,CAAC,KAAK,CAAC,UAAU,UAAU,KAAK,MAAM,CAAC,IAAI,uCAAuC,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;YACrH,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,IAAI,gCAAuB,CAAC,UAAU,IAAI,CAAC,YAAY,IAAI,MAAM,EAAE,CAAC,CAAC;QAC7E,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAEzD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,eAAM,CAAC,IAAI,CAAC,kBAAkB,MAAM,CAAC,MAAM,mBAAmB,EAAE;gBAC9D,aAAa,EAAE,MAAM,CAAC,MAAM;gBAC5B,YAAY;gBACZ,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;aAChE,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;gBACnC,MAAM,IAAI,KAAK,CAAC,OAAO,YAAY,0CAA0C,CAAC,CAAC;YACjF,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,MAAoB;QAC/C,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;YACpB,KAAK,cAAc;gBACjB,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM;YACZ,KAAK,OAAO;gBACV,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjC,MAAM;YACd;gBACE,eAAM,CAAC,IAAI,CAAC,2BAA2B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,OAAe,EAAE,KAAa,EAAE,OAAgB;QACrE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IACxD,CAAC;IAEO,aAAa,CAAC,OAAoC;QACxD,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,CAAC;QAC7B,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,MAAM,CAAC;QAC1C,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YAChD,eAAM,CAAC,IAAI,CAAC,4CAA4C,QAAQ,4CAA4C,CAAC,CAAC;YAC9G,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,QAAQ,MAAM,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QACjE,IAAI,KAAK,CAAC,QAAQ;YAAE,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAClD,IAAI,KAAK,CAAC,QAAQ;YAAE,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAClD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;CACF;AAzMD,0CAyMC"}
|
|
@@ -2,6 +2,7 @@ import { IPixivClient } from '../interfaces/IPixivClient';
|
|
|
2
2
|
import { IDatabase } from '../interfaces/IDatabase';
|
|
3
3
|
import { IFileService } from '../interfaces/IFileService';
|
|
4
4
|
import { PixivIllust } from '../pixiv/PixivClient';
|
|
5
|
+
import { DownloadedArtifact } from '../delivery/types';
|
|
5
6
|
/**
|
|
6
7
|
* Service for downloading illustrations
|
|
7
8
|
*/
|
|
@@ -15,7 +16,7 @@ export declare class IllustrationDownloader {
|
|
|
15
16
|
/**
|
|
16
17
|
* Download an illustration
|
|
17
18
|
*/
|
|
18
|
-
downloadIllustration(illust: PixivIllust, tag: string): Promise<
|
|
19
|
+
downloadIllustration(illust: PixivIllust, tag: string): Promise<DownloadedArtifact | null>;
|
|
19
20
|
/**
|
|
20
21
|
* Download an ugoira (animation) work: fetch metadata, download the frame
|
|
21
22
|
* zip (original size when available), and save the frame-delay sidecar so
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IllustrationDownloader.d.ts","sourceRoot":"","sources":["../../src/download/IllustrationDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAmB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"IllustrationDownloader.d.ts","sourceRoot":"","sources":["../../src/download/IllustrationDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAmB,MAAM,sBAAsB,CAAC;AAMpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD;;GAEG;AACH,qBAAa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAJX,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,SAAS,EACnB,WAAW,EAAE,YAAY,EACzB,mBAAmB,EAAE,MAAM,EAC3B,WAAW,EAAE,MAAM;IAGtC;;OAEG;IACG,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAwKhG;;;;OAIG;YACW,cAAc;IA8F5B;;OAEG;YACW,6BAA6B;IAgC3C;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkB5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAiBvB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAQzB"}
|
|
@@ -82,7 +82,12 @@ class IllustrationDownloader {
|
|
|
82
82
|
});
|
|
83
83
|
}
|
|
84
84
|
logger_1.logger.info(`Updated database with ${existingFiles.length} existing file(s) for illustration ${detail.id}`);
|
|
85
|
-
return
|
|
85
|
+
return {
|
|
86
|
+
pixivId: String(detail.id),
|
|
87
|
+
type: 'illustration',
|
|
88
|
+
title: detail.title,
|
|
89
|
+
files: existingFiles,
|
|
90
|
+
};
|
|
86
91
|
}
|
|
87
92
|
// Add timeout protection for getIllustDetailWithTags to prevent hanging
|
|
88
93
|
const { illust: detail, tags } = await Promise.race([
|
|
@@ -138,17 +143,20 @@ class IllustrationDownloader {
|
|
|
138
143
|
bookmark_count: detail.bookmark_count,
|
|
139
144
|
view_count: detail.view_count,
|
|
140
145
|
};
|
|
146
|
+
let metadataPath;
|
|
141
147
|
try {
|
|
142
|
-
await this.fileService.saveMetadata(filePath, pixivMetadata);
|
|
148
|
+
metadataPath = await this.fileService.saveMetadata(filePath, pixivMetadata);
|
|
143
149
|
}
|
|
144
150
|
catch (error) {
|
|
145
151
|
// Log warning but don't fail the download if metadata save fails
|
|
146
152
|
logger_1.logger.warn(`Failed to save metadata for illustration ${detail.id} page ${index + 1}: ${error instanceof Error ? error.message : String(error)}`);
|
|
147
153
|
}
|
|
148
|
-
return { filePath, index: index + 1 };
|
|
154
|
+
return { filePath, index: index + 1, metadataPath };
|
|
149
155
|
}, concurrency);
|
|
150
156
|
// Insert download records and log results
|
|
151
157
|
let successCount = 0;
|
|
158
|
+
const files = [];
|
|
159
|
+
const cleanupFiles = [];
|
|
152
160
|
for (const result of downloadResults) {
|
|
153
161
|
if (result.success) {
|
|
154
162
|
this.database.insertDownload({
|
|
@@ -167,6 +175,10 @@ class IllustrationDownloader {
|
|
|
167
175
|
filePath: result.result.filePath
|
|
168
176
|
});
|
|
169
177
|
successCount++;
|
|
178
|
+
files.push(result.result.filePath);
|
|
179
|
+
if (result.result.metadataPath) {
|
|
180
|
+
cleanupFiles.push(result.result.metadataPath);
|
|
181
|
+
}
|
|
170
182
|
}
|
|
171
183
|
else {
|
|
172
184
|
logger_1.logger.warn(`Failed to download page ${result.error.message}`, {
|
|
@@ -178,6 +190,13 @@ class IllustrationDownloader {
|
|
|
178
190
|
if (successCount === 0) {
|
|
179
191
|
throw new Error(`Failed to download any pages for illustration ${detail.id}`);
|
|
180
192
|
}
|
|
193
|
+
return {
|
|
194
|
+
pixivId: String(detail.id),
|
|
195
|
+
type: 'illustration',
|
|
196
|
+
title: detail.title,
|
|
197
|
+
files,
|
|
198
|
+
cleanupFiles,
|
|
199
|
+
};
|
|
181
200
|
}
|
|
182
201
|
/**
|
|
183
202
|
* Download an ugoira (animation) work: fetch metadata, download the frame
|
|
@@ -187,7 +206,7 @@ class IllustrationDownloader {
|
|
|
187
206
|
async downloadUgoira(detail, tag, tags) {
|
|
188
207
|
if (this.database.hasDownloaded(String(detail.id), 'illustration')) {
|
|
189
208
|
logger_1.logger.debug(`Ugoira ${detail.id} already downloaded, skipping`);
|
|
190
|
-
return;
|
|
209
|
+
return null;
|
|
191
210
|
}
|
|
192
211
|
const meta = await this.client.ugoiraMetadata(detail.id);
|
|
193
212
|
const medium = meta.zip_urls?.medium ?? '';
|
|
@@ -245,6 +264,12 @@ class IllustrationDownloader {
|
|
|
245
264
|
logger_1.logger.info(`Saved ugoira ${detail.id} (zip + ${meta.frames?.length ?? 0} frames)`, {
|
|
246
265
|
filePath: zipPath,
|
|
247
266
|
});
|
|
267
|
+
return {
|
|
268
|
+
pixivId: String(detail.id),
|
|
269
|
+
type: 'illustration',
|
|
270
|
+
title: detail.title,
|
|
271
|
+
files: [zipPath, framesPath],
|
|
272
|
+
};
|
|
248
273
|
}
|
|
249
274
|
/**
|
|
250
275
|
* Find existing illustration files in the file system
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IllustrationDownloader.js","sourceRoot":"","sources":["../../src/download/IllustrationDownloader.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"IllustrationDownloader.js","sourceRoot":"","sources":["../../src/download/IllustrationDownloader.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,12 @@ import { IPixivClient } from '../interfaces/IPixivClient';
|
|
|
3
3
|
import { IDatabase } from '../interfaces/IDatabase';
|
|
4
4
|
import { IFileService } from '../interfaces/IFileService';
|
|
5
5
|
import { PixivNovel } from '../pixiv/PixivClient';
|
|
6
|
+
import { DownloadedArtifact } from '../delivery/types';
|
|
6
7
|
export declare class NovelDownloader {
|
|
7
8
|
private readonly client;
|
|
8
9
|
private readonly database;
|
|
9
10
|
private readonly fileService;
|
|
10
11
|
constructor(client: IPixivClient, database: IDatabase, fileService: IFileService);
|
|
11
|
-
download(novel: PixivNovel, tag: string, target: TargetConfig): Promise<
|
|
12
|
+
download(novel: PixivNovel, tag: string, target: TargetConfig): Promise<DownloadedArtifact | undefined>;
|
|
12
13
|
}
|
|
13
14
|
//# sourceMappingURL=NovelDownloader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NovelDownloader.d.ts","sourceRoot":"","sources":["../../src/download/NovelDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"NovelDownloader.d.ts","sourceRoot":"","sources":["../../src/download/NovelDownloader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAFX,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,SAAS,EACnB,WAAW,EAAE,YAAY;IAGtC,QAAQ,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;CA+I9G"}
|
|
@@ -137,8 +137,9 @@ class NovelDownloader {
|
|
|
137
137
|
}
|
|
138
138
|
: {}),
|
|
139
139
|
};
|
|
140
|
+
let metadataPath;
|
|
140
141
|
try {
|
|
141
|
-
await this.fileService.saveMetadata(filePath, pixivMetadata);
|
|
142
|
+
metadataPath = await this.fileService.saveMetadata(filePath, pixivMetadata);
|
|
142
143
|
}
|
|
143
144
|
catch (error) {
|
|
144
145
|
logger_1.logger.warn(`Failed to save metadata for novel ${detail.id}: ${error instanceof Error ? error.message : String(error)}`);
|
|
@@ -159,6 +160,13 @@ class NovelDownloader {
|
|
|
159
160
|
filePath,
|
|
160
161
|
...(detectedLang ? { language: detectedLang.name, isChinese: detectedLang.isChinese } : {}),
|
|
161
162
|
});
|
|
163
|
+
return {
|
|
164
|
+
pixivId: String(detail.id),
|
|
165
|
+
type: 'novel',
|
|
166
|
+
title: detail.title,
|
|
167
|
+
files: [filePath],
|
|
168
|
+
cleanupFiles: metadataPath ? [metadataPath] : [],
|
|
169
|
+
};
|
|
162
170
|
}
|
|
163
171
|
}
|
|
164
172
|
exports.NovelDownloader = NovelDownloader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NovelDownloader.js","sourceRoot":"","sources":["../../src/download/NovelDownloader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sCAAmC;AAMnC,oEAA6D;
|
|
1
|
+
{"version":3,"file":"NovelDownloader.js","sourceRoot":"","sources":["../../src/download/NovelDownloader.ts"],"names":[],"mappings":"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"}
|