cabloy 5.1.203 → 5.1.205

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

@@ -4,7 +4,15 @@ import type { IDatabaseClientRecord, ServiceDatabaseClient } from 'vona-module-a
 
 import chalk from 'chalk';
 import { DateTime } from 'luxon';
-import { BeanBase } from 'vona';
+import path from 'node:path';
+import {
+  BeanBase,
+  assertDisposableDatabaseName as assertDisposableDatabaseNameCore,
+  assertIsolatedTestPath,
+  assertTestRunOwner,
+  resolveVonaLocalPaths,
+  withIsolatedTestDatabaseDiscovery,
+} from 'vona';
 import { Service } from 'vona-module-a-bean';
 
 import { createDatabaseTestName, getDatabaseTestPrefix } from '../lib/databaseTestName.ts';
@@ -12,6 +20,21 @@ import { createDatabaseTestName, getDatabaseTestPrefix } from '../lib/databaseTe
 const __separator = '-';
 const __timeFormat = `yyyyMMdd${__separator}HHmmss`;
 
+export function assertDisposableDatabaseName(
+  databaseName: string,
+  databasePrefix: string,
+  sqliteRoot?: string,
+) {
+  const filename = sqliteRoot ? path.basename(databaseName, '.db') : databaseName;
+  assertDisposableDatabaseNameCore(filename, databasePrefix);
+  if (sqliteRoot) {
+    if (!path.isAbsolute(databaseName) || path.extname(databaseName) !== '.db') {
+      throw new Error(`Database is outside the disposable SQLite directory: ${databaseName}`);
+    }
+    assertIsolatedTestPath(databaseName, path.join(sqliteRoot, `${filename}.db`));
+  }
+}
+
 @Service()
 export class ServiceDatabase extends BeanBase {
   get configDatabase() {
@@ -42,9 +65,14 @@ export class ServiceDatabase extends BeanBase {
     instanceName?: keyof IInstanceRecord,
     configInstanceBase?: ConfigInstanceBase,
   ) {
-    await this.bean.database.switchDb(async () => {
-      await this.__prepareDatabase(versionStart, instanceName, configInstanceBase);
-    }, clientName);
+    const clientNameReal =
+      clientName === 'default' ? (this.configDatabase.defaultClient as string) : clientName;
+    const clientConfig = this.configDatabase.clients[clientNameReal];
+    await withIsolatedTestDatabaseDiscovery(this.app, clientNameReal, clientConfig, async () => {
+      await this.bean.database.switchDb(async () => {
+        await this.__prepareDatabase(versionStart, instanceName, configInstanceBase);
+      }, clientName);
+    });
   }
 
   private async __fetchDatabases(
@@ -94,13 +122,14 @@ export class ServiceDatabase extends BeanBase {
     instanceName?: keyof IInstanceRecord,
     configInstanceBase?: ConfigInstanceBase,
   ) {
-    await this.__prepareDatabaseInner(instanceName, configInstanceBase);
+    await this.__prepareDatabaseInner(versionStart, instanceName, configInstanceBase);
     if (versionStart) {
       await this.scope.service.version.__start();
     }
   }
 
   private async __prepareDatabaseInner(
+    versionStart: boolean,
     instanceName?: keyof IInstanceRecord,
     configInstanceBase?: ConfigInstanceBase,
   ) {
@@ -109,26 +138,71 @@ export class ServiceDatabase extends BeanBase {
       return;
     }
     const databasePrefix = this.getDatabasePrefix(instanceName, configInstanceBase);
+    if (this.app.meta.env.VONA_TEST_RUN_ID) {
+      const paths = resolveVonaLocalPaths(
+        this.app.projectPath,
+        this.app.meta.env.META_MODE,
+        this.app.meta.env.VONA_TEST_RUN_ID,
+      );
+      assertTestRunOwner(paths.dataRoot, paths.runId!);
+    }
     // client
     const client = this.bean.database.current.client;
     // get current database name
     let databaseName = client.getDatabaseName();
-    const isTestDatabase = databaseName.includes(databasePrefix);
     // dev/debug db
     if (this.app.meta.isDev) {
-      // if enable testDatabase
-      const enableTestDatabase = this.configDatabase.testDatabase;
-      // check
-      if (!enableTestDatabase || isTestDatabase) {
-        // donothing
+      const reset = versionStart && process.env.VONA_DB_RESET === 'true';
+      // Never drop a configured, non-disposable development database.
+      if (reset && !this.configDatabase.testDatabase) {
+        throw new Error('db:reset requires database.testDatabase=true in the dev configuration');
+      }
+      if (!this.configDatabase.testDatabase) return;
+    }
+    const sqliteRoot =
+      client.db.dialectName === 'better-sqlite3'
+        ? resolveVonaLocalPaths(
+            this.app.projectPath,
+            this.app.meta.env.META_MODE,
+            this.app.meta.env.VONA_TEST_RUN_ID,
+          ).sqliteRoot
+        : undefined;
+    const currentFilename = sqliteRoot ? path.basename(databaseName, '.db') : databaseName;
+    const isTestDatabase = currentFilename.startsWith(databasePrefix);
+    if (isTestDatabase) assertDisposableDatabaseName(databaseName, databasePrefix, sqliteRoot);
+    if (
+      this.app.meta.isTest &&
+      this.app.meta.env.VONA_TEST_RUN_ID &&
+      currentFilename.startsWith('vona-test-') &&
+      !isTestDatabase
+    ) {
+      throw new Error(
+        `Isolated test database is outside its disposable namespace: ${databaseName}`,
+      );
+    }
+    // dev/debug db
+    if (this.app.meta.isDev) {
+      const reset = versionStart && process.env.VONA_DB_RESET === 'true';
+      // The database used to enumerate/drop databases must not itself be dropped.
+      if (isTestDatabase) {
+        if (reset)
+          throw new Error('db:reset requires a connection outside the disposable database');
         return;
       }
       const dbs = await this.__fetchDatabases(client, instanceName, configInstanceBase);
-      if (dbs.length === 0) {
-        databaseName = await this.__createDatabase(client, instanceName, configInstanceBase);
-      } else {
-        databaseName = dbs[0].name;
+      for (const db of dbs) {
+        assertDisposableDatabaseName(db.name, databasePrefix, sqliteRoot);
+      }
+      if (reset) {
+        for (const db of dbs) {
+          await client.connection.schema.dropDatabase(db.name);
+        }
       }
+      databaseName =
+        reset || dbs.length === 0
+          ? await this.__createDatabase(client, instanceName, configInstanceBase)
+          : dbs[0].name;
+      assertDisposableDatabaseName(databaseName, databasePrefix, sqliteRoot);
       // set config and reload client
       await client.changeConfigConnectionAndReloadWorker(databaseName);
       this.$logger.silly(chalk.cyan(`dialect: ${client.db.dialectName}`));
@@ -143,11 +217,15 @@ export class ServiceDatabase extends BeanBase {
       }
       // drop old databases
       const dbs = await this.__fetchDatabases(client, instanceName, configInstanceBase);
+      for (const db of dbs) {
+        assertDisposableDatabaseName(db.name, databasePrefix, sqliteRoot);
+      }
       for (const db of dbs) {
         await client.connection.schema.dropDatabase(db.name);
       }
       // create database
       const databaseName = await this.__createDatabase(client, instanceName, configInstanceBase);
+      assertDisposableDatabaseName(databaseName, databasePrefix, sqliteRoot);
       // set config and reload client
       await client.changeConfigConnectionAndReloadWorker(databaseName);
       // database ready

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.94",
+  "version": "5.1.96",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",

package/vona/tsconfig.json

@@ -31,6 +31,7 @@
   ],
   "include": [
     ".vona/**/*.ts",
+    ".vona-test-*/**/*.ts",
     "src/backend/package.json",
     "src/backend/config",
     "src/backend/play",

package/scripts/initTestData.ts

@@ -1,25 +0,0 @@
-import { execSync } from 'node:child_process';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const ROOT_DIR = resolve(__dirname, '..');
-
-function exec(cmd: string): void {
-  execSync(cmd, { stdio: 'inherit', cwd: ROOT_DIR });
-}
-
-function initTestData(): void {
-  // eslint-disable-next-line no-console
-  console.log('[init:test-data] Initializing test data via npm run test...');
-  try {
-    exec('npm run test');
-  } catch {
-    // eslint-disable-next-line no-console
-    console.warn(
-      '[init:test-data] npm run test failed after init completed; Redis may be unavailable, skipping test data initialization',
-    );
-  }
-}
-
-initTestData();