Skip to content

fix: restore TTY cleanup for stream interrupts #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luyua9 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: restore TTY cleanup for stream interrupts #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 59 additions & 36 deletions src/helpers/completion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,51 +202,74 @@ export const readData =
const [excludedPrefix] = excluded;
const stopTextStreamKeys = ['q', 'escape']; //Group of keys that stop the text stream

const rl = readline.createInterface({
input: process.stdin,
});

process.stdin.setRawMode(true);

process.stdin.on('keypress', (key, data) => {
if (stopTextStreamKeys.includes(data.name)) {
const input = process.stdin;
const canUseRawInput =
input.isTTY && typeof input.setRawMode === 'function';
const rl = canUseRawInput
? readline.createInterface({
input,
terminal: true,
})
: undefined;

const stopOnKeypress = (_key: string, data: readline.Key) => {
if (data?.name && stopTextStreamKeys.includes(data.name)) {
stopTextStream = true;
}
});
for await (const chunk of iterableStream) {
const payloads = chunk.toString().split('\n\n');
for (const payload of payloads) {
if (payload.includes('[DONE]') || stopTextStream) {
dataStart = false;
resolve(data);
return;
}
};

if (payload.startsWith('data:')) {
content = parseContent(payload);
// Use buffer only for start detection
if (!dataStart) {
// Append content to the buffer
buffer += content;
if (buffer.match(excludedPrefix ?? '')) {
dataStart = true;
// Clear the buffer once it has served its purpose
buffer = '';
if (excludedPrefix) break;
}
const cleanupKeypress = () => {
input.off('keypress', stopOnKeypress);
if (canUseRawInput) {
input.setRawMode(false);
}
rl?.close();
};

if (canUseRawInput) {
readline.emitKeypressEvents(input, rl);
input.setRawMode(true);
input.on('keypress', stopOnKeypress);
}

try {
for await (const chunk of iterableStream) {
const payloads = chunk.toString().split('\n\n');
for (const payload of payloads) {
if (payload.includes('[DONE]') || stopTextStream) {
dataStart = false;
resolve(data);
return;
}

if (dataStart && content) {
const contentWithoutExcluded = stripRegexPatterns(
content,
excluded
);
if (payload.startsWith('data:')) {
content = parseContent(payload);
// Use buffer only for start detection
if (!dataStart) {
// Append content to the buffer
buffer += content;
if (buffer.match(excludedPrefix ?? '')) {
dataStart = true;
// Clear the buffer once it has served its purpose
buffer = '';
if (excludedPrefix) break;
}
}

if (dataStart && content) {
const contentWithoutExcluded = stripRegexPatterns(
content,
excluded
);

data += contentWithoutExcluded;
writer(contentWithoutExcluded);
data += contentWithoutExcluded;
writer(contentWithoutExcluded);
}
}
}
}
} finally {
cleanupKeypress();
}

function parseContent(payload: string): string {
Expand Down