rsshub 1.0.0-master.f71451d → 1.0.0-master.f75997f

package/lib/routes/jou/utils/index.ts

@@ -1,26 +1,22 @@
 import cache from '@/utils/cache';
-// 导入got库，该库用来请求网页数据
-import got from '@/utils/got';
-// 导入cheerio库，该库用来解析网页数据
+import ofetch from '@/utils/ofetch'; // 使用ofetch库
 import { load } from 'cheerio';
-// 导入parseDate函数，该函数用于日期处理
 import { parseDate } from '@/utils/parse-date';
-// 导入timezone库，该库用于时区处理
 import timezone from '@/utils/timezone';
 
 async function getItems(ctx, url, host, tableClass, timeStyleClass1, titleStyleClass, timeStyleClass2) {
-    // 发起Http请求，获取网页数据
-    const response = await got({ url, https: { rejectUnauthorized: false } });
-    // 解析网页数据
-    const $ = load(response.data);
+    const response = await ofetch(url).catch(() => null);
+    if (!response) {
+        return [];
+    }
+    const $ = load(response);
 
-    // 通知公告的items的标题、url链接、发布日期
     const list = $(`table.${tableClass} > tbody > tr[height=20]`)
         .toArray()
         .map((item) => {
-            const currentItem = $(item); // 获取当前tr元素的jQuery对象
-            const item1 = currentItem.find('td:eq(1)'); // 获取当前tr元素下的第二个td
-            const item2 = currentItem.find('td:eq(2)'); // 获取当前tr元素下的第三个td
+            const currentItem = $(item);
+            const item1 = currentItem.find('td:eq(1)');
+            const item2 = currentItem.find('td:eq(2)');
             const link = new URL(item1.find('a').attr('href'), host).href;
 
             return {
@@ -32,22 +28,36 @@ async function getItems(ctx, url, host, tableClass, timeStyleClass1, titleStyleC
 
     const out = await Promise.all(
         list.map((item) =>
-            // 使用缓存
             cache.tryGet(item.link, async () => {
-                const response = await got({ url: item.link, https: { rejectUnauthorized: false } });
-                if (response.redirectUrls.length) {
-                    item.link = response.redirectUrls[0];
+                const response = await ofetch(item.link).catch(() => null);
+                if (!response || (response.status >= 300 && response.status < 400)) {
+                    // 响应为空或状态码表明发生了重定向
+                    return {
+                        ...item,
+                        description: '该通知无法直接预览，请点击原文链接↑查看',
+                    };
+                }
+                const $ = load(response);
+
+                item.title = $(`.${titleStyleClass}`).text();
+                const hasEmbeddedPDFScript = $('script:contains("showVsbpdfIframe")').length > 0;
+
+                if (hasEmbeddedPDFScript) {
                     item.description = '该通知无法直接预览，请点击原文链接↑查看';
                 } else {
-                    const $ = load(response.data);
-                    item.title = $(`.${titleStyleClass}`).text();
-                    item.description = $('.v_news_content')
-                        .html()
-                        .replaceAll('src="/', `src="${new URL('.', host).href}`)
-                        .replaceAll('href="/', `href="${new URL('.', host).href}`)
-                        .trim();
-                    item.pubDate = timezone(parseDate($(`.${timeStyleClass2}`).text().replace('发布时间：', '')), +8);
+                    const contentHtml = $('.v_news_content').html();
+                    const $content = load(contentHtml);
+                    $content('a').each(function () {
+                        const a = $(this);
+                        const href = a.attr('href');
+                        if (href && !href.startsWith('http')) {
+                            a.attr('href', new URL(href, host).href);
+                        }
+                    });
+                    item.description = $content.html();
                 }
+                item.pubDate = timezone(parseDate($(`.${timeStyleClass2}`).text().replace('发布时间：', '')), +8);
+
                 return item;
             })
         )

package/lib/routes/lofter/tag.ts

@@ -18,7 +18,7 @@ export const route: Route = {
         supportScihub: false,
     },
     name: 'Tag',
-    maintainers: ['hoilc', 'nczitzk'],
+    maintainers: ['hoilc', 'nczitzk', 'LucunJi'],
     handler,
     description: `| new  | date | week | month | total |
   | ---- | ---- | ---- | ----- | ----- |
@@ -38,7 +38,7 @@ async function handler(ctx) {
     const response = await got({
         method: 'post',
         url: apiUrl,
-        form: {
+        body: new URLSearchParams({
             callCount: 1,
             scriptSessionId: '${scriptSessionId}187',
             httpSessionId: '',
@@ -55,7 +55,7 @@ async function handler(ctx) {
             'c0-param7': `number:${startingIndex}`,
             'c0-param8': 'number:0',
             batchId: 493053,
-        },
+        }),
     });
 
     const dom = new JSDOM(

package/lib/routes/lofter/user.ts

@@ -18,7 +18,7 @@ export const route: Route = {
         supportScihub: false,
     },
     name: 'User',
-    maintainers: ['hondajojo', 'nczitzk'],
+    maintainers: ['hondajojo', 'nczitzk', 'LucunJi'],
     handler,
 };
 
@@ -34,7 +34,7 @@ async function handler(ctx) {
     const response = await got({
         method: 'post',
         url: `http://api.lofter.com/v2.0/blogHomePage.api?product=lofter-iphone-10.0.0`,
-        form: {
+        body: new URLSearchParams({
             blogdomain: rootUrl,
             checkpwd: '1',
             following: '0',
@@ -44,7 +44,7 @@ async function handler(ctx) {
             offset: '0',
             postdigestnew: '1',
             supportposttypes: '1,2,3,4,5,6',
-        },
+        }),
     });
 
     if (!response.data.response || response.data.response.posts.length === 0) {

package/lib/routes/njxzc/utils/index.ts

@@ -1,12 +1,15 @@
 import cache from '@/utils/cache';
-import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
+import ofetch from '@/utils/ofetch'; // 使用默认导出的方式导入ofetch
 
 async function getNoticeList(ctx, url, host, titleSelector, dateSelector, contentSelector, listSelector) {
-    const response = await got(url);
-    const $ = load(response.data);
+    const response = await ofetch(url).catch(() => null);
+    if (!response) {
+        return [];
+    }
+    const $ = load(response);
 
     const list = $(listSelector)
         .toArray()
@@ -22,20 +25,35 @@ async function getNoticeList(ctx, url, host, titleSelector, dateSelector, conten
     const out = await Promise.all(
         list.map((item) =>
             cache.tryGet(item.link, async () => {
-                const response = await got(item.link);
-                if (response.redirectUrls.length) {
-                    item.link = response.redirectUrls[0];
+                const response = await ofetch(item.link).catch(() => null);
+                if (!response || (response.status >= 300 && response.status < 400)) {
+                    return {
+                        ...item,
+                        description: '该通知无法直接预览，请点击原文链接↑查看',
+                    };
+                }
+                const $ = load(response);
+
+                if ($('.wp_error_msg').length > 0) {
+                    item.description = '您当前ip并非校内地址，该信息仅允许校内地址访问';
+                } else if ($('.wp_pdf_player').length > 0) {
                     item.description = '该通知无法直接预览，请点击原文链接↑查看';
                 } else {
-                    const $ = load(response.data);
+                    const contentHtml = $(contentSelector.content).html();
+                    const $content = load(contentHtml);
+                    $content('a').each(function () {
+                        const a = $(this);
+                        const href = a.attr('href');
+                        if (href && !href.startsWith('http')) {
+                            a.attr('href', new URL(href, host).href);
+                        }
+                    });
+                    item.description = $content.html();
                     item.title = $(contentSelector.title).text();
-                    item.description = $(contentSelector.content)
-                        .html()
-                        .replaceAll('src="/', `src="${new URL('.', host).href}`)
-                        .replaceAll('href="/', `href="${new URL('.', host).href}`)
-                        .trim();
-                    item.pubDate = timezone(parseDate($(contentSelector.date).text().replace('编辑：', '').replace('发布日期：', '').replace('发布时间：', '')), +8);
+                    const dateText = $(contentSelector.date).text().replace('编辑：', '').replace('发布日期：', '').replace('发布时间：', '');
+                    item.pubDate = timezone(parseDate(dateText, 'YYYY-MM-DD'), +8);
                 }
+
                 return item;
             })
         )

package/lib/routes/qingting/podcast.ts

@@ -1,9 +1,12 @@
-import { Route } from '@/types';
+import type { DataItem, Route } from '@/types';
 import cache from '@/utils/cache';
 import crypto from 'crypto';
 import got from '@/utils/got';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
+import { config } from '@/config';
+
+const qingtingId = config.qingting.id ?? '';
 
 export const route: Route = {
     path: '/podcast/:id',
@@ -11,12 +14,14 @@ export const route: Route = {
     example: '/qingting/podcast/293411',
     parameters: { id: '专辑id, 可在专辑页 URL 中找到' },
     features: {
-        requireConfig: false,
-        requirePuppeteer: false,
-        antiCrawler: false,
-        supportBT: false,
         supportPodcast: true,
-        supportScihub: false,
+        requireConfig: [
+            {
+                name: 'QINGTING_ID',
+                optional: true,
+                description: '用户id， 部分专辑需要会员身份，用户id可以通过从网页端登录蜻蜓fm后使用开发者工具，在控制台中运行JSON.parse(localStorage.getItem("user")).qingting_id获取',
+            },
+        ],
     },
     radar: [
         {
@@ -29,21 +34,35 @@ export const route: Route = {
     description: `获取的播放 URL 有效期只有 1 天，需要开启播客 APP 的自动下载功能。`,
 };
 
+function getMediaUrl(channelId: string, mediaId: string) {
+    const path = `/audiostream/redirect/${channelId}/${mediaId}?access_token=&device_id=MOBILESITE&qingting_id=${qingtingId}&t=${Date.now()}`;
+    const sign = crypto.createHmac('md5', 'fpMn12&38f_2e').update(path).digest('hex').toString();
+    return `https://audio.qingting.fm${path}&sign=${sign}`;
+}
+
 async function handler(ctx) {
-    const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.req.param('id')}`;
-    let response = await got({
+    const channelId = ctx.req.param('id');
+
+    const channelUrl = `https://i.qingting.fm/capi/v3/channel/${channelId}`;
+    const response = await got({
         method: 'get',
         url: channelUrl,
         headers: {
             Referer: 'https://www.qingting.fm/',
         },
     });
+
     const title = response.data.data.title;
     const channel_img = response.data.data.thumbs['400_thumb'];
     const authors = response.data.data.podcasters.map((author) => author.nick_name).join(',');
     const desc = response.data.data.description;
-    const programUrl = `https://i.qingting.fm/capi/channel/${ctx.req.param('id')}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`;
-    response = await got({
+    const programUrl = `https://i.qingting.fm/capi/channel/${channelId}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`;
+
+    const {
+        data: {
+            data: { programs },
+        },
+    } = await got({
         method: 'get',
         url: programUrl,
         headers: {
@@ -51,45 +70,48 @@ async function handler(ctx) {
         },
     });
 
+    const {
+        data: { data: channelInfo },
+    } = await got(`https://i.qingting.fm/capi/v3/channel/${channelId}?user_id=${qingtingId}`);
+
+    const isCharged = channelInfo.purchase?.item_type !== 0;
+
+    const isPaid = channelInfo.user_relevance?.sale_status === 'paid';
+
     const resultItems = await Promise.all(
-        response.data.data.programs.map((item) =>
-            cache.tryGet(`qingting:podcast:${ctx.req.param('id')}:${item.id}`, async () => {
-                const link = `https://www.qingting.fm/channels/${ctx.req.param('id')}/programs/${item.id}/`;
-
-                const path = `/audiostream/redirect/${ctx.req.param('id')}/${item.id}?access_token=&device_id=MOBILESITE&qingting_id=&t=${Date.now()}`;
-                const sign = crypto.createHmac('md5', 'fpMn12&38f_2e').update(path).digest('hex').toString();
-
-                const [detailRes, mediaRes] = await Promise.all([
-                    got({
-                        method: 'get',
-                        url: link,
-                        headers: {
-                            Referer: 'https://www.qingting.fm/',
-                        },
-                    }),
-                    got({
-                        method: 'get',
-                        url: `https://audio.qingting.fm${path}&sign=${sign}`,
-                        headers: {
-                            Referer: 'https://www.qingting.fm/',
-                        },
-                    }),
-                ]);
+        programs.map(async (item) => {
+            const data = (await cache.tryGet(`qingting:podcast:${channelId}:${item.id}`, async () => {
+                const link = `https://www.qingting.fm/channels/${channelId}/programs/${item.id}/`;
+
+                const detailRes = await got({
+                    method: 'get',
+                    url: link,
+                    headers: {
+                        Referer: 'https://www.qingting.fm/',
+                    },
+                });
 
                 const detail = JSON.parse(detailRes.data.match(/},"program":(.*?),"plist":/)[1]);
 
-                return {
+                const rssItem = {
                     title: item.title,
                     link,
                     itunes_item_image: item.cover,
                     itunes_duration: item.duration,
                     pubDate: timezone(parseDate(item.update_time), +8),
                     description: detail.richtext,
-                    enclosure_url: mediaRes.url,
-                    enclosure_type: 'audio/x-m4a',
                 };
-            })
-        )
+
+                return rssItem;
+            })) as DataItem;
+
+            if (!isCharged || isPaid || item.isfree) {
+                data.enclosure_url = getMediaUrl(channelId, item.id);
+                data.enclosure_type = 'audio/x-m4a';
+            }
+
+            return data;
+        })
     );
 
     return {
@@ -97,7 +119,7 @@ async function handler(ctx) {
         description: desc,
         itunes_author: authors,
         image: channel_img,
-        link: `https://www.qingting.fm/channels/${ctx.req.param('id')}`,
+        link: `https://www.qingting.fm/channels/${channelId}`,
         item: resultItems,
     };
 }

package/lib/routes/reuters/common.ts

@@ -64,13 +64,13 @@ export const route: Route = {
 };
 
 async function handler(ctx) {
-    const MUST_FETCH_BY_TOPICS = new Set(['authors']);
+    const MUST_FETCH_BY_TOPICS = new Set(['authors', 'tags']);
     const CAN_USE_SOPHI = ['world'];
 
     const category = ctx.req.param('category');
     const topic = ctx.req.param('topic') ?? (category === 'authors' ? 'reuters' : '');
     const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 20;
-    const useSophi = ctx.req.query('sophi') === 'true' && 'topic' !== '' && CAN_USE_SOPHI.includes(category);
+    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 () => {

package/lib/routes/sara/index.ts

@@ -0,0 +1,66 @@
+import { Route, DataItem } from '@/types';
+import cache from '@/utils/cache';
+import { load } from 'cheerio';
+import { ofetch } from 'ofetch';
+
+const typeMap = {
+    dynamic: '协会动态',
+    announcement: '通知公告',
+    industry: '行业动态',
+};
+
+export const route: Route = {
+    path: '/:type',
+    categories: ['government'],
+    example: '/sara/announcement',
+    parameters: { type: 'dynamic | announcement | industry' },
+    features: {
+        requireConfig: false,
+        requirePuppeteer: false,
+        antiCrawler: false,
+        supportBT: false,
+        supportPodcast: false,
+        supportScihub: false,
+    },
+    description: `| 协会动态 | 通知公告 |行业动态 |
+    | -------- | ------------ | -------- |
+    | dynamic | announcement | industry |`,
+
+    name: '新闻资讯',
+    maintainers: ['HChenZi'],
+    handler: async (ctx) => {
+        const baseUrl = 'http://www.sara.org.cn';
+        const type = ctx.req.param('type');
+
+        const url = `${baseUrl}/news/${type}.htm`;
+        const response = await ofetch(url);
+        const $ = load(response);
+        const list = $('.newsItem_total > dd')
+            .toArray()
+            .map((item) => {
+                const a = $(item).find('a').first();
+                return {
+                    link: `${baseUrl}${a.attr('href')}`,
+                    title: a.attr('title'),
+                };
+            });
+        const items = (await Promise.all(list.map(getFeedItem))) as DataItem[];
+        return {
+            title: typeMap[type],
+            link: url,
+            item: items,
+        };
+    },
+};
+
+async function getFeedItem(item) {
+    return await cache.tryGet(item.link, async () => {
+        const response = await ofetch(item.link);
+        const $ = load(response);
+        return {
+            description: $('.text').html(),
+            language: 'zh-cn',
+            ...item,
+        };
+    });
+}

package/lib/routes/sara/namespace.ts

@@ -0,0 +1,6 @@
+import type { Namespace } from '@/types';
+
+export const namespace: Namespace = {
+    name: '上海业余无线电协会',
+    url: 'www.sara.org.cn',
+};

package/lib/routes/tencent/news/author.ts

@@ -68,17 +68,19 @@ async function handler(ctx) {
                               .text()
                               .match(/window\.DATA = ({.+});/)[1]
                       );
-                      const $data = load(data.originContent.text, null, false);
-
-                      $data('*')
-                          .contents()
-                          .filter((_, elem) => elem.type === 'comment')
-                          .replaceWith((_, elem) =>
-                              art(path.join(__dirname, '../templates/news/image.art'), {
-                                  attribute: elem.data.trim(),
-                                  originAttribute: data.originAttribute,
-                              })
-                          );
+                      const $data = load(data.originContent?.text || '', null, false);
+                      if ($data) {
+                          // Not video page
+                          $data('*')
+                              .contents()
+                              .filter((_, elem) => elem.type === 'comment')
+                              .replaceWith((_, elem) =>
+                                  art(path.join(__dirname, '../templates/news/image.art'), {
+                                      attribute: elem.data.trim(),
+                                      originAttribute: data.originAttribute,
+                                  })
+                              );
+                      }
 
                       return {
                           title,

package/lib/routes/test/index.ts

@@ -3,13 +3,14 @@ import { config } from '@/config';
 import got from '@/utils/got';
 import wait from '@/utils/wait';
 import cache from '@/utils/cache';
+import { fetchArticle } from '@/utils/wechat-mp';
 import ConfigNotFoundError from '@/errors/types/config-not-found';
 import InvalidParameterError from '@/errors/types/invalid-parameter';
 
 let cacheIndex = 0;
 
 export const route: Route = {
-    path: '/:id',
+    path: '/:id/:params?',
     name: 'Unknown',
     maintainers: ['DIYgod', 'NeverBehave'],
     handler,
@@ -384,6 +385,15 @@ async function handler(ctx) {
         ];
     }
 
+    if (ctx.req.param('id') === 'wechat-mp') {
+        const params = ctx.req.param('params');
+        if (!params) {
+            throw new InvalidParameterError('Invalid parameter');
+        }
+        const mpUrl = 'https:/mp.weixin.qq.com/s' + (params.includes('&') ? '?' : '/') + params;
+        item = [await fetchArticle(mpUrl)];
+    }
+
     return {
         title: `Test ${ctx.req.param('id')}`,
         itunes_author: ctx.req.param('id') === 'enclosure' ? 'DIYgod' : null,

package/lib/routes/twitter/api/mobile-api/login.ts

@@ -6,12 +6,14 @@ import ofetch from '@/utils/ofetch';
 import crypto from 'crypto';
 import { config } from '@/config';
 import { v5 as uuidv5 } from 'uuid';
+import { authenticator } from 'otplib';
 import logger from '@/utils/logger';
 import cache from '@/utils/cache';
 
 const NAMESPACE = 'd41d092b-b007-48f7-9129-e9538d2d8fe9';
 const username = config.twitter.username;
 const password = config.twitter.password;
+const authenticationSecret = config.twitter.authenticationSecret;
 
 let authentication = null;
 
@@ -133,38 +135,37 @@ async function login() {
             });
             logger.debug('Twitter login 5 finished: AccountDuplicationCheck.');
 
-            for (const subtask of task4.data?.subtasks || []) {
+            for await (const subtask of task4.data?.subtasks || []) {
                 if (subtask.open_account) {
                     authentication = subtask.open_account;
                     break;
                 } else if (subtask.subtask_id === 'LoginTwoFactorAuthChallenge') {
-                    // const token = authenticator.generate(authenticationSecret);
-
-                    // // eslint-disable-next-line no-await-in-loop
-                    // const task5 = await got.post('https://api.twitter.com/1.1/onboarding/task.json', {
-                    //     headers,
-                    //     json: {
-                    //         flow_token: task4.data.flow_token,
-                    //         subtask_inputs: [
-                    //             {
-                    //                 enter_text: {
-                    //                     suggestion_id: null,
-                    //                     text: token,
-                    //                     link: 'next_link',
-                    //                 },
-                    //                 subtask_id: 'LoginTwoFactorAuthChallenge',
-                    //             },
-                    //         ],
-                    //     },
-                    // });
-                    // logger.debug('Twitter login 6 finished: LoginTwoFactorAuthChallenge.');
-
-                    // for (const subtask of task5.data?.subtasks || []) {
-                    //     if (subtask.open_account) {
-                    //         authentication = subtask.open_account;
-                    //         break;
-                    //     }
-                    // }
+                    const token = authenticator.generate(authenticationSecret);
+
+                    const task5 = await got.post('https://api.twitter.com/1.1/onboarding/task.json', {
+                        headers,
+                        json: {
+                            flow_token: task4.data.flow_token,
+                            subtask_inputs: [
+                                {
+                                    enter_text: {
+                                        suggestion_id: null,
+                                        text: token,
+                                        link: 'next_link',
+                                    },
+                                    subtask_id: 'LoginTwoFactorAuthChallenge',
+                                },
+                            ],
+                        },
+                    });
+                    logger.debug('Twitter login 6 finished: LoginTwoFactorAuthChallenge.');
+
+                    for (const subtask of task5.data?.subtasks || []) {
+                        if (subtask.open_account) {
+                            authentication = subtask.open_account;
+                            break;
+                        }
+                    }
                     break;
                 }
             }

package/lib/routes/twitter/namespace.ts

@@ -40,8 +40,8 @@ generates
 
 Currently supports two authentication methods:
 
-- Using TWITTER_COOKIE (recommended): Configure the cookies of logged-in Twitter Web, at least including the fields auth_token and ct0. RSSHub will use this information to directly access Twitter's web API to obtain data.
+- Using \`TWITTER_COOKIE\` (recommended): Configure the cookies of logged-in Twitter Web, at least including the fields auth_token and ct0. RSSHub will use this information to directly access Twitter's web API to obtain data.
 
-- Using TWITTER_USERNAME TWITTER_PASSWORD: Configure the Twitter username and password. RSSHub will use this information to log in to Twitter and obtain data using the mobile API. Please note that if you have not logged in with the current IP address before, it is easy to trigger Twitter's risk control mechanism.
+- Using \`TWITTER_USERNAME\` \`TWITTER_PASSWORD\` and \`TWITTER_AUTHENTICATION_SECRET\`: Configure the Twitter username and password. RSSHub will use this information to log in to Twitter and obtain data using the mobile API. Please note that if you have not logged in with the current IP address before, it is easy to trigger Twitter's risk control mechanism.
 `,
 };

package/lib/routes/twitter/user.ts

@@ -21,6 +21,11 @@ export const route: Route = {
                 name: 'TWITTER_PASSWORD',
                 description: 'Please see above for details.',
             },
+            {
+                name: 'TWITTER_AUTHENTICATION_SECRET',
+                description: 'TOTP 2FA secret, please see above for details.',
+                optional: true,
+            },
             {
                 name: 'TWITTER_COOKIE',
                 description: 'Please see above for details.',

package/lib/routes/u3c3/index.ts

@@ -6,7 +6,7 @@ import { load } from 'cheerio';
 export const route: Route = {
     path: ['/search/:keyword/:preview?', '/:type?/:preview?'],
     categories: ['multimedia'],
-    example: '/u9a9/search/新片速递',
+    example: '/u3c3/search/新片速递',
     parameters: { keyword: 'Search keyword', preview: 'Show image preview, off by default, non empty value means on' },
     features: {
         requireConfig: false,

package/lib/routes/u3c3/namespace.ts

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