@ikenxuan/amagi 4.4.18 → 4.4.19

package/dist/default/cjs/index.cjs

@@ -7,6 +7,9 @@ var crypto = require('crypto');
 var express = require('express');
 var chalk = require('chalk');
 var log4js = require('log4js');
+var path = require('path');
+var url = require('url');
+var fs = require('fs');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -14,6 +17,12 @@ var axios__default = /*#__PURE__*/_interopDefault(axios);
 var crypto__default = /*#__PURE__*/_interopDefault(crypto);
 var express__default = /*#__PURE__*/_interopDefault(express);
 var log4js__default = /*#__PURE__*/_interopDefault(log4js);
+var path__default = /*#__PURE__*/_interopDefault(path);
+var fs__default = /*#__PURE__*/_interopDefault(fs);
+
+// node_modules/tsup/assets/cjs_shims.js
+var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.src || new URL("main.js", document.baseURI).href;
+var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
 
 // src/platform/bilibili/API.ts
 var BiLiBiLiAPI = class {
@@ -2241,6 +2250,20 @@ async function getKuaishouData(methodType, arg2, arg3) {
 var fetchDouyinData = getDouyinData;
 var fetchBilibiliData = getBilibiliData;
 var fetchKuaishouData = getKuaishouData;
+var getPackageLogsPath = () => {
+  const currentFileUrl = importMetaUrl;
+  const currentFilePath = url.fileURLToPath(currentFileUrl);
+  const currentDir = path__default.default.dirname(currentFilePath);
+  let packageRoot = currentDir;
+  while (packageRoot !== path__default.default.dirname(packageRoot)) {
+    if (fs__default.default.existsSync(path__default.default.join(packageRoot, "package.json"))) {
+      break;
+    }
+    packageRoot = path__default.default.dirname(packageRoot);
+  }
+  return path__default.default.join(packageRoot, "logs");
+};
+var logsPath = getPackageLogsPath();
 log4js__default.default.configure({
   appenders: {
     console: {
@@ -2252,7 +2275,7 @@ log4js__default.default.configure({
     },
     command: {
       type: "dateFile",
-      filename: "logs/command",
+      filename: path__default.default.join(logsPath, "application", "command"),
       pattern: "yyyy-MM-dd.log",
       numBackups: 15,
       alwaysIncludePattern: true,
@@ -2261,25 +2284,28 @@ log4js__default.default.configure({
         pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
       }
     },
-    pluginConsole: {
+    httpConsole: {
       type: "stdout",
       layout: {
         type: "pattern",
-        pattern: "%[[%d{hh:mm:ss.SSS}][%4.4p][plugin]%] %m"
+        pattern: "%[[amagi][%d{hh:mm:ss.SSS}][HTTP]%] %m"
       }
     },
-    pluginCommand: {
+    httpRequest: {
       type: "dateFile",
-      filename: "logs/pluginCommand",
+      filename: path__default.default.join(logsPath, "http", "requests"),
       pattern: "yyyy-MM-dd.log",
-      numBackups: 15,
+      numBackups: 30,
       alwaysIncludePattern: true,
-      layout: { type: "pattern", pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m" }
+      layout: {
+        type: "pattern",
+        pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
+      }
     }
   },
   categories: {
-    default: { appenders: ["console", "command"], level: "info" }
-    // 添加default类别
+    default: { appenders: ["console", "command"], level: "info" },
+    http: { appenders: ["httpConsole", "httpRequest"], level: "debug" }
   },
   pm2: true
 });
@@ -2319,19 +2345,43 @@ var CustomLogger = class {
   mark(message, ...args) {
     this.logger.mark(message, ...args);
   }
+  debug(message, ...args) {
+    this.logger.debug(message, ...args);
+  }
 };
 var logger = new CustomLogger("default");
+var httpLogger = new CustomLogger("http");
 var logMiddleware = (pathsToLog) => {
   return (req, res, next) => {
-    if (!pathsToLog || pathsToLog.some((path) => req.url.startsWith(path))) {
+    if (!pathsToLog || pathsToLog.some((path2) => req.url.startsWith(path2))) {
       const startTime = Date.now();
       const url = req.url;
       const method = req.method;
       const clientIP = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
+      const referer = req.headers["referer"] || req.headers["referrer"] || "-";
+      const contentType = req.headers["content-type"] || "-";
+      const requestSize = req.headers["content-length"] || "0";
+      const protocol = req.protocol;
+      const httpVersion = req.httpVersion;
       res.on("finish", () => {
         const responseTime = Date.now() - startTime;
         const statusCode = res.statusCode;
-        logger.info(`[${method}] ${url} (Status: ${statusCode}, Time: ${responseTime}ms, Client: ${clientIP})`);
+        const responseSize = res.get("content-length") || "0";
+        const logData = {
+          method,
+          url,
+          statusCode,
+          responseTime: `${responseTime}ms`,
+          clientIP,
+          referer,
+          contentType,
+          requestSize: `${requestSize}B`,
+          responseSize: `${responseSize}B`,
+          protocol,
+          httpVersion,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        httpLogger.debug(JSON.stringify(logData));
       });
     }
     next();
@@ -2618,6 +2668,7 @@ exports.fetchKuaishouData = fetchKuaishouData;
 exports.getBilibiliData = getBilibiliData;
 exports.getDouyinData = getDouyinData;
 exports.getKuaishouData = getKuaishouData;
+exports.httpLogger = httpLogger;
 exports.kuaishou = kuaishou;
 exports.kuaishouAPI = kuaishouAPI;
 exports.kuaishouApiUrls = kuaishouApiUrls;

package/dist/default/esm/index.mjs

@@ -3,6 +3,9 @@ import crypto from 'crypto';
 import express from 'express';
 import { Chalk } from 'chalk';
 import log4js from 'log4js';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
 
 // src/platform/bilibili/API.ts
 var BiLiBiLiAPI = class {
@@ -2230,6 +2233,20 @@ async function getKuaishouData(methodType, arg2, arg3) {
 var fetchDouyinData = getDouyinData;
 var fetchBilibiliData = getBilibiliData;
 var fetchKuaishouData = getKuaishouData;
+var getPackageLogsPath = () => {
+  const currentFileUrl = import.meta.url;
+  const currentFilePath = fileURLToPath(currentFileUrl);
+  const currentDir = path.dirname(currentFilePath);
+  let packageRoot = currentDir;
+  while (packageRoot !== path.dirname(packageRoot)) {
+    if (fs.existsSync(path.join(packageRoot, "package.json"))) {
+      break;
+    }
+    packageRoot = path.dirname(packageRoot);
+  }
+  return path.join(packageRoot, "logs");
+};
+var logsPath = getPackageLogsPath();
 log4js.configure({
   appenders: {
     console: {
@@ -2241,7 +2258,7 @@ log4js.configure({
     },
     command: {
       type: "dateFile",
-      filename: "logs/command",
+      filename: path.join(logsPath, "application", "command"),
       pattern: "yyyy-MM-dd.log",
       numBackups: 15,
       alwaysIncludePattern: true,
@@ -2250,25 +2267,28 @@ log4js.configure({
         pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
       }
     },
-    pluginConsole: {
+    httpConsole: {
       type: "stdout",
       layout: {
         type: "pattern",
-        pattern: "%[[%d{hh:mm:ss.SSS}][%4.4p][plugin]%] %m"
+        pattern: "%[[amagi][%d{hh:mm:ss.SSS}][HTTP]%] %m"
       }
     },
-    pluginCommand: {
+    httpRequest: {
       type: "dateFile",
-      filename: "logs/pluginCommand",
+      filename: path.join(logsPath, "http", "requests"),
       pattern: "yyyy-MM-dd.log",
-      numBackups: 15,
+      numBackups: 30,
       alwaysIncludePattern: true,
-      layout: { type: "pattern", pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m" }
+      layout: {
+        type: "pattern",
+        pattern: "[%d{hh:mm:ss.SSS}][%4.4p] %m"
+      }
     }
   },
   categories: {
-    default: { appenders: ["console", "command"], level: "info" }
-    // 添加default类别
+    default: { appenders: ["console", "command"], level: "info" },
+    http: { appenders: ["httpConsole", "httpRequest"], level: "debug" }
   },
   pm2: true
 });
@@ -2308,19 +2328,43 @@ var CustomLogger = class {
   mark(message, ...args) {
     this.logger.mark(message, ...args);
   }
+  debug(message, ...args) {
+    this.logger.debug(message, ...args);
+  }
 };
 var logger = new CustomLogger("default");
+var httpLogger = new CustomLogger("http");
 var logMiddleware = (pathsToLog) => {
   return (req, res, next) => {
-    if (!pathsToLog || pathsToLog.some((path) => req.url.startsWith(path))) {
+    if (!pathsToLog || pathsToLog.some((path2) => req.url.startsWith(path2))) {
       const startTime = Date.now();
       const url = req.url;
       const method = req.method;
       const clientIP = req.headers["x-forwarded-for"] || req.socket.remoteAddress;
+      const referer = req.headers["referer"] || req.headers["referrer"] || "-";
+      const contentType = req.headers["content-type"] || "-";
+      const requestSize = req.headers["content-length"] || "0";
+      const protocol = req.protocol;
+      const httpVersion = req.httpVersion;
       res.on("finish", () => {
         const responseTime = Date.now() - startTime;
         const statusCode = res.statusCode;
-        logger.info(`[${method}] ${url} (Status: ${statusCode}, Time: ${responseTime}ms, Client: ${clientIP})`);
+        const responseSize = res.get("content-length") || "0";
+        const logData = {
+          method,
+          url,
+          statusCode,
+          responseTime: `${responseTime}ms`,
+          clientIP,
+          referer,
+          contentType,
+          requestSize: `${requestSize}B`,
+          responseSize: `${responseSize}B`,
+          protocol,
+          httpVersion,
+          timestamp: (/* @__PURE__ */ new Date()).toISOString()
+        };
+        httpLogger.debug(JSON.stringify(logData));
       });
     }
     next();
@@ -2580,4 +2624,4 @@ var CreateApp = createAmagiClient;
 var Client = CreateApp;
 var amagi = Client;
 
-export { BilibiliValidateData, CreateApp, DouyinValidateData, KuaishouAPI, KusiahouValidateData, Networks, amagi, amagiClient, av2bv, bilibili, bilibiliAPI, bilibiliApiUrls, bilibiliErrorCodeMap, bilibiliUtils, bv2av, Client as default, douyin, douyinAPI, douyinApiUrls, douyinSign, douyinUtils, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, kuaishou, kuaishouAPI, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, wbi_sign };
+export { BilibiliValidateData, CreateApp, DouyinValidateData, KuaishouAPI, KusiahouValidateData, Networks, amagi, amagiClient, av2bv, bilibili, bilibiliAPI, bilibiliApiUrls, bilibiliErrorCodeMap, bilibiliUtils, bv2av, Client as default, douyin, douyinAPI, douyinApiUrls, douyinSign, douyinUtils, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, httpLogger, kuaishou, kuaishouAPI, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, wbi_sign };

package/dist/default/index.d.ts

@@ -13479,8 +13479,10 @@ declare class CustomLogger {
     warn(message: any, ...args: any[]): void;
     error(message: any, ...args: any[]): void;
     mark(message: any, ...args: any[]): void;
+    debug(message: any, ...args: any[]): void;
 }
 declare const logger: CustomLogger;
+declare const httpLogger: CustomLogger;
 
 /**
  * 创建一个日志中间件，用于记录特定请求的详细信息
@@ -14216,8 +14218,8 @@ declare class amagiClient {
 
 /** amagi 的构造函数类型 */
 type AmagiConstructor = {
-    new (options: cookiesOptions): amagiClient;
-    (options: cookiesOptions): amagiClient;
+    new (options?: cookiesOptions): amagiClient;
+    (options?: cookiesOptions): amagiClient;
     /** 抖音相关功能模块 (工具集) */
     douyin: typeof douyinUtils;
     /** B站相关功能模块 (工具集) */
@@ -14255,4 +14257,4 @@ declare const CreateApp: AmagiConstructor;
 declare const Client: AmagiConstructor;
 declare const amagi: AmagiConstructor;
 
-export { type APIErrorType, type BiliAv2Bv, type BiliBangumiVideoInfo, type BiliBangumiVideoPlayurlIsLogin, type BiliBangumiVideoPlayurlNoLogin, type BiliBiliVideoPlayurlNoLogin, type BiliBv2AV, type BiliCheckQrcode, type BiliDynamicCard, type BiliDynamicInfo, type BiliEmojiList, type BiliLiveRoomDef, type BiliLiveRoomDetail, type BiliNewLoginQrcode, type BiliOneWork, type BiliUserDynamic, type BiliUserFullView, type BiliUserProfile, type BiliVideoPlayurlIsLogin, type BiliWorkComments, type BilibiliDataOptions, type BilibiliDataOptionsMap, type BilibiliMethodOptionsMap, type BilibiliRequest, BilibiliValidateData, CreateApp, type DouyinDataOptions, type DouyinDataOptionsMap, type DouyinMethodOptionsMap, type DouyinRequest, DouyinValidateData, type DyEmojiList, type DyEmojiProList, type DyImageAlbumWork, type DyMusicWork, type DySearchInfo, type DySlidesWork, type DySuggestWords, type DyUserInfo, type DyUserLiveVideos, type DyUserPostVideos, type DyVideoWork, type DyWorkComments, type KsEmojiList, type KsOneWork, type KsWorkComments, KuaishouAPI, type KuaishouDataOptions, type KuaishouDataOptionsMap, type KuaishouMethodOptionsMap, type KusiahouRequest, KusiahouValidateData, Networks, type NetworksConfigType, type OmitMethodType, type TypeControl, amagi, amagiClient, av2bv, bilibili, bilibiliAPI, bilibiliApiUrls, bilibiliErrorCodeMap, bilibiliUtils, bv2av, type cookiesOptions, Client as default, douyin, douyinAPI, douyinApiUrls, douyinSign, douyinUtils, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, kuaishou, kuaishouAPI, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, wbi_sign };
+export { type APIErrorType, type BiliAv2Bv, type BiliBangumiVideoInfo, type BiliBangumiVideoPlayurlIsLogin, type BiliBangumiVideoPlayurlNoLogin, type BiliBiliVideoPlayurlNoLogin, type BiliBv2AV, type BiliCheckQrcode, type BiliDynamicCard, type BiliDynamicInfo, type BiliEmojiList, type BiliLiveRoomDef, type BiliLiveRoomDetail, type BiliNewLoginQrcode, type BiliOneWork, type BiliUserDynamic, type BiliUserFullView, type BiliUserProfile, type BiliVideoPlayurlIsLogin, type BiliWorkComments, type BilibiliDataOptions, type BilibiliDataOptionsMap, type BilibiliMethodOptionsMap, type BilibiliRequest, BilibiliValidateData, CreateApp, type DouyinDataOptions, type DouyinDataOptionsMap, type DouyinMethodOptionsMap, type DouyinRequest, DouyinValidateData, type DyEmojiList, type DyEmojiProList, type DyImageAlbumWork, type DyMusicWork, type DySearchInfo, type DySlidesWork, type DySuggestWords, type DyUserInfo, type DyUserLiveVideos, type DyUserPostVideos, type DyVideoWork, type DyWorkComments, type KsEmojiList, type KsOneWork, type KsWorkComments, KuaishouAPI, type KuaishouDataOptions, type KuaishouDataOptionsMap, type KuaishouMethodOptionsMap, type KusiahouRequest, KusiahouValidateData, Networks, type NetworksConfigType, type OmitMethodType, type TypeControl, amagi, amagiClient, av2bv, bilibili, bilibiliAPI, bilibiliApiUrls, bilibiliErrorCodeMap, bilibiliUtils, bv2av, type cookiesOptions, Client as default, douyin, douyinAPI, douyinApiUrls, douyinSign, douyinUtils, fetchBilibiliData, fetchDouyinData, fetchKuaishouData, getBilibiliData, getDouyinData, getKuaishouData, httpLogger, kuaishou, kuaishouAPI, kuaishouApiUrls, kuaishouUtils, logMiddleware, logger, qtparam, registerBilibiliRoutes, registerDouyinRoutes, registerKuaishouRoutes, wbi_sign };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "4.4.18",
+  "version": "4.4.19",
   "description": "抖音、B站的 web 端相关数据接口基于 Node.js 的实现",
   "keywords": [
     "douyin",