Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs

core/archive_util.js

@@ -8,7 +8,7 @@ const Errors			= require('./enig_error.js').Errors;
 const resolveMimeType	= require('./mime_util.js').resolveMimeType;
 
 //	base/modules
-const fs		= require('fs');
+const fs		= require('graceful-fs');
 const _			= require('lodash');
 const pty		= require('ptyw.js');
 

core/art.js

@@ -9,7 +9,7 @@ const aep		= require('./ansi_escape_parser.js');
 const sauce		= require('./sauce.js');
 
 //	deps
-const fs		= require('fs');
+const fs		= require('graceful-fs');
 const paths		= require('path');
 const assert	= require('assert');
 const iconv		= require('iconv-lite');

core/bbs.js

@@ -17,7 +17,7 @@ const async			= require('async');
 const util			= require('util');
 const _				= require('lodash');
 const mkdirs		= require('fs-extra').mkdirs;
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const paths			= require('path');
 
 //	our main entry point

core/config.js

@@ -5,7 +5,7 @@
 const miscUtil			= require('./misc_util.js');
 
 //	deps
-const fs				= require('fs');
+const fs				= require('graceful-fs');
 const paths				= require('path');
 const async				= require('async');
 const _					= require('lodash');

core/config_cache.js

@@ -5,7 +5,7 @@ var Config				= require('./config.js').config;
 var Log					= require('./logger.js').log;
 
 var paths				= require('path');
-var fs					= require('fs');
+var fs					= require('graceful-fs');
 var Gaze				= require('gaze').Gaze;
 var events				= require('events');
 var util				= require('util');

core/dropfile.js

@@ -4,7 +4,7 @@
 var Config			= require('./config.js').config;
 const StatLog		= require('./stat_log.js');
 
-var fs				= require('fs');
+var fs				= require('graceful-fs');
 var paths			= require('path');
 var _				= require('lodash');
 var moment			= require('moment');

core/file_area_web.js

@@ -20,7 +20,7 @@ const hashids		= require('hashids');
 const moment		= require('moment');
 const paths			= require('path');
 const async			= require('async');
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const mimeTypes		= require('mime-types');
 const _				= require('lodash');
 

core/file_base_area.js

@@ -17,7 +17,7 @@ const wordWrapText		= require('./word_wrap.js').wordWrapText;
 //	deps
 const _				= require('lodash');
 const async			= require('async');
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const crypto		= require('crypto');
 const paths			= require('path');
 const temptmp		= require('temptmp').createTrackedSession('file_area');

core/file_transfer.js

@@ -17,7 +17,7 @@ const _				= require('lodash');
 const pty			= require('ptyw.js');
 const temptmp		= require('temptmp').createTrackedSession('transfer_file');
 const paths			= require('path');
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const fse			= require('fs-extra');
 
 //	some consts

core/ftn_mail_packet.js

@@ -11,7 +11,7 @@ const Log			= require('./logger.js').log;
 const _				= require('lodash');
 const assert		= require('assert');
 const binary		= require('binary');
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const async			= require('async');
 const iconv			= require('iconv-lite');
 const moment		= require('moment');

core/logger.js

@@ -4,7 +4,7 @@
 //	deps
 const bunyan	= require('bunyan');
 const paths		= require('path');
-const fs		= require('fs');
+const fs		= require('graceful-fs');
 const _			= require('lodash');
 
 module.exports = class Log {

core/module_util.js

@@ -5,7 +5,7 @@
 const Config	= require('./config.js').config;
 
 //	deps
-const fs 		= require('fs');
+const fs 		= require('graceful-fs');
 const paths		= require('path');
 const _			= require('lodash');
 const assert	= require('assert');

core/multi_line_edit_text_view.js

@@ -996,7 +996,7 @@ MultiLineEditTextView.prototype.setFocus = function(focused) {
 };
 
 MultiLineEditTextView.prototype.setText = function(text) {
-	//text = require('fs').readFileSync('/home/nuskooler/Downloads/test_text.txt', { encoding : 'utf-8'});
+	//text = require('graceful-fs').readFileSync('/home/nuskooler/Downloads/test_text.txt', { encoding : 'utf-8'});
 
 	this.textLines = [ ];
 	this.addText(text);

core/oputil/oputil_config.js

@@ -16,7 +16,7 @@ const Errors					= require('../../core/enig_error.js').Errors;
 const async			= require('async');
 const inq			= require('inquirer');
 const mkdirsSync	= require('fs-extra').mkdirsSync;
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const hjson			= require('hjson');
 const paths			= require('path');
 const _				= require('lodash');

core/oputil/oputil_file_base.js

@@ -11,7 +11,7 @@ const getAreaAndStorage			= require('./oputil_common.js').getAreaAndStorage;
 const Errors					= require('../../core/enig_error.js').Errors;
 
 const async						= require('async');
-const fs						= require('fs');
+const fs						= require('graceful-fs');
 const paths						= require('path');
 const _							= require('lodash');
 const moment					= require('moment');

core/scanner_tossers/ftn_bso.js

@@ -26,7 +26,7 @@ const moment				= require('moment');
 const _						= require('lodash');
 const paths					= require('path');
 const async					= require('async');
-const fs					= require('fs');
+const fs					= require('graceful-fs');
 const later					= require('later');
 const temptmp				= require('temptmp').createTrackedSession('ftn_bso');
 const assert				= require('assert');

core/servers/content/web.js

@@ -10,7 +10,7 @@ const Config		= require('../../config.js').config;
 const http			= require('http');
 const https			= require('https');
 const _				= require('lodash');
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const paths			= require('path');
 const mimeTypes		= require('mime-types');
 

core/servers/login/ssh.js

@@ -13,7 +13,7 @@ const stringFormat		= require('../../string_format.js');
 
 //	deps
 const ssh2			= require('ssh2');
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const util			= require('util');
 const _				= require('lodash');
 const assert		= require('assert');

core/string_util.js

@@ -509,7 +509,7 @@ function createCleanAnsi(input, options, cb) {
 }
 
 /*
-const fs = require('fs');
+const fs = require('graceful-fs');
 let data = fs.readFileSync('/home/nuskooler/Downloads/art3.ans');
 data = iconv.decode(data, 'cp437');
 createCleanAnsi(data, { width : 79, height : 25 }, (out) => {

core/system_view_validate.js

@@ -7,7 +7,7 @@ const Config	= require('./config.js').config;
 const Log		= require('./logger.js').log;
 
 //	deps
-const fs		= require('fs');
+const fs		= require('graceful-fs');
 
 exports.validateNonEmpty		= validateNonEmpty;
 exports.validateMessageSubject	= validateMessageSubject;

core/theme.js

@@ -11,7 +11,7 @@ const asset				= require('./asset.js');
 const ViewController	= require('./view_controller.js').ViewController;
 const Errors			= require('./enig_error.js').Errors;
 
-const fs				= require('fs');
+const fs				= require('graceful-fs');
 const paths				= require('path');
 const async				= require('async');
 const _					= require('lodash');

core/tic_file_info.js

@@ -7,7 +7,7 @@ const Errors		= require('./enig_error.js').Errors;
 const EnigAssert	= require('./enigma_assert.js');
 
 //	deps
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const CRC32			= require('./crc.js').CRC32;
 const _				= require('lodash');
 const async			= require('async');

core/web_password_reset.js

@@ -15,7 +15,7 @@ const Log					= require('./logger.js').log;
 const async					= require('async');
 const _						= require('lodash');
 const crypto				= require('crypto');
-const fs					= require('fs');
+const fs					= require('graceful-fs');
 const url					= require('url');
 const querystring			= require('querystring');
 

core/word_wrap.js

@@ -245,7 +245,7 @@ function wordWrapText(text, options) {
 
 /*
 const iconv = require('iconv-lite');
-const input = iconv.decode(require('fs').readFileSync('/home/nuskooler/Downloads/msg_out.txt'), 'cp437');
+const input = iconv.decode(require('graceful-fs').readFileSync('/home/nuskooler/Downloads/msg_out.txt'), 'cp437');
 
 const opts = {
 	width : 80,

package.json

@@ -43,7 +43,8 @@
     "temptmp": "^1.0.0",
     "uuid": "^3.0.1",
     "uuid-parse": "^1.0.0",
-    "ws" : "^2.3.1"
+    "ws" : "^2.3.1",
+    "graceful-fs" : "^4.1.11"
   },
   "devDependencies": {},
   "engines": {

util/exiftool2desc.js

@@ -7,7 +7,7 @@
 //	:TODO: Make this it's own sep tool/repo
 
 const exiftool		= require('exiftool');
-const fs			= require('fs');
+const fs			= require('graceful-fs');
 const moment		= require('moment');
 
 const TOOL_VERSION	= '1.0.0.0';