Remove in memory event repository (#853)

Author: dajimenezriv

src/apps/main/device/service.ts

@@ -544,14 +544,12 @@ async function downloadDeviceBackupZip({
 
   const folders = await fetchFolders({ folderUuids: folderUuidsToDownload });
 
-  const networkApiUrl = process.env.BRIDGE_URL;
   const bridgeUser = user.bridgeUser;
   const bridgePass = user.userId;
   const encryptionKey = getConfig().mnemonic;
 
   await downloadFolder(
     device.name,
-    networkApiUrl,
     folders.map((folder) => folder.uuid),
     path,
     {

src/apps/main/network/download.ts

@@ -48,7 +48,6 @@ async function writeReadableStreamToFile(readableStream: ReadableStream<Uint8Arr
 
 export async function downloadFolder(
   deviceName: string,
-  networkApiUrl: string,
   foldersUuid: string[],
   targetPath: PathLike,
   environment: {
@@ -117,7 +116,6 @@ export async function downloadFolder(
             Logger.info('Downloading file:', filePath);
 
             const fileStream = await downloadFile({
-              networkApiUrl,
               bucketId: file.bucket,
               fileId: file.fileId,
               creds: {
@@ -163,13 +161,12 @@ interface MetadataRequiredForDownload {
 }
 
 async function getRequiredFileMetadataWithAuth(
-  networkApiUrl: string,
   bucketId: string,
   fileId: string,
   creds: NetworkCredentials,
 ): Promise<MetadataRequiredForDownload> {
-  const fileMeta: FileInfo = await getFileInfoWithAuth(networkApiUrl, bucketId, fileId, creds);
-  const mirrors: Mirror[] = await getMirrors(networkApiUrl, bucketId, fileId, creds);
+  const fileMeta: FileInfo = await getFileInfoWithAuth(bucketId, fileId, creds);
+  const mirrors: Mirror[] = await getMirrors(bucketId, fileId, creds);
 
   return { fileMeta, mirrors };
 }
@@ -187,12 +184,12 @@ async function downloadFile(params: IDownloadParams): Promise<ReadableStream<Uin
 }
 
 async function _downloadFile(params: IDownloadParams): Promise<ReadableStream<Uint8Array>> {
-  const { networkApiUrl, bucketId, fileId, creds } = params;
+  const { bucketId, fileId, creds } = params;
 
   let metadata: MetadataRequiredForDownload;
 
   if (creds) {
-    metadata = await getRequiredFileMetadataWithAuth(networkApiUrl, bucketId, fileId, creds);
+    metadata = await getRequiredFileMetadataWithAuth(bucketId, fileId, creds);
   } else {
     throw new Error('Download error 1');
   }

src/apps/main/network/download.types.ts

@@ -2,7 +2,6 @@ import { DownloadProgressCallback } from '@internxt/inxt-js/build/lib/core';
 import { NetworkCredentials } from './requests';
 
 export interface IDownloadParams {
-  networkApiUrl: string;
   bucketId: string;
   fileId: string;
   creds: NetworkCredentials;

src/apps/main/network/requests.ts

@@ -35,10 +35,10 @@ function getAuthFromCredentials(creds: NetworkCredentials): AxiosBasicCredential
   };
 }
 
-function getFileInfo(networkApiUrl: string, bucketId: string, fileId: string, opts?: AxiosRequestConfig): Promise<FileInfo> {
+function getFileInfo(bucketId: string, fileId: string, opts?: AxiosRequestConfig): Promise<FileInfo> {
   const defaultOpts: AxiosRequestConfig = {
     method: 'GET',
-    url: `${networkApiUrl}/buckets/${bucketId}/files/${fileId}/info`,
+    url: `${process.env.BRIDGE_URL}/buckets/${bucketId}/files/${fileId}/info`,
     maxContentLength: Infinity,
   };
 
@@ -52,8 +52,8 @@ function getFileInfo(networkApiUrl: string, bucketId: string, fileId: string, op
     });
 }
 
-export function getFileInfoWithAuth(networkApiUrl: string, bucketId: string, fileId: string, creds: NetworkCredentials): Promise<FileInfo> {
-  return getFileInfo(networkApiUrl, bucketId, fileId, {
+export function getFileInfoWithAuth(bucketId: string, fileId: string, creds: NetworkCredentials): Promise<FileInfo> {
+  return getFileInfo(bucketId, fileId, {
     auth: getAuthFromCredentials(creds),
   });
 }
@@ -78,13 +78,7 @@ export interface Mirror {
   operation: string;
 }
 
-export async function getMirrors(
-  networkApiUrl: string,
-  bucketId: string,
-  fileId: string,
-  creds: NetworkCredentials | null,
-  token?: string,
-): Promise<Mirror[]> {
+export async function getMirrors(bucketId: string, fileId: string, creds: NetworkCredentials | null, token?: string): Promise<Mirror[]> {
   const mirrors: Mirror[] = [];
   const limit = 3;
 
@@ -95,7 +89,7 @@ export async function getMirrors(
   };
 
   do {
-    results = (await getFileMirrors(networkApiUrl, bucketId, fileId, limit, mirrors.length, [], requestConfig))
+    results = (await getFileMirrors(bucketId, fileId, limit, mirrors.length, [], requestConfig))
       .filter((m) => !m.parity)
       .sort((mA, mB) => mA.index - mB.index);
 
@@ -110,7 +104,7 @@ export async function getMirrors(
     if (farmerIsOk) {
       mirror.farmer.address = mirror.farmer.address.trim();
     } else {
-      mirrors[mirror.index] = await replaceMirror(networkApiUrl, bucketId, fileId, mirror.index, [], requestConfig);
+      mirrors[mirror.index] = await replaceMirror(bucketId, fileId, mirror.index, [], requestConfig);
 
       if (!isFarmerOk(mirrors[mirror.index].farmer)) {
         throw new Error('Missing pointer for shard %s' + mirror.hash);
@@ -126,7 +120,6 @@ export async function getMirrors(
 }
 
 async function replaceMirror(
-  networkApiUrl: string,
   bucketId: string,
   fileId: string,
   pointerIndex: number,
@@ -137,7 +130,7 @@ async function replaceMirror(
   let mirror: Mirror;
 
   while (!mirrorIsOk) {
-    const [newMirror] = await getFileMirrors(networkApiUrl, bucketId, fileId, 1, pointerIndex, excludeNodes, opts);
+    const [newMirror] = await getFileMirrors(bucketId, fileId, 1, pointerIndex, excludeNodes, opts);
 
     mirror = newMirror;
     mirrorIsOk = newMirror.farmer && newMirror.farmer.nodeID && newMirror.farmer.port && newMirror.farmer.address ? true : false;
@@ -148,7 +141,6 @@ async function replaceMirror(
 }
 
 function getFileMirrors(
-  networkApiUrl: string,
   bucketId: string,
   fileId: string,
   limit: number | 3,
@@ -157,7 +149,7 @@ function getFileMirrors(
   opts?: AxiosRequestConfig,
 ): Promise<Mirror[]> {
   const excludeNodeIds: string = excludeNodes.join(',');
-  const path = `${networkApiUrl}/buckets/${bucketId}/files/${fileId}`;
+  const path = `${process.env.BRIDGE_URL}/buckets/${bucketId}/files/${fileId}`;
   const queryParams = `?limit=${limit}&skip=${skip}&exclude=${excludeNodeIds}`;
 
   const defaultOpts: AxiosRequestConfig = {

src/apps/main/notification-schema.ts

@@ -40,12 +40,4 @@ const FOLDER_CREATED = EVENT.extend({
   }),
 });
 
-/**
- * v2.5.5 Daniel Jiménez
- * TODO: Check this event because I think it doesn't exist and the action done with it can be deleted
- */
-export const FOLDER_DELETED = EVENT.extend({
-  event: z.literal('FOLDER_DELETED'),
-});
-
 export const NOTIFICATION_SCHEMA = z.union([ITEMS_TO_TRASH, FILE_CREATED, FOLDER_CREATED]);

src/apps/main/preload.d.ts

@@ -154,8 +154,6 @@ declare interface Window {
       hasDiscoveredBackups: () => Promise<boolean>;
       discoveredBackups: () => Promise<void>;
     };
-    listenersRefreshBackups(callback: (data: any) => void, eventName?: string): () => void;
-
     backups: {
       isAvailable: () => Promise<boolean>;
     };

src/apps/main/preload.js

@@ -308,16 +308,6 @@ contextBridge.exposeInMainWorld('electron', {
       ipcRenderer.send('user.set-has-discovered-backups');
     },
   },
-  listenersRefreshBackups(callback, eventName = 'refresh-backup') {
-    const callbackWrapper = (_, data) => {
-      Logger.info('Refresh backups');
-      callback(data);
-    };
-
-    ipcRenderer.on(eventName, callbackWrapper);
-
-    return () => ipcRenderer.removeListener(eventName, callbackWrapper);
-  },
   backups: {
     isAvailable: () => {
       return ipcRenderer.invoke('backups:is-available');

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

@@ -76,12 +76,6 @@ export function useBackups(): BackupContextProps {
     loadBackups();
   }, [selected, devices]);
 
-  useEffect(() => {
-    const removeListener = window.electron.listenersRefreshBackups(fetchBackups, 'refresh-backup');
-
-    return removeListener;
-  }, []);
-
   async function addBackup(): Promise<void> {
     try {
       await window.electron.addBackup();

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

@@ -16,7 +16,6 @@ export class AddController extends CallbackController {
   // - a file has been added
   // - a folder has been added
   // - a file has been saved
-  // - after a file has been moved to a folder
 
   constructor(
     private readonly absolutePathToRelativeConverter: AbsolutePathToRelativeConverter,

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

@@ -9,11 +9,7 @@ export function buildBoundaryBridgeContainer(
   contentsContainer: ContentsContainer,
   filesContainer: FilesContainer,
 ): BoundaryBridgeContainer {
-  const fileCreationOrchestrator = new FileCreationOrchestrator(
-    contentsContainer.contentsUploader,
-    filesContainer.fileCreator,
-    filesContainer.sameFileWasMoved,
-  );
+  const fileCreationOrchestrator = new FileCreationOrchestrator(contentsContainer.contentsUploader, filesContainer.fileCreator);
 
   const fileSyncOrchestrator = new FileSyncOrchestrator(filesContainer.fileSyncronizer);