@ikenxuan/amagi 1.4.5 → 1.4.6

package/lib/model/logger.d.ts

@@ -1,3 +1,2 @@
-import log4js from 'log4js';
-declare const logger: log4js.Logger;
+declare const logger: import("pino").Logger<never>;
 export default logger;

package/lib/model/logger.js

@@ -1,28 +1,4 @@
-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',
-            },
-        },
-    },
-    categories: {
-        default: { appenders: ['console'], level: 'debug' },
-    },
-});
-const logger = log4js.getLogger();
+import pino from 'pino';
+import pretty from 'pino-pretty';
+const logger = pino(pretty());
 export default logger;

package/lib/model/networks.js

@@ -51,7 +51,7 @@ export default class Networks {
             return result;
         }
         catch (error) {
-            logger.warn(error);
+            logger.info(error);
             return false;
         }
     }
@@ -215,7 +215,7 @@ export default class Networks {
         const controller = new AbortController();
         return new Promise((resolve, reject) => {
             this.timer = setTimeout(() => {
-                logger.mark('执行力');
+                logger.info('执行力');
                 controller.abort();
                 resolve(new Response('timeout', { status: 504, statusText: 'timeout' }));
             }, timeout);

package/lib/server/listen.js

@@ -1,11 +1,9 @@
 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}`));
+        logger.info(`amagi server listening on ${address}`);
     });
 };

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@ikenxuan/amagi",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "homepage": "https://github.com/ikenxuan/amagi",
   "scripts": {
+    "dev": "tsx src/dev.ts",
     "build": "tsc --project tsconfig.json && tsc-alias -p tsconfig.json && node src/cp.js"
   },
   "files": [
@@ -33,9 +34,10 @@
     "chokidar": "^3.6.0",
     "fastify": "^4.28.1",
     "lodash": "4.17.21",
-    "log4js": "^6.9.1",
     "md5": "^2.3.0",
-    "node-fetch": "^3.3.2"
+    "node-fetch": "^3.3.2",
+    "pino": "^9.3.2",
+    "pino-pretty": "^11.2.2"
   },
   "devDependencies": {
     "@types/lodash": "latest",