rsshub 1.0.0-master.f9e891b → 1.0.0-master.f9ec483

package/lib/routes/reuters/common.ts

@@ -29,44 +29,7 @@ export const route: Route = {
             ],
             default: 'world',
         },
-        topic: {
-            description: 'find it in the URL, or tables below, leave empty for `All`',
-            options: [
-                // World topics
-                { value: 'africa', label: 'Africa' },
-                { value: 'americas', label: 'Americas' },
-                { value: 'asia-pacific', label: 'Asia Pacific' },
-                { value: 'china', label: 'China' },
-                { value: 'europe', label: 'Europe' },
-                { value: 'india', label: 'India' },
-                { value: 'middle-east', label: 'Middle East' },
-                { value: 'uk', label: 'United Kingdom' },
-                { value: 'us', label: 'United States' },
-                { value: 'the-great-reboot', label: 'The Great Reboot' },
-                { value: 'reuters-next', label: 'Reuters Next' },
-                // Business topics
-                { value: 'aerospace-defense', label: 'Aerospace & Defense' },
-                { value: 'autos-transportation', label: 'Autos & Transportation' },
-                { value: 'energy', label: 'Energy' },
-                { value: 'environment', label: 'Environment' },
-                { value: 'finance', label: 'Finance' },
-                { value: 'healthcare-pharmaceuticals', label: 'Healthcare & Pharmaceuticals' },
-                { value: 'media-telecom', label: 'Media & Telecom' },
-                { value: 'retail-consumer', label: 'Retail & Consumer' },
-                { value: 'sustainable-business', label: 'Sustainable Business' },
-                { value: 'charged', label: 'Charged' },
-                { value: 'future-of-health', label: 'Future of Health' },
-                { value: 'future-of-money', label: 'Future of Money' },
-                { value: 'take-five', label: 'Take Five' },
-                { value: 'reuters-impact', label: 'Reuters Impact' },
-                // Legal topics
-                { value: 'government', label: 'Government' },
-                { value: 'legalindustry', label: 'Legal Industry' },
-                { value: 'litigation', label: 'Litigation' },
-                { value: 'transactional', label: 'Transactional' },
-            ],
-            default: 'us',
-        },
+        topic: 'find it in the URL, or tables below, leave empty for `All`',
     },
     features: {
         requireConfig: false,
@@ -82,7 +45,7 @@ export const route: Route = {
         },
     ],
     name: 'Category/Topic/Author',
-    maintainers: ['LyleLee', 'HenryQW', 'proletarius101', 'black-desk', 'nczitzk'],
+    maintainers: ['LyleLee', 'HenryQW', 'proletarius101', 'black-desk', 'nczitzk', 'pseudoyu'],
     handler,
     description: `-   \`:category\`:
 
@@ -127,128 +90,166 @@ async function handler(ctx) {
     const useSophi = ctx.req.query('sophi') === 'true' && topic !== '' && CAN_USE_SOPHI.includes(category);
 
     const section_id = `/${category}/${topic ? `${topic}/` : ''}`;
-    const { title, description, rootUrl, response } = await (async () => {
-        if (MUST_FETCH_BY_TOPICS.has(category)) {
-            const rootUrl = 'https://www.reuters.com/pf/api/v3/content/fetch/articles-by-topic-v1';
-            const response = await ofetch(rootUrl, {
-                query: {
-                    query: JSON.stringify({
-                        offset: 0,
-                        size: limit,
-                        topic_url: section_id,
-                        website: 'reuters',
-                    }),
-                },
-            });
 
-            return {
-                title: `${response.result.topics[0].name} | Reuters`,
-                description: response.result.topics[0].entity_id,
-                rootUrl,
-                response,
-            };
-        } else {
-            const rootUrl = 'https://www.reuters.com/pf/api/v3/content/fetch/articles-by-section-alias-or-id-v1';
-            const response = await ofetch(rootUrl, {
-                query: {
-                    query: JSON.stringify({
-                        offset: 0,
-                        size: limit,
-                        section_id,
-                        website: 'reuters',
-                        ...(useSophi
-                            ? {
-                                  fetch_type: 'sophi',
-                                  sophi_page: '*',
-                                  sophi_widget: 'topic',
-                              }
-                            : {}),
-                    }),
-                },
-            });
-            return {
-                title: response.result.section.title,
-                description: response.result.section.section_about,
-                rootUrl,
-                response,
-            };
-        }
-    })();
-
-    let items = response.result.articles.map((e) => ({
-        title: e.title,
-        link: new URL(e.canonical_url, rootUrl).href,
-        guid: e.id,
-        pubDate: parseDate(e.published_time),
-        updated: parseDate(e.updated_time),
-        author: e.authors.map((e) => e.name).join(', '),
-        category: e.kicker.names,
-        description: e.description,
-    }));
-
-    items = items.filter((e, i) => items.findIndex((f) => e.guid === f.guid) === i);
-
-    const results = await Promise.allSettled(
-        items.map((item) =>
-            ctx.req.query('mode') === 'fulltext'
-                ? cache.tryGet(item.link, async () => {
-                      const detailResponse = await ofetch(item.link);
-                      const content = load(detailResponse.data);
-
-                      if (detailResponse.url.startsWith('https://www.reuters.com/investigates/')) {
-                          const ldJson = JSON.parse(content('script[type="application/ld+json"]').text());
-                          content('.special-report-article-container .container, #slide-dek, #slide-end, .share-in-article-container').remove();
-
-                          item.title = ldJson.headline;
-                          item.pubDate = parseDate(ldJson.dateCreated);
-                          item.author = ldJson.creator;
-                          item.category = ldJson.keywords;
-                          item.description = content('.special-report-article-container').html();
+    try {
+        const { title, description, rootUrl, response } = await (async () => {
+            if (MUST_FETCH_BY_TOPICS.has(category)) {
+                const rootUrl = 'https://www.reuters.com/pf/api/v3/content/fetch/articles-by-topic-v1';
+                const response = await ofetch(rootUrl, {
+                    query: {
+                        query: JSON.stringify({
+                            offset: 0,
+                            size: limit,
+                            topic_url: section_id,
+                            website: 'reuters',
+                        }),
+                    },
+                });
+
+                return {
+                    title: `${response.result.topics[0].name} | Reuters`,
+                    description: response.result.topics[0].entity_id,
+                    rootUrl,
+                    response,
+                };
+            } else {
+                const rootUrl = 'https://www.reuters.com/pf/api/v3/content/fetch/articles-by-section-alias-or-id-v1';
+                const response = await ofetch(rootUrl, {
+                    query: {
+                        query: JSON.stringify({
+                            offset: 0,
+                            size: limit,
+                            section_id,
+                            website: 'reuters',
+                            ...(useSophi
+                                ? {
+                                      fetch_type: 'sophi',
+                                      sophi_page: '*',
+                                      sophi_widget: 'topic',
+                                  }
+                                : {}),
+                        }),
+                    },
+                });
+                return {
+                    title: response.result.section.title,
+                    description: response.result.section.section_about,
+                    rootUrl,
+                    response,
+                };
+            }
+        })();
+
+        let items = response.result.articles.map((e) => ({
+            title: e.title,
+            link: new URL(e.canonical_url, rootUrl).href,
+            guid: e.id,
+            pubDate: parseDate(e.published_time),
+            updated: parseDate(e.updated_time),
+            author: e.authors.map((e) => e.name).join(', '),
+            category: e.kicker.names,
+            description: e.description,
+        }));
+
+        items = items.filter((e, i) => items.findIndex((f) => e.guid === f.guid) === i);
+
+        const results = await Promise.allSettled(
+            items.map((item) =>
+                ctx.req.query('fulltext') === 'true'
+                    ? cache.tryGet(item.link, async () => {
+                          const detailResponse = await ofetch(item.link);
+                          const content = load(detailResponse.data);
+
+                          if (detailResponse.url.startsWith('https://www.reuters.com/investigates/')) {
+                              const ldJson = JSON.parse(content('script[type="application/ld+json"]').text());
+                              content('.special-report-article-container .container, #slide-dek, #slide-end, .share-in-article-container').remove();
+
+                              item.title = ldJson.headline;
+                              item.pubDate = parseDate(ldJson.dateCreated);
+                              item.author = ldJson.creator;
+                              item.category = ldJson.keywords;
+                              item.description = content('.special-report-article-container').html();
+
+                              return item;
+                          }
+
+                          const matches = content('script#fusion-metadata')
+                              .text()
+                              .match(/Fusion.globalContent=({[\S\s]*?});/);
+
+                          if (matches) {
+                              const data = JSON.parse(matches[1]);
+
+                              item.title = data.result.title || item.title;
+                              item.description = art(path.join(__dirname, 'templates/description.art'), {
+                                  result: data.result,
+                              });
+                              item.pubDate = parseDate(data.result.display_time);
+                              item.author = data.result.authors.map((author) => author.name).join(', ');
+                              item.category = data.result.taxonomy.keywords;
+
+                              return item;
+                          }
+
+                          content('.title').remove();
+                          content('.article-metadata').remove();
+
+                          item.title = content('meta[property="og:title"]').attr('content');
+                          item.pubDate = parseDate(detailResponse.data.match(/"datePublished":"(.*?)","dateModified/)[1]);
+                          item.author = detailResponse.data
+                              .match(/{"@type":"Person","name":"(.*?)"}/g)
+                              .map((p) => p.match(/"name":"(.*?)"/)[1])
+                              .join(', ');
+                          item.description = content('article').html();
 
                           return item;
-                      }
+                      })
+                    : item
+            )
+        );
+        items = results.filter((r) => r.status === 'fulfilled').map((r) => r.value);
+
+        return {
+            title,
+            description,
+            image: 'https://www.reuters.com/pf/resources/images/reuters/logo-vertical-default-512x512.png?d=116',
+            link: `https://www.reuters.com${section_id}`,
+            item: items,
+        };
+    } catch {
+        // Fallback to arc outboundfeeds if API fails
+        const arcUrl = topic ? `https://www.reuters.com/arc/outboundfeeds/v4/mobile/section${section_id}?outputType=json` : `https://www.reuters.com/arc/outboundfeeds/v4/mobile/section/${category}/?outputType=json`;
+
+        const arcResponse = await ofetch(arcUrl);
+        if (arcResponse.wireitems?.length) {
+            const items = arcResponse.wireitems
+                .map((item) => {
+                    const story = item.templates.find((t) => t.template === 'story_with_image')?.story;
+                    if (!story) {
+                        return null;
+                    }
+
+                    return {
+                        title: story.hed,
+                        link: item.templates.find((t) => t.template === 'story_with_image')?.template_action?.url,
+                        guid: story.usn,
+                        pubDate: parseDate(story.updated_at),
+                        updated: parseDate(story.updated_at),
+                        description: story.lede,
+                        author: story.authors?.map((author) => author.name).join(', '),
+                        category: [arcResponse.analytics?.topic_channel, arcResponse.analytics?.topic_sub_channel].filter(Boolean),
+                    };
+                })
+                .filter(Boolean);
 
-                      const matches = content('script#fusion-metadata')
-                          .text()
-                          .match(/Fusion.globalContent=({[\S\s]*?});/);
-
-                      if (matches) {
-                          const data = JSON.parse(matches[1]);
-
-                          item.title = data.result.title || item.title;
-                          item.description = art(path.join(__dirname, 'templates/description.art'), {
-                              result: data.result,
-                          });
-                          item.pubDate = parseDate(data.result.display_time);
-                          item.author = data.result.authors.map((author) => author.name).join(', ');
-                          item.category = data.result.taxonomy.keywords;
-
-                          return item;
-                      }
-
-                      content('.title').remove();
-                      content('.article-metadata').remove();
-
-                      item.title = content('meta[property="og:title"]').attr('content');
-                      item.pubDate = parseDate(detailResponse.data.match(/"datePublished":"(.*?)","dateModified/)[1]);
-                      item.author = detailResponse.data
-                          .match(/{"@type":"Person","name":"(.*?)"}/g)
-                          .map((p) => p.match(/"name":"(.*?)"/)[1])
-                          .join(', ');
-                      item.description = content('article').html();
-
-                      return item;
-                  })
-                : item
-        )
-    );
-    items = results.filter((r) => r.status === 'fulfilled').map((r) => r.value);
-
-    return {
-        title,
-        description,
-        image: 'https://www.reuters.com/pf/resources/images/reuters/logo-vertical-default-512x512.png?d=116',
-        link: `https://www.reuters.com${section_id}`,
-        item: items,
-    };
+            return {
+                title: arcResponse.analytics?.title || `${arcResponse.wire_name} | Reuters`,
+                description: arcResponse.analytics?.content_title,
+                image: 'https://www.reuters.com/pf/resources/images/reuters/logo-vertical-default-512x512.png?d=116',
+                link: arcResponse.canonical_action?.url || `https://www.reuters.com${section_id}`,
+                category: [arcResponse.analytics?.topic_channel, arcResponse.analytics?.topic_sub_channel].filter(Boolean),
+                item: items.slice(0, limit),
+            };
+        }
+    }
 }

package/lib/routes/reuters/investigates.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
@@ -6,7 +6,8 @@ import { parseDate } from '@/utils/parse-date';
 
 export const route: Route = {
     path: '/investigates',
-    categories: ['traditional-media'],
+    categories: ['traditional-media', 'popular'],
+    view: ViewType.Articles,
     example: '/reuters/investigates',
     parameters: {},
     features: {

package/lib/routes/reuters/namespace.ts

@@ -6,4 +6,5 @@ export const namespace: Namespace = {
     description: `:::tip
 You can use \`sophi=true\` query parameter to invoke the **experimental** method, which can, if possible, fetch more articles(between 20 and 100) with \`limit\` given. But some articles from the old method might not be available.
 :::`,
+    lang: 'en',
 };

package/lib/routes/rfa/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'Radio Free Asia (RFA) 自由亚洲电台',
     url: 'rfa.org',
+    lang: 'en',
 };

package/lib/routes/rfi/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'Radio France Internationale 法国国际广播电台',
     url: 'rfi.fr',
+    lang: 'fr',
 };

package/lib/routes/right/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: '恩山无线论坛',
     url: 'right.com.cn',
+    lang: 'zh-CN',
 };

package/lib/routes/rodong/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'Rodong Sinmun 劳动新闻',
     url: 'rodong.rep.kp',
+    lang: 'ko',
 };

package/lib/routes/routledge/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'Routledge',
     url: 'routledge.com',
+    lang: 'en',
 };

package/lib/routes/rsc/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'Royal Society of Chemistry',
     url: 'pubs.rsc.org',
+    lang: 'en',
 };

package/lib/routes/rss3/index.ts

@@ -9,7 +9,7 @@ export const route: Route = {
     categories: ['social-media'],
     example: '/rss3/vitalik.eth',
     name: 'Account Activities',
-    maintainers: ['DIYgod'],
+    maintainers: ['DIYgod', 'pseudoyu'],
     url: 'docs.rss3.io/api-reference#tag/decentralized/GET/decentralized/%7Baccount%7D',
     handler,
     description: 'Retrieve the activities associated with a specified account in the decentralized system.',
@@ -123,6 +123,11 @@ export const route: Route = {
 async function handler(ctx) {
     const { account, network, tag } = ctx.req.param();
 
+    // Check if account contains "://" or "/"
+    if (account.includes('://') || account.includes('/')) {
+        throw new Error('Account should not contain "://" or path components');
+    }
+
     const { data } = await ofetch(
         `https://gi.rss3.io/decentralized/${account}?${new URLSearchParams({
             limit: '20',

package/lib/routes/rss3/namespace.ts

@@ -4,4 +4,5 @@ export const namespace: Namespace = {
     name: 'RSS3',
     url: 'rss3.io',
     description: 'The RSS3 Network is the a decentralized network designed to promote the free flow of information on the Open Web .',
+    lang: 'en',
 };

package/lib/routes/rsshub/namespace.ts

@@ -3,4 +3,5 @@ import type { Namespace } from '@/types';
 export const namespace: Namespace = {
     name: 'RSSHub',
     url: 'docs.rsshub.app',
+    lang: 'en',
 };