vona-core 5.0.104 → 5.0.106

package/dist/lib/core/context.js

@@ -1,121 +0,0 @@
-import { cast } from "../../types/utils/cast.js";
-import { BeanContainer } from "../bean/beanContainer.js";
-import { appResource } from "./resource.js";
-const BEAN = Symbol.for('Context#__bean');
-const INNERACCESS = Symbol.for('Context#__inneraccess');
-const CTXCALLER = Symbol.for('Context#__ctxcaller');
-const ONIONSDYNAMIC = Symbol.for('Context#__onionsdynamic');
-export const contextBase = {
-    get bean() {
-        const self = cast(this);
-        if (!self[BEAN]) {
-            self[BEAN] = BeanContainer.create(self.app, self);
-        }
-        return self[BEAN];
-    },
-    get locale() {
-        const self = cast(this);
-        return self.__getLocale();
-    },
-    set locale(value) {
-        const self = cast(this);
-        self.__setLocale(value);
-    },
-    get tz() {
-        const self = cast(this);
-        return self.__getTz();
-    },
-    set tz(value) {
-        const self = cast(this);
-        self.__setTz(value);
-    },
-    get instanceName() {
-        const self = cast(this);
-        return self.__getInstanceName();
-    },
-    set instanceName(value) {
-        const self = cast(this);
-        self.__setInstanceName(value);
-    },
-    get config() {
-        const self = cast(this);
-        const serviceInstance = cast(self.app.bean._getBean('a-instance.service.instance'));
-        return serviceInstance.getConfig(self.instanceName) || self.app.config;
-    },
-    get innerAccess() {
-        return this[INNERACCESS];
-    },
-    set innerAccess(value) {
-        this[INNERACCESS] = value;
-    },
-    get ctxCaller() {
-        return this[CTXCALLER];
-    },
-    set ctxCaller(value) {
-        this[CTXCALLER] = value;
-    },
-    getController() {
-        const self = cast(this);
-        return self.route?.controller;
-    },
-    getControllerPrototype() {
-        const self = cast(this);
-        const controller = self.getController();
-        if (!controller)
-            return undefined;
-        return controller.prototype;
-    },
-    getControllerBean() {
-        const self = cast(this);
-        const beanFullName = self.getControllerBeanFullName();
-        if (!beanFullName)
-            return;
-        return self.app.bean._getBean(beanFullName);
-    },
-    getControllerBeanFullName() {
-        const self = cast(this);
-        const controller = self.getController();
-        if (!controller)
-            return undefined;
-        const beanOptions = appResource.getBean(controller);
-        return beanOptions?.beanFullName;
-    },
-    getHandler() {
-        const self = cast(this);
-        return self.route?.actionDescriptor?.value;
-    },
-    getHandlerName() {
-        const self = cast(this);
-        return self.route?.action;
-    },
-    get onionsDynamic() {
-        return this[ONIONSDYNAMIC];
-    },
-    set onionsDynamic(value) {
-        this[ONIONSDYNAMIC] = value;
-    },
-    get acceptJSON() {
-        const self = cast(this);
-        if (self.path.endsWith('.json'))
-            return true;
-        if (self.response.type && self.response.type.includes('json'))
-            return true;
-        if (self.request.headers['content-type']?.includes('application/json') && self.accepts('json') === 'json')
-            return true;
-        if (self.accepts('html', 'text', 'json') === 'json')
-            return true;
-        return false;
-    },
-    redirect(url, status) {
-        const self = cast(this);
-        // checkOrigin
-        if (!url.startsWith('/')) {
-            const origin = cast(self.app.bean).security.checkOrigin(url, self.host);
-            if (!origin)
-                self.app.throw(403);
-        }
-        // throw
-        status = status ?? 302;
-        self.app.throw(status, url);
-    },
-};

package/dist/lib/core/ctxCounter.js

@@ -1,20 +0,0 @@
-import { sleep } from '@cabloy/utils';
-export class CtxCounter {
-    _ctxCounter = 0;
-    get current() {
-        return this._ctxCounter;
-    }
-    increment() {
-        return ++this._ctxCounter;
-    }
-    decrement() {
-        return --this._ctxCounter;
-    }
-    async awaitUntilZero() {
-        while (true) {
-            if (this.current === 0)
-                break;
-            await sleep(200);
-        }
-    }
-}

package/dist/lib/core/index.js

@@ -1,7 +0,0 @@
-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/locales.js

@@ -1,6 +0,0 @@
-import enUs from "../locale/en-us.js";
-import zhCn from "../locale/zh-cn.js";
-export default {
-    'en-us': enUs,
-    'zh-cn': zhCn,
-};

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

@@ -1,103 +0,0 @@
-import { catchErrorSync } from '@cabloy/utils';
-import fse from 'fs-extra';
-import * as Winston from 'winston';
-import DailyRotateFile from 'winston-daily-rotate-file';
-import { BeanSimple } from "../../bean/beanSimple.js";
-import { deepExtend } from "../../utils/util.js";
-const SymbolLoggerInstances = Symbol('SymbolLoggerInstances');
-export class AppLogger extends BeanSimple {
-    [SymbolLoggerInstances] = {};
-    async dispose() {
-        for (const key in this[SymbolLoggerInstances]) {
-            const logger = this[SymbolLoggerInstances][key];
-            await _closeLogger(logger);
-        }
-    }
-    get(clientName) {
-        clientName = clientName || 'default';
-        if (!this[SymbolLoggerInstances][clientName]) {
-            this[SymbolLoggerInstances][clientName] = this._createClient(clientName);
-        }
-        return this[SymbolLoggerInstances][clientName];
-    }
-    child(childName, clientName) {
-        const logger = this.get(clientName);
-        if (!childName)
-            return logger;
-        return logger.child({ name: childName });
-    }
-    getLevel(clientName) {
-        clientName = clientName || 'default';
-        const envName = `LOGGER_CLIENT_${clientName.toUpperCase()}`;
-        const level = this.app.meta.env[envName];
-        if (level === 'false')
-            return false;
-        if (level === 'true' || !level)
-            return 'info';
-        return level;
-    }
-    setLevel(level, clientName) {
-        clientName = clientName || 'default';
-        const envName = `LOGGER_CLIENT_${clientName.toUpperCase()}`;
-        this.app.meta.env[envName] = level.toString();
-    }
-    _createClient(clientName) {
-        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.base), this._prepareConfigClient(clientName, configClient));
-        const logger = Winston.createLogger(configNode);
-        logger.on('error', err => {
-            console.error(err);
-        });
-        return logger;
-    }
-    _prepareConfigClient(clientName, configClient) {
-        if (typeof configClient !== 'function')
-            return configClient;
-        return configClient.call(this.app, {
-            clientName,
-            level: () => this.getLevel(clientName),
-        }, Winston);
-    }
-    createTransportFile(fileName, clientInfo, options) {
-        const dirname = this.app.config.logger.baseDir;
-        if (!fse.existsSync(dirname)) {
-            const [_, err] = catchErrorSync(() => {
-                fse.ensureDirSync(dirname);
-            });
-            if (err) {
-                throw new Error(`Failed to create logger dir: ${dirname}`);
-            }
-        }
-        const configRotate = this.app.config.logger.rotate.call(this, fileName, Winston, clientInfo);
-        let optionsFile;
-        if (configRotate.enable) {
-            optionsFile = configRotate;
-        }
-        else {
-            optionsFile = Object.assign({}, { filename: `${fileName}.log` }, configRotate);
-        }
-        const _options = deepExtend({ dirname }, optionsFile, options);
-        if (configRotate.enable) {
-            const transport = new DailyRotateFile(_options);
-            transport.on('error', err => {
-                console.error(err);
-            });
-            return transport;
-        }
-        else {
-            return new Winston.transports.File(_options);
-        }
-    }
-}
-async function _closeLogger(logger) {
-    return new Promise(resolve => {
-        if (logger.__closed__)
-            return resolve(true);
-        logger.end(() => {
-            logger.__closed__ = true;
-            resolve(true);
-        });
-    });
-}

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

@@ -1,2 +0,0 @@
-export * from "./appLogger.js";
-export * from "./utils.js";

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

@@ -1,76 +0,0 @@
-import { isEmptyObject } from '@cabloy/utils';
-import chalk from 'chalk';
-import { LEVEL, MESSAGE } from 'triple-beam';
-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') {
-        const info = Object.assign({}, einfo, {
-            level: einfo.level,
-            [LEVEL]: einfo[LEVEL] || einfo.level,
-            message: einfo.message,
-            [MESSAGE]: einfo[MESSAGE] || einfo.message,
-        });
-        if (stack)
-            info.stack = einfo.stack;
-        if (cause)
-            info.cause = einfo.cause;
-        info.message = `${info.message}: ${cast(info.config).url}`;
-        info[MESSAGE] = `${info[MESSAGE]}: ${cast(info.config).url}`;
-        delete info.config;
-        delete info.request;
-        delete info.response;
-        return info;
-    }
-    return einfo;
-});
-export const formatLoggerCtx = Winston.format((info, _opts) => {
-    const app = useApp();
-    if (!app.ctx || !app.ctx.method || !app.ctx.path)
-        return info;
-    info.method = app.ctx.method;
-    info.path = app.ctx.path;
-    return info;
-});
-export const formatLoggerDummy = Winston.format(info => {
-    const app = useApp();
-    if (app.meta.env.LOGGER_DUMMY === 'true')
-        return false;
-    return info;
-});
-export const formatLoggerFilter = Winston.format((info, opts) => {
-    const level = typeof opts.level === 'function' ? opts.level() : opts.level;
-    if (!level)
-        return false;
-    if (opts.strict) {
-        if (Winston.config.npm.levels[info.level] === Winston.config.npm.levels[level])
-            return __formatLoggerFilterCheckInfo(info);
-        return false;
-    }
-    if (Winston.config.npm.levels[info.level] <= Winston.config.npm.levels[level] || (opts.silly && info.level === 'silly'))
-        return __formatLoggerFilterCheckInfo(info);
-    return false;
-});
-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}${textClientName}${textName}${textBeanFullName}${textMeta}${textMessage}${textDurationMs}${textStack}`;
-    });
-};
-function __formatLoggerFilterCheckInfo(info) {
-    if (typeof info.message === 'function') {
-        if (info.message[SymbolLoggerMessage] === undefined) {
-            info.message[SymbolLoggerMessage] = info.message();
-        }
-        info.message = info.message[SymbolLoggerMessage];
-    }
-    return info;
-}

package/dist/lib/core/meta.js

@@ -1,120 +0,0 @@
-import { EnumAppEvent } from "../../types/index.js";
-import { BeanSimple } from "../bean/beanSimple.js";
-import { AppLocale, BeanScopeContainer } from "../bean/index.js";
-import { CtxCounter } from "./ctxCounter.js";
-import { AppLogger } from "./logger/appLogger.js";
-import { appMetadata } from "./metadata.js";
-import { appResource } from "./resource.js";
-const SymbolClosePromise = Symbol('SymbolClosePromise');
-export class AppMeta extends BeanSimple {
-    env;
-    ctxCounter;
-    isProd;
-    isTest;
-    isDev;
-    isLocal;
-    error;
-    logger;
-    locale;
-    text;
-    scopeContainer;
-    appMonkey;
-    //
-    resource;
-    metadata;
-    //
-    modules;
-    modulesArray;
-    modulesMonkey;
-    //
-    constants;
-    locales;
-    localeModules;
-    //
-    appReady;
-    appReadyInstances;
-    //
-    appStarted;
-    appStartError;
-    //
-    appClose;
-    appClosed;
-    __init__(env) {
-        // env
-        this.env = env;
-        this._prepareEnv();
-        // ctxCounter
-        this.ctxCounter = new CtxCounter();
-        // appMonkey
-        this.appMonkey = this.app.options.AppMonkey ? new (this.app.options.AppMonkey)() : undefined;
-        // logger
-        this.logger = this.bean._newBean(AppLogger);
-        // locale
-        this.locale = this.bean._newBean(AppLocale);
-        // text
-        this.text = this.locale.createLocaleText();
-        // scopeContainer
-        this.scopeContainer = this.bean._newBean(BeanScopeContainer);
-        // resource
-        this.resource = appResource;
-        this.resource.app = this.app;
-        // metadata
-        this.metadata = appMetadata;
-    }
-    _prepareEnv() {
-        const mode = this.app.configMeta.mode;
-        this.isProd = mode === 'prod';
-        this.isTest = mode === 'test';
-        this.isDev = mode === 'dev';
-        this.isLocal = this.isTest || this.isDev;
-    }
-    async waitAppStarted() {
-        return new Promise((resolve, reject) => {
-            // check once
-            if (this.appStarted) {
-                resolve(true);
-            }
-            if (this.appStartError) {
-                reject(this.appStartError);
-            }
-            // listen
-            this.app.once(EnumAppEvent.AppStarted, () => {
-                resolve(true);
-            });
-            this.app.once(EnumAppEvent.AppStartError, err => {
-                reject(err);
-            });
-        });
-    }
-    async close() {
-        if (!this[SymbolClosePromise]) {
-            this[SymbolClosePromise] = this._closeInner();
-        }
-        return this[SymbolClosePromise];
-    }
-    async _closeInner() {
-        // should not call disconnect, which will cause channel closed
-        // cluster.worker?.disconnect();
-        // close server
-        if (this.app.server) {
-            this.app.server.close();
-            // maybe hang up using await
-            // await promisify(this.app.server.close).call(this.app.server);
-        }
-        // appClose
-        this.appClose = true;
-        // hook: appClose
-        await this.app.util.monkeyModule(this.app.meta.appMonkey, this.app.meta.modulesMonkey, 'appClose');
-        // ctx counter
-        await this.app.meta.ctxCounter.awaitUntilZero();
-        // appClosed
-        this.appClosed = true;
-        // hook: appClosed
-        await this.app.util.monkeyModule(this.app.meta.appMonkey, this.app.meta.modulesMonkey, 'appClosed');
-        // container dispose
-        await this.app.bean.dispose();
-        // logger dispose
-        await this.app.meta.logger.dispose();
-        // need not call process.exit
-    }
-}

package/dist/lib/core/metadata.js

@@ -1,80 +0,0 @@
-import { isUndefined } from '@cabloy/utils';
-import 'reflect-metadata';
-export class AppMetadata {
-    defineMetadata(metadataKey, metadataValue, target, prop) {
-        if (isUndefined(prop)) {
-            Reflect.defineMetadata(metadataKey, metadataValue, target);
-        }
-        else {
-            Reflect.defineMetadata(metadataKey, metadataValue, target, prop);
-        }
-    }
-    hasOwnMetadata(metadataKey, target, prop) {
-        if (isUndefined(prop))
-            return Reflect.hasOwnMetadata(metadataKey, target);
-        return Reflect.hasOwnMetadata(metadataKey, target, prop);
-    }
-    hasMetadata(metadataKey, target, prop) {
-        if (isUndefined(prop))
-            return Reflect.hasMetadata(metadataKey, target);
-        return Reflect.hasMetadata(metadataKey, target, prop);
-    }
-    getOwnMetadata(metadataKey, target, prop) {
-        if (isUndefined(prop))
-            return Reflect.getOwnMetadata(metadataKey, target);
-        return Reflect.getOwnMetadata(metadataKey, target, prop);
-    }
-    getMetadata(metadataKey, target, prop) {
-        if (isUndefined(prop))
-            return Reflect.getMetadata(metadataKey, target);
-        return Reflect.getMetadata(metadataKey, target, prop);
-    }
-    getOwnMetadataArray(inherit, metadataKey, target, prop) {
-        let own = this.getOwnMetadata(metadataKey, target, prop);
-        if (!own) {
-            if (!inherit) {
-                own = [];
-            }
-            else {
-                const parent = this.getMetadata(metadataKey, target, prop);
-                if (parent) {
-                    own = parent.slice();
-                }
-                else {
-                    own = [];
-                }
-            }
-            this.defineMetadata(metadataKey, own, target, prop);
-        }
-        return own;
-    }
-    getOwnMetadataMap(inherit, metadataKey, target, prop) {
-        let own = this.getOwnMetadata(metadataKey, target, prop);
-        if (!own) {
-            if (!inherit) {
-                own = {};
-            }
-            else {
-                const parent = this.getMetadata(metadataKey, target, prop);
-                if (parent) {
-                    own = Object.assign({}, parent);
-                }
-                else {
-                    own = {};
-                }
-            }
-            this.defineMetadata(metadataKey, own, target, prop);
-        }
-        return own;
-    }
-    getDesignType(target, prop) {
-        return this.getMetadata('design:type', target, prop);
-    }
-    getDesignParamtypes(target, prop) {
-        return this.getMetadata('design:paramtypes', target, prop);
-    }
-    getDesignReturntype(target, prop) {
-        return this.getMetadata('design:returntype', target, prop);
-    }
-}
-export const appMetadata = new AppMetadata();

package/dist/lib/core/resource.js

@@ -1,146 +0,0 @@
-import { isClass } from '@cabloy/utils';
-import { toLowerCaseFirstChar } from '@cabloy/word-utils';
-import { cast } from "../../types/utils/cast.js";
-import { BeanSimple } from "../bean/beanSimple.js";
-import { useApp } from "../framework/useApp.js";
-import { registerMappedClassMetadataKey } from "../mappedClass/utils.js";
-import { deepExtend } from "../utils/util.js";
-import { appMetadata } from "./metadata.js";
-export const SymbolDecoratorBeanFullName = Symbol('SymbolDecoratorBeanFullName');
-export const SymbolDecoratorBeanInfo = Symbol('SymbolDecoratorBeanInfo');
-export const SymbolDecoratorProxyDisable = Symbol('SymbolDecoratorProxyDisable');
-export const SymbolDecoratorVirtual = Symbol('SymbolDecoratorVirtual');
-export const SymbolDecoratorUse = Symbol('SymbolDecoratorUse');
-export class AppResource extends BeanSimple {
-    beans = {};
-    scenes = {};
-    addUse(target, options) {
-        registerMappedClassMetadataKey(target, SymbolDecoratorUse);
-        const uses = appMetadata.getOwnMetadataMap(true, SymbolDecoratorUse, target);
-        uses[options.prop] = options;
-    }
-    getUses(target) {
-        return appMetadata.getMetadata(SymbolDecoratorUse, target);
-    }
-    addBean(beanOptions) {
-        let { module, scene, name, beanClass, options, optionsPrimitive } = beanOptions;
-        // virtual
-        const virtual = appMetadata.getOwnMetadata(SymbolDecoratorVirtual, beanClass);
-        // name
-        name = this._parseBeanName(beanClass, scene, name);
-        // module
-        if (!module) {
-            throw new Error(`module name not parsed for bean: ${scene}.${name}`);
-        }
-        // beanFullName
-        const beanFullName = scene && scene !== 'bean' ? `${module}.${scene}.${name}` : name;
-        // moduleBelong
-        const moduleBelong = this._parseModuleBelong(module, beanClass, virtual);
-        // options
-        const options2 = this._prepareOnionOptions(options, optionsPrimitive, scene, `${module}:${name}`);
-        // beanOptions2
-        const beanOptions2 = {
-            ...beanOptions,
-            beanFullName,
-            name,
-            moduleBelong,
-            options: options2,
-        };
-        // record
-        this.beans[beanFullName] = beanOptions2;
-        if (!this.scenes[scene])
-            this.scenes[scene] = {};
-        if (!this.scenes[scene][module])
-            this.scenes[scene][module] = {};
-        this.scenes[scene][module][beanFullName] = beanOptions2;
-        // set metadata
-        appMetadata.defineMetadata(SymbolDecoratorBeanFullName, beanFullName, beanOptions2.beanClass);
-        // ok
-        return beanOptions2;
-    }
-    getBeanFullName(beanFullName) {
-        if (!beanFullName)
-            return beanFullName;
-        if (typeof beanFullName === 'function' && isClass(beanFullName)) {
-            return appMetadata.getOwnMetadata(SymbolDecoratorBeanFullName, beanFullName);
-        }
-        return beanFullName;
-    }
-    getBean(beanFullName) {
-        const fullName = this.getBeanFullName(beanFullName);
-        if (!fullName)
-            return null;
-        return this.beans[fullName];
-    }
-    _parseBeanName(beanClass, scene, name) {
-        // name
-        if (name)
-            return name;
-        // scene
-        if (!scene)
-            scene = 'bean';
-        scene = scene.replace(/\./g, '');
-        // bean class name
-        const beanClassName = this._fixClassName(beanClass.name);
-        if (beanClassName.toLocaleUpperCase().startsWith(scene.toLocaleUpperCase())) {
-            name = beanClassName.substring(scene.length);
-        }
-        else {
-            name = beanClassName;
-        }
-        // lowerCase
-        name = toLowerCaseFirstChar(name);
-        return name;
-    }
-    _parseModuleBelong(module, beanClass, virtual) {
-        // not set when virtual
-        if (virtual)
-            return;
-        // check parent
-        let moduleBelong;
-        let parent = Object.getPrototypeOf(beanClass);
-        while (parent) {
-            const beanOptions = this.getBean(parent);
-            if (beanOptions && beanOptions.moduleBelong) {
-                moduleBelong = beanOptions.moduleBelong;
-                break;
-            }
-            parent = Object.getPrototypeOf(parent);
-        }
-        // set to current when parent not set
-        if (!moduleBelong) {
-            moduleBelong = module;
-        }
-        return moduleBelong;
-    }
-    _getModuleBelong(beanFullName) {
-        const beanOptions = this.getBean(beanFullName);
-        if (!beanOptions || !beanOptions.moduleBelong)
-            throw new Error(`not found module belong: ${beanFullName}`);
-        return beanOptions.moduleBelong;
-    }
-    _getModuleName(beanFullName) {
-        const beanOptions = this.getBean(beanFullName);
-        return beanOptions?.module;
-    }
-    _fixClassName(className) {
-        while (className.endsWith('2')) {
-            className = className.substring(0, className.length - 1);
-        }
-        return className;
-    }
-    _prepareOnionOptions(options, optionsPrimitive, scene, name) {
-        const app = useApp();
-        if (!app?.config && scene !== 'scope') {
-            throw new Error('Should not import vona module in config');
-        }
-        const optionsConfig = cast(app?.config)?.onions?.[scene]?.[name];
-        if (optionsPrimitive) {
-            return optionsConfig === undefined ? options : optionsConfig;
-        }
-        else {
-            return deepExtend({}, options, optionsConfig);
-        }
-    }
-}
-export const appResource = new AppResource();