Fix: More asynchronous operations to fix stack overflow.

This commit is contained in:
baldo 2016-06-21 18:20:36 +02:00
parent a3b5580d40
commit 23cd31e064
2 changed files with 90 additions and 70 deletions

View file

@ -24,7 +24,7 @@
}, },
"dependencies": { "dependencies": {
"async": "1.5.2", "async": "2.0.0-rc.6",
"body-parser": "1.15.1", "body-parser": "1.15.1",
"command-line-args": "3.0.0", "command-line-args": "3.0.0",
"command-line-usage": "3.0.1", "command-line-usage": "3.0.1",

View file

@ -44,11 +44,25 @@ angular.module('ffffng')
return glob.sync(config.server.peersPath + '/' + pattern.toLowerCase()); return glob.sync(config.server.peersPath + '/' + pattern.toLowerCase());
} }
function findFilesInPeersPath() { function findFilesInPeersPath(callback) {
var files = glob.sync(config.server.peersPath + '/*'); glob(config.server.peersPath + '/*', function (err, files) {
if (err) {
return callback(err);
}
return _.filter(files, function (file) { async.filter(files, function (file, fileCallback) {
return file[0] !== '.' && fs.lstatSync(file).isFile(); if (file[0] === '.') {
return fileCallback(null, false);
}
fs.lstat(file, function (err, stats) {
if (err) {
return fileCallback(err);
}
fileCallback(null, stats.isFile());
});
}, callback);
}); });
} }
@ -199,7 +213,12 @@ angular.module('ffffng')
} }
function parseNodeFile(file, callback) { function parseNodeFile(file, callback) {
var lines = fs.readFileSync(file).toString(); fs.readFile(file, function (err, contents) {
if (err) {
return callback(err);
}
var lines = contents.toString();
var node = {}; var node = {};
var nodeSecrets = {}; var nodeSecrets = {};
@ -240,6 +259,7 @@ angular.module('ffffng')
}); });
callback(null, node, nodeSecrets); callback(null, node, nodeSecrets);
});
} }
function findNodeDataByFilePattern(filter, callback) { function findNodeDataByFilePattern(filter, callback) {
@ -414,7 +434,10 @@ angular.module('ffffng')
}, },
fixNodeFilenames: function (callback) { fixNodeFilenames: function (callback) {
var files = findFilesInPeersPath(); findFilesInPeersPath(function (err, files) {
if (err) {
return callback(err);
}
async.mapLimit( async.mapLimit(
files, files,
@ -427,26 +450,23 @@ angular.module('ffffng')
var expectedFilename = toNodeFilename(node.token, node, nodeSecrets); var expectedFilename = toNodeFilename(node.token, node, nodeSecrets);
if (file !== expectedFilename) { if (file !== expectedFilename) {
try { return fs.rename(file, expectedFilename, function (err) {
fs.renameSync(file, expectedFilename); if (err) {
} catch (e) {
return fileCallback(new Error( return fileCallback(new Error(
'Cannot rename file ' + file + ' to ' + expectedFilename + ' => ' + e 'Cannot rename file ' + file + ' to ' + expectedFilename + ' => ' + err
)); ));
} }
fileCallback(null);
});
} }
fileCallback(null); fileCallback(null);
}); });
}, },
function (err) { callback
if (err) {
return callback(err);
}
return callback(null);
}
); );
});
} }
}; };
}); });