rsshub 1.0.0-master.ff1ff8d → 1.0.0-master.ff3a9ce

package/lib/routes/google/search.ts

@@ -1,21 +1,15 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import cache from '@/utils/cache';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
 import { load } from 'cheerio';
-import { art } from '@/utils/render';
-import path from 'node:path';
 import { config } from '@/config';
 
-const renderDescription = (description, images) => art(path.join(__dirname, './templates/description.art'), { description, images });
-
 export const route: Route = {
     path: '/search/:keyword/:language?',
     categories: ['other'],
     example: '/google/search/rss/zh-CN,zh',
-    parameters: { keyword: 'Keyword', language: 'Accept-Language. Example: zh-CN,zh;q=0.9,en;q=0.8,ja;q=0.7' },
+    parameters: { keyword: 'Keyword', language: 'Accept-Language. Example: `zh-CN,zh;q=0.9,en;q=0.8,ja;q=0.7`' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
@@ -30,47 +24,39 @@ export const route: Route = {
 };
 
 async function handler(ctx) {
-    const { keyword, language } = ctx.req.param();
+    const { keyword, language = 'en' } = ctx.req.param();
     const searchParams = new URLSearchParams({
         q: keyword,
     });
     const tempUrl = new URL('https://www.google.com/search');
     tempUrl.search = searchParams.toString();
     const url = tempUrl.toString();
-    const key = `google-search:${language}:${url}`;
+    const key = `google:search:${language}:${url}`;
     const items = await cache.tryGet(
         key,
         async () => {
-            const response = (
-                await got(url, {
-                    headers: {
-                        'Accept-Language': language,
-                    },
-                })
-            ).data;
+            const response = await ofetch(url, {
+                headers: {
+                    'Accept-Language': language,
+                    'User-Agent': 'Lynx/2.9.2 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/3.5.0',
+                },
+            });
             const $ = load(response);
-            const content = $('#rso');
-            return content
-                .find('> div')
+            return $('body > div > div > div > div > div > div > a')
                 .toArray()
                 .map((el) => {
                     const element = $(el);
-                    const link = element.find('div > div > div > div > div > span > a').first().attr('href');
-                    const title = element.find('div > div > div> div > div > span > a > h3').first().text();
-                    const imgs = element
-                        .find('img')
-                        .toArray()
-                        .map((_el) => $(_el).attr('src'));
-                    const description = element.find('div[style="-webkit-line-clamp:2"]').first().text() || element.find('div[role="heading"]').first().text();
-                    const author = element.find('div > div > div > div > div > span > a > div > div > span').first().text() || '';
+                    const link = element.attr('href')!;
+                    const title = element.find('span').first().text().trim();
+                    const description = element.parent().next().find('span > span').last().text().trim().replaceAll('�', '') || '';
+                    const author = element.find('span > span').text().trim() || '';
                     return {
-                        link,
+                        link: new URL(link, 'https://www.google.com').searchParams.get('q') || link,
                         title,
-                        description: renderDescription(description, imgs),
+                        description,
                         author,
                     };
-                })
-                .filter((e) => e?.link);
+                });
         },
         config.cache.routeExpire,
         false

package/lib/routes/gov/ah/kjt.ts

@@ -94,35 +94,35 @@ export const route: Route = {
     handler,
     example: '/gov/ah/kjt',
     parameters: { category: '分类，默认为 `kjzx/tzgg`，即通知公告，可在对应分类页 URL 中找到' },
-    description: `:::tip
+    description: `::: tip
   若订阅 [通知公告](https://kjt.ah.gov.cn/kjzx/tzgg/)，网址为 \`https://kjt.ah.gov.cn/kjzx/tzgg/\`。截取 \`https://kjt.ah.gov.cn/\` 到末尾 \`/\` 的部分 \`\` 作为参数填入，此时路由为 [\`/gov/ah/kjt/kjzx/tzgg\`](https://rsshub.app/gov/ah/kjt/kjzx/tzgg)。
-  :::
+:::
 
-  #### [科技资讯](https://kjt.ah.gov.cn/kjzx/index.html)
+#### [科技资讯](https://kjt.ah.gov.cn/kjzx/index.html)
 
-  | [通知公告](https://kjt.ah.gov.cn/kjzx/tzgg/index.html) | [工作动态](https://kjt.ah.gov.cn/kjzx/gzdt/index.html) | [基层科技](https://kjt.ah.gov.cn/kjzx/jckj/index.html) | [媒体聚焦](https://kjt.ah.gov.cn/kjzx/mtjj/index.html) |
-  | ------------------------------------------------------ | ------------------------------------------------------ | ------------------------------------------------------ | ------------------------------------------------------ |
-  | [kjzx/tzgg](https://rsshub.app/gov/ah/kjt/kjzx/tzgg)   | [kjzx/gzdt](https://rsshub.app/gov/ah/kjt/kjzx/gzdt)   | [kjzx/jckj](https://rsshub.app/gov/ah/kjt/kjzx/jckj)   | [kjzx/mtjj](https://rsshub.app/gov/ah/kjt/kjzx/mtjj)   |
+| [通知公告](https://kjt.ah.gov.cn/kjzx/tzgg/index.html) | [工作动态](https://kjt.ah.gov.cn/kjzx/gzdt/index.html) | [基层科技](https://kjt.ah.gov.cn/kjzx/jckj/index.html) | [媒体聚焦](https://kjt.ah.gov.cn/kjzx/mtjj/index.html) |
+| ------------------------------------------------------ | ------------------------------------------------------ | ------------------------------------------------------ | ------------------------------------------------------ |
+| [kjzx/tzgg](https://rsshub.app/gov/ah/kjt/kjzx/tzgg)   | [kjzx/gzdt](https://rsshub.app/gov/ah/kjt/kjzx/gzdt)   | [kjzx/jckj](https://rsshub.app/gov/ah/kjt/kjzx/jckj)   | [kjzx/mtjj](https://rsshub.app/gov/ah/kjt/kjzx/mtjj)   |
   
-  | [重要转载](https://kjt.ah.gov.cn/kjzx/zyzz/index.html) | [图片视频](https://kjt.ah.gov.cn/kjzx/tpsp/index.html) |
-  | ------------------------------------------------------ | ------------------------------------------------------ |
-  | [kjzx/zyzz](https://rsshub.app/gov/ah/kjt/kjzx/zyzz)   | [kjzx/tpsp](https://rsshub.app/gov/ah/kjt/kjzx/tpsp)   |
+| [重要转载](https://kjt.ah.gov.cn/kjzx/zyzz/index.html) | [图片视频](https://kjt.ah.gov.cn/kjzx/tpsp/index.html) |
+| ------------------------------------------------------ | ------------------------------------------------------ |
+| [kjzx/zyzz](https://rsshub.app/gov/ah/kjt/kjzx/zyzz)   | [kjzx/tpsp](https://rsshub.app/gov/ah/kjt/kjzx/tpsp)   |
 
-  #### [科技统计](https://kjt.ah.gov.cn/kjzy/kjtj/index.html)
+#### [科技统计](https://kjt.ah.gov.cn/kjzy/kjtj/index.html)
 
-  | [技术市场交易](https://kjt.ah.gov.cn/kjzy/kjtj/jsscjy/index.html)  | [科技成果公报](https://kjt.ah.gov.cn/kjzy/kjtj/kjcggb/index.html)  | [孵化载体发展](https://kjt.ah.gov.cn/kjzy/kjtj/cyfhfz/index.html)  |
-  | ------------------------------------------------------------------ | ------------------------------------------------------------------ | ------------------------------------------------------------------ |
-  | [kjzy/kjtj/jsscjy](https://rsshub.app/gov/ah/kjt/kjzy/kjtj/jsscjy) | [kjzy/kjtj/kjcggb](https://rsshub.app/gov/ah/kjt/kjzy/kjtj/kjcggb) | [kjzy/kjtj/cyfhfz](https://rsshub.app/gov/ah/kjt/kjzy/kjtj/cyfhfz) |
+| [技术市场交易](https://kjt.ah.gov.cn/kjzy/kjtj/jsscjy/index.html)  | [科技成果公报](https://kjt.ah.gov.cn/kjzy/kjtj/kjcggb/index.html)  | [孵化载体发展](https://kjt.ah.gov.cn/kjzy/kjtj/cyfhfz/index.html)  |
+| ------------------------------------------------------------------ | ------------------------------------------------------------------ | ------------------------------------------------------------------ |
+| [kjzy/kjtj/jsscjy](https://rsshub.app/gov/ah/kjt/kjzy/kjtj/jsscjy) | [kjzy/kjtj/kjcggb](https://rsshub.app/gov/ah/kjt/kjzy/kjtj/kjcggb) | [kjzy/kjtj/cyfhfz](https://rsshub.app/gov/ah/kjt/kjzy/kjtj/cyfhfz) |
 
-  #### [科技数据](https://kjt.ah.gov.cn/kjzy/kjsj/index.html)
+#### [科技数据](https://kjt.ah.gov.cn/kjzy/kjsj/index.html)
 
-  | [创新企业](https://kjt.ah.gov.cn/kjzy/kjsj/cxqy/index.html)    | [创新项目](https://kjt.ah.gov.cn/kjzy/kjsj/cxxm/index.html)    | [创新成果](https://kjt.ah.gov.cn/kjzy/kjsj/cxcg/index.html)    | [转化基金入库项目](https://kjt.ah.gov.cn/kjzy/kjsj/zhjjrkxm/index.html) |
-  | -------------------------------------------------------------- | -------------------------------------------------------------- | -------------------------------------------------------------- | ----------------------------------------------------------------------- |
-  | [kjzy/kjsj/cxqy](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxqy) | [kjzy/kjsj/cxxm](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxxm) | [kjzy/kjsj/cxcg](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxcg) | [kjzy/kjsj/zhjjrkxm](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/zhjjrkxm)  |
+| [创新企业](https://kjt.ah.gov.cn/kjzy/kjsj/cxqy/index.html)    | [创新项目](https://kjt.ah.gov.cn/kjzy/kjsj/cxxm/index.html)    | [创新成果](https://kjt.ah.gov.cn/kjzy/kjsj/cxcg/index.html)    | [转化基金入库项目](https://kjt.ah.gov.cn/kjzy/kjsj/zhjjrkxm/index.html) |
+| -------------------------------------------------------------- | -------------------------------------------------------------- | -------------------------------------------------------------- | ----------------------------------------------------------------------- |
+| [kjzy/kjsj/cxqy](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxqy) | [kjzy/kjsj/cxxm](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxxm) | [kjzy/kjsj/cxcg](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxcg) | [kjzy/kjsj/zhjjrkxm](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/zhjjrkxm)  |
 
-  | [创新平台](https://kjt.ah.gov.cn/kjzy/kjsj/cxpt/index.html)    | [创新园区](https://kjt.ah.gov.cn/kjzy/kjsj/cxyq/index.html)    | [创新许可](https://kjt.ah.gov.cn/kjzy/kjsj/cxxk/index.html)    |
-  | -------------------------------------------------------------- | -------------------------------------------------------------- | -------------------------------------------------------------- |
-  | [kjzy/kjsj/cxpt](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxpt) | [kjzy/kjsj/cxyq](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxyq) | [kjzy/kjsj/cxxk](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxxk) |
+| [创新平台](https://kjt.ah.gov.cn/kjzy/kjsj/cxpt/index.html)    | [创新园区](https://kjt.ah.gov.cn/kjzy/kjsj/cxyq/index.html)    | [创新许可](https://kjt.ah.gov.cn/kjzy/kjsj/cxxk/index.html)    |
+| -------------------------------------------------------------- | -------------------------------------------------------------- | -------------------------------------------------------------- |
+| [kjzy/kjsj/cxpt](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxpt) | [kjzy/kjsj/cxyq](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxyq) | [kjzy/kjsj/cxxk](https://rsshub.app/gov/ah/kjt/kjzy/kjsj/cxxk) |
 
   `,
     categories: ['government'],

package/lib/routes/gov/beijing/bjedu/gh.ts

@@ -27,11 +27,11 @@ export const route: Route = {
     name: '通用',
     maintainers: ['TonyRL'],
     handler,
-    description: `:::tip
+    description: `::: tip
   路径处填写对应页面 URL 中 \`https://gh.bjedu.cn/ghsite/\` 和 \`/index.html\` 之间的字段。下面是一个例子。
 
   若订阅 [通知公告](https://gh.bjedu.cn/ghsite/zxtzgg/index.html) 则将对应页面 URL \`https://gh.bjedu.cn/ghsite/zxtzgg/index.html\` 中 \`https://gh.bjedu.cn/ghsite/\` 和 \`/index.html\` 之间的字段 \`zxtzgg\` 作为路径填入。此时路由为 [\`/gov/beijing/bjedu/gh/zxtzgg\`](https://rsshub.app/gov/beijing/bjedu/gh/zxtzgg)
-  :::`,
+:::`,
 };
 
 async function handler(ctx) {

package/lib/routes/gov/beijing/bphc/index.ts

@@ -32,7 +32,7 @@ async function handler(ctx) {
     const defaultPath = 'announcement';
 
     const pathname = getSubPath(ctx).replaceAll(/(^\/beijing\/bphc|\/$)/g, '');
-    const key = pathname === '' ? defaultPath : pathname.endsWith('/') ? pathname.slice(0, -1) : pathname;
+    const key = pathname === '' ? defaultPath : (pathname.endsWith('/') ? pathname.slice(0, -1) : pathname);
     const obj = mapping[key];
     const currentUrl = `${rootUrl}${obj.list}`;
 

package/lib/routes/gov/caac/cjwt.ts

@@ -1,6 +1,4 @@
 import { Route } from '@/types';
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
 
 import got from '@/utils/got';
 import timezone from '@/utils/timezone';
@@ -32,7 +30,7 @@ export const route: Route = {
     handler,
     url: 'caac.gov.cn/HDJL/',
     description: `| 机票 | 托运 | 无人机 | 体检 | 行政审批 | 投诉 |
-  | ---- | ---- | ------ | ---- | -------- | ---- |`,
+| ---- | ---- | ------ | ---- | -------- | ---- |`,
 };
 
 async function handler(ctx) {