@ikenxuan/amagi 1.4.8 → 1.5.0

package/README.md

@@ -1,3 +1,5 @@
+![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站
@@ -14,7 +16,7 @@ import amagi, { StartClient } from '@ikenxuan/amagi'
 const client = await new amagi({
   douyin: '抖音ck',
   bilibili: 'B站ck'
-}).initServer(true)
+}).initServer(true) // 是否开启调试模式
 
 // 启动监听
 await StartClient(client, { port: 4567 })

package/lib/business/bilibili/API.d.ts

@@ -13,7 +13,7 @@ declare class BiLiBiLiAPI {
     动态卡片信息(data: BilibiliAPIParams['DynamicParams']): string;
     用户名片信息(data: BilibiliAPIParams['UserParams']): string;
     直播间信息(data: BilibiliAPIParams['LiveRoomParams']): string;
-    房间页初始化信息(data: BilibiliAPIParams['LiveRoomParams']): string;
+    直播间初始化信息(data: BilibiliAPIParams['LiveRoomParams']): string;
     申请二维码(): string;
     二维码状态(data: BilibiliAPIParams['QrcodeParams']): string;
 }

package/lib/business/bilibili/API.js

@@ -36,7 +36,7 @@ class BiLiBiLiAPI {
     直播间信息(data) {
         return `https://api.live.bilibili.com/room/v1/Room/get_info?room_id=${data.room_id}`;
     }
-    房间页初始化信息(data) {
+    直播间初始化信息(data) {
         return `https://api.live.bilibili.com/room/v1/Room/room_init?id=${data.room_id}`;
     }
     申请二维码() {

package/lib/business/bilibili/getdata.js

@@ -17,7 +17,7 @@ export default class BilibiliData {
             case 'VideoData': {
                 const INFODATA = await this.GlobalGetData({ url: BiLiBiLiAPI.视频详细信息({ id_type: 'bvid', id: data.id }) });
                 const BASEURL = BiLiBiLiAPI.视频流信息({ avid: INFODATA.data.aid, cid: INFODATA.data.cid });
-                const SIGN = await qtparam(BASEURL, this.headers.cookie);
+                const SIGN = await qtparam(BASEURL, this.headers.Cookie);
                 const DATA = await this.GlobalGetData({
                     url: BiLiBiLiAPI.视频流信息({ avid: INFODATA.data.aid, cid: INFODATA.data.cid }) + SIGN.QUERY,
                     headers: this.headers
@@ -26,7 +26,7 @@ export default class BilibiliData {
             }
             case 'CommentData': {
                 const INFODATA = await this.GlobalGetData({ url: BiLiBiLiAPI.视频详细信息({ id_type: 'bvid', id: data.bvid }) });
-                const PARAM = await wbi_sign(BiLiBiLiAPI.评论区明细({ type: 1, oid: INFODATA.data.aid }), this.headers.cookie);
+                const PARAM = await wbi_sign(BiLiBiLiAPI.评论区明细({ type: 1, oid: INFODATA.data.aid }), this.headers.Cookie);
                 const COMMENTSDATA = await this.GlobalGetData({ url: BiLiBiLiAPI.评论区明细({ type: 1, oid: INFODATA.data.aid }) + PARAM, headers: this.headers });
                 return COMMENTSDATA;
             }
@@ -73,12 +73,27 @@ export default class BilibiliData {
                 });
                 return dynamicINFO_CARD;
             }
-            case 'UserInfoData':
+            case 'UserInfoData': {
                 result = await this.GlobalGetData({
                     url: BiLiBiLiAPI.用户名片信息({ host_mid: data.host_mid }),
                     headers: this.headers
                 });
                 return result;
+            }
+            case 'LiveRoomInfoData': {
+                result = await this.GlobalGetData({
+                    url: BiLiBiLiAPI.直播间信息({ room_id: data.room_id }),
+                    headers: this.headers
+                });
+                return result;
+            }
+            case 'LiveRoomInitData': {
+                result = await this.GlobalGetData({
+                    url: BiLiBiLiAPI.直播间初始化信息({ room_id: data.room_id }),
+                    headers: this.headers
+                });
+                return result;
+            }
         }
     }
     async GlobalGetData(options) {

package/lib/index.d.ts

@@ -3,5 +3,6 @@ export * from './business/index.js';
 export * from './types/index.js';
 export * from './server/index.js';
 import { client } from './server/index.js';
-export declare const amagi: typeof client;
+declare const amagi: typeof client;
 export { amagi as default };
+export { amagi as Amagi };

package/lib/index.js

@@ -3,5 +3,6 @@ export * from './business/index.js';
 export * from './types/index.js';
 export * from './server/index.js';
 import { client } from './server/index.js';
-export const amagi = client;
+const amagi = client;
 export { amagi as default };
+export { amagi as Amagi };

package/lib/model/logger.d.ts

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

package/lib/model/logger.js

@@ -1,28 +1,28 @@
-import log4js from 'log4js';
-log4js.configure({
-    appenders: {
-        console: {
-            type: 'stdout',
-            layout: {
-                type: 'pattern',
-                pattern: '%[[amagi][%d{hh:mm:ss.SSS}][%4.4p]%] %m',
-            },
-        },
-        command: {
-            type: 'dateFile', // 可以是console,dateFile,file,Logstash等
-            filename: 'logs/command', // 将会按照filename和pattern拼接文件名
-            pattern: 'yyyy-MM-dd.log',
-            numBackups: 15,
-            alwaysIncludePattern: true,
-            layout: {
-                type: 'pattern',
-                pattern: '[%d{hh:mm:ss.SSS}][%4.4p] %m',
-            },
-        },
+import log from 'loglevel';
+import prefix from 'loglevel-plugin-prefix';
+import chalk from 'chalk';
+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}:`)}`;
     },
-    categories: {
-        default: { appenders: ['console'], level: 'debug' },
+});
+prefix.apply(log.getLogger('critical'), {
+    format(level, name, timestamp) {
+        return chalk.red.bold(`[${timestamp}] ${level} ${name}:`);
     },
 });
-const logger = log4js.getLogger();
+const logger = log;
 export default logger;

package/lib/server/client.d.ts

@@ -1,15 +1,23 @@
 import { FastifyInstance } from 'fastify';
-export declare class client {
+interface initClientParams {
+    /** 抖音ck */
     douyin: string;
+    /** B站ck */
     bilibili: string;
-    constructor(cookies: {
-        douyin: string;
-        bilibili: string;
-    });
+}
+export declare class client {
+    private readonly douyin;
+    private readonly bilibili;
     /**
      *
+     * @param cookies 包含抖音和B站cookie的参数对象
+     */
+    constructor(cookies: initClientParams);
+    /**
+     * 初始化 fastify 实例
      * @param log 是否启用日志
-     * @returns
+     * @returns fastify 实例
      */
     initServer(log?: boolean): Promise<FastifyInstance>;
 }
+export {};

package/lib/server/client.js

@@ -1,9 +1,16 @@
 import fastify from 'fastify';
 import { DouyinResult } from '../business/douyin/index.js';
 import { BilibiliResult } from '../business/bilibili/index.js';
+import fastifySwagger from '@fastify/swagger';
+import fastifySwaggerUi from '@fastify/swagger-ui';
+import fs from 'node:fs';
 export class client {
     douyin;
     bilibili;
+    /**
+     *
+     * @param cookies 包含抖音和B站cookie的参数对象
+     */
     constructor(cookies) {
         /** 抖音ck */
         this.douyin = cookies.douyin;
@@ -11,12 +18,22 @@ export class client {
         this.bilibili = cookies.bilibili;
     }
     /**
-     *
+     * 初始化 fastify 实例
      * @param log 是否启用日志
-     * @returns
+     * @returns fastify 实例
      */
     async initServer(log = false) {
         const client = fastify({ logger: log });
+        const data = JSON.parse(fs.readFileSync(process.cwd() + '/amagi.openapi.json', 'utf8'));
+        await client.register(fastifySwagger, {
+            openapi: data
+        });
+        await client.register(fastifySwaggerUi, {
+            routePrefix: '/docs',
+            uiConfig: {
+                docExpansion: 'full',
+            },
+        });
         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 }));
@@ -92,14 +109,14 @@ export class client {
             reply.type('application/json').send(await new BilibiliResult("UserInfoData" /* BilibiliDataType['用户主页数据'] */, this.bilibili).result({ host_mid }));
         });
         client.get('/api/bilibili/liveroominfo', async (request, reply) => {
-            const room_id = request.query.host_mid;
+            const room_id = request.query.room_id;
             reply.type('application/json').send(await new BilibiliResult("LiveRoomInfoData" /* BilibiliDataType['直播间信息'] */, this.bilibili).result({ room_id }));
         });
         client.get('/api/bilibili/liveroominit', async (request, reply) => {
-            const room_id = request.query.host_mid;
+            const room_id = request.query.room_id;
             reply.type('application/json').send(await new BilibiliResult("LiveRoomInitData" /* BilibiliDataType['直播间初始化信息'] */, this.bilibili).result({ room_id }));
         });
-        // 返回fastify实例
+        // 返回 fastify 实例
         return client;
     }
 }

package/lib/server/listen.d.ts

@@ -9,6 +9,11 @@ interface ServerOptions {
      */
     log?: boolean;
 }
-/** 启动监听 */
+/**
+ * 启动 fastify 实例
+ * @param client fastify 实例
+ * @param options 配置项
+ * @returns
+ */
 export declare const StartClient: (client: FastifyInstance, options: ServerOptions) => Promise<void>;
 export {};

package/lib/server/listen.js

@@ -1,7 +1,12 @@
 import { logger } from '../model/index.js';
-/** 启动监听 */
+/**
+ * 启动 fastify 实例
+ * @param client fastify 实例
+ * @param options 配置项
+ * @returns
+ */
 export const StartClient = async (client, options) => {
-    return client.listen({ port: options.port, host: '[::]' }, (_err, _address) => {
+    return client.listen({ port: options.port, host: '::' }, (_err, _address) => {
         if (_err)
             logger.error(_err);
         logger.info(`amagi server listening on http://localhost:${options.port}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "1.4.8",
+  "version": "1.5.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -29,12 +29,14 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@fastify/autoload": "^5.10.0",
+    "@fastify/swagger": "^8.15.0",
+    "@fastify/swagger-ui": "^4.0.1",
     "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
     "fastify": "^4.28.1",
     "lodash": "4.17.21",
-    "log4js": "^6.9.1",
+    "loglevel": "^1.9.1",
+    "loglevel-plugin-prefix": "^0.8.4",
     "md5": "^2.3.0",
     "node-fetch": "^3.3.2"
   },