Changes:

- Updated the drive URL.
- Improved the synchronization UI.
- Worked on the functionality to move files and folders.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.1.0-test",
+  "version": "2.1.0-v4",
   "author": "Internxt <[email protected]>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",

release/app/package.json

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

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

@@ -14,7 +14,7 @@ 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

@@ -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

@@ -106,6 +106,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);

src/apps/main/remote-sync/RemoteSyncManager.ts

@@ -185,7 +185,8 @@ export class RemoteSyncManager {
     if (value) {
       this.changeStatus('SYNCING');
     } else {
-      this.checkRemoteSyncStatus();
+      // this.checkRemoteSyncStatus();
+      this.changeStatus('SYNCED');
     }
     this._isProcessRunning = value;
   }
@@ -251,7 +252,7 @@ export class RemoteSyncManager {
     }
   }
 
-   async getFileCheckpoint(): Promise<Nullable<Date>> {
+  async getFileCheckpoint(): Promise<Nullable<Date>> {
     const { success, result } = await this.db.files.getLastUpdated();
 
     if (!success) return undefined;
@@ -307,8 +308,6 @@ export class RemoteSyncManager {
       }
 
       Logger.info('Remote files sync finished');
-      this.filesSyncStatus = 'SYNCED';
-      this.checkRemoteSyncStatus();
       return allResults;
     } catch (error) {
       Logger.error('Remote files sync failed with error: ', error);
@@ -379,8 +378,7 @@ export class RemoteSyncManager {
       }
 
       Logger.info('Remote files sync finished');
-      this.filesSyncStatus = 'SYNCED';
-      this.checkRemoteSyncStatus();
+
       return allResults;
     } catch (error) {
       Logger.error('Remote files sync failed with error: ', error);
@@ -457,9 +455,6 @@ export class RemoteSyncManager {
           Logger.info('Retrieving more folders for sync');
         }
       }
-
-      this.foldersSyncStatus = 'SYNCED';
-      this.checkRemoteSyncStatus();
       return allResults;
     } catch (error) {
       Logger.error('Remote folders sync failed with error: ', error);
@@ -527,9 +522,6 @@ export class RemoteSyncManager {
           Logger.info('Retrieving more folders for sync');
         }
       }
-
-      this.foldersSyncStatus = 'SYNCED';
-      this.checkRemoteSyncStatus();
       return allResults;
     } catch (error) {
       Logger.error('Remote folders sync failed with error: ', error);

src/apps/main/remote-sync/handlers.ts

@@ -16,6 +16,7 @@ import {
 } from '../background-processes/sync-engine';
 import { debounce } from 'lodash';
 import configStore from '../config';
+import { setTrayStatus } from '../tray/tray';
 
 const SYNC_DEBOUNCE_DELAY = 3_000;
 
@@ -40,6 +41,13 @@ export function setIsProcessing(isProcessing: boolean) {
   remoteSyncManager.isProcessRunning = isProcessing;
 }
 
+export function checkSyncEngineInProcess(milliSeconds: number) {
+  const syncingStatus: RemoteSyncStatus = 'SYNCING';
+  const isSyncing = remoteSyncManager.getSyncStatus() === syncingStatus;
+  const recentlySyncing = remoteSyncManager.recentlyWasSyncing(milliSeconds);
+  return isSyncing || recentlySyncing; // syncing or recently was syncing
+}
+
 export async function getUpdatedRemoteItems() {
   try {
     const [allDriveFiles, allDriveFolders] = await Promise.all([
@@ -106,6 +114,11 @@ export async function startRemoteSync(folderId?: number): Promise<void> {
 
 ipcMain.handle('START_REMOTE_SYNC', async () => {
   Logger.info('Received start remote sync event');
+  const isSyncing = await checkSyncEngineInProcess(5_000);
+  if (isSyncing) {
+    Logger.info('Remote sync is already running');
+    return;
+  }
   setIsProcessing(true);
   await startRemoteSync();
   setIsProcessing(false);
@@ -120,6 +133,15 @@ remoteSyncManager.onStatusChange((newStatus) => {
   broadcastToWindows('remote-sync-status-change', newStatus);
 });
 
+remoteSyncManager.onStatusChange((newStatus) => {
+  if (newStatus === 'SYNCING') {
+    setTrayStatus('SYNCING');
+  }
+  if (newStatus === 'SYNCED') {
+    setTrayStatus('IDLE');
+  }
+});
+
 ipcMain.handle('get-remote-sync-status', () =>
   remoteSyncManager.getSyncStatus()
 );
@@ -129,6 +151,11 @@ export async function updateRemoteSync(folderId?: number): Promise<void> {
   // that we received the notification, but if we check
   // for new data we don't receive it
   Logger.info('Updating remote sync');
+  const isSyncing = await checkSyncEngineInProcess(5_000);
+  if (isSyncing) {
+    Logger.info('Remote sync is already running');
+    return;
+  }
   await sleep(5_000);
   await startRemoteSync(folderId);
   updateSyncEngine();
@@ -139,13 +166,6 @@ export async function fallbackRemoteSync(): Promise<void> {
   fallbackSyncEngine();
 }
 
-export function checkSyncEngineInProcess(milliSeconds: number) {
-  const syncingStatus: RemoteSyncStatus = 'SYNCING';
-  const isSyncing = remoteSyncManager.getSyncStatus() === syncingStatus;
-  const recentlySyncing = remoteSyncManager.recentlyWasSyncing(milliSeconds);
-  return isSyncing || recentlySyncing; // syncing or recently was syncing
-}
-
 ipcMain.handle('SYNC_MANUALLY', async () => {
   Logger.info('[Manual Sync] Received manual sync event');
   const isSyncing = await checkSyncEngineInProcess(5_000);
@@ -184,19 +204,25 @@ eventBus.on('RECEIVED_REMOTE_CHANGES', async () => {
   // Wait before checking for updates, could be possible
   // that we received the notification, but if we check
   // for new data we don't receive it
+  Logger.info('Received remote changes event');
+  const isSyncing = await checkSyncEngineInProcess(5_000);
+  if (isSyncing) {
+    Logger.info('Remote sync is already running');
+    return;
+  }
   debouncedSynchronization();
 });
 
 eventBus.on('USER_LOGGED_IN', async () => {
   Logger.info('Received user logged in event');
   try {
-    setIsProcessing(true);
+    remoteSyncManager.isProcessRunning = true;
     const userData = configStore.get('userData');
     const lastFilesSyncAt = await remoteSyncManager.getFileCheckpoint();
     Logger.info('Last files sync at', lastFilesSyncAt);
     const folderId = lastFilesSyncAt ? undefined : userData?.root_folder_id;
     await startRemoteSync(folderId);
-    setIsProcessing(false);
+    remoteSyncManager.isProcessRunning = false;
   } catch (error) {
     Logger.error('Error starting remote sync manager', error);
     if (error instanceof Error) reportError(error);

src/apps/main/usage/serviceBuilder.ts

@@ -7,7 +7,7 @@ import { UserUsageService } from './service';
 import { onUserUnauthorized } from '../auth/handlers';
 
 export function buildUsageService() {
-  const driveUrl = `${process.env.API_URL}/api`;
+  const driveUrl = `${process.env.API_URL}`;
   const photosUrl = process.env.PHOTOS_URL;
 
   const { name: clientName, version: clientVersion } = appInfo;

src/apps/renderer/pages/Login/service.ts

@@ -43,7 +43,7 @@ export async function accessRequest(
 
   let accessRes;
   try {
-    accessRes = await fetch(`${process.env.API_URL}/api/access`, {
+    accessRes = await fetch(`${process.env.API_URL}/access`, {
       method: 'POST',
       body: JSON.stringify({
         email: email.toLowerCase(),
@@ -84,7 +84,7 @@ export async function loginRequest(email: string): Promise<{
   let loginRes;
 
   try {
-    loginRes = await fetch(`${process.env.API_URL}/api/login`, {
+    loginRes = await fetch(`${process.env.API_URL}/login`, {
       method: 'POST',
       body: JSON.stringify({ email }),
       headers: {