@ikenxuan/amagi 1.5.8 → 1.5.9

package/README.md

@@ -1,9 +1,12 @@
-![amagi](https://socialify.git.ci/ikenxuan/amagi/image?font=Source%20Code%20Pro&forks=1&issues=1&language=1&name=1&owner=1&pattern=Floating%20Cogs&pulls=1&stargazers=1&theme=Auto)
-
 # amagi（泥干嘛哈哈
+
 * 热门平台视频解析 API 基于 Node.js 的实现，支持最低node版本为 v16
 * 抖音、B站
 
+![amagi](https://socialify.git.ci/ikenxuan/amagi/image?font=Source%20Code%20Pro&forks=1&issues=1&language=1&name=1&owner=1&pattern=Floating%20Cogs&pulls=1&stargazers=1&theme=Auto)
+
+
+
 ## 使用
 ```
 pnpm add @ikenxuan/amagi
@@ -24,10 +27,6 @@ await StartClient(client, { port: 4567 })
 ## 开发构建
 > Node.js版本 <= v18.20.4
 
-* 克隆仓库
-```
-git clone git@github.com:ikenxuan/amagi.git
-```
 * 安装依赖
 ```
 pnpm install

package/lib/business/bilibili/getdata.js

@@ -1,5 +1,5 @@
 import { BiLiBiLiAPI, qtparam, wbi_sign } from '../../business/bilibili/index.js';
-import { Networks, logger } from '../../model/index.js';
+import { Networks } from '../../model/index.js';
 export default class BilibiliData {
     type;
     headers;
@@ -102,7 +102,7 @@ export default class BilibiliData {
         const result = await new Networks(options).getData();
         if (result && result.code !== 0) {
             const errorMessage = errorMap[result.code] || '未知错误';
-            logger.error(`响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
+            console.error(`响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
             return null;
         }
         else {

package/lib/model/index.d.ts

@@ -1,4 +1,3 @@
-import logger from './logger.js';
 import Networks from './networks.js';
 export * from './dir.js';
-export { Networks, logger };
+export { Networks };

package/lib/model/index.js

@@ -1,4 +1,3 @@
-import logger from './logger.js';
 import Networks from './networks.js';
 export * from './dir.js';
-export { Networks, logger };
+export { Networks };

package/lib/model/networks.js

@@ -1,4 +1,3 @@
-import { logger } from '../model/index.js';
 import axios from 'axios';
 export default class Networks {
   url;
@@ -48,7 +47,7 @@ export default class Networks {
       return result;
     }
     catch (error) {
-      logger.info(error);
+      console.info(error);
       return false;
     }
   }
@@ -62,7 +61,7 @@ export default class Networks {
       return result.request.res.responseUrl; // axios中获取最终的请求URL
     }
     catch (error) {
-      logger.error(error);
+      console.error(error);
       return '';
     }
   }
@@ -78,7 +77,7 @@ export default class Networks {
       return response.headers['location'];
     }
     catch (error) {
-      logger.error(error);
+      console.error(error);
       return '';
     }
   }
@@ -91,7 +90,7 @@ export default class Networks {
           return result;
         }
         if (result.status === 429) {
-          logger.warn('HTTP 响应状态码: 429');
+          console.warn('HTTP 响应状态码: 429');
           throw new Error('ratelimit triggered, 触发 https://www.douyin.com/ 的速率限制！！！');
         }
         this.axiosInstance = result;
@@ -118,7 +117,7 @@ export default class Networks {
       return this.axiosInstance;
     }
     catch (error) {
-      logger.error(error);
+      console.error(error);
       return false;
     }
   }
@@ -131,17 +130,17 @@ export default class Networks {
           return this.axiosInstance.headers;
         }
         else {
-          logger.error('未获取到响应头');
+          console.error('未获取到响应头');
           return null;
         }
       }
       else {
-        logger.error('未获取到响应对象');
+        console.error('未获取到响应对象');
         return null;
       }
     }
     catch (error) {
-      logger.error('获取响应头失败:', error);
+      console.error('获取响应头失败:', error);
       return null;
     }
   }
@@ -170,12 +169,12 @@ export default class Networks {
         }
       }
       else {
-        logger.error('未获取到响应对象');
+        console.error('未获取到响应对象');
       }
       return { headers, data };
     }
     catch (error) {
-      logger.error('获取响应头和数据失败:', error);
+      console.error('获取响应头和数据失败:', error);
       return { headers: null, data: null };
     }
   }

package/lib/server/client.js

@@ -20,7 +20,25 @@ export class client {
      * @returns fastify 实例
      */
   async initServer (log = false) {
-    const client = fastify({ logger: log });
+    const client = fastify({
+      logger: log && {
+        transport: {
+          target: 'pino-pretty',
+          options: {
+            colorize: true,
+            translateTime: 'yyyy-MM-dd HH:mm:ss',
+            ignore: 'pid,hostname,reqId,res,responseTime,req.hostname,req.method,req.remotePort',
+            messageFormat: '{msg}'
+          }
+        }
+      }
+    });
+    client.get('/', async (_request, reply) => {
+      reply.redirect('https://amagi.apifox.cn', 301);
+    });
+    client.get('/docs', async (_request, reply) => {
+      reply.redirect('https://amagi.apifox.cn', 301);
+    });
     client.get('/api/douyin/aweme', async (request, reply) => {
       const url = request.query.url;
       reply.type('application/json').send(await new DouyinResult("VideoData" /* DouyinDataType['单个视频作品数据'] */, this.douyin).result({ url }));

package/lib/server/listen.js

@@ -1,4 +1,3 @@
-import { logger } from '../model/index.js';
 /**
  * 启动 fastify 实例
  * @param client fastify 实例
@@ -8,7 +7,7 @@ import { logger } from '../model/index.js';
 export const StartClient = async (client, options) => {
   return client.listen({ port: options.port, host: '::' }, (_err, _address) => {
     if (_err)
-      logger.error(_err);
-    logger.info(`amagi server listening on ${options.port} port. API docs: https://amagi.apifox.cn`);
+      client.log.error(_err);
+    console.log(`amagi server listening on ${options.port} port. API docs: https://amagi.apifox.cn`);
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -34,9 +34,8 @@
     "chokidar": "^3.6.0",
     "fastify": "^4.28.1",
     "lodash": "4.17.21",
-    "loglevel": "^1.9.1",
-    "loglevel-plugin-prefix": "^0.8.4",
-    "md5": "^2.3.0"
+    "md5": "^2.3.0",
+    "pino-pretty": "^11.2.2"
   },
   "devDependencies": {
     "@types/lodash": "latest",

package/lib/model/logger.d.ts

@@ -1,3 +0,0 @@
-import log from 'loglevel';
-declare const logger: log.RootLogger;
-export default logger;

package/lib/model/logger.js

@@ -1,28 +0,0 @@
-import chalk from 'chalk';
-import log from 'loglevel';
-import prefix from 'loglevel-plugin-prefix';
-const colors = {
-  TRACE: chalk.magenta,
-  DEBUG: chalk.cyan,
-  INFO: chalk.blue,
-  WARN: chalk.yellow,
-  ERROR: chalk.red
-};
-prefix.reg(log);
-log.enableAll();
-prefix.apply(log, {
-  format (level, name, timestamp) {
-    const levelKey = level.toUpperCase();
-    if (!(levelKey in colors)) {
-      throw new Error(`Invalid log level: ${levelKey}`);
-    }
-    return `${chalk.gray(`[${timestamp}]`)} ${colors[levelKey](level)} ${chalk.green(`${name}:`)}`;
-  }
-});
-prefix.apply(log.getLogger('critical'), {
-  format (level, name, timestamp) {
-    return chalk.red.bold(`[${timestamp}] ${level} ${name}:`);
-  }
-});
-const logger = log;
-export default logger;