@trap_stevo/filetide 0.0.40 → 0.0.42

package/dist/cjs/FileMessager.js

@@ -1,5 +1,8 @@
 "use strict";
 
+const {
+  OmniMap
+} = require("@trap_stevo/legendarybuilderpronodejs-utilities/HUDStructs");
 const IoTide = require("@trap_stevo/iotide");
 const {
   FileMessagerConfigManager
@@ -26,22 +29,23 @@ class FileMessager {
     this.clientTransferBarriers = new Map();
     this.currentTidingTransfers = new Map();
     this.fileNet = new IoTide(serverOptions.port, serverOptions, true, this.onConnect.bind(this), this.onDisconnect.bind(this));
-    this.onlineClients = new Map();
+    this.onlineClients = new OmniMap();
     return;
   }
   onConnect(socket) {
-    console.log(`Client connected: ${socket.id}`);
+    console.log(`Client connected ~ ${socket.id}`);
     this.onlineClients.set(socket.id, socket);
     return;
   }
   onDisconnect(connectionRes, socket) {
-    console.log(`Client disconnected: ${socket.id}`);
+    console.log(`Client disconnected ~ ${socket.id}`);
     this.onlineClients.delete(socket.id);
     return;
   }
   start() {
     this.fileNet.on("get-client-transfer-barrier-response", this.handleClientTransferBarrierResponse.bind(this));
     this.fileNet.on("get-client-transfer-state", this.handleGetClientTransferState.bind(this));
+    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("send-file-list-to-client", this.handleSendFileListToClient.bind(this));
@@ -51,6 +55,7 @@ class FileMessager {
     this.fileNet.on("transfer-complete", this.handleFileTransferComplete.bind(this));
     this.fileNet.on("request-transfer-from-client", this.handleRequestTransferFromClient.bind(this));
     this.fileNet.on("client-to-client-transfer", this.handleClientToClientTransfer.bind(this));
+    this.fileNet.on("check-client-online", this.handleCheckClientOnline.bind(this));
     this.fileNet.on("client-offline", this.handleClientOffline.bind(this));
     this.fileNet.on("clients-online", this.handleClientsOnline.bind(this));
     this.fileNet.on("client-online", this.handleClientOnline.bind(this));
@@ -321,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);
@@ -330,12 +335,29 @@ class FileMessager {
       }
       this.fileNet.emitToTide(client.tideID, "current-transfer-state", {
         senderID: data.senderID,
+        fileName: data.fileName,
         filePath
       });
     } catch (error) {
       return;
     }
   }
+  handleGetClient(data) {
+    console.log(`[FileTide ~ Net] ~ Getting client ~ ${data.clientID}...`);
+    try {
+      const senderConnectionID = FileNetClientManager.getOnlineClient(data.senderID).id;
+      const clientConnectionID = FileNetClientManager.getOnlineClient(data.clientID).id;
+      const senderClient = this.getClientFromID(clientConnectionID);
+      const client = this.getClientFromID(clientConnectionID);
+      if (!client || !senderClient) {
+        return;
+      }
+      console.log(`[FileTide ~ Net] Got client ~ ${data.clientID}!`);
+      this.fileNet.emitToTide(senderClient.tideID, "retrieved-current-client", client);
+    } catch (error) {
+      return;
+    }
+  }
   handleNotifyTransferBarrier(data, emitToChannel) {
     const accepted = data.accepted;
     const transferID = data.data.transferID;
@@ -383,6 +405,30 @@ class FileMessager {
   handleFileTransferComplete(data) {
     console.log(`File transfer completed: ${data.fileName}`);
   }
+  handleCheckClientOnline(data) {
+    console.log(`[FileTide ~ Net Activity] ~ Checking if client ~ ${data.clientID} online...`);
+    try {
+      const client = FileNetClientManager.getOnlineClient(data.clientID);
+      if (!client) {
+        this.fileNet.emit("retrieved-client-online", {
+          online: false,
+          client: null
+        });
+        return;
+      }
+      console.log(`[FileTide ~ Net Activity] ~ Client ~ ${data.clientID} online!`);
+      this.fileNet.emit("retrieved-client-online", {
+        online: true,
+        client
+      });
+    } catch (error) {
+      this.fileNet.emit("retrieved-client-online", {
+        online: false,
+        client: null
+      });
+      return;
+    }
+  }
   handleClientsOnline(clientID) {
     const connectionDetails = FileNetClientManager.getOnlineClient(clientID);
     if (!connectionDetails) {
@@ -398,7 +444,12 @@ class FileMessager {
     return;
   }
   handleClientOnline(clientID, tideID, pClientID, connectionID, activeTransferBarrier) {
-    if (!this.onlineClients.has(connectionID)) {
+    if (!this.onlineClients.contains(connectionID)) {
+      return;
+    }
+    if (FileNetClientManager.getOnlineClient(clientID) && this.onlineClients.get(connectionID)) {
+      clientID = `${clientID}_${connectionID.slice(0, 4)}`;
+      this.fileNet.emitToTide(tideID, "current-client-id-already-online", clientID);
       return;
     }
     FileNetClientManager.addOnlineClient(clientID, pClientID, tideID, connectionID);
@@ -406,25 +457,38 @@ 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(clientID) {
-    FileNetClientManager.clearOnlineClient(clientID);
-    this.fileNet.emit("current-clients", Object.fromEntries(FileNetClientManager.getOnlineClients()));
-    this.fileNet.emit("save-current-transfer-states", {
-      clientID
-    });
-    const tidingTransfers = this.currentTidingTransfers.get(clientID);
-    if (tidingTransfers && tidingTransfers.size > 0) {
-      for (let recipientID of tidingTransfers.keys()) {
-        this.fileNet.emit("save-current-transfer-states", {
-          clientID: recipientID
-        });
+  handleClientOffline(clientData) {
+    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) {
+        console.log(!clientDetails ? `[FileTide ~ Net Activity] ~ Client ~ ${clientData.clientID} already offline.` : `[FileTide ~ Net Activity] ~ Unauthorized offline signal from connection ID ~ ${clientData.connectionID}.`);
+        return;
+      }
+      FileNetClientManager.clearOnlineClient(clientData.clientID);
+      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
+      });
+      const tidingTransfers = this.currentTidingTransfers.get(clientData.clientID);
+      if (tidingTransfers && tidingTransfers.size > 0) {
+        for (let recipientID of tidingTransfers.keys()) {
+          this.fileNet.emit("save-current-transfer-states", {
+            clientID: recipientID
+          });
+        }
       }
+      this.currentTidingTransfers.delete(clientData.clientID);
+    } catch (error) {
+      console.log(`[FileTide ~ Net Activity] ~ Did not process client ~ ${clientData} offline signal ~ ${error}`);
     }
-    this.currentTidingTransfers.delete(clientID);
     return;
   }
   handleClientTiding(data) {

package/dist/cjs/FileMessagerClient.js

@@ -49,12 +49,14 @@ class FileMessagerClient {
     const socketName = this.createClientInstance(userID, {
       url: this.clientOptions.url
     }, options, headers, onConnect, onDisconnect, authURL, authHeaders, useAuthentication, queryAuthToken);
-    this.clientTide.joinChannel(socketName, roomName, userID, () => {
-      FileNetUtilityManager.outputGradient(`\n[FileTide ~ File Messager] ~ Client ~ ${userID} joined room ${roomName} successfully!`, significantMessageColors);
-      this.clients.set(userID, {
-        roomName
+    return () => {
+      this.clientTide.joinChannel(socketName, roomName, userID, () => {
+        FileNetUtilityManager.outputGradient(`\n[FileTide ~ File Messager] ~ Client ~ ${userID} joined room ${roomName} successfully!`, significantMessageColors);
+        this.clients.set(userID, {
+          roomName
+        });
       });
-    });
+    };
   }
   async requestTransfer(clientID, senderID, filePath, destinationPath, filterContent = []) {
     const transferAllowed = await this.allowedTransfer(clientID, senderID, destinationPath, "N/A", "requestSend");

package/dist/cjs/FileTide.js

@@ -90,14 +90,14 @@ class FileTide {
       this.stopMessager(userID);
     }
     const newClient = new FileMessagerClient(clientOptions);
-    newClient.joinRoom(userID, roomName, connectionOptions, headers, onConnect, onDisconnect, authURL, authHeaders, useAuthentication, queryAuthToken);
+    const enterRoom = newClient.joinRoom(userID, roomName, connectionOptions, headers, onConnect, onDisconnect, authURL, authHeaders, useAuthentication, queryAuthToken);
     this.transferBarrier = enableTransferBarrier;
     this.clientShorePolicies.set(userID, [FileUtilityManager.getTidePath(">CurrentUser"), FileUtilityManager.getTidePath(">Downloads"), FileUtilityManager.getTidePath(">Documents")]);
     this.clients.set(userID, newClient);
     FileTide.outputGradient(`[FileTide] ~ Messager launched successfully for client ~ ${userID}!`, significantMessageColors);
     _assertClassBrand(_FileTide_brand, this, _setupFileEventListeners).call(this, userID, newClient, onTransferProgress, onIncomingTransfer, onIncomingFile, onTransferBarrier, options);
     if (onLaunch) {
-      onLaunch(newClient);
+      onLaunch(newClient, enterRoom);
     }
     return;
   }
@@ -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"]);
@@ -235,6 +242,10 @@ class FileTide {
   stopMessager(userID) {
     if (this.clients.has(userID)) {
       FileTide.outputGradient(`Stopping messager for user ${userID}...`, significantMessageColors);
+      const connectionOrigin = this.clients.get(userID);
+      if (connectionOrigin) {
+        connectionOrigin.clientTide.closeSocket(userID);
+      }
       this.clients.delete(userID);
       FileTide.outputGradient(`Stopped messager for user ${userID}.`, significantMessageColors);
       return;
@@ -262,7 +273,8 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
     onTransferStatus,
     onListFiles,
     onCurrentOnlineClients,
-    onClientTiding
+    onClientTiding,
+    onCurrentClientIDAlreadyOnline
   } = options;
   const cliTable = new ConsoleTable({
     padding: 2,
@@ -328,6 +340,16 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
       onCurrentOnlineClients(currentClients, false);
     }
   });
+  client.clientTide.onEvent(userID, "current-client-id-already-online", clientID => {
+    if (userID === clientID) {
+      return;
+    }
+    _FileTide.outputGradient(`[FileTide ~ FileNet] ~ Client ~ ${userID} already online.`, significantMessageColors);
+    if (onCurrentClientIDAlreadyOnline) {
+      onCurrentClientIDAlreadyOnline(clientID);
+    }
+    return;
+  });
   client.clientTide.onEvent(userID, "save-current-transfer-states", async data => {
     this.saveTransferStates();
     return;
@@ -335,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,
@@ -424,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);
     }
@@ -458,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.40",
+  "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": {
@@ -31,7 +31,7 @@
   "dependencies": {
     "@trap_stevo/iotide": "^0.0.37",
     "@trap_stevo/iotide-client": "^0.0.23",
-    "@trap_stevo/legendarybuilderpronodejs-utilities": "^1.0.40",
+    "@trap_stevo/legendarybuilderpronodejs-utilities": "^1.0.42",
     "chalk": "^4.1.2",
     "readline": "^1.3.0"
   },