npm - @ecency/render-helper - Versions diffs - 2.4.32 → 2.4.34 - Mend

@ecency/render-helper 2.4.32 → 2.4.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/browser/index.js CHANGED Viewed

@@ -1,13 +1,13 @@
-import { DOMParser as DOMParser$1, XMLSerializer as XMLSerializer$1 } from '@xmldom/xmldom';
+import { DOMParser as DOMParser$1, XMLSerializer } from '@xmldom/xmldom';
 import xss from 'xss';
 import multihash from 'multihashes';
 import querystring from 'querystring';
+import { LRUCache } from 'lru-cache';
 import { Remarkable } from 'remarkable';
 import { linkify as linkify$1 } from 'remarkable/linkify';
-import he2 from 'he';
 import * as htmlparser2 from 'htmlparser2';
 import * as domSerializerModule from 'dom-serializer';
-import { LRUCache } from 'lru-cache';
+import he from 'he';
 // src/consts/white-list.const.ts
 var WHITE_LIST = [
@@ -168,13 +168,13 @@ var ALLOWED_ATTRIBUTES = {
   "del": [],
   "ins": []
 };
-var hasDOMParser = typeof globalThis.DOMParser !== "undefined";
-var hasXMLSerializer = typeof globalThis.XMLSerializer !== "undefined";
-var lenientErrorHandler = (level, msg, _context) => {
-  return void 0;
-};
-var DOMParser = hasDOMParser ? new globalThis.DOMParser() : new DOMParser$1({ onError: lenientErrorHandler });
-var XMLSerializer = hasXMLSerializer ? globalThis.XMLSerializer : XMLSerializer$1;
+function createParser() {
+  return new DOMParser$1({
+    onError(level, msg) {
+    }
+  });
+}
+var DOMParser = createParser();
 // src/helper.ts
 function removeDuplicateAttributes(html) {
@@ -296,6 +296,14 @@ function sanitizeHtml(html) {
   });
 }
 var proxyBase = "https://images.ecency.com";
+var urlHashCache = new LRUCache({ max: 500 });
+function getUrlHash(url) {
+  const cached = urlHashCache.get(url);
+  if (cached) return cached;
+  const hash = multihash.toB58String(Buffer.from(url));
+  urlHashCache.set(url, hash);
+  return hash;
+}
 function setProxyBase(p2) {
   proxyBase = p2;
 }
@@ -346,7 +354,7 @@ function proxifyImageSrc(url, width = 0, height = 0, _format = "match") {
   if (pHash) {
     return `${proxyBase}/p/${pHash}?${qs}`;
   }
-  const b58url = multihash.toB58String(Buffer.from(realUrl.toString()));
+  const b58url = getUrlHash(realUrl.toString());
   return `${proxyBase}/p/${b58url}?${qs}`;
 }
 var SRCSET_WIDTHS = [320, 600, 800, 1024, 1280];
@@ -1590,8 +1598,7 @@ function markdownToHTML(input, forApp, parentDomain = "ecency.com", seoContext,
       traverse(doc, forApp, 0, { firstImageFound: false }, parentDomain, seoContext, renderOptions);
       output = serializer.serializeToString(doc);
     } catch (fallbackError) {
-      const escapedContent = he2.encode(output || md.render(input));
-      output = `<p dir="auto">${escapedContent}</p>`;
+      output = sanitizeHtml(output || md.render(input));
     }
   }
   if (forApp && output && entityPlaceholders.length > 0) {
@@ -1600,7 +1607,7 @@ function markdownToHTML(input, forApp, parentDomain = "ecency.com", seoContext,
       output = output.split(placeholder).join(entity);
     });
   }
-  output = output.replace(/ xmlns="http:\/\/www.w3.org\/1999\/xhtml"/g, "").replace('<body id="root">', "").replace("</body>", "").trim();
+  output = output.replace(/ xmlns="http:\/\/www.w3.org\/1999\/xhtml"/g, "").replace(/^<\?xml[^?]*\?>/, "").replace(/^<!DOCTYPE[^>]*>/i, "").replace(/<\/?html[^>]*>/g, "").replace(/<head[^>]*>[\s\S]*?<\/head>/g, "").replace('<body id="root">', "").replace("</body>", "").trim();
   return sanitizeHtml(output);
 }
 var mdInstance = null;
@@ -1619,7 +1626,7 @@ function simpleMarkdownToHTML(input) {
   const html = getMd().render(input);
   return sanitizeHtml(html);
 }
-var cache = new LRUCache({ max: 60 });
+var cache = new LRUCache({ max: 500 });
 function setCacheSize(size) {
   cache = new LRUCache({ max: size });
 }
@@ -1650,6 +1657,40 @@ var gifLinkRegex = /\.(gif)$/i;
 function isGifLink(link) {
   return gifLinkRegex.test(link);
 }
+var BACKTICK_FENCE_RE = /```[\s\S]*?```/g;
+var TILDE_FENCE_RE = /~~~[\s\S]*?~~~/g;
+var INLINE_CODE_RE = /`[^`\n]*`/g;
+var INDENTED_CODE_RE = /^(?: {4}|\t).+$/gm;
+var MD_IMAGE_RE = /!\[[^\]]*\]\(\s*([^)\s]+)(?:\s+["'][^"']*["'])?\s*\)/;
+var HTML_IMAGE_RE = /<img\b[^>]*?\bsrc\s*=\s*["']([^"']+)["']/i;
+var SAFE_URL_RE = /^https?:\/\//i;
+function findFirstImageUrl(body) {
+  if (!body) return null;
+  const cleaned = body.replace(BACKTICK_FENCE_RE, "").replace(TILDE_FENCE_RE, "").replace(INLINE_CODE_RE, "").replace(INDENTED_CODE_RE, "");
+  const mdMatch = cleaned.match(MD_IMAGE_RE);
+  const htmlMatch = cleaned.match(HTML_IMAGE_RE);
+  if (mdMatch) {
+    const url = mdMatch[1];
+    if (!url || !SAFE_URL_RE.test(url) || url.includes("(")) {
+      return null;
+    }
+  }
+  const mdValid = !!mdMatch;
+  const htmlValid = !!(htmlMatch && htmlMatch[1] && SAFE_URL_RE.test(htmlMatch[1]));
+  if (mdValid && htmlValid) {
+    return (mdMatch.index ?? 0) < (htmlMatch.index ?? 0) ? mdMatch[1] : htmlMatch[1];
+  }
+  if (mdValid) return mdMatch[1];
+  if (htmlValid) return htmlMatch[1];
+  return null;
+}
+function proxifyFound(src, width, height, format) {
+  const decoded = he.decode(src);
+  if (isGifLink(decoded)) {
+    return proxifyImageSrc(decoded, 0, 0, format);
+  }
+  return proxifyImageSrc(decoded, width, height, format);
+}
 function getImage(entry, width = 0, height = 0, format = "match") {
   let meta;
   if (typeof entry.json_metadata === "object") {
@@ -1662,7 +1703,7 @@ function getImage(entry, width = 0, height = 0, format = "match") {
     }
   }
   if (meta && typeof meta.image === "string" && meta.image.length > 0) {
-    const decodedImage = he2.decode(meta.image);
+    const decodedImage = he.decode(meta.image);
     if (isGifLink(decodedImage)) {
       return proxifyImageSrc(decodedImage, 0, 0, format);
     }
@@ -1670,7 +1711,7 @@ function getImage(entry, width = 0, height = 0, format = "match") {
   }
   if (meta && meta.image && !!meta.image.length && meta.image[0]) {
     if (typeof meta.image[0] === "string") {
-      const decodedImage = he2.decode(meta.image[0]);
+      const decodedImage = he.decode(meta.image[0]);
       if (isGifLink(decodedImage)) {
         return proxifyImageSrc(decodedImage, 0, 0, format);
       }
@@ -1681,6 +1722,10 @@ function getImage(entry, width = 0, height = 0, format = "match") {
     }
     return proxifyImageSrc(meta.image[0], width, height, format);
   }
+  const fast = findFirstImageUrl(entry.body);
+  if (fast) {
+    return proxifyFound(fast, width, height, format);
+  }
   const html = markdown2Html(entry);
   const doc = createDoc(html);
   if (!doc) {
@@ -1692,16 +1737,16 @@ function getImage(entry, width = 0, height = 0, format = "match") {
     if (!src) {
       return null;
     }
-    const decodedSrc = he2.decode(src);
-    if (isGifLink(decodedSrc)) {
-      return proxifyImageSrc(decodedSrc, 0, 0, format);
-    }
-    return proxifyImageSrc(decodedSrc, width, height, format);
+    return proxifyFound(src, width, height, format);
   }
   return null;
 }
 function catchPostImage(obj, width = 0, height = 0, format = "match") {
   if (typeof obj === "string") {
+    const fast = findFirstImageUrl(obj);
+    if (fast) {
+      return proxifyFound(fast, width, height, format);
+    }
     const html = markdown2Html(obj);
     const doc = createDoc(html);
     if (!doc) {
@@ -1713,11 +1758,7 @@ function catchPostImage(obj, width = 0, height = 0, format = "match") {
       if (!src) {
         return null;
       }
-      const decodedSrc = he2.decode(src);
-      if (isGifLink(decodedSrc)) {
-        return proxifyImageSrc(decodedSrc, 0, 0, format);
-      }
-      return proxifyImageSrc(decodedSrc, width, height, format);
+      return proxifyFound(src, width, height, format);
     }
     return null;
   }
@@ -1730,6 +1771,20 @@ function catchPostImage(obj, width = 0, height = 0, format = "match") {
   cacheSet(key, res);
   return res;
 }
+var summaryRenderer = new Remarkable({
+  html: true,
+  breaks: true,
+  typographer: false
+});
+summaryRenderer.core.ruler.enable(["abbr"]);
+summaryRenderer.block.ruler.enable(["footnote", "deflist"]);
+summaryRenderer.inline.ruler.enable([
+  "footnote_inline",
+  "ins",
+  "mark",
+  "sub",
+  "sup"
+]);
 var joint = (arr, limit = 200) => {
   let result = "";
   if (arr) {
@@ -1755,25 +1810,6 @@ function postBodySummary(entryBody, length = 200, platform = "web") {
     return "";
   }
   entryBody = cleanReply(entryBody);
-  const mdd = new Remarkable({
-    html: true,
-    breaks: true,
-    typographer: false
-  }).use(linkify$1);
-  mdd.core.ruler.enable([
-    "abbr"
-  ]);
-  mdd.block.ruler.enable([
-    "footnote",
-    "deflist"
-  ]);
-  mdd.inline.ruler.enable([
-    "footnote_inline",
-    "ins",
-    "mark",
-    "sub",
-    "sup"
-  ]);
   const entities = entryBody.match(ENTITY_REGEX);
   const entityPlaceholders = [];
   if (entities && platform !== "web") {
@@ -1786,7 +1822,7 @@ function postBodySummary(entryBody, length = 200, platform = "web") {
   }
   let text2 = "";
   try {
-    text2 = mdd.render(entryBody);
+    text2 = summaryRenderer.render(entryBody);
   } catch (err) {
     console.error("[postBodySummary] Failed to render markdown:", {
       error: err instanceof Error ? err.message : String(err),
@@ -1806,7 +1842,7 @@ function postBodySummary(entryBody, length = 200, platform = "web") {
     text2 = joint(text2.split(" "), length);
   }
   if (text2) {
-    text2 = he2.decode(text2);
+    text2 = he.decode(text2);
   }
   return text2;
 }