pixivflow 2.10.28 → 2.10.30
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/commands/LoginCommand.d.ts.map +1 -1
- package/dist/commands/LoginCommand.js +35 -2
- package/dist/commands/LoginCommand.js.map +1 -1
- package/dist/commands/LoginHeadlessCommand.d.ts.map +1 -1
- package/dist/commands/LoginHeadlessCommand.js +35 -2
- package/dist/commands/LoginHeadlessCommand.js.map +1 -1
- package/dist/commands/RefreshCommand.d.ts.map +1 -1
- package/dist/commands/RefreshCommand.js +2 -2
- package/dist/commands/RefreshCommand.js.map +1 -1
- package/dist/commands/SchedulerCommand.d.ts.map +1 -1
- package/dist/commands/SchedulerCommand.js +1 -0
- package/dist/commands/SchedulerCommand.js.map +1 -1
- package/dist/commands/scheduler-runtime.d.ts +4 -0
- package/dist/commands/scheduler-runtime.d.ts.map +1 -1
- package/dist/commands/scheduler-runtime.js +34 -10
- package/dist/commands/scheduler-runtime.js.map +1 -1
- package/dist/delivery/DeliveryOutbox.d.ts.map +1 -1
- package/dist/delivery/DeliveryOutbox.js +6 -2
- package/dist/delivery/DeliveryOutbox.js.map +1 -1
- package/dist/delivery/HttpMultipartDelivery.d.ts.map +1 -1
- package/dist/delivery/HttpMultipartDelivery.js +6 -0
- package/dist/delivery/HttpMultipartDelivery.js.map +1 -1
- package/dist/download/IllustrationDownloader.d.ts.map +1 -1
- package/dist/download/IllustrationDownloader.js +15 -17
- package/dist/download/IllustrationDownloader.js.map +1 -1
- 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/download/plan/DownloadPlanner.d.ts.map +1 -1
- package/dist/download/plan/DownloadPlanner.js +5 -3
- package/dist/download/plan/DownloadPlanner.js.map +1 -1
- package/dist/download/recovery/ErrorRecovery.d.ts.map +1 -1
- package/dist/download/recovery/ErrorRecovery.js +10 -7
- package/dist/download/recovery/ErrorRecovery.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/scheduler/MultiScheduleManager.d.ts +2 -1
- package/dist/scheduler/MultiScheduleManager.d.ts.map +1 -1
- package/dist/scheduler/MultiScheduleManager.js +1 -1
- package/dist/scheduler/MultiScheduleManager.js.map +1 -1
- package/dist/scheduler/Scheduler.d.ts +10 -1
- package/dist/scheduler/Scheduler.d.ts.map +1 -1
- package/dist/scheduler/Scheduler.js +28 -5
- package/dist/scheduler/Scheduler.js.map +1 -1
- package/dist/utils/login-helper.d.ts +1 -1
- package/dist/utils/login-helper.d.ts.map +1 -1
- package/dist/utils/login-helper.js +4 -3
- package/dist/utils/login-helper.js.map +1 -1
- package/dist/utils/token-maintenance.js +2 -2
- package/dist/utils/token-maintenance.js.map +1 -1
- package/dist/webui/package.json +1 -1
- package/dist/webui/routes/handlers/auth/auth-login-handler.d.ts.map +1 -1
- package/dist/webui/routes/handlers/auth/auth-login-handler.js +37 -3
- package/dist/webui/routes/handlers/auth/auth-login-handler.js.map +1 -1
- package/dist/webui/routes/handlers/auth/auth-token-handler.js +2 -2
- package/dist/webui/routes/handlers/auth/auth-token-handler.js.map +1 -1
- package/dist/webui/routes/handlers/auth/auth-utils.js +2 -2
- package/dist/webui/routes/handlers/auth/auth-utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-helper.js","sourceRoot":"","sources":["../../src/utils/login-helper.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"login-helper.js","sourceRoot":"","sources":["../../src/utils/login-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.TokenMaintenanceService = void 0;
|
|
16
16
|
exports.createTokenMaintenanceService = createTokenMaintenanceService;
|
|
17
17
|
const logger_1 = require("../logger");
|
|
18
|
-
const
|
|
18
|
+
const token_refresh_1 = require("../terminal-login/token-refresh");
|
|
19
19
|
const DEFAULT_CONFIG = {
|
|
20
20
|
enabled: true,
|
|
21
21
|
refreshInterval: 7 * 24 * 60 * 60 * 1000, // 7 days
|
|
@@ -121,7 +121,7 @@ class TokenMaintenanceService {
|
|
|
121
121
|
return false;
|
|
122
122
|
}
|
|
123
123
|
// Try to refresh the token to verify it's valid
|
|
124
|
-
await
|
|
124
|
+
await (0, token_refresh_1.refreshToken)(this.credentials.refreshToken);
|
|
125
125
|
return true;
|
|
126
126
|
}
|
|
127
127
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-maintenance.js","sourceRoot":"","sources":["../../src/utils/token-maintenance.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAkLH,sEAuBC;AAvMD,sCAAmC;AAInC,
|
|
1
|
+
{"version":3,"file":"token-maintenance.js","sourceRoot":"","sources":["../../src/utils/token-maintenance.ts"],"names":[],"mappings":"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"}
|
package/dist/webui/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-login-handler.d.ts","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-login-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO5C;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"auth-login-handler.d.ts","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-login-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAO5C;;;;;;;;;;;;GAYG;AACH,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAgHtE;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA0D/E"}
|
|
@@ -1,9 +1,42 @@
|
|
|
1
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
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
exports.login = login;
|
|
4
37
|
exports.loginWithToken = loginWithToken;
|
|
5
38
|
const config_1 = require("../../../../config");
|
|
6
|
-
const
|
|
39
|
+
const token_refresh_1 = require("../../../../terminal-login/token-refresh");
|
|
7
40
|
const login_helper_1 = require("../../../../utils/login-helper");
|
|
8
41
|
const logger_1 = require("../../../../logger");
|
|
9
42
|
const error_codes_1 = require("../../../utils/error-codes");
|
|
@@ -58,7 +91,8 @@ async function login(req, res) {
|
|
|
58
91
|
logger_1.logger.warn('Interactive login requested in Electron environment - Puppeteer may not work');
|
|
59
92
|
logger_1.logger.warn('Recommendation: Use Electron\'s built-in login window from the frontend');
|
|
60
93
|
}
|
|
61
|
-
const
|
|
94
|
+
const { TerminalLogin } = await Promise.resolve().then(() => __importStar(require('../../../../terminal-login')));
|
|
95
|
+
const loginInstance = new TerminalLogin({
|
|
62
96
|
headless: headless,
|
|
63
97
|
username: username || undefined,
|
|
64
98
|
password: password || undefined,
|
|
@@ -144,7 +178,7 @@ async function loginWithToken(req, res) {
|
|
|
144
178
|
// Validate token by attempting to refresh it
|
|
145
179
|
let loginInfo;
|
|
146
180
|
try {
|
|
147
|
-
loginInfo = await
|
|
181
|
+
loginInfo = await (0, token_refresh_1.refreshToken)(trimmedToken);
|
|
148
182
|
logger_1.logger.info('Refresh token validated successfully');
|
|
149
183
|
}
|
|
150
184
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-login-handler.js","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-login-handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth-login-handler.js","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-login-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.refreshToken = refreshToken;
|
|
4
4
|
const config_1 = require("../../../../config");
|
|
5
|
-
const
|
|
5
|
+
const token_refresh_1 = require("../../../../terminal-login/token-refresh");
|
|
6
6
|
const login_helper_1 = require("../../../../utils/login-helper");
|
|
7
7
|
const logger_1 = require("../../../../logger");
|
|
8
8
|
const error_codes_1 = require("../../../utils/error-codes");
|
|
@@ -66,7 +66,7 @@ async function refreshToken(req, res) {
|
|
|
66
66
|
});
|
|
67
67
|
return;
|
|
68
68
|
}
|
|
69
|
-
const loginInfo = await
|
|
69
|
+
const loginInfo = await (0, token_refresh_1.refreshToken)(tokenToUse);
|
|
70
70
|
// Auto-update config file with new refresh token if it changed
|
|
71
71
|
if (loginInfo.refresh_token && loginInfo.refresh_token !== tokenToUse) {
|
|
72
72
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-token-handler.js","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-token-handler.ts"],"names":[],"mappings":";;AAaA,oCAsGC;AAlHD,+CAA+D;AAC/D
|
|
1
|
+
{"version":3,"file":"auth-token-handler.js","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-token-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ const fs_1 = require("fs");
|
|
|
8
8
|
const config_1 = require("../../../../config");
|
|
9
9
|
const logger_1 = require("../../../../logger");
|
|
10
10
|
const token_manager_1 = require("../../../../utils/token-manager");
|
|
11
|
-
const
|
|
11
|
+
const token_refresh_1 = require("../../../../terminal-login/token-refresh");
|
|
12
12
|
/**
|
|
13
13
|
* Read config file without validation (for checking refreshToken even if validation fails)
|
|
14
14
|
*/
|
|
@@ -65,7 +65,7 @@ function getRefreshToken() {
|
|
|
65
65
|
*/
|
|
66
66
|
async function validateToken(refreshToken) {
|
|
67
67
|
try {
|
|
68
|
-
const loginInfo = await
|
|
68
|
+
const loginInfo = await (0, token_refresh_1.refreshToken)(refreshToken);
|
|
69
69
|
return {
|
|
70
70
|
valid: true,
|
|
71
71
|
user: loginInfo.user,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-utils.ts"],"names":[],"mappings":";;AAUA,sCAcC;AAKD,0CAiCC;AAKD,sCAqBC;AAKD,kDAcC;AA3GD,2BAA8C;AAC9C,+CAAwG;AACxG,+CAA4C;AAE5C,mEAA4F;AAC5F
|
|
1
|
+
{"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-utils.ts"],"names":[],"mappings":";;AAUA,sCAcC;AAKD,0CAiCC;AAKD,sCAqBC;AAKD,kDAcC;AA3GD,2BAA8C;AAC9C,+CAAwG;AACxG,+CAA4C;AAE5C,mEAA4F;AAC5F,4EAA6F;AAE7F;;GAEG;AACH,SAAgB,aAAa,CAAC,UAAkB;IAC9C,IAAI,CAAC;QACH,IAAI,CAAC,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,iBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAA8B,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,IAAI,CAAC,gCAAgC,EAAE;YAC5C,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YAC7D,UAAU;SACX,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,eAAe;IAC7B,MAAM,UAAU,GAAG,IAAA,sBAAa,GAAE,CAAC;IAEnC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC;QAEhD,IAAI,YAAY,IAAI,CAAC,IAAA,kCAAkB,EAAC,YAAY,CAAC,EAAE,CAAC;YACtD,OAAO,YAAY,CAAC;QACtB,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,wCAAwC;QACxC,eAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,sBAAsB;IACtB,MAAM,SAAS,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;IAC5C,IAAI,WAAW,GAAG,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC;IAEjD,IAAI,IAAA,kCAAkB,EAAC,WAAW,CAAC,EAAE,CAAC;QACpC,sBAAsB;QACtB,MAAM,YAAY,GAAG,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC;QACtD,MAAM,YAAY,GAAG,IAAA,qCAAqB,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;QACtE,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,YAAY,CAAC;QACtB,CAAC;IACH,CAAC;IAED,IAAI,WAAW,IAAI,CAAC,IAAA,kCAAkB,EAAC,WAAW,CAAC,EAAE,CAAC;QACpD,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,aAAa,CAAC,YAAoB;IAKtD,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,IAAA,4BAAiB,EAAC,YAAY,CAAC,CAAC;QACxD,OAAO;YACL,KAAK,EAAE,IAAI;YACX,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,SAAS;SACV,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE;YACrC,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC9D,CAAC,CAAC;QACH,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,IAAI;SACX,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB,CAAC,KAAkB;IAIpD,MAAM,gBAAgB,GACpB,KAAK,CAAC,KAAK,YAAY,8BAAqB;QAC1C,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM;QACpB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACtB,MAAM,kBAAkB,GACtB,KAAK,CAAC,KAAK,YAAY,8BAAqB;QAC1C,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ;QACtB,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,CAAC;AACpE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pixivflow",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.30",
|
|
4
4
|
"description": "🎨 智能的 Pixiv 自动化下载工具 - 支持批量下载插画和小说、定时任务、Docker部署 | Intelligent Pixiv Automation Downloader with batch download, scheduler, and Docker support",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|