Skip to content
Merged
Changes from all commits
Commits
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
32 changes: 8 additions & 24 deletions src/tg/bot.deno.ts
Original file line number Diff line number Diff line change
Expand Up @@ -704,45 +704,30 @@ async function* handleSh(data: any, cmd: string) {
const id = genRandomToken(32);
await Deno.writeFile(
`${getTempDir()}/${id}.sh`,
new TextEncoder().encode(cmd),
new TextEncoder().encode(
`exec 1>"${getTempDir()}/${id}.out" 2>&1
${cmd}`,
),
{
createNew: true,
},
);

const outFile = await Deno.open(`${getTempDir()}/${id}.out`, {
write: true,
createNew: true,
});
const command = new Deno.Command("bash", {
args: [`${getTempDir()}/${id}.sh`],
stdin: "piped",
stdout: "piped",
stderr: "piped",
stdin: "null",
stdout: "null",
stderr: "null",
});
const child = command.spawn();

let length = 0;
const writer = outFile.writable.getWriter();
const createWritable = () =>
new WritableStream({
write(chunk: Uint8Array) {
length += chunk.length;
writer.write(chunk);
},
});
child.stdout.pipeTo(createWritable());
child.stderr.pipeTo(createWritable());
child.stdin.close();

const raceResult = await Promise.race([
child.status,
new Promise<void>((resolve) => setTimeout(() => resolve(), 5000)),
]);

if (raceResult !== undefined) {
yield* reportProcessResult(
length,
id,
data.message.message_id,
raceResult.code,
Expand Down Expand Up @@ -785,20 +770,19 @@ async function* handleSh(data: any, cmd: string) {
"editMessageReplyMarkup",
);
yield* reportProcessResult(
length,
id,
progressMessageResponse.result.message_id,
status.code,
);
}

async function* reportProcessResult(
length: number,
id: string,
reply_to_message_id: number,
exitCode: number,
) {
const outPath = `${getTempDir()}/${id}.out`;
const { size: length } = await Deno.stat(outPath);
const fileProc = new Deno.Command("file", {
args: ["-ib", outPath],
stdout: "piped",
Expand Down
Loading