pixivflow 2.10.29 → 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.
Files changed (40) hide show
  1. package/dist/commands/LoginCommand.d.ts.map +1 -1
  2. package/dist/commands/LoginCommand.js +35 -2
  3. package/dist/commands/LoginCommand.js.map +1 -1
  4. package/dist/commands/LoginHeadlessCommand.d.ts.map +1 -1
  5. package/dist/commands/LoginHeadlessCommand.js +35 -2
  6. package/dist/commands/LoginHeadlessCommand.js.map +1 -1
  7. package/dist/commands/RefreshCommand.d.ts.map +1 -1
  8. package/dist/commands/RefreshCommand.js +2 -2
  9. package/dist/commands/RefreshCommand.js.map +1 -1
  10. package/dist/delivery/DeliveryOutbox.d.ts.map +1 -1
  11. package/dist/delivery/DeliveryOutbox.js +6 -2
  12. package/dist/delivery/DeliveryOutbox.js.map +1 -1
  13. package/dist/download/IllustrationDownloader.d.ts.map +1 -1
  14. package/dist/download/IllustrationDownloader.js +15 -17
  15. package/dist/download/IllustrationDownloader.js.map +1 -1
  16. package/dist/download/pipeline/DownloadPipeline.d.ts.map +1 -1
  17. package/dist/download/pipeline/DownloadPipeline.js +4 -2
  18. package/dist/download/pipeline/DownloadPipeline.js.map +1 -1
  19. package/dist/download/plan/DownloadPlanner.d.ts.map +1 -1
  20. package/dist/download/plan/DownloadPlanner.js +5 -3
  21. package/dist/download/plan/DownloadPlanner.js.map +1 -1
  22. package/dist/download/recovery/ErrorRecovery.d.ts.map +1 -1
  23. package/dist/download/recovery/ErrorRecovery.js +10 -7
  24. package/dist/download/recovery/ErrorRecovery.js.map +1 -1
  25. package/dist/package.json +1 -1
  26. package/dist/utils/login-helper.d.ts +1 -1
  27. package/dist/utils/login-helper.d.ts.map +1 -1
  28. package/dist/utils/login-helper.js +4 -3
  29. package/dist/utils/login-helper.js.map +1 -1
  30. package/dist/utils/token-maintenance.js +2 -2
  31. package/dist/utils/token-maintenance.js.map +1 -1
  32. package/dist/webui/package.json +1 -1
  33. package/dist/webui/routes/handlers/auth/auth-login-handler.d.ts.map +1 -1
  34. package/dist/webui/routes/handlers/auth/auth-login-handler.js +37 -3
  35. package/dist/webui/routes/handlers/auth/auth-login-handler.js.map +1 -1
  36. package/dist/webui/routes/handlers/auth/auth-token-handler.js +2 -2
  37. package/dist/webui/routes/handlers/auth/auth-token-handler.js.map +1 -1
  38. package/dist/webui/routes/handlers/auth/auth-utils.js +2 -2
  39. package/dist/webui/routes/handlers/auth/auth-utils.js.map +1 -1
  40. package/package.json +1 -1
package/dist/commands/LoginCommand.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LoginCommand.d.ts","sourceRoot":"","sources":["../../src/commands/LoginCommand.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAsBrE;;;;;GAKG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,QAAQ,CAAC,IAAI,WAAW;IACxB,QAAQ,CAAC,WAAW,6CAA6C;IACjE,QAAQ,CAAC,OAAO,WAAoC;IACpD,QAAQ,CAAC,aAAa,SAAS;IAC/B,QAAQ,CAAC,QAAQ;;;;MAIf;IAEI,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IA+DjF,QAAQ,IAAI,MAAM;CAanB"}
1
+ {"version":3,"file":"LoginCommand.d.ts","sourceRoot":"","sources":["../../src/commands/LoginCommand.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAsBrE;;;;;GAKG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C,QAAQ,CAAC,IAAI,WAAW;IACxB,QAAQ,CAAC,WAAW,6CAA6C;IACjE,QAAQ,CAAC,OAAO,WAAoC;IACpD,QAAQ,CAAC,aAAa,SAAS;IAC/B,QAAQ,CAAC,QAAQ;;;;MAIf;IAEI,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAgEjF,QAAQ,IAAI,MAAM;CAanB"}
package/dist/commands/LoginCommand.js CHANGED
@@ -2,11 +2,43 @@
2
2
  /**
3
3
  * Login command - Interactive login
4
4
  */
5
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ var desc = Object.getOwnPropertyDescriptor(m, k);
8
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
9
+ desc = { enumerable: true, get: function() { return m[k]; } };
10
+ }
11
+ Object.defineProperty(o, k2, desc);
12
+ }) : (function(o, m, k, k2) {
13
+ if (k2 === undefined) k2 = k;
14
+ o[k2] = m[k];
15
+ }));
16
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
17
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
18
+ }) : function(o, v) {
19
+ o["default"] = v;
20
+ });
21
+ var __importStar = (this && this.__importStar) || (function () {
22
+ var ownKeys = function(o) {
23
+ ownKeys = Object.getOwnPropertyNames || function (o) {
24
+ var ar = [];
25
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
26
+ return ar;
27
+ };
28
+ return ownKeys(o);
29
+ };
30
+ return function (mod) {
31
+ if (mod && mod.__esModule) return mod;
32
+ var result = {};
33
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
34
+ __setModuleDefault(result, mod);
35
+ return result;
36
+ };
37
+ })();
5
38
  Object.defineProperty(exports, "__esModule", { value: true });
6
39
  exports.LoginCommand = void 0;
7
40
  const Command_1 = require("./Command");
8
41
  const metadata_1 = require("./metadata");
9
- const terminal_login_1 = require("../terminal-login");
10
42
  const login_helper_1 = require("../utils/login-helper");
11
43
  const config_1 = require("../config");
12
44
  /**
@@ -48,6 +80,7 @@ class LoginCommand extends Command_1.BaseCommand {
48
80
  let password = (args.options.password || args.options.p);
49
81
  const configPath = args.options.config || context.configPath;
50
82
  try {
83
+ const { TerminalLogin } = await Promise.resolve().then(() => __importStar(require('../terminal-login')));
51
84
  // Check if credentials were provided via command line arguments
52
85
  const credentialsProvided = !!(username && password);
53
86
  // Use headless mode only if credentials were provided via command line
@@ -60,7 +93,7 @@ class LoginCommand extends Command_1.BaseCommand {
60
93
  console.log('[i]: You do NOT need to enter credentials here - just wait for the browser to open.');
61
94
  console.log('[i]: After you complete login in the browser, the token will be automatically retrieved.');
62
95
  }
63
- const login = new terminal_login_1.TerminalLogin({
96
+ const login = new TerminalLogin({
64
97
  headless: useHeadless,
65
98
  username: useHeadless ? username : undefined,
66
99
  password: useHeadless ? password : undefined,
package/dist/commands/LoginCommand.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LoginCommand.js","sourceRoot":"","sources":["../../src/commands/LoginCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LoginCommand.js","sourceRoot":"","sources":["../../src/commands/LoginCommand.ts"],"names":[],"mappings":"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"}
package/dist/commands/LoginHeadlessCommand.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LoginHeadlessCommand.d.ts","sourceRoot":"","sources":["../../src/commands/LoginHeadlessCommand.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAsBrE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,WAAW;IACnD,QAAQ,CAAC,IAAI,oBAAoB;IACjC,QAAQ,CAAC,WAAW,iDAAiD;IACrE,QAAQ,CAAC,OAAO,WAAU;IAC1B,QAAQ,CAAC,aAAa,SAAS;IAC/B,QAAQ,CAAC,QAAQ;;;;MAIf;IAEF,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE;IAmB3D,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAuDjF,QAAQ,IAAI,MAAM;CAenB"}
1
+ {"version":3,"file":"LoginHeadlessCommand.d.ts","sourceRoot":"","sources":["../../src/commands/LoginHeadlessCommand.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAsBrE;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,WAAW;IACnD,QAAQ,CAAC,IAAI,oBAAoB;IACjC,QAAQ,CAAC,WAAW,iDAAiD;IACrE,QAAQ,CAAC,OAAO,WAAU;IAC1B,QAAQ,CAAC,aAAa,SAAS;IAC/B,QAAQ,CAAC,QAAQ;;;;MAIf;IAEF,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE;IAmB3D,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAwDjF,QAAQ,IAAI,MAAM;CAenB"}
package/dist/commands/LoginHeadlessCommand.js CHANGED
@@ -2,12 +2,44 @@
2
2
  /**
3
3
  * Login headless command - Headless login with credentials
4
4
  */
5
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ var desc = Object.getOwnPropertyDescriptor(m, k);
8
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
9
+ desc = { enumerable: true, get: function() { return m[k]; } };
10
+ }
11
+ Object.defineProperty(o, k2, desc);
12
+ }) : (function(o, m, k, k2) {
13
+ if (k2 === undefined) k2 = k;
14
+ o[k2] = m[k];
15
+ }));
16
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
17
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
18
+ }) : function(o, v) {
19
+ o["default"] = v;
20
+ });
21
+ var __importStar = (this && this.__importStar) || (function () {
22
+ var ownKeys = function(o) {
23
+ ownKeys = Object.getOwnPropertyNames || function (o) {
24
+ var ar = [];
25
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
26
+ return ar;
27
+ };
28
+ return ownKeys(o);
29
+ };
30
+ return function (mod) {
31
+ if (mod && mod.__esModule) return mod;
32
+ var result = {};
33
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
34
+ __setModuleDefault(result, mod);
35
+ return result;
36
+ };
37
+ })();
5
38
  Object.defineProperty(exports, "__esModule", { value: true });
6
39
  exports.LoginHeadlessCommand = void 0;
7
40
  const stdin_1 = require("../utils/stdin");
8
41
  const Command_1 = require("./Command");
9
42
  const metadata_1 = require("./metadata");
10
- const terminal_login_1 = require("../terminal-login");
11
43
  const login_helper_1 = require("../utils/login-helper");
12
44
  const config_1 = require("../config");
13
45
  /**
@@ -72,7 +104,8 @@ class LoginHeadlessCommand extends Command_1.BaseCommand {
72
104
  }
73
105
  const configPath = args.options.config || context.configPath;
74
106
  try {
75
- const login = new terminal_login_1.TerminalLogin({
107
+ const { TerminalLogin } = await Promise.resolve().then(() => __importStar(require('../terminal-login')));
108
+ const login = new TerminalLogin({
76
109
  headless: true,
77
110
  username,
78
111
  password,
package/dist/commands/LoginHeadlessCommand.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"LoginHeadlessCommand.js","sourceRoot":"","sources":["../../src/commands/LoginHeadlessCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"LoginHeadlessCommand.js","sourceRoot":"","sources":["../../src/commands/LoginHeadlessCommand.ts"],"names":[],"mappings":"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"}
package/dist/commands/RefreshCommand.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RefreshCommand.d.ts","sourceRoot":"","sources":["../../src/commands/RefreshCommand.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA0BrE;;GAEG;AACH,qBAAa,cAAe,SAAQ,WAAW;IAC7C,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,kGAAkG;IACtH,QAAQ,CAAC,OAAO,WAA0D;IAC1E,QAAQ,CAAC,aAAa,SAAS;IAC/B,QAAQ,CAAC,QAAQ;;;;MAIf;IAEF;;;OAGG;WACU,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC7E,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE;IAc3D,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAgCjF,QAAQ,IAAI,MAAM;CAqBnB"}
1
+ {"version":3,"file":"RefreshCommand.d.ts","sourceRoot":"","sources":["../../src/commands/RefreshCommand.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA0BrE;;GAEG;AACH,qBAAa,cAAe,SAAQ,WAAW;IAC7C,QAAQ,CAAC,IAAI,aAAa;IAC1B,QAAQ,CAAC,WAAW,kGAAkG;IACtH,QAAQ,CAAC,OAAO,WAA0D;IAC1E,QAAQ,CAAC,aAAa,SAAS;IAC/B,QAAQ,CAAC,QAAQ;;;;MAIf;IAEF;;;OAGG;WACU,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC7E,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE;IAc3D,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC;IAiCjF,QAAQ,IAAI,MAAM;CAqBnB"}
package/dist/commands/RefreshCommand.js CHANGED
@@ -39,7 +39,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
39
39
  exports.RefreshCommand = void 0;
40
40
  const Command_1 = require("./Command");
41
41
  const metadata_1 = require("./metadata");
42
- const terminal_login_1 = require("../terminal-login");
43
42
  const login_helper_1 = require("../utils/login-helper");
44
43
  const defaults_1 = require("../config/defaults");
45
44
  const stdin_1 = require("../utils/stdin");
@@ -140,7 +139,8 @@ class RefreshCommand extends Command_1.BaseCommand {
140
139
  const json = !!(args.options.json || args.options.j);
141
140
  const refreshToken = args.positional[0] || args.options.token;
142
141
  try {
143
- const loginInfo = await terminal_login_1.TerminalLogin.refresh(refreshToken);
142
+ const { TerminalLogin } = await Promise.resolve().then(() => __importStar(require('../terminal-login')));
143
+ const loginInfo = await TerminalLogin.refresh(refreshToken);
144
144
  outputLoginResult(loginInfo, json);
145
145
  return this.success('Token refresh successful', loginInfo);
146
146
  }
package/dist/commands/RefreshCommand.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RefreshCommand.js","sourceRoot":"","sources":["../../src/commands/RefreshCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RefreshCommand.js","sourceRoot":"","sources":["../../src/commands/RefreshCommand.ts"],"names":[],"mappings":"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"}
package/dist/delivery/DeliveryOutbox.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DeliveryOutbox.d.ts","sourceRoot":"","sources":["../../src/delivery/DeliveryOutbox.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAmC,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI9E,mEAAmE;AACnE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAK/D;AAgCD,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,8EAA8E;AAC9E,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHP,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,kBAAkB,EAC9B,mBAAmB,UAAO,EAC1B,OAAO,GAAE,qBAA0B;IAGhD,OAAO,CAAC,QAAQ,EAAE,kBAAkB,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAqE1E,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCxF,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;YAmCnC,eAAe;YAqDf,gBAAgB;YAUhB,WAAW;YAQX,YAAY;IAY1B,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,YAAY;YAMN,gBAAgB;YAIhB,aAAa;CAU5B"}
1
+ {"version":3,"file":"DeliveryOutbox.d.ts","sourceRoot":"","sources":["../../src/delivery/DeliveryOutbox.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAmC,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAI9E,mEAAmE;AACnE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAK/D;AAgCD,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACpB;AAED,8EAA8E;AAC9E,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHP,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,kBAAkB,EAC9B,mBAAmB,UAAO,EAC1B,OAAO,GAAE,qBAA0B;IAGhD,OAAO,CAAC,QAAQ,EAAE,kBAAkB,EAAE,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAsE1E,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCxF,YAAY,IAAI,OAAO,CAAC,kBAAkB,CAAC;YAmCnC,eAAe;YAqDf,gBAAgB;YAUhB,WAAW;YAQX,YAAY;IAY1B,OAAO,CAAC,GAAG;IAIX,OAAO,CAAC,WAAW;IAMnB,OAAO,CAAC,YAAY;YAMN,gBAAgB;YAIhB,aAAa;CAU5B"}
package/dist/delivery/DeliveryOutbox.js CHANGED
@@ -87,8 +87,12 @@ class DeliveryOutbox {
87
87
  await this.processManifest(manifestPath, entry);
88
88
  }
89
89
  catch (error) {
90
- const message = error instanceof Error ? error.message : String(error);
91
- throw new errors_1.PendingDeliveryError(`Delivery failed; files retained for retry in ${manifestPath}: ${message}`, error instanceof Error ? error : undefined);
90
+ logger_1.logger.warn('Delivery failed; downloaded files remain queued for retry', {
91
+ manifestPath,
92
+ pixivId: artifact.pixivId,
93
+ type: artifact.type,
94
+ error: error instanceof Error ? error.message : String(error),
95
+ });
92
96
  }
93
97
  }
94
98
  async notifyNoMatch(target, text, idempotencyKey) {
package/dist/delivery/DeliveryOutbox.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DeliveryOutbox.js","sourceRoot":"","sources":["../../src/delivery/DeliveryOutbox.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DeliveryOutbox.js","sourceRoot":"","sources":["../../src/delivery/DeliveryOutbox.ts"],"names":[],"mappings":"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"}
package/dist/download/IllustrationDownloader.d.ts.map CHANGED
@@ -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;AAOpE,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,CACxB,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAO,GACjE,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAqOrC;;;;OAIG;YACW,cAAc;IAoG5B;;OAEG;YACW,6BAA6B;IAgC3C;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkB5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAiBvB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAQzB"}
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;AAOpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAUvD;;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,CACxB,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAO,GACjE,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAqOrC;;;;OAIG;YACW,cAAc;IAmG5B;;OAEG;YACW,6BAA6B;IAgC3C;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAkB5B;;OAEG;IACH,OAAO,CAAC,eAAe;IAiBvB;;OAEG;IACH,OAAO,CAAC,gBAAgB;CAQzB"}
package/dist/download/IllustrationDownloader.js CHANGED
@@ -40,6 +40,13 @@ const node_fs_1 = require("node:fs");
40
40
  const node_path_1 = require("node:path");
41
41
  const errors_1 = require("../utils/errors");
42
42
  const ai_detection_1 = require("../utils/ai-detection");
43
+ function withTimeout(task, timeoutMs, message) {
44
+ let timer;
45
+ const timeout = new Promise((_, reject) => {
46
+ timer = setTimeout(() => reject(new Error(message)), timeoutMs);
47
+ });
48
+ return Promise.race([task, timeout]).finally(() => clearTimeout(timer));
49
+ }
43
50
  /**
44
51
  * Service for downloading illustrations
45
52
  */
@@ -66,10 +73,7 @@ class IllustrationDownloader {
66
73
  // Files exist but not in database - update database and skip download
67
74
  logger_1.logger.info(`Found existing files for illustration ${illust.id} but missing database record. Updating database...`);
68
75
  // Get illustration detail with tags to get full information
69
- const { illust: detail } = await Promise.race([
70
- this.client.getIllustDetailWithTags(illust.id),
71
- new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout: Failed to get illustration detail for ${illust.id} within 60 seconds`)), 60000))
72
- ]);
76
+ const { illust: detail } = await withTimeout(this.client.getIllustDetailWithTags(illust.id), 60000, `Timeout: Failed to get illustration detail for ${illust.id} within 60 seconds`);
73
77
  // Insert database records for existing files
74
78
  for (const filePath of existingFiles) {
75
79
  this.database.insertDownload({
@@ -93,10 +97,7 @@ class IllustrationDownloader {
93
97
  };
94
98
  }
95
99
  // Add timeout protection for getIllustDetailWithTags to prevent hanging
96
- const { illust: detail, tags } = await Promise.race([
97
- this.client.getIllustDetailWithTags(illust.id),
98
- new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout: Failed to get illustration detail for ${illust.id} within 60 seconds`)), 60000))
99
- ]);
100
+ const { illust: detail, tags } = await withTimeout(this.client.getIllustDetailWithTags(illust.id), 60000, `Timeout: Failed to get illustration detail for ${illust.id} within 60 seconds`);
100
101
  // Ugoira (animation) works have no original image urls; they are
101
102
  // delivered as a zip of frames plus a frame-delay sidecar.
102
103
  if (detail.illust_type === 'ugoira' || illust.type === 'ugoira') {
@@ -127,10 +128,7 @@ class IllustrationDownloader {
127
128
  date: detail.create_date ? new Date(detail.create_date) : new Date(),
128
129
  };
129
130
  // Add timeout protection for image download (2 minutes per image)
130
- const buffer = await Promise.race([
131
- this.client.downloadImage(originalUrl),
132
- new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout: Failed to download image for illustration ${detail.id} page ${index + 1} within 120 seconds`)), 120000))
133
- ]);
131
+ const buffer = await withTimeout(this.client.downloadImage(originalUrl), 120000, `Timeout: Failed to download image for illustration ${detail.id} page ${index + 1} within 120 seconds`);
134
132
  const filePath = await this.fileService.saveImage(buffer, fileName, metadata);
135
133
  // Release the page buffer promptly: ArrayBuffers are external memory,
136
134
  // NOT capped by --max-old-space-size. Without explicit GC they linger
@@ -210,7 +208,10 @@ class IllustrationDownloader {
210
208
  }
211
209
  }
212
210
  if (successCount === 0) {
213
- throw new Error(`Failed to download any pages for illustration ${detail.id}`);
211
+ const firstFailure = downloadResults.find((result) => !result.success);
212
+ throw firstFailure && !firstFailure.success
213
+ ? firstFailure.error
214
+ : new Error(`Failed to download any pages for illustration ${detail.id}`);
214
215
  }
215
216
  // Optional content-side AI check: scan the first page's file metadata for
216
217
  // AI-generator markers (Stable Diffusion parameters / NovelAI EXIF ...).
@@ -280,10 +281,7 @@ class IllustrationDownloader {
280
281
  let lastZipError;
281
282
  for (const zipUrl of zipCandidates) {
282
283
  try {
283
- buffer = await Promise.race([
284
- this.client.downloadImage(zipUrl),
285
- new Promise((_, reject) => setTimeout(() => reject(new Error(`Timeout: ugoira zip download for ${detail.id}`)), 300000)),
286
- ]);
284
+ buffer = await withTimeout(this.client.downloadImage(zipUrl), 300000, `Timeout: ugoira zip download for ${detail.id}`);
287
285
  break;
288
286
  }
289
287
  catch (e) {
package/dist/download/IllustrationDownloader.js.map CHANGED
@@ -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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"}
package/dist/download/pipeline/DownloadPipeline.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DownloadPipeline.d.ts","sourceRoot":"","sources":["../../../src/download/pipeline/DownloadPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI9D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAoB,MAAM,2BAA2B,CAAC;AAEpF,KAAK,YAAY,GAAG,WAAW,GAAG,UAAU,CAAC;AAC7C,KAAK,QAAQ,GAAG,cAAc,GAAG,OAAO,CAAC;AAEzC,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,EAAE,qBAAqB,CAAC;IAChC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;CAC7B;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;gBAEnC,IAAI,EAAE,4BAA4B;IASxC,GAAG,CAAC,CAAC,SAAS,YAAY,EAC9B,KAAK,EAAE,CAAC,EAAE,EACV,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAClD,OAAO,CAAC,sBAAsB,CAAC;YAuCpB,iBAAiB;YAgFjB,qBAAqB;IAsDnC,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,mBAAmB;CAqD5B"}
1
+ {"version":3,"file":"DownloadPipeline.d.ts","sourceRoot":"","sources":["../../../src/download/pipeline/DownloadPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAI9D,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAoB,MAAM,2BAA2B,CAAC;AAEpF,KAAK,YAAY,GAAG,WAAW,GAAG,UAAU,CAAC;AAC7C,KAAK,QAAQ,GAAG,cAAc,GAAG,OAAO,CAAC;AAEzC,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,gBAAgB,CAAC;IACzB,OAAO,EAAE,eAAe,CAAC;IACzB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,QAAQ,EAAE,qBAAqB,CAAC;IAChC;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC;CAC7B;AAED,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkB;IAC1C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmB;IACpD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;gBAEnC,IAAI,EAAE,4BAA4B;IASxC,GAAG,CAAC,CAAC,SAAS,YAAY,EAC9B,KAAK,EAAE,CAAC,EAAE,EACV,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAClD,OAAO,CAAC,sBAAsB,CAAC;YAyCpB,iBAAiB;YAgFjB,qBAAqB;IAsDnC,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,mBAAmB;CAqD5B"}
package/dist/download/pipeline/DownloadPipeline.js CHANGED
@@ -32,9 +32,11 @@ class DownloadPipeline {
32
32
  downloaded: 0,
33
33
  skippedCount: 0,
34
34
  };
35
- const concurrency = itemType === 'novel' && target.languageFilter
35
+ const concurrency = plan.mode === 'sequential' && plan.queue.length > targetLimit
36
36
  ? 1
37
- : (this.config.download?.concurrency || 3);
37
+ : itemType === 'novel' && target.languageFilter
38
+ ? 1
39
+ : (this.config.download?.concurrency || 3);
38
40
  if (plan.mode === 'random') {
39
41
  await this.executeRandomMode(plan, targetLimit, planAvailableCount, itemType, tagForLog, downloadFn, retryAttempts, concurrency, state);
40
42
  }
package/dist/download/pipeline/DownloadPipeline.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DownloadPipeline.js","sourceRoot":"","sources":["../../../src/download/pipeline/DownloadPipeline.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DownloadPipeline.js","sourceRoot":"","sources":["../../../src/download/pipeline/DownloadPipeline.ts"],"names":[],"mappings":"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"}
package/dist/download/plan/DownloadPlanner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DownloadPlanner.d.ts","sourceRoot":"","sources":["../../../src/download/plan/DownloadPlanner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,UAAU,CAAC;AAQpD,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,YAAY;IACrD,KAAK,EAAE,CAAC,EAAE,CAAC;IACX,IAAI,EAAE,YAAY,GAAG,QAAQ,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE;QACP,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,SAAS;IAEhD,aAAa,CAAC,CAAC,SAAS,YAAY,EAClC,KAAK,EAAE,CAAC,EAAE,EACV,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,cAAc,GAAG,OAAO,GACjC,eAAe,CAAC,CAAC,CAAC;IAiDrB,OAAO,CAAC,WAAW;IAwEnB,OAAO,CAAC,WAAW;IAuBnB,OAAO,CAAC,OAAO;CAQhB"}
1
+ {"version":3,"file":"DownloadPlanner.d.ts","sourceRoot":"","sources":["../../../src/download/plan/DownloadPlanner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAE5D,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,UAAU,CAAC;AAQpD,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,YAAY;IACrD,KAAK,EAAE,CAAC,EAAE,CAAC;IACX,IAAI,EAAE,YAAY,GAAG,QAAQ,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE;QACP,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED;;GAEG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,SAAS;IAEhD,aAAa,CAAC,CAAC,SAAS,YAAY,EAClC,KAAK,EAAE,CAAC,EAAE,EACV,MAAM,EAAE,YAAY,EACpB,QAAQ,EAAE,cAAc,GAAG,OAAO,GACjC,eAAe,CAAC,CAAC,CAAC;IAmDrB,OAAO,CAAC,WAAW;IAwEnB,OAAO,CAAC,WAAW;IAuBnB,OAAO,CAAC,OAAO;CAQhB"}
package/dist/download/plan/DownloadPlanner.js CHANGED
@@ -39,10 +39,12 @@ class DownloadPlanner {
39
39
  // Language is detected from the full novel body during download. Keep a
40
40
  // bounded popularity-ordered retry pool so a non-matching Top-1 candidate
41
41
  // can be skipped and replaced by the next matching novel.
42
- const languageBackfillLimit = itemType === 'novel' && target.languageFilter
42
+ const backfillLimit = itemType === 'novel' && target.languageFilter
43
43
  ? Math.max(limit, Math.min(target.languageCandidateLimit ?? 20, 100))
44
- : limit;
45
- const queue = available.slice(0, Math.min(available.length, languageBackfillLimit));
44
+ : target.mode === 'topic'
45
+ ? Math.max(limit, 20)
46
+ : limit;
47
+ const queue = available.slice(0, Math.min(available.length, backfillLimit));
46
48
  return {
47
49
  queue,
48
50
  mode: 'sequential',
package/dist/download/plan/DownloadPlanner.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DownloadPlanner.js","sourceRoot":"","sources":["../../../src/download/plan/DownloadPlanner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DownloadPlanner.js","sourceRoot":"","sources":["../../../src/download/plan/DownloadPlanner.ts"],"names":[],"mappings":"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"}
package/dist/download/recovery/ErrorRecovery.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ErrorRecovery.d.ts","sourceRoot":"","sources":["../../../src/download/recovery/ErrorRecovery.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,gBAAgB,GACxB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5E;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7E;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,GAAG,gBAAgB,CAAC;CACpE;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,oBAAqB,YAAW,qBAAqB;IAChE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,OAAO,GAAE,2BAAgC;IAOrD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,GAAG,gBAAgB;CAmCnE"}
1
+ {"version":3,"file":"ErrorRecovery.d.ts","sourceRoot":"","sources":["../../../src/download/recovery/ErrorRecovery.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,gBAAgB,GACxB;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5E;IAAE,MAAM,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC7E;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,GAAG,gBAAgB,CAAC;CACpE;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,oBAAqB,YAAW,qBAAqB;IAChE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,OAAO,GAAE,2BAAgC;IAOrD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,eAAe,GAAG,gBAAgB;CAsCnE"}
package/dist/download/recovery/ErrorRecovery.js CHANGED
@@ -19,21 +19,24 @@ class DefaultErrorRecovery {
19
19
  if ((0, errors_1.is404Error)(error)) {
20
20
  return { action: 'skip', reason: '404 not found or item is private' };
21
21
  }
22
- if ((0, errors_1.isSkipableError)(error)) {
23
- return { action: 'skip', reason: 'explicitly marked as skipable' };
24
- }
25
- // Fail fast when attempts exceeded
26
- if (attempt >= this.maxAttempts) {
27
- return { action: 'fail', reason: 'max attempts reached' };
28
- }
29
22
  // For network errors, respect server-provided wait time or exponential backoff
30
23
  if (error instanceof errors_1.NetworkError) {
24
+ if (attempt >= this.maxAttempts) {
25
+ return { action: 'skip', reason: 'network retries exhausted' };
26
+ }
31
27
  const delayFromServer = typeof error.waitTime === 'number' && error.waitTime > 0 ? error.waitTime : undefined;
32
28
  const backoff = Math.min(this.baseDelayMs * Math.pow(2, attempt - 1), this.maxDelayMs);
33
29
  const delayMs = delayFromServer ?? backoff;
34
30
  logger_1.logger.warn(`Network error when downloading ${context.itemType ?? 'item'} ${context.itemId ?? ''} (attempt ${attempt}/${this.maxAttempts}), retrying after ${delayMs}ms`);
35
31
  return { action: 'backoff', delayMs, maxAttempts: this.maxAttempts, reason: 'network error' };
36
32
  }
33
+ if ((0, errors_1.isSkipableError)(error)) {
34
+ return { action: 'skip', reason: 'explicitly marked as skipable' };
35
+ }
36
+ // Fail fast when attempts exceeded
37
+ if (attempt >= this.maxAttempts) {
38
+ return { action: 'fail', reason: 'max attempts reached' };
39
+ }
37
40
  const delayMs = Math.min(this.baseDelayMs * attempt, this.maxDelayMs);
38
41
  logger_1.logger.warn(`Retrying ${context.itemType ?? 'item'} ${context.itemId ?? ''} (attempt ${attempt}/${this.maxAttempts}) after ${delayMs}ms`);
39
42
  return { action: 'retry', delayMs, maxAttempts: this.maxAttempts, reason: 'transient error' };
package/dist/download/recovery/ErrorRecovery.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ErrorRecovery.js","sourceRoot":"","sources":["../../../src/download/recovery/ErrorRecovery.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AACtC,+CAA+E;AAwB/E,MAAa,oBAAoB;IACd,WAAW,CAAS;IACpB,WAAW,CAAS;IACpB,UAAU,CAAS;IAEpC,YAAY,UAAuC,EAAE;QACnD,MAAM,EAAE,WAAW,GAAG,CAAC,EAAE,WAAW,GAAG,GAAG,EAAE,UAAU,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;QAC1E,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,KAAc,EAAE,OAAwB;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAE7C,6CAA6C;QAC7C,IAAI,IAAA,mBAAU,EAAC,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,kCAAkC,EAAE,CAAC;QACxE,CAAC;QAED,IAAI,IAAA,wBAAe,EAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAC;QACrE,CAAC;QAED,mCAAmC;QACnC,IAAI,OAAO,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC;QAC5D,CAAC;QAED,+EAA+E;QAC/E,IAAI,KAAK,YAAY,qBAAY,EAAE,CAAC;YAClC,MAAM,eAAe,GACnB,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YACxF,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;YACvF,MAAM,OAAO,GAAG,eAAe,IAAI,OAAO,CAAC;YAC3C,eAAM,CAAC,IAAI,CACT,kCAAkC,OAAO,CAAC,QAAQ,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,aAAa,OAAO,IAAI,IAAI,CAAC,WAAW,qBAAqB,OAAO,IAAI,CAC7J,CAAC;YACF,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;QAChG,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,eAAM,CAAC,IAAI,CACT,YAAY,OAAO,CAAC,QAAQ,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE,aAAa,OAAO,IAAI,IAAI,CAAC,WAAW,WAAW,OAAO,IAAI,CAC7H,CAAC;QACF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IAChG,CAAC;CACF;AA/CD,oDA+CC"}
1
+ {"version":3,"file":"ErrorRecovery.js","sourceRoot":"","sources":["../../../src/download/recovery/ErrorRecovery.ts"],"names":[],"mappings":"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"}
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "type": "commonjs",
3
3
  "name": "pixivflow",
4
- "version": "2.10.29",
4
+ "version": "2.10.30",
5
5
  "private": true
6
6
  }
package/dist/utils/login-helper.d.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  * Login helper utility
3
3
  * Provides functions to login and update config file
4
4
  */
5
- import { LoginInfo } from '../terminal-login';
5
+ import type { LoginInfo } from '../terminal-login/types';
6
6
  /**
7
7
  * Update config file with new refresh token
8
8
  * Also saves token to unified storage for cross-config-file persistence
package/dist/utils/login-helper.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"login-helper.d.ts","sourceRoot":"","sources":["../../src/utils/login-helper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAiB,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAK7D;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,GAAE;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,SAAS,CAAC,CAuB1B;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOzE;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,GAAE;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqDvB"}
1
+ {"version":3,"file":"login-helper.d.ts","sourceRoot":"","sources":["../../src/utils/login-helper.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAMzD;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA8Df;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,GAAE;IAClD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC,SAAS,CAAC,CAwB1B;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOzE;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,GAAE;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAqDvB"}
package/dist/utils/login-helper.js CHANGED
@@ -43,7 +43,7 @@ exports.loginAndUpdateConfig = loginAndUpdateConfig;
43
43
  exports.isTokenValid = isTokenValid;
44
44
  exports.ensureValidToken = ensureValidToken;
45
45
  const fs = __importStar(require("fs/promises"));
46
- const terminal_login_1 = require("../terminal-login");
46
+ const token_refresh_1 = require("../terminal-login/token-refresh");
47
47
  const config_1 = require("../config");
48
48
  const logger_1 = require("../logger");
49
49
  const token_manager_1 = require("./token-manager");
@@ -154,7 +154,8 @@ async function loginAndUpdateConfig(options = {}) {
154
154
  // Use getConfigPath to ensure we use the same config path resolution logic
155
155
  const configPath = options.configPath || (0, config_1.getConfigPath)();
156
156
  logger_1.logger.info('Starting Pixiv login...');
157
- const login = new terminal_login_1.TerminalLogin({
157
+ const { TerminalLogin } = await Promise.resolve().then(() => __importStar(require('../terminal-login')));
158
+ const login = new TerminalLogin({
158
159
  headless: options.headless ?? false,
159
160
  username: options.username,
160
161
  password: options.password,
@@ -174,7 +175,7 @@ async function loginAndUpdateConfig(options = {}) {
174
175
  */
175
176
  async function isTokenValid(refreshToken) {
176
177
  try {
177
- await terminal_login_1.TerminalLogin.refresh(refreshToken);
178
+ await (0, token_refresh_1.refreshToken)(refreshToken);
178
179
  return true;
179
180
  }
180
181
  catch {
package/dist/utils/login-helper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"login-helper.js","sourceRoot":"","sources":["../../src/utils/login-helper.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAaH,sDA8BC;AAMD,4CAgEC;AAOD,oDA4BC;AAKD,oCAOC;AAKD,4CA2DC;AA9ND,gDAAkC;AAElC,sDAA6D;AAC7D,sCAAwE;AACxE,sCAAmC;AACnC,mDAA4E;AAE5E;;;GAGG;AACI,KAAK,UAAU,qBAAqB,CACzC,UAAkB,EAClB,YAAoB;IAEpB,IAAI,CAAC;QACH,IAAI,UAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC3D,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,UAAU,EAAE,CAAC;YACpB,gEAAgE;YAChE,eAAM,CAAC,IAAI,CAAC,mEAAmE,CAAC,CAAC;YACjF,MAAM,EAAE,qBAAqB,EAAE,GAAG,wDAAa,oBAAoB,GAAC,CAAC;YACrE,UAAU,GAAG,qBAAqB,EAAE,CAAC;QACvC,CAAC;QAED,8BAA8B;QAC9B,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YACtB,UAAU,CAAC,KAAK,GAAG,EAAE,CAAC;QACxB,CAAC;QAED,UAAU,CAAC,KAAK,CAAC,YAAY,GAAG,YAAY,CAAC;QAC7C,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7E,eAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;QAE5D,iEAAiE;QACjE,IAAA,kCAAkB,EAAC,YAAY,EAAE,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,iCAAiC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7G,CAAC;AACH,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,gBAAgB,CACpC,UAAkB;IAElB,IAAI,YAAY,GAAuB,SAAS,CAAC;IACjD,IAAI,aAAa,GAAG,KAAK,CAAC;IAE1B,yDAAyD;IACzD,iDAAiD;IACjD,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAqB,CAAC;QAC1F,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,YAAY,CAAC;IAClD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,oFAAoF;QACpF,eAAM,CAAC,IAAI,CAAC,4DAA4D,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACrF,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAQ,CAAC;YACjD,YAAY,GAAG,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC;QAClD,CAAC;QAAC,OAAO,YAAY,EAAE,CAAC;YACtB,wFAAwF;YACxF,eAAM,CAAC,IAAI,CAAC,8CAA8C,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAED,yEAAyE;IACzE,0FAA0F;IAC1F,IAAI,CAAC;QACH,IAAI,YAAY,EAAE,CAAC;YACjB,eAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;YACrE,IAAA,qCAAqB,EAAC,YAAY,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,uBAAuB;YACvB,eAAM,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;YACtE,IAAA,qCAAqB,GAAE,CAAC;QAC1B,CAAC;QACD,eAAM,CAAC,IAAI,CAAC,uCAAuC,EAAE,EAAE,YAAY,EAAE,YAAY,IAAI,kBAAkB,EAAE,CAAC,CAAC;IAC7G,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,KAAK,CAAC,4CAA4C,EAAE;YACzD,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;YAC7D,YAAY,EAAE,YAAY,IAAI,kBAAkB;SACjD,CAAC,CAAC;QACH,0EAA0E;IAC5E,CAAC;IAED,0DAA0D;IAC1D,4FAA4F;IAC5F,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAqB,CAAC;QAE1F,uDAAuD;QACvD,UAAU,CAAC,KAAK,CAAC,YAAY,GAAG,oBAAoB,CAAC;QACrD,MAAM,EAAE,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7E,eAAM,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC;QAC7E,aAAa,GAAG,IAAI,CAAC;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE;YAC/C,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC9D,CAAC,CAAC;IACL,CAAC;IAED,sFAAsF;IACtF,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,eAAM,CAAC,IAAI,CAAC,qFAAqF,CAAC,CAAC;IACrG,CAAC;AACH,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,oBAAoB,CAAC,UAKvC,EAAE;IACJ,2EAA2E;IAC3E,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,sBAAa,GAAE,CAAC;IAEzD,eAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,IAAI,8BAAa,CAAC;QAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,KAAK;QACnC,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC;QAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC,CAAC;IAEH,wCAAwC;IACxC,MAAM,qBAAqB,CAAC,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;IAEjE,eAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IACpD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,YAAY,CAAC,YAAoB;IACrD,IAAI,CAAC;QACH,MAAM,8BAAa,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,gBAAgB,CAAC,UAMnC,EAAE;IACJ,2EAA2E;IAC3E,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,IAAA,sBAAa,GAAE,CAAC;IAEzD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC,CAAC;QACtC,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC;QAE/C,gEAAgE;QAChE,mEAAmE;QACnE,eAAM,CAAC,IAAI,CAAC,+BAA+B,OAAO,CAAC,SAAS,kBAAkB,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;QACrH,IAAI,OAAO,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;YAChC,IAAI,YAAY,EAAE,CAAC;gBACjB,eAAM,CAAC,IAAI,CAAC,yEAAyE,CAAC,CAAC;gBACvF,OAAO,YAAY,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAC;YAC9G,CAAC;QACH,CAAC;QAED,0BAA0B;QAC1B,IAAI,YAAY,IAAI,MAAM,YAAY,CAAC,YAAY,CAAC,EAAE,CAAC;YACrD,eAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;YACnD,OAAO,YAAY,CAAC;QACtB,CAAC;QAED,0CAA0C;QAC1C,eAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;QACrE,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC;YAC3C,UAAU;YACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CAAC;QACH,OAAO,SAAS,CAAC,aAAa,CAAC;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE,CAAC;YACrF,2CAA2C;YAC3C,IAAI,OAAO,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;gBAChC,eAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;gBAC1D,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC;oBAC3C,UAAU;oBACV,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;oBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,CAAC,CAAC;gBACH,OAAO,SAAS,CAAC,aAAa,CAAC;YACjC,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"login-helper.js","sourceRoot":"","sources":["../../src/utils/login-helper.ts"],"names":[],"mappings":"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"}
package/dist/utils/token-maintenance.js CHANGED
@@ -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 terminal_login_1 = require("../terminal-login");
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 terminal_login_1.TerminalLogin.refresh(this.credentials.refreshToken);
124
+ await (0, token_refresh_1.refreshToken)(this.credentials.refreshToken);
125
125
  return true;
126
126
  }
127
127
  catch (error) {
package/dist/utils/token-maintenance.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"token-maintenance.js","sourceRoot":"","sources":["../../src/utils/token-maintenance.ts"],"names":[],"mappings":"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"}
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,6 +1,6 @@
1
1
  {
2
2
  "type": "commonjs",
3
3
  "name": "pixivflow-webui-backend",
4
- "version": "2.10.29",
4
+ "version": "2.10.30",
5
5
  "description": "PixivFlow WebUI Backend - CommonJS module"
6
6
  }
package/dist/webui/routes/handlers/auth/auth-login-handler.d.ts.map 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,CA+GtE;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CA0D/E"}
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"}
package/dist/webui/routes/handlers/auth/auth-login-handler.js CHANGED
@@ -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 terminal_login_1 = require("../../../../terminal-login");
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 loginInstance = new terminal_login_1.TerminalLogin({
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 terminal_login_1.TerminalLogin.refresh(trimmedToken);
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) {
package/dist/webui/routes/handlers/auth/auth-login-handler.js.map CHANGED
@@ -1 +1 @@
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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"}
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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"}
package/dist/webui/routes/handlers/auth/auth-token-handler.js CHANGED
@@ -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 terminal_login_1 = require("../../../../terminal-login");
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 terminal_login_1.TerminalLogin.refresh(tokenToUse);
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 {
package/dist/webui/routes/handlers/auth/auth-token-handler.js.map CHANGED
@@ -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,+DAA2D;AAC3D,iEAAuE;AACvE,+CAA4C;AAC5C,4DAAuD;AACvD,mEAA4F;AAC5F,6CAA6C;AAE7C;;;GAGG;AACI,KAAK,UAAU,YAAY,CAAC,GAAY,EAAE,GAAa;IAC5D,IAAI,CAAC;QACH,MAAM,EAAE,YAAY,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAElC,IAAI,UAAU,GAAuB,YAAY,CAAC;QAElD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,yBAAyB;YACzB,MAAM,UAAU,GAAG,IAAA,sBAAa,GAAE,CAAC;YACnC,IAAI,MAAM,CAAC;YACX,IAAI,CAAC;gBACH,MAAM,GAAG,IAAA,mBAAU,EAAC,UAAU,CAAC,CAAC;YAClC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,kDAAkD;gBAClD,eAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBACjE,MAAM,SAAS,GAAG,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;gBAC5C,IAAI,SAAS,EAAE,KAAK,EAAE,YAAY,IAAI,CAAC,IAAA,kCAAkB,EAAC,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;oBACxF,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC;gBAC5C,CAAC;qBAAM,CAAC;oBACN,sBAAsB;oBACtB,MAAM,YAAY,GAAG,IAAA,qCAAqB,EAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;oBACxF,IAAI,YAAY,EAAE,CAAC;wBACjB,UAAU,GAAG,YAAY,CAAC;oBAC5B,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,UAAU,GAAG,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC;YAC3C,CAAC;YAED,gCAAgC;YAChC,IAAI,CAAC,UAAU,IAAI,IAAA,kCAAkB,EAAC,UAAU,CAAC,EAAE,CAAC;gBAClD,qCAAqC;gBACrC,MAAM,SAAS,GAAG,IAAA,0BAAa,EAAC,UAAU,CAAC,CAAC;gBAC5C,MAAM,YAAY,GAAG,IAAA,qCAAqB,EAAC,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;gBACzF,IAAI,YAAY,EAAE,CAAC;oBACjB,UAAU,GAAG,YAAY,CAAC;gBAC5B,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACnB,SAAS,EAAE,uBAAS,CAAC,2BAA2B;wBAChD,OAAO,EAAE,mDAAmD;qBAC7D,CAAC,CAAC;oBACH,OAAO;gBACT,CAAC;YACH,CAAC;QACH,CAAC;QAED,8DAA8D;QAC9D,IAAI,IAAA,kCAAkB,EAAC,UAAU,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,SAAS,EAAE,uBAAS,CAAC,2BAA2B;gBAChD,OAAO,EAAE,oEAAoE;aAC9E,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,8BAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE1D,+DAA+D;QAC/D,IAAI,SAAS,CAAC,aAAa,IAAI,SAAS,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;YACtE,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,IAAA,sBAAa,GAAE,CAAC;gBACnC,MAAM,IAAA,oCAAqB,EAAC,UAAU,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;gBACjE,eAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YAC1E,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,eAAM,CAAC,IAAI,CAAC,qDAAqD,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC9E,mDAAmD;YACrD,CAAC;QACH,CAAC;QAED,GAAG,CAAC,IAAI,CAAC;YACP,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,uBAAS,CAAC,oBAAoB;YACzC,WAAW,EAAE,SAAS,CAAC,YAAY;YACnC,YAAY,EAAE,SAAS,CAAC,aAAa;YACrC,SAAS,EAAE,SAAS,CAAC,UAAU;SAChC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,eAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAEhD,sCAAsC;QACtC,IAAI,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1E,IAAI,UAAU,GAAG,GAAG,CAAC;QAErB,iCAAiC;QACjC,IAAI,YAAY,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;YACrD,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC1E,YAAY,GAAG,0DAA0D,CAAC;YAC5E,CAAC;iBAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC9E,YAAY,GAAG,iDAAiD,CAAC;YACnE,CAAC;iBAAM,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC;gBACtF,YAAY,GAAG,wDAAwD,CAAC;gBACxE,UAAU,GAAG,GAAG,CAAC;YACnB,CAAC;QACH,CAAC;QAED,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;YAC1B,SAAS,EAAE,uBAAS,CAAC,mBAAmB;YACxC,OAAO,EAAE,YAAY;SACtB,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
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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"}
package/dist/webui/routes/handlers/auth/auth-utils.js CHANGED
@@ -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 terminal_login_1 = require("../../../../terminal-login");
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 terminal_login_1.TerminalLogin.refresh(refreshToken);
68
+ const loginInfo = await (0, token_refresh_1.refreshToken)(refreshToken);
69
69
  return {
70
70
  valid: true,
71
71
  user: loginInfo.user,
package/dist/webui/routes/handlers/auth/auth-utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"auth-utils.js","sourceRoot":"","sources":["../../../../../src/webui/routes/handlers/auth/auth-utils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pixivflow",
3
- "version": "2.10.29",
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",