can1357
9c0828ead5
- Made shell command execution in configuration values asynchronous to prevent blocking the TUI, improving responsiveness during long-running operations. - Added deduplication of concurrent shell command executions to prevent redundant processing when the same command is requested multiple times simultaneously. - Enhanced git URL parsing with credential stripping and validation of URI-encoded hash fragments to improve security and robustness. - Improved @ prefix normalization for path syntaxes to correctly handle well-known patterns while preserving literal paths like '@my-file.txt'. - Refactored prompt cache key calculation in OpenAI responses to improve code clarity and ensure cache retention is only set when a cache key exists.
93 lines
2.7 KiB
TypeScript
93 lines
2.7 KiB
TypeScript
/**
|
|
* Resolve configuration values that may be shell commands, environment variables, or literals.
|
|
*
|
|
* Note: command execution is async to avoid blocking the TUI.
|
|
*/
|
|
|
|
import { executeShell } from "@oh-my-pi/pi-natives";
|
|
|
|
/** Cache for successful shell command results (persists for process lifetime). */
|
|
const commandResultCache = new Map<string, string>();
|
|
|
|
/** De-duplicates concurrent executions for the same command. */
|
|
const commandInFlight = new Map<string, Promise<string | undefined>>();
|
|
|
|
/**
|
|
* Resolve a config value (API key, header value, etc.) to an actual value.
|
|
* - If starts with "!", executes the rest as a shell command and uses stdout (cached)
|
|
* - Otherwise checks environment variable first, then treats as literal (not cached)
|
|
*/
|
|
export async function resolveConfigValue(config: string): Promise<string | undefined> {
|
|
if (config.startsWith("!")) {
|
|
return await executeCommand(config);
|
|
}
|
|
const envValue = process.env[config];
|
|
return envValue || config;
|
|
}
|
|
|
|
async function executeCommand(commandConfig: string): Promise<string | undefined> {
|
|
const cached = commandResultCache.get(commandConfig);
|
|
if (cached !== undefined) {
|
|
return cached;
|
|
}
|
|
|
|
const existing = commandInFlight.get(commandConfig);
|
|
if (existing) {
|
|
return await existing;
|
|
}
|
|
|
|
const command = commandConfig.slice(1);
|
|
const promise = runShellCommand(command, 10_000)
|
|
.then(result => {
|
|
if (result !== undefined) {
|
|
commandResultCache.set(commandConfig, result);
|
|
}
|
|
return result;
|
|
})
|
|
.finally(() => {
|
|
commandInFlight.delete(commandConfig);
|
|
});
|
|
|
|
commandInFlight.set(commandConfig, promise);
|
|
return await promise;
|
|
}
|
|
|
|
async function runShellCommand(command: string, timeoutMs: number): Promise<string | undefined> {
|
|
try {
|
|
let output = "";
|
|
const result = await executeShell({ command, timeoutMs }, chunk => {
|
|
output += chunk;
|
|
});
|
|
if (result.timedOut || result.exitCode !== 0) {
|
|
return undefined;
|
|
}
|
|
const trimmed = output.trim();
|
|
return trimmed.length > 0 ? trimmed : undefined;
|
|
} catch {
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Resolve all header values using the same resolution logic as API keys.
|
|
*/
|
|
export async function resolveHeaders(
|
|
headers: Record<string, string> | undefined,
|
|
): Promise<Record<string, string> | undefined> {
|
|
if (!headers) return undefined;
|
|
const resolved: Record<string, string> = {};
|
|
for (const [key, value] of Object.entries(headers)) {
|
|
const resolvedValue = await resolveConfigValue(value);
|
|
if (resolvedValue) {
|
|
resolved[key] = resolvedValue;
|
|
}
|
|
}
|
|
return Object.keys(resolved).length > 0 ? resolved : undefined;
|
|
}
|
|
|
|
/** Clear the config value command cache. Exported for testing. */
|
|
export function clearConfigValueCache(): void {
|
|
commandResultCache.clear();
|
|
commandInFlight.clear();
|
|
}
|