@atcute/lex-cli 2.6.1 → 2.8.0

package/src/lsp-client.ts

@@ -112,6 +112,9 @@ export const createLspClient = async (command: string, root: string): Promise<Ls
 	// are handled by the close/error handlers below
 	child.stdin.on('error', () => {});
 
+	// drain stderr so a chatty server doesn't block on a full pipe buffer
+	child.stderr.resume();
+
 	// #region JSON-RPC framing
 
 	const pending = new Map<number, PromiseWithResolvers<unknown>>();
@@ -188,7 +191,6 @@ export const createLspClient = async (command: string, root: string): Promise<Ls
 				continue;
 			}
 
-			// dispatch responses to pending requests, ignore everything else
 			if (message.id != null) {
 				const entry = pending.get(message.id);
 				if (entry) {
@@ -199,6 +201,13 @@ export const createLspClient = async (command: string, root: string): Promise<Ls
 					} else {
 						entry.resolve(message.result);
 					}
+				} else if (message.method != null) {
+					// server-initiated request — reply with MethodNotFound so it doesn't hang
+					sendMessage({
+						jsonrpc: '2.0',
+						id: message.id,
+						error: { code: -32601, message: `method not found` },
+					});
 				}
 			}
 		}

package/src/pull-sources/git.ts

@@ -26,80 +26,81 @@ export const pullGitSource = async (
 	const cloneDir = path.join(tempParent, 'repo');
 
 	try {
-		await runGit(
-			[
-				'clone',
-				'--filter=blob:none',
-				'--depth',
-				'1',
-				'--sparse',
-				...(source.ref ? ['--branch', source.ref, '--single-branch'] : []),
-				source.remote,
-				cloneDir,
-			],
-			{ timeoutMs: 60_000 },
-		);
-	} catch (err) {
-		if (err instanceof GitError) {
-			console.error(pc.bold(pc.red(`git clone failed for ${source.remote}:`)));
-			console.error(err.stderr || err.message);
-			process.exit(1);
+		try {
+			await runGit(
+				[
+					'clone',
+					'--filter=blob:none',
+					'--depth',
+					'1',
+					'--sparse',
+					...(source.ref ? ['--branch', source.ref, '--single-branch'] : []),
+					source.remote,
+					cloneDir,
+				],
+				{ timeoutMs: 60_000 },
+			);
+		} catch (err) {
+			if (err instanceof GitError) {
+				console.error(pc.bold(pc.red(`git clone failed for ${source.remote}:`)));
+				console.error(err.stderr || err.message);
+				process.exit(1);
+			}
+
+			throw err;
 		}
 
-		throw err;
-	}
-
-	try {
-		await runGit(['-C', cloneDir, 'sparse-checkout', 'set', '--no-cone', ...source.pattern], {
-			timeoutMs: 30_000,
-		});
-	} catch (err) {
-		if (err instanceof GitError) {
-			console.error(pc.bold(pc.red(`git sparse-checkout failed for ${source.remote}:`)));
-			console.error(err.stderr || err.message);
-			process.exit(1);
+		try {
+			await runGit(['-C', cloneDir, 'sparse-checkout', 'set', '--no-cone', ...source.pattern], {
+				timeoutMs: 30_000,
+			});
+		} catch (err) {
+			if (err instanceof GitError) {
+				console.error(pc.bold(pc.red(`git sparse-checkout failed for ${source.remote}:`)));
+				console.error(err.stderr || err.message);
+				process.exit(1);
+			}
+
+			throw err;
 		}
 
-		throw err;
-	}
-
-	const pulled = new Map<string, PulledLexicon>();
+		const pulled = new Map<string, PulledLexicon>();
 
-	for await (const filename of fs.glob(source.pattern, { cwd: cloneDir })) {
-		const absolute = path.join(cloneDir, filename);
-		const stat = await fs.stat(absolute);
+		for await (const filename of fs.glob(source.pattern, { cwd: cloneDir })) {
+			const absolute = path.join(cloneDir, filename);
+			const stat = await fs.stat(absolute);
 
-		if (!stat.isFile()) {
-			continue;
-		}
+			if (!stat.isFile()) {
+				continue;
+			}
 
-		const location: SourceLocation = {
-			absolutePath: absolute,
-			relativePath: filename,
-			sourceDescription: source.remote,
-		};
+			const location: SourceLocation = {
+				absolutePath: absolute,
+				relativePath: filename,
+				sourceDescription: source.remote,
+			};
 
-		const doc = await parseLexiconFile(location);
+			const doc = await parseLexiconFile(location);
 
-		pulled.set(doc.id, { nsid: doc.id, doc, location });
-	}
+			pulled.set(doc.id, { nsid: doc.id, doc, location });
+		}
 
-	// get the commit hash
-	let rev: string;
-	try {
-		const result = await runGit(['-C', cloneDir, 'rev-parse', 'HEAD'], { timeoutMs: 10_000 });
-		rev = result.stdout.trim();
-	} catch (err) {
-		if (err instanceof GitError) {
-			console.error(pc.bold(pc.red(`git rev-parse failed for ${source.remote}:`)));
-			console.error(err.stderr || err.message);
-			process.exit(1);
+		let rev: string;
+		try {
+			const result = await runGit(['-C', cloneDir, 'rev-parse', 'HEAD'], { timeoutMs: 10_000 });
+			rev = result.stdout.trim();
+		} catch (err) {
+			if (err instanceof GitError) {
+				console.error(pc.bold(pc.red(`git rev-parse failed for ${source.remote}:`)));
+				console.error(err.stderr || err.message);
+				process.exit(1);
+			}
+
+			throw err;
 		}
 
-		throw err;
+		return { pulled, rev };
+	} finally {
+		await fs.rm(tempParent, { recursive: true, force: true });
 	}
-
-	await fs.rm(tempParent, { recursive: true, force: true });
-
-	return { pulled, rev };
 };