stormcloud-video-player 0.7.28 → 0.7.30

package/lib/ui/OverlayRenderer.cjs

@@ -442,10 +442,10 @@ function TextOverlay(param) {
     });
 }
 function parseRSSXml(xmlText, maxItems) {
+    var stripped = xmlText.replace(/^<\?xml[^?]*\?>\s*/, "");
     var parser = new DOMParser();
-    var doc = parser.parseFromString(xmlText, "text/xml");
-    if (doc.querySelector("parsererror")) throw new Error("Invalid RSS XML");
-    return Array.from(doc.querySelectorAll("item")).map(function(item) {
+    var doc = parser.parseFromString(stripped, "text/xml");
+    var items = Array.from(doc.querySelectorAll("item")).map(function(item) {
         var _item_querySelector, _item_querySelector1, _item_querySelector2, _item_querySelector3, _item_querySelector4;
         return {
             title: (((_item_querySelector = item.querySelector("title")) === null || _item_querySelector === void 0 ? void 0 : _item_querySelector.textContent) || "").replace(/<[^>]*>/g, "").trim(),
@@ -457,10 +457,30 @@ function parseRSSXml(xmlText, maxItems) {
     }).filter(function(i) {
         return i.title;
     }).slice(0, maxItems);
+    if (items.length === 0 && doc.querySelector("parsererror")) {
+        throw new Error("Invalid RSS XML");
+    }
+    return items;
+}
+var RSS_CACHE_TTL_MS = 6e4;
+var rssCache = /* @__PURE__ */ new Map();
+function cachedFetchRSSItems(rssUrl, maxItems) {
+    var now = Date.now();
+    var cached = rssCache.get(rssUrl);
+    if (cached && cached.expiresAt > now) return cached.promise;
+    var promise = fetchRSSItems(rssUrl, maxItems).catch(function(err) {
+        rssCache.delete(rssUrl);
+        throw err;
+    });
+    rssCache.set(rssUrl, {
+        promise: promise,
+        expiresAt: now + RSS_CACHE_TTL_MS
+    });
+    return promise;
 }
 function fetchRSSItems(rssUrl, maxItems) {
     return _async_to_generator(function() {
-        var encoded, resp2, data, unused, resp21, text2, unused1, resp, text;
+        var encoded, origin, resp, text, unused, resp1, data, unused1, resp2, text1, unused2;
         return _ts_generator(this, function(_state) {
             switch(_state.label){
                 case 0:
@@ -473,25 +493,26 @@ function fetchRSSItems(rssUrl, maxItems) {
                         ,
                         6
                     ]);
+                    origin = typeof window !== "undefined" ? window.location.origin : "";
                     return [
                         4,
-                        fetch("https://api.allorigins.win/get?url=".concat(encoded))
+                        fetch("".concat(origin, "/api/rss-proxy?url=").concat(encoded))
                     ];
                 case 2:
-                    resp2 = _state.sent();
-                    if (!resp2.ok) return [
+                    resp = _state.sent();
+                    if (!resp.ok) return [
                         3,
                         4
                     ];
                     return [
                         4,
-                        resp2.json()
+                        resp.text()
                     ];
                 case 3:
-                    data = _state.sent();
-                    if (data.contents) return [
+                    text = _state.sent();
+                    if (text.includes("<item")) return [
                         2,
-                        parseRSSXml(data.contents, maxItems)
+                        parseRSSXml(text, maxItems)
                     ];
                     _state.label = 4;
                 case 4:
@@ -514,23 +535,23 @@ function fetchRSSItems(rssUrl, maxItems) {
                     ]);
                     return [
                         4,
-                        fetch("https://corsproxy.io/?url=".concat(encoded))
+                        fetch("https://api.allorigins.win/get?url=".concat(encoded))
                     ];
                 case 7:
-                    resp21 = _state.sent();
-                    if (!resp21.ok) return [
+                    resp1 = _state.sent();
+                    if (!resp1.ok) return [
                         3,
                         9
                     ];
                     return [
                         4,
-                        resp21.text()
+                        resp1.json()
                     ];
                 case 8:
-                    text2 = _state.sent();
-                    if (text2) return [
+                    data = _state.sent();
+                    if (data.contents) return [
                         2,
-                        parseRSSXml(text2, maxItems)
+                        parseRSSXml(data.contents, maxItems)
                     ];
                     _state.label = 9;
                 case 9:
@@ -545,23 +566,46 @@ function fetchRSSItems(rssUrl, maxItems) {
                         11
                     ];
                 case 11:
+                    _state.trys.push([
+                        11,
+                        15,
+                        ,
+                        16
+                    ]);
                     return [
                         4,
-                        fetch("https://thingproxy.freeboard.io/fetch/".concat(rssUrl))
+                        fetch("https://corsproxy.io/?url=".concat(encoded))
                     ];
                 case 12:
-                    resp = _state.sent();
-                    if (!resp.ok) throw new Error("RSS fetch failed: ".concat(resp.status));
+                    resp2 = _state.sent();
+                    if (!resp2.ok) return [
+                        3,
+                        14
+                    ];
                     return [
                         4,
-                        resp.text()
+                        resp2.text()
                     ];
                 case 13:
-                    text = _state.sent();
-                    return [
+                    text1 = _state.sent();
+                    if (text1) return [
                         2,
-                        parseRSSXml(text, maxItems)
+                        parseRSSXml(text1, maxItems)
+                    ];
+                    _state.label = 14;
+                case 14:
+                    return [
+                        3,
+                        16
+                    ];
+                case 15:
+                    unused2 = _state.sent();
+                    return [
+                        3,
+                        16
                     ];
+                case 16:
+                    throw new Error("All RSS proxies failed");
             }
         });
     })();
@@ -586,7 +630,7 @@ function ScrollerOverlay(param) {
         var cancelled = false;
         setRssLoading(true);
         setRssError(false);
-        fetchRSSItems(rssUrl, maxItems).then(function(items) {
+        cachedFetchRSSItems(rssUrl, maxItems).then(function(items) {
             if (!cancelled) {
                 setRssItems(items);
                 setRssError(false);
@@ -608,7 +652,8 @@ function ScrollerOverlay(param) {
     (0, import_react.useEffect)(function() {
         if (!rssUrl || !autoRefresh || (cfg === null || cfg === void 0 ? void 0 : cfg.use_custom_text) && (cfg === null || cfg === void 0 ? void 0 : cfg.custom_text)) return;
         var interval = setInterval(function() {
-            fetchRSSItems(rssUrl, maxItems).then(function(items) {
+            rssCache.delete(rssUrl);
+            cachedFetchRSSItems(rssUrl, maxItems).then(function(items) {
                 setRssItems(items);
                 setRssError(false);
             }).catch(function() {});