Merge pull request #504 from internxt/feat/new-traverse

Change: Progressive file retrieval implemented

package.json

@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.10",
+  "version": "2.1.0",
   "author": "Internxt <[email protected]>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",
@@ -95,8 +95,7 @@
     "win": {
       "target": [
         "nsis"
-      ],
-      "certificateSubjectName": "Internxt Universal Technologies SL"
+      ]
     },
     "linux": {
       "target": [

release/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.10",
+  "version": "2.1.0",
   "description": "Internxt Drive client UI",
   "main": "./dist/main/main.js",
   "author": "Internxt <[email protected]>",

src/apps/main/analytics/drive-handlers.ts

@@ -35,6 +35,16 @@ ipcMainDrive.on('FILE_DOWNLOADED', (_, payload) => {
   });
 });
 
+ipcMainDrive.on('FILE_DOWNLOAD_CANCEL', (_, payload) => {
+  const { name, extension, size } = payload;
+
+  trackEvent('Download Aborted', {
+    file_name: name,
+    file_extension: extension,
+    file_size: size,
+  });
+});
+
 ipcMainDrive.on('FILE_CLONNED', (_, payload) => {
   const { name, extension, size, processInfo } = payload;
 

src/apps/main/auth/refresh-token.ts

@@ -12,8 +12,9 @@ const authorizedClient = getClient();
 
 async function obtainTokens() {
   try {
+    Logger.debug('[TOKEN] Obtaining new tokens');
     const res = await authorizedClient.get(
-      `${process.env.API_URL}/api/user/refresh`
+      `${process.env.API_URL}/user/refresh`
     );
 
     return res.data;

src/apps/main/background-processes/sync-engine.ts

@@ -31,7 +31,7 @@ async function healthCheck() {
       resolve();
     });
 
-    const millisecondsToWait = 8_000;
+    const millisecondsToWait = 5_000;
 
     setTimeout(() => {
       reject(
@@ -55,7 +55,7 @@ function scheduleHeathCheck() {
   const relaunchOnFail = () =>
     healthCheck()
       .then(() => {
-        // Logger.debug('Health check succeeded');
+        Logger.debug('Health check succeeded');
       })
       .catch(() => {
         const warning = 'Health check failed, relaunching the worker';
@@ -71,7 +71,7 @@ function scheduleHeathCheck() {
         spawnSyncEngineWorker();
       });
 
-  healthCheckSchedule = nodeSchedule.scheduleJob('*/30 * * * * *', async () => {
+  healthCheckSchedule = nodeSchedule.scheduleJob('*/20 * * * * *', async () => {
     const workerIsPending = checkSyncEngineInProcess(15_000);
     Logger.debug(
       'Health check',
@@ -166,7 +166,7 @@ export async function stopSyncEngineWatcher() {
   });
 
   try {
-    worker?.webContents.send('STOP_SYNC_ENGINE_PROCESS');
+    worker?.webContents?.send('STOP_SYNC_ENGINE_PROCESS');
 
     await stopPromise;
   } catch (err) {
@@ -219,7 +219,7 @@ async function stopAndClearSyncEngineWatcher() {
   });
 
   try {
-    worker?.webContents.send('STOP_AND_CLEAR_SYNC_ENGINE_PROCESS');
+    worker?.webContents?.send('STOP_AND_CLEAR_SYNC_ENGINE_PROCESS');
 
     await response;
   } catch (err) {
@@ -235,8 +235,13 @@ async function stopAndClearSyncEngineWatcher() {
 
 export function updateSyncEngine() {
   try {
-    if (worker?.webContents && !worker?.isDestroyed()) {
-      worker?.webContents.send('UPDATE_SYNC_ENGINE_PROCESS');
+    if (
+      worker &&
+      !worker.isDestroyed() &&
+      worker.webContents &&
+      !worker.webContents.isDestroyed()
+    ) {
+      worker.webContents?.send('UPDATE_SYNC_ENGINE_PROCESS');
     }
   } catch (err) {
     // TODO: handle error
@@ -247,17 +252,27 @@ export function updateSyncEngine() {
 
 export function fallbackSyncEngine() {
   try {
-    if (worker?.webContents && !worker?.isDestroyed()) {
-      worker?.webContents.send('FALLBACK_SYNC_ENGINE_PROCESS');
+    if (
+      worker &&
+      !worker.isDestroyed() &&
+      worker.webContents &&
+      !worker.webContents.isDestroyed()
+    ) {
+      worker?.webContents?.send('FALLBACK_SYNC_ENGINE_PROCESS');
     }
   } catch (err) {
     Logger.error(err);
   }
 }
 export async function sendUpdateFilesInSyncPending(): Promise<string[]> {
   try {
-    if (worker?.webContents && !worker?.isDestroyed()) {
-      worker?.webContents.send('UPDATE_UNSYNC_FILE_IN_SYNC_ENGINE_PROCESS');
+    if (
+      worker &&
+      !worker.isDestroyed() &&
+      worker.webContents &&
+      !worker.webContents.isDestroyed()
+    ) {
+      worker?.webContents?.send('UPDATE_UNSYNC_FILE_IN_SYNC_ENGINE_PROCESS');
     }
     return [];
   } catch (err) {

src/apps/main/device/service.ts

@@ -35,7 +35,7 @@ export const addUnknownDeviceIssue = (error: Error) => {
 };
 
 function createDevice(deviceName: string) {
-  return fetch(`${process.env.API_URL}/api/backup/deviceAsFolder`, {
+  return fetch(`${process.env.API_URL}/backup/deviceAsFolder`, {
     method: 'POST',
     headers: getHeaders(true),
     body: JSON.stringify({ deviceName }),
@@ -76,7 +76,7 @@ export async function getOrCreateDevice() {
 
   if (deviceIsDefined) {
     const res = await fetch(
-      `${process.env.API_URL}/api/backup/deviceAsFolder/${savedDeviceId}`,
+      `${process.env.API_URL}/backup/deviceAsFolder/${savedDeviceId}`,
       {
         method: 'GET',
         headers: getHeaders(),
@@ -110,7 +110,7 @@ export async function renameDevice(deviceName: string): Promise<Device> {
   const deviceId = getDeviceId();
 
   const res = await fetch(
-    `${process.env.API_URL}/api/backup/deviceAsFolder/${deviceId}`,
+    `${process.env.API_URL}/backup/deviceAsFolder/${deviceId}`,
     {
       method: 'PATCH',
       headers: getHeaders(true),
@@ -221,7 +221,7 @@ export async function addBackup(): Promise<void> {
 
 async function fetchFolder(folderId: number) {
   const res = await fetch(
-    `${process.env.API_URL}/api/storage/v2/folder/${folderId}`,
+    `${process.env.API_URL}/storage/v2/folder/${folderId}`,
     {
       method: 'GET',
       headers: getHeaders(true),
@@ -236,7 +236,7 @@ async function fetchFolder(folderId: number) {
 
 export async function deleteBackup(backup: Backup): Promise<void> {
   const res = await fetch(
-    `${process.env.API_URL}/api/storage/folder/${backup.id}`,
+    `${process.env.API_URL}/storage/folder/${backup.id}`,
     {
       method: 'DELETE',
       headers: getHeaders(true),
@@ -286,7 +286,7 @@ export async function changeBackupPath(currentPath: string): Promise<boolean> {
   }
 
   const res = await fetch(
-    `${process.env.API_URL}/api/storage/folder/${existingBackup.folderId}/meta`,
+    `${process.env.API_URL}/storage/folder/${existingBackup.folderId}/meta`,
     {
       method: 'POST',
       headers: getHeaders(true),

src/apps/main/fordwardToWindows.ts

@@ -23,6 +23,14 @@ ipcMainDrive.on('FILE_DOWNLOADING', (_, payload) => {
   });
 });
 
+ipcMainDrive.on('SYNCING', () => {
+  setIsProcessing(true);
+});
+
+ipcMainDrive.on('SYNCED', () => {
+  setIsProcessing(false);
+});
+
 ipcMainDrive.on('FILE_PREPARING', (_, payload) => {
   const { nameWithExtension, processInfo } = payload;
   setIsProcessing(true);
@@ -34,12 +42,21 @@ ipcMainDrive.on('FILE_PREPARING', (_, payload) => {
 });
 
 ipcMainDrive.on('FILE_DOWNLOADED', (_, payload) => {
+  setIsProcessing(false);
   const { nameWithExtension } = payload;
   broadcastToWindows('sync-info-update', {
     action: 'DOWNLOADED',
     name: nameWithExtension,
   });
 });
+ipcMainDrive.on('FILE_DOWNLOAD_CANCEL', (_, payload) => {
+  setIsProcessing(false);
+  const { nameWithExtension } = payload;
+  broadcastToWindows('sync-info-update', {
+    action: 'DOWNLOAD_CANCEL',
+    name: nameWithExtension,
+  });
+});
 
 ipcMainDrive.on('FILE_MOVED', (_, payload) => {
   const { nameWithExtension } = payload;
@@ -97,6 +114,15 @@ ipcMainDrive.on('FILE_UPLOADING', (_, payload) => {
   });
 });
 
+ipcMainDrive.on('FILE_UPLOADED', (_, payload) => {
+  const { nameWithExtension } = payload;
+  setIsProcessing(false);
+  broadcastToWindows('sync-info-update', {
+    action: 'UPLOADED',
+    name: nameWithExtension,
+  });
+});
+
 ipcMainDrive.on('FILE_CREATED', (_, payload) => {
   const { nameWithExtension } = payload;
   setIsProcessing(false);