Add --url flag to ccc-client and ccc-queue
Overrides CONDUIT_URL env var. Resolved through load_client_config and threaded into create_conduit_client as base_url parameter. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,12 +1,15 @@
|
||||
// Resolve client config from CLI args or environment variables.
|
||||
// Precedence: CLI args > env vars > error
|
||||
// Precedence: CLI args > env vars > defaults
|
||||
//
|
||||
// Env vars:
|
||||
// CCC_SECRETS path to secrets file
|
||||
// CCC_USER username to authenticate as
|
||||
// CCC_SECRETS path to secrets file
|
||||
// CCC_USER username to authenticate as
|
||||
// CONDUIT_URL server URL
|
||||
|
||||
import { readFileSync } from 'fs';
|
||||
|
||||
const DEFAULT_URL = 'http://localhost:3015';
|
||||
|
||||
function get_arg(argv, flag) {
|
||||
const i = argv.indexOf(flag);
|
||||
return i !== -1 ? argv[i + 1] : null;
|
||||
@@ -15,6 +18,7 @@ function get_arg(argv, flag) {
|
||||
export function load_client_config(argv) {
|
||||
const secrets_path = get_arg(argv, '--secrets') || process.env.CCC_SECRETS;
|
||||
const username = get_arg(argv, '--user') || process.env.CCC_USER;
|
||||
const url = get_arg(argv, '--url') || process.env.CONDUIT_URL || DEFAULT_URL;
|
||||
|
||||
if (!secrets_path) {
|
||||
console.error('Secrets file required: --secrets <path> or CCC_SECRETS=<path>');
|
||||
@@ -39,14 +43,14 @@ export function load_client_config(argv) {
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
return { username, secret: user_entry.secret };
|
||||
return { username, secret: user_entry.secret, url };
|
||||
}
|
||||
|
||||
export function get_remaining(argv) {
|
||||
const result = [];
|
||||
let i = 2;
|
||||
while (i < argv.length) {
|
||||
if (argv[i] === '--secrets' || argv[i] === '--user') {
|
||||
if (argv[i] === '--secrets' || argv[i] === '--user' || argv[i] === '--url') {
|
||||
i += 2;
|
||||
} else {
|
||||
result.push(argv[i]);
|
||||
|
||||
Reference in New Issue
Block a user