Remove MCI cache and xxhash dependency
The MCI cache is no longer needed as we no longer rely on DSR/CPR
This commit is contained in:
Bryan Ashby
parent
b6c7ced9ca
commit
b5f05b69e3
99
core/art.js
99
core/art.js
|
|
@ -15,7 +15,6 @@ const paths = require('path');
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const iconv = require('iconv-lite');
|
const iconv = require('iconv-lite');
|
||||||
const _ = require('lodash');
|
const _ = require('lodash');
|
||||||
const xxhash = require('xxhash');
|
|
||||||
|
|
||||||
exports.getArt = getArt;
|
exports.getArt = getArt;
|
||||||
exports.getArtFromPath = getArtFromPath;
|
exports.getArtFromPath = getArtFromPath;
|
||||||
|
|
@ -250,8 +249,7 @@ function display(client, art, options, cb) {
|
||||||
return cb(Errors.Invalid('No art supplied!'));
|
return cb(Errors.Invalid('No art supplied!'));
|
||||||
}
|
}
|
||||||
|
|
||||||
options.mciReplaceChar = options.mciReplaceChar || ' ';
|
options.mciReplaceChar = options.mciReplaceChar || ' ';
|
||||||
options.disableMciCache = options.disableMciCache || false;
|
|
||||||
|
|
||||||
// :TODO: this is going to be broken into two approaches controlled via options:
|
// :TODO: this is going to be broken into two approaches controlled via options:
|
||||||
// 1) Standard - use internal tracking of locations for MCI -- no CPR's/etc.
|
// 1) Standard - use internal tracking of locations for MCI -- no CPR's/etc.
|
||||||
|
|
@ -272,82 +270,45 @@ function display(client, art, options, cb) {
|
||||||
startRow : options.startRow,
|
startRow : options.startRow,
|
||||||
});
|
});
|
||||||
|
|
||||||
let parseComplete = false;
|
const mciMap = {};
|
||||||
let mciMap;
|
let generatedId = 100;
|
||||||
const mciCprQueue = [];
|
|
||||||
let artHash;
|
|
||||||
let mciMapFromCache;
|
|
||||||
|
|
||||||
function completed() {
|
ansiParser.on('mci', mciInfo => {
|
||||||
|
// :TODO: ensure generatedId's do not conflict with any existing |id|
|
||||||
|
const id = _.isNumber(mciInfo.id) ? mciInfo.id : generatedId;
|
||||||
|
const mapKey = `${mciInfo.mci}${id}`;
|
||||||
|
const mapEntry = mciMap[mapKey];
|
||||||
|
|
||||||
if(!options.disableMciCache && !mciMapFromCache) {
|
if(mapEntry) {
|
||||||
// cache our MCI findings...
|
mapEntry.focusSGR = mciInfo.SGR;
|
||||||
client.mciCache[artHash] = mciMap;
|
mapEntry.focusArgs = mciInfo.args;
|
||||||
client.log.trace( { artHash : artHash.toString(16), mciMap : mciMap }, 'Added MCI map to cache');
|
} else {
|
||||||
|
mciMap[mapKey] = {
|
||||||
|
position : mciInfo.position,
|
||||||
|
args : mciInfo.args,
|
||||||
|
SGR : mciInfo.SGR,
|
||||||
|
code : mciInfo.mci,
|
||||||
|
id : id,
|
||||||
|
};
|
||||||
|
|
||||||
|
if(!mciInfo.id) {
|
||||||
|
++generatedId;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ansiParser.removeAllListeners(); // :TODO: Necessary???
|
});
|
||||||
|
|
||||||
|
ansiParser.on('literal', literal => client.term.write(literal, false) );
|
||||||
|
ansiParser.on('control', control => client.term.rawWrite(control) );
|
||||||
|
|
||||||
|
ansiParser.on('complete', () => {
|
||||||
|
ansiParser.removeAllListeners();
|
||||||
|
|
||||||
const extraInfo = {
|
const extraInfo = {
|
||||||
height : ansiParser.row - 1,
|
height : ansiParser.row - 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
return cb(null, mciMap, extraInfo);
|
return cb(null, mciMap, extraInfo);
|
||||||
}
|
|
||||||
|
|
||||||
if(!options.disableMciCache) {
|
|
||||||
artHash = xxhash.hash(Buffer.from(art), 0xCAFEBABE);
|
|
||||||
|
|
||||||
// see if we have a mciMap cached for this art
|
|
||||||
if(client.mciCache) {
|
|
||||||
mciMap = client.mciCache[artHash];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(mciMap) {
|
|
||||||
mciMapFromCache = true;
|
|
||||||
client.log.trace( { artHash : artHash.toString(16), mciMap : mciMap }, 'Loaded MCI map from cache');
|
|
||||||
} else {
|
|
||||||
// no cached MCI info
|
|
||||||
mciMap = {};
|
|
||||||
|
|
||||||
let generatedId = 100;
|
|
||||||
|
|
||||||
ansiParser.on('mci', mciInfo => {
|
|
||||||
// :TODO: ensure generatedId's do not conflict with any existing |id|
|
|
||||||
const id = _.isNumber(mciInfo.id) ? mciInfo.id : generatedId;
|
|
||||||
const mapKey = `${mciInfo.mci}${id}`;
|
|
||||||
const mapEntry = mciMap[mapKey];
|
|
||||||
|
|
||||||
if(mapEntry) {
|
|
||||||
mapEntry.focusSGR = mciInfo.SGR;
|
|
||||||
mapEntry.focusArgs = mciInfo.args;
|
|
||||||
} else {
|
|
||||||
mciMap[mapKey] = {
|
|
||||||
position : mciInfo.position,
|
|
||||||
args : mciInfo.args,
|
|
||||||
SGR : mciInfo.SGR,
|
|
||||||
code : mciInfo.mci,
|
|
||||||
id : id,
|
|
||||||
};
|
|
||||||
|
|
||||||
if(!mciInfo.id) {
|
|
||||||
++generatedId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
ansiParser.on('literal', literal => client.term.write(literal, false) );
|
|
||||||
ansiParser.on('control', control => client.term.rawWrite(control) );
|
|
||||||
|
|
||||||
ansiParser.on('complete', () => {
|
|
||||||
parseComplete = true;
|
|
||||||
|
|
||||||
if(0 === mciCprQueue.length) {
|
|
||||||
return completed();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
let initSeq = '';
|
let initSeq = '';
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,6 @@
|
||||||
"uuid": "8.3.2",
|
"uuid": "8.3.2",
|
||||||
"uuid-parse": "1.1.0",
|
"uuid-parse": "1.1.0",
|
||||||
"ws": "7.4.3",
|
"ws": "7.4.3",
|
||||||
"xxhash": "^0.3.0",
|
|
||||||
"yazl": "^2.5.1"
|
"yazl": "^2.5.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue