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

Minor fixes, tidy up FTS CHRS table a bit

Browse Source
This commit is contained in:
Bryan Ashby
2020-05-03 11:10:40 -06:00
parent b32dae9b48
commit c6bde65be0
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/qwk_mail_packet.js
View File

@@ -963,6 +963,15 @@ class QWKPacketWriter extends EventEmitter {
return `<${message.messageId}.${message.messageUuid}@${this.options.systemDomain}>`;
}
_encodeWithFallback(s, encoding) {
try {
return iconv.encode(s, encoding);
} catch (e) {
this.emit('warning', Errors.General(`Failed to encode buffer using ${encoding}; Falling back to 'ascii'`));
return iconv.encode(s, 'ascii');
}
}
appendMessage(message) {
//
// Each message has to:
@@ -1014,7 +1023,7 @@ class QWKPacketWriter extends EventEmitter {
const encoding = this._getEncoding(message);
const encodedMessage = iconv.encode(fullMessageBody, encoding);
const encodedMessage = this._encodeWithFallback(fullMessageBody, encoding);
//
// QWK spec wants line feeds as 0xe3 for some reason, so we'll have
@@ -1504,11 +1513,11 @@ class QWKPacketWriter extends EventEmitter {
messageData.Editor = `ENiGMA 1/2 BBS FSE v${enigmaVersion}`;
}
this.headersDatStream.write(iconv.encode(`[${this.currentMessageOffset.toString(16)}]\r\n`, encoding));
this.headersDatStream.write(this._encodeWithFallback(`[${this.currentMessageOffset.toString(16)}]\r\n`, encoding));
for (let [name, value] of Object.entries(messageData)) {
if (value) {
this.headersDatStream.write(iconv.encode(`${name}: ${value}\r\n`, encoding));
this.headersDatStream.write(this._encodeWithFallback(`${name}: ${value}\r\n`, encoding));
}
}