zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-08-05 01:11:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

* Use node-temp for temp file creation, cleanup, etc.

Browse source 
* Lots of WIP on FTN BSO import
* Fix double callbacks in ArchiveUtil
* Impl ArchiveUtil.extractTo()
* Update bunyan
This commit is contained in:
Bryan Ashby 2016-03-03 22:54:32 -07:00
parent 5c324788fe
commit 6094bed07f
4 changed files with 194 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

191
core/scanner_tossers/ftn_bso.js
View file

@ -19,6 +19,7 @@ let mkdirp = require('mkdirp');
let async = require('async');
let fs = require('fs');
let later = require('later');
let temp = require('temp').track(); // track() cleans up temp dir/files for us
exports.moduleInfo = {
name : 'FTN BSO',
@ -69,7 +70,14 @@ function FTNMessageScanTossModule() {
this.isDefaultDomainZone = function(networkName, address) {
const defaultNetworkName = this.getDefaultNetworkName();
return(networkName === defaultNetworkName && address.zone === this.moduleConfig.defaultZone);
}
};
this.getNetworkNameByAddress = function(address) {
return _.findKey(Config.messageNetworks.ftn.networks, network => {
const networkAddress = Address.fromString(network.localAddress);
return !_.isUndefined(networkAddress) && address.isEqual(networkAddress);
});
};
this.getOutgoingPacketDir = function(networkName, destAddress) {
let dir = this.moduleConfig.paths.outbound;
@ -306,6 +314,10 @@ function FTNMessageScanTossModule() {
};
this.parseScheduleString = function(schedStr) {
if(!schedStr) {
return; // nothing to parse!
}
let schedule = {};
const m = SCHEDULE_REGEXP.exec(schedStr);
@ -413,7 +425,7 @@ function FTNMessageScanTossModule() {
packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
// use current message ID for filename seed
const pktFileName = self.getOutgoingPacketFileName(exportOpts.exportDir, message.messageId);
const pktFileName = self.getOutgoingPacketFileName(exportOpts.tempDir, message.messageId);
exportedFiles.push(pktFileName);
ws = fs.createWriteStream(pktFileName);
@ -475,7 +487,7 @@ function FTNMessageScanTossModule() {
packetHeader.password = exportOpts.nodeConfig.packetPassword || '';
// use current message ID for filename seed
const pktFileName = self.getOutgoingPacketFileName(exportOpts.exportDir, remainMessageId);
const pktFileName = self.getOutgoingPacketFileName(exportOpts.tempDir, remainMessageId);
exportedFiles.push(pktFileName);
ws = fs.createWriteStream(pktFileName);
@ -512,7 +524,6 @@ function FTNMessageScanTossModule() {
network : Config.messageNetworks.ftn.networks[areaConfig.network],
destAddress : Address.fromString(uplink),
networkName : areaConfig.network,
exportDir : self.moduleConfig.paths.temp,
};
if(_.isString(exportOpts.network.localAddress)) {
@ -524,7 +535,8 @@ function FTNMessageScanTossModule() {
async.waterfall(
[
function createTempDir(callback) {
mkdirp(exportOpts.exportDir, err => {
temp.mkdir('enigftnexport--', (err, tempDir) => {
exportOpts.tempDir = tempDir;
callback(err);
});
},
@ -551,7 +563,7 @@ function FTNMessageScanTossModule() {
}
// adjust back to temp path
const tempBundlePath = paths.join(exportOpts.exportDir, paths.basename(bundlePath));
const tempBundlePath = paths.join(exportOpts.tempDir, paths.basename(bundlePath));
self.archUtil.compressTo(
exportOpts.nodeConfig.archiveType,
@ -579,71 +591,164 @@ function FTNMessageScanTossModule() {
fs.rename(oldPath, newPath, nextFile);
}
}, callback);
},
function cleanUpTempDir(callback) {
temp.cleanup((err, stats) => {
Log.trace(
Object.assign(stats, { tempDir : exportOpts.tempDir }),
'Temporary directory cleaned up');
});
}
],
err => {
nextUplink();
nextUplink();
}
);
}, cb); // complete
};
this.importMessagesFromPacketFile = function(path, packetFileName, cb) {
cb(null);
this.importMessagesFromPacketFile = function(packetPath, cb) {
const packet = new ftnMailPacket.Packet();
// :TODO: packet.read() should have a way to cancel iteration...
let localNetworkName;
packet.read(packetPath, (entryType, entryData) => {
if('header' === entryType) {
//
// Discover if this packet is for one of our network(s)
//
localNetworkName = self.getNetworkNameByAddress(entryData.destAddress);
} else if(localNetworkName && 'message' === entryType) {
const message = entryData; // so we ref something reasonable :)
const areaTag = message.meta.FtnProperty.ftn_area;
// :TODO: we need to know if this message is a dupe - UUID will be the same if MSGID, but if not present... what to do?
// :TODO: lookup and set message.areaTag if match
// :TODO: check SEEN-BY for echo
// :TODO: Handle area vs Netmail - Via, etc.
// :TODO: Handle PATH
// :TODO: handle REPLY kludges... set local ID when possible
if(areaTag) {
//
// Find local area tag
//
}
}
}, err => {
cb(err);
}); };
this.importPacketFilesFromDirectory = function(importDir, cb) {
async.waterfall(
[
function getPacketFiles(callback) {
fs.readdir(importDir, (err, files) => {
if(err) {
return callback(err);
}
callback(null, files.filter(f => '.pkt' === paths.extname(f)));
});
},
function importPacketFiles(packetFiles, callback) {
let rejects = [];
async.each(packetFiles, (packetFile, nextFile) => {
self.importMessagesFromPacketFile(paths.join(importDir, packetFile), err => {
// :TODO: check err -- log / track rejects, etc.
if(err) {
rejects.push(packetFile);
}
nextFile();
});
}, err => {
// :TODO: Handle err! we should try to keep going though...
callback(err, packetFiles, rejects);
});
},
function handleProcessedFiles(packetFiles, rejects, callback) {
async.each(packetFiles, (packetFile, nextFile) => {
const fullPath = paths.join(importDir, packetFile);
if(rejects.indexOf(packetFile) > -1) {
// :TODO: rename to .bad, perhaps move to a rejects dir + log
nextFile();
} else {
//fs.unlink(fullPath, err => {
nextFile();
//});
}
}, err => {
callback(err);
});
}
],
err => {
cb(err);
}
);
};
this.importMessagesFromDirectory = function(importDir, cb) {
async.waterfall(
[
function getPossibleFiles(callback) {
fs.readdir(importDir, (err, files) => {
callback(err, files);
// start with .pkt files
function importPacketFiles(callback) {
self.importPacketFilesFromDirectory(importDir, err => {
callback(err);
});
},
function identify(files, callback) {
async.map(files, (f, transform) => {
let entry = { file : f };
function discoverBundles(callback) {
fs.readdir(importDir, (err, files) => {
files = files.filter(f => '.pkt' !== paths.extname(f));
if('.pkt' === paths.extname(f)) {
entry.type = 'packet';
transform(null, entry);
} else {
const fullPath = paths.join(importDir, f);
async.map(files, (file, transform) => {
const fullPath = paths.join(importDir, file);
self.archUtil.detectType(fullPath, (err, archName) => {
entry.type = archName;
transform(null, entry);
transform(null, { path : fullPath, archName : archName } );
});
}
}, (err, identifiedFiles) => {
}, (err, bundleFiles) => {
callback(err, bundleFiles);
});
});
},
function createTempDir(bundleFiles, callback) {
temp.mkdir('enigftnimport-', (err, tempDir) => {
callback(err, bundleFiles, tempDir);
});
},
function importBundles(bundleFiles, tempDir, callback) {
async.each(bundleFiles, (bundleFile, nextFile) => {
if(_.isUndefined(bundleFile.archName)) {
// :TODO: log?
return nextFile(); // unknown archive type
}
self.archUtil.extractTo(
bundleFile.path,
tempDir,
bundleFile.archName,
err => {
nextFile();
}
);
}, err => {
if(err) {
return callback(err);
}
const fileGroups = _.partition(identifiedFiles, entry => 'packet' === entry.type);
callback(null, fileGroups[0], fileGroups[1]);
//
// All extracted - import .pkt's
//
self.importPacketFilesFromDirectory(tempDir, err => {
callback(err);
});
});
},
function importPacketFiles(packetFiles, bundleFiles, callback) {
async.each(packetFiles, (packetFile, nextFile) => {
self.importMessagesFromPacketFile(importDir, packetFile.file, err => {
// :TODO: check err!
nextFile();
});
}, err => {
// :TODO: Handle err! we should try to keep going though...
callback(null, bundleFiles);
});
},
function importBundles(bundleFiles, callback) {
// :TODO: for each bundle, extract to temp location -> process each packet
}
],
],
err => {
cb(err);
}
}
);
};
}
require('util').inherits(FTNMessageScanTossModule, MessageScanTossModule);