@kaitranntt/ccs 5.19.2-dev.1 → 5.19.2-dev.2
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/VERSION +1 -1
- package/dist/cliproxy/auth-handler.d.ts +1 -0
- package/dist/cliproxy/auth-handler.d.ts.map +1 -1
- package/dist/cliproxy/auth-handler.js +145 -83
- package/dist/cliproxy/auth-handler.js.map +1 -1
- package/dist/management/oauth-port-diagnostics.d.ts +26 -0
- package/dist/management/oauth-port-diagnostics.d.ts.map +1 -1
- package/dist/management/oauth-port-diagnostics.js +97 -7
- package/dist/management/oauth-port-diagnostics.js.map +1 -1
- package/dist/utils/port-utils.d.ts +26 -0
- package/dist/utils/port-utils.d.ts.map +1 -1
- package/dist/utils/port-utils.js +87 -1
- package/dist/utils/port-utils.js.map +1 -1
- package/package.json +1 -1
package/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
5.19.2-dev.
|
|
1
|
+
5.19.2-dev.2
|
|
@@ -81,6 +81,7 @@ export declare function clearAuth(provider: CLIProxyProvider): boolean;
|
|
|
81
81
|
/**
|
|
82
82
|
* Trigger OAuth flow for provider
|
|
83
83
|
* Auto-detects headless environment and uses --no-browser flag accordingly
|
|
84
|
+
* Shows real-time step-by-step progress for better user feedback
|
|
84
85
|
* @param provider - The CLIProxy provider to authenticate
|
|
85
86
|
* @param options - OAuth options
|
|
86
87
|
* @param options.add - If true, skip confirm prompt when adding another account
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-handler.d.ts","sourceRoot":"","sources":["../../src/cliproxy/auth-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;
|
|
1
|
+
{"version":3,"file":"auth-handler.d.ts","sourceRoot":"","sources":["../../src/cliproxy/auth-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAQH,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,EACL,WAAW,EAOZ,MAAM,mBAAmB,CAAC;AAkH3B;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,oBAAoB;IACpB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,oCAAoC;IACpC,aAAa,EAAE,OAAO,CAAC;IACvB,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,6BAA6B;IAC7B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,yCAAyC;IACzC,QAAQ,CAAC,EAAE,IAAI,CAAC;IAChB,oEAAoE;IACpE,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,yBAAyB;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,UAAU,mBAAmB;IAC3B,0BAA0B;IAC1B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,mBAAmB;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,gDAAgD;IAChD,OAAO,EAAE,MAAM,CAAC;IAChB,sBAAsB;IACtB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,wBAAwB;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AA4CD;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,GAAG,mBAAmB,CAM9E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAEtE;AA2CD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkCnE;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,UAAU,CAoDpE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,UAAU,EAAE,CAG/C;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAkC7D;AA8CD;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACd,GACL,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAmR7B;AAkDD;;;;;;GAMG;AACH,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GACxE,OAAO,CAAC,OAAO,CAAC,CAoBlB;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAkBxC"}
|
|
@@ -40,11 +40,9 @@ exports.displayAuthStatus = exports.initializeAccounts = exports.ensureAuth = ex
|
|
|
40
40
|
const child_process_1 = require("child_process");
|
|
41
41
|
const fs = __importStar(require("fs"));
|
|
42
42
|
const path = __importStar(require("path"));
|
|
43
|
-
const progress_indicator_1 = require("../utils/progress-indicator");
|
|
44
43
|
const ui_1 = require("../utils/ui");
|
|
45
44
|
const binary_manager_1 = require("./binary-manager");
|
|
46
45
|
const config_generator_1 = require("./config-generator");
|
|
47
|
-
const platform_commands_1 = require("../utils/platform-commands");
|
|
48
46
|
const account_manager_1 = require("./account-manager");
|
|
49
47
|
const oauth_port_diagnostics_1 = require("../management/oauth-port-diagnostics");
|
|
50
48
|
/**
|
|
@@ -380,9 +378,46 @@ function clearAuth(provider) {
|
|
|
380
378
|
return removedCount > 0;
|
|
381
379
|
}
|
|
382
380
|
exports.clearAuth = clearAuth;
|
|
381
|
+
/**
|
|
382
|
+
* Display a single step status line
|
|
383
|
+
*/
|
|
384
|
+
function showStep(step, total, status, message) {
|
|
385
|
+
const statusIcon = status === 'ok' ? '[OK]' : status === 'fail' ? '[X]' : '[..]';
|
|
386
|
+
console.log(`${statusIcon} [${step}/${total}] ${message}`);
|
|
387
|
+
}
|
|
388
|
+
/**
|
|
389
|
+
* Get platform-specific troubleshooting for OAuth timeout
|
|
390
|
+
*/
|
|
391
|
+
function getTimeoutTroubleshooting(provider, port) {
|
|
392
|
+
const lines = [];
|
|
393
|
+
lines.push('');
|
|
394
|
+
lines.push('TROUBLESHOOTING:');
|
|
395
|
+
lines.push(' 1. Check browser completed auth (should show success page)');
|
|
396
|
+
if (port) {
|
|
397
|
+
if (process.platform === 'win32') {
|
|
398
|
+
lines.push(` 2. Verify port ${port} is reachable: curl http://localhost:${port}`);
|
|
399
|
+
lines.push(' 3. Windows Firewall may block - run as Administrator:');
|
|
400
|
+
lines.push(` netsh advfirewall firewall add rule name="CCS OAuth" dir=in action=allow protocol=TCP localport=${port}`);
|
|
401
|
+
lines.push(` 4. Try: ccs ${provider} --auth --verbose`);
|
|
402
|
+
}
|
|
403
|
+
else if (process.platform === 'darwin') {
|
|
404
|
+
lines.push(` 2. Check for port conflicts: lsof -ti:${port}`);
|
|
405
|
+
lines.push(` 3. Try: ccs ${provider} --auth --verbose`);
|
|
406
|
+
}
|
|
407
|
+
else {
|
|
408
|
+
lines.push(` 2. Check for port conflicts: lsof -ti:${port} or ss -tlnp | grep ${port}`);
|
|
409
|
+
lines.push(` 3. Try: ccs ${provider} --auth --verbose`);
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
else {
|
|
413
|
+
lines.push(` 2. Try: ccs ${provider} --auth --verbose`);
|
|
414
|
+
}
|
|
415
|
+
return lines;
|
|
416
|
+
}
|
|
383
417
|
/**
|
|
384
418
|
* Trigger OAuth flow for provider
|
|
385
419
|
* Auto-detects headless environment and uses --no-browser flag accordingly
|
|
420
|
+
* Shows real-time step-by-step progress for better user feedback
|
|
386
421
|
* @param provider - The CLIProxy provider to authenticate
|
|
387
422
|
* @param options - OAuth options
|
|
388
423
|
* @param options.add - If true, skip confirm prompt when adding another account
|
|
@@ -391,6 +426,7 @@ exports.clearAuth = clearAuth;
|
|
|
391
426
|
async function triggerOAuth(provider, options = {}) {
|
|
392
427
|
const oauthConfig = getOAuthConfig(provider);
|
|
393
428
|
const { verbose = false, add = false, nickname } = options;
|
|
429
|
+
const callbackPort = oauth_port_diagnostics_1.OAUTH_CALLBACK_PORTS[provider];
|
|
394
430
|
// Auto-detect headless if not explicitly set
|
|
395
431
|
const headless = options.headless ?? isHeadlessEnvironment();
|
|
396
432
|
const log = (msg) => {
|
|
@@ -420,25 +456,44 @@ async function triggerOAuth(provider, options = {}) {
|
|
|
420
456
|
return null;
|
|
421
457
|
}
|
|
422
458
|
}
|
|
423
|
-
//
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
459
|
+
// Enhanced pre-flight check with real-time display
|
|
460
|
+
console.log('');
|
|
461
|
+
console.log((0, ui_1.info)(`Pre-flight OAuth check for ${oauthConfig.displayName}...`));
|
|
462
|
+
const preflight = await (0, oauth_port_diagnostics_1.enhancedPreflightOAuthCheck)(provider);
|
|
463
|
+
// Display each check result
|
|
464
|
+
for (const check of preflight.checks) {
|
|
465
|
+
const icon = check.status === 'ok' ? '[OK]' : check.status === 'warn' ? '[!]' : '[X]';
|
|
466
|
+
console.log(` ${icon} ${check.name}: ${check.message}`);
|
|
467
|
+
if (check.fixCommand && check.status !== 'ok') {
|
|
468
|
+
console.log(` Fix: ${check.fixCommand}`);
|
|
430
469
|
}
|
|
470
|
+
}
|
|
471
|
+
// Show firewall warning prominently on Windows
|
|
472
|
+
if (preflight.firewallWarning) {
|
|
431
473
|
console.log('');
|
|
432
|
-
console.log((0, ui_1.
|
|
474
|
+
console.log((0, ui_1.warn)('Windows Firewall may block OAuth callback'));
|
|
475
|
+
console.log(' If auth hangs, run as Administrator:');
|
|
476
|
+
console.log(` ${(0, ui_1.color)(preflight.firewallFixCommand || '', 'command')}`);
|
|
477
|
+
}
|
|
478
|
+
if (!preflight.ready) {
|
|
479
|
+
console.log('');
|
|
480
|
+
console.log((0, ui_1.fail)('Pre-flight check failed. Resolve issues above and retry.'));
|
|
433
481
|
return null;
|
|
434
482
|
}
|
|
435
|
-
|
|
483
|
+
console.log('');
|
|
484
|
+
// Step 1: Ensure binary exists
|
|
485
|
+
showStep(1, 4, 'progress', 'Preparing CLIProxy binary...');
|
|
436
486
|
let binaryPath;
|
|
437
487
|
try {
|
|
438
488
|
binaryPath = await (0, binary_manager_1.ensureCLIProxyBinary)(verbose);
|
|
489
|
+
// Clear and rewrite with OK
|
|
490
|
+
process.stdout.write('\x1b[1A\x1b[2K'); // Move up and clear line
|
|
491
|
+
showStep(1, 4, 'ok', 'CLIProxy binary ready');
|
|
439
492
|
}
|
|
440
493
|
catch (error) {
|
|
441
|
-
|
|
494
|
+
process.stdout.write('\x1b[1A\x1b[2K');
|
|
495
|
+
showStep(1, 4, 'fail', 'Failed to prepare CLIProxy binary');
|
|
496
|
+
console.error((0, ui_1.fail)(error.message));
|
|
442
497
|
throw error;
|
|
443
498
|
}
|
|
444
499
|
// Ensure auth directory exists
|
|
@@ -447,13 +502,12 @@ async function triggerOAuth(provider, options = {}) {
|
|
|
447
502
|
// Generate config file (CLIProxyAPI requires it even for auth)
|
|
448
503
|
const configPath = (0, config_generator_1.generateConfig)(provider);
|
|
449
504
|
log(`Config generated: ${configPath}`);
|
|
450
|
-
// Free OAuth callback port if
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
const killed = killProcessOnPort(callbackPort, verbose);
|
|
505
|
+
// Free OAuth callback port if needed
|
|
506
|
+
const localCallbackPort = OAUTH_CALLBACK_PORTS[provider];
|
|
507
|
+
if (localCallbackPort) {
|
|
508
|
+
const killed = killProcessOnPort(localCallbackPort, verbose);
|
|
455
509
|
if (killed) {
|
|
456
|
-
log(`Freed port ${
|
|
510
|
+
log(`Freed port ${localCallbackPort} for OAuth callback`);
|
|
457
511
|
}
|
|
458
512
|
}
|
|
459
513
|
// Build args: config + auth flag + optional --no-browser for headless
|
|
@@ -461,30 +515,19 @@ async function triggerOAuth(provider, options = {}) {
|
|
|
461
515
|
if (headless) {
|
|
462
516
|
args.push('--no-browser');
|
|
463
517
|
}
|
|
464
|
-
//
|
|
465
|
-
|
|
518
|
+
// Step 2: Starting callback server
|
|
519
|
+
showStep(2, 4, 'progress', `Starting callback server on port ${callbackPort || 'N/A'}...`);
|
|
520
|
+
// Show headless instructions if needed
|
|
466
521
|
if (headless) {
|
|
467
|
-
console.log((0, ui_1.info)('Headless mode detected - manual authentication required'));
|
|
468
522
|
console.log('');
|
|
469
523
|
console.log((0, ui_1.warn)('PORT FORWARDING REQUIRED'));
|
|
470
|
-
console.log(
|
|
471
|
-
console.log(' Run this on your LOCAL machine
|
|
472
|
-
console.log('');
|
|
473
|
-
console.log(` ${(0, ui_1.color)('ssh -L 8085:localhost:8085 <USER>@<HOST>', 'command')}`);
|
|
524
|
+
console.log(` OAuth callback uses localhost:${callbackPort} which must be reachable.`);
|
|
525
|
+
console.log(' Run this on your LOCAL machine:');
|
|
526
|
+
console.log(` ${(0, ui_1.color)(`ssh -L ${callbackPort}:localhost:${callbackPort} <USER>@<HOST>`, 'command')}`);
|
|
474
527
|
console.log('');
|
|
475
|
-
console.log((0, ui_1.info)(`${oauthConfig.displayName} OAuth URL:`));
|
|
476
|
-
}
|
|
477
|
-
else {
|
|
478
|
-
console.log((0, ui_1.info)(`Opening browser for ${oauthConfig.displayName} authentication...`));
|
|
479
|
-
console.log((0, ui_1.info)('Complete the login in your browser.'));
|
|
480
|
-
console.log('');
|
|
481
|
-
}
|
|
482
|
-
const spinner = new progress_indicator_1.ProgressIndicator(`Authenticating with ${oauthConfig.displayName}`);
|
|
483
|
-
if (!headless) {
|
|
484
|
-
spinner.start();
|
|
485
528
|
}
|
|
486
529
|
return new Promise((resolve) => {
|
|
487
|
-
// Spawn CLIProxyAPI with auth flag
|
|
530
|
+
// Spawn CLIProxyAPI with auth flag
|
|
488
531
|
const authProcess = (0, child_process_1.spawn)(binaryPath, args, {
|
|
489
532
|
stdio: ['inherit', 'pipe', 'pipe'],
|
|
490
533
|
env: {
|
|
@@ -494,21 +537,27 @@ async function triggerOAuth(provider, options = {}) {
|
|
|
494
537
|
});
|
|
495
538
|
let stderrData = '';
|
|
496
539
|
let urlDisplayed = false;
|
|
540
|
+
let browserOpened = false;
|
|
541
|
+
const startTime = Date.now();
|
|
497
542
|
authProcess.stdout?.on('data', (data) => {
|
|
498
543
|
const output = data.toString();
|
|
499
544
|
log(`stdout: ${output.trim()}`);
|
|
545
|
+
// Detect when callback server starts or browser opens
|
|
546
|
+
if (!browserOpened && (output.includes('listening') || output.includes('http'))) {
|
|
547
|
+
process.stdout.write('\x1b[1A\x1b[2K');
|
|
548
|
+
showStep(2, 4, 'ok', `Callback server listening on port ${callbackPort}`);
|
|
549
|
+
showStep(3, 4, 'progress', 'Opening browser...');
|
|
550
|
+
browserOpened = true;
|
|
551
|
+
}
|
|
500
552
|
// In headless mode, display OAuth URLs prominently
|
|
501
553
|
if (headless) {
|
|
502
|
-
const
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
console.log((0, ui_1.info)('Waiting for authentication... (press Ctrl+C to cancel)'));
|
|
510
|
-
urlDisplayed = true;
|
|
511
|
-
}
|
|
554
|
+
const urlMatch = output.match(/https?:\/\/[^\s]+/);
|
|
555
|
+
if (urlMatch && !urlDisplayed) {
|
|
556
|
+
console.log('');
|
|
557
|
+
console.log((0, ui_1.info)(`${oauthConfig.displayName} OAuth URL:`));
|
|
558
|
+
console.log(` ${urlMatch[0]}`);
|
|
559
|
+
console.log('');
|
|
560
|
+
urlDisplayed = true;
|
|
512
561
|
}
|
|
513
562
|
}
|
|
514
563
|
});
|
|
@@ -516,82 +565,95 @@ async function triggerOAuth(provider, options = {}) {
|
|
|
516
565
|
const output = data.toString();
|
|
517
566
|
stderrData += output;
|
|
518
567
|
log(`stderr: ${output.trim()}`);
|
|
519
|
-
// Also check stderr for URLs
|
|
568
|
+
// Also check stderr for URLs
|
|
520
569
|
if (headless && !urlDisplayed) {
|
|
521
570
|
const urlMatch = output.match(/https?:\/\/[^\s]+/);
|
|
522
571
|
if (urlMatch) {
|
|
572
|
+
console.log('');
|
|
573
|
+
console.log((0, ui_1.info)(`${oauthConfig.displayName} OAuth URL:`));
|
|
523
574
|
console.log(` ${urlMatch[0]}`);
|
|
524
575
|
console.log('');
|
|
525
|
-
console.log((0, ui_1.info)('Waiting for authentication... (press Ctrl+C to cancel)'));
|
|
526
576
|
urlDisplayed = true;
|
|
527
577
|
}
|
|
528
578
|
}
|
|
529
579
|
});
|
|
530
|
-
//
|
|
580
|
+
// After a short delay, assume browser opened and show waiting
|
|
581
|
+
setTimeout(() => {
|
|
582
|
+
if (!browserOpened) {
|
|
583
|
+
process.stdout.write('\x1b[1A\x1b[2K');
|
|
584
|
+
showStep(2, 4, 'ok', `Callback server ready (port ${callbackPort})`);
|
|
585
|
+
showStep(3, 4, 'ok', 'Browser opened');
|
|
586
|
+
browserOpened = true;
|
|
587
|
+
}
|
|
588
|
+
showStep(4, 4, 'progress', 'Waiting for OAuth callback...');
|
|
589
|
+
console.log('');
|
|
590
|
+
console.log((0, ui_1.info)('Complete the login in your browser. This page will update automatically.'));
|
|
591
|
+
if (!verbose) {
|
|
592
|
+
console.log((0, ui_1.info)('If stuck, try: ccs ' + provider + ' --auth --verbose'));
|
|
593
|
+
}
|
|
594
|
+
}, 2000);
|
|
595
|
+
// Timeout after 5 minutes for headless, 2 minutes for normal
|
|
531
596
|
const timeoutMs = headless ? 300000 : 120000;
|
|
532
597
|
const timeout = setTimeout(() => {
|
|
533
|
-
if (!headless)
|
|
534
|
-
spinner.fail('Authentication timeout');
|
|
535
598
|
authProcess.kill();
|
|
536
|
-
console.
|
|
537
|
-
console.
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
console.
|
|
599
|
+
console.log('');
|
|
600
|
+
console.log((0, ui_1.fail)(`OAuth timed out after ${headless ? 5 : 2} minutes`));
|
|
601
|
+
// Show platform-specific troubleshooting
|
|
602
|
+
const troubleshooting = getTimeoutTroubleshooting(provider, callbackPort);
|
|
603
|
+
for (const line of troubleshooting) {
|
|
604
|
+
console.log(line);
|
|
542
605
|
}
|
|
543
606
|
resolve(null);
|
|
544
607
|
}, timeoutMs);
|
|
545
608
|
authProcess.on('exit', (code) => {
|
|
546
609
|
clearTimeout(timeout);
|
|
610
|
+
const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
|
|
547
611
|
if (code === 0) {
|
|
548
612
|
// Verify token was created BEFORE showing success
|
|
549
613
|
if (isAuthenticated(provider)) {
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
console.log((0, ui_1.ok)('Authentication successful'));
|
|
614
|
+
console.log('');
|
|
615
|
+
console.log((0, ui_1.ok)(`Authentication successful (${elapsed}s)`));
|
|
553
616
|
// Register the account in accounts registry
|
|
554
617
|
const account = registerAccountFromToken(provider, tokenDir, nickname);
|
|
555
618
|
resolve(account);
|
|
556
619
|
}
|
|
557
620
|
else {
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
console.
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
console.
|
|
565
|
-
console.
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
console.
|
|
569
|
-
console.
|
|
570
|
-
console.
|
|
621
|
+
console.log('');
|
|
622
|
+
console.log((0, ui_1.fail)('Token not found after authentication'));
|
|
623
|
+
console.log('');
|
|
624
|
+
console.log('The browser showed success but callback was not received.');
|
|
625
|
+
// Show platform-specific guidance
|
|
626
|
+
if (process.platform === 'win32') {
|
|
627
|
+
console.log('');
|
|
628
|
+
console.log('On Windows, this usually means:');
|
|
629
|
+
console.log(' 1. Windows Firewall blocked the callback');
|
|
630
|
+
console.log(' 2. Antivirus software blocked the connection');
|
|
631
|
+
console.log('');
|
|
632
|
+
console.log('Try running as Administrator:');
|
|
633
|
+
console.log(` netsh advfirewall firewall add rule name="CCS OAuth" dir=in action=allow protocol=TCP localport=${callbackPort}`);
|
|
571
634
|
}
|
|
635
|
+
console.log('');
|
|
636
|
+
console.log(`Try: ccs ${provider} --auth --verbose`);
|
|
572
637
|
resolve(null);
|
|
573
638
|
}
|
|
574
639
|
}
|
|
575
640
|
else {
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
console.error((0, ui_1.fail)(`CLIProxyAPI auth exited with code ${code}`));
|
|
641
|
+
console.log('');
|
|
642
|
+
console.log((0, ui_1.fail)(`CLIProxyAPI auth exited with code ${code}`));
|
|
579
643
|
if (stderrData && !urlDisplayed) {
|
|
580
|
-
console.
|
|
644
|
+
console.log(` ${stderrData.trim().split('\n')[0]}`);
|
|
581
645
|
}
|
|
582
|
-
// Show headless hint if we detected headless environment
|
|
583
646
|
if (headless && !urlDisplayed) {
|
|
584
|
-
console.
|
|
585
|
-
console.
|
|
647
|
+
console.log('');
|
|
648
|
+
console.log((0, ui_1.info)('No OAuth URL was displayed. Try with --verbose for details.'));
|
|
586
649
|
}
|
|
587
650
|
resolve(null);
|
|
588
651
|
}
|
|
589
652
|
});
|
|
590
653
|
authProcess.on('error', (error) => {
|
|
591
654
|
clearTimeout(timeout);
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
console.error((0, ui_1.fail)(`Failed to start auth process: ${error.message}`));
|
|
655
|
+
console.log('');
|
|
656
|
+
console.log((0, ui_1.fail)(`Failed to start auth process: ${error.message}`));
|
|
595
657
|
resolve(null);
|
|
596
658
|
});
|
|
597
659
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-handler.js","sourceRoot":"","sources":["../../src/cliproxy/auth-handler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth-handler.js","sourceRoot":"","sources":["../../src/cliproxy/auth-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,13 +64,38 @@ export declare function getPortConflicts(): Promise<OAuthPortDiagnostic[]>;
|
|
|
64
64
|
* Format OAuth port diagnostics for display
|
|
65
65
|
*/
|
|
66
66
|
export declare function formatOAuthPortDiagnostics(diagnostics: OAuthPortDiagnostic[]): string[];
|
|
67
|
+
/**
|
|
68
|
+
* Enhanced pre-flight check result with detailed diagnostics
|
|
69
|
+
*/
|
|
70
|
+
export interface EnhancedPreflightResult {
|
|
71
|
+
ready: boolean;
|
|
72
|
+
issues: string[];
|
|
73
|
+
checks: PreflightCheck[];
|
|
74
|
+
firewallWarning?: string;
|
|
75
|
+
firewallFixCommand?: string;
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Individual pre-flight check result
|
|
79
|
+
*/
|
|
80
|
+
export interface PreflightCheck {
|
|
81
|
+
name: string;
|
|
82
|
+
status: 'ok' | 'warn' | 'fail';
|
|
83
|
+
message: string;
|
|
84
|
+
fixCommand?: string;
|
|
85
|
+
}
|
|
67
86
|
/**
|
|
68
87
|
* Pre-flight check before OAuth - returns issues or empty array if OK
|
|
88
|
+
* @deprecated Use enhancedPreflightOAuthCheck for more detailed diagnostics
|
|
69
89
|
*/
|
|
70
90
|
export declare function preflightOAuthCheck(provider: CLIProxyProvider): Promise<{
|
|
71
91
|
ready: boolean;
|
|
72
92
|
issues: string[];
|
|
73
93
|
}>;
|
|
94
|
+
/**
|
|
95
|
+
* Enhanced pre-flight check with detailed step-by-step diagnostics
|
|
96
|
+
* Returns structured results for real-time display
|
|
97
|
+
*/
|
|
98
|
+
export declare function enhancedPreflightOAuthCheck(provider: CLIProxyProvider): Promise<EnhancedPreflightResult>;
|
|
74
99
|
declare const _default: {
|
|
75
100
|
OAUTH_CALLBACK_PORTS: Record<CLIProxyProvider, number | null>;
|
|
76
101
|
OAUTH_FLOW_TYPES: Record<CLIProxyProvider, OAuthFlowType>;
|
|
@@ -80,6 +105,7 @@ declare const _default: {
|
|
|
80
105
|
getPortConflicts: typeof getPortConflicts;
|
|
81
106
|
formatOAuthPortDiagnostics: typeof formatOAuthPortDiagnostics;
|
|
82
107
|
preflightOAuthCheck: typeof preflightOAuthCheck;
|
|
108
|
+
enhancedPreflightOAuthCheck: typeof enhancedPreflightOAuthCheck;
|
|
83
109
|
};
|
|
84
110
|
export default _default;
|
|
85
111
|
//# sourceMappingURL=oauth-port-diagnostics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-port-diagnostics.d.ts","sourceRoot":"","sources":["../../src/management/oauth-port-diagnostics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"oauth-port-diagnostics.d.ts","sourceRoot":"","sources":["../../src/management/oauth-port-diagnostics.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAEL,WAAW,EAMZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAMxE,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,aAAa,CAAC;AAEjE;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAMpE,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,oBAAoB;IACpB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,sBAAsB;IACtB,QAAQ,EAAE,aAAa,CAAC;IACxB,gDAAgD;IAChD,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,kBAAkB;IAClB,MAAM,EAAE,MAAM,GAAG,UAAU,GAAG,UAAU,GAAG,gBAAgB,CAAC;IAC5D,0CAA0C;IAC1C,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,oCAAoC;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAuD7F;AAED;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAUzE;AAED;;GAEG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAUzE;AAED;;GAEG;AACH,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAGvE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,mBAAmB,EAAE,GAAG,MAAM,EAAE,CAkCvF;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC;IAC7E,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC,CAMD;AAED;;;GAGG;AACH,wBAAsB,2BAA2B,CAC/C,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,uBAAuB,CAAC,CA4FlC;;;;;;;;;;;;AAED,wBAUE"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* - Qwen: Device Code Flow (no port needed)
|
|
13
13
|
*/
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.preflightOAuthCheck = exports.formatOAuthPortDiagnostics = exports.getPortConflicts = exports.checkAuthCodePorts = exports.checkAllOAuthPorts = exports.checkOAuthPort = exports.OAUTH_FLOW_TYPES = exports.OAUTH_CALLBACK_PORTS = void 0;
|
|
15
|
+
exports.enhancedPreflightOAuthCheck = exports.preflightOAuthCheck = exports.formatOAuthPortDiagnostics = exports.getPortConflicts = exports.checkAuthCodePorts = exports.checkAllOAuthPorts = exports.checkOAuthPort = exports.OAUTH_FLOW_TYPES = exports.OAUTH_CALLBACK_PORTS = void 0;
|
|
16
16
|
const port_utils_1 = require("../utils/port-utils");
|
|
17
17
|
/**
|
|
18
18
|
* OAuth callback ports for each provider
|
|
@@ -160,22 +160,111 @@ function formatOAuthPortDiagnostics(diagnostics) {
|
|
|
160
160
|
exports.formatOAuthPortDiagnostics = formatOAuthPortDiagnostics;
|
|
161
161
|
/**
|
|
162
162
|
* Pre-flight check before OAuth - returns issues or empty array if OK
|
|
163
|
+
* @deprecated Use enhancedPreflightOAuthCheck for more detailed diagnostics
|
|
163
164
|
*/
|
|
164
165
|
async function preflightOAuthCheck(provider) {
|
|
165
|
-
const
|
|
166
|
+
const result = await enhancedPreflightOAuthCheck(provider);
|
|
167
|
+
return {
|
|
168
|
+
ready: result.ready,
|
|
169
|
+
issues: result.issues,
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
exports.preflightOAuthCheck = preflightOAuthCheck;
|
|
173
|
+
/**
|
|
174
|
+
* Enhanced pre-flight check with detailed step-by-step diagnostics
|
|
175
|
+
* Returns structured results for real-time display
|
|
176
|
+
*/
|
|
177
|
+
async function enhancedPreflightOAuthCheck(provider) {
|
|
178
|
+
const port = exports.OAUTH_CALLBACK_PORTS[provider];
|
|
179
|
+
const flowType = exports.OAUTH_FLOW_TYPES[provider];
|
|
180
|
+
const checks = [];
|
|
166
181
|
const issues = [];
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
182
|
+
// Device code flow doesn't need port checks
|
|
183
|
+
if (flowType === 'device_code' || port === null) {
|
|
184
|
+
checks.push({
|
|
185
|
+
name: 'OAuth Flow',
|
|
186
|
+
status: 'ok',
|
|
187
|
+
message: 'Uses Device Code Flow (no callback port needed)',
|
|
188
|
+
});
|
|
189
|
+
return { ready: true, issues: [], checks };
|
|
190
|
+
}
|
|
191
|
+
// Check 1: Port availability via process detection
|
|
192
|
+
const portProcess = await (0, port_utils_1.getPortProcess)(port);
|
|
193
|
+
if (portProcess && !(0, port_utils_1.isCLIProxyProcess)(portProcess)) {
|
|
194
|
+
checks.push({
|
|
195
|
+
name: 'Port Availability',
|
|
196
|
+
status: 'fail',
|
|
197
|
+
message: `Port ${port} blocked by ${portProcess.processName} (PID ${portProcess.pid})`,
|
|
198
|
+
fixCommand: process.platform === 'win32'
|
|
199
|
+
? `taskkill /F /PID ${portProcess.pid}`
|
|
200
|
+
: `kill ${portProcess.pid}`,
|
|
201
|
+
});
|
|
202
|
+
issues.push(`Port ${port} is blocked by ${portProcess.processName} (PID ${portProcess.pid})`);
|
|
203
|
+
}
|
|
204
|
+
else if (portProcess && (0, port_utils_1.isCLIProxyProcess)(portProcess)) {
|
|
205
|
+
checks.push({
|
|
206
|
+
name: 'Port Availability',
|
|
207
|
+
status: 'ok',
|
|
208
|
+
message: `Port ${port} in use by CLIProxy (OK)`,
|
|
209
|
+
});
|
|
210
|
+
}
|
|
211
|
+
else {
|
|
212
|
+
checks.push({
|
|
213
|
+
name: 'Port Availability',
|
|
214
|
+
status: 'ok',
|
|
215
|
+
message: `Port ${port} is available`,
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
// Check 2: Localhost binding test (verifies we can actually listen)
|
|
219
|
+
const bindingResult = await (0, port_utils_1.testLocalhostBinding)(port);
|
|
220
|
+
if (!bindingResult.success && !portProcess) {
|
|
221
|
+
// Only fail if no process found but binding failed (weird state)
|
|
222
|
+
checks.push({
|
|
223
|
+
name: 'Localhost Binding',
|
|
224
|
+
status: 'warn',
|
|
225
|
+
message: bindingResult.message,
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
else if (bindingResult.success) {
|
|
229
|
+
checks.push({
|
|
230
|
+
name: 'Localhost Binding',
|
|
231
|
+
status: 'ok',
|
|
232
|
+
message: 'Can bind to localhost',
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
// Check 3: Windows Firewall (only on Windows)
|
|
236
|
+
let firewallWarning;
|
|
237
|
+
let firewallFixCommand;
|
|
238
|
+
if (process.platform === 'win32') {
|
|
239
|
+
const firewallResult = await (0, port_utils_1.checkWindowsFirewall)(port);
|
|
240
|
+
if (firewallResult.mayBlock) {
|
|
241
|
+
checks.push({
|
|
242
|
+
name: 'Windows Firewall',
|
|
243
|
+
status: 'warn',
|
|
244
|
+
message: firewallResult.message,
|
|
245
|
+
fixCommand: firewallResult.fixCommand,
|
|
246
|
+
});
|
|
247
|
+
firewallWarning = firewallResult.message;
|
|
248
|
+
firewallFixCommand = firewallResult.fixCommand;
|
|
249
|
+
// Don't add to issues - just a warning, not a blocker
|
|
250
|
+
}
|
|
251
|
+
else if (firewallResult.checked) {
|
|
252
|
+
checks.push({
|
|
253
|
+
name: 'Windows Firewall',
|
|
254
|
+
status: 'ok',
|
|
255
|
+
message: 'Firewall rules allow port',
|
|
256
|
+
});
|
|
171
257
|
}
|
|
172
258
|
}
|
|
173
259
|
return {
|
|
174
260
|
ready: issues.length === 0,
|
|
175
261
|
issues,
|
|
262
|
+
checks,
|
|
263
|
+
firewallWarning,
|
|
264
|
+
firewallFixCommand,
|
|
176
265
|
};
|
|
177
266
|
}
|
|
178
|
-
exports.
|
|
267
|
+
exports.enhancedPreflightOAuthCheck = enhancedPreflightOAuthCheck;
|
|
179
268
|
exports.default = {
|
|
180
269
|
OAUTH_CALLBACK_PORTS: exports.OAUTH_CALLBACK_PORTS,
|
|
181
270
|
OAUTH_FLOW_TYPES: exports.OAUTH_FLOW_TYPES,
|
|
@@ -185,5 +274,6 @@ exports.default = {
|
|
|
185
274
|
getPortConflicts,
|
|
186
275
|
formatOAuthPortDiagnostics,
|
|
187
276
|
preflightOAuthCheck,
|
|
277
|
+
enhancedPreflightOAuthCheck,
|
|
188
278
|
};
|
|
189
279
|
//# sourceMappingURL=oauth-port-diagnostics.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-port-diagnostics.js","sourceRoot":"","sources":["../../src/management/oauth-port-diagnostics.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"oauth-port-diagnostics.js","sourceRoot":"","sources":["../../src/management/oauth-port-diagnostics.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,4 +16,30 @@ export declare function getPortProcess(port: number): Promise<PortProcess | null
|
|
|
16
16
|
* Check if process is CLIProxy
|
|
17
17
|
*/
|
|
18
18
|
export declare function isCLIProxyProcess(process: PortProcess | null): boolean;
|
|
19
|
+
/**
|
|
20
|
+
* Windows firewall check result
|
|
21
|
+
*/
|
|
22
|
+
export interface FirewallCheckResult {
|
|
23
|
+
checked: boolean;
|
|
24
|
+
mayBlock: boolean;
|
|
25
|
+
message: string;
|
|
26
|
+
fixCommand?: string;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Check if Windows Firewall might block a port
|
|
30
|
+
* Returns immediately on non-Windows platforms
|
|
31
|
+
*/
|
|
32
|
+
export declare function checkWindowsFirewall(port: number): Promise<FirewallCheckResult>;
|
|
33
|
+
/**
|
|
34
|
+
* Localhost binding test result
|
|
35
|
+
*/
|
|
36
|
+
export interface BindingTestResult {
|
|
37
|
+
success: boolean;
|
|
38
|
+
message: string;
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Test if we can bind to localhost on a specific port
|
|
42
|
+
* This verifies network stack is working and port is actually available
|
|
43
|
+
*/
|
|
44
|
+
export declare function testLocalhostBinding(port: number): Promise<BindingTestResult>;
|
|
19
45
|
//# sourceMappingURL=port-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-utils.d.ts","sourceRoot":"","sources":["../../src/utils/port-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAa9E;AA8ED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAetE"}
|
|
1
|
+
{"version":3,"file":"port-utils.d.ts","sourceRoot":"","sources":["../../src/utils/port-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAa9E;AA8ED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAetE;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAiCrF;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAyBnF"}
|
package/dist/utils/port-utils.js
CHANGED
|
@@ -2,8 +2,31 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* Port utilities for detecting process ownership
|
|
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 (mod) {
|
|
22
|
+
if (mod && mod.__esModule) return mod;
|
|
23
|
+
var result = {};
|
|
24
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
25
|
+
__setModuleDefault(result, mod);
|
|
26
|
+
return result;
|
|
27
|
+
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.isCLIProxyProcess = exports.getPortProcess = void 0;
|
|
29
|
+
exports.testLocalhostBinding = exports.checkWindowsFirewall = exports.isCLIProxyProcess = exports.getPortProcess = void 0;
|
|
7
30
|
const child_process_1 = require("child_process");
|
|
8
31
|
const util_1 = require("util");
|
|
9
32
|
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
@@ -110,4 +133,67 @@ function isCLIProxyProcess(process) {
|
|
|
110
133
|
].includes(name);
|
|
111
134
|
}
|
|
112
135
|
exports.isCLIProxyProcess = isCLIProxyProcess;
|
|
136
|
+
/**
|
|
137
|
+
* Check if Windows Firewall might block a port
|
|
138
|
+
* Returns immediately on non-Windows platforms
|
|
139
|
+
*/
|
|
140
|
+
async function checkWindowsFirewall(port) {
|
|
141
|
+
if (process.platform !== 'win32') {
|
|
142
|
+
return { checked: false, mayBlock: false, message: 'Not Windows' };
|
|
143
|
+
}
|
|
144
|
+
try {
|
|
145
|
+
// Check for inbound rules allowing our port
|
|
146
|
+
const { stdout } = await execAsync(`netsh advfirewall firewall show rule name=all dir=in | findstr /C:"LocalPort" | findstr /C:"${port}"`, { timeout: 5000 });
|
|
147
|
+
// If we find the port in firewall rules, it's likely allowed
|
|
148
|
+
if (stdout.trim()) {
|
|
149
|
+
return { checked: true, mayBlock: false, message: `Port ${port} found in firewall rules` };
|
|
150
|
+
}
|
|
151
|
+
// Port not in rules - might be blocked
|
|
152
|
+
return {
|
|
153
|
+
checked: true,
|
|
154
|
+
mayBlock: true,
|
|
155
|
+
message: `Port ${port} may be blocked by Windows Firewall`,
|
|
156
|
+
fixCommand: `netsh advfirewall firewall add rule name="CCS OAuth" dir=in action=allow protocol=TCP localport=${port}`,
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
catch {
|
|
160
|
+
// Command failed - could be no matching rules, assume might block
|
|
161
|
+
return {
|
|
162
|
+
checked: true,
|
|
163
|
+
mayBlock: true,
|
|
164
|
+
message: `Could not verify firewall rules for port ${port}`,
|
|
165
|
+
fixCommand: `netsh advfirewall firewall add rule name="CCS OAuth" dir=in action=allow protocol=TCP localport=${port}`,
|
|
166
|
+
};
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
exports.checkWindowsFirewall = checkWindowsFirewall;
|
|
170
|
+
/**
|
|
171
|
+
* Test if we can bind to localhost on a specific port
|
|
172
|
+
* This verifies network stack is working and port is actually available
|
|
173
|
+
*/
|
|
174
|
+
async function testLocalhostBinding(port) {
|
|
175
|
+
const net = await Promise.resolve().then(() => __importStar(require('net')));
|
|
176
|
+
return new Promise((resolve) => {
|
|
177
|
+
const server = net.createServer();
|
|
178
|
+
server.once('error', (err) => {
|
|
179
|
+
if (err.code === 'EADDRINUSE') {
|
|
180
|
+
resolve({ success: false, message: `Port ${port} is already in use` });
|
|
181
|
+
}
|
|
182
|
+
else if (err.code === 'EACCES') {
|
|
183
|
+
resolve({ success: false, message: `Permission denied for port ${port}` });
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
resolve({ success: false, message: `Cannot bind to port ${port}: ${err.message}` });
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
server.once('listening', () => {
|
|
190
|
+
server.close(() => {
|
|
191
|
+
resolve({ success: true, message: `Port ${port} is available` });
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
// Try to bind to localhost only (like CLIProxyAPI does)
|
|
195
|
+
server.listen(port, '127.0.0.1');
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
exports.testLocalhostBinding = testLocalhostBinding;
|
|
113
199
|
//# sourceMappingURL=port-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-utils.js","sourceRoot":"","sources":["../../src/utils/port-utils.ts"],"names":[],"mappings":";AAAA;;GAEG
|
|
1
|
+
{"version":3,"file":"port-utils.js","sourceRoot":"","sources":["../../src/utils/port-utils.ts"],"names":[],"mappings":"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"}
|