feat: v3 migration - 5/n

lib/v2/19lou/index.js

@@ -4,7 +4,7 @@ import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 const iconv = require('iconv-lite');
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 const setCookie = function (cookieName, cookieValue, seconds, path, domain, secure) {
     let expires = null;

lib/v2/591/list.js

@@ -5,7 +5,7 @@ import { load } from 'cheerio';
 
 import got from '@/utils/got';
 import { art } from '@/utils/render';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 const cookieJar = new CookieJar();
 

lib/v2/9to5/subsite.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 const utils = require('./utils');
 
 module.exports = async (ctx) => {

lib/v2/aiea/index.js

@@ -1,4 +1,4 @@
-const buildData = require('@/utils/common-config');
+import buildData from '@/utils/common-config';
 
 module.exports = async (ctx) => {
     const link = 'http://www.aiea.org/0504';

lib/v2/aip/journal-pupp.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import { load } from 'cheerio';
 const { puppeteerGet, renderDesc } = require('./utils');
 import { config } from '@/config';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 import puppeteer from '@/utils/puppeteer';
 
 module.exports = async (ctx) => {

lib/v2/airchina/index.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const buildData = require('@/utils/common-config');
+import buildData from '@/utils/common-config';
 const baseUrl = 'https://www.airchina.com.cn';
 
 module.exports = async (ctx) => {

lib/v2/apkpure/versions.js

@@ -1,5 +1,5 @@
 import { load } from 'cheerio';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { parseDate } from '@/utils/parse-date';
 import puppeteer from '@/utils/puppeteer';
 

lib/v2/bangumi/tv/subject/comments.js

@@ -1,6 +1,6 @@
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 
 module.exports = async (subjectID, minLength) => {
     // bangumi.tv未提供获取“吐槽（comments）”的API，因此仍需要通过抓取网页来获取

lib/v2/bangumi/tv/subject/index.js

@@ -1,7 +1,7 @@
 const getComments = require('./comments.js');
 const getFromAPI = require('./offcial-subject-api.js');
 const getEps = require('./ep.js');
-const { queryToBoolean } = require('@/utils/readable-social');
+import { queryToBoolean } from '@/utils/readable-social';
 
 module.exports = async (ctx) => {
     const id = ctx.req.param('id');

lib/v2/bbc/index.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import { load } from 'cheerio';
 const utils = require('./utils');
 

lib/v2/bendibao/news.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const city = ctx.req.param('city');

lib/v2/bilibili/cache.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 const utils = require('./utils');
 import { load } from 'cheerio';
 import { config } from '@/config';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 
 module.exports = {
     getCookie: () => {

lib/v2/bilibili/dynamic.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 const JSONbig = require('json-bigint');
 const utils = require('./utils');
 import { parseDate } from '@/utils/parse-date';
-const { fallback, queryToBoolean } = require('@/utils/readable-social');
+import { fallback, queryToBoolean } from '@/utils/readable-social';
 const cacheIn = require('./cache');
 
 /**

lib/v2/bilibili/followings-dynamic.js

@@ -3,7 +3,7 @@ const cache = require('./cache');
 import { config } from '@/config';
 const utils = require('./utils');
 const JSONbig = require('json-bigint');
-const { fallback, queryToBoolean } = require('@/utils/readable-social');
+import { fallback, queryToBoolean } from '@/utils/readable-social';
 const querystring = require('querystring');
 
 module.exports = async (ctx) => {

lib/v2/bilibili/video.js

@@ -1,7 +1,7 @@
 import got from '@/utils/got';
 const cache = require('./cache');
 const utils = require('./utils');
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 
 module.exports = async (ctx) => {
     const uid = ctx.req.param('uid');

lib/v2/bilibili/vsearch.js

@@ -5,7 +5,7 @@ import { parseDate } from '@/utils/parse-date';
 const utils = require('./utils');
 const { CookieJar } = require('tough-cookie');
 const cookieJar = new CookieJar();
-const { queryToBoolean } = require('@/utils/readable-social');
+import { queryToBoolean } from '@/utils/readable-social';
 
 module.exports = async (ctx) => {
     const kw = ctx.req.param('kw');

lib/v2/bing/search.js

@@ -1,4 +1,4 @@
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import { parseDate } from '@/utils/parse-date';
 const dayjs = require('dayjs');
 const localizedFormat = require('dayjs/plugin/localizedFormat');

lib/v2/bloomberg/authors.js

@@ -1,6 +1,6 @@
 import { load } from 'cheerio';
 import got from '@/utils/got';
-const rssParser = require('@/utils/rss-parser');
+import rssParser from '@/utils/rss-parser';
 const { asyncPoolAll, parseArticle } = require('./utils');
 
 const parseAuthorNewsList = async (slug) => {

lib/v2/brooklynmuseum/exhibitions.js

@@ -1,4 +1,4 @@
-const buildData = require('@/utils/common-config');
+import buildData from '@/utils/common-config';
 
 module.exports = async (ctx) => {
     let link;

lib/v2/caixin/blog.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 import { parseDate } from '@/utils/parse-date';
 const { parseBlogArticle } = require('./utils');
 

lib/v2/caixin/category.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 const { parseArticle } = require('./utils');

lib/v2/chinathinktanks/viewpoint.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 const { CookieJar } = require('tough-cookie');
 

lib/v2/cnbc/rss.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 
 module.exports = async (ctx) => {
     const { id = '100003114' } = ctx.params;

lib/v2/csdn/blog.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const rssParser = require('@/utils/rss-parser');
+import rssParser from '@/utils/rss-parser';
 
 module.exports = async (ctx) => {
     const user = ctx.req.param('user');

lib/v2/cw/utils.js

@@ -1,8 +1,8 @@
 import cache from '@/utils/cache';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-const { getCookies, setCookies } = require('@/utils/puppeteer-utils');
-const logger = require('@/utils/logger');
+import { getCookies, setCookies } from '@/utils/puppeteer-utils';
+import logger from '@/utils/logger';
 let cookie;
 
 const baseUrl = 'https://www.cw.com.tw';

lib/v2/dayanzai/index.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 
 const rootUrl = 'http://www.dayanzai.me/';

lib/v2/deepmind/blog.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 
 module.exports = async (ctx) => {
     const feed = await parser.parseURL('https://www.deepmind.com/blog/rss.xml');

lib/v2/discourse/posts.js

@@ -1,6 +1,6 @@
 const { getConfig } = require('./utils');
 import got from '@/utils/got';
-const RSSParser = require('@/utils/rss-parser');
+import RSSParser from '@/utils/rss-parser';
 
 module.exports = async (ctx) => {
     const { link, key } = getConfig(ctx);

lib/v2/dnaindia/category.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 
 module.exports = async (ctx) => {
     const { category, topic } = ctx.params;

lib/v2/douban/other/list.js

@@ -1,7 +1,7 @@
 import got from '@/utils/got';
 const path = require('path');
 import { art } from '@/utils/render';
-const { fallback, queryToInteger } = require('@/utils/readable-social');
+import { fallback, queryToInteger } from '@/utils/readable-social';
 
 module.exports = async (ctx) => {
     const type = ctx.req.param('type') || 'subject_real_time_hotest';

lib/v2/douban/other/recommended.js

@@ -1,7 +1,7 @@
 import got from '@/utils/got';
 const path = require('path');
 import { art } from '@/utils/render';
-const { fallback, queryToInteger } = require('@/utils/readable-social');
+import { fallback, queryToInteger } from '@/utils/readable-social';
 
 module.exports = async (ctx) => {
     const subjectType = ctx.req.param('type') || 'tv';

lib/v2/douban/people/status.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 const querystring = require('querystring');
 import got from '@/utils/got';
-const { fallback, queryToBoolean, queryToInteger } = require('@/utils/readable-social');
+import { fallback, queryToBoolean, queryToInteger } from '@/utils/readable-social';
 import { config } from '@/config';
 
 const headers = { Referer: `https://m.douban.com/` };

lib/v2/douyin/hashtag.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import { config } from '@/config';
-const { fallback, queryToBoolean } = require('@/utils/readable-social');
+import { fallback, queryToBoolean } from '@/utils/readable-social';
 const { templates, resolveUrl, proxyVideo, getOriginAvatar } = require('./utils');
 import puppeteer from '@/utils/puppeteer';
 

lib/v2/douyin/live.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import { config } from '@/config';
 const { getOriginAvatar } = require('./utils');
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import puppeteer from '@/utils/puppeteer';
 
 module.exports = async (ctx) => {

lib/v2/douyin/user.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import { config } from '@/config';
-const { fallback, queryToBoolean } = require('@/utils/readable-social');
+import { fallback, queryToBoolean } from '@/utils/readable-social';
 const { templates, resolveUrl, proxyVideo, getOriginAvatar, universalGet } = require('./utils');
 
 module.exports = async (ctx) => {

lib/v2/douyin/utils.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 const path = require('path');
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { config } from '@/config';
 import puppeteer from '@/utils/puppeteer';
 

lib/v2/dut/index.js

@@ -4,7 +4,7 @@ import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 const defaults = require('./defaults');
 const shortcuts = require('./shortcuts');
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const site = ctx.params[0] ?? 'news';

lib/v2/eagle/blog.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 const cateList = new Set(['all', 'design-resources', 'learn-design', 'inside-eagle']);
 
 module.exports = async (ctx) => {

lib/v2/eastday/sh.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 

lib/v2/economist/full.js

@@ -1,5 +1,5 @@
 import cache from '@/utils/cache';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 

lib/v2/ehentai/ehapi.js

@@ -1,5 +1,5 @@
 import got from '@/utils/got';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import timezone from '@/utils/timezone';
 import { load } from 'cheerio';
 const path = require('path');

lib/v2/elasticsearch-cn/index.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 
 module.exports = async (ctx) => {
     const params = ctx.req.param('params') ?? '';

lib/v2/eprice/rss.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';

lib/v2/ff14/ff14-global.js

@@ -2,7 +2,7 @@ import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 const path = require('path');
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const lang = ctx.req.param('lang');

lib/v2/finology/most-viewed.js

@@ -1,4 +1,4 @@
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 const { getItems } = require('./utils');
 
 module.exports = async (ctx) => {

lib/v2/finology/tag.js

@@ -1,4 +1,4 @@
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 const { getItems } = require('./utils');
 
 module.exports = async (ctx) => {

lib/v2/fortnite/news.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import { parseDate } from '@/utils/parse-date';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import puppeteer from '@/utils/puppeteer';
 
 module.exports = async (ctx) => {

lib/v2/fortunechina/index.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 
 module.exports = async (ctx) => {
     const category = ctx.req.param('category') ?? '';

lib/v2/freewechat/profile.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
-const { fixArticleContent } = require('@/utils/wechat-mp');
+import { fixArticleContent } from '@/utils/wechat-mp';
 const baseUrl = 'https://freewechat.com';
 
 module.exports = async (ctx) => {

lib/v2/ft/myft.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import { load } from 'cheerio';
 
 module.exports = async (ctx) => {

lib/v2/ft/utils.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import { load } from 'cheerio';
 
 const ProcessFeed = (i, $, link) => {

lib/v2/gameapps/index.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';

lib/v2/gamme/category.js

@@ -1,8 +1,8 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const parser = require('@/utils/rss-parser');
-const { isValidHost } = require('@/utils/valid-host');
+import parser from '@/utils/rss-parser';
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const { domain = 'news', category } = ctx.params;

lib/v2/gamme/tag.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const { domain = 'news', tag } = ctx.params;

lib/v2/gelonghui/utils.js

@@ -1,6 +1,6 @@
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 
 const parseItem = (item, tryGet) =>

lib/v2/gov/general/general.js

@@ -186,7 +186,7 @@ const gdgov = async (info, ctx) => {
                     };
                 });
             } else if (idlink.host === 'mp.weixin.qq.com') {
-                const { finishArticleItem } = require('@/utils/wechat-mp');
+                import { finishArticleItem } from '@/utils/wechat-mp';
                 return finishArticleItem({ link });
             } else {
                 return cache.tryGet(link, async () => {

lib/v2/gov/moe/moe.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { parseDate } from '@/utils/parse-date';
 
 const moeUrl = 'https://www.moe.gov.cn/';

lib/v2/gov/news/index.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 

lib/v2/gov/nmpa/generic.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
-const { finishArticleItem } = require('@/utils/wechat-mp');
+import { finishArticleItem } from '@/utils/wechat-mp';
 import { config } from '@/config';
 const baseUrl = 'https://www.nmpa.gov.cn';
 import got from '@/utils/got';

lib/v2/gov/zhengce/zhengceku.js

@@ -1,4 +1,4 @@
-const buildData = require('@/utils/common-config');
+import buildData from '@/utils/common-config';
 
 module.exports = async (ctx) => {
     const department = ctx.req.param('department');

lib/v2/gumroad/index.js

@@ -2,7 +2,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { art } from '@/utils/render';
 const path = require('path');
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const username = ctx.req.param('username');

lib/v2/hkej/index.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
 import { art } from '@/utils/render';
 const path = require('path');

lib/v2/hoyolab/news.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 const path = require('path');

lib/v2/hrbeu/job/list.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-const { finishArticleItem } = require('@/utils/wechat-mp');
+import { finishArticleItem } from '@/utils/wechat-mp';
 const rootUrl = 'http://job.hrbeu.edu.cn';
 
 const idMap = {

lib/v2/hrbeu/uae/news.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-const { finishArticleItem } = require('@/utils/wechat-mp');
+import { finishArticleItem } from '@/utils/wechat-mp';
 
 module.exports = async (ctx) => {
     const id = ctx.req.param('id').replaceAll('-', '/');

lib/v2/huanqiu/index.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 function getKeysRecursive(dic, key, attr, array) {
     for (const v of Object.values(dic)) {

lib/v2/hupu/all.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 const path = require('path');
 

lib/v2/iiilab/index.js

@@ -1,4 +1,4 @@
-const buildData = require('@/utils/common-config');
+import buildData from '@/utils/common-config';
 const baseUrl = 'https://www.iiilab.com/';
 
 module.exports = async (ctx) => {

lib/v2/inoreader/rss.js

@@ -1,4 +1,4 @@
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import { load } from 'cheerio';
 
 module.exports = async (ctx) => {

lib/v2/instagram/private-api/index.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 const { ig, login } = require('./utils');
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { config } from '@/config';
 const { renderItems } = require('../common-utils');
 

lib/v2/instagram/private-api/utils.js

@@ -1,5 +1,5 @@
 const { IgApiClient } = require('instagram-private-api');
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { config } from '@/config';
 
 const ig = new IgApiClient();

lib/v2/iqiyi/video.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import { load } from 'cheerio';
 import { config } from '@/config';
 import { parseDate } from '@/utils/parse-date';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import puppeteer from '@/utils/puppeteer';
 
 // /iqiyi/user/video/:uid

lib/v2/itch/devlog.js

@@ -5,7 +5,7 @@ import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 const path = require('path');
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const user = ctx.req.param('user') ?? '';

lib/v2/jandan/index.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 
 module.exports = async (ctx) => {
     const rootUrl = 'http://i.jandan.net';

lib/v2/jewishmuseum/exhibitions.js

@@ -1,4 +1,4 @@
-const buildData = require('@/utils/common-config');
+import buildData from '@/utils/common-config';
 
 module.exports = async (ctx) => {
     const link = 'https://thejewishmuseum.org/exhibitions';

lib/v2/jike/topic.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 const { topicDataHanding } = require('./utils');
 import { load } from 'cheerio';
 const dayjs = require('dayjs');
-const { constructTopicEntry } = require('@/v2/jike/utils');
+const { constructTopicEntry } = require('./utils');
 
 const urlRegex = /(https?:\/\/[^\s"'<>]+)/g;
 

lib/v2/jsu/jwc.js

@@ -3,7 +3,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got'; // 自订的 got
 import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器
 import { parseDate } from '@/utils/parse-date';
-const { getPageItemAndDate } = require('@/v2/jsu/utils');
+const { getPageItemAndDate } = require('./utils');
 
 module.exports = async (ctx) => {
     const baseUrl = 'https://jwc.jsu.edu.cn/';

lib/v2/jsu/math.js

@@ -3,7 +3,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got'; // 自订的 got
 import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器
 import { parseDate } from '@/utils/parse-date';
-const { getPageItemAndDate } = require('@/v2/jsu/utils');
+const { getPageItemAndDate } = require('./utils');
 
 module.exports = async (ctx) => {
     const baseUrl = 'https://stxy.jsu.edu.cn/';

lib/v2/jsu/rjxy.js

@@ -3,7 +3,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got'; // 自订的 got
 import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器
 import { parseDate } from '@/utils/parse-date';
-const { getPageItemAndDate } = require('@/v2/jsu/utils');
+const { getPageItemAndDate } = require('./utils');
 
 module.exports = async (ctx) => {
     const baseUrl = 'https://rjxy.jsu.edu.cn/';

lib/v2/latepost/index.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 
 /**
  * Convert an array into a dictionary object.

lib/v2/line/utils.js

@@ -1,7 +1,7 @@
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 const baseUrl = 'https://today.line.me';
 
 const parseList = (items) =>

lib/v2/liveuamap/index.js

@@ -1,6 +1,6 @@
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     let region = ctx.req.param('region') ?? 'ukraine';

lib/v2/lofter/user.js

@@ -1,6 +1,6 @@
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const name = ctx.req.param('name') ?? 'i';

lib/v2/mail/imap.js

@@ -2,7 +2,7 @@ import cache from '@/utils/cache';
 const { ImapFlow } = require('imapflow');
 import { config } from '@/config';
 const { simpleParser } = require('mailparser');
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { parseDate } from '@/utils/parse-date';
 
 module.exports = async (ctx) => {

lib/v2/mangadex/index.js

@@ -1,12 +1,11 @@
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
-const { RequestInProgressError } = require('@/errors');
 
 module.exports = async (ctx) => {
     const { id, lang } = ctx.params;
     let { data } = await got.get(`https://api.mangadex.org/manga/${id}`);
     if (data.result === 'error') {
-        throw new RequestInProgressError(data.errors[0].detail);
+        throw new Error(data.errors[0].detail);
     }
     data = data.data;
     let title;
@@ -42,7 +41,7 @@ module.exports = async (ctx) => {
     }
     data = (await got.get(url)).data;
     if (data.result === 'error') {
-        throw new RequestInProgressError(data.errors[0].detail);
+        throw new Error(data.errors[0].detail);
     }
     ctx.set('data', {
         title: `${title} - MangaDex`,

lib/v2/medsci/index.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
-const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
+import { parseDate, parseRelativeDate } from '@/utils/parse-date';
 
 module.exports = async (ctx) => {
     let sid = ctx.req.param('sid') ?? '';

lib/v2/mingpao/index.js

@@ -1,11 +1,11 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 const path = require('path');
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 
 const renderFanBox = (media) =>
     art(path.join(__dirname, 'templates/fancybox.art'), {

lib/v2/mirror/index.js

@@ -4,7 +4,7 @@ const md = require('markdown-it')({
     html: true,
     linkify: true,
 });
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const id = ctx.req.param('id');

lib/v2/modb/topic.js

@@ -1,7 +1,7 @@
 import cache from '@/utils/cache';
 import { load } from 'cheerio';
 import got from '@/utils/got';
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 

lib/v2/mydrivers/cid.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import { parseDate } from '@/utils/parse-date';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 
 const { rootUrl, rootRSSUrl, title, categories, getInfo, processItems } = require('./util');
 

lib/v2/myfigurecollection/activity.js

@@ -4,7 +4,7 @@ import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 const path = require('path');
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 module.exports = async (ctx) => {
     const category = ctx.req.param('category') ?? '-1';

lib/v2/myfigurecollection/index.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { art } from '@/utils/render';
 const path = require('path');
-const { isValidHost } = require('@/utils/valid-host');
+import { isValidHost } from '@/utils/valid-host';
 
 const shortcuts = {
     potd: 'picture/browse/potd/',

lib/v2/newmuseum/exhibitions.js

@@ -1,4 +1,4 @@
-const buildData = require('@/utils/common-config');
+import buildData from '@/utils/common-config';
 
 module.exports = async (ctx) => {
     let link;

lib/v2/newrank/wechat.js

@@ -1,5 +1,5 @@
 import got from '@/utils/got';
-const { finishArticleItem } = require('@/utils/wechat-mp');
+import { finishArticleItem } from '@/utils/wechat-mp';
 import { load } from 'cheerio';
 const utils = require('./utils');
 import { config } from '@/config';

lib/v2/nikkei/cn/index.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 
 module.exports = async (ctx) => {
     let language = '';

lib/v2/notion/database.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 const { Client, isNotionClientError, APIErrorCode } = require('@notionhq/client');
-const logger = require('@/utils/logger');
+import logger from '@/utils/logger';
 import { config } from '@/config';
 import { parseDate } from '@/utils/parse-date';
 import got from '@/utils/got';

lib/v2/npr/full.js

@@ -1,5 +1,5 @@
 import cache from '@/utils/cache';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 

lib/v2/nua/utils.js

@@ -3,7 +3,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import timezone from '@/utils/timezone';
-const { fetchArticle } = require('@/utils/wechat-mp');
+import { fetchArticle } from '@/utils/wechat-mp';
 
 const pageType = (href) => {
     if (!href.startsWith('http')) {

lib/v2/nuaa/utils/pypasswaf.js

@@ -1,4 +1,4 @@
-const puppeteerUtils = require('@/utils/puppeteer-utils');
+import { getCookies } from '@/utils/puppeteer-utils';
 import puppeteer from '@/utils/puppeteer';
 
 /**
@@ -17,7 +17,7 @@ module.exports = async function getCookie(host) {
         waitUntil: 'networkidle0',
     });
 
-    const cookie = await puppeteerUtils.getCookies(page);
+    const cookie = await getCookies(page);
     await browser.close();
     return cookie;
 };

lib/v2/nytimes/index.js

@@ -1,6 +1,6 @@
 import cache from '@/utils/cache';
 import got from '@/utils/got';
-const parser = require('@/utils/rss-parser');
+import parser from '@/utils/rss-parser';
 const utils = require('./utils');
 import { load } from 'cheerio';
 import puppeteer from '@/utils/puppeteer';