From 1eecfb93b5a3bd18288f155e347aa65edc130c51 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 14 Oct 2024 10:16:53 +0800 Subject: [PATCH] perf: fix web rz failed --- ui/src/global.d.ts | 2 +- ui/src/hooks/useZsentry.ts | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ui/src/global.d.ts b/ui/src/global.d.ts index 836fad82..f366674c 100644 --- a/ui/src/global.d.ts +++ b/ui/src/global.d.ts @@ -19,7 +19,7 @@ declare module 'nora-zmodemjs/src/zmodem_browser' { export class Browser { static send_files( session: ZmodemSession, - files: File, + files: File[], opts?: { on_offer_response?: (obj: any, xfer: ZmodemTransfer) => void; on_file_complete?: (obj: any) => void; diff --git a/ui/src/hooks/useZsentry.ts b/ui/src/hooks/useZsentry.ts index deee600f..d64b17bb 100644 --- a/ui/src/hooks/useZsentry.ts +++ b/ui/src/hooks/useZsentry.ts @@ -69,12 +69,9 @@ export const useSentry = (lastSendTime?: Ref, t?: any): IUseSentry => { } if (!zmodeSession.value) return; - - ZmodemBrowser.Browser.send_files(zmodeSession.value, selectFile.file as File, { + const files = fileList.value.map(item => item.file as File); + ZmodemBrowser.Browser.send_files(zmodeSession.value, files, { on_offer_response: (_obj: any, xfer: ZmodemTransfer) => { - console.log('_obj', _obj); - console.log('xfer', xfer); - if (xfer) { xfer.on('send_progress', (percent: number) => { updateSendProgress(xfer, percent); @@ -87,7 +84,7 @@ export const useSentry = (lastSendTime?: Ref, t?: any): IUseSentry => { } }) .then(() => { - console.log('then'); + zmodeSession.value?.close(); }) .catch((e: Error) => { console.log(e); @@ -168,7 +165,6 @@ export const useSentry = (lastSendTime?: Ref, t?: any): IUseSentry => { zmodeSession.value = zsession; zsession.on('session_end', () => { - console.log('end'); zmodeSession.value = null; fileList.value = []; terminal.write('\r\n'); @@ -242,8 +238,6 @@ export const useSentry = (lastSendTime?: Ref, t?: any): IUseSentry => { return debug('WebSocket Closed'); } - console.log(wsIsActivated(ws)); - try { lastSendTime && (lastSendTime.value = new Date()); ws.send(new Uint8Array(octets)); @@ -261,7 +255,6 @@ export const useSentry = (lastSendTime?: Ref, t?: any): IUseSentry => { // @ts-ignore if (!zsession._accepted_offer) { - console.log('2', zsession); handleSendSession(zsession, terminal); } else { handleReceiveSession(zsession, terminal);