@trap_stevo/filetide 0.0.38 → 0.0.39

package/dist/cjs/FileMessager.js

@@ -84,7 +84,7 @@ class FileMessager {
    * @param {String} fileName - The name of the file
    * @param {Number} chunkIndex - The index of the current chunk
    */
-  sendFileChunkToClient(senderData, clientData, fileChunk, fileName, chunkIndex, totalChunks, filePath = process.cwd(), fileSize = 100) {
+  sendFileChunkToClient(senderData, clientData, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath = process.cwd(), fileSize = 100) {
     const senderClient = this.getClientFromID(senderData.id);
     const client = this.getClientFromID(clientData.id);
     if (!client) {
@@ -106,6 +106,7 @@ class FileMessager {
       fileName,
       fileChunk,
       chunkIndex,
+      chunkSize,
       path: filePath,
       fileSize
     });
@@ -173,6 +174,7 @@ class FileMessager {
       fileSize,
       filePath,
       chunkIndex,
+      chunkSize,
       totalChunks
     } = transferData;
     console.log(`Transferring file ~ ${fileName} | chunk ${chunkIndex + 1} of ${totalChunks} to client (${recipientId})`);
@@ -182,7 +184,7 @@ class FileMessager {
     }, {
       userID: recipientId,
       id: FileNetClientManager.getOnlineClient(recipientId).id
-    }, fileChunk, fileName, chunkIndex, totalChunks, filePath, fileSize);
+    }, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath, fileSize);
     if (chunkIndex + 1 === totalChunks) {
       this.fileNet.emit("transfer-complete", {
         senderID,

package/dist/cjs/FileMessagerClient.js

@@ -154,7 +154,7 @@ class FileMessagerClient {
       });
     }
     this.transporter.sendFile(file, {
-      onSendChunk: (transferId, chunkIndex, chunkData, totalChunks) => {
+      onSendChunk: (transferId, chunkIndex, chunkSize, chunkData, totalChunks) => {
         if (chunkIndex === 0) {
           this.progressBarManager.addTask({
             name: fileName,
@@ -169,6 +169,7 @@ class FileMessagerClient {
             fileChunk: chunkData,
             totalChunks,
             chunkIndex,
+            chunkSize,
             filePath,
             fileSize
           });
@@ -186,8 +187,8 @@ class FileMessagerClient {
           resolve();
         });
       },
-      onProgress: progress => {
-        this.progressBarManager.updateTaskProgress(fileName, 512 * 1024);
+      onProgress: (progress, chunkSize) => {
+        this.progressBarManager.updateTaskProgress(fileName, chunkSize);
       },
       originDetails: {
         recipientID: recipientId,
@@ -224,7 +225,7 @@ class FileMessagerClient {
       path: filePath
     });
     this.transporter.sendFile(file, {
-      onSendChunk: (transferId, chunkIndex, chunkData, totalChunks) => {
+      onSendChunk: (transferId, chunkIndex, chunkSize, chunkData, totalChunks) => {
         if (chunkIndex === 0) {
           this.progressBarManager.addTask({
             name: fileName,
@@ -239,6 +240,7 @@ class FileMessagerClient {
             fileChunk: chunkData,
             totalChunks,
             chunkIndex,
+            chunkSize,
             filePath,
             fileSize
           });
@@ -256,8 +258,8 @@ class FileMessagerClient {
           resolve();
         });
       },
-      onProgress: progress => {
-        this.progressBarManager.updateTaskProgress(fileName, 512 * 1024);
+      onProgress: (progress, chunkSize) => {
+        this.progressBarManager.updateTaskProgress(fileName, chunkSize);
       },
       originDetails: {
         recipientID: recipientId,

package/dist/cjs/FileTide.js

@@ -12,6 +12,9 @@ const {
   significantMessageColors,
   errorMessageColors
 } = require("./HUDManagers/FileNetUtilityManager.js");
+const {
+  FileTransferReceiverManager
+} = require("./HUDManagers/FileTransferReceiverManager.js");
 const {
   FileNetConfigManager
 } = require("./HUDManagers/FileNetConfigManager.js");
@@ -266,7 +269,7 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
       return content;
     }
   });
-  let activeTransfers = new Map();
+  const fileTransferReceiver = new FileTransferReceiverManager();
   client.clientTide.onEvent(userID, "current-online-clients", data => {
     const currentClients = {};
     Object.keys(data).forEach(key => {
@@ -325,14 +328,10 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
     this.progressBarManager.displayPage("Page Number:", "Press 'n' for next page, 'p' for previous page.", chalk.blue, chalk.magenta);
     this.progressBarManager.listenForInput("Page Number:", "Press 'n' for next page, 'p' for previous page.", chalk.blue, chalk.magenta, chalk.yellow);
   });
-  client.clientTide.onEvent(userID, "incoming-file", data => {
+  client.clientTide.onEvent(userID, "incoming-file", async data => {
     try {
       _FileTide.outputGradient(`[${userID}] Preparing to receive file : ${data.fileName}`, significantMessageColors);
-      activeTransfers.set(data.fileName, {
-        receivedChunks: [],
-        totalChunks: data.totalChunks,
-        fileInfo: data
-      });
+      await fileTransferReceiver.initializeTransfer(data);
       const saveDir = FileUtilityManager.getTidePath(data.path);
       const verifiedSender = data.senderID && data.senderID !== userID;
       if (verifiedSender) {
@@ -342,7 +341,7 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
         });
       }
       if (onIncomingFile) {
-        onIncomingFile(verifiedSender, data, activeTransfers);
+        onIncomingFile(verifiedSender, data, fileTransferReceiver.activeTransfers);
       }
       if (verifiedSender && !fs.existsSync(saveDir)) {
         fs.mkdirSync(saveDir, {
@@ -366,17 +365,12 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
       onTransferBarrier(data);
     }
   });
-  client.clientTide.onEvent(userID, "transfer-progress", data => {
+  client.clientTide.onEvent(userID, "transfer-progress", async data => {
     if (!data || data.fileChunk === undefined || data.fileChunk === null) {
       return;
     }
-    const transferState = activeTransfers.get(data.fileName);
-    if (!transferState) {
-      return;
-    }
-    transferState.receivedChunks[data.chunkIndex] = Buffer.from(data.fileChunk);
-    const progress = (data.chunkIndex + 1) / transferState.totalChunks * 100;
-    this.progressBarManager.updateTaskProgress(data.fileName, 512 * 1024);
+    await fileTransferReceiver.handleTransferProgress(data);
+    this.progressBarManager.updateTaskProgress(data.fileName, data.chunkSize || 512 * 1024);
     if (onTransferProgress) {
       onTransferProgress(data);
     }
@@ -391,22 +385,24 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
     const savePath = FileUtilityManager.getTidePath(path.join(data.filePath, data.fileName));
     try {
       _FileTide.outputGradient(`[${userID}] File transfer complete : ${data.fileName}`, significantMessageColors);
-      const transferState = activeTransfers.get(data.fileName);
+      const transferState = fileTransferReceiver.activeTransfers.get(data.fileName);
       if (!transferState) {
         return;
       }
-      const fullFile = Buffer.concat(transferState.receivedChunks);
-      fs.writeFileSync(savePath, fullFile);
-      _FileTide.outputGradient(`[${userID}] File saved at : ${savePath}`, significantMessageColors);
-      activeTransfers.delete(data.fileName);
-      if (onTransferComplete) {
-        onTransferComplete(data, activeTransfers, true);
-      }
+      fileTransferReceiver.completeTransfer(data, (transferData, transfers, success) => {
+        if (success) {
+          _FileTide.outputGradient(`[${userID}] File saved at : ${savePath}\n`, significantMessageColors);
+        } else if (!success) {
+          _FileTide.outputGradient(`[${userID}] Did not save file at : ${savePath}\n`, errorMessageColors);
+        }
+        if (onTransferComplete) {
+          onTransferComplete(data, fileTransferReceiver.activeTransfers, success);
+        }
+      });
     } catch (error) {
       _FileTide.outputGradient(`[${userID}] Did not save file at : ${savePath}\n${error}`, errorMessageColors);
-      activeTransfers.delete(data.fileName);
       if (onTransferComplete) {
-        onTransferComplete(data, activeTransfers, false);
+        onTransferComplete(data, fileTransferReceiver.activeTransfers, false);
       }
     }
   });

package/dist/cjs/HUDManagers/FileTransferManager.js

@@ -41,7 +41,7 @@ function _startTransfer(file, transferId, fileDetails, onSendChunk, onComplete,
   const updateProgress = () => {
     const transferState = this.activeTransfers.get(transferId);
     if (onProgress) {
-      onProgress(transferState.completedChunks / transferState.totalChunks * 100);
+      onProgress(transferState.completedChunks / transferState.totalChunks * 100, this.chunkSize);
     }
   };
   return new Promise((resolve, reject) => {
@@ -60,7 +60,7 @@ function _startTransfer(file, transferId, fileDetails, onSendChunk, onComplete,
         });
       }
       transferState.activeChunks++;
-      onSendChunk(transferId, chunkIndex, chunk, transferState.totalChunks).then(() => {
+      onSendChunk(transferId, chunkIndex, this.chunkSize, chunk, transferState.totalChunks).then(() => {
         transferState.completedChunks++;
         transferState.activeChunks--;
         updateProgress();

package/dist/cjs/HUDManagers/FileTransferReceiverManager.js

@@ -0,0 +1,82 @@
+"use strict";
+
+const fs = require("fs");
+const path = require("path");
+const {
+  FileUtilityManager
+} = require("./FileUtilityManager.js");
+class FileTransferReceiverManager {
+  constructor() {
+    this.activeTransfers = new Map();
+  }
+  async initializeTransfer(data, onError) {
+    const savePath = FileUtilityManager.getTidePath(path.join(data.path || data.filePath, data.fileName));
+    if (this.activeTransfers.has(data.fileName)) {
+      return;
+    }
+    const totalChunks = data.totalChunks || Math.ceil(data.fileSize / (data.chunkSize || 512 * 1024));
+    const chunkSize = data.chunkSize || 512 * 1024;
+    try {
+      const dir = path.dirname(savePath);
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, {
+          recursive: true
+        });
+      }
+      const fileStream = fs.createWriteStream(savePath, {
+        flags: "w"
+      });
+      this.activeTransfers.set(data.fileName, {
+        receivedChunks: new Set(),
+        fileInfo: data,
+        totalChunks,
+        fileStream,
+        chunkSize
+      });
+    } catch (error) {
+      if (onError) {
+        onError(`[${data.fileName}] Did not initialize transfer ~ ${error.message}`);
+      }
+    }
+  }
+  async handleTransferProgress(data, onError) {
+    let transferState = this.activeTransfers.get(data.fileName);
+    if (!transferState) {
+      await this.initializeTransfer(data);
+      transferState = this.activeTransfers.get(data.fileName);
+    }
+    const chunkBuffer = Buffer.from(data.fileChunk);
+    try {
+      transferState.fileStream.write(chunkBuffer);
+      transferState.receivedChunks.add(data.chunkIndex);
+    } catch (error) {
+      if (onError) {
+        onError(`[${data.fileName}] Did not write chunk ${data.chunkIndex} ~ ${error.message}`);
+      }
+    }
+  }
+  async completeTransfer(data, onComplete) {
+    let transferState = this.activeTransfers.get(data.fileName);
+    if (!transferState) {
+      await this.initializeTransfer(data);
+      transferState = this.activeTransfers.get(data.fileName);
+    }
+    try {
+      if (transferState.receivedChunks.size === transferState.totalChunks) {
+        transferState.fileStream.end();
+        console.log(`[${data.fileName}] Transfer complete. All chunks received and file written.`);
+        this.activeTransfers.delete(data.fileName);
+        if (onComplete) onComplete(data, this.activeTransfers, true);
+      } else {
+        throw new Error(`[${data.fileName}] Transfer incomplete. Received ${transferState.receivedChunks.size}/${transferState.totalChunks} chunks.`);
+      }
+    } catch (error) {
+      if (onComplete) {
+        onComplete(data, this.activeTransfers, false);
+      }
+    }
+  }
+}
+module.exports = {
+  FileTransferReceiverManager
+};

package/dist/cjs/HUDManagers/FileUtilityManager.js

@@ -292,7 +292,7 @@ class FileUtilityManager {
       for (const file of files) {
         const stats = await fs.promises.stat(file.path);
         if (stats.isFile()) {
-          const fileData = FileUtilityManager.getFileData(file.path);
+          const fileData = await FileUtilityManager.getFileData(file.path);
           if (fileData) {
             filesData.push(fileData);
           }
@@ -310,22 +310,33 @@ class FileUtilityManager {
    * @param {string} inputFilePath - The full path to the file.
    * @returns {Object|null} - An object containing file data, name, path, and size or null if the file doesn't exist.
    */
-  static getFileData(inputFilePath) {
+  static async getFileData(inputFilePath) {
     const filePath = this.getTidePath(inputFilePath);
     if (!fs.existsSync(filePath)) {
       console.log(`File at path ${filePath} not found.`);
       return null;
     }
-    const fileData = fs.readFileSync(filePath, {
-      encoding: null
-    });
     const fileName = path.basename(filePath);
-    return {
-      size: fileData.length,
-      fileName,
-      fileData,
-      filePath
-    };
+    return new Promise((resolve, reject) => {
+      const fileStream = fs.createReadStream(filePath);
+      const chunks = [];
+      fileStream.on("data", chunk => {
+        chunks.push(chunk);
+      });
+      fileStream.on("end", () => {
+        const fileData = Buffer.concat(chunks);
+        resolve({
+          size: fileData.length,
+          fileName,
+          fileData,
+          filePath
+        });
+      });
+      fileStream.on("error", error => {
+        console.error(`Did not read file ${filePath}: `, error);
+        resolve(null);
+      });
+    });
   }
 
   /**
@@ -343,7 +354,7 @@ class FileUtilityManager {
     const stats = fs.statSync(currentInputPath);
     if (stats.isFile()) {
       return {
-        content: this.getFileData(currentInputPath),
+        content: await this.getFileData(currentInputPath),
         type: "file"
       };
     } else if (stats.isDirectory()) {

package/package.json

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