@trap_stevo/filetide 0.0.43 → 0.0.45

package/dist/cjs/FileMessager.js

@@ -48,6 +48,7 @@ class FileMessager {
     this.fileNet.on("get-client", this.handleGetClient.bind(this));
     this.fileNet.on("notify-transfer-barrier", this.handleNotifyTransferBarrier.bind(this));
     this.fileNet.on("send-current-transfer-state", this.handleSendCurrentTransferState.bind(this));
+    this.fileNet.on("sent-file-list-to-client", this.handleSentFileListToClient.bind(this));
     this.fileNet.on("send-file-list-to-client", this.handleSendFileListToClient.bind(this));
     this.fileNet.on("list-client-files", this.handleListClientFiles.bind(this));
     this.fileNet.on("transfer-start", this.handleFileTransferStart.bind(this));
@@ -144,6 +145,28 @@ class FileMessager {
     } = transferData;
     this.requestFromClient(requesterID, senderID, filePath, destinationPath);
   }
+  handleSentFileListToClient(listData) {
+    const {
+      totalItemsSent,
+      recipientID,
+      senderID
+    } = listData;
+    try {
+      const recipientConnectionID = FileNetClientManager.getOnlineClient(recipientID).id;
+      const senderConnectionID = FileNetClientManager.getOnlineClient(senderID).id;
+      const senderClient = this.getClientFromID(senderConnectionID);
+      const client = this.getClientFromID(recipientConnectionID);
+      if (!client || !senderClient) {
+        return;
+      }
+      this.fileNet.emitToTide(client.tideID, "client-file-list-received", {
+        senderID,
+        totalItemsSent
+      });
+    } catch (error) {
+      return;
+    }
+  }
   handleSendFileListToClient(listData) {
     const {
       listedFiles,
@@ -236,7 +259,7 @@ class FileMessager {
             console.log(`[FileTide ~ File Messager] ~ File transfer completed: ${fileName} from ${senderID} to ${recipientId}`);
             const tidingTransfers = this.currentTidingTransfers.get(senderID);
             if (tidingTransfers) {
-              tidingTransfers.delete(recipientId);
+              tidingTransfers.delete(senderID);
             }
           }
         }
@@ -280,7 +303,7 @@ class FileMessager {
         console.log(`[FileTide ~ File Messager] ~ File transfer completed: ${fileName} from ${senderID} to ${recipientId}`);
         const tidingTransfers = this.currentTidingTransfers.get(senderID);
         if (tidingTransfers) {
-          tidingTransfers.delete(recipientId);
+          tidingTransfers.delete(senderID);
         }
       }
     } catch (error) {
@@ -490,26 +513,23 @@ class FileMessager {
       const currentOnlineClients = Object.fromEntries(FileNetClientManager.getOnlineClients());
       this.fileNet.emit("current-online-clients", currentOnlineClients);
       this.fileNet.emit("current-clients", currentOnlineClients);
-      this.fileNet.emit("save-current-transfer-states", {
+      const senderClient = this.getClientFromID(clientDetails.id);
+      this.fileNet.emitToTide(senderClient.tideID, "save-current-transfer-states", {
         clientID: clientData.clientID
       });
       const tidingTransfers = this.currentTidingTransfers.get(clientData.clientID);
       if (tidingTransfers && tidingTransfers.size > 0) {
         for (let recipientID of tidingTransfers.keys()) {
-          try {
-            const recipientConnectionID = FileNetClientManager.getOnlineClient(data.recipientID).id;
-            const client = this.getClientFromID(recipientConnectionID);
-            if (client) {
-              this.fileNet.emitToTide(client.tideID, "save-current-transfer-states", {
-                clientID: recipientID
-              });
-            }
-          } catch (error) {
-            console.log(`[FileTide ~ Net Activity] ~ Did not save current transfer state signal to ~ ${recipientID}\n\t${error}`);
+          const recipientConnectionID = FileNetClientManager.getOnlineClient(data.recipientID).id;
+          const client = this.getClientFromID(recipientConnectionID);
+          if (client) {
+            this.fileNet.emitToTide(client.tideID, "save-current-transfer-states", {
+              clientID: recipientID
+            });
           }
         }
+        this.currentTidingTransfers.delete(clientData.clientID);
       }
-      this.currentTidingTransfers.delete(clientData.clientID);
     } catch (error) {
       console.log(`[FileTide ~ Net Activity] ~ Did not process client ~ ${clientData} offline signal ~ ${error}`);
     }

package/dist/cjs/FileMessagerClient.js

@@ -189,7 +189,7 @@ class FileMessagerClient {
       },
       onComplete: () => {
         return new Promise((resolve, reject) => {
-          FileTransferRecoveryManager.clearTransferState(recipientId, clientID, `${filePath}-${fileName}`);
+          FileTransferRecoveryManager.clearTransferState(clientID, recipientId, `${filePath}-${fileName}`);
           this.clientTide.emitEvent(clientID, "transfer-complete", {
             senderID: clientID,
             recipientId,
@@ -295,7 +295,7 @@ class FileMessagerClient {
               });
               chunkBatch.length = 0;
             }
-            FileTransferRecoveryManager.clearTransferState(recipientId, clientID, `${filePath}-${fileName}`);
+            FileTransferRecoveryManager.clearTransferState(clientID, recipientId, `${filePath}-${fileName}`);
             this.clientTide.emitEvent(clientID, "transfer-complete", {
               senderID: clientID,
               recipientId,
@@ -360,7 +360,7 @@ class FileMessagerClient {
       },
       onComplete: () => {
         return new Promise((resolve, reject) => {
-          FileTransferRecoveryManager.clearTransferState(recipientId, clientID, `${filePath}-${fileName}`);
+          FileTransferRecoveryManager.clearTransferState(clientID, recipientId, `${filePath}-${fileName}`);
           this.clientTide.emitEvent(clientID, "transfer-complete", {
             senderID: clientID,
             recipientId,

package/dist/cjs/FileTide.js

@@ -113,6 +113,9 @@ class FileTide {
   getTidePath(inputPath) {
     return FileUtilityManager.getTidePath(inputPath);
   }
+  getTidingTransferStates() {
+    return FileTransferRecoveryManager.memoryStorage;
+  }
   saveTransferStates() {
     FileTransferRecoveryManager.flushToDisk();
   }
@@ -272,6 +275,7 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
     onTransferRequested,
     onTransferStatus,
     onListFiles,
+    onFileListReceived,
     onCurrentOnlineClients,
     onClientTiding,
     onCurrentClientIDAlreadyOnline
@@ -513,6 +517,7 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
   client.clientTide.onEvent(userID, "list-files", async data => {
     _FileTide.outputGradient(`[${userID}] Sending file list to ${data.senderID}...!`, significantMessageColors);
     const currentClientShorePolicies = this.getShorePolicies(userID);
+    let totalFilesSent = 0;
     const listedFiles = await this.listFiles(currentClientShorePolicies || [">Downloads"], data.depth || 1, (totalItems, directoryContents) => {
       const capacitor = new ChunkCapacitor(directoryContents, 100);
       const contents = capacitor.getAllChunks();
@@ -524,14 +529,26 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
           listedFiles: files
         });
       }
+      totalFilesSent += totalItems;
     });
     setTimeout(() => {
       _FileTide.outputGradient(`[${userID}] Sent file list to ${data.senderID}!`, significantMessageColors);
+      client.clientTide.emitEvent(userID, "sent-file-list-to-client", {
+        senderID: data.recipientID,
+        recipientID: data.senderID,
+        totalItemsSent: totalFilesSent
+      });
     }, 1000);
   });
   client.clientTide.onEvent(userID, "error", async error => {
     _FileTide.outputGradient(`[${userID} | FileTide Error] ${error}`, errorMessageColors);
   });
+  client.clientTide.onEvent(userID, "client-file-list-received", async data => {
+    _FileTide.outputGradient(`[${userID}] Successfully received all ${data.totalItemsSent} contents in ${data.senderID}'s file list!`, significantMessageColors);
+    if (onFileListReceived) {
+      onFileListReceived(data);
+    }
+  });
   client.clientTide.onEvent(userID, "client-file-list", async data => {
     _FileTide.outputGradient(`[${userID}] Received ${data.totalItems} directory contents from ${data.senderID}'s file list!`, significantMessageColors);
     if (onListFiles) {

package/dist/cjs/HUDManagers/FileTransferManager.js

@@ -178,6 +178,7 @@ async function _startTransfer(file, transferId, fileDetails, originDetails, onSe
       transferState.activeChunks++;
       try {
         await onSendChunk(transferId, chunkIndex, this.chunkSize, chunk, transferState.totalChunks, transferState.completedChunks + 1);
+        transferState.transferredSize += this.chunkSize;
         transferState.completedChunks++;
         transferState.activeChunks--;
         updateProgress();
@@ -190,7 +191,7 @@ async function _startTransfer(file, transferId, fileDetails, originDetails, onSe
           resolve();
         }
       } catch (error) {
-        console.error(`Did not send chunk ${chunkIndex} ~ ${error.message}`);
+        console.error(`[FileTide ~ File Messager] ~ Did not send chunk ${chunkIndex} ~ ${error.message}`);
         transferState.activeChunks--;
         const retryCount = (transferState.failedChunks.get(chunkIndex) || 0) + 1;
         if (retryCount > this.maxRetries) {

package/dist/cjs/HUDManagers/FileTransferRecoveryManager.js

@@ -47,9 +47,9 @@ class FileTransferRecoveryManager {
     if (transferState) {
       try {
         fs.writeFileSync(storageFile, JSON.stringify(transferState, null, 2));
-        console.log(`Saved transfer state to disk: ${storageFile}`);
+        console.log(`Saved transfer state to disk ~ ${storageFile}`);
       } catch (error) {
-        console.error(`Error saving transfer state for ${key}: ${error.message}`);
+        console.error(`Error saving transfer state for ${key} ~ ${error.message}`);
       }
     }
   }
@@ -84,7 +84,7 @@ class FileTransferRecoveryManager {
         senderName,
         filePath
       } = state;
-      console.log("Saving current state ~ ", state);
+      console.log("Saving current state ~ ", key);
       this.saveToDisk(clientName, senderName, filePath);
     }
     ;

package/dist/cjs/HUDManagers/FileUtilityManager.js

@@ -117,7 +117,7 @@ class FileUtilityManager {
       };
       results.push(dirMetadata);
       const processEntries = list.map(async file => {
-        const filePath = path.join(dir, file.name);
+        const filePath = FileUtilityManager.getTidePath(path.join(dir, file.name));
         try {
           if (file.isDirectory()) {
             console.log(`[FileTide] Depth >> ${currentDepth} | Including directory ~ ${filePath}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trap_stevo/filetide",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "Revolutionizing real-time file transfer with seamless, instant communication across any device. Deliver files instantly, regardless of platform, and experience unparalleled speed and control in managing transfers. Elevate your file-sharing capabilities with a tool designed for precision, efficiency, and effortless connectivity.",
   "main": "dist/cjs/FileTide.js",
   "scripts": {