@trap_stevo/filetide 0.0.51 → 0.0.52

package/dist/cjs/FileMessager.js

@@ -1,5 +1,8 @@
 "use strict";
 
+function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 const {
   OmniMap
 } = require("@trap_stevo/legendarybuilderpronodejs-utilities/HUDStructs");
@@ -7,6 +10,9 @@ const IoTide = require("@trap_stevo/iotide");
 const {
   FileMessagerConfigManager
 } = require("./HUDManagers/FileMessagerConfigManager");
+const {
+  FileNetUtilityManager
+} = require("./HUDManagers/FileNetUtilityManager");
 const {
   FileNetClientManager
 } = require("./HUDManagers/FileNetClientManager");
@@ -14,6 +20,7 @@ const {
   FileTransferManager
 } = require("./HUDManagers/FileTransferManager");
 const HUDTargetQueue = require("./HUDManagers/HUDTargetQueueManager");
+var _FileMessager_brand = /*#__PURE__*/new WeakSet();
 class FileMessager {
   constructor(options = {
     pingTimeout: 3600000,
@@ -21,7 +28,8 @@ class FileMessager {
   }, transportOptions = {
     parallelChunks: 3,
     maxRetries: 3
-  }) {
+  }, debugMode = false) {
+    _classPrivateMethodInitSpec(this, _FileMessager_brand);
     const serverOptions = FileMessagerConfigManager.getServerOptions(options);
     this.transporter = new FileTransferManager(transportOptions);
     this.transferQueue = new HUDTargetQueue();
@@ -30,6 +38,7 @@ class FileMessager {
     this.currentTidingTransfers = new Map();
     this.fileNet = new IoTide(serverOptions.port, serverOptions, true, this.onConnect.bind(this), this.onDisconnect.bind(this));
     this.onlineClients = new OmniMap();
+    this.debugMode = debugMode;
     return;
   }
   onConnect(socket) {
@@ -46,6 +55,7 @@ class FileMessager {
     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("acknowledge-transfer-tide", this.handleAcknowledgeTransferTide.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));
@@ -121,7 +131,7 @@ class FileMessager {
       path: filePath,
       fileSize
     });
-    console.log(`[FileTide ~ File Messager] ~ Sent chunk ${chunkIndex} of ${fileName} to client ~ ${clientData.userID}!`);
+    _assertClassBrand(_FileMessager_brand, this, _log).call(this, `[FileTide ~ File Messager] ~ Sent chunk ${chunkIndex} of ${fileName} to client ~ ${clientData.userID}!`);
     if (senderClient) {
       this.fileNet.emitToTide(senderClient.tideID, "transfer-status", {
         status: `Chunk ${chunkIndex} of ${fileName} sent to client ${clientData.userID}!`,
@@ -233,7 +243,7 @@ class FileMessager {
             completedChunks,
             totalChunks
           } = chunkData;
-          console.log(`[FileTide ~ File Messager] ~ Transferring file ~ ${fileName} | chunk ${chunkIndex + 1} >> ${completedChunks} of ${totalChunks} to client (${recipientId})`);
+          _assertClassBrand(_FileMessager_brand, this, _log).call(this, `[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({
@@ -277,7 +287,7 @@ class FileMessager {
         completedChunks,
         totalChunks
       } = transferData;
-      console.log(`[FileTide ~ File Messager] ~ Transferring file ~ ${fileName} | chunk ${chunkIndex + 1} >> ${completedChunks} of ${totalChunks} to client (${recipientId})`);
+      _assertClassBrand(_FileMessager_brand, this, _log).call(this, `[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({
@@ -397,6 +407,13 @@ class FileMessager {
       return;
     }
   }
+  handleAcknowledgeTransferTide(data) {
+    try {
+      console.log(`[FileTide ~ Net Activity] ~ ${data.recipientName} acknowledged tide transfer from ${data.senderName}.\n\n\t~ [${data.fileName}-${data.transferStats.startTime}] ~\n\n\t\tFile Name ~ ${data.fileName}\n\t\tDestination ~ ${data.path}\n\n\t\t\tProgress ~ ${data.transferStats.progress.toFixed(2)}%\n\t\t\tETA ~ ${data.transferStats.timeLeft <= 0 ? "Now" : FileNetUtilityManager.convertSeconds(data.transferStats.timeLeft.toFixed(2))}\n\t\t\tSpeed ~ ${FileNetUtilityManager.getFormattedSize(data.transferStats.speed, true)}/s\n\t\t\tSize ~ ${FileNetUtilityManager.getFormattedSize(data.transferStats.totalSize, true)}\n\t\t\tTransferred ~ ${FileNetUtilityManager.getFormattedSize(data.transferStats.current, true)}\n`);
+    } catch (error) {
+      console.log(`[FileTide ~ Net Activity] ~  ${data.recipientName} acknowledged tide transfer from ${data.senderName}.\n\n${error}`);
+    }
+  }
   handleNotifyTransferBarrier(data, emitToChannel) {
     const accepted = data.accepted;
     const transferID = data.data.transferID;
@@ -552,5 +569,11 @@ class FileMessager {
     }
   }
 }
+function _log(...message) {
+  if (!this.debugMode) {
+    return;
+  }
+  console.log(...message);
+}
 ;
 module.exports = FileMessager;

package/dist/cjs/FileTide.js

@@ -474,8 +474,16 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
     };
     currentTransferState.transferredSize += data.chunkSize || 512 * 1024;
     FileTransferRecoveryManager.saveTransferState(userID, data.senderName, `${data.path}-${data.fileName}`, data.chunkIndex, currentTransferState.transferredSize);
+    const taskBarStats = this.progressBarManager.getTaskBar(data.fileName);
+    client.clientTide.emitEvent(userID, "acknowledge-transfer-tide", {
+      fileName: data.fileName,
+      senderName: data.senderName,
+      recipientName: userID,
+      transferStateID: `${data.path}-${data.fileName}`,
+      path: data.path,
+      transferStats: taskBarStats
+    });
     if (onTransferProgress) {
-      const taskBarStats = this.progressBarManager.getTaskBar(data.fileName);
       onTransferProgress({
         ...data,
         stats: taskBarStats
@@ -508,7 +516,7 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
   client.clientTide.onEvent(userID, "transfer-complete", data => {
     const savePath = FileUtilityManager.getTidePath(path.join(data.filePath, data.fileName));
     try {
-      _FileTide.outputGradient(`[${userID}] File transfer complete : ${data.fileName}`, significantMessageColors);
+      _FileTide.outputGradient(`[${userID}] File transfer complete ~ ${data.fileName}`, significantMessageColors);
       const transferState = fileTransferReceiver.activeTransfers.get(data.fileName);
       if (!transferState) {
         return;
@@ -516,9 +524,9 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
       fileTransferReceiver.completeTransfer(data, (transferData, transfers, success, error) => {
         if (success) {
           FileTransferRecoveryManager.clearTransferState(userID, data.senderID, `${data.filePath}-${data.fileName}`);
-          _FileTide.outputGradient(`[${userID}] File saved at : ${savePath}\n`, significantMessageColors);
+          _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);
+          _FileTide.outputGradient(`[${userID}] Did not save file at ~ ${savePath}\n\t${error}\n`, errorMessageColors);
         }
         if (onTransferComplete) {
           const taskBarStats = this.progressBarManager.getTaskBar(data.fileName);
@@ -527,9 +535,12 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
             stats: taskBarStats
           }, fileTransferReceiver.activeTransfers, success);
         }
+        setTimeout(() => {
+          this.progressBarManager.clearTaskBar(data.fileName);
+        }, this.progressBarManager.completionTimeout);
       });
     } catch (error) {
-      _FileTide.outputGradient(`[${userID}] Did not save file at : ${savePath}\n${error}`, errorMessageColors);
+      _FileTide.outputGradient(`[${userID}] Did not save file at ~ ${savePath}\n${error}`, errorMessageColors);
       if (onTransferComplete) {
         const taskBarStats = this.progressBarManager.getTaskBar(data.fileName);
         onTransferComplete({
@@ -537,6 +548,9 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
           stats: taskBarStats
         }, fileTransferReceiver.activeTransfers, false);
       }
+      setTimeout(() => {
+        this.progressBarManager.clearTaskBar(data.fileName);
+      }, this.progressBarManager.completionTimeout);
     }
   });
   client.clientTide.onEvent(userID, "transfer-requested", async data => {

package/dist/cjs/HUDComponents/ConsoleProgressBarManager.js

@@ -2,6 +2,9 @@
 
 const readline = require("readline");
 const chalk = require("chalk");
+const {
+  FileNetUtilityManager
+} = require("../HUDManagers/FileNetUtilityManager");
 class ConsoleProgressBarManager {
   constructor(tasks = [], options = {}) {
     const rows = process.stdout.rows || 24;
@@ -20,41 +23,6 @@ class ConsoleProgressBarManager {
     this.allTasksCompleted = false;
     this.taskBars = tasks.map((task, index) => this.createTaskBar(task, index));
   }
-  convertSeconds(seconds) {
-    if (seconds === 0) return "0 s";
-    const units = [{
-      name: "y",
-      seconds: 60 * 60 * 24 * 365
-    }, {
-      name: "mo",
-      seconds: 60 * 60 * 24 * 30
-    }, {
-      name: "w",
-      seconds: 60 * 60 * 24 * 7
-    }, {
-      name: "d",
-      seconds: 60 * 60 * 24
-    }, {
-      name: "h",
-      seconds: 60 * 60
-    }, {
-      name: "m",
-      seconds: 60
-    }, {
-      name: "s",
-      seconds: 1
-    }];
-    let remainingSeconds = seconds;
-    let result = "";
-    for (const unit of units) {
-      const count = Math.floor(remainingSeconds / unit.seconds);
-      if (count > 0) {
-        result += `${count}${unit.name} `;
-        remainingSeconds %= unit.seconds;
-      }
-    }
-    return result.trim();
-  }
   createTaskBar(task, index) {
     const defaultOptions = {
       barLength: 40,
@@ -81,32 +49,6 @@ class ConsoleProgressBarManager {
       startTime: Date.now(),
       taskIndex: index,
       completed: false,
-      getFormattedSize: size => {
-        if (!settings.dynamicUnits) return `${size.toFixed(1)} B`;
-        const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
-        let unitIndex = 0;
-        while (size >= 1024 && unitIndex < units.length - 1) {
-          size /= 1024;
-          unitIndex++;
-        }
-        return `${size.toFixed(2)} ${units[unitIndex]}`;
-      },
-      getUnitData: size => {
-        if (!settings.dynamicUnits) return {
-          current: size.toFixed(1),
-          unit: "B"
-        };
-        const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
-        let unitIndex = 0;
-        while (size >= 1024 && unitIndex < units.length - 1) {
-          size /= 1024;
-          unitIndex++;
-        }
-        return {
-          current: size.toFixed(2),
-          unit: units[unitIndex]
-        };
-      },
       redraw: () => {
         if (!isNaN(newBar.taskIndex) && !isNaN(this.barsPerPage) && process.stdout.isTTY) {
           readline.cursorTo(process.stdout, 0, newBar.taskIndex % this.barsPerPage);
@@ -119,7 +61,7 @@ class ConsoleProgressBarManager {
         const percentage = newBar.current / newBar.totalSize * 100;
         const elapsedTime = (Date.now() - newBar.startTime) / 1000;
         const speed = newBar.current / elapsedTime;
-        const speedData = newBar.getUnitData(speed);
+        const speedData = FileNetUtilityManager.getFormattedSize(speed, settings.dynamicUnits);
         const timeLeft = (newBar.totalSize - newBar.current) / (speed || 1);
         newBar.progress = percentage;
         newBar.timeLeft = timeLeft;
@@ -127,7 +69,7 @@ class ConsoleProgressBarManager {
         const filledLength = Math.round(settings.barLength * (newBar.current / newBar.totalSize));
         const bar = settings.barColor(settings.filledChar.repeat(filledLength)) + settings.unfilledChar.repeat(settings.barLength - filledLength);
         try {
-          process.stdout.write(`${settings.taskNameColor(newBar.taskName)} > ${settings.totalSizeColor(newBar.getFormattedSize(newBar.totalSize))} | ${settings.sizeTransferredColor(newBar.getFormattedSize(newBar.current))} ${settings.speedColor(`${speedData.current} ${speedData.unit}/s`)} | ${settings.taskETAColor(this.convertSeconds(timeLeft.toFixed(2)))} [${bar}] ${settings.percentageColor(percentage.toFixed(2) + "%")}`);
+          process.stdout.write(`${settings.taskNameColor(newBar.taskName)} > ${settings.totalSizeColor(FileNetUtilityManager.getFormattedSize(newBar.totalSize, settings.dynamicUnits))} | ${settings.sizeTransferredColor(FileNetUtilityManager.getFormattedSize(newBar.current, settings.dynamicUnits))} ${settings.speedColor(`${speedData}/s`)} | ${settings.taskETAColor(FileNetUtilityManager.convertSeconds(timeLeft.toFixed(2)))} [${bar}] ${settings.percentageColor(percentage.toFixed(2) + "%")}`);
         } catch (error) {
           console.log(error);
         }
@@ -220,10 +162,10 @@ class ConsoleProgressBarManager {
         taskName: bar.taskName,
         progress: `${(bar.current / bar.totalSize * 100).toFixed(2)}%`,
         completed: bar.completed,
-        currentSize: bar.getFormattedSize(bar.current),
-        totalSize: bar.getFormattedSize(bar.totalSize),
-        speed: `${bar.getUnitData(bar.speed).current} ${bar.getUnitData(bar.speed).unit}/s`,
-        timeLeft: this.convertSeconds(bar.timeLeft.toFixed(2))
+        currentSize: FileNetUtilityManager.getFormattedSize(bar.current, true),
+        totalSize: FileNetUtilityManager.getFormattedSize(bar.totalSize, true),
+        speed: `${FileNetUtilityManager.getUnitData(bar.speed, true).current} ${FileNetUtilityManager.getUnitData(bar.speed, true).unit}/s`,
+        timeLeft: FileNetUtilityManager.convertSeconds(bar.timeLeft.toFixed(2))
       }))
     };
     return stats;

package/dist/cjs/HUDManagers/FileNetUtilityManager.js

@@ -17,6 +17,67 @@ class FileNetUtilityManager {
     console.log(coloredText);
     return;
   }
+  static convertSeconds(seconds) {
+    if (seconds === 0) return "0 s";
+    const units = [{
+      name: "y",
+      seconds: 60 * 60 * 24 * 365
+    }, {
+      name: "mo",
+      seconds: 60 * 60 * 24 * 30
+    }, {
+      name: "w",
+      seconds: 60 * 60 * 24 * 7
+    }, {
+      name: "d",
+      seconds: 60 * 60 * 24
+    }, {
+      name: "h",
+      seconds: 60 * 60
+    }, {
+      name: "m",
+      seconds: 60
+    }, {
+      name: "s",
+      seconds: 1
+    }];
+    let remainingSeconds = seconds;
+    let result = "";
+    for (const unit of units) {
+      const count = Math.floor(remainingSeconds / unit.seconds);
+      if (count > 0) {
+        result += `${count}${unit.name} `;
+        remainingSeconds %= unit.seconds;
+      }
+    }
+    return result.trim();
+  }
+  static getFormattedSize(size, dynamicUnits = true) {
+    if (!dynamicUnits) return `${size.toFixed(1)} B`;
+    const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+    let unitIndex = 0;
+    while (size >= 1024 && unitIndex < units.length - 1) {
+      size /= 1024;
+      unitIndex++;
+    }
+    return `${size.toFixed(2)} ${units[unitIndex]}`;
+  }
+  static getUnitData(size, dynamicUnits = true) {
+    if (!dynamicUnits) return {
+      current: size.toFixed(1),
+      unit: "B"
+    };
+    const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+    let unitIndex = 0;
+    while (size >= 1024 && unitIndex < units.length - 1) {
+      size /= 1024;
+      unitIndex++;
+    }
+    return {
+      current: size.toFixed(2),
+      unit: units[unitIndex]
+    };
+  }
 }
 module.exports = {
   FileNetUtilityManager,

package/dist/cjs/HUDManagers/FileTransferManager.js

@@ -77,16 +77,23 @@ class FileTransferManager {
       } = await fileHandle.read(Buffer.alloc(end - start), 0, end - start, start);
       const transferState = this.activeTransfers.get(transferId);
       chunkBuffer.set(chunkIndex, buffer);
-      while (chunkBuffer.has(nextExpectedChunk)) {
-        const nextChunkBuffer = chunkBuffer.get(nextExpectedChunk);
-        await onSendChunk(transferId, nextExpectedChunk, this.chunkSize, nextChunkBuffer, totalChunks, this.activeTransfers.get(transferId).completedChunks + 1);
-        chunkBuffer.delete(nextExpectedChunk);
-        nextExpectedChunk++;
-        transferState.transferredSize += this.chunkSize;
-        transferState.completedChunks++;
-        updateProgress();
-      }
-      if (transferState.completedChunks === transferState.totalChunks) {
+      try {
+        while (chunkBuffer.has(nextExpectedChunk)) {
+          const nextChunkBuffer = chunkBuffer.get(nextExpectedChunk);
+          await onSendChunk(transferId, nextExpectedChunk, this.chunkSize, nextChunkBuffer, totalChunks, this.activeTransfers.get(transferId).completedChunks + 1);
+          chunkBuffer.delete(nextExpectedChunk);
+          nextExpectedChunk++;
+          transferState.transferredSize += this.chunkSize;
+          transferState.completedChunks++;
+          updateProgress();
+        }
+        if (transferState.completedChunks === transferState.totalChunks) {
+          return onComplete(transferId).then(() => {
+            this.activeTransfers.delete(transferId);
+          });
+        }
+      } catch (error) {
+        console.error(`[FileTide ~ Transporter] ~ Did not send chunk ${chunkIndex} ~ ${error.message}`);
         return onComplete(transferId).then(() => {
           this.activeTransfers.delete(transferId);
         });

package/package.json

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