@trap_stevo/filetide-client 0.0.70 → 0.0.72

package/dist/cjs/FileTideClient.js

@@ -9,8 +9,6 @@ const os = require("os");
 let currentRoom = "file-room";
 let tideUrl = "http://localhost:9269";
 const deviceName = os.hostname();
-let fileTide;
-let fileMessagerInstance;
 const gradients = {
   success: ["\x1b[38;5;48m", "\x1b[38;5;49m", "\x1b[38;5;50m"],
   indicator: ["\x1b[38;5;30m", "\x1b[38;5;37m", "\x1b[38;5;44m", "\x1b[38;5;51m", "\x1b[38;5;147m"],
@@ -25,13 +23,13 @@ class FileTideClient {
   constructor(inputDeviceName, inputTideURL, inputCurrentRoom, displayTitle = true, showAuthor = false, showCLITitle = false, debugMode = false) {
     // --- FileTide Client Cleanup Management ---
     _classPrivateMethodInitSpec(this, _FileTideClient_brand);
-    fileTide = new FileTide(debugMode);
+    this.fileTide = new FileTide(debugMode);
     this.currentDeviceName = inputDeviceName || deviceName;
     this.originDeviceName = inputDeviceName || deviceName;
     this.deviceName = inputDeviceName || deviceName;
     this.tideUrl = inputTideURL || tideUrl;
     this.currentRoom = inputCurrentRoom || currentRoom;
-    this.fileMessagerInstance = fileMessagerInstance;
+    this.fileMessagerInstance = null;
     this.clientDisconnected = false;
     this.connectionID = null;
     _assertClassBrand(_FileTideClient_brand, this, _setupProcessEvents).call(this);
@@ -57,31 +55,31 @@ class FileTideClient {
   // --- FileTide Client TideToken Enforcement Management ---
 
   updateTideTokenEnforcementCallbackConfigurations(updatedConfigurations = {}) {
-    fileTide.updateTideTokenEnforcementCallbackConfigurations(updatedConfigurations);
+    this.fileTide.updateTideTokenEnforcementCallbackConfigurations(updatedConfigurations);
   }
   async registerTideToken(tideToken, meta = {}) {
-    return await fileTide.registerTideToken(tideToken, meta);
+    return await this.fileTide.registerTideToken(tideToken, meta);
   }
   async inspectTideToken(tideToken) {
-    return await fileTide.inspectTideToken(tideToken);
+    return await this.fileTide.inspectTideToken(tideToken);
   }
   getTideTokenEnforcerOverviewMetrics() {
-    return fileTide.getTideTokenEnforcerOverviewMetrics();
+    return this.fileTide.getTideTokenEnforcerOverviewMetrics();
   }
   getTideToken(scope = "default") {
-    return fileTide.getTideToken(scope);
+    return this.fileTide.getTideToken(scope);
   }
 
   // --- FileTide Client Storage Management ---
 
   async initializeStorage(options = {}) {
-    return await fileTide.initializeStorage(options);
+    return await this.fileTide.initializeStorage(options);
   }
   storage(namespace) {
-    return fileTide.storage(namespace);
+    return this.fileTide.storage(namespace);
   }
   getStorageManager() {
-    return fileTide.getStorageManager();
+    return this.fileTide.getStorageManager();
   }
   broadcastClientOffline(fileMessager, forceBroadcast = false) {
     if (fileMessager && !this.clientDisconnected) {
@@ -104,7 +102,7 @@ class FileTideClient {
     FileTide.outputGradient(`[${this.deviceName}] Disconnected from the Anchor.`, ["#00C897", "#00E0FF"]);
   }
   async closeAllClients(onBeforeClientDisconnect, onClientDisconnect, onCompletion) {
-    await fileTide.stopAllMessagers(async (...data) => {
+    await this.fileTide.stopAllMessagers(async (...data) => {
       this.broadcastClientOffline(this.fileMessagerInstance);
       if (typeof onBeforeClientDisconnect === "function") {
         await onBeforeClientDisconnect(...data);
@@ -112,7 +110,7 @@ class FileTideClient {
     }, onClientDisconnect, onCompletion);
   }
   async closeClient(userID, onBeforeDisconnect, onDisconnect, onCompletion) {
-    await fileTide.stopMessager(userID, async (...data) => {
+    await this.fileTide.stopMessager(userID, async (...data) => {
       this.broadcastClientOffline(this.fileMessagerInstance);
       if (typeof onBeforeDisconnect === "function") {
         await onBeforeDisconnect(...data);
@@ -132,6 +130,7 @@ class FileTideClient {
   }, onConnect = null, onDisconnect = null, clientConfigurations = {}) {
     const {
       onLaunch = null,
+      onReady = null,
       onIncomingFile = null,
       onIncomingTransfer = null,
       onTransferBarrier = null,
@@ -158,22 +157,21 @@ class FileTideClient {
       }
       let enterRoom = null;
       let pendingConnectionArguments = null;
-      let connectionHandled = false;
+      let handledConnectionID = null;
       const handleConnection = async (...connectionArguments) => {
         if (typeof enterRoom !== "function") {
           pendingConnectionArguments = connectionArguments;
           return;
         }
-        if (connectionHandled) {
-          return;
-        }
-        connectionHandled = true;
-        this.clientDisconnected = false;
         const socket = this.fileMessagerInstance?.clientTide?.sockets?.[this.deviceName];
         if (!socket) {
-          connectionHandled = false;
           return;
         }
+        if (handledConnectionID === socket.id) {
+          return;
+        }
+        handledConnectionID = socket.id;
+        this.clientDisconnected = false;
         this.connectionID = socket.id;
 
         /*
@@ -190,13 +188,12 @@ class FileTideClient {
          * originClientID
          * currentTideChannel
          */
-        this.fileMessagerInstance.clientTide.emitEvent(this.deviceName, "client-online", this.deviceName, socket.tideID, this.currentDeviceName, socket.id, fileTide.transferBarrier, this.originDeviceName, this.currentRoom);
-        enterRoom();
+        this.fileMessagerInstance.clientTide.emitEvent(this.deviceName, "client-online", this.deviceName, socket.tideID, this.currentDeviceName, socket.id, this.fileTide.transferBarrier, this.originDeviceName, this.currentRoom);
         if (typeof onConnect === "function") {
           await onConnect(this.fileMessagerInstance, ...connectionArguments);
         }
       };
-      fileTide.launchMessager({
+      this.fileTide.launchMessager({
         serverUrl: this.tideUrl,
         ...clientOptions
       }, {
@@ -204,12 +201,30 @@ class FileTideClient {
         pingTimeout: 3600000,
         pingInterval: 60000,
         ...connectionOptions
-      }, transportOptions, messagerSettings, this.currentRoom, this.deviceName, (fileMessager, roomEntry) => {
+      }, transportOptions, messagerSettings, this.currentRoom, this.deviceName, (fileMessager, roomEntry, resolvedClientID) => {
+        this.deviceName = resolvedClientID;
+        this.currentDeviceName = resolvedClientID;
+        this.originDeviceName = resolvedClientID;
         this.fileMessagerInstance = fileMessager;
-        fileMessagerInstance = fileMessager;
         enterRoom = roomEntry;
+        let readyConnectionID = null;
+        const launchSocket = fileMessager.clientTide.sockets[this.deviceName];
+        launchSocket.on("filetide-identity-authorized", async authorization => {
+          const socket = fileMessager.clientTide.sockets?.[this.deviceName];
+          if (authorization?.clientID !== this.deviceName || !socket?.connected || !this.getClientAuthorizationState().authenticated || readyConnectionID === socket.id) {
+            return;
+          }
+          readyConnectionID = socket.id;
+          enterRoom();
+          if (typeof onReady === "function") {
+            await onReady(fileMessager, authorization);
+          }
+        });
+        launchSocket.on("disconnect", () => {
+          readyConnectionID = null;
+        });
         if (typeof onLaunch === "function") {
-          onLaunch(fileMessager, roomEntry);
+          onLaunch(fileMessager, roomEntry, resolvedClientID);
         }
         if (pendingConnectionArguments) {
           const connectionArguments = pendingConnectionArguments;
@@ -245,6 +260,18 @@ class FileTideClient {
     this.startClient(this.clientOptions, this.connectionOptions, this.transportOptions, this.messagerSettings, onReconnect, onDisconnect, clientConfigurations);
   }
 
+  // --- FileTide Client Identity Management ---
+
+  getClientAuthorizationState() {
+    return this.fileTide.getClientAuthorizationState(this.deviceName);
+  }
+  async associateClientID(targetClientID) {
+    return await this.fileTide.associateClientID(this.deviceName, targetClientID);
+  }
+  async recoverClientID(targetClientID, destinationIdentity) {
+    return await this.fileTide.recoverClientID(this.deviceName, targetClientID, destinationIdentity);
+  }
+
   // --- FileTide Client Transfer Management ---
 
   async requestFileTransfer(senderID, filePath, destinationPath, filterContent = [], transferRequestExpirationTime = 30000) {
@@ -252,106 +279,106 @@ class FileTideClient {
     return await this.fileMessagerInstance.requestTransfer(this.deviceName, senderID, filePath, destinationPath, filterContent, transferRequestExpirationTime);
   }
   async transferFiles(recipientID, filePath, destinationPath, filterContent = [], tideSize = 200, tidalSize = 500, minTideSize = 10, maxTideSize = 2000, transferRequestExpirationTime = 30000, metadata = {}) {
-    return await fileTide.sendToDevice(recipientID, filePath, destinationPath, filterContent, tideSize, tidalSize, minTideSize, maxTideSize, transferRequestExpirationTime, metadata);
+    return await this.fileTide.sendToDevice(recipientID, filePath, destinationPath, filterContent, tideSize, tidalSize, minTideSize, maxTideSize, transferRequestExpirationTime, metadata);
   }
   listFiles(recipientID, depth = 1) {
-    return fileTide.listFilesFromClient(recipientID, depth);
+    return this.fileTide.listFilesFromClient(recipientID, depth);
   }
 
   // --- FileTide Client Transfer State Management ---
 
   getTransferStats(transferID) {
-    return fileTide.getTransferStats(transferID);
+    return this.fileTide.getTransferStats(transferID);
   }
   getTransferStatsOverview() {
-    return fileTide.getTransferStatsOverview();
+    return this.fileTide.getTransferStatsOverview();
   }
 
   // --- FileTide Client Transfer History Management ---
 
   async getTransferHistory(options = {}) {
-    return await fileTide.getTransferHistory(options);
+    return await this.fileTide.getTransferHistory(options);
   }
   async getTransferHistoryEntry(transferID, options = {}) {
-    return await fileTide.getTransferHistoryEntry(transferID, options);
+    return await this.fileTide.getTransferHistoryEntry(transferID, options);
   }
   async clearTransferHistory(options = {}) {
-    return await fileTide.clearTransferHistory(options);
+    return await this.fileTide.clearTransferHistory(options);
   }
   async pruneTransferHistory(maxEntries, options = {}) {
-    return await fileTide.pruneTransferHistory(maxEntries, options);
+    return await this.fileTide.pruneTransferHistory(maxEntries, options);
   }
 
   // --- FileTide Client Shore Policy Management ---
 
   async clearShorePolicies(clientID = this.deviceName) {
-    return await fileTide.clearShorePolicies(clientID);
+    return await this.fileTide.clearShorePolicies(clientID);
   }
   async removeShorePolicies(shores = [], clientID = this.deviceName) {
-    return await fileTide.removeShorePolicies(clientID, shores);
+    return await this.fileTide.removeShorePolicies(clientID, shores);
   }
   async addShorePolicies(shores = [], clientID = this.deviceName) {
-    return await fileTide.addShorePolicies(clientID, shores);
+    return await this.fileTide.addShorePolicies(clientID, shores);
   }
   async setShorePolicies(shores = [], clientID = this.deviceName) {
-    return await fileTide.setShorePolicies(clientID, shores);
+    return await this.fileTide.setShorePolicies(clientID, shores);
   }
   async resetShorePolicies(clientID = this.deviceName) {
-    return await fileTide.resetShorePolicies(clientID);
+    return await this.fileTide.resetShorePolicies(clientID);
   }
   async pathWithinShorePolicies(inputPath, clientID = this.deviceName) {
-    return await fileTide.pathWithinShorePolicies(clientID, inputPath);
+    return await this.fileTide.pathWithinShorePolicies(clientID, inputPath);
   }
   async getShorePolicies(clientID = this.deviceName) {
-    return await fileTide.getShorePolicies(clientID);
+    return await this.fileTide.getShorePolicies(clientID);
   }
   getDefaultShorePolicies() {
-    return fileTide.getDefaultShorePolicies();
+    return this.fileTide.getDefaultShorePolicies();
   }
   async getResolvedShorePolicies(clientID = this.deviceName) {
-    return await fileTide.getResolvedShorePolicies(clientID);
+    return await this.fileTide.getResolvedShorePolicies(clientID);
   }
 
   // --- FileTide Client Shortcut Management ---
 
   getDefaultShortcuts() {
-    return fileTide.getDefaultShortcuts();
+    return this.fileTide.getDefaultShortcuts();
   }
   getShortcuts() {
-    return fileTide.getShortcuts();
+    return this.fileTide.getShortcuts();
   }
   getShortcut(shortcut) {
-    return fileTide.getShortcut(shortcut);
+    return this.fileTide.getShortcut(shortcut);
   }
   hasShortcut(shortcut) {
-    return fileTide.hasShortcut(shortcut);
+    return this.fileTide.hasShortcut(shortcut);
   }
   addShortcut(shortcut, targetPath) {
-    return fileTide.addShortcut(shortcut, targetPath);
+    return this.fileTide.addShortcut(shortcut, targetPath);
   }
   setShortcut(shortcut, targetPath) {
-    return fileTide.setShortcut(shortcut, targetPath);
+    return this.fileTide.setShortcut(shortcut, targetPath);
   }
   updateShortcut(shortcut, targetPath) {
-    return fileTide.updateShortcut(shortcut, targetPath);
+    return this.fileTide.updateShortcut(shortcut, targetPath);
   }
   renameShortcut(shortcut, nextShortcut) {
-    return fileTide.renameShortcut(shortcut, nextShortcut);
+    return this.fileTide.renameShortcut(shortcut, nextShortcut);
   }
   removeShortcut(shortcut) {
-    return fileTide.removeShortcut(shortcut);
+    return this.fileTide.removeShortcut(shortcut);
   }
   setShortcuts(shortcuts = {}) {
-    return fileTide.setShortcuts(shortcuts);
+    return this.fileTide.setShortcuts(shortcuts);
   }
   clearShortcuts() {
-    return fileTide.clearShortcuts();
+    return this.fileTide.clearShortcuts();
   }
   resetShortcut(shortcut) {
-    return fileTide.resetShortcut(shortcut);
+    return this.fileTide.resetShortcut(shortcut);
   }
   resetShortcuts() {
-    return fileTide.resetShortcuts();
+    return this.fileTide.resetShortcuts();
   }
 
   // --- FileTide Client Client Settings Management ---
@@ -364,30 +391,17 @@ class FileTideClient {
       completion(room, true);
     }
   }
-  async changeClientID(clientID, completion, reconnectClient = true, onReconnect = this.onConnect, onDisconnect = this.onDisconnect, clientConfigurations = this.clientConfigurations) {
-    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) {
-      const pDeviceName = this.deviceName;
-      this.currentDeviceName = pDeviceName;
-      this.clientDisconnected = true;
-      this.fileMessagerInstance.clientTide.emitEvent(pDeviceName, "client-offline", {
-        clientID: pDeviceName,
-        connectionID: this.connectionID
-      });
-      this.fileMessagerInstance.clientTide.closeSocket(this.deviceName);
-      this.deviceName = clientID;
-      FileTide.outputGradient(`[${pDeviceName}] Updated client name to ${this.deviceName}`, ["#4D96FF", "#89CFF0"]);
-      this.refreshConnection(reconnectClient, onReconnect, onDisconnect, clientConfigurations);
-      updatedClientID = true;
-    }
-    if (completion) {
-      completion(clientID, updatedClientID);
+  async changeClientID(clientID, completion, reconnectClient = true, onReconnect = this.onConnect, onDisconnect = this.onDisconnect, clientConfigurations = this.clientConfigurations, renameOptions = {}) {
+    const previousClientID = this.deviceName;
+    const result = await this.fileTide.updateClientID(previousClientID, clientID, renameOptions);
+    this.deviceName = clientID;
+    this.currentDeviceName = clientID;
+    this.originDeviceName = clientID;
+    this.connectionID = result.connectionID;
+    if (typeof completion === "function") {
+      completion(clientID, true);
     }
+    return result;
   }
   changeTideUrl(url, completion, reconnectClient = true, onReconnect = this.onConnect, onDisconnect = this.onDisconnect, clientConfigurations = this.clientConfigurations) {
     this.tideUrl = url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trap_stevo/filetide-client",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "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": {
@@ -37,8 +37,8 @@
   "author": "Steven Compton",
   "license": "SCL-1.0-Universal",
   "dependencies": {
-    "@trap_stevo/filetide": "^0.1.3",
-    "@trap_stevo/iotide": "^0.0.46",
+    "@trap_stevo/filetide": "^0.1.5",
+    "@trap_stevo/iotide": "^0.0.48",
     "@trap_stevo/legendarybuilderpronodejs-utilities": "^1.0.51",
     "chalk": "^4.1.2"
   },
@@ -46,6 +46,7 @@
     "@babel/cli": "^7.24.8",
     "@babel/core": "^7.25.2",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-transform-private-methods": "^7.24.7",
     "@babel/plugin-transform-runtime": "^7.24.7",
     "@babel/preset-env": "^7.25.3"
   }