Merge pull request #1339 from DIYgod/master

[pull] master from diygod:master
axelburks · Apr 4, 2024 · db42428 · db42428
2 parents 2de1cc1 + 3ba4a63
commit db42428
Show file tree

Hide file tree

Showing 503 changed files with 928 additions and 633 deletions.
diff --git a/.puppeteerrc.cjs b/.puppeteerrc.cjs
@@ -1,9 +1,9 @@
-const { join } = require('path');
+const path = require('path');
 
 /**
  * @type {import("puppeteer").Configuration}
  */
 module.exports = {
     // Changes the cache location for Puppeteer.
-    cacheDirectory: join(__dirname, 'node_modules', '.cache', 'puppeteer'),
+    cacheDirectory: path.join(__dirname, 'node_modules', '.cache', 'puppeteer'),
 };
diff --git a/lib/app.tsx b/lib/app.tsx
@@ -28,13 +28,12 @@ const app = new Hono();
 
 app.use(compress());
 
-app.use(jsxRenderer(
-    ({ children }) => <>{children}</>,
-    {
+app.use(
+    jsxRenderer(({ children }) => <>{children}</>, {
         docType: '<?xml version="1.0" encoding="UTF-8"?>',
-        stream: {}
-    }
-));
+        stream: {},
+    })
+);
 app.use(mLogger);
 app.use(sentry);
 app.use(accessControl);

diff --git a/lib/errors/index.tsx b/lib/errors/index.tsx
@@ -62,18 +62,13 @@ export const errorHandler: ErrorHandler = (error, ctx) => {
 
     logger.error(`Error in ${requestPath}: ${message}`);
 
-    return config.isPackage ? ctx.json({
-        error: {
-            message: error.message ?? error,
-        },
-    }) : ctx.html((
-        <Error
-            requestPath={requestPath}
-            message={message}
-            errorRoute={hasMatchedRoute ? matchedRoute : requestPath}
-            nodeVersion={process.version}
-        />
-    ));
+    return config.isPackage
+        ? ctx.json({
+              error: {
+                  message: error.message ?? error,
+              },
+          })
+        : ctx.html(<Error requestPath={requestPath} message={message} errorRoute={hasMatchedRoute ? matchedRoute : requestPath} nodeVersion={process.version} />);
 };
 
 export const notFoundHandler: NotFoundHandler = (ctx) => errorHandler(new NotFoundError(), ctx);
diff --git a/lib/middleware/template.tsx b/lib/middleware/template.tsx
@@ -1,13 +1,9 @@
 import { rss3Ums, json, RSS, Atom } from '@/utils/render';
-import * as path from 'node:path';
 import { config } from '@/config';
 import { collapseWhitespace, convertDateToISO8601 } from '@/utils/common-utils';
 import type { MiddlewareHandler } from 'hono';
 import { Data } from '@/types';
 
-import { getCurrentPath } from '@/utils/helpers';
-const __dirname = getCurrentPath(import.meta.url);
-
 // Set RSS <ttl> (minute) according to the availability of cache
 // * available: max(config.cache.routeExpire / 60, 1)
 // * unavailable: 1

diff --git a/lib/registry.ts b/lib/registry.ts
@@ -1,7 +1,7 @@
 import type { Namespace, Route } from '@/types';
 import { directoryImport } from 'directory-import';
 import { Hono, type Handler } from 'hono';
-import * as path from 'node:path';
+import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { serveStatic } from '@hono/node-server/serve-static';
 

diff --git a/lib/routes/005/index.ts b/lib/routes/005/index.ts
@@ -8,7 +8,7 @@ import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const handler = async (ctx) => {
     const { category = 'zx' } = ctx.req.param();

diff --git a/lib/routes/12306/index.ts b/lib/routes/12306/index.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import { config } from '@/config';
 
 const rootUrl = 'https://kyfw.12306.cn';

diff --git a/lib/routes/141jav/index.ts b/lib/routes/141jav/index.ts
@@ -7,7 +7,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/{.*}?',

diff --git a/lib/routes/141ppv/index.ts b/lib/routes/141ppv/index.ts
@@ -7,7 +7,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/{.*}?',

diff --git a/lib/routes/163/ds.ts b/lib/routes/163/ds.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 const root_url = 'https://inf.ds.163.com';
 

diff --git a/lib/routes/163/exclusive.ts b/lib/routes/163/exclusive.ts
@@ -8,7 +8,7 @@ import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 const ids = {
     '': {

diff --git a/lib/routes/163/music/artist-songs.ts b/lib/routes/163/music/artist-songs.ts
@@ -4,7 +4,7 @@ const __dirname = getCurrentPath(import.meta.url);
 
 import got from '@/utils/got';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/music/artist/songs/:id',

diff --git a/lib/routes/163/music/artist.ts b/lib/routes/163/music/artist.ts
@@ -4,7 +4,7 @@ const __dirname = getCurrentPath(import.meta.url);
 
 import got from '@/utils/got';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/music/artist/:id',

diff --git a/lib/routes/163/music/djradio.ts b/lib/routes/163/music/djradio.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/music/djradio/:id',

diff --git a/lib/routes/163/music/playlist.ts b/lib/routes/163/music/playlist.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import got from '@/utils/got';
 import { config } from '@/config';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/music/playlist/:id',

diff --git a/lib/routes/163/music/userevents.ts b/lib/routes/163/music/userevents.ts
@@ -2,7 +2,7 @@ import { Route } from '@/types';
 import { getCurrentPath } from '@/utils/helpers';
 const __dirname = getCurrentPath(import.meta.url);
 
-import * as path from 'node:path';
+import path from 'node:path';
 import got from '@/utils/got';
 import { art } from '@/utils/render';
 const renderDescription = (info) => art(path.join(__dirname, '../templates/music/userevents.art'), info);

diff --git a/lib/routes/163/music/userplaylist.ts b/lib/routes/163/music/userplaylist.ts
@@ -4,7 +4,7 @@ const __dirname = getCurrentPath(import.meta.url);
 
 import got from '@/utils/got';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/music/user/playlist/:uid',

diff --git a/lib/routes/163/music/userplayrecords.ts b/lib/routes/163/music/userplayrecords.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import got from '@/utils/got';
 import { config } from '@/config';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 const headers = {
     cookie: config.ncm.cookies,

diff --git a/lib/routes/163/open/vip.ts b/lib/routes/163/open/vip.ts
@@ -7,7 +7,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/open/vip',

diff --git a/lib/routes/163/utils.ts b/lib/routes/163/utils.ts
@@ -4,7 +4,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 const parseDyArticle = (item, tryGet) =>
     tryGet(item.link, async () => {

diff --git a/lib/routes/18comic/utils.ts b/lib/routes/18comic/utils.ts
@@ -6,7 +6,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import { config } from '@/config';
 
 const defaultDomain = 'jmcomic1.me';

diff --git a/lib/routes/1point3acres/offer.ts b/lib/routes/1point3acres/offer.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import got from '@/utils/got';
 import { art } from '@/utils/render';
 import { parseDate } from '@/utils/parse-date';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/offer/:year?/:major?/:school?',

diff --git a/lib/routes/1point3acres/utils.ts b/lib/routes/1point3acres/utils.ts
@@ -4,7 +4,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import got from '@/utils/got';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import bbcode from 'bbcodejs';
 
 const rootUrl = 'https://instant.1point3acres.com';

diff --git a/lib/routes/1x/index.ts b/lib/routes/1x/index.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const handler = async (ctx) => {
     const { category = 'latest/awarded' } = ctx.req.param();

diff --git a/lib/routes/2048/index.ts b/lib/routes/2048/index.ts
@@ -8,7 +8,7 @@ import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/:id?',

diff --git a/lib/routes/3kns/index.ts b/lib/routes/3kns/index.ts
@@ -5,7 +5,7 @@ import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
 import { load } from 'cheerio';
 import { Context } from 'hono';
-import * as path from 'node:path';
+import path from 'node:path';
 const __dirname = getCurrentPath(import.meta.url);
 
 export const route: Route = {

diff --git a/lib/routes/4gamers/utils.ts b/lib/routes/4gamers/utils.ts
@@ -2,7 +2,7 @@ import { getCurrentPath } from '@/utils/helpers';
 const __dirname = getCurrentPath(import.meta.url);
 
 import got from '@/utils/got';
-import * as path from 'node:path';
+import path from 'node:path';
 import { art } from '@/utils/render';
 import { parseDate } from '@/utils/parse-date';
 

diff --git a/lib/routes/4ksj/forum.ts b/lib/routes/4ksj/forum.ts
@@ -8,7 +8,7 @@ import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import iconv from 'iconv-lite';
 
 export const route: Route = {

diff --git a/lib/routes/500px/tribe-set.ts b/lib/routes/500px/tribe-set.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import cache from '@/utils/cache';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 import { baseUrl, getTribeDetail, getTribeSets } from './utils';
 

diff --git a/lib/routes/500px/user.ts b/lib/routes/500px/user.ts
@@ -5,7 +5,7 @@ const __dirname = getCurrentPath(import.meta.url);
 import cache from '@/utils/cache';
 import { art } from '@/utils/render';
 import { parseDate } from '@/utils/parse-date';
-import * as path from 'node:path';
+import path from 'node:path';
 import { baseUrl, getUserInfoFromUsername, getUserInfoFromId, getUserWorks } from './utils';
 
 export const route: Route = {

diff --git a/lib/routes/56kog/util.ts b/lib/routes/56kog/util.ts
@@ -7,7 +7,7 @@ import iconv from 'iconv-lite';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 const rootUrl = 'https://www.56kog.com';
 

diff --git a/lib/routes/591/list.ts b/lib/routes/591/list.ts
@@ -2,7 +2,7 @@ import { Route } from '@/types';
 import { getCurrentPath } from '@/utils/helpers';
 const __dirname = getCurrentPath(import.meta.url);
 
-import * as path from 'node:path';
+import path from 'node:path';
 
 import { CookieJar } from 'tough-cookie';
 import { load } from 'cheerio';

diff --git a/lib/routes/78dm/index.ts b/lib/routes/78dm/index.ts
@@ -9,7 +9,7 @@ import { load } from 'cheerio';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '*',

diff --git a/lib/routes/7mmtv/index.ts b/lib/routes/7mmtv/index.ts
@@ -7,7 +7,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/:language?/:category?/:type?',

diff --git a/lib/routes/8264/list.ts b/lib/routes/8264/list.ts
@@ -9,7 +9,7 @@ import iconv from 'iconv-lite';
 import timezone from '@/utils/timezone';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/list/:id?',

diff --git a/lib/routes/91porn/author.ts b/lib/routes/91porn/author.ts
@@ -7,7 +7,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import { domainValidation } from './utils';
 
 export const route: Route = {

diff --git a/lib/routes/91porn/index.ts b/lib/routes/91porn/index.ts
@@ -7,7 +7,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import { domainValidation } from './utils';
 
 export const route: Route = {

diff --git a/lib/routes/95mm/utils.ts b/lib/routes/95mm/utils.ts
@@ -5,7 +5,7 @@ import cache from '@/utils/cache';
 import got from '@/utils/got';
 import { load } from 'cheerio';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 const rootUrl = 'https://www.95mm.vip';
 

diff --git a/lib/routes/abc/index.ts b/lib/routes/abc/index.ts
@@ -7,7 +7,7 @@ import got from '@/utils/got';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 
 export const route: Route = {
     path: '/:category{.+}?',

diff --git a/lib/routes/acs/journal.ts b/lib/routes/acs/journal.ts
@@ -6,7 +6,7 @@ import cache from '@/utils/cache';
 import { load } from 'cheerio';
 import { parseDate } from '@/utils/parse-date';
 import { art } from '@/utils/render';
-import * as path from 'node:path';
+import path from 'node:path';
 import { config } from '@/config';
 import puppeteer from '@/utils/puppeteer';