From 963394297764f20a5f49deb09fefdc663d5ab61a Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Sat, 29 Jun 2019 12:26:58 +0800 Subject: [PATCH] html: abort on zmodem consume error --- html/src/components/terminal/index.tsx | 28 +++++++++++++++----------- src/index.html | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/html/src/components/terminal/index.tsx b/html/src/components/terminal/index.tsx index f9618e3..639a86b 100644 --- a/html/src/components/terminal/index.tsx +++ b/html/src/components/terminal/index.tsx @@ -51,6 +51,7 @@ export class Xterm extends Component { private resizeTimeout: number; private sentry: Zmodem.Sentry; private session: Zmodem.Session; + private detection: Zmodem.Detection; constructor(props) { super(props); @@ -115,11 +116,12 @@ export class Xterm extends Component { } @bind - private zmodemDetect(detection: any): void { + private zmodemDetect(detection: Zmodem.Detection): void { const { terminal, receiveFile } = this; - terminal.setOption('disableStdin', true); + this.detection = detection; this.session = detection.confirm(); + if (this.session.type === 'send') { this.setState({ modal: true }); } else { @@ -133,18 +135,13 @@ export class Xterm extends Component { const { terminal, session, writeProgress } = this; const files: FileList = (event.target as HTMLInputElement).files; - if (files.length === 0) { - session.close(); - terminal.setOption('disableStdin', false); - return; - } Zmodem.Browser.send_files(session, files, { on_progress: (_, xfer: any) => writeProgress(xfer), - on_file_complete: () => {}, }) .then(() => { session.close(); + this.detection = null; terminal.setOption('disableStdin', false); }) .catch(e => { @@ -164,10 +161,14 @@ export class Xterm extends Component { }); xfer.accept().then(() => { Zmodem.Browser.save_to_disk(fileBuffer, xfer.get_details().name); - terminal.setOption('disableStdin', false); }); }); + session.on('session_end', () => { + this.detection = null; + terminal.setOption('disableStdin', false); + }); + session.start(); } @@ -272,7 +273,7 @@ export class Xterm extends Component { @bind private onSocketData(event: MessageEvent) { - const { terminal, textDecoder, socket } = this; + const { terminal, textDecoder } = this; const rawData = event.data as ArrayBuffer; const cmd = String.fromCharCode(new Uint8Array(rawData)[0]); const data = rawData.slice(1); @@ -283,8 +284,11 @@ export class Xterm extends Component { this.sentry.consume(data); } catch (e) { console.log(`[ttyd] zmodem consume: `, e); - this.reconnect = 0.5; - socket.close(); + terminal.setOption('disableStdin', false); + if (this.detection) { + this.detection.deny(); + this.detection = null; + } } break; case Command.SET_WINDOW_TITLE: diff --git a/src/index.html b/src/index.html index 64b5cbf..62130ae 100644 --- a/src/index.html +++ b/src/index.html @@ -1 +1 @@ -ttyd - Terminal \ No newline at end of file +ttyd - Terminal \ No newline at end of file -- 2.43.4