Refactor watcher 3

src/apps/sync-engine/tests/create-placeholder.infra.test.ts

@@ -10,11 +10,9 @@ import { initWatcher } from '@/node-win/watcher/watcher';
 import { VirtualDrive } from '@/node-win/virtual-drive';
 import { join } from '@/context/local/localFile/infrastructure/AbsolutePath';
 import { Sync } from '@/backend/features/sync';
-import * as processEvent from '@/node-win/watcher/process-event';
 import { SqliteModule } from '@/infra/sqlite/sqlite.module';
 
 describe('create-placeholder', () => {
-  const processEventSpy = partialSpyOn(processEvent, 'processEvent', false);
   const createFileMock = partialSpyOn(Sync.Actions, 'createFile');
   const getByNameMock = partialSpyOn(SqliteModule.FileModule, 'getByName');
 
@@ -43,15 +41,17 @@ describe('create-placeholder', () => {
 
     // When
     await writeFile(file, 'content');
-    await sleep(3000);
-    return;
+    await sleep(2200);
 
     // Then
     calls(loggerMock.error).toHaveLength(0);
-    calls(loggerMock.debug).toStrictEqual([
+    calls(loggerMock.debug).toMatchObject([
       { tag: 'SYNC-ENGINE', msg: 'Create sync root folder', code: 'NON_EXISTS' },
       { msg: 'Register sync root', providerId, rootPath },
       { msg: 'Setup watcher' },
+      { msg: 'Watcher event', event: { action: 'create', size: 0 } },
+      { msg: 'Watcher event', event: { action: 'update', size: 7 } },
+      { msg: 'Watcher event', event: { action: 'update', size: 7 } },
       {
         msg: 'On change event',
         path: file,
@@ -63,11 +63,5 @@ describe('create-placeholder', () => {
         isModified: true,
       },
     ]);
-
-    calls(processEventSpy).toMatchObject([
-      { event: 'create', path: file },
-      { event: 'update', path: file },
-      { event: 'update', path: file },
-    ]);
   });
 });

src/backend/features/local-sync/watcher/events/unlink/on-unlink.test.ts

@@ -1,4 +1,4 @@
-import { call, calls, partialSpyOn } from '@/tests/vitest/utils.helper.test';
+import { call, calls, partialSpyOn, TestProps } from '@/tests/vitest/utils.helper.test';
 import { abs } from '@/context/local/localFile/infrastructure/AbsolutePath';
 import { FolderUuid } from '@/apps/main/database/entities/DriveFolder';
 import { loggerMock } from '@/tests/vitest/mocks.helper.test';
@@ -7,7 +7,6 @@ import { NodeWin } from '@/infra/node-win/node-win.module';
 import { SqliteModule } from '@/infra/sqlite/sqlite.module';
 import { onUnlink } from './on-unlink';
 import * as ipcMain from '@/infra/drive-server-wip/out/ipc-main';
-import { DeepPartial } from 'ts-essentials';
 
 describe('on-unlink', () => {
   const getFolderInfoMock = partialSpyOn(NodeWin, 'getFolderInfo');
@@ -16,7 +15,7 @@ describe('on-unlink', () => {
   const deleteFileByUuidMock = partialSpyOn(ipcMain, 'deleteFileByUuid');
   const deleteFolderByUuidMock = partialSpyOn(ipcMain, 'deleteFolderByUuid');
 
-  let props: DeepPartial<Parameters<typeof onUnlink>[0]>;
+  let props: TestProps<typeof onUnlink>;
 
   beforeEach(() => {
     getFolderInfoMock.mockResolvedValue({ data: { uuid: 'parentUuid' as FolderUuid } });
@@ -33,9 +32,9 @@ describe('on-unlink', () => {
     // Given
     getFolderInfoMock.mockResolvedValue({ error: new Error() });
     // When
-    await onUnlink(props as any);
+    const promise = onUnlink(props as any);
     // Then
-    expect(loggerMock.error).toBeCalledTimes(1);
+    await expect(promise).rejects.toThrow();
   });
 
   it('should skip if file does not exist', async () => {

src/backend/features/local-sync/watcher/events/unlink/on-unlink.ts

@@ -12,32 +12,28 @@ type Props = {
 };
 
 export async function onUnlink({ ctx, path, type }: Props) {
-  try {
-    // Get parent placeholderId from the file explorer.
-    const parentPath = dirname(path);
-    const { data: parentInfo, error } = await NodeWin.getFolderInfo({ ctx, path: parentPath });
-    if (error) throw error;
+  // Get parent placeholderId from the file explorer.
+  const parentPath = dirname(path);
+  const { data: parentInfo, error } = await NodeWin.getFolderInfo({ ctx, path: parentPath });
+  if (error) throw error;
 
-    const parentUuid = parentInfo.uuid;
-    const name = basename(path);
+  const parentUuid = parentInfo.uuid;
+  const name = basename(path);
 
-    if (type === 'folder') {
-      // Since the item is deleted we cannot obtain the placeholderId from the file explorer
-      // and we need to obtain it from the sqlite.
-      const { data: folder } = await SqliteModule.FolderModule.getByName({ parentUuid, plainName: name });
-      if (!folder) return;
+  if (type === 'folder') {
+    // Since the item is deleted we cannot obtain the placeholderId from the file explorer
+    // and we need to obtain it from the sqlite.
+    const { data: folder } = await SqliteModule.FolderModule.getByName({ parentUuid, plainName: name });
+    if (!folder) return;
 
-      ctx.logger.debug({ msg: 'Folder unlinked', path });
-      await deleteFolderByUuid({ ctx, path, uuid: folder.uuid });
-      return;
-    }
+    ctx.logger.debug({ msg: 'Folder unlinked', path });
+    await deleteFolderByUuid({ ctx, path, uuid: folder.uuid });
+    return;
+  }
 
-    const { data: file } = await SqliteModule.FileModule.getByName({ parentUuid, nameWithExtension: name });
-    if (!file) return;
+  const { data: file } = await SqliteModule.FileModule.getByName({ parentUuid, nameWithExtension: name });
+  if (!file) return;
 
-    ctx.logger.debug({ msg: 'File unlinked', path });
-    await deleteFileByUuid({ ctx, path, uuid: file.uuid });
-  } catch (error) {
-    ctx.logger.error({ msg: 'Error on unlink event', path, error });
-  }
+  ctx.logger.debug({ msg: 'File unlinked', path });
+  await deleteFileByUuid({ ctx, path, uuid: file.uuid });
 }

src/backend/features/remote-sync/file-explorer/check-if-modified.infra.test.ts

@@ -37,7 +37,7 @@ describe('check-if-modified', () => {
         uuid: 'uuid' as FileUuid,
         absolutePath: path,
         updatedAt: '2000-01-02',
-        size: 1000,
+        size: 14,
       },
       local: {
         path,
@@ -48,28 +48,33 @@ describe('check-if-modified', () => {
     // When
     await sleep(100);
     await checkIfModified(props);
-    await sleep(100);
-    return;
+    await sleep(2200);
 
     // Then
     calls(loggerMock.error).toHaveLength(0);
-    calls(loggerMock.debug).toStrictEqual([
+    calls(loggerMock.debug).toMatchObject([
       { tag: 'SYNC-ENGINE', msg: 'Create sync root folder', code: 'NON_EXISTS' },
       { msg: 'Register sync root', providerId, rootPath },
       { msg: 'Setup watcher' },
+      { msg: 'Watcher event', event: { action: 'create', size: 0 } },
+      { msg: 'Watcher event', event: { action: 'update', size: 7 } },
+      { msg: 'Watcher event', event: { action: 'update', size: 7 } },
       {
         msg: 'Sync remote changes to local',
         path,
-        remoteSize: 1000,
+        remoteSize: 14,
         localSize: 7,
         remoteDate: new Date('2000-01-02T00:00:00.000Z'),
         localDate: new Date('2000-01-01T00:00:00.000Z'),
       },
+      { msg: 'Watcher event', event: { action: 'update', size: 14 } },
+      { msg: 'Watcher event', event: { action: 'update', size: 14 } },
+      { msg: 'Watcher event', event: { action: 'update', size: 14 } },
     ]);
 
     const stats = await stat(path);
     const fileInfo = await Addon.getPlaceholderState({ path });
-    expect(stats.size).toBe(1000);
+    expect(stats.size).toBe(14);
     expect(fileInfo.onDiskSize).toBe(0);
   });
 });

src/node-win/watcher/events/on-add-dir.service.ts

@@ -10,24 +10,17 @@ type TProps = {
 };
 
 export async function onAddDir({ ctx, path }: TProps) {
-  try {
-    const { data: folderInfo } = await NodeWin.getFolderInfo({ ctx, path });
+  const { data: folderInfo } = await NodeWin.getFolderInfo({ ctx, path });
 
-    if (folderInfo) {
-      await moveFolder({ ctx, path, uuid: folderInfo.uuid });
-      return;
-    }
+  if (folderInfo) {
+    await moveFolder({ ctx, path, uuid: folderInfo.uuid });
+    return;
+  }
 
-    const { data: parentInfo } = await NodeWin.getFolderInfo({ ctx, path: dirname(path) });
+  const { data: parentInfo } = await NodeWin.getFolderInfo({ ctx, path: dirname(path) });
 
-    if (parentInfo) {
-      await Drive.Actions.createFolder({
-        ctx,
-        path,
-        parentUuid: parentInfo.uuid,
-      });
-    }
-  } catch (error) {
-    ctx.logger.error({ msg: 'Error on addDir event', path, error });
+  if (parentInfo) {
+    const parentUuid = parentInfo.uuid;
+    await Drive.Actions.createFolder({ ctx, path, parentUuid });
   }
 }