cabloy 5.1.203 → 5.1.205

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

@@ -0,0 +1,11 @@
+export function redactIsolatedReadyHeader<HEADERS extends Record<string, unknown>>(
+  headers: HEADERS,
+  path: string,
+  runId: string | undefined,
+  header: string,
+): HEADERS {
+  if (path !== '/health/ready' || !runId) return headers;
+  const redacted = { ...headers };
+  delete redacted[header];
+  return redacted;
+}

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

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

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

@@ -4,6 +4,7 @@ import type {
   IMiddlewareSystemExecute,
 } from 'vona-module-a-aspect';
 
+import { createHmac } from 'node:crypto';
 import { BeanBase } from 'vona';
 import { MiddlewareSystem } from 'vona-module-a-aspect';
 
@@ -19,6 +20,20 @@ export class MiddlewareSystemHealth extends BeanBase implements IMiddlewareSyste
     const health = await this.$scope.metrics.service.health.status(path);
     this.ctx.status = health.code;
     this.ctx.type = 'application/json';
+    if (
+      path === '/health/ready' &&
+      this.app.meta.env.META_MODE === 'test' &&
+      this.app.meta.env.VONA_TEST_RUN_ID &&
+      process.env.VONA_TEST_READY_KEY
+    ) {
+      const challenge = this.ctx.get('x-vona-test-challenge');
+      if (/^[a-f0-9]{32}$/.test(challenge)) {
+        this.ctx.set(
+          'x-vona-test-proof',
+          createHmac('sha256', process.env.VONA_TEST_READY_KEY).update(challenge).digest('hex'),
+        );
+      }
+    }
     this.ctx.body = { status: health.status };
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.32",
+  "version": "5.1.34",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/extend/schemaBuilder.ts

@@ -2,7 +2,7 @@ import type { Knex } from 'knex';
 import type { VonaApplication } from 'vona';
 
 import knex from 'knex';
-import { cast } from 'vona';
+import { cast, registerTestClaimDatabaseCreation } from 'vona';
 
 import type { IDatabaseClientDialectRecord } from '../types/database.ts';
 import type { IFetchDatabasesResultItem, IFetchIndexesResultItem } from '../types/dialect.ts';
@@ -10,10 +10,17 @@ import type { IFetchDatabasesResultItem, IFetchIndexesResultItem } from '../type
 export function ExtendSchemaBuilder(app: VonaApplication) {
   ['fetchDatabases', 'createDatabase', 'dropDatabase', 'fetchIndexes'].forEach(method => {
     knex.SchemaBuilder.extend(method, async function (...args) {
-      const client = cast<Knex.Client>(cast(this).client).config
-        .client as keyof IDatabaseClientDialectRecord;
+      const clientConfig = cast<Knex.Client>(cast(this).client).config;
+      const client = clientConfig.client as keyof IDatabaseClientDialectRecord;
       const dialect = app.bean.database.getDialect(client);
-      return await dialect[method](this, ...args);
+      if (method === 'createDatabase') {
+        await registerTestClaimDatabaseCreation(app, clientConfig, args[0], 'intent');
+      }
+      const result = await dialect[method](this, ...args);
+      if (method === 'createDatabase') {
+        await registerTestClaimDatabaseCreation(app, clientConfig, args[0], 'created');
+      }
+      return result;
     });
   });
 }

package/vona/src/suite-vendor/a-vona/modules/a-orm/src/service/databaseClient_.ts

@@ -2,7 +2,7 @@ import type { Knex } from 'knex';
 
 import { catchError } from '@cabloy/utils';
 import knex from 'knex';
-import { deepExtend } from 'vona';
+import { assertIsolatedTestDatabaseClient, assertTestClaimDatabaseClient, deepExtend } from 'vona';
 import { Service } from 'vona-module-a-bean';
 import { BeanMutateBase } from 'vona-module-a-beanmutate';
 
@@ -71,6 +71,8 @@ export class ServiceDatabaseClient extends BeanMutateBase {
     this.clientName = dbInfo.clientName;
     // config: inited by bean.database.getClient
     this.clientConfig = clientConfig!;
+    assertIsolatedTestDatabaseClient(this.app, this.clientName, this.clientConfig);
+    assertTestClaimDatabaseClient(this.app, this.clientName, this.clientConfig);
     // knex
     this._knex = knex(deepExtend({}, this.clientConfig));
   }
@@ -89,6 +91,7 @@ export class ServiceDatabaseClient extends BeanMutateBase {
       this.clientName,
       clientConfig,
     );
+    assertIsolatedTestDatabaseClient(this.app, this.clientName, clientConfigReal);
     this.$mutate([this.clientNameSelector, clientConfigReal]);
     await this.__close();
     this.__load(this.clientNameSelector, clientConfigReal);
@@ -118,6 +121,8 @@ export class ServiceDatabaseClient extends BeanMutateBase {
     //   * should not use this.clientConfig.connection, because password is hidden
     const config = this.scope.service.database.getClientConfig(this.clientName, undefined, true);
     config.connection = Object.assign({}, config.connection, connDatabaseName);
+    const effectiveConfig = this.scope.service.database.getClientConfig(this.clientName, config);
+    assertIsolatedTestDatabaseClient(this.app, this.clientName, effectiveConfig);
     // only used by startup, so no consider that workers broadcast
     this.configDatabase.clients[this.clientName] = config;
     // reload

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

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

package/vona/src/suite-vendor/a-vona/modules/a-ormdialect/src/bean/databaseDialect.betterSqlite3.ts

@@ -11,7 +11,9 @@ import type {
 
 import { ensureDir, remove } from 'fs-extra';
 import { globby } from 'globby';
+import { lstat } from 'node:fs/promises';
 import path from 'node:path';
+import { assertTestRunOwner, resolveVonaLocalPaths, resolveTestRunId } from 'vona';
 import { ServiceDatabaseDialectBase, DatabaseDialect } from 'vona-module-a-orm';
 
 export interface IDatabaseDialectOptionsBetterSqlite3 extends IDecoratorDatabaseDialectOptions {}
@@ -54,6 +56,30 @@ export class DatabaseDialectBetterSqlite3 extends ServiceDatabaseDialectBase {
   }
 
   async dropDatabase(_schemaBuilder: Knex.SchemaBuilder, databaseName: string): Promise<void> {
+    const isolated = resolveTestRunId(
+      this.app.meta.env.META_MODE,
+      this.app.meta.env.VONA_TEST_RUN_ID,
+    );
+    if (isolated) {
+      const paths = resolveVonaLocalPaths(this.app.projectPath, 'test', isolated);
+      assertTestRunOwner(paths.dataRoot, isolated);
+      const basename = path.basename(databaseName);
+      if (
+        path.resolve(databaseName) !== path.join(paths.sqliteRoot, basename) ||
+        !/^vona-test-[\w-]+-\d{8}-\d{6}\.db$/.test(basename)
+      ) {
+        throw new Error(
+          `Isolated test cannot remove SQLite database outside its owned root: ${databaseName}`,
+        );
+      }
+      await assertNotSymlink(paths.sqliteRoot);
+      for (const file of [
+        databaseName,
+        ...['shm', 'wal', 'journal'].map(part => `${databaseName}-${part}`),
+      ]) {
+        await assertNotSymlink(file);
+      }
+    }
     await remove(databaseName);
     for (const part of ['shm', 'wal', 'journal']) {
       await remove(`${databaseName}-${part}`);
@@ -93,7 +119,21 @@ export class DatabaseDialectBetterSqlite3 extends ServiceDatabaseDialectBase {
   }
 
   private _getDbDir() {
-    return path.join(this.app.projectPath, '.app/sqlite3');
+    return resolveVonaLocalPaths(
+      this.app.projectPath,
+      this.app.meta.env.META_MODE,
+      this.app.meta.env.VONA_TEST_RUN_ID,
+    ).sqliteRoot;
+  }
+}
+
+async function assertNotSymlink(file: string) {
+  try {
+    if ((await lstat(file)).isSymbolicLink()) {
+      throw new Error(`Isolated test SQLite path is a symlink: ${file}`);
+    }
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') throw error;
   }
 }
 

package/vona/src/suite-vendor/a-vona/modules/a-ormdialect/src/bean/databaseDialect.mysql.ts

@@ -34,7 +34,10 @@ export class DatabaseDialectMysql extends ServiceDatabaseDialectBase {
     schemaBuilder: Knex.SchemaBuilder,
     databasePrefix: string,
   ): Promise<IFetchDatabasesResultItem[]> {
-    const res = await schemaBuilder.raw(`show databases like '${databasePrefix}%'`);
+    const escapedPrefix = databasePrefix.replaceAll("'", "''");
+    const res = await schemaBuilder.raw(
+      `select schema_name from information_schema.schemata where left(schema_name, ${databasePrefix.length}) = '${escapedPrefix}'`,
+    );
     let dbs = res[0];
     dbs = dbs.map(db => {
       const name = db[Object.keys(db)[0]];

package/vona/src/suite-vendor/a-vona/modules/a-ormdialect/src/bean/databaseDialect.pg.ts

@@ -26,8 +26,9 @@ export class DatabaseDialectPg extends ServiceDatabaseDialectBase {
     schemaBuilder: Knex.SchemaBuilder,
     databasePrefix: string,
   ): Promise<IFetchDatabasesResultItem[]> {
+    const escapedPrefix = databasePrefix.replaceAll("'", "''");
     const res: any = await schemaBuilder.raw(
-      `select datname from pg_database where datname like '${databasePrefix}%'`,
+      `select datname from pg_database where left(datname, ${databasePrefix.length}) = '${escapedPrefix}'`,
     );
     let dbs = res.rows;
     dbs = dbs.map(db => {

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-permission",
-  "version": "5.1.24",
+  "version": "5.1.26",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

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

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

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

@@ -1,5 +1,7 @@
 import type { VonaApplication } from 'vona';
 
+import { resolveTestRunId } from 'vona';
+
 export function getRedisClientKeyPrefix(clientName: string, app: VonaApplication): string {
   const mode = ['test', 'dev'].includes(app.config.meta.mode) ? '_local' : '';
   return `${clientName}_${app.name}${mode}:`;
@@ -10,5 +12,11 @@ export function prepareRedisClientKeyPrefix(
   clientName: string,
   app: VonaApplication,
 ): string | undefined {
+  const isolated = resolveTestRunId(app.meta.env.META_MODE, app.meta.env.VONA_TEST_RUN_ID);
+  const specialClient =
+    ['queue', 'broadcast'].includes(clientName) || clientName.startsWith('redlock');
+  if (isolated && (specialClient ? keyPrefix !== undefined : keyPrefix !== true)) {
+    throw new Error(`Isolated test requires a framework-managed Redis prefix: ${clientName}`);
+  }
   return keyPrefix === true ? getRedisClientKeyPrefix(clientName, app) : keyPrefix;
 }

package/vona/src/suite-vendor/a-vona/modules/a-redis/src/service/redis.ts

@@ -1,6 +1,6 @@
 import type { Redis } from 'ioredis';
 
-import { BeanBase } from 'vona';
+import { BeanBase, resolveTestRunId } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 import type { IRedisClientRecord } from '../types/redis.ts';
@@ -14,7 +14,8 @@ export class ServiceRedis extends BeanBase {
     // clear keys
     await this._clearRedisKeys(
       app.bean.redis.get('queue'),
-      `${getRedisClientKeyPrefix('bull', app)}*`,
+      getRedisClientKeyPrefix('bull', app),
+      true,
     );
     // broadcast channel has subscribed
     // await _clearRedisKeys(app.redis.get('broadcast'), `${getRedisClientKeyPrefix('broadcast', app)}*`);
@@ -24,22 +25,38 @@ export class ServiceRedis extends BeanBase {
       if (clientName.startsWith('redlock')) {
         await this._clearRedisKeys(
           app.bean.redis.get(clientName),
-          `${getRedisClientKeyPrefix('redlock', app)}*`,
+          getRedisClientKeyPrefix('redlock', app),
+          true,
         );
       } else {
         const client = app.config.redis.clients[clientName];
         const keyPrefix = prepareRedisClientKeyPrefix(client.keyPrefix, clientName, this.app);
-        await this._clearRedisKeys(app.bean.redis.get(clientName), `${keyPrefix}*`);
+        await this._clearRedisKeys(app.bean.redis.get(clientName), keyPrefix!);
       }
     }
   }
 
-  private async _clearRedisKeys(redis: Redis, pattern: string) {
+  private async _clearRedisKeys(redis: Redis, expectedPrefix: string, unprefixedClient = false) {
     if (!redis) return;
+    const isolated = resolveTestRunId(
+      this.app.meta.env.META_MODE,
+      this.app.meta.env.VONA_TEST_RUN_ID,
+    );
     const keyPrefix = redis.options.keyPrefix;
-    const keys = await redis.keys(pattern);
+    if (isolated) {
+      if (!expectedPrefix.includes(this.app.name) || !expectedPrefix.endsWith(':')) {
+        throw new Error('Isolated test Redis cleanup prefix does not belong to this run');
+      }
+      if (unprefixedClient ? Boolean(keyPrefix) : keyPrefix !== expectedPrefix) {
+        throw new Error('Isolated test Redis cleanup uses an unexpected client prefix');
+      }
+    }
+    const keys = await redis.keys(`${expectedPrefix}*`);
     const keysDel: string[] = [];
     for (const fullKey of keys) {
+      if (isolated && !fullKey.startsWith(expectedPrefix)) {
+        throw new Error('Isolated test Redis lookup returned a key outside the owned prefix');
+      }
       const key = keyPrefix ? fullKey.substring(keyPrefix.length) : fullKey;
       keysDel.push(key);
     }

package/vona/src/suite-vendor/a-vona/modules/a-redis/src/service/redisClient_.ts

@@ -1,7 +1,7 @@
 import type { RedisOptions } from 'ioredis';
 
 import { Redis } from 'ioredis';
-import { BeanBase, cast, deepExtend } from 'vona';
+import { assertTestClaimRedisClient, BeanBase, cast, deepExtend, resolveTestRunId } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 import type { ConfigRedisCluster, IRedisClientRecord } from '../types/redis.ts';
@@ -29,6 +29,22 @@ export class ServiceRedisClient extends BeanBase {
     const configRedis = this.app.config.redis;
     const configClient = configRedis.clients[clientName];
     if (!configClient) throw new Error(`redis client not found: ${clientName}`);
+    const isolated = resolveTestRunId(
+      this.app.meta.env.META_MODE,
+      this.app.meta.env.VONA_TEST_RUN_ID,
+    );
+    if (
+      isolated &&
+      (cast<RedisOptions>(configClient).sentinels || cast<ConfigRedisCluster>(configClient).nodes)
+    ) {
+      throw new Error(`Isolated test cannot use a Redis sentinel or cluster client: ${clientName}`);
+    }
+    if (isolated) {
+      prepareRedisClientKeyPrefix(configClient.keyPrefix, clientName, this.app);
+      if (configRedis.base.keyPrefix !== undefined) {
+        throw new Error('Isolated test cannot inherit a Redis base keyPrefix');
+      }
+    }
     if (cast<RedisOptions>(configClient).sentinels) {
       // sentinels
       return new Redis(configClient as RedisOptions);
@@ -40,6 +56,7 @@ export class ServiceRedisClient extends BeanBase {
     } else {
       const keyPrefix = prepareRedisClientKeyPrefix(configClient.keyPrefix, clientName, this.app);
       const configNode = deepExtend({}, configRedis.base, configClient, { keyPrefix });
+      assertTestClaimRedisClient(this.app, clientName, configNode);
       return new Redis(configNode);
     }
   }

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

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

package/vona/src/suite-vendor/a-vona/modules/a-startup/src/service/startup.ts

@@ -3,7 +3,13 @@ import type { IOnionSlice } from 'vona-module-a-onion';
 
 import { isNil } from '@cabloy/utils';
 import fse from 'fs-extra';
-import { BeanBase, cast, getRuntimePathPhysicalRoot } from 'vona';
+import {
+  assertIsolatedTestConfig,
+  BeanBase,
+  cast,
+  getRuntimePathPhysicalRoot,
+  withIsolatedTestDatabaseDiscovery,
+} from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 import type {
@@ -16,6 +22,10 @@ import type {
 @Service()
 export class ServiceStartup extends BeanBase {
   async appStart() {
+    // db:reset is a one-shot data preparation command, not a development server.
+    if (this.app.meta.isDev && process.env.VONA_DB_RESET === 'true') {
+      this.app.config.server.listen.disable = true;
+    }
     // clear keys
     await this._clearResources();
 
@@ -23,7 +33,23 @@ export class ServiceStartup extends BeanBase {
     for (const startup of this._startups) {
       const startupOptions = startup.beanOptions.options;
       if (!startupOptions?.instance && startupOptions?.after !== true) {
-        await this.runStartup(startup.name, null);
+        // A previous dev startup may have left databaseInit's debounce key in Redis.
+        // Only the explicit reset must bypass that key to guarantee recreation.
+        const force =
+          this.app.meta.isDev &&
+          process.env.VONA_DB_RESET === 'true' &&
+          startup.name === 'a-version:databaseInit';
+        const run = () => this.runStartup(startup.name, null, force ? { force: true } : undefined);
+        if (this.app.meta.env.VONA_TEST_RUN_ID && startup.name === 'a-version:databaseInit') {
+          const defaultClient = this.app.config.database.defaultClient;
+          if (typeof defaultClient !== 'string') {
+            throw new TypeError('Isolated test requires a static default database client');
+          }
+          const client = this.app.config.database.clients[defaultClient];
+          await withIsolatedTestDatabaseDiscovery(this.app, defaultClient, client, run);
+        } else {
+          await run();
+        }
       }
     }
   }
@@ -52,24 +78,25 @@ export class ServiceStartup extends BeanBase {
       }
     }
 
-    // version seed
-    if (this.app.meta.isTest) {
-      const instanceName = '';
-      await this.bean.executor.newCtx(
-        async () => {
-          await this.$scope.version.service.version.__instanceSeed(instanceName);
-        },
-        {
-          dbInfo: { level: 1 },
-          instanceName,
-        },
-      );
+    // Seed test runs and explicit development resets only, after instance initialization.
+    if (this.app.meta.isTest || (this.app.meta.isDev && process.env.VONA_DB_RESET === 'true')) {
+      await this.seedDefaultInstance();
     }
   }
 
+  private async seedDefaultInstance() {
+    const instanceName = '';
+    await this.bean.executor.newCtx(
+      async () => {
+        await this.$scope.version.service.version.__instanceSeed(instanceName);
+      },
+      { dbInfo: { level: 1 }, instanceName },
+    );
+  }
+
   private async _appReadyInstanceStartup(instanceName: keyof IInstanceRecord, wait: boolean) {
     const res = this.$scope.instance.service.instance.instanceStartupIsolate(instanceName, {
-      force: false,
+      force: this.app.meta.isDev && process.env.VONA_DB_RESET === 'true',
     });
     if (wait) {
       await res;
@@ -172,6 +199,7 @@ export class ServiceStartup extends BeanBase {
 
   private async _clearResources() {
     if (!this.app.meta.isTest) return;
+    assertIsolatedTestConfig(this.app);
     // redis
     await this.$scope.redis.service.redis.clearAllData();
     // .app/public

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

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

package/vona/src/suite-vendor/a-vona/modules/a-version/src/lib/databaseTestName.ts

@@ -1,21 +1,8 @@
-import { createHash } from 'node:crypto';
+import { getDatabaseTestPrefix } from 'vona';
 
-const DATABASE_NAME_MAX_BYTES = 63;
-const APP_NAME_MAX_BYTES = 13;
-const HASH_LENGTH = 10;
-const TIMESTAMP_LENGTH = 15;
-
-export function getDatabaseTestPrefix(appName: string, scope: string): string {
-  const readablePrefix = getReadablePrefix(appName, scope);
-  if (Buffer.byteLength(readablePrefix, 'utf8') + TIMESTAMP_LENGTH <= DATABASE_NAME_MAX_BYTES) {
-    return readablePrefix;
-  }
+export { getDatabaseTestPrefix };
 
-  const appHead = truncateUtf8(appName, APP_NAME_MAX_BYTES);
-  const scopeKind = scope === 'share' ? 's' : 'i';
-  const namespaceHash = hash(`${appName}\0${scope}`);
-  return `vona-test-${appHead}-${scopeKind}-${namespaceHash}-`;
-}
+const DATABASE_NAME_MAX_BYTES = 63;
 
 export function createDatabaseTestName(databasePrefix: string, timestamp: string): string {
   const databaseName = `${databasePrefix}${timestamp}`;
@@ -24,24 +11,3 @@ export function createDatabaseTestName(databasePrefix: string, timestamp: string
   }
   return databaseName;
 }
-
-function getReadablePrefix(appName: string, scope: string): string {
-  if (scope === 'share') return `vona-test-${appName}-s-`;
-  return `vona-test-${appName}-i-${scope.slice('isolate-'.length)}-`;
-}
-
-function hash(value: string): string {
-  return createHash('sha256').update(value).digest('base64url').slice(0, HASH_LENGTH);
-}
-
-function truncateUtf8(value: string, maxBytes: number): string {
-  let result = '';
-  let bytes = 0;
-  for (const char of value) {
-    const charBytes = Buffer.byteLength(char, 'utf8');
-    if (bytes + charBytes > maxBytes) break;
-    result += char;
-    bytes += charBytes;
-  }
-  return result;
-}