rsshub 1.0.0-master.f9ec483 → 1.0.0-master.fa04a11

package/lib/routes/taptap/types.ts

@@ -0,0 +1,363 @@
+export interface Detail {
+    group: Group;
+    app: App;
+}
+
+interface Group {
+    id: number;
+    app_id: number;
+    title: string;
+    intro: string;
+    has_treasure: boolean;
+    has_official: boolean;
+    icon: Icon;
+    banner: Banner;
+    moderators: Moderator[];
+    log: Log;
+    event_log: EventLog;
+    stat: Stat;
+    web_url: string;
+    style_info: StyleInfo;
+    terms: Term[];
+    sharing: Sharing;
+    new_rec_list: NewRecListItem[];
+    actions: Actions;
+    title_labels: TitleLabel[];
+}
+
+interface Icon {
+    url: string;
+    medium_url: string;
+    small_url: string;
+    original_url: string;
+    original_format: string;
+    width: number;
+    height: number;
+    color: string;
+    original_size: number;
+}
+
+interface Banner {
+    url: string;
+    medium_url: string;
+    small_url: string;
+    original_url: string;
+    original_format: string;
+    width: number;
+    height: number;
+    color: string;
+    original_size: number;
+}
+
+interface Moderator {
+    id: number;
+    name: string;
+    avatar: string;
+    medium_avatar: string;
+    avatar_pendant: string;
+    badges: Badge[];
+    verified: Verified;
+}
+
+interface Badge {
+    id: number;
+    title: string;
+    description: string;
+    is_wear: boolean;
+    icon: BadgeIcon;
+    style: BadgeStyle;
+    time: number;
+    unlock_tips: string;
+    level: number;
+    status: number;
+}
+
+interface BadgeIcon {
+    small: string;
+    middle: string;
+    large: string;
+    small_border: string;
+}
+
+interface BadgeStyle {
+    background_image: string;
+    background_color: string;
+    font_color: string;
+    border_background_color: string;
+}
+
+interface Verified {
+    type: string;
+    reason: string;
+    url: string;
+}
+
+interface Log {
+    follow: Follow;
+    unfollow: Follow;
+}
+
+interface Follow {
+    uri: string;
+    params: FollowParams;
+}
+
+interface FollowParams {
+    type: string;
+    APIVersion: string;
+    paramId: string;
+    paramType: string;
+}
+
+interface EventLog {
+    paramType: string;
+    paramId: string;
+}
+
+interface Stat {
+    favorite_count: number;
+    topic_count: number;
+    elite_topic_count: number;
+    recent_topic_count: number;
+    official_topic_count: number;
+    top_topic_count: number;
+    video_count: number;
+    user_moment_count: number;
+    app_moment_count: number;
+    image_moment_count: number;
+    treasure_count: number;
+    topic_page_view: number;
+    feed_count: number;
+    topic_pv_total: number;
+}
+
+interface StyleInfo {
+    background_color: string;
+    font_color: string;
+}
+
+interface Term {
+    label: string;
+    type: string;
+    index: string;
+    params: TermParams;
+    sort: TermSort[];
+    log: TermLog;
+    position: string;
+    referer_ext: string;
+    log_keyword: string;
+    top_params: TermParams;
+    sub_terms: SubTerm[];
+}
+
+interface TermParams {
+    type: string;
+}
+
+interface TermSort {
+    label: string;
+    params: SortParams;
+    icon_type: string;
+}
+
+interface SortParams {
+    sort: string;
+}
+
+interface TermLog {
+    page_view: PageView;
+}
+
+interface PageView {
+    uri: string;
+    params: PageViewParams;
+}
+
+interface PageViewParams {
+    type: string;
+    APIVersion: string;
+    paramId: string;
+    paramType: string;
+    position: string;
+}
+
+interface SubTerm {
+    label: string;
+    type: string;
+    index: string;
+    params: SubTermParams;
+    top_params: SubTermTopParams;
+    sort: SubTermSort[];
+    log: SubTermLog;
+    referer_ext: string;
+    log_keyword: string;
+    uri: string;
+    web_url: string;
+}
+
+interface SubTermParams {
+    group_label_id: string;
+    type: string;
+}
+
+interface SubTermTopParams {
+    group_label_id: string;
+    is_top: string;
+    type: string;
+}
+
+interface SubTermSort {
+    label: string;
+    params: SortParams;
+    icon_type: string;
+}
+
+interface SubTermLog {
+    page_view: PageView;
+}
+
+interface Sharing {
+    url: string;
+    title: string;
+    description: string;
+    image: Icon;
+}
+
+interface NewRecListItem {
+    icon: Icon;
+    uri: string;
+    url: string;
+    web_url: string;
+    label: string;
+}
+
+interface Actions {
+    publish_contents: boolean;
+}
+
+interface TitleLabel {
+    label: string;
+    icon: Icon;
+}
+
+interface App {
+    id: number;
+    identifier: string;
+    title: string;
+    title_labels: string[];
+    icon: Icon;
+    price: Price;
+    uri: Uri;
+    can_view: boolean;
+    released_time: number;
+    button_flag: number;
+    style: number;
+    hidden_button: boolean;
+    is_deny_minors: boolean;
+    stat: AppStat;
+    ad_banner: Icon;
+    top_banner: Icon;
+    banner: Icon;
+    tags: Tag[];
+    log: AppLog;
+    event_log: EventLog;
+    can_buy_redeem_code: CanBuyRedeemCode;
+    show_module: ShowModule[];
+    complaint: Complaint;
+    serial_number: SerialNumber;
+    rec_text: string;
+    readable_id: string;
+    m_button_map: object;
+    description: Description;
+    title_labels_v2: TitleLabel[];
+    stat_key: string;
+    include_app_product_type_complete: boolean;
+    is_console_game: boolean;
+}
+
+interface Price {
+    taptap_current: string;
+    discount_rate: number;
+}
+
+interface Uri {
+    google: string;
+    google_play: string;
+    apple: string;
+    download_site: string;
+}
+
+interface AppStat {
+    rating: Rating;
+    vote_info: VoteInfo;
+    hits_total: number;
+    play_total: number;
+    bought_count: number;
+    feed_count: number;
+    reserve_count: number;
+    recent_sandbox_played_count: number;
+    album_count: number;
+    review_count: number;
+    topic_count: number;
+    video_count: number;
+    official_topic_count: number;
+    official_video_count: number;
+    official_album_count: number;
+    fans_count: number;
+}
+
+interface Rating {
+    score: string;
+    max: number;
+    latest_score: string;
+    latest_version_score: string;
+}
+
+interface VoteInfo {
+    1: number;
+    2: number;
+    3: number;
+    4: number;
+    5: number;
+}
+
+interface Tag {
+    id: number;
+    value: string;
+    uri: string;
+    web_url: string;
+}
+
+interface AppLog {
+    follow: Follow;
+    open: Follow;
+    page_view: Follow;
+    play: Follow;
+    reserve: Follow;
+    unfollow: Follow;
+    unreserved: Follow;
+}
+
+interface CanBuyRedeemCode {
+    flag: boolean;
+}
+
+interface ShowModule {
+    key: string;
+    value: boolean;
+}
+
+interface Complaint {
+    uri: string;
+    web_url: string;
+    url: string;
+}
+
+interface SerialNumber {
+    number_exists: boolean;
+    button_action: number;
+}
+
+interface Description {
+    text: string;
+}

package/lib/routes/taptap/utils.ts

@@ -1,24 +1,26 @@
 import { getCurrentPath } from '@/utils/helpers';
 const __dirname = getCurrentPath(import.meta.url);
 
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
 import path from 'node:path';
 import { art } from '@/utils/render';
+import cache from '@/utils/cache';
+import { Detail } from './types';
 
-// Please do not change %26 to &
-const X_UA = (lang = 'zh_CN') => `X-UA=V=1%26PN=WebApp%26VN=0.1.0%26LANG=${lang}%26PLT=PC`;
+const X_UA = (lang = 'zh_CN') => `X-UA=${encodeURIComponent(`V=1&PN=WebApp&VN=0.1.0&LANG=${lang}&PLT=PC`)}`;
 
-const getRootUrl = (isIntl = false) => (isIntl ? 'https://www.taptap.io' : 'https://www.taptap.com');
+const getRootUrl = (isIntl = false) => (isIntl ? 'https://www.taptap.io' : 'https://www.taptap.cn');
 
-const appDetail = async (appId, lang = 'zh_CN', isIntl = false) => {
-    const { data } = await got(`${getRootUrl(isIntl)}/webapiv2/group/v1/detail?app_id=${appId}&${X_UA(lang)}`, {
-        headers: {
-            Referer: `${getRootUrl(isIntl)}/app/${appId}`,
-        },
-    });
-    return data.data;
-};
+const appDetail = (appId, lang = 'zh_CN', isIntl = false) =>
+    cache.tryGet(`taptap:appDetail:${appId}:${lang}:${isIntl}`, async () => {
+        const data = await ofetch(`${getRootUrl(isIntl)}/webapiv2/group/v1/detail?app_id=${appId}&${X_UA(lang)}`, {
+            headers: {
+                Referer: `${getRootUrl(isIntl)}/app/${appId}`,
+            },
+        });
+        return data.data;
+    }) as Promise<Detail>;
 
 const imagePost = (images) =>
     art(path.join(__dirname, 'templates/imagePost.art'), {
@@ -26,25 +28,23 @@ const imagePost = (images) =>
     });
 
 const topicPost = async (appId, topicId, lang = 'zh_CN') => {
-    const res = await got(`${getRootUrl(false)}/webapiv2/topic/v1/detail?id=${topicId}&${X_UA(lang)}`, {
+    const res = await ofetch(`${getRootUrl(false)}/webapiv2/topic/v1/detail?id=${topicId}&${X_UA(lang)}`, {
         headers: {
             Referer: `${getRootUrl(false)}/app/${appId}`,
         },
     });
-    const $ = load(res.data.data.first_post.contents.text, null, false);
+    const $ = load(res.data.first_post.contents.text, null, false);
     $('img').each((_, e) => {
-        e = $(e);
-        e.attr('src', e.attr('data-origin-url'));
-        e.attr('referrerpolicy', 'no-referrer');
-        e.removeAttr('data-origin-url');
+        const $e = $(e);
+        $e.attr('src', $e.attr('data-origin-url'));
+        $e.removeAttr('data-origin-url');
     });
     return $.html();
 };
 
 const videoPost = (video) =>
     art(path.join(__dirname, 'templates/videoPost.art'), {
-        intro: video?.intro?.text,
-        previewUrl: video?.video_resource.preview_animation.original_url,
+        previewUrl: video.thumbnail.original_url || video.thumbnail.url,
     });
 
 export { getRootUrl, X_UA, appDetail, imagePost, topicPost, videoPost };

package/lib/routes/techsir/index.ts

@@ -0,0 +1,67 @@
+import { Route } from '@/types';
+
+import cache from '@/utils/cache';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
+
+export const route: Route = {
+    path: '/',
+    categories: ['new-media'],
+    example: '/techsir',
+    url: 'www.techsir.com',
+    name: '最新资讯',
+    maintainers: ['p3psi-boo'],
+    handler,
+};
+
+async function handler() {
+    const baseUrl = 'https://techsir.com';
+
+    const response = await got({
+        method: 'get',
+        url: baseUrl,
+    });
+
+    const $ = load(response.data);
+
+    const alist = $(
+        '#kt_wrapper > div.main-content-area > div.container.container-fluid > div:nth-child(1) > div.col-xs-12.col-sm-6.col-md-8.post-listing > div.row.flex-row-fluid > div:nth-child(2) > div > div > div.card-body.pt-2 > div.d-flex'
+    );
+
+    const list = alist.toArray().map((item) => {
+        const $item = $(item);
+
+        const path = $item.find('a').attr('href');
+        const link = `${baseUrl}${path}`;
+        const title = $item.find('a').text();
+
+        return {
+            title,
+            link,
+        };
+    });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            cache.tryGet(item.link, async () => {
+                const response = await got({
+                    method: 'get',
+                    url: item.link,
+                });
+
+                const $ = load(response.data);
+                item.description = $('.kg-card-markdown').html();
+                item.pubDate = parseDate($('time.time').text());
+                item.author = $('a.author').text();
+                return item;
+            })
+        )
+    );
+
+    return {
+        title: 'TechSir - 最新资讯',
+        link: baseUrl,
+        item: items,
+    };
+}

package/lib/routes/techsir/namespace.ts

@@ -0,0 +1,8 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'TechSir',
+    url: 'techsir.com',
+    description: '科技先生 TechSir.Com 是新酷科技创新与创业媒体',
+    lang: 'zh-CN',
+};

package/lib/routes/telecompaper/news.ts

@@ -33,11 +33,11 @@ export const route: Route = {
   | -------- | --------- | --------- | ------- | -- | ------------------ |
   | mobile   | internet  | boardcast | general | it | industry-resources |
 
-  :::tip
+::: tip
   If \`country\` or \`type\` includes empty space, use \`-\` instead. For example, \`United States\` needs to be replaced with \`United-States\`, \`White paper\` needs to be replaced with \`White-paper\`
 
   Filters in [INDUSTRY RESOURCES](https://www.telecompaper.com/industry-resources) only provides \`Content Type\` which corresponds to \`type\`. \`year\` and \`country\` are not supported.
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/telegram/channel.ts

@@ -98,6 +98,36 @@ For backward compatibility reasons, invalid \`routeParams\` will be treated as \
                 optional: true,
                 description: 'Telegram API Authentication',
             },
+            {
+                name: 'TELEGRAM_API_ID',
+                optional: true,
+                description: 'Telegram API ID',
+            },
+            {
+                name: 'TELEGRAM_API_HASH',
+                optional: true,
+                description: 'Telegram API Hash',
+            },
+            {
+                name: 'TELEGRAM_MAX_CONCURRENT_DOWNLOADS',
+                optional: true,
+                description: 'Telegram Max Concurrent Downloads',
+            },
+            {
+                name: 'TELEGRAM_PROXY_HOST',
+                optional: true,
+                description: 'Telegram Proxy Host',
+            },
+            {
+                name: 'TELEGRAM_PROXY_PORT',
+                optional: true,
+                description: 'Telegram Proxy Port',
+            },
+            {
+                name: 'TELEGRAM_PROXY_SECRET',
+                optional: true,
+                description: 'Telegram Proxy Secret',
+            },
         ],
         requirePuppeteer: false,
         antiCrawler: false,
@@ -112,12 +142,12 @@ For backward compatibility reasons, invalid \`routeParams\` will be treated as \
         },
     ],
     name: 'Channel',
-    maintainers: ['DIYgod', 'Rongronggg9', 'pseudoyu'],
+    maintainers: ['DIYgod', 'Rongronggg9', 'synchrone', 'pseudoyu'],
     handler,
     description: `
-  :::tip
+::: tip
   Due to Telegram restrictions, some channels involving pornography, copyright, and politics cannot be subscribed. You can confirm by visiting \`https://t.me/s/:username\`, it's recommended to deploy your own instance with telegram api configs (create your telegram application via \`https://core.telegram.org/api/obtaining_api_id\`, run this command \`node ./lib/routes/telegram/scripts/get-telegram-session.mjs\` to get \`TELEGRAM_SESSION\` and set it as Environment Variable).
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/telegram/scripts/get-telegram-session.mjs

@@ -1,11 +1,12 @@
 import { TelegramClient } from 'telegram';
 import { StringSession } from 'telegram/sessions/index.js';
 import readline from 'readline';
+import winston from 'winston';
 
 function userInput(question) {
     const rl = readline.createInterface({
         input: process.stdin,
-        output: process.stdout
+        output: process.stdout,
     });
     return new Promise((resolve) => {
         rl.question(question, (answer) => {
@@ -15,8 +16,17 @@ function userInput(question) {
     });
 }
 
+const logger = winston.createLogger({
+    level: 'info',
+    format: winston.format.combine(
+        winston.format.timestamp(),
+        winston.format.printf(({ level, message, timestamp }) => `${timestamp} ${level}: ${message}`)
+    ),
+    transports: [new winston.transports.Console()],
+});
+
 async function getSessionString() {
-    const apiId = parseInt(await userInput('Please enter your API ID: '));
+    const apiId = Number.parseInt(await userInput('Please enter your API ID: '));
     const apiHash = await userInput('Please enter your API Hash: ');
     const stringSession = new StringSession('');
     const client = new TelegramClient(stringSession, apiId, apiHash, {
@@ -26,16 +36,16 @@ async function getSessionString() {
         phoneNumber: async () => await userInput('Please enter your phone number: '),
         password: async () => await userInput('Please enter your password: '),
         phoneCode: async () => await userInput('Please enter the code you received: '),
-        onError: (err) => console.log(err),
+        onError: (err) => logger.error(err),
     });
 
-    console.log('You are now connected.');
+    logger.info('You are now connected.');
     const sessionString = client.session.save();
+    logger.info(`Your session string is: ${sessionString}`);
 
-    console.log('Your session string is:', sessionString);
     await client.disconnect();
     return sessionString;
 }
 
 // Run the function
-getSessionString().catch(console.error);
+getSessionString().catch((error) => logger.error(error));

package/lib/routes/telegram/stickerpack.ts

@@ -5,7 +5,7 @@ import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
     path: '/stickerpack/:name',
-    categories: ['social-media', 'popular'],
+    categories: ['social-media'],
     view: ViewType.Pictures,
     example: '/telegram/stickerpack/DIYgod',
     parameters: { name: 'Sticker Pack name, available in the sharing URL' },

package/lib/routes/telegram/tglib/channel.ts

@@ -2,6 +2,8 @@ import InvalidParameterError from '@/errors/types/invalid-parameter';
 import { client, decodeMedia, getClient, getFilename, getMediaLink, streamDocument, streamThumbnail } from './client';
 import { returnBigInt as bigInt } from 'telegram/Helpers';
 import { HTMLParser } from 'telegram/extensions/html';
+import { DataItem } from '@/types';
+import type { Api } from 'telegram';
 
 function parseRange(range, length) {
     if (!range) {
@@ -111,24 +113,25 @@ async function getMedia(ctx) {
 }
 
 export default async function handler(ctx) {
+    const { username } = ctx.req.param();
     const client = await getClient();
 
-    const item = [];
-    const chat = await client.getInputEntity(ctx.req.param('username'));
+    const item: DataItem[] = [];
+    const chat = (await client.getInputEntity(username)) as Api.InputPeerChannel;
     const channelInfo = await client.getEntity(chat);
 
     if (channelInfo.className !== 'Channel') {
-        throw new Error(`${ctx.req.param('username')} is not a channel`);
+        throw new Error(`${username} is not a channel`);
     }
 
-    let attachments = [];
+    let attachments: string[] = [];
     const messages = await client.getMessages(chat, { limit: 50 });
 
     for (const message of messages) {
         if (message.media) {
             // messages that have no text are shown as if they're one post
             // because in TG only 1 attachment per message is possible
-            attachments.push(getMediaLink(ctx, chat, ctx.req.param('username'), message));
+            attachments.push(getMediaLink(ctx, chat, username, message));
         }
         if (message.text !== '') {
             let description = attachments.join('\n');
@@ -144,8 +147,8 @@ export default async function handler(ctx) {
                 title,
                 description,
                 pubDate: new Date(message.date * 1000).toUTCString(),
-                link: `https://t.me/s/${ctx.req.param('username')}/${message.id}`,
-                author: `${channelInfo.title} (@${ctx.req.param('username')})`,
+                link: `https://t.me/s/${username}/${message.id}`,
+                author: `${channelInfo.title} (@${username})`,
             });
         }
     }
@@ -153,10 +156,10 @@ export default async function handler(ctx) {
     return {
         title: channelInfo.title,
         language: null,
-        link: `https://t.me/${ctx.req.param('username')}`,
+        link: `https://t.me/${username}`,
         item,
         allowEmpty: ctx.req.param('id') === 'allow_empty',
-        description: `@${ctx.req.param('username')} on Telegram`,
+        description: `@${username} on Telegram`,
     };
 }