@ecency/render-helper 2.5.22 → 2.5.24

package/dist/browser/index.d.ts

@@ -60,6 +60,7 @@ declare function catchPostImage(obj: Entry | string, width?: number, height?: nu
 declare function getPostBodySummary(obj: Entry | string, length?: number, platform?: 'ios' | 'android' | 'web'): string;
 
 declare function setProxyBase(p: string): void;
+declare function isLegacySizedProxyUrl(url?: string): boolean;
 interface ProxifyOptions {
     /**
      * Request a tiny blurred LQIP placeholder. The proxy resizes to ~20px and
@@ -159,4 +160,4 @@ declare function isValidPermlink(permlink: string): boolean;
  */
 declare function simpleMarkdownToHTML(input: string): string;
 
-export { type Entry, IMAGE_SIZES, type ProxifyOptions, type RenderOptions, SECTION_LIST, type SeoContext, buildPictureSources, buildSrcSet, buildSrcSetForFormat, catchPostImage, getEntryImageRawUrl, isAllowedEmbedSrc, isPictureEligibleRawUrl, isValidPermlink, getPostBodySummary as postBodySummary, proxifyImageSrc, markdown2Html as renderPostBody, setCacheSize, setProxyBase, setSlowRenderThresholdMs, simpleMarkdownToHTML };
+export { type Entry, IMAGE_SIZES, type ProxifyOptions, type RenderOptions, SECTION_LIST, type SeoContext, buildPictureSources, buildSrcSet, buildSrcSetForFormat, catchPostImage, getEntryImageRawUrl, isAllowedEmbedSrc, isLegacySizedProxyUrl, isPictureEligibleRawUrl, isValidPermlink, getPostBodySummary as postBodySummary, proxifyImageSrc, markdown2Html as renderPostBody, setCacheSize, setProxyBase, setSlowRenderThresholdMs, simpleMarkdownToHTML };

package/dist/browser/index.js

@@ -77,6 +77,7 @@ var DAPPLR_REGEX = /^(https?:)?\/\/[a-z]*\.dapplr\.in\/file\/dapplr-videos\/.*/i
 var TRUVVL_REGEX = /^https?:\/\/embed\.truvvl\.com\/(@[\w.\d-]+)\/(.*)/i;
 var LBRY_REGEX = /^(https?:)?\/\/lbry\.tv\/\$\/embed\/[^?#]+(?:$|[?#])/i;
 var ODYSEE_REGEX = /^(https?:)?\/\/odysee\.com\/(?:\$|%24)\/embed\/[^?#]+(?:$|[?#])/i;
+var ODYSEE_WATCH_REGEX = /^(?:https?:)?\/\/odysee\.com\/(@[^/?#\s:"'<>\\]+:[^/?#\s:"'<>\\]+\/[^/?#\s:"'<>\\]+:[^/?#\s:"'<>\\]+|[^@/?#\s:"'<>\\][^/?#\s:"'<>\\]*:[^/?#\s:"'<>\\]+)(?:$|[?#])/i;
 var SKATEHIVE_IPFS_REGEX = /^https?:\/\/ipfs\.skatehive\.app\/ipfs\/([^/?#]+)/i;
 var SKATEHYPE_EMBED_REGEX = /^(https?:)?\/\/(www\.)?skatehype\.com\/ifplay\.php\?v=\d+(?:$|[&#])/i;
 var ARCH_REGEX = /^(https?:)?\/\/archive\.org\/embed\/[^/?#]+(?:$|[?#])/i;
@@ -250,7 +251,13 @@ var EMBED_HOST_PATH_PATTERNS = {
   "www.rumble.com": /^\/embed\//,
   "rumble.com": /^\/embed\//,
   "www.brighteon.com": /^\/embed\//,
-  "brighteon.com": /^\/embed\//
+  "brighteon.com": /^\/embed\//,
+  // Odysee's embed route is /$/embed/<claim path>. Both the literal `$` and its
+  // percent-encoded spelling occur in the wild: the renderer emits the literal
+  // form, while Odysee's own share dialog hands out fully-encoded URLs, and
+  // `URL.pathname` does not decode either. ODYSEE_REGEX accepts both for the
+  // same reason.
+  "odysee.com": /^\/(?:\$|%24)\/embed\//
 };
 function isAllowedEmbedSrc(value) {
   if (!value) return false;
@@ -594,6 +601,40 @@ function isValidUrl(url) {
     return false;
   }
 }
+var MAX_PROXIED_URL_LENGTH = 2048;
+var LEGACY_SIZED_PROXY_RE = /^https:\/\/(?:images\.hive\.blog|steemitimages\.com)\/\d+x\d+\/(.+)$/;
+function isLegacySizedProxyUrl(url) {
+  if (!url || typeof url !== "string") return false;
+  return LEGACY_SIZED_PROXY_RE.test(url);
+}
+function extractLegacySizedSource(url) {
+  const m = LEGACY_SIZED_PROXY_RE.exec(url);
+  if (!m) return null;
+  const rest = m[1];
+  const hashIndex = rest.indexOf("#");
+  const addressable = hashIndex >= 0 ? rest.slice(0, hashIndex) : rest;
+  const qIndex = addressable.indexOf("?");
+  const path = qIndex >= 0 ? addressable.slice(0, qIndex) : addressable;
+  const query = qIndex >= 0 ? addressable.slice(qIndex + 1) : "";
+  let end = path.length;
+  while (end > 0 && path.charCodeAt(end - 1) === 47) {
+    end--;
+  }
+  try {
+    const inner = new URL(path.slice(0, end));
+    if (query) {
+      for (const [key, value] of new URLSearchParams(query)) {
+        inner.searchParams.append(key, value);
+      }
+    }
+    return inner.toString();
+  } catch {
+    return null;
+  }
+}
+function isLegacyForeignProxyUrl(url) {
+  return url.indexOf("https://images.hive.blog/") === 0 && url.indexOf("https://images.hive.blog/D") !== 0 || url.indexOf("https://steemitimages.com/") === 0 && url.indexOf("https://steemitimages.com/D") !== 0;
+}
 function getLatestUrl(str) {
   const [last] = [...str.replace(/https?:\/\//g, "\n$&").trim().split("\n")].reverse();
   return last;
@@ -602,17 +643,17 @@ function proxifyForFormat(url, width = 0, height = 0, format = "match", opts = {
   if (!url || typeof url !== "string" || !isValidUrl(url)) {
     return "";
   }
-  const routeThroughProxy = width > 0 || height > 0 || !!opts.blur || !!opts.forceProxy;
-  if (url.indexOf("https://images.hive.blog/") === 0 && url.indexOf("https://images.hive.blog/D") !== 0) {
-    return url.replace("https://images.hive.blog", proxyBase);
+  if (url.length > MAX_PROXIED_URL_LENGTH) {
+    return "";
   }
-  if (url.indexOf("https://steemitimages.com/") === 0 && url.indexOf("https://steemitimages.com/D") !== 0) {
-    return url.replace("https://steemitimages.com", proxyBase);
+  const routeThroughProxy = width > 0 || height > 0 || !!opts.blur || !!opts.forceProxy;
+  if (isLegacyForeignProxyUrl(url) && !(isLegacySizedProxyUrl(url) && routeThroughProxy)) {
+    return url.replace("https://images.hive.blog", proxyBase).replace("https://steemitimages.com", proxyBase);
   }
   if (url.indexOf("https://images.ecency.com/") === 0 && !routeThroughProxy) {
     return url.replace("https://images.ecency.com", proxyBase);
   }
-  const realUrl = getLatestUrl(url);
+  const realUrl = extractLegacySizedSource(url) ?? getLatestUrl(url);
   const pHash = extractPHash(realUrl);
   const options = {
     format,
@@ -672,6 +713,7 @@ function isPictureEligibleRawUrl(rawUrl) {
     return false;
   }
   if (u.protocol !== "http:" && u.protocol !== "https:") return false;
+  if (isLegacySizedProxyUrl(rawUrl)) return true;
   const host = `${u.protocol}//${u.host}`;
   const isProxyHost = host === proxyBase || host === "https://images.ecency.com";
   if (isProxyHost && (u.pathname.startsWith("/p/") || u.pathname.startsWith("/u/") || SIZED_PROXY_PATH.test(u.pathname))) {
@@ -854,6 +896,33 @@ function getExternalLinkRel(seoContext) {
   }
   return "nofollow ugc noopener";
 }
+function renderPlainVideoLink(el, provider, embedSrc, renderOptions) {
+  const baseClass = `markdown-video-link markdown-video-link-${provider}`;
+  el.setAttribute("class", baseClass);
+  el.removeAttribute("href");
+  el.textContent = "";
+  el.setAttribute("data-embed-src", embedSrc);
+  if (renderOptions?.embedVideosDirectly) {
+    const wrapper = el.ownerDocument.createElement("span");
+    wrapper.setAttribute("class", "er-embed-frame");
+    wrapper.setAttribute("style", "display:block");
+    const frame = el.ownerDocument.createElement("iframe");
+    frame.setAttribute("src", embedSrc);
+    frame.setAttribute("title", "Video player");
+    frame.setAttribute(
+      "allow",
+      "accelerometer; encrypted-media; gyroscope; picture-in-picture; web-share"
+    );
+    frame.setAttribute("allowfullscreen", "");
+    wrapper.appendChild(frame);
+    el.appendChild(wrapper);
+    el.setAttribute("class", `${baseClass} er-embed`);
+    return;
+  }
+  const play = el.ownerDocument.createElement("span");
+  play.setAttribute("class", "markdown-video-play");
+  el.appendChild(play);
+}
 var normalizeValue = (value) => value ? value.trim() : "";
 var matchesHref = (href, value) => {
   const normalizedHref = normalizeValue(href);
@@ -1192,41 +1261,22 @@ function a(el, forApp, parentDomain = "ecency.com", seoContext, renderOptions) {
   }
   const BCmatch = href.match(BITCHUTE_REGEX);
   if (BCmatch && BCmatch[1] && el.textContent.trim() === href) {
-    const vid = BCmatch[1];
-    el.setAttribute("class", "markdown-video-link");
-    el.removeAttribute("href");
-    const embedSrc = `https://www.bitchute.com/embed/${vid}/`;
-    el.textContent = "";
-    el.setAttribute("data-embed-src", embedSrc);
-    const play = el.ownerDocument.createElement("span");
-    play.setAttribute("class", "markdown-video-play");
-    el.appendChild(play);
+    renderPlainVideoLink(el, "bitchute", `https://www.bitchute.com/embed/${BCmatch[1]}/`, renderOptions);
     return;
   }
   const RBmatch = href.match(RUMBLE_REGEX);
   if (RBmatch && RBmatch[1] && el.textContent.trim() === href) {
-    const vid = RBmatch[1];
-    const embedSrc = `https://www.rumble.com/embed/${vid}/?pub=4`;
-    el.setAttribute("class", "markdown-video-link");
-    el.removeAttribute("href");
-    el.textContent = "";
-    el.setAttribute("data-embed-src", embedSrc);
-    const play = el.ownerDocument.createElement("span");
-    play.setAttribute("class", "markdown-video-play");
-    el.appendChild(play);
+    renderPlainVideoLink(el, "rumble", `https://www.rumble.com/embed/${RBmatch[1]}/?pub=4`, renderOptions);
     return;
   }
   const BNmatch = href.match(BRIGHTEON_REGEX);
   if (BNmatch && BNmatch[2] && el.textContent.trim() === href) {
-    const vid = BNmatch[2];
-    const embedSrc = `https://www.brighteon.com/embed/${vid}`;
-    el.setAttribute("class", "markdown-video-link");
-    el.removeAttribute("href");
-    el.textContent = "";
-    el.setAttribute("data-embed-src", embedSrc);
-    const play = el.ownerDocument.createElement("span");
-    play.setAttribute("class", "markdown-video-play");
-    el.appendChild(play);
+    renderPlainVideoLink(el, "brighteon", `https://www.brighteon.com/embed/${BNmatch[2]}`, renderOptions);
+    return;
+  }
+  const ODmatch = href.match(ODYSEE_WATCH_REGEX);
+  if (ODmatch && ODmatch[1] && el.textContent.trim() === href) {
+    renderPlainVideoLink(el, "odysee", `https://odysee.com/$/embed/${ODmatch[1]}`, renderOptions);
     return;
   }
   let match = href.match(YOUTUBE_REGEX);
@@ -2363,6 +2413,6 @@ function getPostBodySummary(obj, length, platform) {
   return res;
 }
 
-export { IMAGE_SIZES, SECTION_LIST, buildPictureSources, buildSrcSet, buildSrcSetForFormat, catchPostImage, getEntryImageRawUrl, isAllowedEmbedSrc, isPictureEligibleRawUrl, isValidPermlink, getPostBodySummary as postBodySummary, proxifyImageSrc, markdown2Html as renderPostBody, setCacheSize, setProxyBase, setSlowRenderThresholdMs, simpleMarkdownToHTML };
+export { IMAGE_SIZES, SECTION_LIST, buildPictureSources, buildSrcSet, buildSrcSetForFormat, catchPostImage, getEntryImageRawUrl, isAllowedEmbedSrc, isLegacySizedProxyUrl, isPictureEligibleRawUrl, isValidPermlink, getPostBodySummary as postBodySummary, proxifyImageSrc, markdown2Html as renderPostBody, setCacheSize, setProxyBase, setSlowRenderThresholdMs, simpleMarkdownToHTML };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map