mirror of
https://github.com/Elysola/WebHooker.git
synced 2026-11-21 01:23:40 +00:00
fix(formatter): preserve invalid code points
Out-of-range numeric entities can throw while formatting a delivery. Keep invalid code points verbatim instead of aborting the message.
This commit is contained in:
1 parent
1b3f353153
commit
99d239ff4f
1 file changed
+9
-2
@@ -110,6 +110,13 @@ export function cap(text: string, max: number): string {
|
|||||||
return text.length > max ? text.slice(0, max) : text;
|
return text.length > max ? text.slice(0, max) : text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** A numeric character reference, kept verbatim when it names no valid code point. */
|
||||||
|
function codePoint(value: number, original: string): string {
|
||||||
|
if (!Number.isInteger(value) || value < 0 || value > 0x10ffff) return original;
|
||||||
|
if (value >= 0xd800 && value <= 0xdfff) return original;
|
||||||
|
return String.fromCodePoint(value);
|
||||||
|
}
|
||||||
|
|
||||||
export function htmlToText(input: string): string {
|
export function htmlToText(input: string): string {
|
||||||
if (!input) return "";
|
if (!input) return "";
|
||||||
let out = input
|
let out = input
|
||||||
@@ -125,8 +132,8 @@ export function htmlToText(input: string): string {
|
|||||||
.replace(/>/gi, ">")
|
.replace(/>/gi, ">")
|
||||||
.replace(/"/gi, '"')
|
.replace(/"/gi, '"')
|
||||||
.replace(/'/gi, "'")
|
.replace(/'/gi, "'")
|
||||||
.replace(/&#x([0-9a-f]+);/gi, (_m, hex: string) => String.fromCodePoint(parseInt(hex, 16)))
|
.replace(/&#x([0-9a-f]+);/gi, (m, hex: string) => codePoint(parseInt(hex, 16), m))
|
||||||
.replace(/&#(\d+);/g, (_m, dec: string) => String.fromCodePoint(Number(dec)))
|
.replace(/&#(\d+);/g, (m, dec: string) => codePoint(Number(dec), m))
|
||||||
.replace(/&/gi, "&");
|
.replace(/&/gi, "&");
|
||||||
out = out
|
out = out
|
||||||
.replace(/[ \t]+\n/g, "\n")
|
.replace(/[ \t]+\n/g, "\n")
|
||||||
|
|||||||
Reference in new issue
Block a user