@ikenxuan/amagi 2.1.1 → 2.1.2

package/lib/business/bilibili/getdata.js

@@ -102,8 +102,7 @@ export default class BilibiliData {
         const result = await new Networks(options).getData();
         if (result && result.code !== 0) {
             const errorMessage = errorMap[result.code] || '未知错误';
-            console.error(`响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
-            return null;
+            throw new Error(`响应数据失败！\n请求接口类型：${this.type}\n请求URL：${options.url}\n错误代码：${result.code}，\n含义：${errorMessage}`);
         }
         else {
             return result;

package/lib/business/bilibili/getid.js

@@ -1,4 +1,4 @@
-import { Networks } from '../../model/index.js';
+import { Networks, logger } from '../../model/index.js';
 /**
  * return aweme_id
  * @param {string} url 分享连接
@@ -11,7 +11,7 @@ export default async function GetBilibiliID(url) {
         case /video\/([A-Za-z0-9]+)/.test(longLink): {
             const bvideoMatch = longLink.match(/video\/([A-Za-z0-9]+)/);
             result = {
-                type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* BilibiliDataType['单个视频作品数据'] */,
+                type: "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* BilibiliDataType.单个视频作品数据 */,
                 id: bvideoMatch ? bvideoMatch[1] : ''
             };
             break;
@@ -19,7 +19,7 @@ export default async function GetBilibiliID(url) {
         case /play\/(\S+?)\??/.test(longLink): {
             const playMatch = longLink.match(/play\/(\w+)/);
             result = {
-                type: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType['番剧基本信息数据'] */,
+                type: "\u756A\u5267\u57FA\u672C\u4FE1\u606F\u6570\u636E" /* BilibiliDataType.番剧基本信息数据 */,
                 id: playMatch ? playMatch[1] : ''
             };
             break;
@@ -29,7 +29,7 @@ export default async function GetBilibiliID(url) {
             const opusMatch = longLink.match(/^https:\/\/www\.bilibili\.com\/opus\/(\d+)/);
             const dynamic_id = tMatch || opusMatch;
             result = {
-                type: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType['动态详情数据'] */,
+                type: "\u52A8\u6001\u8BE6\u60C5\u6570\u636E" /* BilibiliDataType.动态详情数据 */,
                 dynamic_id: dynamic_id ? dynamic_id[1] : ''
             };
             break;
@@ -37,5 +37,6 @@ export default async function GetBilibiliID(url) {
         default:
             break;
     }
+    logger.mark(result);
     return result;
 }

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

@@ -1,5 +1,5 @@
 import { BilibiliDataType, BilibiliOptionsType, GetDataResponseType } from '../../types/index.js';
-interface resultParams {
+interface configParams {
     /** 请求数据的类型 */
     type: keyof typeof BilibiliDataType;
     /** B站用户ck */
@@ -11,5 +11,5 @@ interface resultParams {
  * @param config
  * @returns
  */
-export default function BilibiliResult(config: resultParams | undefined, options: BilibiliOptionsType): Promise<GetDataResponseType | any>;
+export default function BilibiliResult(config: configParams | undefined, options: BilibiliOptionsType): Promise<GetDataResponseType | any>;
 export {};

package/lib/business/douyin/getdata.js

@@ -125,6 +125,9 @@ export default class DouyinData {
     }
     async GlobalGetData(options) {
         const ResponseData = await new Networks(options).getData();
+        if (ResponseData === '') {
+            throw new Error('获取响应数据失败！抖音ck可能已经失效！\n请求类型：' + this.type + '\n请求URL：' + options.url);
+        }
         return ResponseData;
     }
 }

package/lib/business/douyin/getid.js

@@ -1,4 +1,4 @@
-import { Networks } from '../../model/index.js';
+import { logger, Networks } from '../../model/index.js';
 /**
  * return aweme_id
  * @param {string} url 视频分享连接
@@ -32,5 +32,6 @@ export default async function GetDouyinID(url) {
         default:
             break;
     }
+    logger.mark(result);
     return result;
 }

package/lib/business/douyin/result.d.ts

@@ -1,9 +1,9 @@
 import { DouyinDataType, DouyinOptionsType, GetDataResponseType } from '../../types/index.js';
-interface resultParams {
+interface configParams {
     /** 请求数据的类型 */
     type: keyof typeof DouyinDataType;
-    /** B站用户ck */
+    /** 抖音用户ck */
     cookie: string;
 }
-export default function DouyinResult(config?: resultParams, options?: DouyinOptionsType): Promise<GetDataResponseType>;
+export default function DouyinResult(config?: configParams, options?: DouyinOptionsType): Promise<GetDataResponseType>;
 export {};

package/lib/business/douyin/result.js

@@ -16,9 +16,15 @@ export default async function DouyinResult(config = { cookie: '' }, options = {}
         case "\u5355\u4E2A\u89C6\u9891\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.单个视频作品数据 */:
         case "\u56FE\u96C6\u4F5C\u54C1\u6570\u636E" /* DouyinDataType.图集作品数据 */:
         case "\u8BC4\u8BBA\u6570\u636E" /* DouyinDataType.评论数据 */: {
-            const defurl = options?.url?.toString().match(/(http|https):\/\/.*\.(douyin|iesdouyin)\.com\/[^ ]+/g);
-            const iddata = await GetDouyinID(String(defurl));
-            result = await new DouyinData(config.type, config.cookie).GetData(iddata);
+            const hasaweme_id = options.aweme_id || null;
+            if (hasaweme_id) {
+                result = await new DouyinData(config.type, config.cookie).GetData({ aweme_id: options.aweme_id });
+            }
+            else {
+                const defurl = options.url?.toString().match(/(http|https):\/\/.*\.(douyin|iesdouyin)\.com\/[^ ]+/g);
+                const iddata = await GetDouyinID(String(defurl));
+                result = await new DouyinData(config.type, config.cookie).GetData(iddata);
+            }
             break;
         }
         default:

package/lib/index.js

@@ -15,7 +15,7 @@ const amagi = client;
  */
 export const GetDouyinData = async (type, cookie = '', options = {}) => {
     const data = await DouyinResult({ type, cookie }, options);
-    return data;
+    return data.data;
 };
 /**
  *
@@ -26,5 +26,5 @@ export const GetDouyinData = async (type, cookie = '', options = {}) => {
  */
 export const GetBilibiliData = async (type, cookie = '', options = {}) => {
     const data = await BilibiliResult({ type, cookie }, options);
-    return data;
+    return data.data;
 };

package/lib/model/index.d.ts

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

package/lib/model/index.js

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

package/lib/model/logger.d.ts

@@ -0,0 +1,3 @@
+import log4js from 'log4js'
+declare const logger: log4js.Logger
+export default logger

package/lib/model/logger.js

@@ -0,0 +1,44 @@
+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',
+      filename: 'logs/command',
+      pattern: 'yyyy-MM-dd.log',
+      numBackups: 15,
+      alwaysIncludePattern: true,
+      layout: {
+        type: 'pattern',
+        pattern: '[%d{hh:mm:ss.SSS}][%4.4p] %m'
+      }
+    },
+    pluginConsole: {
+      type: 'stdout',
+      layout: {
+        type: 'pattern',
+        pattern: '%[[%d{hh:mm:ss.SSS}][%4.4p][plugin]%] %m'
+      }
+    },
+    pluginCommand: {
+      type: 'dateFile',
+      filename: 'logs/pluginCommand',
+      pattern: 'yyyy-MM-dd.log',
+      numBackups: 15,
+      alwaysIncludePattern: true,
+      layout: { type: 'pattern', pattern: '[%d{hh:mm:ss.SSS}][%4.4p] %m' }
+    }
+  },
+  categories: {
+    default: { appenders: [ 'console', 'command' ], level: 'info' } // 添加default类别
+  },
+  pm2: true
+})
+const logger = log4js.getLogger()
+export default logger

package/lib/model/networks.js

@@ -1,4 +1,5 @@
 import axios, { AxiosError } from 'axios'
+import logger from './logger.js'
 export default class Networks {
   url
   method
@@ -47,7 +48,7 @@ export default class Networks {
       return result
     }
     catch (error) {
-      console.info(error)
+      logger.info(error)
       return false
     }
   }
@@ -94,7 +95,7 @@ export default class Networks {
           return result
         }
         if (result.status === 429) {
-          console.warn('HTTP 响应状态码: 429')
+          logger.error('HTTP 响应状态码: 429')
           throw new Error('ratelimit triggered, 触发 https://www.douyin.com/ 的速率限制！！！')
         }
         this.axiosInstance = result

package/lib/server/listen.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -31,6 +31,7 @@
   "dependencies": {
     "axios": "^1.7.3",
     "fastify": "^4.28.1",
+    "log4js": "6.9.0",
     "md5": "^2.3.0",
     "pino-pretty": "^11.2.2"
   },