Timeout

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 - Rename files and folders
 - Delete files
+- Error correction for file download & upload
+- Timeout for response from server
 
 ## 0.2.0
 

lib/src/commands/fileupload.dart

@@ -73,5 +73,7 @@ class FileUpload {
     _socket.readResponse();
 
     _log.log('File Uploaded!');
+
+    _socket.readResponse(true);
   }
 }

lib/src/ftpclient_base.dart

@@ -24,11 +24,13 @@ class FTPClient {
   /// [user]: Username (Defaults to anonymous)
   /// [pass]: Password if not anonymous login
   /// [debug]: Enable Debug Logging
+  /// [timeout]: Timeout in secods to wait for responses
   FTPClient(String host,
       {int port = 21,
       String user = 'anonymous',
       String pass = '',
-      bool debug = false}) {
+      bool debug = false,
+      int timeout = 30}) {
     _user = user;
     _pass = pass;
 
@@ -38,7 +40,7 @@ class FTPClient {
       _log = NoOpLogger();
     }
 
-    _socket = FTPSocket(host, port, _log);
+    _socket = FTPSocket(host, port, _log, timeout);
   }
 
   /// Connect to the FTP Server

lib/src/ftpsocket.dart

@@ -11,17 +11,19 @@ class FTPSocket {
   final String host;
   final int port;
   final DebugLog _log;
+  final int _timeout;
 
   RawSynchronousSocket _socket;
 
-  FTPSocket(this.host, this.port, this._log);
+  FTPSocket(this.host, this.port, this._log, this._timeout);
 
   /// Read the FTP Server response from the Stream
   ///
   /// Blocks until data is received!
   String readResponse([bool bOptional = false]) {
     int iToRead = 0;
     StringBuffer buffer = StringBuffer();
+    int iStart = DateTime.now().millisecondsSinceEpoch;
 
     do {
       if (iToRead > 0) {
@@ -31,6 +33,10 @@ class FTPSocket {
       iToRead = _socket.available();
 
       if (iToRead == 0 && buffer.length == 0) {
+        int iCurrent = DateTime.now().millisecondsSinceEpoch;
+        if (iCurrent - iStart > _timeout * 1000) {
+          throw FTPException('Timeout reached for Receive', '');
+        }
         sleep(Duration(milliseconds: 100));
       }
     } while (iToRead > 0 || (buffer.length == 0 && !bOptional));