@ikenxuan/amagi 1.4.3 → 1.4.5

package/lib/index.js

@@ -1,113 +1,7 @@
-import fastify from 'fastify';
-import { DouyinResult } from './business/douyin/index.js';
-import { BilibiliResult } from './business/bilibili/index.js';
-import { logger } from './model/index.js';
-import chalk from 'chalk';
-export const initServer = async (client) => {
-    client.get('/api/douyin/aweme', async (request, reply) => {
-        const url = request.query.url;
-        reply.type('application/json').send(await new DouyinResult("VideoData" /* DouyinDataType['单个视频作品数据'] */).result({ url }));
-    });
-    client.get('/api/douyin/comments', async (request, reply) => {
-        const url = request.query.url;
-        reply.type('application/json').send(await new DouyinResult("CommentData" /* DouyinDataType['评论数据'] */).result({ url }));
-    });
-    client.get('/api/douyin/comments/reply', async (request, reply) => {
-        const { aweme_id, comment_id } = request.query;
-        reply.type('application/json').send(await new DouyinResult("CommentReplyData" /* DouyinDataType['二级评论数据'] */).result({ aweme_id, comment_id }));
-    });
-    client.get('/api/douyin/userinfo', async (request, reply) => {
-        const sec_uid = request.query.sec_uid;
-        reply.type('application/json').send(await new DouyinResult("UserInfoData" /* DouyinDataType['用户主页数据'] */).result({ sec_uid }));
-    });
-    client.get('/api/douyin/uservideoslist', async (request, reply) => {
-        const sec_uid = request.query.sec_uid;
-        reply.type('application/json').send(await new DouyinResult("UserVideosListData" /* DouyinDataType['用户主页视频列表数据'] */).result({ sec_uid }));
-    });
-    client.get('/api/douyin/suggestwords', async (request, reply) => {
-        const query = request.query.query;
-        reply.type('application/json').send(await new DouyinResult("SuggestWordsData" /* DouyinDataType['热点词数据'] */).result({ query }));
-    });
-    client.get('/api/douyin/search', async (request, reply) => {
-        const query = request.query.query;
-        reply.type('application/json').send(await new DouyinResult("SearchData" /* DouyinDataType['搜索数据'] */).result({ query }));
-    });
-    client.get('/api/douyin/emoji', async (_request, reply) => {
-        reply.type('application/json').send(await new DouyinResult("EmojiData" /* DouyinDataType['官方emoji数据'] */).result());
-    });
-    client.get('/api/douyin/expressionplus', async (_request, reply) => {
-        reply.type('application/json').send(await new DouyinResult("ExpressionPlusData" /* DouyinDataType['动态表情数据'] */).result());
-    });
-    client.get('/api/douyin/music', async (request, reply) => {
-        const music_id = request.query.music_id;
-        reply.type('application/json').send(await new DouyinResult("MusicData" /* DouyinDataType['音乐数据'] */).result({ music_id }));
-    });
-    // bilibili
-    client.get('/api/bilibili/work', async (request, reply) => {
-        const url = request.query.url;
-        reply.type('application/json').send(await new BilibiliResult("VideoData" /* BilibiliDataType['单个视频作品数据'] */).result({ url }));
-    });
-    client.get('/api/bilibili/comment', async (request, reply) => {
-        const bvid = request.query.bvid;
-        reply.type('application/json').send(await new BilibiliResult("CommentData" /* BilibiliDataType['评论数据'] */).result({ bvid }));
-    });
-    client.get('/api/bilibili/emoji', async (_request, reply) => {
-        reply.type('application/json').send(await new BilibiliResult("EmojiData" /* BilibiliDataType['emoji数据'] */).result());
-    });
-    client.get('/api/bilibili/bangumivideoinfo', async (request, reply) => {
-        const url = request.query.url;
-        reply.type('application/json').send(await new BilibiliResult("BangumiVideoData" /* BilibiliDataType['番剧基本信息数据'] */).result({ url }));
-    });
-    client.get('/api/bilibili/bangumivideodownloadlink', async (request, reply) => {
-        const { cid, ep_id } = request.query;
-        reply.type('application/json').send(await new BilibiliResult("BangumiVideoDownloadLinkData" /* BilibiliDataType['番剧下载信息数据'] */).result({ cid, ep_id }));
-    });
-    client.get('/api/bilibili/dynamiclist', async (request, reply) => {
-        const host_mid = request.query.host_mid;
-        reply.type('application/json').send(await new BilibiliResult("UserDynamicListData" /* BilibiliDataType['用户主页动态列表数据'] */).result({ host_mid }));
-    });
-    client.get('/api/bilibili/dynamicinfo', async (request, reply) => {
-        const dynamic_id = request.query.dynamic_id;
-        reply.type('application/json').send(await new BilibiliResult("DynamicInfoData" /* BilibiliDataType['动态详情数据'] */).result({ dynamic_id }));
-    });
-    client.get('/api/bilibili/dynamicdard', async (request, reply) => {
-        const dynamic_id = request.query.dynamic_id;
-        reply.type('application/json').send(await new BilibiliResult("DynamicCardData" /* BilibiliDataType['动态卡片数据'] */).result({ dynamic_id }));
-    });
-    client.get('/api/bilibili/userinfo', async (request, reply) => {
-        const host_mid = request.query.host_mid;
-        reply.type('application/json').send(await new BilibiliResult("UserInfoData" /* BilibiliDataType['用户主页数据'] */).result({ host_mid }));
-    });
-    // 返回fastify实例
-    return client;
-};
-/**
- * 添加路由
- * @param client fastify实例
- * @param routeOptions[] 路由参数，传递数组
- * @param extend 是否继承 amagi 的默认路由
- * @returns
- */
-export const AddRoute = (client, routeOptions = [], extend = false) => {
-    if (extend)
-        return client;
-    // 继承默认路由参数
-    initServer(client);
-    for (const item of routeOptions) {
-        client.route({ method: item.method, handler: item.handler, url: item.url });
-    }
-    return client;
-};
-/** 创建一个新的 fastify 实例 */
-export const CreateNewClient = (options) => {
-    return fastify({ logger: options.log });
-};
-/** 启动监听 */
-export const StartClient = async (client, options) => {
-    // 继承 amagi 路由规则
-    return client.listen({ port: options.port, host: '127.0.0.1' }, (_err, address) => {
-        if (_err)
-            logger.error(_err);
-        console.log(chalk.green(`服务监听于 ${address}`));
-    });
-};
+export * from './model/index.js';
+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;
+export { amagi as default };

package/lib/model/index.d.ts

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

package/lib/model/index.js

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

package/lib/server/client.d.ts

@@ -0,0 +1,15 @@
+import { FastifyInstance } from 'fastify';
+export declare class client {
+    douyin: string;
+    bilibili: string;
+    constructor(cookies: {
+        douyin: string;
+        bilibili: string;
+    });
+    /**
+     *
+     * @param log 是否启用日志
+     * @returns
+     */
+    initServer(log?: boolean): Promise<FastifyInstance>;
+}

package/lib/server/client.js

@@ -0,0 +1,105 @@
+import fastify from 'fastify';
+import { DouyinResult } from '../business/douyin/index.js';
+import { BilibiliResult } from '../business/bilibili/index.js';
+export class client {
+    douyin;
+    bilibili;
+    constructor(cookies) {
+        /** 抖音ck */
+        this.douyin = cookies.douyin;
+        /** B站ck */
+        this.bilibili = cookies.bilibili;
+    }
+    /**
+     *
+     * @param log 是否启用日志
+     * @returns
+     */
+    async initServer(log = false) {
+        const client = fastify({ logger: log });
+        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 }));
+        });
+        client.get('/api/douyin/comments', async (request, reply) => {
+            const url = request.query.url;
+            reply.type('application/json').send(await new DouyinResult("CommentData" /* DouyinDataType['评论数据'] */, this.douyin).result({ url }));
+        });
+        client.get('/api/douyin/comments/reply', async (request, reply) => {
+            const { aweme_id, comment_id } = request.query;
+            reply.type('application/json').send(await new DouyinResult("CommentReplyData" /* DouyinDataType['二级评论数据'] */, this.douyin).result({ aweme_id, comment_id }));
+        });
+        client.get('/api/douyin/userinfo', async (request, reply) => {
+            const sec_uid = request.query.sec_uid;
+            reply.type('application/json').send(await new DouyinResult("UserInfoData" /* DouyinDataType['用户主页数据'] */, this.douyin).result({ sec_uid }));
+        });
+        client.get('/api/douyin/uservideoslist', async (request, reply) => {
+            const sec_uid = request.query.sec_uid;
+            reply.type('application/json').send(await new DouyinResult("UserVideosListData" /* DouyinDataType['用户主页视频列表数据'] */, this.douyin).result({ sec_uid }));
+        });
+        client.get('/api/douyin/suggestwords', async (request, reply) => {
+            const query = request.query.query;
+            reply.type('application/json').send(await new DouyinResult("SuggestWordsData" /* DouyinDataType['热点词数据'] */, this.douyin).result({ query }));
+        });
+        client.get('/api/douyin/search', async (request, reply) => {
+            const query = request.query.query;
+            reply.type('application/json').send(await new DouyinResult("SearchData" /* DouyinDataType['搜索数据'] */, this.douyin).result({ query }));
+        });
+        client.get('/api/douyin/emoji', async (_request, reply) => {
+            reply.type('application/json').send(await new DouyinResult("EmojiData" /* DouyinDataType['官方emoji数据'] */, this.douyin).result());
+        });
+        client.get('/api/douyin/expressionplus', async (_request, reply) => {
+            reply.type('application/json').send(await new DouyinResult("ExpressionPlusData" /* DouyinDataType['动态表情数据'] */, this.douyin).result());
+        });
+        client.get('/api/douyin/music', async (request, reply) => {
+            const music_id = request.query.music_id;
+            reply.type('application/json').send(await new DouyinResult("MusicData" /* DouyinDataType['音乐数据'] */, this.douyin).result({ music_id }));
+        });
+        // bilibili
+        client.get('/api/bilibili/work', async (request, reply) => {
+            const url = request.query.url;
+            reply.type('application/json').send(await new BilibiliResult("VideoData" /* BilibiliDataType['单个视频作品数据'] */, this.bilibili).result({ url }));
+        });
+        client.get('/api/bilibili/comment', async (request, reply) => {
+            const bvid = request.query.bvid;
+            reply.type('application/json').send(await new BilibiliResult("CommentData" /* BilibiliDataType['评论数据'] */, this.bilibili).result({ bvid }));
+        });
+        client.get('/api/bilibili/emoji', async (_request, reply) => {
+            reply.type('application/json').send(await new BilibiliResult("EmojiData" /* BilibiliDataType['emoji数据'] */, this.bilibili).result());
+        });
+        client.get('/api/bilibili/bangumivideoinfo', async (request, reply) => {
+            const url = request.query.url;
+            reply.type('application/json').send(await new BilibiliResult("BangumiVideoData" /* BilibiliDataType['番剧基本信息数据'] */, this.bilibili).result({ url }));
+        });
+        client.get('/api/bilibili/bangumivideodownloadlink', async (request, reply) => {
+            const { cid, ep_id } = request.query;
+            reply.type('application/json').send(await new BilibiliResult("BangumiVideoDownloadLinkData" /* BilibiliDataType['番剧下载信息数据'] */, this.bilibili).result({ cid, ep_id }));
+        });
+        client.get('/api/bilibili/dynamiclist', async (request, reply) => {
+            const host_mid = request.query.host_mid;
+            reply.type('application/json').send(await new BilibiliResult("UserDynamicListData" /* BilibiliDataType['用户主页动态列表数据'] */, this.bilibili).result({ host_mid }));
+        });
+        client.get('/api/bilibili/dynamicinfo', async (request, reply) => {
+            const dynamic_id = request.query.dynamic_id;
+            reply.type('application/json').send(await new BilibiliResult("DynamicInfoData" /* BilibiliDataType['动态详情数据'] */, this.bilibili).result({ dynamic_id }));
+        });
+        client.get('/api/bilibili/dynamicdard', async (request, reply) => {
+            const dynamic_id = request.query.dynamic_id;
+            reply.type('application/json').send(await new BilibiliResult("DynamicCardData" /* BilibiliDataType['动态卡片数据'] */, this.bilibili).result({ dynamic_id }));
+        });
+        client.get('/api/bilibili/userinfo', async (request, reply) => {
+            const host_mid = request.query.host_mid;
+            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;
+            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;
+            reply.type('application/json').send(await new BilibiliResult("LiveRoomInitData" /* BilibiliDataType['直播间初始化信息'] */, this.bilibili).result({ room_id }));
+        });
+        // 返回fastify实例
+        return client;
+    }
+}

package/lib/server/index.d.ts

@@ -0,0 +1,2 @@
+export * from './client.js';
+export * from './listen.js';

package/lib/server/index.js

@@ -0,0 +1,2 @@
+export * from './client.js';
+export * from './listen.js';

package/lib/server/listen.d.ts

@@ -0,0 +1,14 @@
+import { FastifyInstance } from 'fastify';
+interface ServerOptions {
+    /**
+     * 端口
+     */
+    port?: number;
+    /**
+     * 是否启用日志
+     */
+    log?: boolean;
+}
+/** 启动监听 */
+export declare const StartClient: (client: FastifyInstance, options: ServerOptions) => Promise<void>;
+export {};

package/lib/server/listen.js

@@ -0,0 +1,11 @@
+import { logger } from '../model/index.js';
+import chalk from 'chalk';
+/** 启动监听 */
+export const StartClient = async (client, options) => {
+    // 继承 amagi 路由规则
+    return client.listen({ port: options.port, host: '127.0.0.1' }, (_err, address) => {
+        if (_err)
+            logger.error(_err);
+        console.log(chalk.green(`amagi 服务监听于 ${address}`));
+    });
+};

package/lib/types/BilibiliAPIParams.d.ts

@@ -0,0 +1,59 @@
+type VideoInfoParams = {
+    /** ID类型 */
+    id_type: 'bvid' | 'aid';
+    /** 稿件ID */
+    id: string;
+};
+type VideoStreamParams = {
+    /** 稿件AVID */
+    avid: string;
+    /** 稿件cid */
+    cid: string;
+};
+type CommentParams = {
+    /** 评论区类型，type参数详见https://github.com/SocialSisterYi/bilibili-API-collect/blob/master/docs/comment/readme.md#评论区类型代码 */
+    type: number | string;
+    /** 稿件ID，也就是AVID */
+    oid: number | string;
+};
+type BangumiInfoParams = {
+    /** 稿件ID是否为epid */
+    isep: boolean | undefined;
+    /** 稿件id，season_id与ep_id任选其一 */
+    id: string;
+};
+type BangumiStreamParams = {
+    /** 稿件cid */
+    cid: string;
+    /** 稿件ep_id */
+    ep_id: string;
+};
+type UserParams = {
+    /** UP主UID */
+    host_mid: string;
+};
+type DynamicParams = {
+    /** 动态ID */
+    dynamic_id: string;
+};
+type LiveRoomParams = {
+    /** 直播间ID */
+    room_id: string;
+};
+type QrcodeParams = {
+    /** 扫码登录秘钥 */
+    qrcode_key: string;
+};
+/** 抖音API接口参数类型 */
+export type BilibiliAPIParams = {
+    VideoInfoParams: VideoInfoParams;
+    VideoStreamParams: VideoStreamParams;
+    CommentParams: CommentParams;
+    BangumiInfoParams: BangumiInfoParams;
+    BangumiStreamParams: BangumiStreamParams;
+    UserParams: UserParams;
+    DynamicParams: DynamicParams;
+    LiveRoomParams: LiveRoomParams;
+    QrcodeParams: QrcodeParams;
+};
+export {};

package/lib/types/DataType.d.ts

@@ -28,5 +28,7 @@ export declare const enum BilibiliDataType {
     番剧基本信息数据 = "BangumiVideoData",
     番剧下载信息数据 = "BangumiVideoDownloadLinkData",
     动态详情数据 = "DynamicInfoData",
-    动态卡片数据 = "DynamicCardData"
+    动态卡片数据 = "DynamicCardData",
+    直播间信息 = "LiveRoomInfoData",
+    直播间初始化信息 = "LiveRoomInitData"
 }

package/lib/types/DouyinAPIParams.d.ts

@@ -0,0 +1,37 @@
+type WorkParams = {
+    /** 视频ID */
+    aweme_id: string;
+    number?: number | string;
+};
+type CommentParams = {
+    /** 视频ID */
+    aweme_id: string;
+    /** 评论ID */
+    comment_id: string;
+};
+type UserParams = {
+    /** 用户ID */
+    sec_uid: string;
+};
+type SearchParams = {
+    /** 搜索词 */
+    query: string;
+};
+type MusicParams = {
+    /** 音乐ID */
+    music_id: string;
+};
+type LiveRoomParams = {
+    /** 直播间ID */
+    room_id: string;
+};
+/** 抖音API接口参数类型 */
+export type DouyinAPIParams = {
+    WorkParams: WorkParams;
+    CommentParams: CommentParams;
+    UserParams: UserParams;
+    SearchParams: SearchParams;
+    MusicParams: MusicParams;
+    LiveRoomParams: LiveRoomParams;
+};
+export {};

package/lib/types/DouyinAPIParams.js

@@ -0,0 +1 @@
+export {};

package/lib/types/OptionsType.d.ts

@@ -63,4 +63,8 @@ export type BilibiliOptionsType = {
      * 番剧视频EPID
      */
     ep_id?: string;
+    /**
+     * 直播间ID
+     */
+    room_id?: string;
 };

package/lib/types/Request.d.ts

@@ -0,0 +1,8 @@
+import { FastifyRequest } from 'fastify';
+import { DouyinOptionsType, BilibiliOptionsType } from './OptionsType.js';
+export interface DouyinRequest extends FastifyRequest {
+    Querystring: DouyinOptionsType;
+}
+export interface BilibiliRequest extends FastifyRequest {
+    Querystring: BilibiliOptionsType;
+}

package/lib/types/Request.js

@@ -0,0 +1 @@
+export {};

package/lib/types/index.d.ts

@@ -3,4 +3,7 @@ import { type DouyinOptionsType, type BilibiliOptionsType } from './OptionsType.
 import { type GetDataResponseType } from './GetDataResponseType.js';
 import { type ConfigType } from './ConfigType.js';
 import { type NetworksConfigType } from './NetworksConfigType.js';
-export { DouyinDataType, BilibiliDataType, DouyinOptionsType, BilibiliOptionsType, GetDataResponseType, ConfigType, NetworksConfigType, };
+import { DouyinRequest, BilibiliRequest } from './Request.js';
+import { type DouyinAPIParams } from './DouyinAPIParams.js';
+import { type BilibiliAPIParams } from './BilibiliAPIParams.js';
+export { DouyinDataType, BilibiliDataType, DouyinOptionsType, BilibiliOptionsType, GetDataResponseType, ConfigType, NetworksConfigType, DouyinRequest, BilibiliRequest, DouyinAPIParams, BilibiliAPIParams };

package/package.json

@@ -1,19 +1,12 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "homepage": "https://github.com/ikenxuan/amagi",
   "scripts": {
-    "app": "node lib/app.js",
-    "start": "pm2 start lib/pm2.json",
-    "stop": "pm2 stop lib/pm2.json",
-    "log": "pm2 log amagi",
-    "restart": "pm2 restart lib/pm2.json",
-    "delpkg": "node src/pkg.js --type del",
-    "dev": "tsx watch src/index.ts",
-    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && tsx src/build.ts && tsx src/cp.ts && npm run delpkg"
+    "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && node src/cp.js"
   },
   "files": [
     "/lib/**/*.js",
@@ -42,8 +35,17 @@
     "lodash": "4.17.21",
     "log4js": "^6.9.1",
     "md5": "^2.3.0",
-    "node-fetch": "^3.3.2",
-    "pm2": "^5.4.2",
-    "yaml": "^2.4.5"
+    "node-fetch": "^3.3.2"
+  },
+  "devDependencies": {
+    "@types/lodash": "latest",
+    "@types/md5": "latest",
+    "@types/node": "latest",
+    "eslint": "latest",
+    "neostandard": "latest",
+    "ts-node": "latest",
+    "tsc-alias": "latest",
+    "tsx": "latest",
+    "typescript": "latest"
   }
 }

package/config/config.yaml

@@ -1,5 +0,0 @@
-# 抖音ck
-douyin:
-
-# B站ck
-bilibili:

package/config/default_config.yaml

@@ -1,5 +0,0 @@
-# 抖音ck
-douyin:
-
-# B站ck
-bilibili:

package/lib/app.js

@@ -1,2 +0,0 @@
-import { StartClient, CreateNewClient } from './index.js';
-(() => { return StartClient(CreateNewClient({ log: true }), { port: 4567 }); })();

package/lib/model/config.d.ts

@@ -1,70 +0,0 @@
-import YAML from 'yaml';
-declare class Config {
-    config: any;
-    watcher: any;
-    constructor();
-    /** 初始化配置 */
-    initCfg(): void;
-    get douyin(): any;
-    get bilibili(): any;
-    /** 默认配置和用户配置 */
-    getDefOrConfig(name: string): any;
-    /** 默认配置 */
-    getdefSet(name: any): any;
-    /** 用户配置 */
-    getConfig(name: any): any;
-    /**
-     * 获取配置yaml
-     * @param type 默认跑配置-defSet，用户配置-config
-     * @param name 名称
-     */
-    getYaml(type: string | undefined, name: any): any;
-    /** 监听配置文件 */
-    watch(file: string, name: string, type?: string): void;
-    /**
-     * 修改设置
-     * @param {'douoyin','bilibili'} name 文件名
-     * @param {String} key 修改的key值
-     * @param {String|Number} value 修改的value值
-     * @param {'config'|'default_config'} type 配置文件或默认
-     */
-    modify(name: string, key: string, value: any, type?: string): void;
-    mergeObjectsWithPriority(objA: any, objB: any): {
-        differences: boolean;
-        result: any;
-    };
-}
-/**
- * YamlReader类提供了对YAML文件的动态读写功能
- */
-export declare class YamlReader {
-    filePath: string;
-    document: any;
-    /**
-    * 创建一个YamlReader实例。
-    * @param {string} filePath - 文件路径
-    */
-    constructor(filePath: string);
-    /**
-    * 解析YAML文件并返回Document对象，保留注释。
-    * @returns {Document} 包含YAML数据和注释的Document对象
-    */
-    parseDocument(): YAML.Document.Parsed<YAML.Alias.Parsed, true> | YAML.Document.Parsed<YAML.Scalar.Parsed, true> | YAML.Document.Parsed<YAML.YAMLMap.Parsed<YAML.ParsedNode, YAML.ParsedNode | null>, true> | YAML.Document.Parsed<YAML.YAMLSeq.Parsed<YAML.ParsedNode>, true>;
-    /**
-     * 修改指定参数的值。
-     * @param {string} key - 参数键名
-     * @param {any} value - 新的参数值
-     */
-    set(key: any, value: any): void;
-    /**
-     * 从YAML文件中删除指定参数。
-     * @param {string} key - 要删除的参数键名
-     */
-    rm(key: any): void;
-    /**
-       * 将更新后的Document对象写入YAML文件中。
-       */
-    write(): void;
-}
-declare const _default: Config;
-export default _default;