@trap_stevo/filetide-client 0.0.11 → 0.0.13

package/dist/cjs/FileTideClient.js

@@ -105,9 +105,9 @@ class FileTideClient {
     this.tideUrl = inputTideURL || tideUrl;
     this.currentRoom = inputCurrentRoom || currentRoom;
     this.fileMessagerInstance = fileMessagerInstance;
-    this.fileTide = fileTide;
     this.clientDisconnected = false;
     this.shortcuts = shortcuts;
+    this.connectionID = null;
     _assertClassBrand(_FileTideClient_brand, this, _setupProcessEvents).call(this);
     if (displayTitle) {
       this.displayTitle(showCLITitle);
@@ -153,73 +153,77 @@ class FileTideClient {
   broadcastClientOffline(fileMessager) {
     if (fileMessager && !this.clientDisconnected) {
       this.clientDisconnected = true;
-      fileMessager.clientTide.emitEvent(this.deviceName, "client-offline", this.deviceName);
+      const transferStates = fileTide.getTidingTransferStates();
+      fileMessager.clientTide.emitEvent(this.deviceName, "client-offline", {
+        clientID: this.deviceName,
+        connectionID: this.connectionID,
+        disconnectedDuringTransfer: transferStates.size > 0 ? true : false
+      });
       FileTide.outputGradient(`[${this.deviceName}] Disconnected from the file net.`, ["#00C897", "#00E0FF"]);
     }
   }
   startClient(clientOptions = {}, connectionOptions = {}, onConnect = null, ...clientConfigurations) {
-    if (this.fileMessagerInstance && this.fileMessagerInstance.clientTide) {
-      this.fileMessagerInstance.clientTide.closeSocket(this.deviceName);
-    }
-    this.fileTide.launchMessager({
-      serverUrl: this.tideUrl,
-      ...clientOptions
-    }, {
-      maxHttpBufferSize: 5e9,
-      pingTimeout: 3600000,
-      pingInterval: 60000,
-      ...connectionOptions
-    }, this.currentRoom, this.deviceName, fileMessager => {
-      this.fileMessagerInstance = fileMessager;
-      fileMessager.clientTide.onEvent(this.deviceName, "connect", () => {
-        this.clientDisconnected = false;
-        FileTide.outputGradient(`[${this.deviceName}] Connected to FileTide ~ ${this.tideUrl} in ${this.currentRoom}!`, ["#00C897", "#00E0FF"]);
-        fileMessager.clientTide.emitEvent(this.deviceName, "client-online", this.deviceName, fileMessager.clientTide.sockets[this.deviceName].tideID, this.pDeviceName, fileMessager.clientTide.sockets[this.deviceName].id);
-        FileTide.outputGradient(`[${this.deviceName}] Getting connected clients...`, ["#00C897", "#00E0FF"]);
-        if (onConnect) {
-          onConnect(fileMessager);
-        }
-      });
-      fileMessager.clientTide.onEvent(this.deviceName, "disconnect", () => {
-        this.broadcastClientOffline(fileMessager);
-      });
-    }, ...clientConfigurations);
+    const launchClient = () => {
+      if (this.fileMessagerInstance && this.fileMessagerInstance.clientTide) {
+        this.fileMessagerInstance.clientTide.closeSocket(this.deviceName);
+      }
+      fileTide.launchMessager({
+        serverUrl: this.tideUrl,
+        ...clientOptions
+      }, {
+        maxHttpBufferSize: 5e9,
+        pingTimeout: 3600000,
+        pingInterval: 60000,
+        ...connectionOptions
+      }, this.currentRoom, this.deviceName, (fileMessager, enterRoom) => {
+        this.fileMessagerInstance = fileMessager;
+        this.connectionID = null;
+        fileMessager.clientTide.onEvent(this.deviceName, "connect", async () => {
+          this.clientDisconnected = false;
+          this.connectionID = fileMessager.clientTide.sockets[this.deviceName].id;
+          FileTide.outputGradient(`[${this.deviceName}] Connected to FileTide ~ ${this.tideUrl} in ${this.currentRoom}!`, ["#00C897", "#00E0FF"]);
+          fileMessager.clientTide.emitEvent(this.deviceName, "client-online", this.deviceName, fileMessager.clientTide.sockets[this.deviceName].tideID, this.pDeviceName, fileMessager.clientTide.sockets[this.deviceName].id);
+          const clientOnline = await fileMessager.clientTide.emitEventWithResponse(this.deviceName, "check-client-online", "retrieved-client-online", {
+            clientID: this.deviceName
+          }, 5000);
+          if (clientOnline && clientOnline.online && clientOnline.client.id !== this.connectionID) {
+            launchClient();
+            return;
+          }
+          enterRoom();
+          FileTide.outputGradient(`[${this.deviceName}] Getting connected clients...`, ["#00C897", "#00E0FF"]);
+          if (onConnect) {
+            onConnect(fileMessager);
+          }
+        });
+        fileMessager.clientTide.onEvent(this.deviceName, "disconnect", () => {
+          this.broadcastClientOffline(fileMessager);
+        });
+      }, ...clientConfigurations);
+    };
+    launchClient();
   }
   requestFileTransfer(senderID, filePath, destinationPath, filterContent = []) {
     FileTide.outputGradient(`[${this.deviceName}] Requesting ${path.basename(filePath)} from client ~ ${senderID}...`, ["#00C897", "#00E0FF"]);
     this.fileMessagerInstance.requestTransfer(this.deviceName, senderID, filePath, destinationPath, filterContent);
     return;
   }
-  async transferFiles(recipientID, filePath, destinationPath, filterContent = []) {
-    const fileDetails = await this.fileTide.getPathData(filePath, filterContent);
-    if (!fileDetails) {
-      FileTide.outputGradient(`[${this.deviceName}] File at path ${filePath} not found.`, ["#F94144", "#F3722C"]);
-      return;
-    }
-    if (fileDetails.type === "file") {
-      FileTide.outputGradient(`[${this.deviceName}] Sending file ~ ${fileDetails.content.fileName} to client ~ ${recipientID}...`, ["#00C897", "#00E0FF"]);
-      this.fileMessagerInstance.sendFile(this.deviceName, recipientID, fileDetails.content.fileName, fileDetails.content.fileData, destinationPath, fileDetails.content.size);
-      return;
-    }
-    if (fileDetails.type === "directory") {
-      FileTide.outputGradient(`[${this.deviceName}] Sending ${fileDetails.content.length} files in directory ~ ${path.basename(filePath)} to client ~ ${recipientID}...`, ["#00C897", "#00E0FF"]);
-      this.fileMessagerInstance.sendDirectoryFiles(this.deviceName, recipientID, fileDetails.content, this.fileTide.getTidePath(filePath), destinationPath);
-      return;
-    }
+  async transferFiles(recipientID, filePath, destinationPath, filterContent = [], tideSize = 500, minTideSize = 10, maxTideSize = 2000) {
+    await fileTide.sendToDevice(recipientID, filePath, destinationPath, filterContent, tideSize, minTideSize, maxTideSize);
     return;
   }
   listFiles(recipientID, depth = 1) {
-    this.fileTide.listFilesFromClient(recipientID, depth);
+    fileTide.listFilesFromClient(recipientID, depth);
     return;
   }
   clearShorePolicies(clientID, shores = []) {
-    return this.fileTide.clearShorePolicies(clientID, shores);
+    return fileTide.clearShorePolicies(clientID, shores);
   }
   addShorePolicies(clientID, shores = []) {
-    return this.fileTide.addShorePolicies(clientID, shores);
+    return fileTide.addShorePolicies(clientID, shores);
   }
   getShorePolicies(clientID) {
-    return this.fileTide.getShorePolicies(clientID);
+    return fileTide.getShorePolicies(clientID);
   }
   addShortcuts(inputShortcuts) {
     for (const [key, value] of Object.entries(inputShortcuts)) {
@@ -255,18 +259,27 @@ class FileTideClient {
     FileTide.outputGradient(`[${this.deviceName}] Updated room to ${this.currentRoom}`, ["#4D96FF", "#89CFF0"]);
     this.startClient({}, {}, onReconnect);
     if (completion) {
-      completion(room);
+      completion(room, true);
     }
     return;
   }
-  changeClientID(clientID, completion, onReconnect) {
-    this.currentDeviceName = this.deviceName;
-    this.deviceName = clientID;
-    this.fileMessagerInstance.clientTide.emitEvent(this.currentDeviceName, "client-offline", this.currentDeviceName);
-    FileTide.outputGradient(`[${this.deviceName}] Updated client name to ${this.deviceName}`, ["#4D96FF", "#89CFF0"]);
-    this.startClient({}, {}, onReconnect);
+  async changeClientID(clientID, completion, onReconnect) {
+    const clientOnline = await this.fileMessagerInstance.clientTide.emitEventWithResponse(clientID, "check-client-online", "retrieved-client-online", {
+      clientID
+    }, 5000);
+    let updatedClientID = false;
+    if (clientOnline && clientOnline.online && clientOnline.client.id !== this.connectionID) {
+      FileTide.outputGradient(`[${this.deviceName}] Client name taken ~ ${this.deviceName}`, ["#4D96FF", "#89CFF0"]);
+    } else if (!clientOnline || !clientOnline.online || clientOnline.client.id === this.connectionID) {
+      this.currentDeviceName = this.deviceName;
+      this.deviceName = clientID;
+      this.fileMessagerInstance.clientTide.emitEvent(this.currentDeviceName, "client-offline", this.currentDeviceName);
+      FileTide.outputGradient(`[${this.deviceName}] Updated client name to ${this.deviceName}`, ["#4D96FF", "#89CFF0"]);
+      this.startClient({}, {}, onReconnect);
+      updatedClientID = true;
+    }
     if (completion) {
-      completion(clientID);
+      completion(clientID, updatedClientID);
     }
     return;
   }
@@ -275,7 +288,7 @@ class FileTideClient {
     FileTide.outputGradient(`[${this.deviceName}] Updated tide URL to ${this.tideUrl}`, ["#4D96FF", "#89CFF0"]);
     this.startClient({}, {}, onReconnect);
     if (completion) {
-      completion(url);
+      completion(url, true);
     }
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trap_stevo/filetide-client",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "Seamless, real-time file transfers between devices with effortless connectivity. Allowing for powerful, instant, secure, and cross-platform file sharing, enabling efficient and reliable data transfers in any network environment.",
   "main": "dist/cjs/FileTideClient.js",
   "exports": {
@@ -8,6 +8,7 @@
   },
   "scripts": {
     "build": "babel src -d dist/cjs --env-name cjs",
+    "start-client": "node ./demos/FileTideClientDemo.js",
     "start": "node ./dist/cjs/FileTideClient.js"
   },
   "keywords": [
@@ -36,7 +37,7 @@
   "author": "Steven Compton",
   "license": "See License in LICENSE.md",
   "dependencies": {
-    "@trap_stevo/filetide": "^0.0.39",
+    "@trap_stevo/filetide": "^0.0.44",
     "@trap_stevo/iotide": "^0.0.37",
     "@trap_stevo/legendarybuilderpronodejs-utilities": "^1.0.36",
     "chalk": "^4.1.2",