vona-core 5.0.84 → 5.0.87

package/dist/lib/bean/beanBase.d.ts

@@ -12,7 +12,7 @@ export declare class BeanBase extends BeanBaseSimple {
     private [SymbolLoggerChildren];
     protected get $text(): IModuleLocaleText;
     protected get $logger(): winston.Logger;
-    protected $loggerClient(clientName: keyof ILoggerClientRecord): winston.Logger;
+    protected $loggerClient(clientName?: keyof ILoggerClientRecord): winston.Logger;
     protected $loggerChild(childName: keyof ILoggerChildRecord, clientName?: keyof ILoggerClientRecord): winston.Logger;
     protected get $scope(): IBeanScopeContainer;
     get scope(): unknown;

package/dist/lib/bean/beanBase.js

@@ -15,7 +15,7 @@ export class BeanBase extends BeanBaseSimple {
     get $logger() {
         return this.$loggerClient('default');
     }
-    $loggerClient(clientName) {
+    $loggerClient(clientName = 'default') {
         if (!this[SymbolLogger][clientName]) {
             this[SymbolLogger][clientName] = this.app.meta.logger.get(clientName).child({ beanFullName: this.$beanFullName });
         }

package/dist/lib/bean/beanSimple.d.ts

@@ -3,5 +3,5 @@ import type { VonaApplication } from '../core/application.ts';
 export declare class BeanSimple {
     protected app: VonaApplication;
     protected get ctx(): VonaContext;
-    protected get bean(): import("vona").BeanContainer;
+    protected get bean(): import("./beanContainer.ts").BeanContainer;
 }

package/dist/lib/core/index.d.ts

@@ -1,6 +1,7 @@
 export * from './application.ts';
 export * from './config.ts';
 export * from './locales.ts';
+export * from './logger/index.ts';
 export * from './meta.ts';
 export * from './metadata.ts';
 export * from './resource.ts';

package/dist/lib/core/index.js

@@ -1,6 +1,7 @@
 export * from "./application.js";
 export * from "./config.js";
 export * from "./locales.js";
+export * from "./logger/index.js";
 export * from "./meta.js";
 export * from "./metadata.js";
 export * from "./resource.js";

package/dist/lib/core/logger/appLogger.d.ts

@@ -1,4 +1,3 @@
-import type * as Transport from 'winston-transport';
 import type { ILoggerChildRecord, ILoggerClientRecord, ILoggerOptionsClientInfo, LoggerLevel } from '../../../types/interface/logger.ts';
 import * as Winston from 'winston';
 import DailyRotateFile from 'winston-daily-rotate-file';
@@ -9,12 +8,10 @@ export declare class AppLogger extends BeanSimple {
     dispose(): Promise<void>;
     get(clientName?: keyof ILoggerClientRecord): Winston.Logger;
     child(childName?: keyof ILoggerChildRecord, clientName?: keyof ILoggerClientRecord): Winston.Logger;
-    getLevel(clientName?: keyof ILoggerClientRecord): LoggerLevel | undefined;
+    getLevel(clientName?: keyof ILoggerClientRecord): LoggerLevel | false;
     setLevel(level: LoggerLevel | boolean, clientName?: keyof ILoggerClientRecord): void;
     private _createClient;
     private _prepareConfigClient;
-    makeTransportFile(clientInfo: ILoggerOptionsClientInfo, fileName: string, levelStrict?: LoggerLevel): DailyRotateFile | Winston.transports.FileTransportInstance | undefined;
-    makeTransportConsole(clientInfo: ILoggerOptionsClientInfo): Transport | undefined;
-    createTransportFile(fileName: string, clientInfo: ILoggerOptionsClientInfo, options: Winston.transports.FileTransportOptions | DailyRotateFile.DailyRotateFileTransportOptions): DailyRotateFile | Winston.transports.FileTransportInstance | undefined;
+    createTransportFile(fileName: string, clientInfo: ILoggerOptionsClientInfo, options: Winston.transports.FileTransportOptions | DailyRotateFile.DailyRotateFileTransportOptions): DailyRotateFile | Winston.transports.FileTransportInstance;
 }
 export {};

package/dist/lib/core/logger/appLogger.js

@@ -4,7 +4,6 @@ import * as Winston from 'winston';
 import DailyRotateFile from 'winston-daily-rotate-file';
 import { BeanSimple } from "../../bean/beanSimple.js";
 import { deepExtend } from "../../utils/util.js";
-import { formatLoggerConsole, formatLoggerFilter } from "./utils.js";
 const SymbolLoggerInstances = Symbol('SymbolLoggerInstances');
 export class AppLogger extends BeanSimple {
     [SymbolLoggerInstances] = {};
@@ -32,7 +31,7 @@ export class AppLogger extends BeanSimple {
         const envName = `LOGGER_CLIENT_${clientName.toUpperCase()}`;
         const level = this.app.meta.env[envName];
         if (level === 'false')
-            return;
+            return false;
         if (level === 'true' || !level)
             return 'info';
         return level;
@@ -46,7 +45,7 @@ export class AppLogger extends BeanSimple {
         const configClient = this.app.config.logger.clients[clientName];
         if (!configClient)
             throw new Error(`logger client not found: ${clientName}`);
-        const configNode = deepExtend({}, this._prepareConfigClient(clientName, this.app.config.logger.default), this._prepareConfigClient(clientName, configClient));
+        const configNode = deepExtend({}, this._prepareConfigClient(clientName, this.app.config.logger.base), this._prepareConfigClient(clientName, configClient));
         const logger = Winston.createLogger(configNode);
         logger.on('error', err => {
             console.error(err);
@@ -61,21 +60,6 @@ export class AppLogger extends BeanSimple {
             level: () => this.getLevel(clientName),
         }, Winston);
     }
-    makeTransportFile(clientInfo, fileName, levelStrict) {
-        return this.createTransportFile(fileName, clientInfo, {
-            level: levelStrict ?? 'silly',
-            format: Winston.format.combine(formatLoggerFilter({ level: levelStrict ?? clientInfo.level, strict: !!levelStrict }), Winston.format.json()),
-        });
-    }
-    makeTransportConsole(clientInfo) {
-        if (this.app.meta.env.LOGGER_DUMMY === 'true')
-            return;
-        return new Winston.transports.Console({
-            level: 'silly',
-            format: Winston.format.combine(formatLoggerFilter({ level: clientInfo.level, silly: true }), Winston.format.colorize(), formatLoggerConsole()),
-            forceConsole: true,
-        });
-    }
     createTransportFile(fileName, clientInfo, options) {
         const dirname = this.app.config.server.loggerDir;
         if (!fse.existsSync(dirname)) {
@@ -83,8 +67,7 @@ export class AppLogger extends BeanSimple {
                 fse.ensureDirSync(dirname);
             });
             if (err) {
-                console.error(`========== Logger dir not exists: ${dirname} ==========`);
-                return;
+                throw new Error(`Failed to create logger dir: ${dirname}`);
             }
         }
         const configRotate = this.app.config.logger.rotate;

package/dist/lib/core/logger/loggerDefault.d.ts

@@ -1,5 +1,5 @@
-import type { PowerPartial } from 'vona';
 import type { VonaAppInfo } from '../../../types/application/app.ts';
 import type { ConfigLogger } from '../../../types/interface/logger.ts';
 import type { VonaConfigEnv } from '../../../types/utils/env.ts';
+import type { PowerPartial } from '../../../types/utils/powerPartial.ts';
 export declare function combineLoggerDefault(_appInfo: VonaAppInfo, env: VonaConfigEnv): PowerPartial<ConfigLogger>;

package/dist/lib/core/logger/loggerDefault.js

@@ -13,24 +13,13 @@ export function combineLoggerDefault(_appInfo, env) {
                 };
             },
         },
-        default(_clientInfo, { format }) {
+        base(_clientInfo, { format }) {
             return {
                 format: format.combine(formatLoggerAxiosError({ stack: true }), formatLoggerCtx(), format.errors({ stack: true }), format.splat(), format.timestamp()),
                 transports: undefined,
             };
         },
-        clients: {
-            default(clientInfo) {
-                const transports = [
-                    this.meta.logger.makeTransportFile(clientInfo, 'error', 'error'),
-                    this.meta.logger.makeTransportFile(clientInfo, 'warn', 'warn'),
-                    this.meta.logger.makeTransportFile(clientInfo, 'http', 'http'),
-                    this.meta.logger.makeTransportFile(clientInfo, 'combined'),
-                    this.meta.logger.makeTransportConsole(clientInfo),
-                ].filter(item => !!item);
-                return { transports };
-            },
-        },
+        clients: {},
     };
     return configDefault;
 }

package/dist/lib/core/logger/utils.d.ts

@@ -1,5 +1,6 @@
+import type { ILoggerOptionsClientInfo } from '../../../types/interface/logger.ts';
 import * as Winston from 'winston';
 export declare const formatLoggerAxiosError: Winston.Logform.FormatWrap;
 export declare const formatLoggerCtx: Winston.Logform.FormatWrap;
 export declare const formatLoggerFilter: Winston.Logform.FormatWrap;
-export declare const formatLoggerConsole: () => Winston.Logform.Format;
+export declare const formatLoggerConsole: (clientInfo: ILoggerOptionsClientInfo) => Winston.Logform.Format;

package/dist/lib/core/logger/utils.js

@@ -1,9 +1,9 @@
 import { isEmptyObject } from '@cabloy/utils';
 import chalk from 'chalk';
 import { LEVEL, MESSAGE } from 'triple-beam';
-import { useApp } from 'vona';
 import * as Winston from 'winston';
 import { cast } from "../../../types/utils/cast.js";
+import { useApp } from "../../framework/useApp.js";
 const SymbolLoggerMessage = Symbol('SymbolLoggerMessage');
 export const formatLoggerAxiosError = Winston.format((einfo, { stack, cause }) => {
     if ((einfo instanceof Error && einfo.constructor.name.includes('AxiosError')) || einfo.name === 'AxiosError') {
@@ -47,15 +47,16 @@ export const formatLoggerFilter = Winston.format((info, opts) => {
         return __formatLoggerFilterCheckInfo(info);
     return false;
 });
-export const formatLoggerConsole = () => {
+export const formatLoggerConsole = (clientInfo) => {
     return Winston.format.printf(({ timestamp, level, stack, message, name, beanFullName, durationMs, ...meta }) => {
+        const textClientName = clientInfo.clientName === 'default' ? '' : ` ${chalk.cyan(`[${clientInfo.clientName}]`)}`;
         const textName = name ? ` ${chalk.cyan(`[${name}]`)}` : '';
         const textBeanFullName = beanFullName ? ` ${chalk.gray(`[${beanFullName}]`)}` : '';
         const textMeta = !isEmptyObject(meta) ? ` ${JSON.stringify(meta)}` : '';
         const textMessage = ` ${message}`;
         const textDurationMs = durationMs !== undefined ? ` ${chalk.cyan(`+${durationMs}ms`)}` : '';
         const textStack = stack ? `\n${stack}` : '';
-        return `${timestamp} ${level}${textName}${textBeanFullName}${textMeta}${textMessage}${textDurationMs}${textStack}`;
+        return `${timestamp} ${level}${textClientName}${textName}${textBeanFullName}${textMeta}${textMessage}${textDurationMs}${textStack}`;
     });
 };
 function __formatLoggerFilterCheckInfo(info) {

package/dist/lib/framework/process.js

@@ -1,3 +1,4 @@
+import { catchErrorSync } from '@cabloy/utils';
 import { closeApp, useApp } from "./useApp.js";
 export function handleProcessWork() {
     process.once('SIGUSR2', async () => {
@@ -15,8 +16,15 @@ export function handleProcessWork() {
             process.kill(process.pid, 'SIGTERM');
         }
         else {
-            const logger = app.meta.logger.get();
-            logger.error(err);
+            const [logger] = catchErrorSync(() => {
+                return app.meta.logger.get();
+            });
+            if (logger) {
+                logger.error(err);
+            }
+            else {
+                console.error(err);
+            }
             if (!app.meta.appStarted) {
                 await app.meta.logger.dispose();
                 process.kill(process.pid, 'SIGTERM');

package/dist/types/interface/logger.d.ts

@@ -2,7 +2,7 @@ import type * as Winston from 'winston';
 import type DailyRotateFile from 'winston-daily-rotate-file';
 export interface ILoggerOptionsClientInfo {
     clientName: keyof ILoggerClientRecord;
-    level: () => (LoggerLevel | undefined);
+    level: () => (LoggerLevel | false);
 }
 export type TypeLoggerOptions = Winston.LoggerOptions | ((clientInfo: ILoggerOptionsClientInfo, winston: typeof Winston) => Winston.LoggerOptions);
 export type TypeLoggerRotateOptions = (fileName: string, winston: typeof Winston, clientInfo: ILoggerOptionsClientInfo) => DailyRotateFile.DailyRotateFileTransportOptions;
@@ -11,13 +11,14 @@ export interface ILoggerClientRecord {
 }
 export interface ILoggerChildRecord {
 }
+export interface ILoggerRotateConfig {
+    enable: boolean;
+    options: TypeLoggerRotateOptions;
+}
 export interface ConfigLogger {
-    default: TypeLoggerOptions;
+    base: TypeLoggerOptions;
     clients: Record<keyof ILoggerClientRecord, TypeLoggerOptions>;
-    rotate: {
-        enable: boolean;
-        options: TypeLoggerRotateOptions;
-    };
+    rotate: ILoggerRotateConfig;
 }
 export type LoggerLevel = 'error' | 'warn' | 'info' | 'http' | 'verbose' | 'debug' | 'silly';
 declare module 'winston' {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.84",
+  "version": "5.0.87",
   "description": "vona",
   "publishConfig": {
     "access": "public"