* Couple more toString() -> decode() updates

This commit is contained in:
Bryan Ashby 2015-11-01 13:55:59 -07:00
parent 46088a9f02
commit f318dc8da2
4 changed files with 4 additions and 5 deletions

View File

@ -99,7 +99,6 @@ function initialize(cb) {
}); });
// Init some extensions // Init some extensions
require('iconv-lite').extendNodeEncodings();
require('string-format').extend(String.prototype, require('./string_util.js').stringFormatExtensions); require('string-format').extend(String.prototype, require('./string_util.js').stringFormatExtensions);
callback(null); callback(null);

View File

@ -10,8 +10,6 @@ var iconv = require('iconv-lite');
var assert = require('assert'); var assert = require('assert');
var _ = require('lodash'); var _ = require('lodash');
//iconv.extendNodeEncodings();
exports.ClientTerminal = ClientTerminal; exports.ClientTerminal = ClientTerminal;
function ClientTerminal(output) { function ClientTerminal(output) {

View File

@ -9,6 +9,7 @@ var assert = require('assert');
var binary = require('binary'); var binary = require('binary');
var fs = require('fs'); var fs = require('fs');
var util = require('util'); var util = require('util');
var iconv = require('iconv-lite');
// :TODO: Remove "Ftn" from most of these -- it's implied in the module // :TODO: Remove "Ftn" from most of these -- it's implied in the module
exports.stringFromFTN = stringFromFTN; exports.stringFromFTN = stringFromFTN;
@ -29,7 +30,7 @@ function stringFromFTN(buf, encoding) {
} }
} }
return buf.slice(0, nullPos).toString(encoding || 'utf-8'); return iconv.decode(buf.slice(0, nullPos), encoding || 'utf-8');
} }

View File

@ -10,6 +10,7 @@ var userLogin = require('./user_login.js').userLogin;
var async = require('async'); var async = require('async');
var _ = require('lodash'); var _ = require('lodash');
var iconv = require('iconv-lite');
exports.login = login; exports.login = login;
exports.logoff = logoff; exports.logoff = logoff;
@ -66,7 +67,7 @@ function logoff(callingMenu, formData, extraArgs) {
// //
client.term.write( client.term.write(
ansi.normal() + '\n' + ansi.normal() + '\n' +
require('crypto').randomBytes(Math.floor(Math.random() * 65) + 20).toString(client.term.outputEncoding) + iconv.decode(require('crypto').randomBytes(Math.floor(Math.random() * 65) + 20), client.term.outputEncoding) +
'NO CARRIER'); 'NO CARRIER');
client.end(); client.end();