@trap_stevo/filetide 0.0.41 → 0.0.42

package/dist/cjs/FileMessager.js

@@ -326,7 +326,7 @@ class FileMessager {
   }
   handleGetClientTransferState(data) {
     const filePath = data.filePath || data.path;
-    console.log(`[FileTide ~ Net] Getting ${data.recipientID}'s transfer state for ~ ${filePath}...`);
+    console.log(`[FileTide ~ Net] ~ Getting ${data.recipientID}'s transfer state for ~ ${filePath}...`);
     try {
       const recipientConnectionID = FileNetClientManager.getOnlineClient(data.recipientID).id;
       const client = this.getClientFromID(recipientConnectionID);
@@ -335,6 +335,7 @@ class FileMessager {
       }
       this.fileNet.emitToTide(client.tideID, "current-transfer-state", {
         senderID: data.senderID,
+        fileName: data.fileName,
         filePath
       });
     } catch (error) {
@@ -342,7 +343,7 @@ class FileMessager {
     }
   }
   handleGetClient(data) {
-    console.log(`[FileTide ~ Net] Getting client ~ ${data.clientID}...`);
+    console.log(`[FileTide ~ Net] ~ Getting client ~ ${data.clientID}...`);
     try {
       const senderConnectionID = FileNetClientManager.getOnlineClient(data.senderID).id;
       const clientConnectionID = FileNetClientManager.getOnlineClient(data.clientID).id;
@@ -456,12 +457,13 @@ class FileMessager {
       clientID,
       activeTransferBarrier
     });
-    this.fileNet.emitToTide(tideID, "current-online-clients", Object.fromEntries(FileNetClientManager.getOnlineClients()));
-    this.fileNet.emit("current-clients", Object.fromEntries(FileNetClientManager.getOnlineClients()));
+    const currentOnlineClients = Object.fromEntries(FileNetClientManager.getOnlineClients());
+    this.fileNet.emit("current-online-clients", currentOnlineClients);
+    this.fileNet.emit("current-clients", currentOnlineClients);
     return;
   }
   handleClientOffline(clientData) {
-    console.log(`Client ~ ${clientData.clientID} | connection origin ~ ${clientData.connectionID} going offline...`);
+    console.log(`[FileTide ~ Net Activity] ~ Client ~ ${clientData.clientID} | connection origin ~ ${clientData.connectionID} going offline...`);
     try {
       const clientDetails = FileNetClientManager.getOnlineClient(clientData.clientID);
       if (!clientDetails || clientDetails.id !== clientData.connectionID) {
@@ -469,7 +471,9 @@ class FileMessager {
         return;
       }
       FileNetClientManager.clearOnlineClient(clientData.clientID);
-      this.fileNet.emit("current-clients", Object.fromEntries(FileNetClientManager.getOnlineClients()));
+      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", {
         clientID: clientData.clientID
       });

package/dist/cjs/FileTide.js

@@ -176,6 +176,13 @@ class FileTide {
       FileTide.outputGradient(`[FileTide] Client ~ ${clientID} not found.`, ["#F94144", "#F3722C"]);
       return;
     }
+    const recipientOnline = await clientMessager.clientTide.emitEventWithResponse(clientID, "check-client-online", "retrieved-client-online", {
+      clientID: recipientID
+    }, 5000);
+    if (!recipientOnline || !recipientOnline.online) {
+      FileTide.outputGradient(`[FileTide] ${recipientID} currently not tiding.`, ["#F94144", "#F3722C"]);
+      return;
+    }
     const fileDetails = await this.getPathData(filePath, filterDirectoryContent);
     if (!fileDetails) {
       FileTide.outputGradient(`[${clientID}] File at path ${filePath} not found.`, ["#F94144", "#F3722C"]);
@@ -350,9 +357,10 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
   client.clientTide.onEvent(userID, "current-transfer-state", async data => {
     const {
       senderID,
+      fileName,
       filePath
     } = data;
-    const currentTransferState = FileTransferRecoveryManager.getTransferState(userID, senderID, filePath);
+    const currentTransferState = FileTransferRecoveryManager.getTransferState(userID, senderID, `${filePath}-${fileName}`);
     client.clientTide.emitEvent(userID, "send-current-transfer-state", {
       recipientID: userID,
       senderID,
@@ -439,11 +447,11 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
     }
     await fileTransferReceiver.handleTransferProgress(data);
     this.progressBarManager.updateTaskProgress(data.fileName, data.chunkSize || 512 * 1024);
-    const currentTransferState = FileTransferRecoveryManager.getTransferState(userID, data.senderName, data.path) || {
+    const currentTransferState = FileTransferRecoveryManager.getTransferState(userID, data.senderName, `${data.path}-${data.fileName}`) || {
       transferredSize: 0
     };
     currentTransferState.transferredSize += data.chunkSize || 512 * 1024;
-    FileTransferRecoveryManager.saveTransferState(userID, data.senderName, data.path, data.chunkIndex, currentTransferState.transferredSize);
+    FileTransferRecoveryManager.saveTransferState(userID, data.senderName, `${data.path}-${data.fileName}`, data.chunkIndex, currentTransferState.transferredSize);
     if (onTransferProgress) {
       onTransferProgress(data);
     }
@@ -473,11 +481,12 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
       _FileTide.outputGradient(`[${userID}] File transfer complete : ${data.fileName}`, significantMessageColors);
       const transferState = fileTransferReceiver.activeTransfers.get(data.fileName);
       if (!transferState) {
+        FileTransferRecoveryManager.clearTransferState(userID, data.senderID, `${data.filePath}-${data.fileName}`);
         return;
       }
       fileTransferReceiver.completeTransfer(data, (transferData, transfers, success, error) => {
         if (success) {
-          FileTransferRecoveryManager.clearTransferState(userID, data.senderID, data.filePath);
+          FileTransferRecoveryManager.clearTransferState(userID, data.senderID, `${data.filePath}-${data.fileName}`);
           _FileTide.outputGradient(`[${userID}] File saved at : ${savePath}\n`, significantMessageColors);
         } else if (!success) {
           _FileTide.outputGradient(`[${userID}] Did not save file at : ${savePath}\n\t${error}\n`, errorMessageColors);

package/dist/cjs/HUDManagers/FileTransferManager.js

@@ -43,7 +43,8 @@ class FileTransferManager {
     const recoveredTransferState = (await clientTide.emitEventWithResponse(originDetails.senderID, "get-client-transfer-state", "sent-current-transfer-state", {
       recipientID,
       senderID: originDetails.senderID,
-      filePath: fileDetails.destinationPath
+      filePath: fileDetails.destinationPath,
+      fileName: fileDetails.name
     }, 30000)) || {
       transferredSize: 0,
       lastChunkSent: 0
@@ -134,7 +135,8 @@ async function _startTransfer(file, transferId, fileDetails, originDetails, onSe
   const recoveredTransferState = (await clientTide.emitEventWithResponse(originDetails.senderID, "get-client-transfer-state", "sent-current-transfer-state", {
     recipientID: originDetails.recipientID,
     senderID: originDetails.senderID,
-    filePath: fileDetails.destinationPath
+    filePath: fileDetails.destinationPath,
+    fileName: fileDetails.name
   }, 30000)) || {
     transferredSize: 0,
     lastChunkSent: 0

package/dist/cjs/HUDManagers/FileTransferRecoveryManager.js

@@ -78,7 +78,6 @@ class FileTransferRecoveryManager {
     }
   }
   flushToDisk() {
-    console.log(this.memoryStorage);
     for (const [key, state] of this.memoryStorage.entries()) {
       const {
         clientName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trap_stevo/filetide",
-  "version": "0.0.41",
+  "version": "0.0.42",
   "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": {