pixivflow 2.16.1 → 2.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/{README_EN.md → README.en.md} +8 -6
- package/README.md +8 -6
- package/config/examples/README.md +218 -0
- package/config/examples/multi-tag-or-limit.zh.json +49 -0
- package/config/examples/specific-download.example.json +173 -0
- package/config/examples/standalone.config.example.json +167 -0
- package/config/examples/standalone.config.novel-chinese.json +124 -0
- package/config/examples/standalone.config.ranking.json +135 -0
- package/config/examples/standalone.config.simple.json +52 -0
- package/config/examples/yesterday-popular-novel.zh.json +48 -0
- package/config/examples/yesterday-ranking-illustration.json +43 -0
- package/dist/auth/PixivAuth.d.ts +12 -0
- package/dist/auth/PixivAuth.d.ts.map +1 -1
- package/dist/auth/PixivAuth.js +26 -0
- package/dist/auth/PixivAuth.js.map +1 -1
- package/dist/batch/executionResult.d.ts +85 -0
- package/dist/batch/executionResult.d.ts.map +1 -0
- package/dist/batch/executionResult.js +102 -0
- package/dist/batch/executionResult.js.map +1 -0
- package/dist/batch/runDiagnostics.d.ts +48 -0
- package/dist/batch/runDiagnostics.d.ts.map +1 -0
- package/dist/batch/runDiagnostics.js +103 -0
- package/dist/batch/runDiagnostics.js.map +1 -0
- package/dist/commands/Command.d.ts +5 -0
- package/dist/commands/Command.d.ts.map +1 -1
- package/dist/commands/Command.js +7 -0
- package/dist/commands/Command.js.map +1 -1
- package/dist/commands/DiagnoseEgressCommand.d.ts +98 -0
- package/dist/commands/DiagnoseEgressCommand.d.ts.map +1 -0
- package/dist/commands/DiagnoseEgressCommand.js +327 -0
- package/dist/commands/DiagnoseEgressCommand.js.map +1 -0
- package/dist/commands/ExecuteSlotCommand.d.ts +37 -0
- package/dist/commands/ExecuteSlotCommand.d.ts.map +1 -0
- package/dist/commands/ExecuteSlotCommand.js +267 -0
- package/dist/commands/ExecuteSlotCommand.js.map +1 -0
- package/dist/commands/MaintainCommand.d.ts.map +1 -1
- package/dist/commands/MaintainCommand.js +10 -15
- package/dist/commands/MaintainCommand.js.map +1 -1
- package/dist/commands/index.d.ts +3 -1
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +7 -1
- package/dist/commands/index.js.map +1 -1
- package/dist/commands/scheduler-runtime.d.ts +37 -1
- package/dist/commands/scheduler-runtime.d.ts.map +1 -1
- package/dist/commands/scheduler-runtime.js +52 -19
- package/dist/commands/scheduler-runtime.js.map +1 -1
- package/dist/commands/types.d.ts +6 -0
- package/dist/commands/types.d.ts.map +1 -1
- package/dist/config/types.d.ts +33 -1
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/validation.d.ts +14 -1
- package/dist/config/validation.d.ts.map +1 -1
- package/dist/config/validation.js +109 -33
- package/dist/config/validation.js.map +1 -1
- package/dist/config.d.ts +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js.map +1 -1
- package/dist/delivery/DeliveryDispatcher.d.ts.map +1 -1
- package/dist/delivery/DeliveryDispatcher.js +7 -0
- package/dist/delivery/DeliveryDispatcher.js.map +1 -1
- package/dist/delivery/HttpMultipartDelivery.d.ts +12 -0
- package/dist/delivery/HttpMultipartDelivery.d.ts.map +1 -1
- package/dist/delivery/HttpMultipartDelivery.js +89 -70
- package/dist/delivery/HttpMultipartDelivery.js.map +1 -1
- package/dist/delivery/LegacyOutboxMigration.js +1 -1
- package/dist/delivery/LegacyOutboxMigration.js.map +1 -1
- package/dist/delivery/TelegramReviewDelivery.d.ts +49 -0
- package/dist/delivery/TelegramReviewDelivery.d.ts.map +1 -0
- package/dist/delivery/TelegramReviewDelivery.js +307 -0
- package/dist/delivery/TelegramReviewDelivery.js.map +1 -0
- package/dist/download/DownloadManager.d.ts +10 -0
- package/dist/download/DownloadManager.d.ts.map +1 -1
- package/dist/download/DownloadManager.js +21 -0
- package/dist/download/DownloadManager.js.map +1 -1
- package/dist/download/plan/DownloadPlanner.d.ts +10 -0
- package/dist/download/plan/DownloadPlanner.d.ts.map +1 -1
- package/dist/download/plan/DownloadPlanner.js +19 -0
- package/dist/download/plan/DownloadPlanner.js.map +1 -1
- package/dist/index.js +5 -3
- package/dist/index.js.map +1 -1
- package/dist/notification/NotificationPolicy.d.ts.map +1 -1
- package/dist/notification/NotificationPolicy.js +4 -1
- package/dist/notification/NotificationPolicy.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/pixiv-token-getter-adapter.d.ts +27 -7
- package/dist/pixiv-token-getter-adapter.d.ts.map +1 -1
- package/dist/pixiv-token-getter-adapter.js +44 -27
- package/dist/pixiv-token-getter-adapter.js.map +1 -1
- package/dist/puppeteer-login-adapter/auth-code.d.ts +1 -1
- package/dist/puppeteer-login-adapter/auth-code.d.ts.map +1 -1
- package/dist/puppeteer-login-adapter/browser-launch.d.ts +21 -0
- package/dist/puppeteer-login-adapter/browser-launch.d.ts.map +1 -0
- package/dist/puppeteer-login-adapter/browser-launch.js +46 -0
- package/dist/puppeteer-login-adapter/browser-launch.js.map +1 -0
- package/dist/puppeteer-login-adapter/environment.js +2 -2
- package/dist/puppeteer-login-adapter/environment.js.map +1 -1
- package/dist/puppeteer-login-adapter/login-headless.d.ts.map +1 -1
- package/dist/puppeteer-login-adapter/login-headless.js +2 -5
- package/dist/puppeteer-login-adapter/login-headless.js.map +1 -1
- package/dist/puppeteer-login-adapter/login-interactive.d.ts.map +1 -1
- package/dist/puppeteer-login-adapter/login-interactive.js +2 -5
- package/dist/puppeteer-login-adapter/login-interactive.js.map +1 -1
- package/dist/storage/Database.d.ts +2 -0
- package/dist/storage/Database.d.ts.map +1 -1
- package/dist/storage/Database.js +7 -6
- package/dist/storage/Database.js.map +1 -1
- package/dist/storage/DatabaseMigration.d.ts +2 -2
- package/dist/storage/DatabaseMigration.d.ts.map +1 -1
- package/dist/storage/DatabaseMigration.js.map +1 -1
- package/dist/storage/drivers/NodeSqliteDriver.d.ts +14 -0
- package/dist/storage/drivers/NodeSqliteDriver.d.ts.map +1 -0
- package/dist/storage/drivers/NodeSqliteDriver.js +123 -0
- package/dist/storage/drivers/NodeSqliteDriver.js.map +1 -0
- package/dist/storage/drivers/SqliteDriver.d.ts +55 -0
- package/dist/storage/drivers/SqliteDriver.d.ts.map +1 -0
- package/dist/storage/drivers/SqliteDriver.js +21 -0
- package/dist/storage/drivers/SqliteDriver.js.map +1 -0
- package/dist/storage/repositories/BaseRepository.d.ts +4 -4
- package/dist/storage/repositories/BaseRepository.d.ts.map +1 -1
- package/dist/storage/repositories/BaseRepository.js.map +1 -1
- package/dist/storage/repositories/DownloadRepository.d.ts +2 -1
- package/dist/storage/repositories/DownloadRepository.d.ts.map +1 -1
- package/dist/storage/repositories/DownloadRepository.js.map +1 -1
- package/dist/storage/repositories/RateLimitStateRepository.d.ts +1 -1
- package/dist/storage/repositories/RateLimitStateRepository.js +1 -1
- package/dist/utils/concurrency.d.ts.map +1 -1
- package/dist/utils/concurrency.js +9 -2
- package/dist/utils/concurrency.js.map +1 -1
- package/dist/utils/config-validator-unified.d.ts.map +1 -1
- package/dist/utils/config-validator-unified.js +15 -1
- package/dist/utils/config-validator-unified.js.map +1 -1
- package/dist/utils/token-maintenance.d.ts +0 -4
- package/dist/utils/token-maintenance.d.ts.map +1 -1
- package/dist/utils/token-maintenance.js +5 -25
- package/dist/utils/token-maintenance.js.map +1 -1
- package/dist/version.js +1 -1
- package/dist/webui/package.json +1 -1
- package/node_modules/@redtidev/pixiv-client/README.en.md +105 -0
- package/node_modules/@redtidev/pixiv-client/README.md +67 -73
- package/node_modules/@redtidev/pixiv-client/dist/rate-limit/RateLimitGate.d.ts +1 -1
- package/node_modules/@redtidev/pixiv-client/dist/rate-limit/RateLimitGate.js +1 -1
- package/node_modules/@redtidev/pixiv-client/src/rate-limit/RateLimitGate.ts +1 -1
- package/package.json +7 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DownloadPlanner.js","sourceRoot":"","sources":["../../../src/download/plan/DownloadPlanner.ts"],"names":[],"mappings":";;;AAEA,uDAAuE;AACvE,2DAA4D;AAC5D,yCAAsC;
|
|
1
|
+
{"version":3,"file":"DownloadPlanner.js","sourceRoot":"","sources":["../../../src/download/plan/DownloadPlanner.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -68,14 +68,16 @@ async function executeCommand(registry, commandName, context, args) {
|
|
|
68
68
|
const result = await command.execute(context, args);
|
|
69
69
|
if (!result.success) {
|
|
70
70
|
logger_1.logger.error('Command execution failed', { command: commandName, error: result.error });
|
|
71
|
-
process
|
|
71
|
+
// A batch command distinguishes "nothing succeeded" from "the process could
|
|
72
|
+
// not run at all"; honour the explicit code when it provides one.
|
|
73
|
+
process.exit(result.exitCode ?? 1);
|
|
72
74
|
}
|
|
73
75
|
// Decide exit behavior based on command metadata (long running)
|
|
74
76
|
const isLongRunning = typeof command.getMetadata === 'function'
|
|
75
77
|
? command.getMetadata().longRunning === true
|
|
76
78
|
: false;
|
|
77
79
|
if (!isLongRunning) {
|
|
78
|
-
process.exit(0);
|
|
80
|
+
process.exit(result.exitCode ?? 0);
|
|
79
81
|
}
|
|
80
82
|
}
|
|
81
83
|
catch (error) {
|
|
@@ -143,7 +145,7 @@ async function bootstrap() {
|
|
|
143
145
|
let config;
|
|
144
146
|
try {
|
|
145
147
|
const isLoginCommand = ['login', 'l', 'login-interactive', 'li', 'login-headless'].includes(commandName || '');
|
|
146
|
-
const tokenOptionalCommands = new Set(['config', 'dirs', 'logs', 'setup', 'status', 'health', 'maintain', 'normalize', 'migrate-config', 'backup', 'monitor', 'outbox', 'runs', 'webui', 'w']);
|
|
148
|
+
const tokenOptionalCommands = new Set(['config', 'dirs', 'logs', 'setup', 'status', 'health', 'maintain', 'normalize', 'migrate-config', 'backup', 'monitor', 'outbox', 'runs', 'webui', 'w', 'diagnose']);
|
|
147
149
|
const isTokenOptional = commandName ? tokenOptionalCommands.has(commandName) : true;
|
|
148
150
|
config = (0, config_1.loadConfig)(configPath, isLoginCommand || isTokenOptional || !commandName);
|
|
149
151
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationPolicy.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D;;;;;;;;GAQG;AACH,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,gBAAgB;IAG3C,OAAO,CAAC,UAAU;IAIlB,2EAA2E;IAC3E,MAAM,CAAC,IAAI;0BACS,MAAM,YAAY,MAAM;2BACvB,MAAM,YAAY,MAAM;0BACzB,MAAM;uBACT,MAAM,YAAY,MAAM;MACvC;IAEF,WAAW,CACT,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,aAAa,GACrB,IAAI;IAyBP,yFAAyF;IACzF,eAAe,CACb,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,GAC9H,IAAI;
|
|
1
|
+
{"version":3,"file":"NotificationPolicy.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D;;;;;;;;GAQG;AACH,qBAAa,kBAAkB;IAE3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBADN,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,gBAAgB;IAG3C,OAAO,CAAC,UAAU;IAIlB,2EAA2E;IAC3E,MAAM,CAAC,IAAI;0BACS,MAAM,YAAY,MAAM;2BACvB,MAAM,YAAY,MAAM;0BACzB,MAAM;uBACT,MAAM,YAAY,MAAM;MACvC;IAEF,WAAW,CACT,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,cAAc,EACxB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,aAAa,GACrB,IAAI;IAyBP,yFAAyF;IACzF,eAAe,CACb,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,GAC9H,IAAI;IAgCP,OAAO,CAAC,IAAI;CASb"}
|
|
@@ -54,7 +54,10 @@ class NotificationPolicy {
|
|
|
54
54
|
/** One consolidated summary per slot, delivered to every notifying target's endpoint. */
|
|
55
55
|
sendSlotSummary(slot, schedule, rows) {
|
|
56
56
|
const targets = this.config.delivery?.targets ?? {};
|
|
57
|
-
const notifiable = new Set(Object.keys(targets).filter((n) =>
|
|
57
|
+
const notifiable = new Set(Object.keys(targets).filter((n) => {
|
|
58
|
+
const target = targets[n];
|
|
59
|
+
return target?.type === 'httpMultipart' && Boolean(target.notificationUrl?.trim());
|
|
60
|
+
}));
|
|
58
61
|
if (notifiable.size === 0 || rows.length === 0)
|
|
59
62
|
return;
|
|
60
63
|
const icon = (s) => s === 'submitted' ? '✅' : s === 'no_candidate' ? '⚠️' : s === 'duplicate' ? '♱' : s === 'delivery_pending' ? '🕓' : '❌';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationPolicy.js","sourceRoot":"","sources":["../../src/notification/NotificationPolicy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"NotificationPolicy.js","sourceRoot":"","sources":["../../src/notification/NotificationPolicy.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,13 +1,33 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Pixiv Token Getter Adapter
|
|
3
3
|
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
4
|
+
* Thin delegation layer over the `pixiv-token-getter` credential manager.
|
|
5
|
+
*
|
|
6
|
+
* The library owns everything credential-related: the PKCE browser login, the
|
|
7
|
+
* credential (e2e) login, refresh handling, proxy routing and the persistent
|
|
8
|
+
* per-profile token store. This module only:
|
|
9
|
+
* - decides which login method to ask for, and
|
|
10
|
+
* - maps the returned `TokenInfo` onto the project's `LoginInfo` shape.
|
|
6
11
|
*
|
|
7
12
|
* Library: https://github.com/redtidev1918/pixiv-token-getter
|
|
8
13
|
*/
|
|
9
14
|
import { LoginInfo } from './terminal-login';
|
|
10
|
-
import { ProxyConfig } from './puppeteer-login-adapter';
|
|
15
|
+
import { ProxyConfig } from './puppeteer-login-adapter/proxy';
|
|
16
|
+
/**
|
|
17
|
+
* Options shared by the interactive and headless login helpers.
|
|
18
|
+
*/
|
|
19
|
+
export interface PixivTokenGetterLoginOptions {
|
|
20
|
+
/**
|
|
21
|
+
* Force a fresh login even when a valid credential is already stored.
|
|
22
|
+
*
|
|
23
|
+
* Defaults to `true`: these helpers are used as the *login* step, so they keep
|
|
24
|
+
* the historical "a login command always logs in" contract. Pass `false` to
|
|
25
|
+
* let the library reuse a cached credential or refresh it instead.
|
|
26
|
+
*/
|
|
27
|
+
force?: boolean;
|
|
28
|
+
/** Login timeout in milliseconds. */
|
|
29
|
+
timeout?: number;
|
|
30
|
+
}
|
|
11
31
|
/**
|
|
12
32
|
* Check if pixiv-token-getter is available
|
|
13
33
|
*/
|
|
@@ -16,13 +36,13 @@ export declare function checkPixivTokenGetterAvailable(): Promise<boolean>;
|
|
|
16
36
|
* Login using pixiv-token-getter (interactive mode)
|
|
17
37
|
* Opens a browser window for user to manually log in
|
|
18
38
|
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
39
|
+
* Proxy is routed through the library, which applies it to both the browser and
|
|
40
|
+
* the token exchange.
|
|
21
41
|
*/
|
|
22
|
-
export declare function loginWithPixivTokenGetterInteractive(proxy?: ProxyConfig): Promise<LoginInfo | null>;
|
|
42
|
+
export declare function loginWithPixivTokenGetterInteractive(proxy?: ProxyConfig, options?: PixivTokenGetterLoginOptions): Promise<LoginInfo | null>;
|
|
23
43
|
/**
|
|
24
44
|
* Login using pixiv-token-getter (headless mode)
|
|
25
45
|
* Runs browser in background without visible window
|
|
26
46
|
*/
|
|
27
|
-
export declare function loginWithPixivTokenGetterHeadless(username: string, password: string, proxy?: ProxyConfig): Promise<LoginInfo | null>;
|
|
47
|
+
export declare function loginWithPixivTokenGetterHeadless(username: string, password: string, proxy?: ProxyConfig, options?: PixivTokenGetterLoginOptions): Promise<LoginInfo | null>;
|
|
28
48
|
//# sourceMappingURL=pixiv-token-getter-adapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pixiv-token-getter-adapter.d.ts","sourceRoot":"","sources":["../src/pixiv-token-getter-adapter.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"pixiv-token-getter-adapter.d.ts","sourceRoot":"","sources":["../src/pixiv-token-getter-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAiB,MAAM,iCAAiC,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,4BAA4B;IAC3C;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,8BAA8B,IAAI,OAAO,CAAC,OAAO,CAAC,CAiBvE;AAiFD;;;;;;GAMG;AACH,wBAAsB,oCAAoC,CACxD,KAAK,CAAC,EAAE,WAAW,EACnB,OAAO,GAAE,4BAAiC,GACzC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA6B3B;AAED;;;GAGG;AACH,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,WAAW,EACnB,OAAO,GAAE,4BAAiC,GACzC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA+C3B"}
|
|
@@ -2,8 +2,13 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* Pixiv Token Getter Adapter
|
|
4
4
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
5
|
+
* Thin delegation layer over the `pixiv-token-getter` credential manager.
|
|
6
|
+
*
|
|
7
|
+
* The library owns everything credential-related: the PKCE browser login, the
|
|
8
|
+
* credential (e2e) login, refresh handling, proxy routing and the persistent
|
|
9
|
+
* per-profile token store. This module only:
|
|
10
|
+
* - decides which login method to ask for, and
|
|
11
|
+
* - maps the returned `TokenInfo` onto the project's `LoginInfo` shape.
|
|
7
12
|
*
|
|
8
13
|
* Library: https://github.com/redtidev1918/pixiv-token-getter
|
|
9
14
|
*/
|
|
@@ -45,13 +50,15 @@ exports.checkPixivTokenGetterAvailable = checkPixivTokenGetterAvailable;
|
|
|
45
50
|
exports.loginWithPixivTokenGetterInteractive = loginWithPixivTokenGetterInteractive;
|
|
46
51
|
exports.loginWithPixivTokenGetterHeadless = loginWithPixivTokenGetterHeadless;
|
|
47
52
|
const pixiv_token_getter_1 = require("pixiv-token-getter");
|
|
53
|
+
const proxy_1 = require("./puppeteer-login-adapter/proxy");
|
|
48
54
|
/**
|
|
49
55
|
* Check if pixiv-token-getter is available
|
|
50
56
|
*/
|
|
51
57
|
async function checkPixivTokenGetterAvailable() {
|
|
52
58
|
try {
|
|
53
|
-
const
|
|
54
|
-
|
|
59
|
+
const mod = await Promise.resolve().then(() => __importStar(require('pixiv-token-getter')));
|
|
60
|
+
// `getToken` is the credential-lifecycle entry point (2.4+).
|
|
61
|
+
return typeof mod.getToken === 'function';
|
|
55
62
|
}
|
|
56
63
|
catch (error) {
|
|
57
64
|
const errorMessage = error?.message || String(error);
|
|
@@ -65,14 +72,27 @@ async function checkPixivTokenGetterAvailable() {
|
|
|
65
72
|
return false;
|
|
66
73
|
}
|
|
67
74
|
}
|
|
75
|
+
/**
|
|
76
|
+
* Map the project's proxy configuration onto the library's `proxy` option.
|
|
77
|
+
*
|
|
78
|
+
* The library accepts a proxy URL and applies it to both the browser and the
|
|
79
|
+
* token requests, so redirecting the login no longer requires env vars.
|
|
80
|
+
*/
|
|
81
|
+
function toProxyOption(proxy) {
|
|
82
|
+
if (!proxy || !proxy.enabled) {
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
return (0, proxy_1.buildProxyUrl)(proxy);
|
|
86
|
+
}
|
|
68
87
|
/**
|
|
69
88
|
* Convert TokenInfo from pixiv-token-getter to LoginInfo format
|
|
70
89
|
* Maps the user object to match the project's UserInfo interface
|
|
71
90
|
*/
|
|
72
91
|
function convertTokenInfoToLoginInfo(tokenInfo) {
|
|
73
|
-
// Map user object to match project's UserInfo interface
|
|
74
|
-
//
|
|
75
|
-
|
|
92
|
+
// Map user object to match project's UserInfo interface.
|
|
93
|
+
// `user` is optional in the library's TokenInfo (a gppt-imported credential
|
|
94
|
+
// has no user at all), so normalise it to an empty object first.
|
|
95
|
+
const user = tokenInfo.user ?? {};
|
|
76
96
|
// Create UserInfo with required fields, using defaults for missing fields
|
|
77
97
|
const mappedUser = {
|
|
78
98
|
id: user.id || '',
|
|
@@ -128,27 +148,25 @@ function convertTokenInfoToLoginInfo(tokenInfo) {
|
|
|
128
148
|
* Login using pixiv-token-getter (interactive mode)
|
|
129
149
|
* Opens a browser window for user to manually log in
|
|
130
150
|
*
|
|
131
|
-
*
|
|
132
|
-
*
|
|
151
|
+
* Proxy is routed through the library, which applies it to both the browser and
|
|
152
|
+
* the token exchange.
|
|
133
153
|
*/
|
|
134
|
-
async function loginWithPixivTokenGetterInteractive(proxy) {
|
|
154
|
+
async function loginWithPixivTokenGetterInteractive(proxy, options = {}) {
|
|
155
|
+
const { force = true, timeout = 300000 } = options;
|
|
135
156
|
try {
|
|
136
157
|
console.log('[!]: Using pixiv-token-getter for login (interactive mode)...');
|
|
137
158
|
console.log('[i]: A browser window will open shortly.');
|
|
138
159
|
console.log('[i]: Please complete the login process in the browser window.');
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
if (proxy && proxy.enabled) {
|
|
142
|
-
console.warn('[!]: Proxy configuration is not yet supported by pixiv-token-getter');
|
|
143
|
-
console.warn('[!]: Proceeding without proxy...');
|
|
144
|
-
}
|
|
145
|
-
const tokenInfo = await (0, pixiv_token_getter_1.getTokenInteractive)({
|
|
160
|
+
const tokenInfo = await (0, pixiv_token_getter_1.getToken)({
|
|
161
|
+
method: 'browser',
|
|
146
162
|
headless: false,
|
|
147
|
-
timeout
|
|
163
|
+
timeout,
|
|
164
|
+
force,
|
|
165
|
+
proxy: toProxyOption(proxy),
|
|
148
166
|
onBrowserOpen: () => {
|
|
149
167
|
console.log('[i]: Browser opened, please complete login');
|
|
150
168
|
},
|
|
151
|
-
onPageReady: (
|
|
169
|
+
onPageReady: (_page, url) => {
|
|
152
170
|
console.log(`[i]: Login page ready: ${url}`);
|
|
153
171
|
},
|
|
154
172
|
});
|
|
@@ -165,7 +183,8 @@ async function loginWithPixivTokenGetterInteractive(proxy) {
|
|
|
165
183
|
* Login using pixiv-token-getter (headless mode)
|
|
166
184
|
* Runs browser in background without visible window
|
|
167
185
|
*/
|
|
168
|
-
async function loginWithPixivTokenGetterHeadless(username, password, proxy) {
|
|
186
|
+
async function loginWithPixivTokenGetterHeadless(username, password, proxy, options = {}) {
|
|
187
|
+
const { force = true, timeout = 120000 } = options;
|
|
169
188
|
try {
|
|
170
189
|
console.log('[!]: Using pixiv-token-getter for login (headless mode)...');
|
|
171
190
|
// Validate inputs
|
|
@@ -175,15 +194,13 @@ async function loginWithPixivTokenGetterHeadless(username, password, proxy) {
|
|
|
175
194
|
if (!password || password.trim() === '') {
|
|
176
195
|
throw new Error('Password cannot be empty');
|
|
177
196
|
}
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
console.warn('[!]: Proxy configuration is not yet supported by pixiv-token-getter');
|
|
181
|
-
console.warn('[!]: Proceeding without proxy...');
|
|
182
|
-
}
|
|
183
|
-
const tokenInfo = await (0, pixiv_token_getter_1.getTokenHeadless)({
|
|
197
|
+
const tokenInfo = await (0, pixiv_token_getter_1.getToken)({
|
|
198
|
+
method: 'e2e',
|
|
184
199
|
username: username.trim(),
|
|
185
200
|
password: password.trim(),
|
|
186
|
-
timeout
|
|
201
|
+
timeout,
|
|
202
|
+
force,
|
|
203
|
+
proxy: toProxyOption(proxy),
|
|
187
204
|
});
|
|
188
205
|
const loginInfo = convertTokenInfoToLoginInfo(tokenInfo);
|
|
189
206
|
console.log('[+]: Login successful with pixiv-token-getter!');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pixiv-token-getter-adapter.js","sourceRoot":"","sources":["../src/pixiv-token-getter-adapter.ts"],"names":[],"mappings":";AAAA
|
|
1
|
+
{"version":3,"file":"pixiv-token-getter-adapter.js","sourceRoot":"","sources":["../src/pixiv-token-getter-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-code.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/auth-code.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"auth-code.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/auth-code.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE3C;;GAEG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuJ3F"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared launcher for the login adapters.
|
|
3
|
+
*
|
|
4
|
+
* Uses puppeteer-core (NO install-time browser download) plus the system
|
|
5
|
+
* browser resolver exported by pixiv-token-getter — single implementation of
|
|
6
|
+
* discovery lives there:
|
|
7
|
+
*
|
|
8
|
+
* explicit PUPPETEER_EXECUTABLE_PATH -> platform-known locations -> PATH
|
|
9
|
+
*
|
|
10
|
+
* When no browser exists the error tells the user exactly how to fix it
|
|
11
|
+
* instead of leaking a raw ENOENT from puppeteer.
|
|
12
|
+
*/
|
|
13
|
+
import type { Browser } from 'puppeteer-core';
|
|
14
|
+
/**
|
|
15
|
+
* Launch the system browser with PixivFlow's standard hardening flags.
|
|
16
|
+
*
|
|
17
|
+
* @param overrides any puppeteer-core launch options to merge (headless, args,
|
|
18
|
+
* userDataDir, proxy is handled by callers through `args`)
|
|
19
|
+
*/
|
|
20
|
+
export declare function launchSystemBrowser(overrides?: Record<string, unknown>): Promise<Browser>;
|
|
21
|
+
//# sourceMappingURL=browser-launch.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-launch.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/browser-launch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAiB9C;;;;;GAKG;AACH,wBAAsB,mBAAmB,CAAC,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAanG"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Shared launcher for the login adapters.
|
|
4
|
+
*
|
|
5
|
+
* Uses puppeteer-core (NO install-time browser download) plus the system
|
|
6
|
+
* browser resolver exported by pixiv-token-getter — single implementation of
|
|
7
|
+
* discovery lives there:
|
|
8
|
+
*
|
|
9
|
+
* explicit PUPPETEER_EXECUTABLE_PATH -> platform-known locations -> PATH
|
|
10
|
+
*
|
|
11
|
+
* When no browser exists the error tells the user exactly how to fix it
|
|
12
|
+
* instead of leaking a raw ENOENT from puppeteer.
|
|
13
|
+
*/
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.launchSystemBrowser = launchSystemBrowser;
|
|
16
|
+
const pixiv_token_getter_1 = require("pixiv-token-getter");
|
|
17
|
+
/** Lazily resolved puppeteer-core module (never a hard CLI-boot dependency). */
|
|
18
|
+
function loadPuppeteerCore() {
|
|
19
|
+
try {
|
|
20
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
21
|
+
return require('puppeteer-core');
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
throw new Error('puppeteer-core is missing from this installation. ' +
|
|
25
|
+
'Reinstall pixivflow (npm install -g pixivflow). ' +
|
|
26
|
+
`Original error: ${error?.message ?? error}`);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Launch the system browser with PixivFlow's standard hardening flags.
|
|
31
|
+
*
|
|
32
|
+
* @param overrides any puppeteer-core launch options to merge (headless, args,
|
|
33
|
+
* userDataDir, proxy is handled by callers through `args`)
|
|
34
|
+
*/
|
|
35
|
+
async function launchSystemBrowser(overrides = {}) {
|
|
36
|
+
// An explicit path always wins; `undefined` must NOT clobber discovery, so the
|
|
37
|
+
// key is pulled out before the spread instead of relying on merge order.
|
|
38
|
+
const { executablePath: explicitPath, ...rest } = overrides;
|
|
39
|
+
const executablePath = (typeof explicitPath === 'string' && explicitPath) || (0, pixiv_token_getter_1.findBrowserExecutable)();
|
|
40
|
+
if (!executablePath) {
|
|
41
|
+
throw new Error((0, pixiv_token_getter_1.browserNotFoundMessage)());
|
|
42
|
+
}
|
|
43
|
+
const core = loadPuppeteerCore();
|
|
44
|
+
return core.launch({ ...rest, executablePath });
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=browser-launch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-launch.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/browser-launch.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;AAyBH,kDAaC;AAnCD,2DAAmF;AAEnF,gFAAgF;AAChF,SAAS,iBAAiB;IACxB,IAAI,CAAC;QACH,8DAA8D;QAC9D,OAAO,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,oDAAoD;YAClD,kDAAkD;YAClD,mBAAmB,KAAK,EAAE,OAAO,IAAI,KAAK,EAAE,CAC/C,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,mBAAmB,CAAC,YAAqC,EAAE;IAC/E,+EAA+E;IAC/E,yEAAyE;IACzE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC;IAC5D,MAAM,cAAc,GAClB,CAAC,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,IAAA,0CAAqB,GAAE,CAAC;IAEhF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CAAC,IAAA,2CAAsB,GAAE,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,GAAG,iBAAiB,EAAE,CAAC;IACjC,OAAO,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,EAAE,cAAc,EAAS,CAAC,CAAC;AACzD,CAAC"}
|
|
@@ -59,9 +59,9 @@ async function checkPuppeteerAvailable() {
|
|
|
59
59
|
// In Electron, we'll still try, but expect it might fail
|
|
60
60
|
// The actual availability will be tested when we try to launch
|
|
61
61
|
}
|
|
62
|
-
// Try to import puppeteer
|
|
62
|
+
// Try to import puppeteer-core
|
|
63
63
|
// Use dynamic import to handle cases where module might not be available
|
|
64
|
-
const puppeteer = await Promise.resolve().then(() => __importStar(require('puppeteer')));
|
|
64
|
+
const puppeteer = await Promise.resolve().then(() => __importStar(require('puppeteer-core')));
|
|
65
65
|
// Verify that puppeteer has the expected exports
|
|
66
66
|
if (!puppeteer || typeof puppeteer.launch !== 'function') {
|
|
67
67
|
console.warn('[Puppeteer] Module imported but missing expected exports');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/environment.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMH,sDAGC;AAMD,0DAsCC;AAnDD;;;GAGG;AACH,SAAgB,qBAAqB;IACnC,MAAM,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACjF,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,uBAAuB;IAC3C,IAAI,CAAC;QACH,4CAA4C;QAC5C,IAAI,qBAAqB,EAAE,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAC;YAC3F,OAAO,CAAC,GAAG,CAAC,kGAAkG,CAAC,CAAC;YAChH,yDAAyD;YACzD,+DAA+D;QACjE,CAAC;QAED
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/environment.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMH,sDAGC;AAMD,0DAsCC;AAnDD;;;GAGG;AACH,SAAgB,qBAAqB;IACnC,MAAM,EAAE,qBAAqB,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IACjF,OAAO,aAAa,EAAE,CAAC;AACzB,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,uBAAuB;IAC3C,IAAI,CAAC;QACH,4CAA4C;QAC5C,IAAI,qBAAqB,EAAE,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,6EAA6E,CAAC,CAAC;YAC3F,OAAO,CAAC,GAAG,CAAC,kGAAkG,CAAC,CAAC;YAChH,yDAAyD;YACzD,+DAA+D;QACjE,CAAC;QAED,+BAA+B;QAC/B,yEAAyE;QACzE,MAAM,SAAS,GAAG,wDAAa,gBAAgB,GAAC,CAAC;QAEjD,iDAAiD;QACjD,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;YACzE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,8EAA8E;QAC9E,0EAA0E;QAC1E,wDAAwD;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,8BAA8B;QAC9B,MAAM,YAAY,GAAG,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,KAAK,EAAE,IAAI,CAAC;QAE9B,yCAAyC;QACzC,IAAI,SAAS,KAAK,kBAAkB,IAAI,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;YACpF,OAAO,CAAC,KAAK,CAAC,qEAAqE,EAAE,YAAY,CAAC,CAAC;QACrG,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;QACvE,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-headless.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-headless.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"login-headless.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-headless.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAiB,MAAM,SAAS,CAAC;AAOrD;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,WAAW,GAClB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAwP3B"}
|
|
@@ -3,12 +3,9 @@
|
|
|
3
3
|
* Headless login using Puppeteer
|
|
4
4
|
* Runs browser in background without visible window
|
|
5
5
|
*/
|
|
6
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
7
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
8
|
-
};
|
|
9
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
7
|
exports.loginWithPuppeteerHeadless = loginWithPuppeteerHeadless;
|
|
11
|
-
const
|
|
8
|
+
const browser_launch_1 = require("./browser-launch");
|
|
12
9
|
const proxy_1 = require("./proxy");
|
|
13
10
|
const pkce_1 = require("./pkce");
|
|
14
11
|
const constants_1 = require("./constants");
|
|
@@ -64,7 +61,7 @@ async function loginWithPuppeteerHeadless(username, password, proxy) {
|
|
|
64
61
|
console.log('[i]: Starting headless browser...');
|
|
65
62
|
// Try to launch browser
|
|
66
63
|
try {
|
|
67
|
-
browser = await
|
|
64
|
+
browser = await (0, browser_launch_1.launchSystemBrowser)(launchOptions);
|
|
68
65
|
}
|
|
69
66
|
catch (launchError) {
|
|
70
67
|
const errorMsg = launchError?.message || String(launchError);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-headless.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-headless.ts"],"names":[],"mappings":";AAAA;;;GAGG
|
|
1
|
+
{"version":3,"file":"login-headless.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-headless.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-interactive.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-interactive.ts"],"names":[],"mappings":"AAAA;;;GAGG;
|
|
1
|
+
{"version":3,"file":"login-interactive.d.ts","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-interactive.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAiB,MAAM,SAAS,CAAC;AAOrD;;;GAGG;AACH,wBAAsB,6BAA6B,CAAC,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CA0JlG"}
|
|
@@ -3,12 +3,9 @@
|
|
|
3
3
|
* Interactive login using Puppeteer
|
|
4
4
|
* Opens a browser window for user to manually log in
|
|
5
5
|
*/
|
|
6
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
7
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
8
|
-
};
|
|
9
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
7
|
exports.loginWithPuppeteerInteractive = loginWithPuppeteerInteractive;
|
|
11
|
-
const
|
|
8
|
+
const browser_launch_1 = require("./browser-launch");
|
|
12
9
|
const proxy_1 = require("./proxy");
|
|
13
10
|
const pkce_1 = require("./pkce");
|
|
14
11
|
const constants_1 = require("./constants");
|
|
@@ -59,7 +56,7 @@ async function loginWithPuppeteerInteractive(proxy) {
|
|
|
59
56
|
}
|
|
60
57
|
// Try to launch browser
|
|
61
58
|
try {
|
|
62
|
-
browser = await
|
|
59
|
+
browser = await (0, browser_launch_1.launchSystemBrowser)(launchOptions);
|
|
63
60
|
}
|
|
64
61
|
catch (launchError) {
|
|
65
62
|
const errorMsg = launchError?.message || String(launchError);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login-interactive.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-interactive.ts"],"names":[],"mappings":";AAAA;;;GAGG
|
|
1
|
+
{"version":3,"file":"login-interactive.js","sourceRoot":"","sources":["../../src/puppeteer-login-adapter/login-interactive.ts"],"names":[],"mappings":"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"}
|