rsshub 1.0.0-master.fc1b99f → 1.0.0-master.fc2cf18

package/lib/routes/bilibili/followings-video.ts

@@ -3,6 +3,7 @@ import got from '@/utils/got';
 import cache from './cache';
 import { config } from '@/config';
 import utils from './utils';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
     path: '/followings/video/:uid/:disableEmbed?',
@@ -41,7 +42,7 @@ async function handler(ctx) {
 
     const cookie = config.bilibili.cookies[uid];
     if (cookie === undefined) {
-        throw new Error('缺少对应 uid 的 Bilibili 用户登录后的 Cookie 值');
+        throw new ConfigNotFoundError('缺少对应 uid 的 Bilibili 用户登录后的 Cookie 值');
     }
 
     const response = await got({
@@ -53,7 +54,7 @@ async function handler(ctx) {
         },
     });
     if (response.data.code === -6) {
-        throw new Error('对应 uid 的 Bilibili 用户的 Cookie 已过期');
+        throw new ConfigNotFoundError('对应 uid 的 Bilibili 用户的 Cookie 已过期');
     }
     const cards = response.data.data.cards;
 

package/lib/routes/bilibili/followings.ts

@@ -2,6 +2,8 @@ import { Route } from '@/types';
 import got from '@/utils/got';
 import cache from './cache';
 import { config } from '@/config';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
+import InvalidParameterError from '@/errors/types/invalid-parameter';
 
 export const route: Route = {
     path: '/user/followings/:uid/:loginUid',
@@ -43,7 +45,7 @@ async function handler(ctx) {
     const loginUid = ctx.req.param('loginUid');
     const cookie = config.bilibili.cookies[loginUid];
     if (cookie === undefined) {
-        throw new Error('缺少对应 loginUid 的 Bilibili 用户登录后的 Cookie 值 <a href="https://docs.rsshub.app/install/#pei-zhi-bu-fen-rss-mo-kuai-pei-zhi">bilibili 用户关注动态系列路由</a>');
+        throw new ConfigNotFoundError('缺少对应 loginUid 的 Bilibili 用户登录后的 Cookie 值 <a href="https://docs.rsshub.app/zh/deploy/config#route-specific-configurations">bilibili 用户关注动态系列路由</a>');
     }
 
     const uid = ctx.req.param('uid');
@@ -67,11 +69,11 @@ async function handler(ctx) {
         },
     });
     if (response.data.code === -6) {
-        throw new Error('对应 loginUid 的 Bilibili 用户的 Cookie 已过期');
+        throw new ConfigNotFoundError('对应 loginUid 的 Bilibili 用户的 Cookie 已过期');
     }
     // 22115 : 用户已设置隐私，无法查看
     if (response.data.code === 22115) {
-        throw new Error(response.data.message);
+        throw new InvalidParameterError(response.data.message);
     }
     const data = response.data.data.list;
 

package/lib/routes/bilibili/manga-followings.ts

@@ -2,6 +2,7 @@ import { Route } from '@/types';
 import got from '@/utils/got';
 import cache from './cache';
 import { config } from '@/config';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
     path: '/manga/followings/:uid/:limits?',
@@ -39,7 +40,7 @@ async function handler(ctx) {
 
     const cookie = config.bilibili.cookies[uid];
     if (cookie === undefined) {
-        throw new Error('缺少对应 uid 的 Bilibili 用户登录后的 Cookie 值');
+        throw new ConfigNotFoundError('缺少对应 uid 的 Bilibili 用户登录后的 Cookie 值');
     }
     const page_size = ctx.req.param('limits') || 10;
     const link = 'https://manga.bilibili.com/account-center';
@@ -53,7 +54,7 @@ async function handler(ctx) {
         },
     });
     if (response.data.code === -6) {
-        throw new Error('对应 uid 的 Bilibili 用户的 Cookie 已过期');
+        throw new ConfigNotFoundError('对应 uid 的 Bilibili 用户的 Cookie 已过期');
     }
     const comics = response.data.data;
 

package/lib/routes/bilibili/namespace.ts

@@ -1,6 +1,6 @@
 import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
-    name: 'Bilibili',
+    name: '哔哩哔哩 bilibili',
     url: 'www.bilibili.com',
 };

package/lib/routes/bilibili/ranking.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 import utils from './utils';
 
@@ -6,17 +6,108 @@ export const route: Route = {
     path: '/ranking/:rid?/:day?/:arc_type?/:disableEmbed?',
     name: '排行榜',
     maintainers: ['DIYgod'],
-    categories: ['social-media'],
+    categories: ['social-media', 'popular'],
+    view: ViewType.Videos,
     example: '/bilibili/ranking/0/3/1',
     parameters: {
-        rid: '排行榜分区 id, 默认 0',
-        day: '时间跨度, 可为 1 3 7 30',
-        arc_type: '投稿时间, 可为 0(全部投稿) 1(近期投稿) , 默认 1',
-        disableEmbed: '默认为开启内嵌视频, 任意值为关闭',
+        rid: {
+            description: '排行榜分区 id',
+            default: '0',
+            options: [
+                {
+                    label: '全站',
+                    value: '0',
+                },
+                {
+                    label: '动画',
+                    value: '1',
+                },
+                {
+                    label: '国创相关',
+                    value: '168',
+                },
+                {
+                    label: '音乐',
+                    value: '3',
+                },
+                {
+                    label: '舞蹈',
+                    value: '129',
+                },
+                {
+                    label: '游戏',
+                    value: '4',
+                },
+                {
+                    label: '科技',
+                    value: '36',
+                },
+                {
+                    label: '数码',
+                    value: '188',
+                },
+                {
+                    label: '生活',
+                    value: '160',
+                },
+                {
+                    label: '鬼畜',
+                    value: '119',
+                },
+                {
+                    label: '时尚',
+                    value: '155',
+                },
+                {
+                    label: '娱乐',
+                    value: '5',
+                },
+                {
+                    label: '影视',
+                    value: '181',
+                },
+            ],
+        },
+        day: {
+            description: '时间跨度',
+            default: '3',
+            options: [
+                {
+                    value: '1',
+                    label: '1日',
+                },
+                {
+                    value: '3',
+                    label: '3日',
+                },
+                {
+                    value: '7',
+                    label: '7日',
+                },
+                {
+                    value: '30',
+                    label: '30日',
+                },
+            ],
+        },
+        arc_type: {
+            description: '投稿时间',
+            default: '1',
+            options: [
+                {
+                    value: '0',
+                    label: '全部投稿',
+                },
+                {
+                    value: '1',
+                    label: '近期投稿',
+                },
+            ],
+        },
+        disableEmbed: {
+            description: '默认为开启内嵌视频, 任意值为关闭',
+        },
     },
-    description: `| 全站 | 动画 | 国创相关 | 音乐 | 舞蹈 | 游戏 | 科技 | 数码 | 生活 | 鬼畜 | 时尚 | 娱乐 | 影视 |
-    | ---- | ---- | -------- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- | ---- |
-    | 0    | 1    | 168      | 3    | 129  | 4    | 36   | 188  | 160  | 119  | 155  | 5    | 181  |`,
     handler,
 };
 

package/lib/routes/bilibili/user-collection.ts

@@ -3,6 +3,7 @@ import got from '@/utils/got';
 import cache from './cache';
 import utils from './utils';
 import { parseDate } from '@/utils/parse-date';
+import { queryToBoolean } from '@/utils/readable-social';
 
 const notFoundData = {
     title: '此 bilibili 频道不存在',
@@ -15,7 +16,7 @@ export const route: Route = {
     parameters: {
         uid: '用户 id, 可在 UP 主主页中找到',
         sid: '合集 id, 可在合集页面的 URL 中找到',
-        disableEmbed: '默认为开启内嵌视频, 任意值为关闭',
+        disableEmbed: '空,0与false为开启内嵌视频, 其他任意值为关闭',
         sortReverse: '默认:默认排序 1:升序排序',
         page: '页码, 默认1',
     },
@@ -35,7 +36,7 @@ export const route: Route = {
 async function handler(ctx) {
     const uid = Number.parseInt(ctx.req.param('uid'));
     const sid = Number.parseInt(ctx.req.param('sid'));
-    const disableEmbed = ctx.req.param('disableEmbed');
+    const disableEmbed = queryToBoolean(ctx.req.param('disableEmbed'));
     const sortReverse = Number.parseInt(ctx.req.param('sortReverse')) === 1;
     const page = ctx.req.param('page') ? Number.parseInt(ctx.req.param('page')) : 1;
     const limit = ctx.req.query('limit') ?? 25;

package/lib/routes/bilibili/utils.ts

@@ -2,7 +2,7 @@ import { config } from '@/config';
 import md5 from '@/utils/md5';
 import CryptoJS from 'crypto-js';
 
-function iframe(aid, page, bvid) {
+function iframe(aid: any, page?: any, bvid?: any) {
     return `<iframe src="https://www.bilibili.com/blackboard/html5mobileplayer.html?${bvid ? `bvid=${bvid}` : `aid=${aid}`}${
         page ? `&page=${page}` : ''
     }&high_quality=1&autoplay=0" width="650" height="477" scrolling="no" border="0" frameborder="no" framespacing="0" allowfullscreen="true"></iframe>`;

package/lib/routes/bilibili/video.ts

@@ -1,4 +1,4 @@
-import { Route } from '@/types';
+import { Route, ViewType } from '@/types';
 import got from '@/utils/got';
 import cache from './cache';
 import utils from './utils';
@@ -6,13 +6,14 @@ import logger from '@/utils/logger';
 
 export const route: Route = {
     path: '/user/video/:uid/:disableEmbed?',
-    categories: ['social-media'],
+    categories: ['social-media', 'popular'],
+    view: ViewType.Videos,
     example: '/bilibili/user/video/2267573',
     parameters: { uid: '用户 id, 可在 UP 主主页中找到', disableEmbed: '默认为开启内嵌视频, 任意值为关闭' },
     features: {
         requireConfig: false,
         requirePuppeteer: false,
-        antiCrawler: true,
+        antiCrawler: false,
         supportBT: false,
         supportPodcast: false,
         supportScihub: false,
@@ -26,9 +27,6 @@ export const route: Route = {
     name: 'UP 主投稿',
     maintainers: ['DIYgod'],
     handler,
-    description: `:::tip 动态的专栏显示全文
-  可以使用 [UP 主动态](#bilibili-up-zhu-dong-tai)路由作为代替绕过反爬限制
-  :::`,
 };
 
 async function handler(ctx) {

package/lib/routes/bilibili/vsearch.ts

@@ -1,12 +1,9 @@
 import { Route } from '@/types';
-import cache from '@/utils/cache';
-import { config } from '@/config';
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
 import utils from './utils';
-import { CookieJar } from 'tough-cookie';
-const cookieJar = new CookieJar();
 import { queryToBoolean } from '@/utils/readable-social';
+import cacheIn from './cache';
 
 export const route: Route = {
     path: '/vsearch/:kw/:order?/:disableEmbed?/:tid?',
@@ -14,7 +11,17 @@ export const route: Route = {
     example: '/bilibili/vsearch/RSSHub',
     parameters: { kw: '检索关键字', order: '排序方式, 综合:totalrank 最多点击:click 最新发布:pubdate(缺省) 最多弹幕:dm 最多收藏:stow', disableEmbed: '默认为开启内嵌视频, 任意值为关闭', tid: '分区 id' },
     features: {
-        requireConfig: false,
+        requireConfig: [
+            {
+                name: 'BILIBILI_COOKIE_*',
+                optional: true,
+                description: `如果没有此配置，那么必须开启 puppeteer 支持；BILIBILI_COOKIE_{uid}: 用于用户关注动态系列路由，对应 uid 的 b 站用户登录后的 Cookie 值，\`{uid}\` 替换为 uid，如 \`BILIBILI_COOKIE_2267573\`，获取方式：
+1.  打开 [https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/dynamic_new?uid=0&type=8](https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/dynamic_new?uid=0&type=8)
+2.  打开控制台，切换到 Network 面板，刷新
+3.  点击 dynamic_new 请求，找到 Cookie
+4.  视频和专栏，UP 主粉丝及关注只要求 \`SESSDATA\` 字段，动态需复制整段 Cookie`,
+            },
+        ],
         requirePuppeteer: false,
         antiCrawler: false,
         supportBT: false,
@@ -22,7 +29,7 @@ export const route: Route = {
         supportScihub: false,
     },
     name: '视频搜索',
-    maintainers: ['Symty'],
+    maintainers: ['pcrtool', 'DIYgod'],
     handler,
     description: `分区 id 的取值请参考下表：
 
@@ -37,32 +44,22 @@ async function handler(ctx) {
     const disableEmbed = queryToBoolean(ctx.req.param('disableEmbed'));
     const kw_url = encodeURIComponent(kw);
     const tids = ctx.req.param('tid') ?? 0;
+    const cookie = await cacheIn.getCookie();
 
-    const data = await cache.tryGet(
-        `bilibili:vsearch:${tids}:${kw}:${order}`,
-        async () => {
-            await got('https://passport.bilibili.com/login', {
-                cookieJar,
-            });
-
-            const response = await got('https://api.bilibili.com/x/web-interface/search/type', {
-                headers: {
-                    Referer: `https://search.bilibili.com/all?keyword=${kw_url}`,
-                },
-                cookieJar,
-                searchParams: {
-                    search_type: 'video',
-                    highlight: 1,
-                    keyword: kw,
-                    order,
-                    tids,
-                },
-            });
-            return response.data.data.result;
+    const response = await got('https://api.bilibili.com/x/web-interface/search/type', {
+        headers: {
+            Referer: `https://search.bilibili.com/all?keyword=${kw_url}`,
+            Cookie: cookie,
+        },
+        searchParams: {
+            search_type: 'video',
+            highlight: 1,
+            keyword: kw,
+            order,
+            tids,
         },
-        config.cache.routeExpire,
-        false
-    );
+    });
+    const data = response.data.data.result;
 
     return {
         title: `${kw} - bilibili`,

package/lib/routes/bilibili/watchlater.ts

@@ -4,6 +4,7 @@ import cache from './cache';
 import { config } from '@/config';
 import utils from './utils';
 import { parseDate } from '@/utils/parse-date';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
 
 export const route: Route = {
     path: '/watchlater/:uid/:disableEmbed?',
@@ -42,7 +43,7 @@ async function handler(ctx) {
 
     const cookie = config.bilibili.cookies[uid];
     if (cookie === undefined) {
-        throw new Error('缺少对应 uid 的 Bilibili 用户登录后的 Cookie 值');
+        throw new ConfigNotFoundError('缺少对应 uid 的 Bilibili 用户登录后的 Cookie 值');
     }
 
     const response = await got({
@@ -55,7 +56,7 @@ async function handler(ctx) {
     });
     if (response.data.code) {
         const message = response.data.code === -6 ? '对应 uid 的 Bilibili 用户的 Cookie 已过期' : response.data.message;
-        throw new Error(`Error code ${response.data.code}: ${message}`);
+        throw new ConfigNotFoundError(`Error code ${response.data.code}: ${message}`);
     }
     const list = response.data.data.list || [];
 

package/lib/routes/binance/launchpool.ts

@@ -0,0 +1,46 @@
+import { Route } from '@/types';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+
+export const route: Route = {
+    path: '/launchpool',
+    categories: ['finance'],
+    example: '/binance/launchpool',
+    radar: [
+        {
+            source: ['binance.com/:lang/support/announcement'],
+        },
+    ],
+    name: 'Binance数字货币及交易对上新',
+    maintainers: ['zhenlohuang'],
+    handler,
+};
+
+async function handler() {
+    const baseUrl = 'https://www.binance.com/zh-CN/support/announcement';
+    const url = `${baseUrl}/数字货币及交易对上新?c=48&navId=48`;
+
+    const response = await got({
+        url,
+        headers: {
+            Referer: 'https://www.binance.com/',
+        },
+    });
+
+    const $ = load(response.data);
+    const appData = JSON.parse($('#__APP_DATA').text());
+    const articles = appData.appState.loader.dataByRouteId.d969.catalogs.find((catalog) => catalog.catalogId === 48).articles.filter((article) => article.title.includes('币安新币挖矿上线'));
+
+    return {
+        title: 'Binance | 数字货币及交易对上新',
+        link: url,
+        description: '数字货币及交易对上新',
+        item: articles.map((item) => ({
+            title: item.title,
+            link: `${baseUrl}/${item.code}`,
+            description: item.title,
+            pubDate: parseDate(item.releaseDate),
+        })),
+    };
+}

package/lib/routes/binance/namespace.ts

@@ -0,0 +1,6 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: 'Binance',
+    url: 'binance.com',
+};

package/lib/routes/bing/daily-wallpaper.ts

@@ -1,40 +1,80 @@
 import { Route } from '@/types';
-import got from '@/utils/got';
+import ofetch from '@/utils/ofetch';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
 
 export const route: Route = {
-    path: '/',
+    path: '/:routeParams?',
+    parameters: {
+        routeParams: '额外参数type,story和lang:请参阅以下说明和表格',
+    },
     radar: [
         {
-            source: ['cn.bing.com/'],
+            source: ['www.bing.com/', 'cn.bing.com/'],
             target: '',
         },
     ],
-    name: 'Unknown',
-    maintainers: ['FHYunCai'],
+    name: '每日壁纸',
+    maintainers: ['FHYunCai', 'LLLLLFish'],
     handler,
-    url: 'cn.bing.com/',
+    url: 'www.bing.com/',
+    example: '/bing/type=UHD&story=1&lang=zh-CN',
+    description: `| 参数    | 含义                 | 接受的值                                                      | 默认值       | 备注                                                     |
+|-------|--------------------|-----------------------------------------------------------|-----------|--------------------------------------------------------|
+| type  | 输出壁纸的像素类型          | UHD/1920x1080/1920x1200/768x1366/1080x1920/1080x1920_logo | 1920x1080 | 1920x1200与1080x1920_logo带有水印,输入的值不在接受范围内都会输出成1920x1080 |
+| story | 是否输出壁纸的故事          | 1/0                                                       | 0         | 输入的值不为1都不会输出故事                                         |
+| lang  | 输出壁纸图文的地区(中文或者是英文) | zh/en                                               | zh     | zh/en输出的壁纸图文不一定是一样的;如果en不生效,试着部署到其他地方               |
+`,
 };
 
 async function handler(ctx) {
-    const response = await got({
-        method: 'get',
-        prefixUrl: 'https://cn.bing.com',
-        url: 'HPImageArchive.aspx',
-        searchParams: {
-            format: 'js',
-            idx: 0,
-            n: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 7,
-            mkt: 'zh-CN',
+    const routeParams = new URLSearchParams(ctx.req.param('routeParams'));
+    let type = routeParams.get('type') || '1920x1080';
+    let lang = routeParams.get('lang');
+    let apiUrl = '';
+    const allowedTypes = ['UHD', '1920x1080', '1920x1200', '768x1366', '1080x1920', '1080x1920_logo'];
+    if (lang !== 'zh' && lang !== 'en') {
+        lang = 'zh';
+    }
+    if (lang === 'zh') {
+        lang = 'zh-CN';
+        apiUrl = 'https://cn.bing.com';
+    } else {
+        lang = 'en-US';
+        apiUrl = 'https://www.bing.com';
+    }
+    if (!allowedTypes.includes(type)) {
+        type = '1920x1080';
+    }
+    const story = routeParams.get('story') === '1';
+    const resp = await ofetch('/hp/api/model', {
+        baseURL: apiUrl,
+        method: 'GET',
+        query: {
+            mtk: lang,
         },
     });
-    const data = response.data;
+    const items = resp.MediaContents.map((item) => {
+        const ssd = item.Ssd;
+        const link = `${apiUrl}${item.ImageContent.Image.Url.match(/\/th\?id=[^_]+_[^_]+/)[0].replace(/(_\d+x\d+\.webp)$/i, '')}_${type}.jpg`;
+        let description = `<img width="1920" height="1080" src="${link}" alt="Article Cover Image" style="display: block; margin: 0 auto;"><br>`;
+        if (story) {
+            description += `<b>${item.ImageContent.Headline}</b>`;
+            description += `<i>${item.ImageContent.QuickFact.MainText}</i><br>`;
+            description += `<p>${item.ImageContent.Description}<p>`;
+        }
+        return {
+            title: item.ImageContent.Title,
+            description,
+            link: `${apiUrl}${item.ImageContent.BackstageUrl}`,
+            author: item.ImageContent.Copyright,
+            pubDate: timezone(parseDate(ssd, 'YYYYMMDD_HHmm'), 0),
+        };
+    });
     return {
         title: 'Bing每日壁纸',
-        link: 'https://cn.bing.com/',
-        item: data.images.map((item) => ({
-            title: item.copyright,
-            description: `<img src="https://cn.bing.com${item.url}">`,
-            link: item.copyrightlink,
-        })),
+        link: apiUrl,
+        description: 'Bing每日壁纸',
+        item: items,
     };
 }

package/lib/routes/biquge/index.ts

@@ -7,6 +7,7 @@ import iconv from 'iconv-lite';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { config } from '@/config';
+import ConfigNotFoundError from '@/errors/types/config-not-found';
 const allowHost = new Set([
     'www.xbiquwx.la',
     'www.biqu5200.net',
@@ -36,7 +37,7 @@ async function handler(ctx) {
     const rootUrl = getSubPath(ctx).split('/').slice(1, 4).join('/');
     const currentUrl = getSubPath(ctx).slice(1);
     if (!config.feature.allow_user_supply_unsafe_domain && !allowHost.has(new URL(rootUrl).hostname)) {
-        throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
+        throw new ConfigNotFoundError(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
     }
 
     const response = await got({

package/lib/routes/bjfu/namespace.ts

@@ -1,6 +1,6 @@
 import type { Namespace } from '@/types';
 
 export const namespace: Namespace = {
-    name: '北京师范大学',
+    name: '北京林业大学',
     url: 'graduate.bjfu.edu.cn',
 };

package/lib/routes/bjnews/cat.ts

@@ -0,0 +1,43 @@
+import { Route } from '@/types';
+import { load } from 'cheerio';
+import ofetch from '@/utils/ofetch';
+
+import { fetchArticle } from './utils';
+
+export const route: Route = {
+    path: '/cat/:cat',
+    categories: ['traditional-media'],
+    example: '/bjnews/cat/depth',
+    parameters: { cat: '分类, 可从URL中找到' },
+    features: {},
+    radar: [
+        {
+            source: ['www.bjnews.com.cn/:cat'],
+        },
+    ],
+    name: '分类',
+    maintainers: ['dzx-dzx'],
+    handler,
+    url: 'www.bjnews.com.cn',
+};
+
+async function handler(ctx) {
+    const url = `https://www.bjnews.com.cn/${ctx.req.param('cat')}`;
+    const res = await ofetch(url);
+    const $ = load(res);
+    const list = $('#waterfall-container .pin_demo > a')
+        .toArray()
+        .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 15)
+        .map((a) => ({
+            title: $(a).text(),
+            link: $(a).attr('href'),
+            category: $(a).parent().find('.source').text().trim(),
+        }));
+
+    const out = await Promise.all(list.map((item) => fetchArticle(item)));
+    return {
+        title: `新京报 - 分类 - ${$('.cur').text().trim()}`,
+        link: url,
+        item: out,
+    };
+}