@trap_stevo/filetide 0.0.42 → 0.0.44

package/dist/cjs/FileMessager.js

@@ -211,15 +211,23 @@ class FileMessager {
             totalChunks
           } = chunkData;
           console.log(`[FileTide ~ File Messager] ~ Transferring file ~ ${fileName} | chunk ${chunkIndex + 1} >> ${completedChunks} of ${totalChunks} to client (${recipientId})`);
+          const recipientClient = FileNetClientManager.getOnlineClient(recipientId);
+          const senderClient = FileNetClientManager.getOnlineClient(senderID);
           this.sendFileChunkToClient({
             userID: senderID,
-            id: FileNetClientManager.getOnlineClient(senderID).id
+            id: senderClient.id
           }, {
             userID: recipientId,
-            id: FileNetClientManager.getOnlineClient(recipientId).id
+            id: recipientClient.id
           }, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath, fileSize);
           if (completedChunks === totalChunks) {
-            this.fileNet.emit("transfer-complete", {
+            this.fileNet.emitToTide(recipientClient.tideID, "transfer-complete", {
+              senderID,
+              recipientId,
+              fileName,
+              filePath
+            });
+            this.fileNet.emitToTide(senderClient.tideID, "transfer-complete", {
               senderID,
               recipientId,
               fileName,
@@ -228,7 +236,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);
             }
           }
         }
@@ -247,15 +255,23 @@ class FileMessager {
         totalChunks
       } = transferData;
       console.log(`[FileTide ~ File Messager] ~ Transferring file ~ ${fileName} | chunk ${chunkIndex + 1} >> ${completedChunks} of ${totalChunks} to client (${recipientId})`);
+      const recipientClient = FileNetClientManager.getOnlineClient(recipientId);
+      const senderClient = FileNetClientManager.getOnlineClient(senderID);
       this.sendFileChunkToClient({
         userID: senderID,
-        id: FileNetClientManager.getOnlineClient(senderID).id
+        id: senderClient.id
       }, {
         userID: recipientId,
-        id: FileNetClientManager.getOnlineClient(recipientId).id
+        id: recipientClient.id
       }, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath, fileSize);
       if (chunkIndex + 1 === totalChunks) {
-        this.fileNet.emit("transfer-complete", {
+        this.fileNet.emitToTide(recipientClient.tideID, "transfer-complete", {
+          senderID,
+          recipientId,
+          fileName,
+          filePath
+        });
+        this.fileNet.emitToTide(senderClient.tideID, "transfer-complete", {
           senderID,
           recipientId,
           fileName,
@@ -264,7 +280,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) {
@@ -474,18 +490,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()) {
-          this.fileNet.emit("save-current-transfer-states", {
-            clientID: recipientID
-          });
+          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

@@ -170,13 +170,14 @@ class FileMessagerClient {
       });
     }
     this.transporter.sendFile(file, {
-      onSendChunk: (transferId, chunkIndex, chunkSize, chunkData, totalChunks) => {
+      onSendChunk: (transferId, chunkIndex, chunkSize, chunkData, totalChunks, completedChunks) => {
         return new Promise((resolve, reject) => {
           this.clientTide.emitEvent(clientID, "client-to-client-transfer", {
             senderID: clientID,
             recipientId,
             fileName,
             fileChunk: chunkData,
+            completedChunks,
             totalChunks,
             chunkIndex,
             chunkSize,
@@ -188,6 +189,7 @@ class FileMessagerClient {
       },
       onComplete: () => {
         return new Promise((resolve, reject) => {
+          FileTransferRecoveryManager.clearTransferState(clientID, recipientId, `${filePath}-${fileName}`);
           this.clientTide.emitEvent(clientID, "transfer-complete", {
             senderID: clientID,
             recipientId,
@@ -293,6 +295,7 @@ class FileMessagerClient {
               });
               chunkBatch.length = 0;
             }
+            FileTransferRecoveryManager.clearTransferState(clientID, recipientId, `${filePath}-${fileName}`);
             this.clientTide.emitEvent(clientID, "transfer-complete", {
               senderID: clientID,
               recipientId,
@@ -357,6 +360,7 @@ class FileMessagerClient {
       },
       onComplete: () => {
         return new Promise((resolve, reject) => {
+          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();
   }
@@ -481,7 +484,6 @@ 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) => {

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/package.json

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

package/dist/cjs/HUDManagers/LomlLoggingSystem.js

@@ -1,379 +0,0 @@
-"use strict";
-
-const {
-  HUDIoTide
-} = require("@trap_stevo/iotide-client");
-const IoTide = require("@trap_stevo/iotide");
-const Loml = require("@trap_stevo/loml");
-class LomlLoggingSystem {
-  constructor(config = {}, ...args) {
-    this.lomlLogging = null;
-    this.clientInstance = config.clientInstance || false;
-    this.serverInstance = config.serverInstance || false;
-    this.setupIoTideInstance(config.lomlLoggingSystemOptions, ...args);
-    if (this.clientInstance) {
-      this.lomlLoggerClient = new HUDIoTide();
-      this.initializeClient(config.clientOptions);
-    }
-    if (this.serverInstance) {
-      this.lomlLogging.on("external-log", data => {
-        this.processExternalLog(data);
-      });
-    }
-  }
-  setupIoTideInstance(lomlLoggingSystemOptions, ...args) {
-    if (this.serverInstance) {
-      this.lomlLogging = new IoTide(lomlLoggingSystemOptions.port || 3069, lomlLoggingSystemOptions.options || {}, ...args);
-      this.lomlLogging.server.listen(lomlLoggingSystemOptions.port || 3069, "0.0.0.0", () => {
-        console.log(`LomlLoggingSystem ~ ${lomlLoggingSystemOptions.port || 3069}`);
-      });
-    }
-  }
-  initializeClient(clientOptions) {
-    const {
-      socketName,
-      url,
-      options,
-      onConnect
-    } = clientOptions;
-    this.lomlLoggerClient.createIO(socketName, url, options);
-    this.lomlLoggerClient.onEvent(socketName, "connect", () => {
-      console.log("Connected to the LomlLoggingSystem!");
-      if (onConnect) {
-        onConnect(this.lomlLoggerClient);
-      }
-    });
-  }
-  processExternalLog(data) {
-    const {
-      roomName,
-      tideID,
-      text,
-      styles,
-      colors,
-      direction,
-      href,
-      tag,
-      type,
-      protocol
-    } = data;
-    const loml = new Loml();
-    let formattedMessage;
-    switch (type) {
-      case "text":
-        formattedMessage = loml.text(text, styles).build();
-        break;
-      case "bold":
-        formattedMessage = loml.bold(text, styles).build();
-        break;
-      case "italic":
-        formattedMessage = loml.italic(text, styles).build();
-        break;
-      case "link":
-        formattedMessage = loml.link(text, href, styles).build();
-        break;
-      case "color":
-        formattedMessage = loml.color(text, styles.color, styles).build();
-        break;
-      case "gradientText":
-        formattedMessage = loml.gradientText(text, colors, direction, styles).build();
-        break;
-      case "customElement":
-        formattedMessage = loml.element(tag, text, styles).build();
-        break;
-      default:
-        formattedMessage = loml.text(text, styles).build();
-    }
-    if (protocol && protocol === "system") {
-      this.lomlLogging.emitTide("log", {
-        message: formattedMessage
-      });
-      return formattedMessage;
-    }
-    if (roomName) {
-      this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-        message: formattedMessage
-      });
-      return formattedMessage;
-    }
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logToAll(text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.text(text, styles).build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logToRoom(tideID, roomName, text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.text(text, styles).build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logBoldToAll(text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.bold(text, styles).build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logBoldToRoom(tideID, roomName, text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.bold(text, styles).build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logItalicToAll(text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.italic(text, styles).build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logItalicToRoom(tideID, roomName, text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.italic(text, styles).build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logLinkToAll(text, href, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.link(text, href, styles).build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logLinkToRoom(tideID, roomName, text, href, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.link(text, href, styles).build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logColorToAll(text, color, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.color(text, color, styles).build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logColorToRoom(tideID, roomName, text, color, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.color(text, color, styles).build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logGradientTextToRoom(tideID, roomName, text, colors, direction = "to right", styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.gradientText(text, colors, direction, styles).build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logGradientTextToAll(text, colors, direction = "to right", styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.gradientText(text, colors, direction, styles).build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logCustomElementToAll(tag, text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.element(tag, text, styles).build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logCustomElementToRoom(tideID, roomName, tag, text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.element(tag, text, styles).build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logLineBreakToAll() {
-    const loml = new Loml();
-    const formattedMessage = loml.br().build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logLineBreakToRoom(tideID, roomName) {
-    const loml = new Loml();
-    const formattedMessage = loml.br().build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logStyledMessageToAll(messageParts) {
-    const loml = new Loml();
-    messageParts.forEach(part => {
-      if (typeof loml[part.method] === "function") {
-        loml[part.method](...part.args);
-      }
-    });
-    const formattedMessage = loml.build();
-    this.lomlLogging.emit("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logStyledMessageToRoom(tideID, roomName, messageParts) {
-    const loml = new Loml();
-    messageParts.forEach(part => {
-      if (typeof loml[part.method] === "function") {
-        loml[part.method](...part.args);
-      }
-    });
-    const formattedMessage = loml.build();
-    this.lomlLogging.emitToChannel(tideID, roomName, "log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logTextToSystem(text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.text(text, styles).build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logBoldToSystem(text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.bold(text, styles).build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logItalicToSystem(text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.italic(text, styles).build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logLinkToSystem(text, href, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.link(text, href, styles).build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logColorToSystem(text, color, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.color(text, color, styles).build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logGradientTextToSystem(text, colors, direction = "to right", styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.gradientText(text, colors, direction, styles).build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logCustomElementToSystem(tag, text, styles = {}) {
-    const loml = new Loml();
-    const formattedMessage = loml.element(tag, text, styles).build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logLineBreakToSystem() {
-    const loml = new Loml();
-    const formattedMessage = loml.br().build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  logStyledMessageToSystem(messageParts) {
-    const loml = new Loml();
-    messageParts.forEach(part => {
-      if (typeof loml[part.method] === "function") {
-        loml[part.method](...part.args);
-      }
-    });
-    const formattedMessage = loml.build();
-    this.lomlLogging.emitTide("log", {
-      message: formattedMessage
-    });
-    return formattedMessage;
-  }
-  static log(options = {}) {
-    const {
-      text = "Sample text",
-      type = "text",
-      direction = "to right",
-      colors = [],
-      styles = {},
-      href = "",
-      tag = "span",
-      logToConsole = true
-    } = options;
-    const loml = new Loml();
-    let formattedMessage;
-    switch (type) {
-      case "text":
-        formattedMessage = loml.text(text, styles).build();
-        break;
-      case "bold":
-        formattedMessage = loml.bold(text, styles).build();
-        break;
-      case "italic":
-        formattedMessage = loml.italic(text, styles).build();
-        break;
-      case "link":
-        formattedMessage = loml.link(text, href, styles).build();
-        break;
-      case "color":
-        formattedMessage = loml.color(text, styles.color, styles).build();
-        break;
-      case "gradientText":
-        formattedMessage = loml.gradientText(text, colors, direction, styles).build();
-        break;
-      case "customElement":
-        formattedMessage = loml.element(tag, text, styles).build();
-        break;
-      default:
-        formattedMessage = loml.text(text, styles).build();
-    }
-    if (logToConsole) {
-      console.log(`${type.charAt(0).toUpperCase() + type.slice(1)} Log:`, formattedMessage);
-    }
-    return formattedMessage;
-  }
-}
-module.exports = LomlLoggingSystem;