pixivflow 2.15.0 → 2.16.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/dist/auth/PixivAuth.d.ts +18 -0
- package/dist/auth/PixivAuth.d.ts.map +1 -0
- package/dist/auth/PixivAuth.js +200 -0
- package/dist/auth/PixivAuth.js.map +1 -0
- package/dist/commands/DoctorCommand.d.ts.map +1 -1
- package/dist/commands/DoctorCommand.js +23 -0
- package/dist/commands/DoctorCommand.js.map +1 -1
- package/dist/commands/DownloadCommand.js +4 -4
- package/dist/commands/DownloadCommand.js.map +1 -1
- package/dist/commands/HealthCommand.d.ts.map +1 -1
- package/dist/commands/HealthCommand.js +14 -1
- package/dist/commands/HealthCommand.js.map +1 -1
- package/dist/commands/RandomDownloadCommand.js +4 -4
- package/dist/commands/RandomDownloadCommand.js.map +1 -1
- package/dist/commands/TagsCommand.js +4 -4
- package/dist/commands/TagsCommand.js.map +1 -1
- package/dist/commands/TopicCommand.d.ts.map +1 -1
- package/dist/commands/TopicCommand.js +4 -4
- package/dist/commands/TopicCommand.js.map +1 -1
- package/dist/commands/scheduler-runtime.d.ts +2 -2
- package/dist/commands/scheduler-runtime.d.ts.map +1 -1
- package/dist/commands/scheduler-runtime.js +4 -4
- package/dist/commands/scheduler-runtime.js.map +1 -1
- package/dist/config/types.d.ts +7 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/download/IllustrationDownloader.d.ts +1 -1
- package/dist/download/IllustrationDownloader.d.ts.map +1 -1
- package/dist/download/NovelDownloader.d.ts +1 -1
- package/dist/download/NovelDownloader.d.ts.map +1 -1
- package/dist/download/RankingService.d.ts +1 -1
- package/dist/download/RankingService.d.ts.map +1 -1
- package/dist/download/handlers/IllustrationTargetHandler.d.ts.map +1 -1
- package/dist/download/handlers/IllustrationTargetHandler.js +12 -5
- package/dist/download/handlers/IllustrationTargetHandler.js.map +1 -1
- package/dist/download/handlers/NovelTargetHandler.d.ts.map +1 -1
- package/dist/download/handlers/NovelTargetHandler.js +12 -5
- package/dist/download/handlers/NovelTargetHandler.js.map +1 -1
- package/dist/download/pipeline/DownloadPipeline.d.ts +1 -1
- package/dist/download/pipeline/DownloadPipeline.d.ts.map +1 -1
- package/dist/download/plan/DownloadPlanner.d.ts +1 -1
- package/dist/download/plan/DownloadPlanner.d.ts.map +1 -1
- package/dist/download/recovery/ErrorRecovery.d.ts.map +1 -1
- package/dist/download/recovery/ErrorRecovery.js +8 -2
- package/dist/download/recovery/ErrorRecovery.js.map +1 -1
- package/dist/interfaces/IPixivClient.d.ts +1 -5
- package/dist/interfaces/IPixivClient.d.ts.map +1 -1
- package/dist/package.json +1 -1
- package/dist/pixiv/AuthClient.d.ts +6 -12
- package/dist/pixiv/AuthClient.d.ts.map +1 -1
- package/dist/pixiv/AuthClient.js +7 -188
- package/dist/pixiv/AuthClient.js.map +1 -1
- package/dist/pixiv/PixivClient.d.ts +14 -156
- package/dist/pixiv/PixivClient.d.ts.map +1 -1
- package/dist/pixiv/PixivClient.js +15 -292
- package/dist/pixiv/PixivClient.js.map +1 -1
- package/dist/pixiv-client/PixivAuthTokenProvider.d.ts +16 -0
- package/dist/pixiv-client/PixivAuthTokenProvider.d.ts.map +1 -0
- package/dist/pixiv-client/PixivAuthTokenProvider.js +27 -0
- package/dist/pixiv-client/PixivAuthTokenProvider.js.map +1 -0
- package/dist/pixiv-client/PixivFlowPixivClient.d.ts +77 -0
- package/dist/pixiv-client/PixivFlowPixivClient.d.ts.map +1 -0
- package/dist/pixiv-client/PixivFlowPixivClient.js +146 -0
- package/dist/pixiv-client/PixivFlowPixivClient.js.map +1 -0
- package/dist/pixiv-client/TargetSearchRunner.d.ts +29 -0
- package/dist/pixiv-client/TargetSearchRunner.d.ts.map +1 -0
- package/dist/pixiv-client/TargetSearchRunner.js +182 -0
- package/dist/pixiv-client/TargetSearchRunner.js.map +1 -0
- package/dist/pixiv-client/createPixivFlowClient.d.ts +11 -0
- package/dist/pixiv-client/createPixivFlowClient.d.ts.map +1 -0
- package/dist/pixiv-client/createPixivFlowClient.js +29 -0
- package/dist/pixiv-client/createPixivFlowClient.js.map +1 -0
- package/dist/pixiv-client/query-mapper.d.ts +14 -0
- package/dist/pixiv-client/query-mapper.d.ts.map +1 -0
- package/dist/pixiv-client/query-mapper.js +63 -0
- package/dist/pixiv-client/query-mapper.js.map +1 -0
- package/dist/random-download.js +4 -4
- package/dist/random-download.js.map +1 -1
- package/dist/storage/Database.d.ts +4 -0
- package/dist/storage/Database.d.ts.map +1 -1
- package/dist/storage/Database.js +7 -0
- package/dist/storage/Database.js.map +1 -1
- package/dist/storage/DatabaseMigration.d.ts.map +1 -1
- package/dist/storage/DatabaseMigration.js +8 -0
- package/dist/storage/DatabaseMigration.js.map +1 -1
- package/dist/storage/repositories/RateLimitStateRepository.d.ts +17 -0
- package/dist/storage/repositories/RateLimitStateRepository.d.ts.map +1 -0
- package/dist/storage/repositories/RateLimitStateRepository.js +46 -0
- package/dist/storage/repositories/RateLimitStateRepository.js.map +1 -0
- package/dist/tags/types.d.ts +1 -1
- package/dist/tags/types.d.ts.map +1 -1
- package/dist/utils/concurrency.d.ts.map +1 -1
- package/dist/utils/concurrency.js +2 -1
- package/dist/utils/concurrency.js.map +1 -1
- package/dist/utils/errors.d.ts +20 -0
- package/dist/utils/errors.d.ts.map +1 -1
- package/dist/utils/errors.js +56 -1
- package/dist/utils/errors.js.map +1 -1
- package/dist/utils/pixiv-sort.d.ts +1 -1
- package/dist/utils/pixiv-sort.d.ts.map +1 -1
- package/dist/utils/pixiv-utils.d.ts +1 -1
- package/dist/utils/pixiv-utils.d.ts.map +1 -1
- package/dist/utils/token-maintenance.d.ts +1 -1
- package/dist/utils/token-maintenance.d.ts.map +1 -1
- package/dist/version.js +1 -1
- package/dist/webui/package.json +1 -1
- package/dist/webui/services/DownloadTaskManager.js +4 -4
- package/dist/webui/services/DownloadTaskManager.js.map +1 -1
- package/package.json +11 -4
- package/dist/pixiv/IPixivRequestHandler.d.ts +0 -26
- package/dist/pixiv/IPixivRequestHandler.d.ts.map +0 -1
- package/dist/pixiv/IPixivRequestHandler.js +0 -3
- package/dist/pixiv/IPixivRequestHandler.js.map +0 -1
- package/dist/pixiv/RateLimitCoordinator.d.ts +0 -30
- package/dist/pixiv/RateLimitCoordinator.d.ts.map +0 -1
- package/dist/pixiv/RateLimitCoordinator.js +0 -66
- package/dist/pixiv/RateLimitCoordinator.js.map +0 -1
- package/dist/pixiv/client/IllustService.d.ts +0 -24
- package/dist/pixiv/client/IllustService.d.ts.map +0 -1
- package/dist/pixiv/client/IllustService.js +0 -70
- package/dist/pixiv/client/IllustService.js.map +0 -1
- package/dist/pixiv/client/MediaDownloadService.d.ts +0 -11
- package/dist/pixiv/client/MediaDownloadService.d.ts.map +0 -1
- package/dist/pixiv/client/MediaDownloadService.js +0 -22
- package/dist/pixiv/client/MediaDownloadService.js.map +0 -1
- package/dist/pixiv/client/NovelService.d.ts +0 -30
- package/dist/pixiv/client/NovelService.d.ts.map +0 -1
- package/dist/pixiv/client/NovelService.js +0 -203
- package/dist/pixiv/client/NovelService.js.map +0 -1
- package/dist/pixiv/client/PixivApiCore.d.ts +0 -52
- package/dist/pixiv/client/PixivApiCore.d.ts.map +0 -1
- package/dist/pixiv/client/PixivApiCore.js +0 -412
- package/dist/pixiv/client/PixivApiCore.js.map +0 -1
- package/dist/pixiv/client/SearchService.d.ts +0 -21
- package/dist/pixiv/client/SearchService.d.ts.map +0 -1
- package/dist/pixiv/client/SearchService.js +0 -207
- package/dist/pixiv/client/SearchService.js.map +0 -1
- package/dist/pixiv/client/search/SearchFilters.d.ts +0 -31
- package/dist/pixiv/client/search/SearchFilters.d.ts.map +0 -1
- package/dist/pixiv/client/search/SearchFilters.js +0 -102
- package/dist/pixiv/client/search/SearchFilters.js.map +0 -1
- package/dist/pixiv/types.d.ts +0 -72
- package/dist/pixiv/types.d.ts.map +0 -1
- package/dist/pixiv/types.js +0 -6
- package/dist/pixiv/types.js.map +0 -1
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SQLiteRateLimitStateStore = void 0;
|
|
4
|
+
const BaseRepository_1 = require("./BaseRepository");
|
|
5
|
+
/**
|
|
6
|
+
* Host-side SQLite adapter for the kit's RateLimitStateStore port.
|
|
7
|
+
* Sync better-sqlite3 calls satisfy the async interface trivially.
|
|
8
|
+
*/
|
|
9
|
+
class SQLiteRateLimitStateStore extends BaseRepository_1.BaseRepository {
|
|
10
|
+
load(scope) {
|
|
11
|
+
const row = this.db
|
|
12
|
+
.prepare(`SELECT state FROM rate_limit_state WHERE scope = ?`)
|
|
13
|
+
.get(scope);
|
|
14
|
+
if (!row)
|
|
15
|
+
return null;
|
|
16
|
+
try {
|
|
17
|
+
return JSON.parse(row.state);
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
save(scope, state) {
|
|
24
|
+
this.db
|
|
25
|
+
.prepare(`INSERT INTO rate_limit_state (scope, state, updated_at)
|
|
26
|
+
VALUES (@scope, @state, @updatedAt)
|
|
27
|
+
ON CONFLICT(scope) DO UPDATE SET state = excluded.state, updated_at = excluded.updated_at`)
|
|
28
|
+
.run({ scope, state: JSON.stringify(state), updatedAt: Date.now() });
|
|
29
|
+
}
|
|
30
|
+
/** All persisted gate states (doctor/health inspection). Read-only. */
|
|
31
|
+
getAll() {
|
|
32
|
+
const rows = this.db.prepare(`SELECT scope, state, updated_at FROM rate_limit_state`).all();
|
|
33
|
+
const out = [];
|
|
34
|
+
for (const row of rows) {
|
|
35
|
+
try {
|
|
36
|
+
out.push({ scope: row.scope, state: JSON.parse(row.state), updatedAt: row.updatedAt });
|
|
37
|
+
}
|
|
38
|
+
catch {
|
|
39
|
+
// Skip corrupt rows rather than failing diagnostics.
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return out;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
exports.SQLiteRateLimitStateStore = SQLiteRateLimitStateStore;
|
|
46
|
+
//# sourceMappingURL=RateLimitStateRepository.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RateLimitStateRepository.js","sourceRoot":"","sources":["../../../src/storage/repositories/RateLimitStateRepository.ts"],"names":[],"mappings":";;;AACA,qDAAkD;AAElD;;;GAGG;AACH,MAAa,yBAA0B,SAAQ,+BAAc;IAC3D,IAAI,CAAC,KAAa;QAChB,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CAAC,oDAAoD,CAAC;aAC7D,GAAG,CAAC,KAAK,CAAkC,CAAC;QAC/C,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAC;QACtB,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAmB,CAAC;QACjD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,IAAI,CAAC,KAAa,EAAE,KAAqB;QACvC,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;mGAE2F,CAC5F;aACA,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,uEAAuE;IACvE,MAAM;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,uDAAuD,CAAC,CAAC,GAAG,EAIvF,CAAC;QACH,MAAM,GAAG,GAAuE,EAAE,CAAC;QACnF,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC;gBACH,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAmB,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;YAC3G,CAAC;YAAC,MAAM,CAAC;gBACP,qDAAqD;YACvD,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAxCD,8DAwCC"}
|
package/dist/tags/types.d.ts
CHANGED
package/dist/tags/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tags/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/tags/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,MAAM,MAAM,uBAAuB,GAAG,cAAc,GAAG,OAAO,CAAC;AAE/D,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,KAAK,CAAC,cAAc,GAAG,cAAc,CAAC,CAAC;IAChD,KAAK,EAAE,uBAAuB,EAAE,CAAC;IACjC,WAAW,EAAE;QACX,YAAY,EAAE,MAAM,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,uBAAuB,EAAE,CAAC;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE;QACZ,YAAY,EAAE,MAAM,CAAC;QACrB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;IACF,UAAU,EAAE,qBAAqB,EAAE,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IACjC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtD,0BAA0B,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAC,CAAC,CAAC;IAC/F,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAA;KAAE,CAAC,CAAC,CAAC;CACzF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"concurrency.d.ts","sourceRoot":"","sources":["../../src/utils/concurrency.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,6CAA6C;IAC7C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4CAA4C;IAC5C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gCAAgC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IACvB;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GAC5B;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAErC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAC1C,KAAK,EAAE,CAAC,EAAE,EACV,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAClC,WAAW,GAAE,MAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"concurrency.d.ts","sourceRoot":"","sources":["../../src/utils/concurrency.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,6CAA6C;IAC7C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4CAA4C;IAC5C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,gCAAgC;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IACvB;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GAC5B;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,CAAC;AAErC;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAsB,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAC1C,KAAK,EAAE,CAAC,EAAE,EACV,SAAS,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,EAClC,WAAW,GAAE,MAAU,EACvB,MAAM,GAAE,iBAAsB,GAC7B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CA6H7B"}
|
|
@@ -92,7 +92,8 @@ async function processInParallel(items, processor, concurrency = 3, config = {})
|
|
|
92
92
|
error: error instanceof Error ? error : new Error(String(error))
|
|
93
93
|
};
|
|
94
94
|
// Check if this is a rate limit error
|
|
95
|
-
const isRateLimit = error instanceof errors_1.NetworkError && error.isRateLimit === true
|
|
95
|
+
const isRateLimit = (error instanceof errors_1.NetworkError && error.isRateLimit === true) ||
|
|
96
|
+
error instanceof errors_1.PixivRateLimitError;
|
|
96
97
|
if (isRateLimit && dynamicConcurrency) {
|
|
97
98
|
rateLimitCount++;
|
|
98
99
|
const previousConcurrency = currentConcurrency;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"concurrency.js","sourceRoot":"","sources":["../../src/utils/concurrency.ts"],"names":[],"mappings":";;AA8CA,
|
|
1
|
+
{"version":3,"file":"concurrency.js","sourceRoot":"","sources":["../../src/utils/concurrency.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/errors.d.ts
CHANGED
|
@@ -2,6 +2,16 @@
|
|
|
2
2
|
* Unified error handling utilities
|
|
3
3
|
* Provides consistent error types and handling patterns across the application
|
|
4
4
|
*/
|
|
5
|
+
import { PixivError, PixivHttpError, PixivNetworkError, PixivNotFoundError, PixivRateLimitError, PixivTimeoutError } from '@redtidev/pixiv-client';
|
|
6
|
+
/** True for network/HTTP errors thrown by the independent pixiv-client kit. */
|
|
7
|
+
export declare function isPixivKitError(error: unknown): error is PixivError;
|
|
8
|
+
/**
|
|
9
|
+
* Bridge a kit error into PixivFlow's legacy NetworkError shape so existing
|
|
10
|
+
* instanceof NetworkError / .isRateLimit / .waitTime / .url / .cause checks
|
|
11
|
+
* keep working while callers migrate to typed kit errors.
|
|
12
|
+
*/
|
|
13
|
+
export declare function toNetworkError(error: PixivError): NetworkError;
|
|
14
|
+
export { PixivError, PixivHttpError, PixivNetworkError, PixivNotFoundError, PixivRateLimitError, PixivTimeoutError, };
|
|
5
15
|
export declare class PixivFlowError extends Error {
|
|
6
16
|
readonly code: string;
|
|
7
17
|
readonly statusCode?: number | undefined;
|
|
@@ -66,6 +76,16 @@ export declare class HelpRequest extends Error {
|
|
|
66
76
|
* Check if an error is a 404 (not found) error
|
|
67
77
|
*/
|
|
68
78
|
export declare function is404Error(error: unknown): boolean;
|
|
79
|
+
/**
|
|
80
|
+
* True for TYPED network/rate-limit failures (legacy NetworkError or errors
|
|
81
|
+
* thrown by the pixiv-client kit). String-pattern matching on arbitrary
|
|
82
|
+
* Errors is intentionally NOT included: plain Errors with words like
|
|
83
|
+
* "timeout" were historically treated as skipable, and callers keep that
|
|
84
|
+
* classification via their own regexes.
|
|
85
|
+
*/
|
|
86
|
+
export declare function isRetryableNetworkError(error: unknown): boolean;
|
|
87
|
+
/** Rate-limit wait hint (ms) from a kit or legacy error, if any. */
|
|
88
|
+
export declare function rateLimitWaitMs(error: unknown): number | undefined;
|
|
69
89
|
/**
|
|
70
90
|
* Check if an error should be skipped (non-fatal)
|
|
71
91
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,qBAAa,cAAe,SAAQ,KAAK;aAGrB,IAAI,EAAE,MAAM;aACZ,UAAU,CAAC,EAAE,MAAM;aACnB,KAAK,CAAC,EAAE,KAAK;gBAH7B,OAAO,EAAE,MAAM,EACC,IAAI,EAAE,MAAM,EACZ,UAAU,CAAC,EAAE,MAAM,YAAA,EACnB,KAAK,CAAC,EAAE,KAAK,YAAA;CAShC;AAED,qBAAa,WAAY,SAAQ,cAAc;gBACjC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED,qBAAa,mBAAoB,SAAQ,cAAc;gBACzC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED,qBAAa,YAAa,SAAQ,cAAc;aAM5B,GAAG,CAAC,EAAE,MAAM;IAL9B,SAAgB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtC,SAAgB,QAAQ,CAAC,EAAE,MAAM,CAAC;gBAGhC,OAAO,EAAE,MAAM,EACC,GAAG,CAAC,EAAE,MAAM,YAAA,EAC5B,KAAK,CAAC,EAAE,KAAK,EACb,QAAQ,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE;CAO1D;AAED,qBAAa,aAAc,SAAQ,cAAc;aAG7B,MAAM,CAAC,EAAE,MAAM;aACf,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO;gBAFnD,OAAO,EAAE,MAAM,EACC,MAAM,CAAC,EAAE,MAAM,YAAA,EACf,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO,YAAA,EACnD,KAAK,CAAC,EAAE,KAAK;CAKhB;AAED;;;;GAIG;AACH,qBAAa,oBAAqB,SAAQ,cAAc;gBAC1C,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED,qBAAa,aAAc,SAAQ,cAAc;gBACnC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED;;;;GAIG;AACH,qBAAa,uBAAwB,SAAQ,cAAc;gBAC7C,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK;CAI3C;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,uBAAuB,CAErF;AAED;;;GAGG;AACH,qBAAa,cAAe,SAAQ,KAAK;;CAKxC;AAED;;GAEG;AACH,qBAAa,WAAY,SAAQ,KAAK;aACR,OAAO,CAAC,EAAE,MAAM;gBAAhB,OAAO,CAAC,EAAE,MAAM,YAAA;CAI7C;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/errors.js
CHANGED
|
@@ -4,9 +4,13 @@
|
|
|
4
4
|
* Provides consistent error types and handling patterns across the application
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.ErrorRecoveryStrategy = exports.HelpRequest = exports.VersionRequest = exports.OperationCancelledError = exports.DatabaseError = exports.PendingDeliveryError = exports.DownloadError = exports.NetworkError = exports.AuthenticationError = exports.ConfigError = exports.PixivFlowError = void 0;
|
|
7
|
+
exports.ErrorRecoveryStrategy = exports.HelpRequest = exports.VersionRequest = exports.OperationCancelledError = exports.DatabaseError = exports.PendingDeliveryError = exports.DownloadError = exports.NetworkError = exports.AuthenticationError = exports.ConfigError = exports.PixivFlowError = exports.PixivTimeoutError = exports.PixivRateLimitError = exports.PixivNotFoundError = exports.PixivNetworkError = exports.PixivHttpError = exports.PixivError = void 0;
|
|
8
|
+
exports.isPixivKitError = isPixivKitError;
|
|
9
|
+
exports.toNetworkError = toNetworkError;
|
|
8
10
|
exports.isOperationCancelled = isOperationCancelled;
|
|
9
11
|
exports.is404Error = is404Error;
|
|
12
|
+
exports.isRetryableNetworkError = isRetryableNetworkError;
|
|
13
|
+
exports.rateLimitWaitMs = rateLimitWaitMs;
|
|
10
14
|
exports.isSkipableError = isSkipableError;
|
|
11
15
|
exports.getErrorMessage = getErrorMessage;
|
|
12
16
|
exports.getDetailedErrorInfo = getDetailedErrorInfo;
|
|
@@ -14,6 +18,34 @@ exports.getErrorStack = getErrorStack;
|
|
|
14
18
|
exports.getErrorRecoveryStrategy = getErrorRecoveryStrategy;
|
|
15
19
|
exports.safeAsync = safeAsync;
|
|
16
20
|
exports.toResult = toResult;
|
|
21
|
+
const pixiv_client_1 = require("@redtidev/pixiv-client");
|
|
22
|
+
Object.defineProperty(exports, "PixivError", { enumerable: true, get: function () { return pixiv_client_1.PixivError; } });
|
|
23
|
+
Object.defineProperty(exports, "PixivHttpError", { enumerable: true, get: function () { return pixiv_client_1.PixivHttpError; } });
|
|
24
|
+
Object.defineProperty(exports, "PixivNetworkError", { enumerable: true, get: function () { return pixiv_client_1.PixivNetworkError; } });
|
|
25
|
+
Object.defineProperty(exports, "PixivNotFoundError", { enumerable: true, get: function () { return pixiv_client_1.PixivNotFoundError; } });
|
|
26
|
+
Object.defineProperty(exports, "PixivRateLimitError", { enumerable: true, get: function () { return pixiv_client_1.PixivRateLimitError; } });
|
|
27
|
+
Object.defineProperty(exports, "PixivTimeoutError", { enumerable: true, get: function () { return pixiv_client_1.PixivTimeoutError; } });
|
|
28
|
+
/** True for network/HTTP errors thrown by the independent pixiv-client kit. */
|
|
29
|
+
function isPixivKitError(error) {
|
|
30
|
+
return error instanceof pixiv_client_1.PixivError;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Bridge a kit error into PixivFlow's legacy NetworkError shape so existing
|
|
34
|
+
* instanceof NetworkError / .isRateLimit / .waitTime / .url / .cause checks
|
|
35
|
+
* keep working while callers migrate to typed kit errors.
|
|
36
|
+
*/
|
|
37
|
+
function toNetworkError(error) {
|
|
38
|
+
const mapped = new NetworkError(error.message, error.endpoint, error.cause instanceof Error ? error.cause : undefined, error instanceof pixiv_client_1.PixivRateLimitError
|
|
39
|
+
? { isRateLimit: true, waitTime: error.retryAfterMs }
|
|
40
|
+
: error.retryAfterMs !== undefined
|
|
41
|
+
? { waitTime: error.retryAfterMs }
|
|
42
|
+
: undefined);
|
|
43
|
+
// Preserve the status (404/403/500/...) for legacy code.
|
|
44
|
+
if (error.status !== undefined) {
|
|
45
|
+
Object.assign(mapped, { statusCode: error.status });
|
|
46
|
+
}
|
|
47
|
+
return mapped;
|
|
48
|
+
}
|
|
17
49
|
class PixivFlowError extends Error {
|
|
18
50
|
code;
|
|
19
51
|
statusCode;
|
|
@@ -130,6 +162,8 @@ exports.HelpRequest = HelpRequest;
|
|
|
130
162
|
* Check if an error is a 404 (not found) error
|
|
131
163
|
*/
|
|
132
164
|
function is404Error(error) {
|
|
165
|
+
if (error instanceof pixiv_client_1.PixivNotFoundError)
|
|
166
|
+
return true;
|
|
133
167
|
if (error instanceof Error) {
|
|
134
168
|
return error.message.includes('404') ||
|
|
135
169
|
error.message.includes('not found') ||
|
|
@@ -137,6 +171,27 @@ function is404Error(error) {
|
|
|
137
171
|
}
|
|
138
172
|
return String(error).includes('404');
|
|
139
173
|
}
|
|
174
|
+
/**
|
|
175
|
+
* True for TYPED network/rate-limit failures (legacy NetworkError or errors
|
|
176
|
+
* thrown by the pixiv-client kit). String-pattern matching on arbitrary
|
|
177
|
+
* Errors is intentionally NOT included: plain Errors with words like
|
|
178
|
+
* "timeout" were historically treated as skipable, and callers keep that
|
|
179
|
+
* classification via their own regexes.
|
|
180
|
+
*/
|
|
181
|
+
function isRetryableNetworkError(error) {
|
|
182
|
+
return (error instanceof NetworkError ||
|
|
183
|
+
error instanceof pixiv_client_1.PixivNetworkError ||
|
|
184
|
+
error instanceof pixiv_client_1.PixivRateLimitError ||
|
|
185
|
+
error instanceof pixiv_client_1.PixivTimeoutError);
|
|
186
|
+
}
|
|
187
|
+
/** Rate-limit wait hint (ms) from a kit or legacy error, if any. */
|
|
188
|
+
function rateLimitWaitMs(error) {
|
|
189
|
+
if (error instanceof pixiv_client_1.PixivRateLimitError)
|
|
190
|
+
return error.retryAfterMs;
|
|
191
|
+
if (error instanceof NetworkError)
|
|
192
|
+
return error.waitTime;
|
|
193
|
+
return undefined;
|
|
194
|
+
}
|
|
140
195
|
/**
|
|
141
196
|
* Check if an error should be skipped (non-fatal)
|
|
142
197
|
*/
|
package/dist/utils/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/utils/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Pixiv item sorting utilities
|
|
3
3
|
*/
|
|
4
|
-
import type { PixivIllust, PixivNovel } from '
|
|
4
|
+
import type { PixivIllust, PixivNovel } from '@redtidev/pixiv-client';
|
|
5
5
|
export type SortMode = 'date_desc' | 'date_asc' | 'popular_desc';
|
|
6
6
|
/**
|
|
7
7
|
* Sort items based on sort parameter
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pixiv-sort.d.ts","sourceRoot":"","sources":["../../src/utils/pixiv-sort.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"pixiv-sort.d.ts","sourceRoot":"","sources":["../../src/utils/pixiv-sort.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEtE,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,UAAU,GAAG,cAAc,CAAC;AAEjE;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,WAAW,GAAG,UAAU,EAC/D,KAAK,EAAE,CAAC,EAAE,EACV,IAAI,CAAC,EAAE,QAAQ,GACd,CAAC,EAAE,CAuEL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pixiv-utils.d.ts","sourceRoot":"","sources":["../../src/utils/pixiv-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"pixiv-utils.d.ts","sourceRoot":"","sources":["../../src/utils/pixiv-utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEjE;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,MAAM,CAW/E;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAY5E"}
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* - Background maintenance without user intervention
|
|
11
11
|
* - One-time setup, forever working
|
|
12
12
|
*/
|
|
13
|
-
import { PixivAuth } from '../
|
|
13
|
+
import { PixivAuth } from '../auth/PixivAuth';
|
|
14
14
|
import { PixivCredentialConfig, NetworkConfig, StandaloneConfig } from '../config';
|
|
15
15
|
export interface TokenMaintenanceConfig {
|
|
16
16
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-maintenance.d.ts","sourceRoot":"","sources":["../../src/utils/token-maintenance.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"token-maintenance.d.ts","sourceRoot":"","sources":["../../src/utils/token-maintenance.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAGnF,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAQD,qBAAa,uBAAuB;IAClC,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,MAAM,CAAmC;IACjD,OAAO,CAAC,IAAI,CAAY;IACxB,OAAO,CAAC,WAAW,CAAwB;IAC3C,OAAO,CAAC,OAAO,CAAgB;gBAG7B,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,qBAAqB,EAClC,OAAO,EAAE,aAAa,EACtB,MAAM,CAAC,EAAE,sBAAsB;IAQjC;;OAEG;IACI,KAAK,IAAI,IAAI;IAiCpB;;OAEG;IACI,IAAI,IAAI,IAAI;IAcnB;;;OAGG;YACW,aAAa;IA+B3B;;OAEG;YACW,yBAAyB;IAiBvC;;;OAGG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAIzC;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,qBAAqB,EAClC,OAAO,EAAE,aAAa,EACtB,MAAM,CAAC,EAAE,gBAAgB,GACxB,uBAAuB,GAAG,IAAI,CAkBhC"}
|
package/dist/version.js
CHANGED
|
@@ -2,5 +2,5 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BUILD = void 0;
|
|
4
4
|
// GENERATED by scripts/write-version.js — do not edit manually.
|
|
5
|
-
exports.BUILD = { version: '2.
|
|
5
|
+
exports.BUILD = { version: '2.16.0', commit: '1542ffc9b516' };
|
|
6
6
|
//# sourceMappingURL=version.js.map
|
package/dist/webui/package.json
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.downloadTaskManager = exports.DownloadTaskManager = void 0;
|
|
4
4
|
const DownloadManager_1 = require("../../download/DownloadManager");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
5
|
+
const createPixivFlowClient_1 = require("../../pixiv-client/createPixivFlowClient");
|
|
6
|
+
const PixivAuth_1 = require("../../auth/PixivAuth");
|
|
7
7
|
const Database_1 = require("../../storage/Database");
|
|
8
8
|
const FileService_1 = require("../../download/FileService");
|
|
9
9
|
const config_1 = require("../../config");
|
|
@@ -99,8 +99,8 @@ class DownloadTaskManager {
|
|
|
99
99
|
database.migrate();
|
|
100
100
|
// Use the first config path for auth (or default if none specified)
|
|
101
101
|
const authConfigPath = configPaths && configPaths.length > 0 ? configPaths[0] : (0, config_1.getConfigPath)();
|
|
102
|
-
const auth = new
|
|
103
|
-
const pixivClient =
|
|
102
|
+
const auth = new PixivAuth_1.PixivAuth(config.pixiv, config.network, database, authConfigPath);
|
|
103
|
+
const pixivClient = (0, createPixivFlowClient_1.createPixivFlowClient)(auth, config, database);
|
|
104
104
|
const fileService = new FileService_1.FileService(config.storage);
|
|
105
105
|
const downloadManager = new DownloadManager_1.DownloadManager(config, pixivClient, database, fileService);
|
|
106
106
|
// Set progress callback
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadTaskManager.js","sourceRoot":"","sources":["../../../src/webui/services/DownloadTaskManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DownloadTaskManager.js","sourceRoot":"","sources":["../../../src/webui/services/DownloadTaskManager.ts"],"names":[],"mappings":";;;AAAA,oEAAiE;AACjE,oFAAiF;AACjF,oDAAiD;AACjD,qDAAkD;AAClD,4DAAyD;AACzD,yCAA2E;AAC3E,yCAAsC;AACtC,+CAA0D;AAuB1D,MAAa,mBAAmB;IACtB,KAAK,GAAG,IAAI,GAAG,EAAsB,CAAC;IACtC,QAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;IAC7C,UAAU,GAKP,IAAI,CAAC;IAEhB;;;OAGG;IACK,eAAe,GAAG,IAAI,GAAG,EAAc,CAAC;IACxC,WAAW,GAA0B,IAAI,CAAC;IAElD,4EAA4E;IACrE,SAAS,CAAC,QAAoB;QACnC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxC,CAAC,CAAC;IACJ,CAAC;IAED,0DAA0D;IACnD,gBAAgB;QACrB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED,oFAAoF;IAC5E,YAAY;QAClB,IAAI,IAAI,CAAC,WAAW;YAAE,OAAO;QAC7B,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC5C,IAAI,CAAC;oBACH,QAAQ,EAAE,CAAC;gBACb,CAAC;gBAAC,MAAM,CAAC;oBACP,uDAAuD;gBACzD,CAAC;YACH,CAAC;QACH,CAAC,EAAE,GAAG,CAAC,CAAC;IACV,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,SAAS,CACb,MAAc,EACd,QAAiB,EACjB,YAAwC,EACxC,WAAsB;QAEtB,0CAA0C;QAC1C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,MAAwB,CAAC;QAE7B,6DAA6D;QAC7D,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,gCAAgC;YAChC,MAAM,UAAU,GAAG,IAAA,mBAAU,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,UAAU,GAAU,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;YAE1D,mCAAmC;YACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,MAAM,WAAW,GAAG,IAAA,mBAAU,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/C,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC1D,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,0CAA0C;YAC1C,MAAM,GAAG;gBACP,GAAG,UAAU;gBACb,OAAO,EAAE,UAAU;aACpB,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC,MAAM,YAAY,UAAU,CAAC,MAAM,QAAQ,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACN,uCAAuC;YACvC,MAAM,UAAU,GAAG,IAAA,sBAAa,GAAE,CAAC;YACnC,MAAM,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAED,kCAAkC;QAClC,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,YAAY,EAAE,CAAC;QAC1C,CAAC;QAED,0CAA0C;QAC1C,IAAI,QAAQ,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAC5C,GAAG,CAAC,QAAQ,EAAE,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,KAAK,QAAQ,CAClD,CAAC;YACF,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5C,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,IAAI,mBAAQ,CAAC,MAAM,CAAC,OAAQ,CAAC,YAAa,CAAC,CAAC;QAC7D,QAAQ,CAAC,OAAO,EAAE,CAAC;QAEnB,oEAAoE;QACpE,MAAM,cAAc,GAAG,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAA,sBAAa,GAAE,CAAC;QAChG,MAAM,IAAI,GAAG,IAAI,qBAAS,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,OAAQ,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;QACpF,MAAM,WAAW,GAAG,IAAA,6CAAqB,EAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,MAAM,CAAC,OAAQ,CAAC,CAAC;QACrD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAExF,wBAAwB;QACxB,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC1D,eAAe,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;QAEtD,MAAM,eAAe,CAAC,UAAU,EAAE,CAAC;QAEnC,MAAM,UAAU,GAAe;YAC7B,MAAM;YACN,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,QAAQ;YACR,IAAI,EAAE,EAAE;SACT,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,gCAAgC;QAChC,IAAI,CAAC;YACH,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE;gBAC/B,MAAM,EAAE,SAAS;gBACjB,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,QAAQ;aACT,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,wBAAwB;QACxB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,MAAM,MAAM,CAAC,CAAC;QAElD,MAAM,OAAO,GAAG,CAAC,KAAK,IAAI,EAAE;YAC1B,IAAI,CAAC;gBACH,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;gBAC3C,eAAM,CAAC,IAAI,CAAC,0BAA0B,MAAM,EAAE,CAAC,CAAC;gBAChD,MAAM,eAAe,CAAC,aAAa,EAAE,CAAC;gBAEtC,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBACpC,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC;oBAChC,UAAU,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;oBAEhC,IAAI,CAAC;wBACH,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE;4BAC/B,MAAM,EAAE,WAAW;4BACnB,SAAS,EAAE,UAAU,CAAC,SAAS;4BAC/B,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,eAAe,EAAE,UAAU,CAAC,QAAQ,EAAE,OAAO;4BAC7C,aAAa,EAAE,UAAU,CAAC,QAAQ,EAAE,KAAK;4BACzC,eAAe,EAAE,UAAU,CAAC,QAAQ,EAAE,OAAO;yBAC9C,CAAC,CAAC;oBACL,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,eAAM,CAAC,IAAI,CAAC,2CAA2C,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC9E,CAAC;oBAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;oBACtC,eAAM,CAAC,IAAI,CAAC,iBAAiB,MAAM,YAAY,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,IAAI,IAAA,6BAAoB,EAAC,KAAK,CAAC,EAAE,CAAC;oBACnE,oEAAoE;oBACpE,mEAAmE;oBACnE,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBACpC,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;wBAC9B,UAAU,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;oBAClC,CAAC;oBACD,IAAI,CAAC;wBACH,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE;4BAC/B,MAAM,EAAE,UAAU,CAAC,MAAM;4BACzB,SAAS,EAAE,UAAU,CAAC,SAAS;4BAC/B,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,KAAK,EAAE,UAAU,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,SAAS;4BAC3E,eAAe,EAAE,UAAU,CAAC,QAAQ,EAAE,OAAO;4BAC7C,aAAa,EAAE,UAAU,CAAC,QAAQ,EAAE,KAAK;4BACzC,eAAe,EAAE,UAAU,CAAC,QAAQ,EAAE,OAAO;yBAC9C,CAAC,CAAC;oBACL,CAAC;oBAAC,OAAO,OAAO,EAAE,CAAC;wBACjB,eAAM,CAAC,IAAI,CAAC,2CAA2C,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;oBACvF,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,IAAA,6BAAoB,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;gBAChG,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,MAAM,GAAG,QAAQ,CAAC;oBAC7B,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAC5E,UAAU,CAAC,KAAK,GAAG,YAAY,CAAC;oBAChC,UAAU,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;oBAEhC,IAAI,CAAC;wBACH,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE;4BAC/B,MAAM,EAAE,QAAQ;4BAChB,SAAS,EAAE,UAAU,CAAC,SAAS;4BAC/B,OAAO,EAAE,UAAU,CAAC,OAAO;4BAC3B,KAAK,EAAE,YAAY;4BACnB,eAAe,EAAE,UAAU,CAAC,QAAQ,EAAE,OAAO;4BAC7C,aAAa,EAAE,UAAU,CAAC,QAAQ,EAAE,KAAK;4BACzC,eAAe,EAAE,UAAU,CAAC,QAAQ,EAAE,OAAO;yBAC9C,CAAC,CAAC;oBACL,CAAC;oBAAC,OAAO,OAAO,EAAE,CAAC;wBACjB,eAAM,CAAC,IAAI,CAAC,2CAA2C,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;oBACvF,CAAC;oBAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,YAAY,EAAE,CAAC,CAAC;oBACxD,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;wBAC1C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;oBACvD,CAAC;oBACD,eAAM,CAAC,KAAK,CAAC,iBAAiB,MAAM,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;oBAC1D,MAAM,KAAK,CAAC;gBACd,CAAC;YACH,CAAC;oBAAS,CAAC;gBACT,IAAI,CAAC;oBACH,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACnB,CAAC;gBAAC,OAAO,UAAU,EAAE,CAAC;oBACpB,eAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;gBAClF,CAAC;gBACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;gBACvB,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,IAAI,CAAC,UAAU,GAAG;YAChB,MAAM;YACN,OAAO,EAAE,eAAe;YACxB,QAAQ;YACR,OAAO;SACR,CAAC;QAEF,yCAAyC;QACzC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;YACjB,mCAAmC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,QAAQ,MAAM,YAAY,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,QAAQ,MAAM,iBAAiB,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;YAE1C,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;YACxB,IAAI,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;YAE1B,IAAI,CAAC;gBACH,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE;oBAC/B,MAAM,EAAE,SAAS;oBACjB,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,KAAK,EAAE,sBAAsB;oBAC7B,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO;oBACvC,aAAa,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK;oBACnC,eAAe,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO;iBACxC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,eAAM,CAAC,IAAI,CAAC,2CAA2C,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAC9E,CAAC;YAED,uEAAuE;YACvE,wEAAwE;YACxE,yCAAyC;YACzC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAElD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;YACvC,eAAM,CAAC,IAAI,CAAC,iBAAiB,MAAM,UAAU,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,QAAQ,MAAM,yBAAyB,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,MAAc;QAC1B,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CACzC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CACxD,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,aAAa;QACX,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;IACxD,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAc,EAAE,QAA8D;QAC3F,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAEzB,4DAA4D;YAC5D,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjD,IAAI,CAAC;oBACH,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,EAAE;wBAC/C,MAAM,EAAE,SAAS;wBACjB,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,eAAe,EAAE,QAAQ,CAAC,OAAO;wBACjC,aAAa,EAAE,QAAQ,CAAC,KAAK;wBAC7B,eAAe,EAAE,QAAQ,CAAC,OAAO;qBAClC,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,sEAAsE;oBACtE,eAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBACzE,CAAC;YACH,CAAC;YACD,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,MAAc;QAChC,OAAO,CAAC,OAAe,EAAE,KAAa,EAAE,OAAgB,EAAE,EAAE;YAC1D,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YAEzD,mDAAmD;YACnD,MAAM,UAAU,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvE,MAAM,UAAU,GAAG,OAAO;gBACxB,CAAC,CAAC,OAAO,OAAO,IAAI,KAAK,KAAK,UAAU,QAAQ,OAAO,EAAE;gBACzD,CAAC,CAAC,OAAO,OAAO,IAAI,KAAK,KAAK,UAAU,IAAI,CAAC;YAE/C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YAExC,IAAI,OAAO,EAAE,CAAC;gBACZ,eAAM,CAAC,IAAI,CAAC,IAAI,MAAM,eAAe,OAAO,IAAI,KAAK,KAAK,UAAU,QAAQ,OAAO,EAAE,CAAC,CAAC;YACzF,CAAC;iBAAM,CAAC;gBACN,eAAM,CAAC,IAAI,CAAC,IAAI,MAAM,eAAe,OAAO,IAAI,KAAK,KAAK,UAAU,IAAI,CAAC,CAAC;YAC5E,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,MAAc,EAAE,KAA0C,EAAE,OAAe;QAChF,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,KAAK,GAAiB;YAC1B,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,KAAK;YACL,OAAO;SACR,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEjB,2CAA2C;QAC3C,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC;YACvB,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAEhC,mCAAmC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;QACxB,CAAC;QAED,8DAA8D;QAC9D,MAAM,UAAU,GAAG,SAAS,MAAM,KAAK,OAAO,EAAE,CAAC;QACjD,QAAQ,KAAK,EAAE,CAAC;YACd,KAAK,OAAO;gBACV,eAAM,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBACrC,MAAM;YACR,KAAK,MAAM;gBACT,eAAM,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBACpC,MAAM;YACR,KAAK,MAAM;gBACT,eAAM,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBACpC,MAAM;YACR,KAAK,OAAO;gBACV,eAAM,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBACrC,MAAM;QACV,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,MAAc,EAAE,KAAc;QACxC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7C,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,aAAa,CAAC,MAAc;QAC1B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACjB,CAAC;IACH,CAAC;CACF;AA1bD,kDA0bC;AAED,qBAAqB;AACR,QAAA,mBAAmB,GAAG,IAAI,mBAAmB,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pixivflow",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.16.0",
|
|
4
4
|
"description": "🎨 智能的 Pixiv 自动化下载工具 - 支持批量下载插画和小说、定时任务、Docker部署 | Intelligent Pixiv Automation Downloader with batch download, scheduler, and Docker support",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -12,13 +12,18 @@
|
|
|
12
12
|
},
|
|
13
13
|
"author": "redtidev1918",
|
|
14
14
|
"license": "MIT",
|
|
15
|
+
"workspaces": [
|
|
16
|
+
"packages/*"
|
|
17
|
+
],
|
|
15
18
|
"main": "dist/index.js",
|
|
16
19
|
"bin": {
|
|
17
20
|
"pixivflow": "dist/index.js"
|
|
18
21
|
},
|
|
19
22
|
"scripts": {
|
|
20
23
|
"prepublishOnly": "npm run build",
|
|
21
|
-
"build": "
|
|
24
|
+
"build:kit": "npm run build -w @redtidev/pixiv-client",
|
|
25
|
+
"typecheck": "npm run build:kit && tsc --noEmit",
|
|
26
|
+
"build": "npm run build:kit && node scripts/write-version.js && tsc && node scripts/create-webui-package-json.js",
|
|
22
27
|
"build:watch": "tsc --watch",
|
|
23
28
|
"start": "npm run build && node dist/index.js",
|
|
24
29
|
"login": "./scripts/login.sh",
|
|
@@ -26,7 +31,9 @@
|
|
|
26
31
|
"refresh": "npm run build && node dist/index.js refresh",
|
|
27
32
|
"download": "npm run build && node dist/index.js download",
|
|
28
33
|
"scheduler": "npm run build && node dist/index.js scheduler",
|
|
29
|
-
"test": "
|
|
34
|
+
"test": "npm run test:kit && npm run test:app",
|
|
35
|
+
"test:app": "npm run build:kit && jest --runInBand",
|
|
36
|
+
"test:kit": "npm run test -w @redtidev/pixiv-client",
|
|
30
37
|
"test:scheduled": "jest --runTestsByPath src/__tests__/integration/download-flow.test.ts",
|
|
31
38
|
"test:concurrency": "jest --runTestsByPath src/__tests__/utils/concurrency.test.ts",
|
|
32
39
|
"test:performance": "jest --runInBand src/__tests__/performance",
|
|
@@ -109,13 +116,13 @@
|
|
|
109
116
|
"ws": "^8.21.0"
|
|
110
117
|
},
|
|
111
118
|
"dependencies": {
|
|
119
|
+
"@redtidev/pixiv-client": "0.1.0",
|
|
112
120
|
"axios": "^1.20.0",
|
|
113
121
|
"better-sqlite3": "^12.11.1",
|
|
114
122
|
"cors": "^2.8.6",
|
|
115
123
|
"cron-parser": "^4.9.0",
|
|
116
124
|
"express": "^4.22.2",
|
|
117
125
|
"franc-min": "^6.2.0",
|
|
118
|
-
"https-proxy-agent": "^7.0.6",
|
|
119
126
|
"node-cron": "^4.6.0",
|
|
120
127
|
"pixiv-token-getter": "^2.2.1",
|
|
121
128
|
"socket.io": "^4.8.3",
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Interface for handling Pixiv API HTTP requests
|
|
3
|
-
* Used by service classes to access core request functionality
|
|
4
|
-
*/
|
|
5
|
-
export interface IPixivRequestHandler {
|
|
6
|
-
/**
|
|
7
|
-
* Make an HTTP request to Pixiv API
|
|
8
|
-
*/
|
|
9
|
-
request<T>(url: string, init: RequestInit): Promise<T>;
|
|
10
|
-
/**
|
|
11
|
-
* Create a request URL with query parameters
|
|
12
|
-
*/
|
|
13
|
-
createRequestUrl(path: string, params: Record<string, string>): string;
|
|
14
|
-
/**
|
|
15
|
-
* Parse date range from target config
|
|
16
|
-
*/
|
|
17
|
-
parseDateRange(target: import('../config').TargetConfig): {
|
|
18
|
-
startDate: Date | null;
|
|
19
|
-
endDate: Date | null;
|
|
20
|
-
} | null;
|
|
21
|
-
/**
|
|
22
|
-
* Check if item date is within the specified range
|
|
23
|
-
*/
|
|
24
|
-
isDateInRange(itemDate: Date | null, startDate: Date | null, endDate: Date | null): boolean;
|
|
25
|
-
}
|
|
26
|
-
//# sourceMappingURL=IPixivRequestHandler.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"IPixivRequestHandler.d.ts","sourceRoot":"","sources":["../../src/pixiv/IPixivRequestHandler.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAEvD;;OAEG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC;IAEvE;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,OAAO,WAAW,EAAE,YAAY,GAAG;QAAE,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;QAAC,OAAO,EAAE,IAAI,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAElH;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,GAAG,IAAI,GAAG,OAAO,CAAC;CAC7F"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"IPixivRequestHandler.js","sourceRoot":"","sources":["../../src/pixiv/IPixivRequestHandler.ts"],"names":[],"mappings":""}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Process-wide Pixiv rate-limit coordinator.
|
|
3
|
-
*
|
|
4
|
-
* Every Pixiv HTTP request routes through the SAME gate. On a 429 (or an
|
|
5
|
-
* explicit Retry-After) the WHOLE client enters a cooldown: other candidate
|
|
6
|
-
* requests due meanwhile wait at the gate instead of hammering Pixiv in
|
|
7
|
-
* parallel, which is what produced inner*outer retry storms.
|
|
8
|
-
*/
|
|
9
|
-
export declare class RateLimitCoordinator {
|
|
10
|
-
private readonly minIntervalMs;
|
|
11
|
-
private readonly defaultCooldownMs;
|
|
12
|
-
private readonly maxCooldownMs;
|
|
13
|
-
private readonly clock;
|
|
14
|
-
private nextAllowedAt;
|
|
15
|
-
private cooldownUntil;
|
|
16
|
-
private signals;
|
|
17
|
-
constructor(minIntervalMs?: number, defaultCooldownMs?: number, maxCooldownMs?: number, clock?: () => number);
|
|
18
|
-
preflightDelay(now?: number): number;
|
|
19
|
-
acquire(signal?: AbortSignal): Promise<void>;
|
|
20
|
-
reportRateLimited(retryAfter?: string | null, now?: number): number;
|
|
21
|
-
reportSuccess(): void;
|
|
22
|
-
get cooldownRemainingMs(): number;
|
|
23
|
-
status(now?: number): {
|
|
24
|
-
cooldownUntil: number;
|
|
25
|
-
cooldownRemainingMs: number;
|
|
26
|
-
signals: number;
|
|
27
|
-
};
|
|
28
|
-
private sleep;
|
|
29
|
-
}
|
|
30
|
-
//# sourceMappingURL=RateLimitCoordinator.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"RateLimitCoordinator.d.ts","sourceRoot":"","sources":["../../src/pixiv/RateLimitCoordinator.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAM7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK;IARxB,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,OAAO,CAAK;gBAGD,aAAa,GAAE,MAAY,EAC3B,iBAAiB,GAAE,MAAc,EACjC,aAAa,GAAE,MAAoB,EACnC,KAAK,GAAE,MAAM,MAAyB;IAGzD,cAAc,CAAC,GAAG,GAAE,MAAqB,GAAG,MAAM;IAM5C,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlD,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,GAAE,MAAqB,GAAG,MAAM;IAUjF,aAAa,IAAI,IAAI;IAErB,IAAI,mBAAmB,IAAI,MAAM,CAA2D;IAE5F,MAAM,CAAC,GAAG,GAAE,MAAqB;;;;;YAInB,KAAK;CAGpB"}
|