cabloy 5.1.216 → 5.1.217

package/vona/packages-vona/vona-core/src/lib/framework/useApp.test.ts

@@ -0,0 +1,84 @@
+import assert from 'node:assert/strict';
+import { spawnSync } from 'node:child_process';
+import { test } from 'node:test';
+
+const useAppUrl = new URL('./useApp.ts', import.meta.url).href;
+
+for (const platform of ['win32', 'linux', 'darwin']) {
+  test(`general apps use the single-app entry and await close on ${platform}`, () => {
+    const source = `
+      import assert from 'node:assert/strict';
+      import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
+      import { tmpdir } from 'node:os';
+      import path from 'node:path';
+      import { registerHooks } from 'node:module';
+      const useAppUrl = ${JSON.stringify(useAppUrl)};
+      const projectPath = mkdtempSync(path.join(tmpdir(), 'vona-general-app-'));
+      const appSource =
+        'export async function createSingleApp() {' +
+        '  if (globalThis.failure) throw globalThis.failure;' +
+        '  globalThis.factoryCalls++;' +
+        '  return globalThis.__app__ = { meta: { async close() {' +
+        '    await new Promise(resolve => setTimeout(resolve, 10));' +
+        '    globalThis.closed = true;' +
+        '  } } };' +
+        '}';
+      try {
+        writeFileSync(path.join(projectPath, 'package.json'), '{"type":"module"}');
+        for (const flavor of ['ci', 'other']) {
+          const directory = path.join(projectPath, 'dist', flavor);
+          mkdirSync(directory, { recursive: true });
+          writeFileSync(path.join(directory, 'app.js'), appSource);
+          writeFileSync(path.join(directory, 'bootstrap.js'), 'throw new Error("General apps must not bootstrap a server");');
+        }
+        const generatedRoot = path.join(projectPath, '.vona');
+        mkdirSync(generatedRoot);
+        writeFileSync(path.join(generatedRoot, 'app.ts'), appSource);
+        const mocks = {
+          '@cabloy/utils': 'export const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));',
+          '../utils/util.ts': 'import { pathToFileURL } from "node:url"; export const pathToHref = file => pathToFileURL(file).href;',
+          '../core/testIsolation.ts': 'export function resolveVonaLocalPaths(projectPath, mode) { globalThis.resolvedMode = mode; return { generatedRoot: globalThis.generatedRoot }; }',
+        };
+        registerHooks({
+          resolve(specifier, context, nextResolve) {
+            if (context.parentURL === useAppUrl && mocks[specifier]) {
+              return { url: 'data:text/javascript,' + encodeURIComponent(mocks[specifier]), shortCircuit: true };
+            }
+            return nextResolve(specifier, context);
+          },
+        });
+        Object.defineProperty(process, 'platform', { value: ${JSON.stringify(platform)} });
+        globalThis.generatedRoot = generatedRoot;
+        globalThis.factoryCalls = 0;
+        const { createGeneralApp, closeApp, useApp } = await import(useAppUrl);
+        for (const mode of ['prod', 'dev', 'test']) {
+          globalThis.closed = false;
+          const app = await createGeneralApp(projectPath, { META_MODE: mode, META_FLAVOR: 'ci' });
+          assert.equal(app, useApp());
+          assert.equal(globalThis.factoryCalls, 1);
+          assert.equal(globalThis.closed, false);
+          if (mode !== 'prod') assert.equal(globalThis.resolvedMode, mode);
+          await closeApp();
+          assert.equal(globalThis.closed, true, 'close must await application cleanup');
+          assert.equal(useApp(), undefined);
+          globalThis.factoryCalls = 0;
+        }
+        const failure = globalThis.failure = new Error('single-app startup failed');
+        await assert.rejects(
+          createGeneralApp(projectPath, { META_MODE: 'prod', META_FLAVOR: 'other' }),
+          error => error === failure,
+        );
+        assert.equal(useApp(), undefined);
+      } finally {
+        rmSync(projectPath, { recursive: true, force: true });
+      }
+    `;
+    const result = spawnSync(process.execPath, ['--input-type=module', '--eval', source], {
+      encoding: 'utf8',
+      timeout: 5_000,
+    });
+    assert.ifError(result.error);
+    assert.equal(result.signal, null, result.stderr);
+    assert.equal(result.status, 0, result.stderr);
+  });
+}

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

@@ -35,9 +35,9 @@ export async function createGeneralApp(
     }
   }
   if (process.env.META_MODE === 'prod') {
-    const testFile = path.join(projectPath, `dist/${process.env.META_FLAVOR}/bootstrap.js`);
+    const testFile = path.join(projectPath, `dist/${process.env.META_FLAVOR}/app.js`);
     const testInstance = await import(pathToHref(testFile));
-    return await testInstance.appBootstrap;
+    return await testInstance.createSingleApp();
   } else {
     const testFile = path.join(
       resolveVonaLocalPaths(projectPath, process.env.META_MODE).generatedRoot,

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

@@ -122,7 +122,7 @@ export class AppUtil extends BeanSimple {
     const globalPrefix = '/api/static';
     if (!staticPath) staticPath = '';
     // safe
-    staticPath = path.normalize(staticPath);
+    staticPath = path.posix.normalize(staticPath.replace(/\\/g, '/'));
     if (staticPath.includes('..')) throw new Error(`unsafe path: ${staticPath}`);
     // ignore globalPrefix
     if (staticPath.startsWith('//')) return staticPath.substring(1);

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

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

package/vona/pnpm-lock.yaml

@@ -573,7 +573,7 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.170
+        specifier: ^5.1.171
         version: 5.1.171(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.92
@@ -606,8 +606,8 @@ importers:
         specifier: ^5.1.38
         version: 5.1.38(vue@3.5.43(typescript@5.9.3))
       zova-module-a-openapi:
-        specifier: file:/tmp/zova-module-a-openapi-5.1.56.tgz
-        version: file:../../../../../tmp/zova-module-a-openapi-5.1.56.tgz
+        specifier: ^5.1.57
+        version: 5.1.57
       zova-module-a-pay:
         specifier: ^5.0.9
         version: 5.0.9
@@ -741,8 +741,8 @@ importers:
         specifier: npm:@cabloy/zod@4.3.8
         version: '@cabloy/zod@4.3.8'
       zova:
-        specifier: ^5.1.167
-        version: 5.1.167(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.171
+        version: 5.1.171(typescript@5.9.3)(vue@3.5.43(typescript@5.9.3))
       zova-jsx:
         specifier: ^1.1.92
         version: 1.1.92(typescript@5.9.3)
@@ -759,8 +759,8 @@ importers:
         specifier: ^5.1.35
         version: 5.1.35
       zova-module-a-form:
-        specifier: ^5.1.51
-        version: 5.1.51(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.54
+        version: 5.1.54(vue@3.5.43(typescript@5.9.3))
       zova-module-a-icon:
         specifier: ^5.1.27
         version: 5.1.27
@@ -771,20 +771,20 @@ importers:
         specifier: ^5.0.3
         version: 5.0.3
       zova-module-a-model:
-        specifier: ^5.1.37
-        version: 5.1.37(vue@3.5.43(typescript@5.9.3))
+        specifier: ^5.1.38
+        version: 5.1.38(vue@3.5.43(typescript@5.9.3))
       zova-module-a-openapi:
-        specifier: ^5.1.55
-        version: 5.1.55
+        specifier: ^5.1.57
+        version: 5.1.57
       zova-module-a-pay:
         specifier: ^5.0.9
         version: 5.0.9
       zova-module-a-router:
-        specifier: ^5.1.41
-        version: 5.1.41
+        specifier: ^5.1.42
+        version: 5.1.42
       zova-module-a-routertabs:
-        specifier: ^5.1.34
-        version: 5.1.34
+        specifier: ^5.1.35
+        version: 5.1.35
       zova-module-a-ssr:
         specifier: ^5.1.40
         version: 5.1.40
@@ -798,8 +798,8 @@ importers:
         specifier: ^5.0.5
         version: 5.0.5
       zova-module-rest-resource:
-        specifier: ^5.1.55
-        version: 5.1.55
+        specifier: ^5.1.56
+        version: 5.1.56
 
   .zova-rest/cabloy-commerce-admin:
     dependencies:
@@ -15300,16 +15300,16 @@ snapshots:
       zova-module-a-behaviors: 5.1.22
       zova-module-a-command: 5.1.35
       zova-module-a-fetch: 5.1.25
-      zova-module-a-form: 5.1.51(vue@3.5.43(typescript@5.9.3))
+      zova-module-a-form: 5.1.54(vue@3.5.43(typescript@5.9.3))
       zova-module-a-icon: 5.1.27
       zova-module-a-interceptor: 5.1.31
       zova-module-a-logger: 5.1.28
       zova-module-a-meta: 5.1.22
-      zova-module-a-model: 5.1.37(vue@3.5.43(typescript@5.9.3))
-      zova-module-a-openapi: 5.1.55
-      zova-module-a-router: 5.1.41
+      zova-module-a-model: 5.1.38(vue@3.5.43(typescript@5.9.3))
+      zova-module-a-openapi: 5.1.57
+      zova-module-a-router: 5.1.42
       zova-module-a-routerstack: 5.1.29
-      zova-module-a-routertabs: 5.1.34
+      zova-module-a-routertabs: 5.1.35
       zova-module-a-ssr: 5.1.40
       zova-module-a-ssrhmr: 5.1.23
       zova-module-a-ssrserver: 5.1.26

package/vona/src/suite-vendor/a-cabloy/modules/a-rbac/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-rbac",
-  "version": "5.0.11",
+  "version": "5.0.12",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-cabloy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-cabloy",
-  "version": "5.1.62",
+  "version": "5.1.63",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -10,7 +10,7 @@
     "vona-module-a-cabloy": "workspace:^",
     "vona-module-a-layoutprofile": "^5.0.2",
     "vona-module-a-markdown": "^5.0.3",
-    "vona-module-a-rbac": "^5.0.11",
+    "vona-module-a-rbac": "^5.0.12",
     "vona-module-a-socket": "workspace:^",
     "vona-module-a-ssr": "workspace:^",
     "vona-module-a-ssrhmr": "workspace:^"

package/vona/src/suite-vendor/a-vona/modules/a-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.60",
+  "version": "5.1.61",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-executor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-executor",
-  "version": "5.1.17",
+  "version": "5.1.18",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-executor/src/bean/bean.executor.ts

@@ -4,6 +4,7 @@ import type { IApiPathRecordMethodMap } from 'vona-module-a-web';
 import { isNil } from '@cabloy/utils';
 import { BeanBase } from 'vona';
 import { Bean } from 'vona-module-a-bean';
+import { ServiceTransactionAsyncLocalStorage } from 'vona-module-a-orm';
 
 import type { INewCtxOptions, IPerformActionOptions } from '../types/executor.ts';
 
@@ -113,7 +114,7 @@ export class BeanExecutor extends BeanBase {
           __delegateProperties(ctx, options.extraData);
         }
       }
-      return await fn();
+      return await this.bean._getBean(ServiceTransactionAsyncLocalStorage).run(fn, isolate);
     });
   }
 

package/vona/src/suite-vendor/a-vona/modules/a-logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-logger",
-  "version": "5.1.15",
+  "version": "5.1.16",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-logger/src/bean/middlewareSystem.httpLog.ts

@@ -22,7 +22,7 @@ export class MiddlewareSystemHttpLog extends BeanBase implements IMiddlewareSyst
       req.headers,
       ctx.path,
       this.app.meta.env.VONA_TEST_RUN_ID,
-      'x-vona-test-challenge',
+      ['x-vona-test-challenge', 'x-vona-test-stop-nonce', 'x-vona-test-stop-authorization'],
     );
     this.$loggerChild('req').http(() => JSON.stringify(req));
     const profiler = this.$loggerChild('res').startTimer();
@@ -33,7 +33,7 @@ export class MiddlewareSystemHttpLog extends BeanBase implements IMiddlewareSyst
       ctx.res.getHeaders(),
       ctx.path,
       this.app.meta.env.VONA_TEST_RUN_ID,
-      'x-vona-test-proof',
+      ['x-vona-test-proof', 'x-vona-test-stop-proof'],
     );
     const res = {
       url: ctx.req.url,

package/vona/src/suite-vendor/a-vona/modules/a-logger/src/lib/redactIsolatedReadyHeader.test.ts

@@ -3,6 +3,22 @@ import { test } from 'node:test';
 
 import { redactIsolatedReadyHeader } from './redactIsolatedReadyHeader.ts';
 
+test('redacts isolated shutdown authorization and proof case-insensitively', () => {
+  const headers = {
+    'X-Vona-Test-Stop-Authorization': 'authorization-value',
+    'x-vona-test-stop-nonce': 'nonce-value',
+    'X-VONA-TEST-STOP-PROOF': 'proof-value',
+    'content-type': 'application/json',
+  };
+  const logged = redactIsolatedReadyHeader(headers, '/health/test-stop', 'managed-run', [
+    'x-vona-test-stop-authorization',
+    'x-vona-test-stop-nonce',
+    'x-vona-test-stop-proof',
+  ]);
+  assert.deepEqual(logged, { 'content-type': 'application/json' });
+  assert.equal(headers['X-Vona-Test-Stop-Authorization'], 'authorization-value');
+});
+
 test('redacts isolated readiness challenge and proof without changing live headers', () => {
   const runId = '20261014010203-a1b2c3d4';
   const req = { 'x-vona-test-challenge': 'challenge-value', 'accept': 'application/json' };

package/vona/src/suite-vendor/a-vona/modules/a-logger/src/lib/redactIsolatedReadyHeader.ts

@@ -2,10 +2,13 @@ export function redactIsolatedReadyHeader<HEADERS extends Record<string, unknown
   headers: HEADERS,
   path: string,
   runId: string | undefined,
-  header: string,
+  header: string | string[],
 ): HEADERS {
-  if (path !== '/health/ready' || !runId) return headers;
+  if (!['/health/ready', '/health/test-stop'].includes(path) || !runId) return headers;
   const redacted = { ...headers };
-  delete redacted[header];
+  const names = (Array.isArray(header) ? header : [header]).map(name => name.toLowerCase());
+  for (const name of Object.keys(redacted)) {
+    if (names.includes(name.toLowerCase())) delete redacted[name];
+  }
   return redacted;
 }

package/vona/src/suite-vendor/a-vona/modules/a-logger/test/middlewareSystem.httpLog.test.ts

@@ -0,0 +1,80 @@
+import assert from 'node:assert/strict';
+import { readFileSync } from 'node:fs';
+import { registerHooks } from 'node:module';
+import { test } from 'node:test';
+import ts from 'typescript';
+
+const middlewareUrl = new URL(
+  '../src/bean/middlewareSystem.httpLog.ts?fixture=httpLog',
+  import.meta.url,
+).href;
+const hooks = registerHooks({
+  resolve(specifier, context, nextResolve) {
+    if (context.parentURL === middlewareUrl) {
+      const source = {
+        'vona': 'export class BeanBase {}',
+        'vona-module-a-aspect': 'export function MiddlewareSystem() { return () => {}; }',
+        'pino-std-serializers':
+          'export default { req: req => ({ headers: req.headers, url: req.url }) };',
+      }[specifier];
+      if (source)
+        return { url: `data:text/javascript,${encodeURIComponent(source)}`, shortCircuit: true };
+    }
+    return nextResolve(specifier, context);
+  },
+  load(url, context, nextLoad) {
+    if (url === middlewareUrl) {
+      return {
+        format: 'module',
+        source: ts.transpileModule(readFileSync(new URL(url), 'utf8'), {
+          compilerOptions: {
+            experimentalDecorators: true,
+            target: ts.ScriptTarget.ESNext,
+            module: ts.ModuleKind.ESNext,
+          },
+        }).outputText,
+        shortCircuit: true,
+      };
+    }
+    return nextLoad(url, context);
+  },
+});
+const { MiddlewareSystemHttpLog } = await import(middlewareUrl);
+hooks.deregister();
+
+for (const path of ['/health/ready', '/health/test-stop']) {
+  test(`HTTP logger redacts request authorization and response proof at ${path} without mutating headers`, async () => {
+    const headers = {
+      'x-vona-test-challenge': 'secret-challenge',
+      'X-Vona-Test-Stop-Authorization': 'secret-authorization',
+      'x-vona-test-stop-nonce': 'secret-nonce',
+      'accept': 'application/json',
+    };
+    const responseHeaders = {
+      'x-vona-test-proof': 'secret-readiness',
+      'X-Vona-Test-Stop-Proof': 'secret-ack',
+      'content-type': 'application/json',
+    };
+    const logs: string[] = [];
+    const middleware = Object.create(MiddlewareSystemHttpLog.prototype);
+    Object.assign(middleware, {
+      app: { meta: { env: { VONA_TEST_RUN_ID: '20261014010203-a1b2c3d4' } } },
+      ctx: {
+        path,
+        req: { url: path, headers },
+        res: { statusCode: 200, getHeaders: () => responseHeaders },
+      },
+      $loggerChild: () => ({
+        http: (message: () => string) => logs.push(message()),
+        startTimer: () => ({ done: ({ message }: { message: string }) => logs.push(message) }),
+      }),
+    });
+    await middleware.execute({}, async () => {});
+    assert.equal(logs.length, 2);
+    assert.equal(logs.join('\n').includes('secret-'), false);
+    assert.match(logs[0], /application\/json/);
+    assert.match(logs[1], /application\/json/);
+    assert.equal(headers['X-Vona-Test-Stop-Authorization'], 'secret-authorization');
+    assert.equal(responseHeaders['X-Vona-Test-Stop-Proof'], 'secret-ack');
+  });
+}

package/vona/src/suite-vendor/a-vona/modules/a-metrics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-metrics",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "",
   "keywords": [
     "Vona Module"

package/vona/src/suite-vendor/a-vona/modules/a-metrics/src/bean/middlewareSystem.health.ts

@@ -4,10 +4,15 @@ import type {
   IMiddlewareSystemExecute,
 } from 'vona-module-a-aspect';
 
-import { createHmac } from 'node:crypto';
-import { BeanBase } from 'vona';
+import { createHmac, timingSafeEqual } from 'node:crypto';
+import { assertTestAppIdentity, BeanBase, closeProcessWorker } from 'vona';
 import { MiddlewareSystem } from 'vona-module-a-aspect';
 
+// An accepted shutdown consumes this app's authorization before yielding. This also
+// rejects concurrent/replayed requests across request-scoped middleware instances.
+const stoppingApps = new WeakSet<object>();
+const STOP_PATH = '/health/test-stop';
+
 export interface IMiddlewareSystemOptionsHealth extends IDecoratorMiddlewareSystemOptions {}
 
 @MiddlewareSystem<IMiddlewareSystemOptionsHealth>({
@@ -16,6 +21,10 @@ export interface IMiddlewareSystemOptionsHealth extends IDecoratorMiddlewareSyst
 export class MiddlewareSystemHealth extends BeanBase implements IMiddlewareSystemExecute {
   async execute(_options: IMiddlewareSystemOptionsHealth, next: Next) {
     const path = this.ctx.path;
+    if (path === STOP_PATH) {
+      this._testStop();
+      return;
+    }
     if (!['/health/live', '/health/ready', '/health/startup'].includes(path)) return next();
     const health = await this.$scope.metrics.service.health.status(path);
     this.ctx.status = health.code;
@@ -36,4 +45,66 @@ export class MiddlewareSystemHealth extends BeanBase implements IMiddlewareSyste
     }
     this.ctx.body = { status: health.status };
   }
+
+  private _testStop() {
+    const ctx = this.ctx;
+    // Never trust forwarded IP headers, even when the app trusts a proxy.
+    const address = ctx.req.socket.remoteAddress;
+    const env = this.app.meta.env;
+    const key = process.env.VONA_TEST_READY_KEY;
+    let runId: string | undefined;
+    try {
+      runId = assertTestAppIdentity(env.META_MODE, env.VONA_TEST_RUN_ID ?? '', this.app.name);
+    } catch {
+      // Invalid or ordinary app identities must not expose this operation.
+    }
+    if (
+      !runId ||
+      process.env.META_MODE !== 'test' ||
+      process.env.VONA_TEST_RUN_ID !== runId ||
+      this.app.config.server.workers !== 1 ||
+      !key ||
+      !/^[a-f0-9]{64}$/.test(key) ||
+      !['127.0.0.1', '::1', '::ffff:127.0.0.1'].includes(address ?? '')
+    ) {
+      ctx.status = 404;
+      return;
+    }
+    const nonce = ctx.get('x-vona-test-stop-nonce');
+    const authorization = ctx.get('x-vona-test-stop-authorization');
+    if (
+      ctx.method !== 'POST' ||
+      ctx.req.url !== STOP_PATH ||
+      !/^[a-f0-9]{32}$/.test(nonce) ||
+      !/^[a-f0-9]{64}$/.test(authorization)
+    ) {
+      ctx.status = 403;
+      return;
+    }
+    // Readiness signs only a hex challenge. Neither that signing oracle nor the
+    // acknowledgment domain can produce a shutdown request authorization.
+    const payload = `${runId}\nPOST\n${STOP_PATH}\n${nonce}`;
+    const expected = createHmac('sha256', key)
+      .update(`vona-test-stop-request-v1\n${payload}`)
+      .digest();
+    if (!timingSafeEqual(expected, Buffer.from(authorization, 'hex'))) {
+      ctx.status = 403;
+      return;
+    }
+    if (stoppingApps.has(this.app)) {
+      ctx.status = 409;
+      return;
+    }
+    stoppingApps.add(this.app);
+    ctx.status = 200;
+    ctx.type = 'application/json';
+    ctx.set(
+      'x-vona-test-stop-proof',
+      createHmac('sha256', key).update(`vona-test-stop-ack-v1\n${payload}`).digest('hex'),
+    );
+    ctx.body = { status: 'stopping' };
+    // closeApp may close this listener, so flush the authenticated acknowledgment
+    // first. A disconnected response is not permission to start closing.
+    ctx.res.once('finish', () => void closeProcessWorker());
+  }
 }