@trap_stevo/filetide 0.0.79 → 0.0.80

package/dist/cjs/FileMessager.js

@@ -1476,8 +1476,9 @@ class FileMessager {
    * @param {Buffer} fileChunk - The file chunk to send
    * @param {String} fileName - The name of the file
    * @param {Number} chunkIndex - The index of the current chunk
+   * @param {Object} metadata - Any additional identifying data attached to the transfer
    */
-  sendFileChunkToClient(senderData, clientData, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath = process.cwd(), fileSize = 100) {
+  sendFileChunkToClient(senderData, clientData, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath = process.cwd(), fileSize = 100, metadata = {}) {
     const senderClient = this.getClientFromID(senderData.id);
     const client = this.getClientFromID(clientData.id);
     if (!client) {
@@ -1511,7 +1512,8 @@ class FileMessager {
           fileSize,
           fileName,
           totalChunks,
-          chunkSize
+          chunkSize,
+          transferMetadata: metadata
         }
       });
       this.onTideAction({
@@ -1524,7 +1526,8 @@ class FileMessager {
           fileSize,
           fileName,
           totalChunks,
-          chunkSize
+          chunkSize,
+          transferMetadata: metadata
         }
       });
     }
@@ -1536,7 +1539,8 @@ class FileMessager {
       chunkIndex,
       chunkSize,
       path: filePath,
-      fileSize
+      fileSize,
+      metadata
     });
     _assertClassBrand(_FileMessager_brand, this, _log).call(this, `[FileTide ~ File Messager] ~ Sent chunk ${chunkIndex} of ${fileName} to client ~ ${clientData.userID}!`);
     if (senderClient) {
@@ -1551,7 +1555,8 @@ class FileMessager {
         totalChunks,
         chunkSize,
         path: filePath,
-        fileSize
+        fileSize,
+        metadata
       });
     }
   }
@@ -1726,7 +1731,8 @@ class FileMessager {
             chunkIndex,
             chunkSize,
             completedChunks,
-            totalChunks
+            totalChunks,
+            metadata = {}
           } = chunkData;
           _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);
@@ -1737,7 +1743,7 @@ class FileMessager {
           }, {
             userID: recipientId,
             id: recipientClient.id
-          }, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath, fileSize);
+          }, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath, fileSize, metadata);
           if (completedChunks === totalChunks) {
             this.fileNet.emitToTide(recipientClient.tideID, "transfer-complete", {
               senderID,
@@ -1770,7 +1776,8 @@ class FileMessager {
                 fileName,
                 completedChunks,
                 totalChunks,
-                chunkSize
+                chunkSize,
+                transferMetadata: metadata
               }
             });
             this.onTideAction({
@@ -1784,7 +1791,8 @@ class FileMessager {
                 fileName,
                 completedChunks,
                 totalChunks,
-                chunkSize
+                chunkSize,
+                transferMetadata: metadata
               }
             });
             console.log(`[FileTide ~ File Messager] ~ File transfer completed: ${fileName} from ${senderID} to ${recipientId}`);
@@ -1806,7 +1814,8 @@ class FileMessager {
         chunkIndex,
         chunkSize,
         completedChunks,
-        totalChunks
+        totalChunks,
+        metadata = {}
       } = transferData;
       _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);
@@ -1817,7 +1826,7 @@ class FileMessager {
       }, {
         userID: recipientId,
         id: recipientClient.id
-      }, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath, fileSize);
+      }, fileChunk, fileName, chunkIndex, chunkSize, totalChunks, filePath, fileSize, metadata);
       if (chunkIndex + 1 === totalChunks) {
         this.fileNet.emitToTide(recipientClient.tideID, "transfer-complete", {
           senderID,
@@ -1850,7 +1859,8 @@ class FileMessager {
             fileName,
             completedChunks,
             totalChunks,
-            chunkSize
+            chunkSize,
+            transferMetadata: metadata
           }
         });
         this.onTideAction({
@@ -1864,7 +1874,8 @@ class FileMessager {
             fileName,
             completedChunks,
             totalChunks,
-            chunkSize
+            chunkSize,
+            transferMetadata: metadata
           }
         });
         console.log(`[FileTide ~ File Messager] ~ File transfer completed: ${fileName} from ${senderID} to ${recipientId}`);
@@ -2058,6 +2069,8 @@ class FileMessager {
       const transferSize = FileNetUtilityManager.getFormattedSize(data.transferStats.totalSize, true);
       const transferSpeed = FileNetUtilityManager.getFormattedSize(data.transferStats.speed, true);
       const transferStartTime = data.transferStats.startTime;
+      const transferMetadata = data.metadata;
+      const contentType = transferMetadata?.contentType ?? "file";
       const fileName = data.fileName;
       console.log(`[FileTide ~ Net Activity] ~ ${data.recipientName} acknowledged tide transfer from ${data.senderName}.\n\n\t~ [${fileName}-${transferStartTime}] ~\n\n\t\tFile Name ~ ${fileName}\n\t\tDestination ~ ${data.path}\n\n\t\t\tProgress ~ ${transferProgress}%\n\t\t\tETA ~ ${transferETA}\n\t\t\tSpeed ~ ${transferSpeed}/s\n\t\t\tSize ~ ${transferSize}\n\t\t\tTransferred ~ ${currentTransferredSize}\n`);
       tidalytics.track("tide:transfer-state", {
@@ -2071,6 +2084,7 @@ class FileMessager {
           path: data.path,
           startTime: transferStartTime,
           transferSize,
+          contentType,
           fileName
         },
         metadata: {
@@ -2084,7 +2098,8 @@ class FileMessager {
           transferProgress,
           transferSize,
           transferETA,
-          fileName
+          fileName,
+          transferMetadata
         }
       });
       this.onTideAction({
@@ -2101,7 +2116,9 @@ class FileMessager {
           transferProgress,
           transferSize,
           transferETA,
-          fileName
+          contentType,
+          fileName,
+          transferMetadata
         }
       });
     } catch (error) {

package/dist/cjs/FileMessagerClient.js

@@ -136,8 +136,9 @@ class FileMessagerClient {
    * @param {Number} minTideSize - The minimum tide size in sending files (10).
    * @param {Number} maxTideSize - The maximum tide size in sending files (2000).
    * @param {Number} transferRequestExpirationTime - The maximum time until the transfer barrier times out the transfer request.
+   * @param {Object} metadata - Any additional identifying data attached to the transfer.
    */
-  async sendDirectoryFiles(clientID, recipientId, filesData, baseDirectory, destinationPath, tideSize = 500, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000) {
+  async sendDirectoryFiles(clientID, recipientId, filesData, baseDirectory, destinationPath, tideSize = 500, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000, metadata = {}) {
     try {
       const baseDirectoryName = path.basename(baseDirectory);
       const adjustedDestinationPath = FileUtilityManager.normalizePath(path.join(destinationPath, baseDirectoryName));
@@ -157,23 +158,23 @@ class FileMessagerClient {
         const relativeFilePath = path.dirname(path.relative(baseDirectory, fileInfo.filePath));
         const fileDestinationPath = FileUtilityManager.normalizePath(path.join(adjustedDestinationPath, relativeFilePath));
         if (fileInfo.largeFile) {
-          return await this.sendDirectoryLargeFile(clientID, recipientId, fileInfo.fileName, fileInfo.filePath, fileDestinationPath, fileInfo.fileSize, index, tideSize, minTideSize, maxTideSize, transferRequestExpirationTime);
+          return await this.sendDirectoryLargeFile(clientID, recipientId, fileInfo.fileName, fileInfo.filePath, fileDestinationPath, fileInfo.fileSize, index, tideSize, minTideSize, maxTideSize, transferRequestExpirationTime, metadata);
         }
-        return await this.sendDirectoryFile(clientID, recipientId, fileInfo.fileName, fileInfo.filePath, fileInfo.size, fileDestinationPath, index, tideSize, minTideSize, maxTideSize, transferRequestExpirationTime);
+        return await this.sendDirectoryFile(clientID, recipientId, fileInfo.fileName, fileInfo.filePath, fileInfo.size, fileDestinationPath, index, tideSize, minTideSize, maxTideSize, transferRequestExpirationTime, metadata);
       });
       Promise.all(sendFilePromises).then(() => console.log("\nAll files in directory transferred successfully!")).catch(error => console.error("Did not transfer directory: ", error));
     } catch (error) {
       FileTideDebugUtilityManager.outputGradient(`[FileTide ~ File Messager] ~ Refused directory transfer: ${error}`, errorMessageColors);
     }
   }
-  async sendDirectoryLargeFile(clientID, recipientId, fileName, filePath = process.cwd(), destinationPath = null, fileSize, index = 0, tideSize = 500, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000) {
+  async sendDirectoryLargeFile(clientID, recipientId, fileName, filePath = process.cwd(), destinationPath = null, fileSize, index = 0, tideSize = 500, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000, metadata = {}) {
     let initiatingTransfer = false;
     if (index === 0) {
       initiatingTransfer = true;
     }
-    return await this.sendFile(clientID, recipientId, fileName, filePath, destinationPath, fileSize, tideSize, minTideSize, maxTideSize, initiatingTransfer, true, true, true, transferRequestExpirationTime);
+    return await this.sendFile(clientID, recipientId, fileName, filePath, destinationPath, fileSize, tideSize, minTideSize, maxTideSize, initiatingTransfer, true, true, true, transferRequestExpirationTime, metadata);
   }
-  async sendDirectoryFile(clientID, recipientId, fileName, filePath = process.cwd(), fileSize, directoryPath = null, index = 0, tideSize = 200, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000) {
+  async sendDirectoryFile(clientID, recipientId, fileName, filePath = process.cwd(), fileSize, directoryPath = null, index = 0, tideSize = 200, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000, metadata = {}) {
     if (!filePath) {
       return;
     }
@@ -184,13 +185,14 @@ class FileMessagerClient {
         senderID: clientID,
         recipientID: recipientId,
         path: directoryPath || filePath,
-        fileSize
+        fileSize,
+        metadata
       });
       initiatingTransfer = true;
     }
-    return await this.sendFile(clientID, recipientId, fileName, filePath, directoryPath, fileSize, tideSize, minTideSize, maxTideSize, initiatingTransfer, true, true, false, transferRequestExpirationTime);
+    return await this.sendFile(clientID, recipientId, fileName, filePath, directoryPath, fileSize, tideSize, minTideSize, maxTideSize, initiatingTransfer, true, true, false, transferRequestExpirationTime, metadata);
   }
-  async sendFile(clientID, recipientId, fileName, filePath = process.cwd(), destination = process.cwd(), fileSize, tideSize = 500, minTideSize = 10, maxTideSize = 2000, initiatingTransfer = true, inDirectory = false, largeFile = false, transferRequestExpirationTime = 30000) {
+  async sendFile(clientID, recipientId, fileName, filePath = process.cwd(), destination = process.cwd(), fileSize, tideSize = 500, minTideSize = 10, maxTideSize = 2000, initiatingTransfer = true, inDirectory = false, largeFile = false, transferRequestExpirationTime = 30000, metadata = {}) {
     const destinationPath = FileUtilityManager.normalizePath(path.join(destination, fileName));
     FileTideDebugUtilityManager.outputGradient(largeFile ? `[FileTide ~ File Messager] ~ Requesting to transfer large file ~ ${destinationPath} to ${recipientId}!` : `[FileTide ~ File Messager] ~ Requesting to transfer ~ ${destinationPath} to ${recipientId}!`, significantMessageColors);
     const incomingType = this.activeTransferTypes.get(filePath);
@@ -207,7 +209,8 @@ class FileMessagerClient {
         senderID: clientID,
         recipientID: recipientId,
         path: destination,
-        fileSize
+        fileSize,
+        metadata
       });
     } else if (inDirectory && !initiatingTransfer) {
       if (incomingType) {
@@ -247,7 +250,8 @@ class FileMessagerClient {
               chunkIndex,
               chunkSize,
               filePath: destination,
-              fileSize
+              fileSize,
+              metadata
             });
             if (!transferInitiated) {
               this.clientTide.emitEvent(clientID, "client-to-client-transfer", {
@@ -286,7 +290,8 @@ class FileMessagerClient {
               senderID: clientID,
               recipientId,
               fileName,
-              filePath: destination
+              filePath: destination,
+              metadata
             });
             resolve();
           });

package/dist/cjs/FileTide.js

@@ -270,8 +270,9 @@ class FileTide {
    * @param {Number} minTideSize - The minimum tide size in sending files (10).
    * @param {Number} maxTideSize - The maximum tide size in sending files (2000).
    * @param {Number} transferRequestExpirationTime - The maximum time until the transfer barrier times out the transfer request.
+   * @param {Object} metadata - Any additional identifying data attached to the transfer.
    */
-  async sendToDevice(recipientID, filePath, destinationPath, filterDirectoryContent = [], tideSize = 200, tidalSize = 500, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000) {
+  async sendToDevice(recipientID, filePath, destinationPath, filterDirectoryContent = [], tideSize = 200, tidalSize = 500, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000, metadata = {}) {
     return await TideTokenEnforcer.protect(async () => {
       const clientID = this.currentUserID;
       const clientMessager = this.clients.get(clientID);
@@ -295,19 +296,23 @@ class FileTide {
         FileTide.outputGradient(`[${clientID}] File at path ${filePath} not found.`, errorMessageColors);
         return false;
       }
+      const transferMetadata = {
+        ...(metadata ?? {}),
+        contentType: fileDetails.type
+      };
       if (fileDetails.type === "file") {
         if (fileDetails.largeFile) {
           FileTide.outputGradient(`[${clientID}] Sending large file ~ ${fileDetails.fileName} to client ~ ${recipientID}...`, significantMessageColors);
-          await clientMessager.sendFile(clientID, recipientID, fileDetails.fileName, fileDetails.filePath, destinationPath, fileDetails.fileSize, tidalSize, minTideSize, maxTideSize, true, false, true, transferRequestExpirationTime);
+          await clientMessager.sendFile(clientID, recipientID, fileDetails.fileName, fileDetails.filePath, destinationPath, fileDetails.fileSize, tidalSize, minTideSize, maxTideSize, true, false, true, transferRequestExpirationTime, transferMetadata);
           return true;
         }
         FileTide.outputGradient(`[${clientID}] Sending file ~ ${fileDetails.content.fileName} to client ~ ${recipientID}...`, significantMessageColors);
-        await clientMessager.sendFile(clientID, recipientID, fileDetails.content.fileName, fileDetails.content.filePath, destinationPath, fileDetails.content.size, tideSize, minTideSize, maxTideSize, transferRequestExpirationTime);
+        await clientMessager.sendFile(clientID, recipientID, fileDetails.content.fileName, fileDetails.content.filePath, destinationPath, fileDetails.content.size, tideSize, minTideSize, maxTideSize, true, false, false, transferRequestExpirationTime, transferMetadata);
         return true;
       }
       if (fileDetails.type === "directory") {
         FileTide.outputGradient(`[${clientID}] Sending ${fileDetails.content.length} files in directory ~ ${path.basename(filePath)} to client ~ ${recipientID}...`, significantMessageColors);
-        await clientMessager.sendDirectoryFiles(clientID, recipientID, fileDetails.content, this.getTidePath(filePath), destinationPath, tideSize, minTideSize, maxTideSize, transferRequestExpirationTime);
+        await clientMessager.sendDirectoryFiles(clientID, recipientID, fileDetails.content, this.getTidePath(filePath), destinationPath, tideSize, minTideSize, maxTideSize, true, true, false, transferRequestExpirationTime, transferMetadata);
         return true;
       }
       FileTide.outputGradient(`[FileTide] ~ No active client ~ ${recipientID} found.`, errorMessageColors);
@@ -682,12 +687,14 @@ function _setupFileEventListeners(userID, client, onTransferProgress, onIncoming
       recipientName: userID,
       transferStateID: `${data.path}-${data.fileName}`,
       path: data.path,
-      transferStats: taskBarStats
+      transferStats: taskBarStats,
+      metadata: data.metadata
     });
     if (onTransferProgress) {
       onTransferProgress({
         ...data,
-        stats: taskBarStats
+        stats: taskBarStats,
+        metadata: data.metadata
       });
     }
   });

package/package.json

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