Resolve: System methods prev/nextArea, and prev/nextConf can cause a crash #79

mods/bbs_list.js

@@ -325,23 +325,20 @@ function BBSListModule(options) {
 		//
 		//	Key & submit handlers
 		//
-		quitBBSList : function() {
-			self.prevMenu();
+		addBBS : function(formData, extraArgs, cb) {
+			self.displayAddScreen(cb);
 		},
-		addBBS : function() {
-			self.displayAddScreen();
-		},
-		deleteBBS : function() {
+		deleteBBS : function(formData, extraArgs, cb) {
 			const entriesView = self.viewControllers.view.getView(MciViewIds.view.BBSList);
 
 			if(self.entries[self.selectedBBS].submitterUserId !== self.client.user.userId && !self.client.user.isSysOp()) {
 				//	must be owner or +op
-				return;
+				return cb(null);
 			}
 
 			const entry = self.entries[self.selectedBBS];
 			if(!entry) {
-				return;
+				return cb(null);
 			}
 
 			self.database.run(
@@ -362,10 +359,12 @@ function BBSListModule(options) {
 
 						self.viewControllers.view.redrawAll();
 					}
+
+					return cb(null);
 				}
 			);
 		},
-		submitBBS : function(formData) {
+		submitBBS : function(formData, extraArgs, cb) {
 
 			let ok = true;
 			[ 'BBSName', 'Sysop', 'Telnet' ].forEach( mciName => {
@@ -375,7 +374,7 @@ function BBSListModule(options) {
 			});
 			if(!ok) {
 				//	validators should prevent this!
-				return;
+				return cb(null);
 			}
 
 			self.database.run(
@@ -388,13 +387,13 @@ function BBSListModule(options) {
 					}
 
 					self.clearAddForm();
-					self.displayBBSList(true);
+					self.displayBBSList(true, cb);
 				}
 			);
 		},
-		cancelSubmit : function() {
+		cancelSubmit : function(formData, extraArgs, cb) {
 			self.clearAddForm();
-			self.displayBBSList(true);
+			self.displayBBSList(true, cb);
 		}
 	};
 

mods/erc_client.js

@@ -143,7 +143,7 @@ function ErcClientModule(options) {
 
 
 	this.menuMethods = {
-		inputAreaSubmit : function() {
+		inputAreaSubmit : function(formData, extraArgs, cb) {
 			const inputAreaView = self.viewControllers.menu.getView(MciViewIds.InputArea);
 			const inputData		= inputAreaView.getData();
 
@@ -157,12 +157,15 @@ function ErcClientModule(options) {
 				}
 				inputAreaView.clearText();
 			}
+			return cb(null);
 		},
-		scrollUp : function(formData) {
+		scrollUp : function(formData, extraArgs, cb) {
 			self.scrollHandler(formData.key.name);
+			return cb(null);
 		},
-		scrollDown : function(formData) {
-			self.scrollHandler(formData.key.name);			
+		scrollDown : function(formData, extraArgs, cb) {
+			self.scrollHandler(formData.key.name);
+			return cb(null);
 		}
 	};
 }

mods/menu.hjson

@@ -1198,7 +1198,7 @@
 						}
 						{
 							keys: [ "q", "escape" ]
-							action: @method:quitBBSList
+							action: @systemMethod:prevMenu
 						}
 					]
 				}

mods/msg_area_list.js

@@ -1,14 +1,14 @@
 /* jslint node: true */
 'use strict';
 
-var MenuModule			= require('../core/menu_module.js').MenuModule;
-var ViewController		= require('../core/view_controller.js').ViewController;
-var messageArea			= require('../core/message_area.js');
-var strUtil				= require('../core/string_util.js');
+//	ENiGMA½
+const MenuModule		= require('../core/menu_module.js').MenuModule;
+const ViewController	= require('../core/view_controller.js').ViewController;
+const messageArea		= require('../core/message_area.js');
 
-var async				= require('async');
-var assert				= require('assert');
-var _					= require('lodash');
+//	deps
+const async				= require('async');
+const _					= require('lodash');
 
 exports.getModule			= MessageAreaListModule;
 
@@ -32,9 +32,8 @@ exports.moduleInfo = {
           |TI      Current time
 */
 
-var MciCodesIds = {
+const MCICodesIDs = {
 	AreaList	: 1,
-	CurrentArea	: 2,
 };
 
 function MessageAreaListModule(options) {
@@ -42,27 +41,29 @@ function MessageAreaListModule(options) {
 
 	var self = this;
 
-    this.messageAreas = messageArea.getSortedAvailMessageAreasByConfTag(
+	this.messageAreas = messageArea.getSortedAvailMessageAreasByConfTag(
          self.client.user.properties.message_conf_tag,
         { client : self.client }
     );
 
 	this.menuMethods = {
-		changeArea : function(formData, extraArgs) {
+		changeArea : function(formData, extraArgs, cb) {
 			if(1 === formData.submitId) {
 				const areaTag = self.messageAreas[formData.value.area].areaTag;
 
-                messageArea.changeMessageArea(self.client, areaTag, function areaChanged(err) {
-                    if(err) {
-                        self.client.term.pipeWrite('\n|00Cannot change area: ' + err.message + '\n');
+				messageArea.changeMessageArea(self.client, areaTag, err => {
+					if(err) {
+						self.client.term.pipeWrite(`\n|00Cannot change area: ${err.message}\n`);
 
-                        setTimeout(function timeout() {
-                            self.prevMenu();
-                        }, 1000);
-                    } else {
-                        self.prevMenu();
-                    }
-                });
+						setTimeout( () => {
+							return self.prevMenu(cb);
+						}, 1000);
+					} else {
+						return self.prevMenu(cb);
+					}
+				});
+			} else {
+				return cb(null);
 			}
 		}
 	};
@@ -79,7 +80,7 @@ function MessageAreaListModule(options) {
 require('util').inherits(MessageAreaListModule, MenuModule);
 
 MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
-	var self	= this;
+	const self	= this;
 	const vc	= self.viewControllers.areaList = new ViewController( { client : self.client } );
 
 	async.series(
@@ -90,7 +91,7 @@ MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
 				});
 			},
 			function loadFromConfig(callback) {
-				var loadOpts = {
+				const loadOpts = {
 					callingMenu	: self,
 					mciMap		: mciData.menu,
 					formId		: 0,
@@ -104,40 +105,34 @@ MessageAreaListModule.prototype.mciReady = function(mciData, cb) {
 				const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
 				const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
                 
-                const areaListView = vc.getView(1);
-                let i = 1;
-                areaListView.setItems(_.map(self.messageAreas, v => {
-                    return listFormat.format({
-                        index   : i++,
-                        areaTag : v.area.areaTag,
-                        name    : v.area.name,
-                        desc    : v.area.desc, 
-                    });
-                }));
-                
-                i = 1;
-                areaListView.setFocusItems(_.map(self.messageAreas, v => {
-                    return focusListFormat.format({
-                        index   : i++,
-                        areaTag : v.area.areaTag,
-                        name    : v.area.name,
-                        desc    : v.area.desc, 
-                    })
-                }));
+				const areaListView = vc.getView(MCICodesIDs.AreaList);
+				let i = 1;
+				areaListView.setItems(_.map(self.messageAreas, v => {
+					return listFormat.format({
+						index   : i++,
+						areaTag : v.area.areaTag,
+						name    : v.area.name,
+						desc    : v.area.desc, 
+					});
+				}));
+
+				i = 1;
+				areaListView.setFocusItems(_.map(self.messageAreas, v => {
+					return focusListFormat.format({
+						index   : i++,
+						areaTag : v.area.areaTag,
+						name    : v.area.name,
+						desc    : v.area.desc, 
+					});
+				}));
 
 				areaListView.redraw();
 
-				callback(null);
-			},
-			function populateTextViews(callback) {
-				//	:TODO: populate current message area desc!
-				//self.setViewText(MciCodesIds.CurrentArea, 
-
 				callback(null);
 			}
 		],
 		function complete(err) {
-			cb(null);
+			return cb(err);
 		}
 	);
 };

mods/msg_area_post_fse.js

@@ -25,7 +25,7 @@ function AreaPostFSEModule(options) {
 	//	we're posting, so always start with 'edit' mode
 	this.editorMode = 'edit';
 
-	this.menuMethods.editModeMenuSave = function() {
+	this.menuMethods.editModeMenuSave = function(formData, extraArgs, cb) {
 
 		var msg;
 		async.series(
@@ -33,16 +33,11 @@ function AreaPostFSEModule(options) {
 				function getMessageObject(callback) {
 					self.getMessage(function gotMsg(err, msgObj) {
 						msg = msgObj;
-						callback(err);
+						return callback(err);
 					});
 				},
 				function saveMessage(callback) {
-					persistMessage(msg, callback);
-					/*
-					msg.persist(function persisted(err) {
-						callback(err);
-					});
-					*/
+					return persistMessage(msg, callback);
 				}
 			],
 			function complete(err) {
@@ -56,7 +51,7 @@ function AreaPostFSEModule(options) {
 						);
 				}
 				
-				self.nextMenu();
+				return self.nextMenu(cb);
 			}
 		);
 	};

mods/msg_area_view_fse.js

@@ -1,14 +1,12 @@
 /* jslint node: true */
 'use strict';
 
-var FullScreenEditorModule		= require('../core/fse.js').FullScreenEditorModule;
-var Message						= require('../core/message.js');
-var messageArea					= require('../core/message_area.js');
-var user						= require('../core/user.js');
+//	ENiGMA½
+const FullScreenEditorModule		= require('../core/fse.js').FullScreenEditorModule;
+const Message						= require('../core/message.js');
 
-var _							= require('lodash');
-var async					 	= require('async');
-var assert						= require('assert');
+//	deps
+const _							= require('lodash');
 
 exports.getModule				= AreaViewFSEModule;
 
@@ -21,8 +19,7 @@ exports.moduleInfo = {
 function AreaViewFSEModule(options) {
 	FullScreenEditorModule.call(this, options);
 
-	var self		= this;
-	var config		= this.menuConfig.config;
+	const self		= this;
 
 	this.editorType			= 'area';
 	this.editorMode			= 'view';
@@ -36,57 +33,67 @@ function AreaViewFSEModule(options) {
 	this.messageIndex	= this.messageIndex || 0;
 	this.messageTotal	= this.messageList.length;
 
-	this.menuMethods.nextMessage = function(formData, extraArgs) {
+	this.menuMethods.nextMessage = function(formData, extraArgs, cb) {
 		if(self.messageIndex + 1 < self.messageList.length) {
 			self.messageIndex++;
 
-			self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid);
+			return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
 		}
+
+		return cb(null);
 	};
 
-	this.menuMethods.prevMessage = function(formData, extraArgs) {
+	this.menuMethods.prevMessage = function(formData, extraArgs, cb) {
 		if(self.messageIndex > 0) {
 			self.messageIndex--;
 
-			self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid);
+			return self.loadMessageByUuid(self.messageList[self.messageIndex].messageUuid, cb);
 		}
+
+		return cb(null);
 	};
 
-	this.menuMethods.movementKeyPressed = function(formData, extraArgs) {
-		var bodyView = self.viewControllers.body.getView(1);
+	this.menuMethods.movementKeyPressed = function(formData, extraArgs, cb) {
+		const bodyView = self.viewControllers.body.getView(1);	//	:TODO: use const here vs magic #
 
 		//	:TODO: Create methods for up/down vs using keyPressXXXXX
 		switch(formData.key.name) {
-			case 'down arrow'	: bodyView.scrollDocumentUp(); break;
-			case 'up arrow'		: bodyView.scrollDocumentDown(); break;
-			case 'page up'		: bodyView.keyPressPageUp(); break;
-			case 'page down'	: bodyView.keyPressPageDown(); break;			
+		case 'down arrow'	: bodyView.scrollDocumentUp(); break;
+		case 'up arrow'		: bodyView.scrollDocumentDown(); break;
+		case 'page up'		: bodyView.keyPressPageUp(); break;
+		case 'page down'	: bodyView.keyPressPageDown(); break;			
 		}
 
 		//	:TODO: need to stop down/page down if doing so would push the last
-		//	visible page off the screen at all
+		//	visible page off the screen at all .... this should be handled by MLTEV though...
+
+		return cb(null);
 
 	};
 
-	this.menuMethods.replyMessage = function(formData, extraArgs) {
+	this.menuMethods.replyMessage = function(formData, extraArgs, cb) {
 		if(_.isString(extraArgs.menu)) {
-			var modOpts = {
+			const modOpts = {
 				extraArgs : {
 					messageAreaTag		: self.messageAreaTag,
 					replyToMessage		: self.message,	
 				}				
 			};
 
-			self.gotoMenu(extraArgs.menu, modOpts);
-		} else {
-			self.client.log(extraArgs, 'Missing extraArgs.menu');
+			return self.gotoMenu(extraArgs.menu, modOpts, cb);
 		}
+		
+		self.client.log(extraArgs, 'Missing extraArgs.menu');
+		return cb(null);
 	};
 
-	this.loadMessageByUuid = function(uuid) {
-		var msg = new Message();
-		msg.load( { uuid : uuid, user : self.client.user }, function loaded(err) {
+	this.loadMessageByUuid = function(uuid, cb) {
+		const msg = new Message();
+		msg.load( { uuid : uuid, user : self.client.user }, () => {
 			self.setMessage(msg);
+			if(cb) {
+				return cb(null);
+			}
 		});
 	};
 }
@@ -106,7 +113,7 @@ AreaViewFSEModule.prototype.getSaveState = function() {
 		messageList		: this.messageList,
 		messageIndex	: this.messageIndex,
 		messageTotal	: this.messageList.length,
-	}
+	};
 };
 
 AreaViewFSEModule.prototype.restoreSavedState = function(savedState) {

mods/msg_conf_list.js

@@ -1,13 +1,14 @@
 /* jslint node: true */
 'use strict';
 
-var MenuModule			= require('../core/menu_module.js').MenuModule;
-var ViewController		= require('../core/view_controller.js').ViewController;
-var messageArea			= require('../core/message_area.js');
+//	ENiGMA½
+const MenuModule		= require('../core/menu_module.js').MenuModule;
+const ViewController	= require('../core/view_controller.js').ViewController;
+const messageArea		= require('../core/message_area.js');
 
-var async				= require('async');
-var assert				= require('assert');
-var _					= require('lodash');
+//	deps
+const async				= require('async');
+const _					= require('lodash');
 
 exports.getModule		= MessageConfListModule;
 
@@ -17,12 +18,11 @@ exports.moduleInfo = {
 	author	: 'NuSkooler',
 };
 
-var MciCodesIds = {
+const MCICodeIDs = {
 	ConfList	: 1,
-	CurrentConf	: 2,
 	
 	//	:TODO:
-	//	# areas in con
+	//	# areas in conf .... see Obv/2, iNiQ, ...
 	//	
 };
 
@@ -34,7 +34,7 @@ function MessageConfListModule(options) {
 	this.messageConfs = messageArea.getSortedAvailMessageConferences(self.client);
 
 	this.menuMethods = {
-		changeConference : function(formData, extraArgs) {
+		changeConference : function(formData, extraArgs, cb) {
 			if(1 === formData.submitId) {
 				const confTag = self.messageConfs[formData.value.conf].confTag;
 
@@ -42,13 +42,15 @@ function MessageConfListModule(options) {
 					if(err) {						
 						self.client.term.pipeWrite(`\n|00Cannot change conference: ${err.message}\n`);
 
-						setTimeout(function timeout() {
-                            self.prevMenu();
-                        }, 1000);
+						setTimeout( () => {
+							return self.prevMenu(cb);
+						}, 1000);
 					} else {
-						self.prevMenu();
+						return self.prevMenu(cb);
 					}
 				});
+			} else {
+				return cb(null);
 			}
 		}
 	};
@@ -85,26 +87,26 @@ MessageConfListModule.prototype.mciReady = function(mciData, cb) {
 				const listFormat 		= self.menuConfig.config.listFormat || '{index} ) - {name}';
 				const focusListFormat	= self.menuConfig.config.focusListFormat || listFormat;
                 
-                const confListView = vc.getView(1);
-                let i = 1;
-                confListView.setItems(_.map(self.messageConfs, v => {
-                    return listFormat.format({
-                        index   : i++,
-                        confTag : v.conf.confTag,
-                        name    : v.conf.name,
-                        desc    : v.conf.desc, 
-                    });
-                }));
-                
-                i = 1;
-                confListView.setFocusItems(_.map(self.messageConfs, v => {
-                    return focusListFormat.format({
-                        index   : i++,
-                        confTag : v.conf.confTag,
-                        name    : v.conf.name,
-                        desc    : v.conf.desc, 
-                    })
-                }));
+				const confListView = vc.getView(MCICodeIDs.ConfList);
+				let i = 1;
+				confListView.setItems(_.map(self.messageConfs, v => {
+					return listFormat.format({
+						index   : i++,
+						confTag : v.conf.confTag,
+						name    : v.conf.name,
+						desc    : v.conf.desc, 
+					});
+				}));
+
+				i = 1;
+				confListView.setFocusItems(_.map(self.messageConfs, v => {
+					return focusListFormat.format({
+						index   : i++,
+						confTag : v.conf.confTag,
+						name    : v.conf.name,
+						desc    : v.conf.desc, 
+					});
+				}));
 
 				confListView.redraw();
 

mods/msg_list.js

@@ -70,7 +70,7 @@ function MessageListModule(options) {
 	}
 
 	this.menuMethods = {
-		selectMessage : function(formData) {
+		selectMessage : function(formData, extraArgs, cb) {
 			if(1 === formData.submitId) {
 				self.initialFocusIndex = formData.value.message;
 
@@ -99,7 +99,9 @@ function MessageListModule(options) {
 					};
 				};
 
-				self.gotoMenu(config.menuViewPost || 'messageAreaViewPost', modOpts);
+				return self.gotoMenu(config.menuViewPost || 'messageAreaViewPost', modOpts, cb);
+			} else {
+				return cb(null);
 			}
 		}
 	};

mods/nua.js

@@ -1,13 +1,13 @@
 /* jslint node: true */
 'use strict';
-var MenuModule				= require('../core/menu_module.js').MenuModule;
-var user					= require('../core/user.js');
-var theme					= require('../core/theme.js');
-var login					= require('../core/system_menu_method.js').login;
-var Config					= require('../core/config.js').config;
-var messageArea             = require('../core/message_area.js');
 
-var async					= require('async');
+//	ENiGMA½
+const MenuModule	= require('../core/menu_module.js').MenuModule;
+const user			= require('../core/user.js');
+const theme			= require('../core/theme.js');
+const login			= require('../core/system_menu_method.js').login;
+const Config		= require('../core/config.js').config;
+const messageArea	= require('../core/message_area.js');
 
 exports.getModule	= NewUserAppModule;
 
@@ -16,7 +16,7 @@ exports.moduleInfo = {
 	desc	: 'New User Application',
 };
 
-var MciViewIds = {
+const MciViewIds = {
 	userName	: 1,
 	password	: 9,
 	confirm		: 10,
@@ -26,54 +26,54 @@ var MciViewIds = {
 function NewUserAppModule(options) {
 	MenuModule.call(this, options);
 
-	var self = this;
+	const self = this;
 
 	this.menuMethods = {
 		//
 		//	Validation stuff
 		//
 		validatePassConfirmMatch : function(data, cb) {
-			var passwordView = self.viewControllers.menu.getView(MciViewIds.password);
-			cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
+			const passwordView = self.viewControllers.menu.getView(MciViewIds.password);
+			return cb(passwordView.getData() === data ? null : new Error('Passwords do not match'));
 		},
 
 		viewValidationListener : function(err, cb) {
-			var errMsgView = self.viewControllers.menu.getView(MciViewIds.errMsg);
-			var newFocusId;
+			const errMsgView = self.viewControllers.menu.getView(MciViewIds.errMsg);
+			let newFocusId;
+			
 			if(err) {
 				errMsgView.setText(err.message);
 				err.view.clearText();
 
 				if(err.view.getId() === MciViewIds.confirm) {
 					newFocusId = MciViewIds.password;
-					var passwordView = self.viewControllers.menu.getView(MciViewIds.password);
-					passwordView.clearText();
+					self.viewControllers.menu.getView(MciViewIds.password).clearText();
 				}
 			} else {
 				errMsgView.clearText();
 			}
 
-			cb(newFocusId);
+			return cb(newFocusId);
 		},
 
 
 		//
 		//	Submit handlers
 		//
-		submitApplication : function(formData, extraArgs) {
-			var newUser = new user.User();
+		submitApplication : function(formData, extraArgs, cb) {
+			const newUser = new user.User();
 
 			newUser.username = formData.value.username;
 
 			//
 			//	We have to disable ACS checks for initial default areas as the user is not yet ready
 			//            
-            var confTag     = messageArea.getDefaultMessageConferenceTag(self.client, true);				//	true=disableAcsCheck
-            var areaTag     = messageArea.getDefaultMessageAreaTagByConfTag(self.client, confTag, true);	//	true=disableAcsCheck
-            
-            //  can't store undefined!
-            confTag = confTag || '';
-            areaTag = areaTag || '';
+			let confTag     = messageArea.getDefaultMessageConferenceTag(self.client, true);				//	true=disableAcsCheck
+			let areaTag     = messageArea.getDefaultMessageAreaTagByConfTag(self.client, confTag, true);	//	true=disableAcsCheck
+
+			//  can't store undefined!
+			confTag = confTag || '';
+			areaTag = areaTag || '';
 			
 			newUser.properties = {
 				real_name			: formData.value.realName,
@@ -102,14 +102,15 @@ function NewUserAppModule(options) {
 			}
 			
 			//	:TODO: User.create() should validate email uniqueness!
-			newUser.create( { password : formData.value.password }, function created(err) {
+			newUser.create( { password : formData.value.password }, err => {
 				if(err) {
 					self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');
 
-					self.gotoMenu(extraArgs.error, function result(err) {
+					self.gotoMenu(extraArgs.error, err => {
 						if(err) {
-							self.prevMenu();
+							return self.prevMenu(cb);
 						}
+						return cb(null);
 					});
 				} else {
 					self.client.log.info( { username : formData.value.username, userId : newUser.userId }, 'New user created');
@@ -124,12 +125,12 @@ function NewUserAppModule(options) {
 					}
 
 					if(user.User.AccountStatus.inactive === self.client.user.properties.account_status) {
-						self.gotoMenu(extraArgs.inactive);
+						return self.gotoMenu(extraArgs.inactive, cb);
 					} else {
 						//
 						//	If active now, we need to call login() to authenticate
 						//
-						login(self, formData, extraArgs);
+						return login(self, formData, extraArgs, cb);
 					}
 				}
 			});

mods/onelinerz.js

@@ -231,11 +231,11 @@ function OnelinerzModule(options) {
 	};
 
 	this.menuMethods = {
-		viewAddScreen : function() {
-			self.displayAddScreen();
+		viewAddScreen : function(formData, extraArgs, cb) {
+			return self.displayAddScreen(cb);
 		},
 
-		addEntry : function(formData) {
+		addEntry : function(formData, extraArgs, cb) {
 			if(_.isString(formData.value.oneliner) && formData.value.oneliner.length > 0) {
 				const oneliner = formData.value.oneliner.trim();	//	remove any trailing ws
 
@@ -245,18 +245,18 @@ function OnelinerzModule(options) {
 					}
 
 					self.clearAddForm(); 
-					self.displayViewScreen(true);	//	true=cls
+					return self.displayViewScreen(true, cb);	//	true=cls
 				});
 
 			} else {
 				//	empty message - treat as if cancel was hit
-				self.displayViewScreen(true);	//	true=cls
+				return self.displayViewScreen(true, cb);	//	true=cls
 			}
 		},
 
-		cancelAdd : function() {
+		cancelAdd : function(formData, extraArgs, cb) {
 			self.clearAddForm();
-			self.displayViewScreen(true);	//	true=cls
+			return self.displayViewScreen(true, cb);	//	true=cls
 		}
 	};