moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP on real-time interruptions (ie: incoming message) 

Still need work on *when* they are allowed with good defaults, etc.
This commit is contained in:
Bryan Ashby 2018-11-14 22:47:20 -07:00
parent 4025c3c643
commit 080d1727c2
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/menu_module.js
View File

@ -192,19 +192,7 @@ exports.MenuModule = class MenuModule extends PluginModule {
async.whilst(
() => this.client.interruptQueue.hasItems(),
next => {
this.client.interruptQueue.displayNext( (err, interruptItem) => {
if(err) {
return next(err);
}
if(interruptItem.pause) {
return this.pausePrompt(next);
}
return next(null);
});
},
next => this.client.interruptQueue.displayNext(next),
err => {
return cb(err);
}
@ -212,7 +200,21 @@ exports.MenuModule = class MenuModule extends PluginModule {
}
attemptInterruptNow(interruptItem, cb) {
return cb(null, false);
if(true !== this.interruptable) {
return cb(null, false); // don't eat up the item; queue for later
}
//
// Default impl: clear screen -> standard display -> reload menu
//
this.client.interruptQueue.displayWithItem(Object.assign({}, interruptItem, { cls : true }), err => {
if(err) {
return cb(err, false);
}
this.reload(err => {
return cb(err, err ? false : true);
});
});
}
getSaveState() {
@ -311,6 +313,8 @@ exports.MenuModule = class MenuModule extends PluginModule {
} else {
return gotoNextMenu();
}
} else {
this.enableInterruption();
}
}

20
core/user_interrupt_queue.js
View File

@ -35,8 +35,17 @@ module.exports = class UserInterruptQueue
if(!_.isString(interruptItem.contents) && !_.isString(interruptItem.text)) {
return;
}
// pause defaulted on
interruptItem.pause = _.get(interruptItem, 'pause', true);
this.queue.push(interruptItem);
this.client.currentMenuModule.attemptInterruptNow(interruptItem, (err, ateIt) => {
if(err) {
// :TODO: Log me
} else if(true !== ateIt) {
this.queue.push(interruptItem);
}
});
}
hasItems() {
@ -61,8 +70,13 @@ module.exports = class UserInterruptQueue
if(interruptItem.contents) {
Art.display(this.client, interruptItem.contents, err => {
this.client.term.rawWrite('\r\n\r\n');
return cb(err, interruptItem);
if(err) {
return cb(err);
}
//this.client.term.rawWrite('\r\n\r\n'); // :TODO: Prob optional based on contents vs text
this.client.currentMenuModule.pausePrompt( () => {
return cb(null);
});
});
} else {
return this.client.term.write(pipeToAnsi(`${interruptItem.text}\r\n\r\n`, this.client), cb);