Merge pull request #29 from bchelli/readlargedir

Read large directories

Author: bchelli

README.md

@@ -146,6 +146,7 @@ This function will close the open connection if opened, it will be called automa
 - [Benjamin Chelli](https://github.com/bchelli)
 - [Fabrice Marsaud](https://github.com/marsaud)
 - [Jay McAliley](https://github.com/jaymcaliley)
+- [eldrago](https://github.com/eldrago)
 
 ## References
 

lib/api/readdir.js

@@ -24,20 +24,50 @@ module.exports = function(path, cb){
   SMB2Request('open', {path:path}, connection, function(err, file){
     if(err) cb && cb(err);
     // SMB2 query directory
-    else SMB2Request('query_directory', file, connection, function(err, files){
-      if(err) cb && cb(err);
-      // SMB2 close directory
-      else SMB2Request('close', file, connection, function(err){
-        cb && cb(
-          null
-        , files
+    else queryDir(file, connection, [], cb);
+  });
+}
+
+
+
+
+
+/*
+ * Helpers
+ */
+
+/**
+ * queryDir - recursive querying until all files in a directory have been added to the listing.
+ * @param file
+ * @param connection
+ * @param completeFileListing
+ * @param cb
+ */
+function queryDir(file, connection, completeFileListing, cb) {
+  SMB2Request('query_directory', file, connection, function(err, files){
+    var allFiles = completeFileListing.concat(files || []);
+
+    // no more file
+    // => close and send response
+    if(err && err.code === 'STATUS_NO_MORE_FILES') {
+      return SMB2Request('close', file, connection, function(err){
+        var fileNames = allFiles
             .map(function(v){ return v.Filename }) // get the filename only
             .filter(function(v){ return v!='.' && v!='..' }) // remove '.' and '..' values
-        );
+            ;
+        cb && cb(null, fileNames);
       });
-    });
+    }
+
+    // error
+    // => close and send error
+    if (err) {
+      return cb && cb(err);
+    }
+
+    // still receiving files
+    // => maybe the folder is not empty
+    queryDir(file, connection, allFiles, cb)
   });
-  
 }
 
-

lib/tools/message.js

@@ -22,7 +22,9 @@ var defaults = {
         , self.parseResponse && self.parseResponse(response)
         );
       } else {
-        cb && cb(new Error(MsErref.getErrorMessage(err)));
+        var error = new Error(MsErref.getErrorMessage(err));
+        error.code = err.code;
+        cb && cb(error);
       }
     };
 

package-lock.json

@@ -1,39 +1,30 @@
 {
-
-  "name":"smb2"
-, "description":"SMB2 Client"
-, "homepage": "https://github.com/bchelli/node-smb2"
-
-, "version":"0.2.8"
-
-, "engines": [
+  "name": "smb2",
+  "description": "SMB2 Client",
+  "homepage": "https://github.com/bchelli/node-smb2",
+  "version": "0.2.8",
+  "engines": [
     "node"
-  ]
-
-, "author":{
-    "name": "Benjamin Chelli"
-  , "email": "benjamin@chelli.net"
-  , "url": "https://github.com/bchelli"
-  }
-
-, "main":"lib/smb2.js"
-
-, "repository": {
-    "type": "git"
-  , "url": "https://github.com/bchelli/node-smb2"
-  }
-
-, "dependencies": {
+  ],
+  "author": {
+    "name": "Benjamin Chelli",
+    "email": "benjamin@chelli.net",
+    "url": "https://github.com/bchelli"
+  },
+  "main": "lib/smb2.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bchelli/node-smb2"
+  },
+  "dependencies": {
     "ntlm": "~0.1.1"
-  }
-
-, "keywords": [
-    "SMB"
-  , "SMB2"
-  , "SMB3"
-  , "NTLM"
-  , "CIFS"
-  , "Samba"
+  },
+  "keywords": [
+    "SMB",
+    "SMB2",
+    "SMB3",
+    "NTLM",
+    "CIFS",
+    "Samba"
   ]
-
 }