vona-cli-set-api 1.0.333 → 1.0.339

package/cli/templates/create/project/basic/boilerplate/env/.env

@@ -9,7 +9,6 @@ APP_VERSION = 5.0.0
 SERVER_KEYS = <%=argv.SERVER_KEYS%>
 SERVER_GLOBALPREFIX = /api
 SERVER_PUBLICDIR =
-SERVER_LOGGERDIR =
 SERVER_SUBDOMAINOFFSET = 1
 SERVER_WORKERS =
 SERVER_LISTEN_HOSTNAME = 0.0.0.0
@@ -23,6 +22,7 @@ PROJECT_DISABLED_SUITES =
 
 # logger
 
+LOGGER_DIR =
 LOGGER_CLIENT_DEFAULT = 
 LOGGER_DUMMY =
 LOGGER_ROTATE_ENABLE = true

package/cli/templates/create/project/basic/boilerplate/package.original.json

@@ -46,7 +46,7 @@
     }
   },
   "dependencies": {
-    "vona": "^5.0.194"
+    "vona": "^5.0.197"
   },
   "devDependencies": {
     "@cabloy/lint": "^5.0.16",

package/cli/templates/create/project/basic/boilerplate/src/backend/config/config/config.test.ts

@@ -3,6 +3,11 @@ import type { VonaAppInfo, VonaConfigOptional } from 'vona';
 export default function (_appInfo: VonaAppInfo) {
   const config = {} as VonaConfigOptional;
 
+  // proxy
+  config.proxy = {
+    enable: false,
+  };
+
   // instances
   config.instances = [
     { name: '', password: '', title: '' },

package/cli/templates/create/project/basic/boilerplate/src/backend/config/config/config.ts

@@ -2,7 +2,7 @@ import type { ILoggerOptionsClientInfo, VonaAppInfo, VonaApplication, VonaConfig
 import type { IDatabaseClientRecord } from 'vona-module-a-orm';
 import type * as Winston from 'winston';
 import { replaceTemplate } from '@cabloy/utils';
-import { formatLoggerAxiosError, formatLoggerCtx } from 'vona';
+import { formatLoggerAxiosError, formatLoggerCtx, getLoggerPathPhysicalRoot, getPublicPathPhysicalRoot } from 'vona';
 
 declare module 'vona' {
   export interface IInstanceRecord {
@@ -20,8 +20,44 @@ declare module 'vona-module-a-orm' {
 export default function (appInfo: VonaAppInfo, env: VonaConfigEnv) {
   const config = {} as VonaConfigOptional;
 
+  // meta
+  config.meta = {
+    flavor: appInfo.configMeta.flavor,
+    mode: appInfo.configMeta.mode,
+  };
+
+  // server
+  const publicDir = env.SERVER_PUBLICDIR || getPublicPathPhysicalRoot(appInfo);
+  const subdomainOffset = Number.parseInt(env.SERVER_SUBDOMAINOFFSET || '1');
+  const workers = Number.parseInt(env.SERVER_WORKERS!);
+  config.server = {
+    keys: (env.SERVER_KEYS || '').split(','),
+    globalPrefix: env.SERVER_GLOBALPREFIX || '/api',
+    publicDir,
+    subdomainOffset,
+    workers,
+    listen: {
+      hostname: env.SERVER_LISTEN_HOSTNAME,
+      port: Number.parseInt(env.SERVER_LISTEN_PORT!),
+      disable: env.SERVER_LISTEN_DISABLE === 'true',
+    },
+    serve: {},
+  };
+
+  // proxy
+  config.proxy = {
+    enable: true,
+    ipHeaders: 'x-real-ip,x-forwarded-for',
+    hostHeaders: 'x-forwarded-host,host',
+    protocolHeaders: 'x-forwarded-proto',
+    maxProxyCount: 1,
+    maxIpsCount: 15,
+  };
+
   // logger
+  const loggerDir = env.LOGGER_DIR || getLoggerPathPhysicalRoot(appInfo);
   config.logger = {
+    baseDir: loggerDir,
     rotate: {
       enable: env.LOGGER_ROTATE_ENABLE === 'true',
       options(filename: string) {

package/dist/lib/bean/cli.init.asset.d.ts

@@ -0,0 +1,13 @@
+import type { IModuleInfo } from '@cabloy/module-info';
+import { BeanCliBase } from '@cabloy/cli';
+declare module '@cabloy/cli' {
+    interface ICommandArgv {
+        module: string;
+        moduleInfo: IModuleInfo;
+        scene: string;
+    }
+}
+export declare class CliInitAsset extends BeanCliBase {
+    execute(): Promise<void>;
+    _setPackageInfo(modulePath: string, scene: string): Promise<void>;
+}

package/dist/lib/bean/cli.init.asset.js

@@ -0,0 +1,46 @@
+import path from 'node:path';
+import { BeanCliBase } from '@cabloy/cli';
+import fse from 'fs-extra';
+export class CliInitAsset extends BeanCliBase {
+    async execute() {
+        const { argv } = this.context;
+        // super
+        await super.execute();
+        // module name/info
+        const moduleName = argv.module;
+        argv.moduleInfo = this.helper.parseModuleInfo(moduleName);
+        // check if exists
+        const _module = this.helper.findModule(moduleName);
+        if (!_module) {
+            throw new Error(`module does not exist: ${moduleName}`);
+        }
+        // target dir
+        const targetDir = await this.helper.ensureDir(_module.root);
+        // scene
+        const scene = argv.scene;
+        // directory
+        const assetDir = path.join(targetDir, scene);
+        if (fse.existsSync(assetDir)) {
+            throw new Error(`asset exists: ${moduleName}/${scene}`);
+        }
+        await this.helper.ensureDir(assetDir);
+        // package.json
+        await this._setPackageInfo(targetDir, scene);
+    }
+    async _setPackageInfo(modulePath, scene) {
+        const pkgFile = path.join(modulePath, 'package.json');
+        const pkg = await this.helper.loadJSONFile(pkgFile);
+        if (!pkg.files)
+            pkg.files = [];
+        let changed;
+        // files
+        if (!pkg.files.includes(scene)) {
+            pkg.files.push(scene);
+            changed = true;
+        }
+        // save
+        if (changed) {
+            await this.helper.saveJSONFile(pkgFile, pkg);
+        }
+    }
+}

package/dist/lib/beans.d.ts

@@ -12,6 +12,7 @@ import { CliCreateSuite } from './bean/cli.create.suite.ts';
 import { CliCreateTest } from './bean/cli.create.test.ts';
 import { CliDefaultList } from './bean/cli.default.list.ts';
 import { CliInitAppMonkey } from './bean/cli.init.appMonkey.ts';
+import { CliInitAsset } from './bean/cli.init.asset.ts';
 import { CliInitConfig } from './bean/cli.init.config.ts';
 import { CliInitConstant } from './bean/cli.init.constant.ts';
 import { CliInitError } from './bean/cli.init.error.ts';
@@ -45,6 +46,7 @@ export declare const beans: {
     'init.monkey': typeof CliInitMonkey;
     'init.main': typeof CliInitMain;
     'init.static': typeof CliInitStatic;
+    'init.asset': typeof CliInitAsset;
     'init.lib': typeof CliInitLib;
     'init.types': typeof CliInitTypes;
     'init.appMonkey': typeof CliInitAppMonkey;

package/dist/lib/beans.js

@@ -12,6 +12,7 @@ import { CliCreateSuite } from "./bean/cli.create.suite.js";
 import { CliCreateTest } from "./bean/cli.create.test.js";
 import { CliDefaultList } from "./bean/cli.default.list.js";
 import { CliInitAppMonkey } from "./bean/cli.init.appMonkey.js";
+import { CliInitAsset } from "./bean/cli.init.asset.js";
 import { CliInitConfig } from "./bean/cli.init.config.js";
 import { CliInitConstant } from "./bean/cli.init.constant.js";
 import { CliInitError } from "./bean/cli.init.error.js";
@@ -45,6 +46,7 @@ export const beans = {
     'init.monkey': CliInitMonkey,
     'init.main': CliInitMain,
     'init.static': CliInitStatic,
+    'init.asset': CliInitAsset,
     'init.lib': CliInitLib,
     'init.types': CliInitTypes,
     'init.appMonkey': CliInitAppMonkey,

package/dist/lib/command/init.asset.d.ts

@@ -0,0 +1,34 @@
+declare const _default: {
+    bean: string;
+    info: {
+        version: string;
+        title: string;
+        usage: string;
+    };
+    options: {
+        module: {
+            description: string;
+            type: string;
+        };
+    };
+    groups: {
+        default: {
+            questions: {
+                scene: {
+                    type: string;
+                    message: string;
+                    initial: {
+                        expression: string;
+                    };
+                    required: boolean;
+                };
+                module: {
+                    type: string;
+                    message: string;
+                    required: boolean;
+                };
+            };
+        };
+    };
+};
+export default _default;

package/dist/lib/command/init.asset.js

@@ -0,0 +1,33 @@
+export default {
+    bean: 'init.asset',
+    info: {
+        version: '5.0.0',
+        title: 'Cli: Init: Asset Resources',
+        usage: 'vona :init:asset scene [--module=]',
+    },
+    options: {
+        module: {
+            description: 'module name',
+            type: 'string',
+        },
+    },
+    groups: {
+        default: {
+            questions: {
+                scene: {
+                    type: 'input',
+                    message: 'scene',
+                    initial: {
+                        expression: 'context.argv._[0]',
+                    },
+                    required: true,
+                },
+                module: {
+                    type: 'input',
+                    message: 'module name',
+                    required: true,
+                },
+            },
+        },
+    },
+};

package/dist/lib/commands.d.ts

@@ -399,6 +399,39 @@ export declare const commands: {
                 usage: string;
             };
         };
+        asset: {
+            bean: string;
+            info: {
+                version: string;
+                title: string;
+                usage: string;
+            };
+            options: {
+                module: {
+                    description: string;
+                    type: string;
+                };
+            };
+            groups: {
+                default: {
+                    questions: {
+                        scene: {
+                            type: string;
+                            message: string;
+                            initial: {
+                                expression: string;
+                            };
+                            required: boolean;
+                        };
+                        module: {
+                            type: string;
+                            message: string;
+                            required: boolean;
+                        };
+                    };
+                };
+            };
+        };
         lib: {
             bean: string;
             info: {

package/dist/lib/commands.js

@@ -12,6 +12,7 @@ import createSuite from "./command/create.suite.js";
 import createTest from "./command/create.test.js";
 import defaultList from "./command/default.list.js";
 import initAppMonkey from "./command/init.appMonkey.js";
+import initAsset from "./command/init.asset.js";
 import initConfig from "./command/init.config.js";
 import initConstant from "./command/init.constant.js";
 import initError from "./command/init.error.js";
@@ -52,6 +53,7 @@ export const commands = {
         monkey: initMonkey,
         main: initMain,
         static: initStatic,
+        asset: initAsset,
         lib: initLib,
         types: initTypes,
         appMonkey: initAppMonkey,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-cli-set-api",
   "type": "module",
-  "version": "1.0.333",
+  "version": "1.0.339",
   "description": "vona cli-set-api",
   "publishConfig": {
     "access": "public"
@@ -61,7 +61,7 @@
     "ts-node-maintained": "^10.9.6",
     "urllib": "^4.6.11",
     "uuid": "^11.1.0",
-    "vona-core": "^5.0.89",
+    "vona-core": "^5.0.92",
     "why-is-node-running": "^3.2.2",
     "yargs-parser": "^21.1.1"
   },