Files
jackwener__opencli/clis/spotify/utils.ts
jakevin 80eef46b4e refactor: monorepo adapter separation (clis/ at root) (#782)
* refactor: move adapters from src/clis/ to root clis/ for monorepo separation

Separates CLI adapters from the core runtime to prepare for independent
adapter distribution via postinstall fetch.

Key changes:
- Move src/clis/ → clis/ (adapters at repo root)
- Change tsconfig rootDir from "src" to "." so tsc compiles both
- Create root-level shim files (registry.ts, errors.ts, etc.) so adapter
  relative imports (../../registry.js) resolve correctly
- Update build-manifest.ts, main.ts paths for new dist/src/ structure
- Expand ensureUserCliCompatShims() to cover all adapter import targets
  (types, utils, logger, launcher, browser/*, download/*, pipeline/*)
- Add scripts/fetch-adapters.js postinstall for ~/.opencli/clis/ sync
- Update vitest.config.ts adapter test paths
- Add package.json files field to exclude adapters from npm package

Official adapter files are unconditionally overwritten on update;
user-created files not in the manifest are preserved.

* fix: add dist/clis/ and cli-manifest.json to npm files, harden fetch-adapters

- Add dist/clis/ and dist/cli-manifest.json to package.json files field
  so built-in adapters and manifest ship with the npm package
- Replace execSync with execFileSync to prevent command injection
- Add version check to skip redundant adapter fetches
- Track tmpRoot explicitly for reliable cleanup

* fix: address review blockers — manifest-based updates, global-only fetch, first-run fallback

1. Manifest-based update strategy:
   - Read old manifest to identify previously-official files
   - Clean up files removed upstream (in old manifest but not new)
   - User-created files (never in any manifest) remain untouched

2. Only run fetch-adapters on global install (npm_config_global=true)
   or explicit OPENCLI_FETCH=1, preventing heavy side effects for
   local/dev installs

3. First-run fallback in discovery.ts:
   - ensureUserAdapters() checks for adapter-manifest.json
   - If missing and ~/.opencli/clis/ is empty, spawns fetch-adapters.js
   - Guarantees adapters are available even with --ignore-scripts

* fix: remove OPENCLI_FETCH env var, use internal _OPENCLI_FIRST_RUN instead

* feat: also support OPENCLI_FETCH=1 for explicit adapter fetch trigger

* simplify: replace git clone with local copy from dist/clis/

Adapters already ship in the npm package (dist/clis/), so there's no
need to clone from GitHub. Copy directly from the installed package:

- Eliminates git, curl, tar dependencies
- No network calls in postinstall
- No timeout/offline issues
- Version always matches the installed CLI
- ~65 lines of clone/download code replaced by one cpSync loop
2026-04-05 01:46:36 +08:00

93 lines
2.9 KiB
TypeScript

import { CliError } from '../../errors.js';
export interface SpotifyCredentials {
clientId: string;
clientSecret: string;
}
export interface SpotifyTrackSummary {
track: string;
artist: string;
album: string;
uri: string;
}
const SPOTIFY_PLACEHOLDER_PATTERNS = [
/^your_spotify_client_id_here$/i,
/^your_spotify_client_secret_here$/i,
/^your_.+_here$/i,
];
export function parseDotEnv(content: string): Record<string, string> {
return Object.fromEntries(
content
.split(/\r?\n/)
.map(line => line.trim())
.filter(line => line && !line.startsWith('#') && line.includes('='))
.map(line => {
const index = line.indexOf('=');
return [line.slice(0, index).trim(), line.slice(index + 1).trim()] as [string, string];
}),
);
}
export function resolveSpotifyCredentials(
fileEnv: Record<string, string>,
processEnv: NodeJS.ProcessEnv = process.env,
): SpotifyCredentials {
return {
clientId: processEnv.SPOTIFY_CLIENT_ID || fileEnv.SPOTIFY_CLIENT_ID || '',
clientSecret: processEnv.SPOTIFY_CLIENT_SECRET || fileEnv.SPOTIFY_CLIENT_SECRET || '',
};
}
export function isPlaceholderCredential(value: string | null | undefined): boolean {
const normalized = value?.trim() || '';
if (!normalized) return false;
return SPOTIFY_PLACEHOLDER_PATTERNS.some(pattern => pattern.test(normalized));
}
export function hasConfiguredSpotifyCredentials(credentials: SpotifyCredentials): boolean {
return Boolean(credentials.clientId.trim()) &&
Boolean(credentials.clientSecret.trim()) &&
!isPlaceholderCredential(credentials.clientId) &&
!isPlaceholderCredential(credentials.clientSecret);
}
export function assertSpotifyCredentialsConfigured(credentials: SpotifyCredentials, envFile: string): void {
if (hasConfiguredSpotifyCredentials(credentials)) return;
throw new CliError(
'CONFIG',
`Missing Spotify credentials.\n\n` +
`1. Go to https://developer.spotify.com/dashboard and create an app\n` +
`2. Add ${'http://127.0.0.1:8888/callback'} as a Redirect URI\n` +
`3. Copy your Client ID and Client Secret\n` +
`4. Open the file: ${envFile}\n` +
`5. Fill in SPOTIFY_CLIENT_ID and SPOTIFY_CLIENT_SECRET, then save\n` +
`6. Run: opencli spotify auth`,
);
}
export function mapSpotifyTrackResults(data: any): SpotifyTrackSummary[] {
const items = data?.tracks?.items;
if (!Array.isArray(items)) return [];
return items.map((track: any) => ({
track: track?.name || '',
artist: Array.isArray(track?.artists) ? track.artists.map((artist: any) => artist.name).join(', ') : '',
album: track?.album?.name || '',
uri: track?.uri || '',
}));
}
export function getFirstSpotifyTrack(data: any): { uri: string; name: string; artist: string } | null {
const track = mapSpotifyTrackResults(data)[0];
if (!track) return null;
return {
uri: track.uri,
name: track.track,
artist: track.artist,
};
}