rsshub 1.0.0-master.f992838 → 1.0.0-master.f9a482d

package/lib/v2/gov/maintainer.js

@@ -1,5 +1,6 @@
 module.exports = {
     // ministry
+    '/cac/:path+': ['drgnchan'],
     '/ccdi/:path+': ['bigfei'],
     '/cmse/xwzx/zhxw': ['nczitzk'],
     '/cmse/xwzx/yzjz': ['nczitzk'],
@@ -12,9 +13,12 @@ module.exports = {
     '/cmse/kpjy/:id': ['nczitzk'],
     '/cmse/:path+': ['nczitzk'],
     '/cnnic/:path+': ['nczitzk'],
+    '/csrc/auditstatus/:apply_id': ['hillerliao'],
+    '/csrc/news/:suffix*': ['chinobing', 'LogicJake'],
     '/customs/list/:gchannel?': ['Jeason0228', 'TonyRL', 'he1q'],
     '/fmprc/:category?': ['nicolaszf', 'nczitzk'],
     '/immiau/news': ['liu233w'],
+    '/jinan/healthcommission/medical_exam_notice': ['tzjyxb'],
     '/mee/ywdt?': ['liuxsdev'],
     '/mfa/wjdt/:category?': ['nczitzk'],
     '/miit/wjfb/:ministry': ['Fatpandac'],
@@ -23,8 +27,10 @@ module.exports = {
     '/miit/wjgs': ['Yoge-Code'],
     '/miit/zcjd': ['Yoge-Code'],
     '/moe/:type': ['Crawler995'],
+    '/moe/s78/:column': ['TonyRL'],
     '/mofcom/article/:suffix+': ['LogicJake'],
     '/moj/aac/news/:type?': ['TonyRL'],
+    '/news/:uid': ['EsuRt'],
     '/nifdc/:path+': ['nczitzk'],
     '/nmpa/:path+': ['TonyRL'],
     '/nopss/:path+': ['nczitzk'],
@@ -35,7 +41,7 @@ module.exports = {
     '/pbc/tradeAnnouncement': ['nczitzk'],
     '/pbc/zcyj': ['Fatpandac'],
     '/sasac/:path+': ['TonyRL'],
-    '/stats/:path+': ['bigfei'],
+    '/stats/:path+': ['bigfei', 'nczitzk'],
     '/zhengce/govall/:advance?': ['ciaranchen'],
     '/zhengce/wenjian/:pcodeJiguan?': ['ciaranchen'],
     '/zhengce/zhengceku/:department': ['zxx-457'],
@@ -45,6 +51,7 @@ module.exports = {
     '/beijing/bphc/:channel': ['bigfei'],
     '/beijing/jw/tzgg': ['nczitzk'],
     '/beijing/kw/:channel': ['Fatpandac'],
+    '/chongqing/rsks': ['Mai19930513'],
     '/dianbai/:path+': ['ShuiHuo'],
     '/gaozhou/:path+': ['ShuiHuo'],
     '/guangdong/tqyb/sncsyjxh': ['Fatpandac'],
@@ -67,7 +74,8 @@ module.exports = {
     '/shenzhen/hrss/szksy/:caty/:page?': ['zlasd'],
     '/shenzhen/xxgk/zfxxgj/:caty': ['laoxua'],
     '/shenzhen/zzb/:caty/:page?': ['zlasd'],
-    '/sichuan/deyang/govpulicinfo/:countyName': ['zytomorrow'],
+    '/sichuan/deyang/govpublicinfo/:countyName/:infoType?': ['zytomorrow'],
+    '/sichuan/deyang/mztoday/:infoType?': ['zytomorrow'],
     '/taiyuan/rsj/:caty/:page?': ['2PoL'],
     '/wuhan/sy/whyw': ['nczitzk'],
     '/xinyi/:path+': ['ShuiHuo'],

package/lib/v2/gov/moe/moe.js

@@ -17,10 +17,10 @@ module.exports = async (ctx) => {
     let id = '';
     let name = '';
 
-    for (let i = 0; i < typesIdMap.length; i++) {
-        if (typesIdMap[i].type === type) {
-            id = typesIdMap[i].id;
-            name = typesIdMap[i].name;
+    for (const item of typesIdMap) {
+        if (item.type === type) {
+            id = item.id;
+            name = item.name;
         }
     }
 

package/lib/v2/gov/moe/s78.js

@@ -0,0 +1,44 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const timezone = require('@/utils/timezone');
+
+module.exports = async (ctx) => {
+    const baseUrl = 'https://www.moe.gov.cn';
+    const { column } = ctx.params;
+    const link = `${baseUrl}/s78/${column}/tongzhi/`;
+
+    const { data: response } = await got(link);
+    const $ = cheerio.load(response);
+
+    const list = $('#list li')
+        .toArray()
+        .map((item) => {
+            item = $(item);
+            return {
+                title: item.find('a').attr('title'),
+                link: new URL(item.find('a').attr('href'), link).href,
+                pubDate: timezone(parseDate(item.find('span').text(), 'YYYY-MM-DD'), +8),
+            };
+        });
+
+    const items = await Promise.all(
+        list.map((item) =>
+            ctx.cache.tryGet(item.link, async () => {
+                const { data: response } = await got(item.link);
+                const $ = cheerio.load(response);
+
+                $('#moe-detail-page-set, #moeCode, .moe-detail-shuxing, h1').remove();
+                item.description = $('.moe-detail-box').html();
+
+                return item;
+            })
+        )
+    );
+
+    ctx.state.data = {
+        title: `${$('meta[name="ColumnType"]').attr('content')} - ${$('head title').text()}`,
+        link,
+        item: items,
+    };
+};

package/lib/v2/gov/news/index.js

@@ -0,0 +1,119 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const logger = require('@/utils/logger');
+
+module.exports = async (ctx) => {
+    const uid = ctx.params.uid;
+    const originDomain = 'https://www.gov.cn';
+    let url = '';
+    let title = '';
+    let list = '';
+    switch (uid) {
+        case 'bm':
+            url = `${originDomain}/lianbo/bumen/index.htm`;
+            title = '中国政府网 - 部门政务';
+            break;
+        case 'yw':
+            url = `${originDomain}/yaowen/index.htm`;
+            title = '中国政府网 - 新闻要闻';
+            break;
+        case 'gd':
+            // 因 /xinwen/gundong.htm 被重定向到 /yaowen/index.htm, 所以这里直接用要闻的代替了
+            url = `${originDomain}/yaowen/index.htm`;
+            title = '中国政府网 - 滚动新闻';
+            break;
+        case 'gwy':
+            url = `${originDomain}/pushinfo/v150203/`;
+            title = '中国政府网 - 国务院信息';
+            break;
+        case 'zhengce':
+            url = 'http://sousuo.gov.cn/s.htm?t=zhengcelibrary';
+            title = '中国政府网 - 政策文件';
+            break;
+        default:
+            logger.error('pattern not matched');
+    }
+    const listData = await got.get(url);
+    const $ = cheerio.load(listData.data);
+    if (url.includes('zhengcelibrary')) {
+        list = $('.dys_middle_result_content_item');
+    } else if (url.includes('bumen')) {
+        list = $('.infolist li');
+    } else {
+        list = $('.news_box .list li:not(.line)');
+    }
+
+    ctx.state.data = {
+        title,
+        link: url,
+        item: await Promise.all(
+            list.toArray().map(async (item) => {
+                item = $(item);
+                let fullText = '';
+                let href = '';
+                let contentUrl = '';
+                let description = '';
+                let fullTextData = '';
+                let fullTextGet = '';
+                if (item.html().search(/dysMiddleResultConItemTitle/g) !== -1) {
+                    contentUrl = item.find('a').attr('href');
+                    if (!contentUrl.includes('content')) {
+                        description = item.find('a').text(); // 忽略获取吹风会的全文
+                    } else {
+                        description = await ctx.cache.tryGet(contentUrl, async () => {
+                            fullTextGet = await got.get(contentUrl);
+                            fullTextData = cheerio.load(fullTextGet.data);
+                            if (fullTextData.html().search(/pages_content/g) !== -1) {
+                                fullTextData('.shuzi').remove(); // 移除videobg的图片
+                                fullTextData('#myFlash').remove(); // 移除flash
+                                return fullTextData('.pages_content').html();
+                            } else {
+                                fullTextData('.shuzi').remove(); // 移除videobg的图片
+                                fullTextData('#myFlash').remove(); // 移除flash
+                                return fullTextData('#UCAP-CONTENT').html();
+                            }
+                        });
+                    }
+                } else {
+                    href = item.find('a').attr('href');
+                    if (href.startsWith('.')) {
+                        href = new URL(href, url).pathname;
+                    }
+                    contentUrl = href.startsWith('/') ? `${originDomain}${href}` : href;
+                    if (!contentUrl.includes('content')) {
+                        description = item.find('a').text(); // 忽略获取吹风会的全文
+                    } else {
+                        description = await ctx.cache.tryGet(contentUrl, async () => {
+                            fullTextGet = await got.get(contentUrl);
+                            fullTextData = cheerio.load(fullTextGet.data);
+                            const $1 = fullTextData.html();
+                            if (contentUrl.search(/zhengceku/g) !== -1) {
+                                // 政策文件库
+                                fullText = fullTextData('.pages_content').html();
+                            } else {
+                                if ($1.search(/UCAP-CONTENT/g) === -1) {
+                                    fullTextData('.shuzi').remove(); // 移除videobg的图片
+                                    fullTextData('#myFlash').remove(); // 移除flash
+                                    fullText = fullTextData('body').html();
+                                } else {
+                                    fullTextData('.shuzi').remove(); // 移除videobg的图片
+                                    fullTextData('#myFlash').remove(); // 移除flash
+                                    fullText = fullTextData('#UCAP-CONTENT').html();
+                                }
+                            }
+                            const regImg = /(img src=")(.*)(".*)/g;
+                            const regUrl = /(http.*\/)(content.*)/;
+                            const urlSplit = contentUrl.replace(regUrl, '$1');
+                            return fullText.replace(regImg, '$1' + urlSplit + '$2' + '$3'); // 处理图片链接
+                        });
+                    }
+                }
+                return {
+                    title: item.find('a').text(),
+                    description,
+                    link: contentUrl,
+                };
+            })
+        ),
+    };
+};

package/lib/v2/gov/pbc/utils.js

@@ -1,8 +1,8 @@
 const got = require('@/utils/got');
 const cheerio = require('cheerio');
 
-const processItems = async (list, ctx) =>
-    await Promise.all(
+const processItems = (list, ctx) =>
+    Promise.all(
         list.map((item) =>
             ctx.cache.tryGet(item.link, async () => {
                 const detailResponse = await got.post(item.link);

package/lib/v2/gov/radar.js

@@ -308,6 +308,17 @@ module.exports = {
             },
         ],
     },
+    'cac.gov.cn': {
+        _name: '中央网信办',
+        '.': [
+            {
+                title: '分类',
+                docs: 'https://docs.rsshub.app/government.html#zhong-yang-wang-xin-ban',
+                source: ['/*'],
+                target: (params, url) => `/gov/cac/${new URL(url).href.match(/cac\.gov\.cn(.*?)\/(A.*?\.htm)/)[1]}`,
+            },
+        ],
+    },
     'ccdi.gov.cn': {
         _name: '中央纪委国家监委',
         www: [
@@ -406,6 +417,36 @@ module.exports = {
             },
         ],
     },
+    'cq.gov.cn': {
+        _name: '重庆市人民政府',
+        rlsbj: [
+            {
+                title: '重庆人事考试通知公告',
+                docs: 'https://docs.rsshub.app/government.html#zhong-qing-shi-ren-min-zheng-fu',
+                source: ['/'],
+                target: '/gov/chongqing/rsks',
+            },
+        ],
+    },
+    'csrc.gov.cn': {
+        _name: '中国证券监督管理委员会',
+        neris: [
+            {
+                title: '申请事项进度',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-quan-jian-du-guan-li-wei-yuan-hui',
+                source: ['/alappl/home1/onlinealog'],
+                target: (_, url) => `/gov/csrc/auditstatus/${new URL(url).searchParams.get('appMatrCde')}`,
+            },
+        ],
+        www: [
+            {
+                title: '通用',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-quan-jian-du-guan-li-wei-yuan-hui',
+                source: ['/csrc/*suffix'],
+                target: '/gov/csrc/:suffix',
+            },
+        ],
+    },
     'customs.gov.cn': {
         _name: '中华人民共和国海关总署',
         www: [
@@ -424,7 +465,7 @@ module.exports = {
                 title: '德阳市政府公开信息',
                 docs: 'https://docs.rsshub.app/government.html#de-yang-shi-fu-ren-min-zheng-zheng-fu',
                 source: ['/*'],
-                target: '/sichuan/deyang/govpulicinfo/:countyName',
+                target: '/sichuan/deyang/govpublicinfo/:countyName',
             },
         ],
     },
@@ -553,6 +594,17 @@ module.exports = {
             },
         ],
     },
+    'jinan.gov.cn': {
+        _name: '济南市卫生健康委员会',
+        jnmhc: [
+            {
+                title: '获取国家医师资格考试通知',
+                docs: 'https://docs.rsshub.app/government.html#ji-nan-shi-wei-sheng-jian-kang-wei-yuan-hui',
+                source: ['/*'],
+                target: '/gov/jinan/healthcommission/medical_exam_notice',
+            },
+        ],
+    },
     'maoming.gov.cn': {
         _name: '茂名市人民政府门户网站',
         '.': [
@@ -681,6 +733,12 @@ module.exports = {
                 source: ['/'],
                 target: '/gov/moe/newest_file',
             },
+            {
+                title: '司局通知',
+                docs: 'https://docs.rsshub.app/government.html#zhong-hua-ren-min-gong-he-guo-jiao-yu-bu',
+                source: ['/s78/:column/tongzhi', '/s78/:column'],
+                target: '/gov/moe/s78/:column',
+            },
         ],
     },
     'mofcom.gov.cn': {
@@ -705,6 +763,17 @@ module.exports = {
             },
         ],
     },
+    'mztoday.gov.cn': {
+        _name: '德阳市人民政府',
+        www: [
+            {
+                title: '今日绵竹',
+                docs: 'https://docs.rsshub.app/government.html#de-yang-shi-ren-min-zheng-fu',
+                source: ['/*'],
+                target: '/gov/sichuan/deyang/mztoday',
+            },
+        ],
+    },
     'nifdc.gov.cn': {
         _name: '国家药品监督管理局医疗器械标准管理中心',
         '.': [
@@ -867,12 +936,23 @@ module.exports = {
             },
         ],
     },
+    'sousuo.gov.cn': {
+        _name: '中国政府网',
+        kjt: [
+            {
+                title: '政府新闻 - 政策文件',
+                docs: 'https://docs.rsshub.app/government.html#shan-xi-sheng-sheng-ren-min-zheng-fu-sheng-ke-xue-ji-shu-ting',
+                source: ['/s.htm', '/'],
+                target: '/gov/news/zhengce',
+            },
+        ],
+    },
     'stats.gov.cn': {
         _name: '国家统计局',
         www: [
             {
-                title: '统计数据 > 最新发布',
-                docs: 'https://docs.rsshub.app/government.html#guo-jia-tong-ji-ju-tong-ji-shu-ju-zui-xin-fa-bu',
+                title: '通用',
+                docs: 'https://docs.rsshub.app/government.html#guo-jia-tong-ji-ju-shu-ju-tong-yong',
                 source: ['/*'],
                 target: (params, url) => `/gov/stats/${new URL(url).href.match(/stats\.gov\.cn\/(.*)/)[1]}`,
             },
@@ -947,6 +1027,30 @@ module.exports = {
     'www.gov.cn': {
         _name: '中国政府网',
         '.': [
+            {
+                title: '政府新闻 - 政务部门',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang',
+                source: ['/lianbo/bumen/index.htm', '/'],
+                target: '/gov/news/bm',
+            },
+            {
+                title: '政府新闻 - 滚动新闻',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang',
+                source: ['/xinwen/gundong.htm', '/'],
+                target: '/gov/news/gd',
+            },
+            {
+                title: '政府新闻 - 新闻要闻',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang',
+                source: ['/yaowen/index.htm', '/'],
+                target: '/gov/news/yw',
+            },
+            {
+                title: '政府新闻 - 国务院新闻',
+                docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang',
+                source: ['/pushinfo/v150203', '/'],
+                target: '/gov/news/gwy',
+            },
             {
                 title: '最新政策',
                 docs: 'https://docs.rsshub.app/government.html#zhong-guo-zheng-fu-wang',

package/lib/v2/gov/router.js

@@ -1,12 +1,16 @@
 module.exports = function (router) {
     // ministry
+    router.get(/cac(\/[\w/-]+)?/, require('./cac/index'));
     router.get(/ccdi(\/[\w/-]+)?/, require('./ccdi'));
     router.get('/cmse/fxrw', require('./cmse/fxrw'));
     router.get(/cmse(\/[\w/-]+)?/, require('./cmse'));
     router.get(/cnnic(\/[\w/-]+)?/, require('./cnnic'));
+    router.get('/csrc/auditstatus/:apply_id', require('./csrc/auditstatus'));
+    router.get('/csrc/news/:suffix*', require('./csrc/news'));
     router.get('/customs/list/:gchannel?', require('./customs/list'));
     router.get('/fmprc/:category?', require('./mfa/wjdt'));
     router.get('/immiau/news', require('./immiau/news'));
+    router.get('/jinan/healthcommission/medical_exam_notice', require('./jinan/healthcommission/medical_exam_notice'));
     router.get('/mee/ywdt/:category?', require('./mee/ywdt'));
     router.get('/mfa/wjdt/:category?', require('./mfa/wjdt'));
     router.get('/miit/wjfb/:ministry', require('./miit/wjfb'));
@@ -15,8 +19,10 @@ module.exports = function (router) {
     router.get('/miit/wjgs', require('./miit/wjgs'));
     router.get('/miit/zcjd', require('./miit/zcjd'));
     router.get('/moe/:type', require('./moe/moe'));
+    router.get('/moe/s78/:column', require('./moe/s78'));
     router.get('/mofcom/article/:suffix+', require('./mofcom/article'));
     router.get('/moj/aac/news/:type?', require('./moj/aac/news'));
+    router.get('/news/:uid', require('./news'));
     router.get(/nifdc\/([\w/-]+)?/, require('./nifdc'));
     router.get(/\/nmpa\/([\w][\w/]+)?/, require('./nmpa/generic'));
     router.get(/nopss(\/[\w/-]+)?/, require('./nopss'));
@@ -37,6 +43,7 @@ module.exports = function (router) {
     router.get(/beijing\/bphc(\/[\w/-]+)?/, require('./beijing/bphc'));
     router.get('/beijing/jw/tzgg', require('./beijing/jw/tzgg'));
     router.get('/beijing/kw/:channel', require('./beijing/kw/index'));
+    router.get('/chongqing/rsks', require('./chongqing/rsks'));
     router.get(/dianbai(\/[\w/-]+)?/, require('./dianbai/dianbai'));
     router.get(/gaozhou(\/[\w/-]+)?/, require('./gaozhou/gaozhou'));
     router.get('/guangdong/tqyb/sncsyjxh', require('./guangdong/tqyb/sncsyjxh'));
@@ -58,7 +65,8 @@ module.exports = function (router) {
     router.get('/shenzhen/hrss/szksy/:caty/:page?', require('./shenzhen/hrss/szksy/index'));
     router.get('/shenzhen/xxgk/zfxxgj/:caty', require('./shenzhen/xxgk/zfxxgj'));
     router.get('/shenzhen/zzb/:caty/:page?', require('./shenzhen/zzb/index'));
-    router.get('/sichuan/deyang/govpulicinfo/:countyName', require('./sichuan/deyang/govpulicinfo'));
+    router.get('/sichuan/deyang/govpublicinfo/:countyName/:infoType?', require('./sichuan/deyang/govpublicinfo'));
+    router.get('/sichuan/deyang/mztoday/:infoType?', require('./sichuan/deyang/mztoday'));
     router.get('/taiyuan/rsj/:caty/:page?', require('./taiyuan/rsj'));
     router.get('/wuhan/sy/whyw', require('./wuhan/whyw'));
     router.get(/xinyi(\/[\w/-]+)?/, require('./xinyi/xinyi'));

package/lib/v2/gov/sichuan/deyang/govpublicinfo.js

@@ -0,0 +1,92 @@
+const got = require('@/utils/got');
+const cheerio = require('cheerio');
+const { parseDate } = require('@/utils/parse-date');
+const { art } = require('@/utils/render');
+const path = require('path');
+const timezone = require('@/utils/timezone');
+
+// 各地区url信息
+const basicInfoDict = {
+    绵竹市: {
+        rootUrl: 'https://www.mz.gov.cn',
+        infoType: {
+            fdzdnr: {
+                basicUrl: 'https://www.mz.gov.cn/info/iList.jsp?node_id=GKmzs&cat_id=15971&cur_page=1',
+                name: '法定主动内容',
+            },
+            gsgg: {
+                basicUrl: 'https://www.mz.gov.cn/info/iList.jsp?node_id=GKmzs&cat_id=24186&cur_page=1',
+                name: '公示公告',
+            },
+        },
+    },
+};
+
+const getInfoUrlList = async (rootUrl, infoBasicUrl) => {
+    const response = await got(infoBasicUrl);
+    const $ = cheerio.load(response.data);
+    // 非当前日期文章计数，部分旧文章可能会置顶，目前为发现置顶数超过10
+    const infoList = $('body > div.container > div.ewb-white > div.ewb-job > ul > li')
+        .toArray()
+        .map((item) => ({
+            title: $('a', item).attr('title'),
+            url: `${rootUrl}${$('a', item).attr('href')}`,
+        }));
+    return infoList;
+};
+
+// 获取信息正文内容
+const getInfoContent = (ctx, rootUrl, item) =>
+    ctx.cache.tryGet(item.url, async () => {
+        const response = await got(item.url);
+        // 部分网页会跳转其他类型网站,则不解析，直接附超链接
+        try {
+            const $ = cheerio.load(response.data);
+            const fileList = $('#symbol > div:nth-child(4) > div > span > a')
+                .toArray()
+                .map((item) => ({
+                    name: $(item).text(),
+                    url: `${rootUrl}/${$(item).attr('href')}`,
+                }));
+            const rawDate = $('#symbol > div:nth-child(1) > div:nth-child(3)').text().split('：')[1].trim();
+            return {
+                title: $('#main').text().trim(),
+                id: $('#symbol > div:nth-child(1) > div:nth-child(1)').text().split('：')[1].trim(),
+                infoNum: $('#symbol > div:nth-child(1) > div:nth-child(2) > span').text().split('：')[1].trim(),
+                pubDate: parseDate(timezone(rawDate, +8)),
+                date: rawDate,
+                keyWord: $('#symbol > div:nth-child(2) > div:nth-child(3)').text().split('：')[1].trim(),
+                source: $('#symbol > div:nth-child(2) > div:nth-child(2)').text().split('：')[1].trim(),
+                content: $('#container > div.ewb-white > div.ewb-article-detail').html(),
+                file: fileList,
+                link: item.url,
+                _isCompleteInfo: true,
+            };
+        } catch (err) {
+            return {
+                title: item.title,
+                link: item.url,
+                _isCompleteInfo: false,
+            };
+        }
+    });
+
+module.exports = async (ctx) => {
+    const countyName = ctx.params.countyName;
+    const infoType = ctx.params.infoType || 'fdzdnr';
+    const infoBasicUrl = basicInfoDict[countyName].infoType[infoType].basicUrl;
+    const rootUrl = basicInfoDict[countyName].rootUrl;
+    const infoUrlList = await getInfoUrlList(rootUrl, infoBasicUrl);
+    const items = await Promise.all(infoUrlList.map((item) => getInfoContent(ctx, rootUrl, item)));
+
+    ctx.state.data = {
+        title: `政府公开信息-${countyName}-${basicInfoDict[countyName].infoType[infoType].name}`,
+        link: infoBasicUrl,
+        item: items.map((item) => ({
+            title: item.title,
+            description: art(path.join(__dirname, './templates/govPublicInfo.art'), { item }),
+            link: item.link,
+            pubDate: item.pubDate,
+        })),
+    };
+};