cabloy 5.1.116 → 5.1.118

package/observability/docker-compose.metrics.yml

@@ -0,0 +1,25 @@
+services:
+  collector:
+    image: otel/opentelemetry-collector-contrib:0.134.1
+    command: [--config=/etc/otelcol-contrib/config.yaml]
+    ports:
+      - '127.0.0.1:4318:4318'
+      - '127.0.0.1:9464:9464'
+    volumes:
+      - ./collector/otel-collector.yaml:/etc/otelcol-contrib/config.yaml:ro
+
+  prometheus:
+    image: prom/prometheus:v3.5.0
+    depends_on: [collector]
+    ports:
+      - '127.0.0.1:9090:9090'
+    volumes:
+      - ./prometheus/prometheus.yaml:/etc/prometheus/prometheus.yml:ro
+
+  grafana:
+    image: grafana/grafana:12.1.0
+    depends_on: [prometheus]
+    ports:
+      - '127.0.0.1:3000:3000'
+    volumes:
+      - ./grafana/provisioning:/etc/grafana/provisioning:ro

package/observability/grafana/provisioning/datasources/prometheus.yaml

@@ -0,0 +1,8 @@
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    type: prometheus
+    access: proxy
+    url: http://prometheus:9090
+    isDefault: true

package/observability/prometheus/prometheus.yaml

@@ -0,0 +1,7 @@
+global:
+  scrape_interval: 15s
+
+scrape_configs:
+  - job_name: cabloy-collector
+    static_configs:
+      - targets: [collector:9464]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cabloy",
-  "version": "5.1.116",
+  "version": "5.1.118",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A Node.js fullstack framework",
   "keywords": [

package/vona/env/.env

@@ -34,6 +34,12 @@ LOGGER_ROTATE_DATEPATTERN = YYYY-MM-DD
 LOGGER_ROTATE_MAXSIZE = 20m
 LOGGER_ROTATE_MAXFILES = 7d
 
+# telemetry
+TELEMETRY_ENABLED = false
+
+# metrics
+METRICS_ENABLED = true
+
 # build
 
 BUILD_OUTDIR =

package/vona/packages-cli/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli",
-  "version": "1.1.132",
+  "version": "1.1.134",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli",
   "keywords": [

package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoBaseName%>.tsx_

@@ -4,7 +4,7 @@ import { $makeMetadata } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Model<%=argv.detailResourceNameCapitalize%> } from '<%=argv.detailPackageName%>';
-import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from '<%=argv.restAdminNpm%>';
 
 export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> extends IDecoratorDtoOptions {}
 

package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoMutateName%>.tsx_

@@ -3,14 +3,14 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Model<%=argv.detailResourceNameCapitalize%> } from '<%=argv.detailPackageName%>';
-import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from '<%=argv.restAdminNpm%>';
 
 import { Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> } from './<%=argv.detailDtoBaseName%>.tsx';
 
 export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoMutateName)%> extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoMutateName)%>>({
-  blocks: [ZovaRender.block('basic-details:blockForm')],
+  blocks: [ZovaRender.block('<%=argv.detailsModuleName%>:blockForm')],
 })
 export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoMutateName)%> extends $Dto.mutate(() => Model<%=argv.detailResourceNameCapitalize%>, {
   dtoClass: Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>,

package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoResItemName%>.tsx_

@@ -4,7 +4,7 @@ import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Model<%=argv.detailResourceNameCapitalize%> } from '<%=argv.detailPackageName%>';
-import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from '<%=argv.restAdminNpm%>';
 
 import { $locale } from '../.metadata/locales.ts';
 import { Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> } from './<%=argv.detailDtoBaseName%>.tsx';
@@ -13,23 +13,23 @@ export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoRes
 
 @Dto<IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoResItemName)%>>({
   blocks: [
-    ZovaRender.block('basic-details:blockDetails', {
+    ZovaRender.block('<%=argv.detailsModuleName%>:blockDetails', {
       blocks: [
-        ZovaRender.block('basic-details:blockToolbarBulk', {
+        ZovaRender.block('<%=argv.detailsModuleName%>:blockToolbarBulk', {
           actions: [
-            ZovaRender.detailsActionBulk('basic-details:actionCreate', {
+            ZovaRender.detailsActionBulk('<%=argv.detailsModuleName%>:actionCreate', {
               dialogOptions: { title: $locale('Add<%=argv.detailDialogTitleCapitalize%>') },
               permission: { formScene: ['create', 'edit'] },
             }),
           ],
         }),
-        ZovaRender.block('basic-details:blockTable'),
+        ZovaRender.block('<%=argv.detailsModuleName%>:blockTable'),
       ],
     }),
   ],
   fields: {
     name: $makeMetadata(
-      ZovaRender.cell('basic-details:actionView', {
+      ZovaRender.cell('<%=argv.detailsModuleName%>:actionView', {
         dialogOptions: { title: $locale('View<%=argv.detailDialogTitleCapitalize%>') },
       }),
     ),
@@ -38,19 +38,19 @@ export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoRes
 export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoResItemName)%> extends $Dto.get(() => Model<%=argv.detailResourceNameCapitalize%>, {
   dtoClass: Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>,
 }) {
-  @Api.field(v.title('#'), ZovaRender.order(1, 'core'), ZovaRender.cell('basic-details:lineNumber'))
+  @Api.field(v.title('#'), ZovaRender.order(1, 'core'), ZovaRender.cell('<%=argv.detailsModuleName%>:lineNumber'))
   _lineNumber?: number;
 
   @Api.field(
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),
-    ZovaRender.cell('basic-details:actionOperationsRow', {
+    ZovaRender.cell('<%=argv.detailsModuleName%>:actionOperationsRow', {
       actions: [
-        ZovaRender.detailsActionRow('basic-details:actionUpdate', {
+        ZovaRender.detailsActionRow('<%=argv.detailsModuleName%>:actionUpdate', {
           dialogOptions: { title: $locale('Edit<%=argv.detailDialogTitleCapitalize%>') },
           permission: { formScene: ['create', 'edit'] },
         }),
-        ZovaRender.detailsActionRow('basic-details:actionDelete', {
+        ZovaRender.detailsActionRow('<%=argv.detailsModuleName%>:actionDelete', {
           permission: { formScene: ['create', 'edit'] },
         }),
       ],

package/vona/packages-cli/cli-set-api/cli/templates/tools/masterDetail/boilerplate/dto/<%=argv.detailDtoViewName%>.tsx_

@@ -3,14 +3,14 @@ import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { Model<%=argv.detailResourceNameCapitalize%> } from '<%=argv.detailPackageName%>';
-import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+import { ZovaRender } from '<%=argv.restAdminNpm%>';
 
 import { Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%> } from './<%=argv.detailDtoBaseName%>.tsx';
 
 export interface IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoViewName)%> extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptions<%=cli.helper.firstCharToUpperCase(argv.detailDtoViewName)%>>({
-  blocks: [ZovaRender.block('basic-details:blockForm')],
+  blocks: [ZovaRender.block('<%=argv.detailsModuleName%>:blockForm')],
 })
 export class Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoViewName)%> extends $Dto.get(() => Model<%=argv.detailResourceNameCapitalize%>, {
   dtoClass: Dto<%=cli.helper.firstCharToUpperCase(argv.detailDtoBaseName)%>,

package/vona/packages-cli/cli-set-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-cli-set-api",
-  "version": "1.1.130",
+  "version": "1.1.132",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona cli-set-api",
   "keywords": [

package/vona/packages-cli/cli-set-api/src/lib/bean/cli.tools.masterDetail.ts

@@ -36,6 +36,9 @@ declare module '@cabloy/cli' {
     detailDialogTitleCapitalize: string;
     createdDetailModule?: boolean;
     createdDetailResource?: boolean;
+    restAdminNpm: string;
+    detailsModuleName: string;
+    detailCrudCommand: string;
   }
 }
 
@@ -82,6 +85,12 @@ export class CliToolsMasterDetail extends BeanCliBase {
     argv.detailDtoResItemName = `detail${argv.detailResourceNameCapitalize}ResItem`;
     argv.detailFieldPrivateName = `_${argv.relationName}`;
     argv.detailDialogTitleCapitalize = argv.detailModuleCapitalize;
+    const editionName = fs.existsSync(path.join(argv.projectPath, '__CABLOY_START__'))
+      ? 'start'
+      : 'basic';
+    argv.restAdminNpm = `zova-rest-cabloy-${editionName}-admin`;
+    argv.detailsModuleName = `${editionName}-details`;
+    argv.detailCrudCommand = `:tools:crud${this._capitalize(editionName)}`;
   }
 
   private async _ensureDetailModule() {
@@ -437,8 +446,8 @@ export class CliToolsMasterDetail extends BeanCliBase {
     if (!content.includes("import { $locale } from '../.metadata/locales.ts';")) {
       content = this._replaceStrict(
         content,
-        "import { ZovaRender } from 'zova-rest-cabloy-basic-admin';\n",
-        "import { ZovaRender } from 'zova-rest-cabloy-basic-admin';\n\nimport { $locale } from '../.metadata/locales.ts';\n",
+        `import { ZovaRender } from '${argv.restAdminNpm}';\n`,
+        `import { ZovaRender } from '${argv.restAdminNpm}';\n\nimport { $locale } from '../.metadata/locales.ts';\n`,
         fileName,
       );
     }
@@ -498,7 +507,7 @@ export class CliToolsMasterDetail extends BeanCliBase {
 
   private _masterDtoFieldCode(scene: MasterDtoScene) {
     const { argv } = this.context;
-    return `    ${argv.relationName}: $makeMetadata(\n      v.title($locale('${argv.relationNameCapitalize}')),\n      ZovaRender.order(5),\n      ZovaRender.field('basic-details:formFieldDetails'),\n${scene === 'Create' ? '      v.optional(),\n' : ''}    ),\n`;
+    return `    ${argv.relationName}: $makeMetadata(\n      v.title($locale('${argv.relationNameCapitalize}')),\n      ZovaRender.order(5),\n      ZovaRender.field('${argv.detailsModuleName}:formFieldDetails'),\n${scene === 'Create' ? '      v.optional(),\n' : ''}    ),\n`;
   }
 
   private _masterDtoClassReplaceSource(scene: MasterDtoScene) {
@@ -546,7 +555,7 @@ export class CliToolsMasterDetail extends BeanCliBase {
     const { argv } = this.context;
     await this.helper.invokeCli(
       [
-        ':tools:crudBasic',
+        argv.detailCrudCommand,
         argv.detailResourceName,
         `--module=${argv.detailModule}`,
         '--nometadata',

package/vona/packages-vona/vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona",
-  "version": "5.1.80",
+  "version": "5.1.82",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "Vona is an intuitive, elegant and powerful Node.js framework for rapidly developing enterprise applications of any size",
   "keywords": [

package/vona/packages-vona/vona-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-core",
-  "version": "5.1.33",
+  "version": "5.1.35",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona",
   "keywords": [

package/vona/packages-vona/vona-core/src/lib/core/logger/utils.ts

@@ -44,9 +44,18 @@ export const formatLoggerErrors = (opts: ILoggerFormatOpts) => {
 
 export const formatLoggerCtx = Winston.format((info, _opts: any) => {
   const app = useApp();
-  if (!app.ctx || !app.ctx.method || !app.ctx.path) return info;
-  info.method = app.ctx.method;
-  info.path = app.ctx.path;
+  if (!app.ctx) return info;
+  if (app.ctx.method) info.method = app.ctx.method;
+  if (app.ctx.path) info.path = app.ctx.path;
+  const telemetry = (app.ctx.state as any).telemetry;
+  if (telemetry?.requestId) info.request_id = telemetry.requestId;
+  const span = telemetry?.span ?? telemetry?.serverSpan;
+  const spanContext = span?.spanContext();
+  if (spanContext?.traceId && spanContext?.spanId) {
+    info.trace_id = spanContext.traceId;
+    info.span_id = spanContext.spanId;
+    info.trace_flags = spanContext.traceFlags;
+  }
   return info;
 });
 

package/vona/packages-vona/vona-core/src/lib/framework/processWorker.ts

@@ -21,7 +21,7 @@ async function _closeInner() {
 }
 
 export function handleProcessWork() {
-  ['SIGINT', 'SIGUSR2'].forEach(signal => {
+  ['SIGINT', 'SIGTERM', 'SIGUSR2'].forEach(signal => {
     process.on(signal, async () => {
       if (__closing) return;
       __closing = true;

package/vona/packages-vona/vona-mock/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-mock",
-  "version": "6.1.33",
+  "version": "6.1.35",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "vona mock",
   "keywords": [

package/vona/packages-vona/vona-mock/src/index.ts

@@ -4,6 +4,8 @@ import type { VonaApplication } from 'vona-core';
 import { parseModuleInfo, ParseModuleNameLevelInit } from '@cabloy/module-info-pro';
 import { useApp } from 'vona-core';
 
+export { acquireTestLock } from './lib/testLock.ts';
+
 const ParseModuleNameLevel = ParseModuleNameLevelInit + 2;
 
 export const app: VonaApplication = useApp();

package/vona/packages-vona/vona-mock/src/lib/testLock.ts

@@ -0,0 +1,21 @@
+const pendingScenes = new Map<string, Promise<void>>();
+
+export async function acquireTestLock(scene: string): Promise<() => void> {
+  const previous = pendingScenes.get(scene) ?? Promise.resolve();
+  let resolve: () => void;
+  const pending = new Promise<void>(pendingResolve => {
+    resolve = pendingResolve;
+  });
+  pendingScenes.set(scene, pending);
+  await previous;
+
+  let released = false;
+  return () => {
+    if (released) return;
+    released = true;
+    resolve!();
+    if (pendingScenes.get(scene) === pending) {
+      pendingScenes.delete(scene);
+    }
+  };
+}