fix download

src/apps/main/device/service.ts

@@ -543,7 +543,14 @@ export async function downloadBackup(device: Device): Promise<void> {
 
   const abortListener = (_: IpcMainEvent, abortDeviceUuid: string) => {
     if (abortDeviceUuid === device.uuid) {
-      abortController.abort();
+      try {
+        Logger.info(`[BACKUPS] Aborting download for device ${device.name}`);
+        if (abortController && !abortController.signal.aborted) {
+          abortController.abort();
+        }
+      } catch (error) {
+        Logger.error(`[BACKUPS] Error while aborting download: ${error}`);
+      }
     }
   };
 
@@ -555,7 +562,6 @@ export async function downloadBackup(device: Device): Promise<void> {
     await downloadDeviceBackupZip(device, zipFilePath, {
       updateProgress: (progress: number) => {
         if (abortController?.signal.aborted) return;
-        Logger.info(`[BACKUPS] Download progress: ${Math.round(progress)}`);
         broadcastToWindows('backup-download-progress', {
           id: device.uuid,
           progress: Math.round(progress),

src/apps/main/main.ts

@@ -102,18 +102,17 @@ app
 
     eventBus.emit('APP_IS_READY');
     const isLoggedIn = getIsLoggedIn();
+    setUpBackups();
 
     if (!isLoggedIn) {
       await createAuthWindow();
       setTrayStatus('IDLE');
     }
+
     checkForUpdates();
   })
   .catch(Logger.error);
 
-eventBus.on('WIDGET_IS_READY', () => {
-  setUpBackups();
-});
 eventBus.on('USER_LOGGED_IN', async () => {
   try {
     if (!AppDataSource.isInitialized) {

src/apps/main/network/download.ts

@@ -1,4 +1,3 @@
-import Logger from 'electron-log';
 import { FileVersionOneError } from '@internxt/sdk/dist/network/download';
 import { FlatFolderZip } from './zip.service';
 import { items } from '@internxt/lib';
@@ -47,8 +46,6 @@ export async function downloadFolderAsZip(
   const writeStream = fs.createWriteStream(path + 'Backup_' + now + '.zip');
   const destination = convertToWritableStream(writeStream);
 
-  Logger.info('Downloading folder as zip');
-
   const { abortController, updateProgress } = opts;
   const { bridgeUser, bridgePass, encryptionKey } = environment;
   const { tree, folderDecryptedNames, fileDecryptedNames, size } =
@@ -59,22 +56,15 @@ export async function downloadFolderAsZip(
     { path: '', data: tree },
   ];
 
-  Logger.info('Creating zip file');
-
   const zip = new FlatFolderZip(destination, {
     abortController: opts.abortController,
     progress: (loadedBytes) => {
-      Logger.info('Download progress', loadedBytes, size);
       if (updateProgress) {
         updateProgress((loadedBytes / size) * 100);
       }
     },
   });
 
-  Logger.info('Adding files to zip');
-
-  Logger.info(!abortController?.signal.aborted);
-
   while (pendingFolders.length > 0 && !abortController?.signal.aborted) {
     const currentFolder = pendingFolders.shift() as {
       path: string;
@@ -126,7 +116,6 @@ export async function downloadFolderAsZip(
     throw new Error('Download cancelled');
   }
 
-  Logger.info('Closing zip file');
   return zip.close();
 }
 

src/apps/main/network/zip.service.ts

@@ -1,3 +1,4 @@
+import Logger from 'electron-log';
 import { AsyncZipDeflate, Zip } from 'fflate';
 import { ReadableStream, WritableStream } from 'node:stream/web';
 
@@ -26,18 +27,18 @@ export class FlatFolderZip {
   private passThrough: ReadableStream<Uint8Array>;
   private abortController?: AbortController;
 
-  constructor(destination: WritableStream<Uint8Array>, opts: FlatFolderZipOpts) {
+  constructor(
+    destination: WritableStream<Uint8Array>,
+    opts: FlatFolderZipOpts
+  ) {
     this.zip = createFolderWithFilesWritable(opts.progress);
     this.abortController = opts.abortController;
 
     this.passThrough = this.zip.stream;
 
-    this.finished = this.passThrough.pipeTo(
-      destination,
-      {
-        signal: opts.abortController?.signal,
-      }
-    );
+    this.finished = this.passThrough.pipeTo(destination, {
+      signal: opts.abortController?.signal,
+    });
   }
 
   addFile(name: string, source: ReadableStream<Uint8Array>): void {
@@ -78,15 +79,19 @@ export function createFolderWithFilesWritable(
     },
     cancel() {
       if (passthroughController) {
-        passthroughController.close();
+        try {
+          passthroughController.close();
+        } catch (err) {
+          /* noop */
+        }
         passthroughController = null;
       }
     },
   });
 
   zip.ondata = (err, data, final) => {
     if (err) {
-      console.error('Error in ZIP data event:', err);
+      Logger.error('Error while zipping', err);
       return;
     }
 

src/apps/renderer/hooks/backups/useBackupDownloadProgress.tsx

@@ -19,12 +19,10 @@ export function useBackupDownloadProgress(): BackupDownloadContextProps {
 
   useEffect(() => {
     const removeListener = window.electron.onBackupDownloadProgress(
-      ({ id, progress }: { id: string; progress: number }) => {
-        window.electron.logger.info(`Llego: ${progress}`);
+      ({ id, progress }: { id: string; progress: number }) =>
         setBackupDownloadProgress((prevState) => {
           return { ...prevState, [id]: Math.round(progress) };
-        });
-      }
+        })
     );
     return removeListener;
   }, []);

src/context/virtual-drive/contents/application/ContentsDownloader.ts

@@ -53,8 +53,6 @@ export class ContentsDownloader {
     });
 
     downloader.on('progress', async () => {
-      Logger.debug('[Server] Download progress', filePath);
-
       const stats = fs.statSync(filePath);
       const fileSizeInBytes = stats.size;
       const progress = fileSizeInBytes / file.size;