Merge branch 'monitoring-polling-system' of github.com:internxt/drive…

…-desktop into fix/ignore-nodes-with-same-name

src/apps/renderer/localize/locales/en.json

@@ -1,7 +1,7 @@
 {
   "login": {
     "email": {
-      "section": "Email adress"
+      "section": "Email address"
     },
     "password": {
       "section": "Password",
@@ -11,7 +11,7 @@
       "show": "Show"
     },
     "action": {
-      "login": "Login",
+      "login": "Log in",
       "is-logging-in": "Logging you in..."
     },
     "create-account": "Create account",

src/apps/sync-engine/BindingManager.ts

@@ -37,6 +37,7 @@ export class BindingsManager {
 
   async start(version: string, providerId: string) {
     await this.stop();
+    await this.pollingStart();
 
     const controllers = buildControllers(this.container);
 
@@ -215,6 +216,7 @@ export class BindingsManager {
 
   async stop() {
     await this.container.virtualDrive.disconnectSyncRoot();
+    this.container.pollingMonitorStop.run();
   }
 
   async cleanUp() {
@@ -276,4 +278,16 @@ export class BindingsManager {
       Logger.error('[SYNC ENGINE] ', error);
     }
   }
+
+  private async pollingStart() {
+    return this.container.pollingMonitorStart.run(this.polling.bind(this));
+  }
+
+  private async polling(): Promise<void> {
+    Logger.info('[SYNC ENGINE] Monitoring polling...');
+    const fileInPendingPaths =
+      (await this.container.virtualDrive.getPlaceholderWithStatePending()) as Array<string>;
+    Logger.info('[SYNC ENGINE] fileInPendingPaths', fileInPendingPaths);
+    await this.container.fileSyncOrchestrator.run(fileInPendingPaths);
+  }
 }

src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts

@@ -89,6 +89,7 @@ export class AddController extends CallbackController {
     const posixDir =
       PlatformPathConverter.getFatherPathPosix(posixRelativePath);
     try {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
       await this.runFolderCreator(posixDir);
     } catch (error) {
       Logger.error('Error creating folder father creation:', error);

src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts

@@ -1,5 +1,7 @@
 import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+import { FileSyncOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileSyncOrchestrator';
 
 export interface BoundaryBridgeContainer {
   fileCreationOrchestrator: FileCreationOrchestrator;
+  fileSyncOrchestrator: FileSyncOrchestrator;
 }

src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts

@@ -2,6 +2,7 @@ import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
 import { ContentsContainer } from '../contents/ContentsContainer';
 import { FilesContainer } from '../files/FilesContainer';
 import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+import { FileSyncOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileSyncOrchestrator';
 
 export function buildBoundaryBridgeContainer(
   contentsContainer: ContentsContainer,
@@ -13,7 +14,13 @@ export function buildBoundaryBridgeContainer(
     filesContainer.sameFileWasMoved
   );
 
+  const fileSyncOrchestrator = new FileSyncOrchestrator(
+    contentsContainer.contentsUploader,
+    filesContainer.fileSyncronizer
+  );
+
   return {
     fileCreationOrchestrator,
+    fileSyncOrchestrator,
   };
 }

src/apps/sync-engine/dependency-injection/files/FilesContainer.ts

@@ -9,17 +9,23 @@ import { FilesPlaceholderCreator } from '../../../../context/virtual-drive/files
 import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
 import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
 import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
+import { FileSyncronizer } from '../../../../context/virtual-drive/files/application/FileSyncronizer';
+import { FilePlaceholderConverter } from '../../../../context/virtual-drive/files/application/FIlePlaceholderConverter';
+import { FileSyncStatusUpdater } from '../../../../context/virtual-drive/files/application/FileSyncStatusUpdater';
 
 export interface FilesContainer {
   fileFinderByContentsId: FileFinderByContentsId;
   fileDeleter: FileDeleter;
   filePathUpdater: FilePathUpdater;
   fileCreator: FileCreator;
+  fileSyncronizer: FileSyncronizer;
   filePlaceholderCreatorFromContentsId: FilePlaceholderCreatorFromContentsId;
   createFilePlaceholderOnDeletionFailed: CreateFilePlaceholderOnDeletionFailed;
   sameFileWasMoved: SameFileWasMoved;
   retrieveAllFiles: RetrieveAllFiles;
   repositoryPopulator: RepositoryPopulator;
   filesPlaceholderCreator: FilesPlaceholderCreator;
   filesPlaceholderUpdater: FilesPlaceholderUpdater;
+  filePlaceholderConverter: FilePlaceholderConverter;
+  fileSyncStatusUpdater: FileSyncStatusUpdater;
 }

src/apps/sync-engine/dependency-injection/files/builder.ts

@@ -24,6 +24,9 @@ import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/inf
 import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem';
 import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
 import { DependencyInjectionHttpClientsProvider } from '../common/clients';
+import { FileSyncronizer } from '../../../../context/virtual-drive/files/application/FileSyncronizer';
+import { FilePlaceholderConverter } from '../../../../context/virtual-drive/files/application/FIlePlaceholderConverter';
+import { FileSyncStatusUpdater } from '../../../../context/virtual-drive/files/application/FileSyncStatusUpdater';
 
 export async function buildFilesContainer(
   folderContainer: FoldersContainer,
@@ -115,11 +118,29 @@ export async function buildFilesContainer(
     eventHistory
   );
 
+  const filePlaceholderConverter = new FilePlaceholderConverter(
+    localFileSystem
+  );
+
+  const fileSyncStatusUpdater = new FileSyncStatusUpdater(localFileSystem);
+
+  const fileSyncronizer = new FileSyncronizer(
+    repository,
+    fileSyncStatusUpdater,
+    filePlaceholderConverter,
+    fileCreator,
+    sharedContainer.absolutePathToRelativeConverter,
+    folderContainer.folderCreator,
+    folderContainer.offline.folderCreator,
+    folderContainer.foldersFatherSyncStatusUpdater
+  );
+
   const container: FilesContainer = {
     fileFinderByContentsId,
     fileDeleter,
     filePathUpdater,
     fileCreator,
+    fileSyncronizer,
     filePlaceholderCreatorFromContentsId: filePlaceholderCreatorFromContentsId,
     createFilePlaceholderOnDeletionFailed:
       createFilePlaceholderOnDeletionFailed,
@@ -128,6 +149,8 @@ export async function buildFilesContainer(
     repositoryPopulator: repositoryPopulator,
     filesPlaceholderCreator,
     filesPlaceholderUpdater,
+    filePlaceholderConverter,
+    fileSyncStatusUpdater,
   };
 
   return { container, subscribers: [] };

src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts

@@ -12,6 +12,9 @@ import { RetrieveAllFolders } from '../../../../context/virtual-drive/folders/ap
 import { SynchronizeOfflineModifications } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModifications';
 import { SynchronizeOfflineModificationsOnFolderCreated } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
 import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/folders/application/UpdatePlaceholderFolder';
+import { FolderPlaceholderConverter } from '../../../../context/virtual-drive/folders/application/FolderPlaceholderConverter';
+import { FolderSyncStatusUpdater } from '../../../../context/virtual-drive/folders/application/FolderSyncStatusUpdater';
+import { FoldersFatherSyncStatusUpdater } from '../../../../context/virtual-drive/folders/application/FoldersFatherSyncStatusUpdater';
 
 export interface FoldersContainer {
   folderCreator: FolderCreator;
@@ -30,4 +33,7 @@ export interface FoldersContainer {
   folderRepositoryInitiator: FolderRepositoryInitiator;
   folderPlaceholderUpdater: FolderPlaceholderUpdater;
   foldersPlaceholderCreator: FoldersPlaceholderCreator;
+  folderPlaceholderConverter: FolderPlaceholderConverter;
+  folderSyncStatusUpdater: FolderSyncStatusUpdater;
+  foldersFatherSyncStatusUpdater: FoldersFatherSyncStatusUpdater;
 }

src/apps/sync-engine/dependency-injection/folders/builder.ts

@@ -27,6 +27,9 @@ import { DependencyInjectionEventRepository } from '../common/eventRepository';
 import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FoldersContainer } from './FoldersContainer';
+import { FolderPlaceholderConverter } from '../../../../context/virtual-drive/folders/application/FolderPlaceholderConverter';
+import { FolderSyncStatusUpdater } from '../../../../context/virtual-drive/folders/application/FolderSyncStatusUpdater';
+import { FoldersFatherSyncStatusUpdater } from '../../../../context/virtual-drive/folders/application/FoldersFatherSyncStatusUpdater';
 
 export async function buildFoldersContainer(
   shredContainer: SharedContainer
@@ -38,12 +41,21 @@ export async function buildFoldersContainer(
 
   const repository = new InMemoryFolderRepository();
 
-  const localFileSystem = new NodeWinLocalFileSystem(virtualDrive);
+  const localFileSystem = new NodeWinLocalFileSystem(
+    virtualDrive,
+    shredContainer.relativePathToAbsoluteConverter
+  );
   const remoteFileSystem = new HttpRemoteFileSystem(
     clients.drive,
     clients.newDrive
   );
 
+  const folderPlaceholderConverter = new FolderPlaceholderConverter(
+    localFileSystem
+  );
+
+  const folderSyncStatusUpdater = new FolderSyncStatusUpdater(localFileSystem);
+
   const folderFinder = new FolderFinder(repository);
 
   const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
@@ -61,7 +73,8 @@ export async function buildFoldersContainer(
     repository,
     remoteFileSystem,
     ipcRendererSyncEngine,
-    eventBus
+    eventBus,
+    folderPlaceholderConverter
   );
 
   const folderMover = new FolderMover(
@@ -124,6 +137,11 @@ export async function buildFoldersContainer(
     shredContainer.relativePathToAbsoluteConverter
   );
 
+  const foldersFatherSyncStatusUpdater = new FoldersFatherSyncStatusUpdater(
+    localFileSystem,
+    repository
+  );
+
   return {
     folderCreator,
     folderFinder,
@@ -141,5 +159,8 @@ export async function buildFoldersContainer(
     folderRepositoryInitiator,
     foldersPlaceholderCreator,
     folderPlaceholderUpdater,
+    folderPlaceholderConverter,
+    folderSyncStatusUpdater,
+    foldersFatherSyncStatusUpdater,
   };
 }

src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts

@@ -1,7 +1,11 @@
 import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { PollingMonitorStart } from '../../../../context/virtual-drive/shared/application/PollingMonitorStart';
+import { PollingMonitorStop } from '../../../../context/virtual-drive/shared/application/PollingMonitorStop';
 import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
 
 export interface SharedContainer {
   absolutePathToRelativeConverter: AbsolutePathToRelativeConverter;
   relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter;
+  pollingMonitorStart: PollingMonitorStart;
+  pollingMonitorStop: PollingMonitorStop;
 }

src/apps/sync-engine/dependency-injection/shared/builder.ts

@@ -1,9 +1,13 @@
 import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { PollingMonitorStart } from '../../../../context/virtual-drive/shared/application/PollingMonitorStart';
+import { PollingMonitorStop } from '../../../../context/virtual-drive/shared/application/PollingMonitorStop';
 import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
+import { PollingMonitor } from '../../../../context/virtual-drive/shared/domain/PollingMonitor';
 import { DependencyInjectionLocalRootFolderPath } from '../common/localRootFolderPath';
 import { SharedContainer } from './SharedContainer';
 
 export function buildSharedContainer(): SharedContainer {
+  const MONITORING_PULLING_INTERVAL = 60 * 60 * 1000;
   const localRootFolderPath = DependencyInjectionLocalRootFolderPath.get();
   const absolutePathToRelativeConverter = new AbsolutePathToRelativeConverter(
     localRootFolderPath
@@ -13,8 +17,14 @@ export function buildSharedContainer(): SharedContainer {
     localRootFolderPath
   );
 
+  const pollingMonitor = new PollingMonitor(MONITORING_PULLING_INTERVAL);
+  const pollingMonitorStart = new PollingMonitorStart(pollingMonitor);
+  const pollingMonitorStop = new PollingMonitorStop(pollingMonitor);
+
   return {
     absolutePathToRelativeConverter,
     relativePathToAbsoluteConverter,
+    pollingMonitorStart,
+    pollingMonitorStop,
   };
 }

src/context/virtual-drive/boundaryBridge/application/FileSyncOrchestrator.ts

@@ -0,0 +1,20 @@
+import { RetryContentsUploader } from '../../contents/application/RetryContentsUploader';
+import { FileSyncronizer } from '../../files/application/FileSyncronizer';
+
+export class FileSyncOrchestrator {
+  constructor(
+    private readonly contentsUploader: RetryContentsUploader,
+    private readonly fileSyncronizer: FileSyncronizer
+  ) {}
+
+  run(absolutePaths: string[]): Promise<void[]> {
+    return Promise.all(
+      absolutePaths.map(async (absolutePath) => {
+        await this.fileSyncronizer.run(
+          absolutePath,
+          this.contentsUploader.run.bind(this.contentsUploader)
+        );
+      })
+    );
+  }
+}

src/context/virtual-drive/files/application/FIlePlaceholderConverter.ts

@@ -0,0 +1,10 @@
+import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FilePlaceholderConverter {
+  constructor(private readonly localFileSystem: LocalFileSystem) {}
+
+  async run(file: File) {
+    await this.localFileSystem.convertToPlaceholder(file);
+  }
+}

src/context/virtual-drive/files/application/FileContentsUpdater.ts

@@ -0,0 +1,13 @@
+// import { FileRepository } from '../domain/FileRepository';
+// import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+
+// export class FileContentsUpdater {
+//   constructor(
+//     private readonly repository: FileRepository,
+//     private readonly remote: RemoteFileSystem
+//   ) {}
+
+//   async run(file: File): Promise<void> {
+//     await this.local.updateSyncStatus(file);
+//   }
+// }

src/context/virtual-drive/files/application/FileCreator.ts

@@ -22,15 +22,21 @@ export class FileCreator {
     private readonly ipc: SyncEngineIpc
   ) {}
 
-  async run(filePath: FilePath, contents: RemoteFileContents): Promise<File> {
+  async run(
+    filePath: FilePath,
+    contents: RemoteFileContents,
+    existingFileAlreadyEvaluated = false
+  ): Promise<File> {
     try {
-      const existingFile = this.repository.searchByPartial({
-        path: PlatformPathConverter.winToPosix(filePath.value),
-        status: FileStatuses.EXISTS,
-      });
+      if (!existingFileAlreadyEvaluated) {
+        const existingFile = this.repository.searchByPartial({
+          path: PlatformPathConverter.winToPosix(filePath.value),
+          status: FileStatuses.EXISTS,
+        });
 
-      if (existingFile) {
-        await this.fileDeleter.run(existingFile.contentsId);
+        if (existingFile) {
+          await this.fileDeleter.run(existingFile.contentsId);
+        }
       }
 
       const size = new FileSize(contents.size);

src/context/virtual-drive/files/application/FileSyncStatusUpdater.ts

@@ -0,0 +1,10 @@
+import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FileSyncStatusUpdater {
+  constructor(private readonly localFileSystem: LocalFileSystem) {}
+
+  async run(file: File) {
+    await this.localFileSystem.updateSyncStatus(file);
+  }
+}