vona-core 5.0.89 → 5.0.92

package/dist/lib/core/application.js

@@ -21,7 +21,7 @@ export class VonaApplication extends KoaApplication {
         const koaOptions = {
             env: cast(env).NODE_ENV,
             keys: options.config.server.keys,
-            proxy: options.config.proxy.enabled,
+            proxy: options.config.proxy.enable,
             subdomainOffset: options.config.server.subdomainOffset,
             proxyIpHeader: options.config.proxy.ipHeaders,
             maxIpsCount: options.config.proxy.maxIpsCount,

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

@@ -4,9 +4,11 @@ import type { VonaConfigEnv } from '../../types/utils/env.ts';
 import type { PowerPartial } from '../../types/utils/powerPartial.ts';
 import type { VonaApplication } from './application.ts';
 export declare function combineAppConfigDefault(appInfo: VonaAppInfo, env: VonaConfigEnv): PowerPartial<import("../../types/config/config.ts").VonaConfig>;
-export declare function configDefault(appInfo: VonaAppInfo, env: VonaConfigEnv): VonaConfigOptional;
+export declare function configDefault(_appInfo: VonaAppInfo, _env: VonaConfigEnv): VonaConfigOptional;
 export declare function configDev(_env: VonaConfigEnv): VonaConfigOptional;
 export declare function configProd(_env: VonaConfigEnv): VonaConfigOptional;
 export declare function configTest(_env: VonaConfigEnv): VonaConfigOptional;
 export type TypeConfigLoader<T> = (app: VonaApplication) => Promise<PowerPartial<T>>;
 export declare function combineConfigDefault<T>(app: VonaApplication, configDefault: TypeConfigLoader<T>, configDev?: TypeConfigLoader<T>, configProd?: TypeConfigLoader<T>, configTest?: TypeConfigLoader<T>): Promise<PowerPartial<T>>;
+export declare function getLoggerPathPhysicalRoot(appInfo: VonaAppInfo): string;
+export declare function getPublicPathPhysicalRoot(appInfo: VonaAppInfo): string;

package/dist/lib/core/config.js

@@ -1,7 +1,6 @@
 import os from 'node:os';
 import path from 'node:path';
 import fse from 'fs-extra';
-import { cast } from "../../types/utils/cast.js";
 import { deepExtend } from "../utils/util.js";
 export function combineAppConfigDefault(appInfo, env) {
     let config = configDefault(appInfo, env);
@@ -17,63 +16,33 @@ export function combineAppConfigDefault(appInfo, env) {
     }
     return config;
 }
-export function configDefault(appInfo, env) {
-    // server
-    const publicDir = env.SERVER_PUBLICDIR || getPublicPathPhysicalRoot(appInfo);
-    const loggerDir = env.SERVER_LOGGERDIR || getLoggerPathPhysicalRoot(appInfo);
-    const subdomainOffset = Number.parseInt(env.SERVER_SUBDOMAINOFFSET || '1');
-    const workers = Number.parseInt(env.SERVER_WORKERS);
-    return {
-        meta: {
-            flavor: cast(env).META_FLAVOR,
-            mode: cast(env).META_MODE,
-        },
-        server: {
-            keys: (env.SERVER_KEYS || '').split(','),
-            globalPrefix: env.SERVER_GLOBALPREFIX || '/api',
-            publicDir,
-            loggerDir,
-            subdomainOffset,
-            workers,
-            listen: {
-                hostname: env.SERVER_LISTEN_HOSTNAME,
-                port: Number.parseInt(env.SERVER_LISTEN_PORT),
-                disable: env.SERVER_LISTEN_DISABLE === 'true',
-            },
-            serve: {},
-        },
-        proxy: {
-            enabled: true,
-            ipHeaders: 'x-real-ip,x-forwarded-for',
-            hostHeaders: 'x-forwarded-host,host',
-            protocolHeaders: 'x-forwarded-proto',
-            maxProxyCount: 1,
-            maxIpsCount: 15,
-        },
-    };
+export function configDefault(_appInfo, _env) {
+    return {};
 }
 export function configDev(_env) {
-    return {
-        proxy: {
-            enabled: true,
-        },
-    };
+    return {};
 }
 export function configProd(_env) {
-    return {
-        proxy: {
-            enabled: true,
-        },
-    };
+    return {};
 }
 export function configTest(_env) {
-    return {
-        proxy: {
-            enabled: false,
-        },
-    };
+    return {};
 }
-function getLoggerPathPhysicalRoot(appInfo) {
+export async function combineConfigDefault(app, configDefault, configDev, configProd, configTest) {
+    let config = await configDefault(app);
+    const mode = app.config.meta.mode;
+    if (mode === 'dev' && configDev) {
+        config = deepExtend(config, await configDev(app));
+    }
+    else if (mode === 'prod' && configProd) {
+        config = deepExtend(config, await configProd(app));
+    }
+    else if (mode === 'test' && configTest) {
+        config = deepExtend(config, await configTest(app));
+    }
+    return config;
+}
+export function getLoggerPathPhysicalRoot(appInfo) {
     const mode = appInfo.configMeta.mode;
     let loggerDir;
     if (mode === 'test' || mode === 'dev') {
@@ -85,7 +54,7 @@ function getLoggerPathPhysicalRoot(appInfo) {
     fse.ensureDirSync(loggerDir);
     return loggerDir;
 }
-function getPublicPathPhysicalRoot(appInfo) {
+export function getPublicPathPhysicalRoot(appInfo) {
     const mode = appInfo.configMeta.mode;
     let publicDir;
     if (mode === 'test' || mode === 'dev') {
@@ -97,17 +66,3 @@ function getPublicPathPhysicalRoot(appInfo) {
     fse.ensureDirSync(publicDir);
     return publicDir;
 }
-export async function combineConfigDefault(app, configDefault, configDev, configProd, configTest) {
-    let config = await configDefault(app);
-    const mode = app.config.meta.mode;
-    if (mode === 'dev' && configDev) {
-        config = deepExtend(config, await configDev(app));
-    }
-    else if (mode === 'prod' && configProd) {
-        config = deepExtend(config, await configProd(app));
-    }
-    else if (mode === 'test' && configTest) {
-        config = deepExtend(config, await configTest(app));
-    }
-    return config;
-}

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

@@ -61,7 +61,7 @@ export class AppLogger extends BeanSimple {
         }, Winston);
     }
     createTransportFile(fileName, clientInfo, options) {
-        const dirname = this.app.config.server.loggerDir;
+        const dirname = this.app.config.logger.baseDir;
         if (!fse.existsSync(dirname)) {
             const [_, err] = catchErrorSync(() => {
                 fse.ensureDirSync(dirname);

package/dist/lib/utils/util.d.ts

@@ -32,11 +32,11 @@ export declare class AppUtil extends BeanSimple {
     combineApiPathControllerAndActionRaw(moduleName: ModuleInfo.IModuleInfo | string, controllerPath: string | undefined, actionPath: RegExp | string | undefined, simplify?: boolean): string;
     combineApiPathControllerAndAction(moduleName: ModuleInfo.IModuleInfo | string, controllerPath: string | undefined, actionPath: RegExp | string | undefined, prefix?: string | boolean, simplify?: boolean): string;
     combineApiPath(path: string | undefined, moduleName?: ModuleInfo.IModuleInfo | string, prefix?: string | boolean, simplify?: boolean): string;
-    combineStaticPath(path: string | undefined, moduleName?: ModuleInfo.IModuleInfo | string): string;
+    combineStaticPath(staticPath: string | undefined, moduleName?: ModuleInfo.IModuleInfo | string): string;
     combineResourceName(resourceName: string | undefined, moduleName: ModuleInfo.IModuleInfo | string, simplify?: boolean, simplifyProviderId?: boolean): string;
     getPublicPathPhysical(subdir?: string, ensure?: boolean): Promise<string>;
     get prodRootPath(): string;
-    getAssetPathPhysical(moduleName: ModuleInfo.IModuleInfo | string, scene: keyof IModuleAssetSceneRecord, assetPath?: string): string | undefined;
+    getAssetPathPhysical(moduleName: ModuleInfo.IModuleInfo | string, scene: keyof IModuleAssetSceneRecord, assetPath?: string): string;
     createError(data: any, returnObject?: boolean): any;
     monkeyModule(ebAppMonkey: any, ebModulesMonkey: any, monkeyName: TypeMonkeyName, moduleTarget?: IModule, ...monkeyData: any[]): Promise<void>;
     monkeyModuleSync(ebAppMonkey: any, ebModulesMonkey: any, monkeyName: TypeMonkeyName, moduleTarget?: IModule, ...monkeyData: any[]): void;
@@ -62,5 +62,5 @@ export declare function prepareEnv(env: Partial<NodeJS.ProcessEnv>): VonaConfigE
 export declare function beanFullNameFromOnionName(onionName: string, sceneName: keyof IBeanSceneRecord): keyof IBeanRecord;
 export declare function onionNameFromBeanFullName(beanFullName: string, sceneName: keyof IBeanSceneRecord): string;
 export declare function filterHeaders(headers: object | undefined, whitelist: string[]): {} | undefined;
-export declare function combineFilePathSafe(dir: string, file: string): string | undefined;
+export declare function combineFilePathSafe(dir: string, file: string): string;
 export {};

package/dist/lib/utils/util.js

@@ -40,16 +40,20 @@ export class AppUtil extends BeanSimple {
     combineApiPath(path, moduleName, prefix, simplify) {
         return combineApiPath(path, moduleName, prefix, simplify, this.app.config.server.globalPrefix);
     }
-    combineStaticPath(path, moduleName) {
+    combineStaticPath(staticPath, moduleName) {
         const globalPrefix = '/api/static';
-        if (!path)
-            path = '';
+        if (!staticPath)
+            staticPath = '';
+        // safe
+        staticPath = path.normalize(staticPath);
+        if (staticPath.includes('..'))
+            throw new Error(`unsafe path: ${staticPath}`);
         // ignore globalPrefix
-        if (path.startsWith('//'))
-            return path.substring(1);
+        if (staticPath.startsWith('//'))
+            return staticPath.substring(1);
         // ignore module path
-        if (path.startsWith('/'))
-            return `${globalPrefix}${path}`;
+        if (staticPath.startsWith('/'))
+            return `${globalPrefix}${staticPath}`;
         // globalPrefix + module path + arg
         if (!moduleName)
             throw new Error('should specify the moduleName');
@@ -57,7 +61,7 @@ export class AppUtil extends BeanSimple {
             moduleName = moduleName.relativeName;
         const parts = moduleName.split('-');
         // path
-        return `${globalPrefix}/${parts[0]}/${parts[1]}/${path}`;
+        return `${globalPrefix}/${parts[0]}/${parts[1]}/${staticPath}`;
     }
     combineResourceName(resourceName, moduleName, simplify, simplifyProviderId) {
         return combineResourceName(resourceName, moduleName, simplify, simplifyProviderId);
@@ -300,6 +304,6 @@ export function combineFilePathSafe(dir, file) {
     const fullPath = path.normalize(path.join(dir, file));
     // files that can be accessd should be under options.dir
     if (fullPath.indexOf(dir) !== 0)
-        return;
+        throw new Error(`unsafe dir: ${dir}`);
     return fullPath;
 }

package/dist/types/config/config.d.ts

@@ -7,7 +7,6 @@ export interface VonaConfig {
         keys: string[];
         globalPrefix: string;
         publicDir: string;
-        loggerDir: string;
         subdomainOffset: number;
         workers: number;
         listen: {
@@ -21,7 +20,7 @@ export interface VonaConfig {
         };
     };
     proxy: {
-        enabled: boolean;
+        enable: boolean;
         ipHeaders: string;
         hostHeaders: string;
         protocolHeaders: string;

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

@@ -16,6 +16,7 @@ export interface ILoggerRotateConfig {
     options: TypeLoggerRotateOptions;
 }
 export interface ConfigLogger {
+    baseDir: string;
     base: TypeLoggerOptions;
     clients: Record<keyof ILoggerClientRecord, TypeLoggerOptions>;
     rotate: ILoggerRotateConfig;

package/dist/types/utils/env.d.ts

@@ -6,13 +6,13 @@ export interface VonaConfigEnv {
     SERVER_KEYS: string | undefined;
     SERVER_GLOBALPREFIX: string | undefined;
     SERVER_PUBLICDIR: string | undefined;
-    SERVER_LOGGERDIR: string | undefined;
     SERVER_SUBDOMAINOFFSET: string | undefined;
     SERVER_WORKERS: string | undefined;
     SERVER_LISTEN_HOSTNAME: string | undefined;
     SERVER_LISTEN_PORT: string | undefined;
     SERVER_LISTEN_DISABLE: 'true' | 'false' | undefined;
     TEST_WHYISNODERUNNING: string | undefined;
+    LOGGER_DIR: string | undefined;
     LOGGER_DUMMY: 'true' | 'false' | undefined;
     LOGGER_ROTATE_ENABLE: 'true' | 'false' | undefined;
     LOGGER_ROTATE_FILENAME: string | undefined;

package/package.json

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