Merge 8ab86b9 into 7e54940

framework/integration/storage/mysql-storage.ts

@@ -22,6 +22,8 @@ describe('storage/mysql-storage', () => {
       mysqlUser: 'idrinth-api-bench',
       mysqlPassword: 'mysqlTestPassword',
       mysqlDb: 'idrinth-api-bench',
+      containerName: 'storage-mysql',
+      defaultExternalPort: 3337,
     },);
     port = Number.parseInt(
       database.databaseURL.replace(/\D/gui, '',),
@@ -30,7 +32,7 @@ describe('storage/mysql-storage', () => {
   },);
   after(async() => {
     await delay(WAIT_MEDIUM,);
-    database.kill();
+    await database.kill();
   },);
   it('should be a class', () => {
     expect(MysqlStorage,).to.be.a('function',);

framework/integration/storage/storage-factory.ts

@@ -0,0 +1,55 @@
+import MysqlStorage from '../../src/storage/mysql-storage.js';
+import {
+  expect,
+} from 'chai';
+import 'mocha';
+import storageFactory from '../../src/storage/storage-factory';
+import getDatabase from '@databases/mysql-test';
+import NoopStorage from '../../src/storage/noop-storage';
+import delay from '../delay';
+
+const WAIT_LONG = 25000;
+const WAIT_MEDIUM = 1000;
+const RADIX = 10;
+
+describe('storage/storage-factory', () => {
+  it('should be a function', () => {
+    expect(storageFactory,).to.be.a('function',);
+  },);
+  it('(mysql) should not throw an error', async() => {
+    const database: {
+      databaseURL: string;
+      kill: () => Promise<void>;
+    } = await getDatabase.default({
+      mysqlUser: 'idrinth-api-bench',
+      mysqlPassword: 'mysqlTestPassword',
+      mysqlDb: 'idrinth-api-bench',
+      containerName: 'storage-factory-mysql',
+      defaultExternalPort: 3338,
+    },);
+    const port = Number.parseInt(
+      database.databaseURL.replace(/\D/gui, '',),
+      RADIX,
+    );
+    const storage = storageFactory({
+      databaseUser: 'idrinth-api-bench',
+      databasePassword: 'mysqlTestPassword',
+      databaseDatabase: 'idrinth-api-bench',
+      databasePort: port,
+      database: 'mysql',
+      cwd: '',
+      task: 'bench',
+    },) as MysqlStorage;
+    expect(storage,).to.be.an.instanceof(MysqlStorage,);
+    await delay(WAIT_MEDIUM,);
+    storage.close();
+    await database.kill();
+  },).timeout(WAIT_LONG,);
+  it('(noop) should not throw an error', function() {
+    const storage = storageFactory({
+      cwd: '',
+      task: 'bench',
+    },);
+    expect(storage,).to.be.an.instanceof(NoopStorage,);
+  },);
+},);

framework/src/cli/cli.ts

@@ -9,19 +9,22 @@ import run from '../main.js';
 import pkg from '../../package.json' with {
   type: 'json',
 };
-import factory from './config/factory.js';
+import configFactory from './config/config-factory.js';
+import storageFactory from '../storage/storage-factory.js';
 
 // eslint-disable-next-line complexity
 export default async(args: string[], cwd: string,): Promise<number> => {
-  const config = factory(cwd, args, process.env,);
+  const config = configFactory(cwd, args, process.env,);
   resultStore.set(false,);
+  const storage = storageFactory(config,);
   switch (config.task) {
     case 'bench':
       await run({
         mode: 'benchmarking',
         taskId: config.taskId,
         language: config.language,
         cwd: config.cwd,
+        resultStorage: storage,
       }, config.threads, config.repetitions,);
       break;
     case 'content':

framework/src/cli/config/config.ts

@@ -1,4 +1,11 @@
 interface Config {
+  databasePassword?: string;
+  databaseDriver?: string;
+  databaseTrustedConnection?: string;
+  databaseDatabase?: string;
+  databasePort?: number;
+  databaseUser?: string;
+  databaseHost?: string;
   cwd: string;
   taskId?: string;
   repetitions?: number;
@@ -8,5 +15,6 @@ interface Config {
   increment?: number;
   duration?: number;
   task: string;
+  database?: 'mysql'|'mssql'|'postgres';
 }
 export default Config;

framework/src/storage/storage-factory.ts

@@ -0,0 +1,43 @@
+import MysqlStorage from './mysql-storage.js';
+import PostgresStorage from './postgres-storage.js';
+import MssqlStorage from './mssql-storage.js';
+import NoopStorage from './noop-storage.js';
+import Config from '../cli/config/config.js';
+import Storage from './storage.js';
+
+// eslint-disable-next-line complexity
+export default (config: Config,): Storage => {
+  switch (config.database) {
+    case 'mysql':
+      return new MysqlStorage(
+        config.databaseHost,
+        config.databasePassword,
+        config.databasePort,
+        config.databaseUser ?? 'idrinth-api-bench',
+        config.databaseDatabase ?? 'idrinth-api-bench',
+      );
+    case 'postgres':
+      return new PostgresStorage(
+        config.databaseHost,
+        config.databasePassword,
+        config.databasePort,
+        config.databaseUser ?? 'idrinth-api-bench',
+        config.databaseDatabase ?? 'idrinth-api-bench',
+      );
+    case 'mssql':
+      return new MssqlStorage(
+        config.databaseHost,
+        config.databasePassword,
+        config.databasePort,
+        config.databaseDriver,
+        config.databaseUser ?? 'idrinth-api-bench',
+        config.databaseDatabase ?? 'idrinth-api-bench',
+        config.databaseTrustedConnection === 'true',
+      );
+    default:
+      if (config.database) {
+        throw new Error(`Database type ${ config.database } is unknown.`,);
+      }
+      return new NoopStorage();
+  }
+};