qa: add e2e tests

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Node.js Package
 on:
   push:
   pull_request:
-    types: [opened]
+    types: [opened, synchronize, reopened]
   # release:
   #   types: [created]
 
@@ -18,6 +18,7 @@ env:
 permissions:
   contents: read
   packages: read
+  pull-requests: write
 
 jobs:
   build:
@@ -34,6 +35,11 @@ jobs:
 
       - run: pnpm install
       - run: pnpm run test
+      - name: 'Report Coverage'
+        # Set if: always() to also generate the report if tests are failing
+        # Only works if you set `reportOnFailure: true` in your vite config as specified above
+        if: always()
+        uses: davelosert/vitest-coverage-report-action@v2
       - run: pnpm run build
       - uses: actions/upload-artifact@v3
         with:

.gitignore

@@ -2,3 +2,5 @@
 .turbo/
 /.pnpm-store/
 /out/
+/coverage/
+/e2e-tmp/

package.json

@@ -8,21 +8,25 @@
     "build": "turbo build",
     "build:dev": "tsc --build --watch",
     "test:lint": "eslint ./packages/*/src",
-    "test": "pnpm run test:lint"
+    "test:code": "vitest --coverage",
+    "test": "pnpm run test:lint && pnpm run test:code"
   },
   "keywords": [],
   "author": "",
   "devDependencies": {
     "@react-native-community/eslint-config": "^3.2.0",
+    "@vitest/coverage-v8": "^1.2.0",
     "eslint": "^8.53.0",
     "prettier": "^2.8.8",
     "turbo": "^1.10.16",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vite": "^5.0.11"
   },
   "dependencies": {
     "@pnpm/find-workspace-packages": "^6.0.9",
     "@types/node": "^20.10.8",
-    "ts-node": "^10.9.2"
+    "ts-node": "^10.9.2",
+    "vitest": "^1.2.0"
   },
   "homepage": "https://github.com/morten-olsen/mini-loader",
   "repository": {

packages/cli/bin/index.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
 import 'source-map-support/register.js';
-import '../dist/esm/index.js';
+import '../dist/esm/bin.js';

packages/cli/package.json

@@ -40,7 +40,8 @@
     "rollup": "^4.9.4",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "source-map-support": "^0.5.21",
-    "superjson": "^2.2.1"
+    "superjson": "^2.2.1",
+    "typedi": "^0.10.0"
   },
   "devDependencies": {
     "@morten-olsen/mini-loader-configs": "workspace:^",

packages/cli/src/api/api.ts

@@ -0,0 +1,46 @@
+import { ContainerInstance, Service } from 'typedi';
+import { Context } from '../context/context.js';
+import { Config } from '../config/config.js';
+import { Client, createClient } from '../client/client.js';
+import type { Runtime } from '@morten-olsen/mini-loader-server';
+import { Terminal } from './output.js';
+
+@Service()
+class CliApi {
+  #container: ContainerInstance;
+  #client?: Client;
+
+  constructor(container: ContainerInstance) {
+    this.#container = container;
+  }
+
+  public get log() {
+    return this.#container.get(Terminal).log;
+  }
+
+  public get step() {
+    return this.#container.get(Terminal).step;
+  }
+
+  public get output() {
+    return this.#container.get(Terminal).output;
+  }
+
+  public get config() {
+    return this.#container.get(Config);
+  }
+
+  public get client() {
+    if (!this.#client) {
+      this.#client = createClient(this.context);
+    }
+    return this.#client;
+  }
+
+  public get context() {
+    return new Context(this.config);
+  }
+}
+
+export type { Runtime };
+export { CliApi };

packages/cli/src/api/output.ts

@@ -0,0 +1,27 @@
+import ora from 'ora';
+import { Service } from 'typedi';
+
+@Service()
+class Terminal {
+  public log = (message: string) => {
+    console.log(message);
+  };
+
+  public output = (data: unknown) => {
+    console.table(data);
+  };
+
+  public step = async <T>(message: string, action: () => Promise<T>) => {
+    const spinner = ora(message).start();
+    try {
+      const result = await action();
+      await spinner.succeed();
+      return result;
+    } catch (err) {
+      await spinner.fail();
+      throw err;
+    }
+  };
+}
+
+export { Terminal };

packages/cli/src/bin.ts

@@ -0,0 +1,7 @@
+import { ContainerInstance } from 'typedi';
+import { createClientCli } from './index.js';
+
+const container = new ContainerInstance('client');
+const program = createClientCli(container);
+
+await program.parseAsync();

packages/cli/src/client/client.ts

@@ -1,14 +1,9 @@
 import { createTRPCProxyClient, httpBatchLink } from '@trpc/client';
 import superjson from 'superjson';
-import { createRequire } from 'module';
 import type { Runtime } from '@morten-olsen/mini-loader-server';
 import type { RootRouter } from '@morten-olsen/mini-loader-server';
 import { Context } from '../context/context.js';
-import { readFile } from 'fs/promises';
 
-const require = createRequire(import.meta.url);
-
-const pkg = JSON.parse(await readFile(require.resolve('#pkg'), 'utf-8'));
 const createClient = (context: Context) => {
   if (!context.host || !context.token) {
     throw new Error('Not signed in');
@@ -19,7 +14,6 @@ const createClient = (context: Context) => {
       httpBatchLink({
         url: `${context.host}/trpc`,
         headers: {
-          'x-version': pkg.version,
           authorization: `Bearer ${context.token}`,
         },
       }),

packages/cli/src/commands/artifacts/artifacts.list.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const list = new Command('list');
 
@@ -22,11 +19,7 @@ list
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
     const { runId, loadId, offset, limit } = list.opts();
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
+    const { step, client } = getApi(list);
     const artifacts = await step('Getting artifacts', async () => {
       return await client.artifacts.find.query({
         runId,

packages/cli/src/commands/artifacts/artifacts.pull.ts

@@ -1,10 +1,7 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
 import { dirname, resolve } from 'path';
 import { mkdir, writeFile } from 'fs/promises';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const pull = new Command('pull');
 
@@ -13,12 +10,8 @@ pull
   .argument('<artifact-id>', 'Artifact ID')
   .argument('<file>', 'File to save')
   .action(async (id, file) => {
-    const config = new Config();
-    const context = new Context(config.context);
+    const { step, client } = getApi(pull);
     const target = resolve(file);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const artifact = await step('Getting artifact', async () => {
       const result = await client.artifacts.get.query(id);
       if (!result) {

packages/cli/src/commands/artifacts/artifacts.remove.ts

@@ -1,9 +1,6 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
 import inquirer from 'inquirer';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const remove = new Command('remove');
 
@@ -22,12 +19,8 @@ remove
   .option('-o, --offset <offset>', 'Offset')
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
+    const { step, client } = getApi(remove);
     const { runId, loadId, offset, limit } = remove.opts();
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const response = await step('Preparing to delete', async () => {
       return await client.artifacts.prepareRemove.query({
         runId,

packages/cli/src/commands/auth/auth.login.ts

@@ -1,28 +1,37 @@
 import { Command } from 'commander';
 import inquerer from 'inquirer';
-import { Context } from '../../context/context.js';
-import { step } from '../../utils/step.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const login = new Command('login');
 
 login.description('Login to your account');
+login.option('--host <host>', 'The host of your server');
+login.option('--token <token>', 'The token of your account');
 login.action(async () => {
-  const config = new Config();
-  const context = new Context(config.context);
-  const { host, token } = await inquerer.prompt([
-    {
-      type: 'input',
-      name: 'host',
-      message: 'Enter the host of your server',
-      default: context.host ?? 'http://localhost:4500',
-    },
-    {
-      type: 'password',
-      name: 'token',
-      message: 'Enter your token',
-    },
-  ]);
+  let { host, token } = login.opts();
+  const { step, context } = getApi(login);
+  if (!host) {
+    const answers = await inquerer.prompt([
+      {
+        type: 'input',
+        name: 'host',
+        message: 'Enter the host of your server',
+        default: context.host || 'http://localhost:4500',
+      },
+    ]);
+    host = answers.host;
+  }
+
+  if (!token) {
+    const answers = await inquerer.prompt([
+      {
+        type: 'password',
+        name: 'token',
+        message: 'Enter your token',
+      },
+    ]);
+    token = answers.token;
+  }
 
   const healthResponse = await step('Getting auth status', async () => {
     return await fetch(`${host}/health`, {

packages/cli/src/commands/contexts/contexts.current.ts

@@ -1,9 +1,9 @@
 import { Command } from 'commander';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const current = new Command('current');
 current.action(async () => {
-  const config = new Config();
+  const { config } = getApi(current);
   console.log(config.context);
 });
 

packages/cli/src/commands/contexts/contexts.use.ts

@@ -1,10 +1,10 @@
 import { Command } from 'commander';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const use = new Command('use');
 
 use.argument('<name>').action(async (name) => {
-  const config = new Config();
+  const { config } = getApi(use);
   await config.setContext(name);
 });
 

packages/cli/src/commands/loads/loads.list.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const list = new Command('list');
 
@@ -10,15 +7,11 @@ list
   .alias('ls')
   .description('List loads')
   .action(async () => {
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
+    const { output, step, client } = getApi(list);
     const loads = await step('Getting data', async () => {
       return await client.loads.find.query({});
     });
-    console.table(loads);
+    await output(loads);
   });
 
 export { list };

packages/cli/src/commands/loads/loads.push.ts

@@ -1,10 +1,7 @@
 import { Command } from 'commander';
 import { resolve } from 'path';
-import { createClient } from '../../client/client.js';
 import { bundle } from '../../bundler/bundler.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const push = new Command('push');
 
@@ -16,12 +13,8 @@ push
   .option('-ai, --auto-install', 'Auto install dependencies', false)
   .action(async (script) => {
     const opts = push.opts();
-    const config = new Config();
-    const context = new Context(config.context);
+    const { step, log, client } = getApi(push);
     const location = resolve(script);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const code = await step('Bundling', async () => {
       return await bundle({ entry: location, autoInstall: opts.autoInstall });
     });
@@ -32,12 +25,12 @@ push
         script: code,
       });
     });
-    console.log('created load with id', id);
+    await log(`created load with id ${id}`);
     if (opts.run) {
       const runId = await step('Creating run', async () => {
         return await client.runs.create.mutate({ loadId: id });
       });
-      console.log('created run with id', runId);
+      await log(`created run with id ${runId}`);
     }
   });
 

packages/cli/src/commands/local/local.run.ts

@@ -2,9 +2,8 @@ import { Command } from 'commander';
 import { resolve } from 'path';
 import { run as runLoad } from '@morten-olsen/mini-loader-runner';
 import { bundle } from '../../bundler/bundler.js';
-import { step } from '../../utils/step.js';
 import { readSecrets } from './local.utils.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const run = new Command('run');
 
@@ -12,8 +11,8 @@ run
   .option('-ai, --auto-install', 'Auto install dependencies', false)
   .argument('script')
   .action(async (script) => {
+    const { step, config } = getApi(run);
     const location = resolve(script);
-    const config = new Config();
     const { autoInstall } = run.opts();
     const secrets = await readSecrets();
 

packages/cli/src/commands/logs/logs.list.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const list = new Command('list');
 
@@ -24,11 +21,7 @@ list
   .option('-s, --sort <order>', 'Sort', 'desc')
   .action(async () => {
     const { runId, loadId, severities, offset, limit, order } = list.opts();
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
+    const { step, output, client } = getApi(list);
     const logs = await step('Getting logs', async () => {
       return await client.logs.find.query({
         runId,
@@ -39,7 +32,7 @@ list
         order,
       });
     });
-    console.table(logs);
+    output(logs);
   });
 
 export { list };

packages/cli/src/commands/logs/logs.remove.ts

@@ -1,9 +1,6 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
 import inquirer from 'inquirer';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const remove = new Command('remove');
 
@@ -24,12 +21,8 @@ remove
   .option('-a, --limit <limit>', 'Limit', '1000')
   .option('-s, --sort <order>', 'Sort', 'desc')
   .action(async () => {
+    const { step, client } = getApi(remove);
     const { runId, loadId, severities, offset, limit, order } = remove.opts();
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const response = await step('Preparing to delete', async () => {
       return await client.logs.prepareRemove.query({
         runId,

packages/cli/src/commands/runs/runs.create.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const create = new Command('create');
 
@@ -10,11 +7,7 @@ create
   .description('Create a new run')
   .argument('load-id', 'Load ID')
   .action(async (loadId) => {
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
+    const { step, client } = getApi(create);
     await step('Creating run', async () => {
       await client.runs.create.mutate({ loadId });
     });

packages/cli/src/commands/runs/runs.list.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const list = new Command('list');
 
@@ -11,15 +8,11 @@ list
   .description('Find a run')
   .argument('[load-id]', 'Load ID')
   .action(async (loadId) => {
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
+    const { step, output, client } = getApi(list);
     const runs = await step('Getting runs', async () => {
       return await client.runs.find.query({ loadId });
     });
-    console.table(runs);
+    await output(runs);
   });
 
 export { list };

packages/cli/src/commands/runs/runs.remove.ts

@@ -1,9 +1,6 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
 import inquirer from 'inquirer';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const remove = new Command('remove');
 
@@ -21,12 +18,8 @@ remove
   .option('-o, --offset <offset>', 'Offset')
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
+    const { step, client } = getApi(remove);
     const { loadId, offset, limit } = remove.opts();
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const response = await step('Preparing to delete', async () => {
       return await client.runs.prepareRemove.query({
         loadId,

packages/cli/src/commands/runs/runs.terminate.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const terminate = new Command('terminate');
 
@@ -10,11 +7,7 @@ terminate
   .description('Terminate an in progress run')
   .argument('run-id', 'Run ID')
   .action(async (runId) => {
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
+    const { step, client } = getApi(terminate);
     await step('Terminating run', async () => {
       await client.runs.terminate.mutate(runId);
     });

packages/cli/src/commands/schedules/schedules.add.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const add = new Command('add');
 
@@ -12,12 +9,8 @@ add
   .argument('<cron>', 'Cron')
   .option('-n, --name <name>', 'Name')
   .action(async (loadId, cron) => {
-    const config = new Config();
-    const context = new Context(config.context);
+    const { step, client } = getApi(add);
     const { name } = add.opts();
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const id = await step('Adding schedule', async () => {
       return await client.schedules.add.mutate({
         name,

packages/cli/src/commands/schedules/schedules.list.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const list = new Command('list');
 
@@ -20,12 +17,8 @@ list
   .option('-o, --offset <offset>', 'Offset')
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
+    const { step, output, client } = getApi(list);
     const { loadIds, offset, limit } = list.opts();
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const schedules = await step('Getting schedules', async () => {
       return await client.schedules.find.query({
         loadIds,
@@ -33,7 +26,7 @@ list
         limit: toInt(limit),
       });
     });
-    console.table(schedules);
+    output(schedules);
   });
 
 export { list };

packages/cli/src/commands/schedules/schedules.remove.ts

@@ -1,9 +1,6 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
 import inquirer from 'inquirer';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const remove = new Command('remove');
 
@@ -22,12 +19,8 @@ remove
   .option('-o, --offset <offset>', 'Offset')
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
+    const { step, client } = getApi(remove);
     const { ids, loadIds, offset, limit } = remove.opts();
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const response = await step('Preparing to delete', async () => {
       return await client.schedules.prepareRemove.query({
         ids,

packages/cli/src/commands/secrets/secrets.list.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const list = new Command('list');
 
@@ -15,16 +12,12 @@ const toInt = (value?: string) => {
 
 list
   .alias('ls')
-  .description('List logs')
+  .description('List secrets')
   .option('-o, --offset <offset>', 'Offset')
   .option('-a, --limit <limit>', 'Limit', '1000')
   .action(async () => {
+    const { step, client } = getApi(list);
     const { offset, limit } = list.opts();
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
     const secrets = await step('Getting secrets', async () => {
       return await client.secrets.find.query({
         offset: toInt(offset),

packages/cli/src/commands/secrets/secrets.remove.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const remove = new Command('remove');
 
@@ -10,11 +7,7 @@ remove
   .alias('rm')
   .argument('<id>')
   .action(async (id) => {
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
+    const { step, client } = getApi(remove);
     await step('Removing', async () => {
       await client.secrets.remove.mutate({
         id,

packages/cli/src/commands/secrets/secrets.set.ts

@@ -1,8 +1,5 @@
 import { Command } from 'commander';
-import { createClient } from '../../client/client.js';
-import { step } from '../../utils/step.js';
-import { Context } from '../../context/context.js';
-import { Config } from '../../config/config.js';
+import { getApi } from '../../utils/command.js';
 
 const set = new Command('set');
 
@@ -10,11 +7,7 @@ set
   .argument('<id>')
   .argument('[value]')
   .action(async (id, value) => {
-    const config = new Config();
-    const context = new Context(config.context);
-    const client = await step('Connecting to server', async () => {
-      return createClient(context);
-    });
+    const { step, client } = getApi(set);
     await step('Setting secret', async () => {
       await client.secrets.set.mutate({
         id,

packages/cli/src/config/config.ts

@@ -1,20 +1,22 @@
-import envPaths from 'env-paths';
-import { existsSync, readFileSync, writeFileSync } from 'fs';
-import { mkdir } from 'fs/promises';
+import { existsSync, readFileSync } from 'fs';
+import { mkdir, writeFile } from 'fs/promises';
 import { join, dirname } from 'path';
+import { ContainerInstance, Service } from 'typedi';
+import { Paths } from '../paths/paths.js';
 
 type ConfigValues = {
   context?: string;
 };
 
-const paths = envPaths('mini-loader');
-
+@Service()
 class Config {
+  #paths: Paths;
   #location: string;
   #config?: ConfigValues;
 
-  constructor() {
-    this.#location = join(paths.config, 'config.json');
+  constructor(contianer: ContainerInstance) {
+    this.#paths = contianer.get(Paths);
+    this.#location = join(this.#paths.config, 'config.json');
     if (existsSync(this.#location)) {
       this.#config = JSON.parse(readFileSync(this.#location, 'utf-8'));
     }
@@ -24,8 +26,12 @@ class Config {
     return this.#config?.context || 'default';
   }
 
+  public get location() {
+    return this.#paths.config;
+  }
+
   public get cacheLocation() {
-    return join(paths.cache, this.context);
+    return join(this.#paths.cache, this.context);
   }
 
   public setContext = (context: string) => {
@@ -42,7 +48,7 @@ class Config {
     }
     const json = JSON.stringify(this.#config);
     mkdir(dirname(this.#location), { recursive: true });
-    writeFileSync(this.#location, json);
+    writeFile(this.#location, json);
   };
 }
 

packages/cli/src/context/context.ts

@@ -2,6 +2,7 @@ import envPaths from 'env-paths';
 import { existsSync, readFileSync } from 'fs';
 import { mkdir, readdir, writeFile } from 'fs/promises';
 import { dirname, join } from 'path';
+import { Config } from '../config/config.js';
 
 type ContextValues = {
   host: string;
@@ -12,9 +13,8 @@ class Context {
   #location: string;
   #config?: ContextValues;
 
-  constructor(name: string) {
-    const paths = envPaths('mini-loader');
-    this.#location = join(paths.config, 'contexts', name);
+  constructor(config: Config) {
+    this.#location = join(config.location, 'contexts', config.context);
     if (existsSync(this.#location)) {
       this.#config = JSON.parse(readFileSync(this.#location, 'utf-8'));
     }
@@ -28,13 +28,13 @@ class Context {
     return this.#config?.token;
   }
 
-  public saveLogin = (host: string, token: string) => {
+  public saveLogin = async (host: string, token: string) => {
     this.#config = {
       ...(this.#config || {}),
       host,
       token,
     };
-    this.save();
+    await this.save();
   };
 
   public save = async () => {

packages/cli/src/index.ts

@@ -1,5 +1,4 @@
-import { Command, program } from 'commander';
-import { createRequire } from 'module';
+import { Command } from 'commander';
 import { loads } from './commands/loads/loads.js';
 import { runs } from './commands/runs/runs.js';
 import { logs } from './commands/logs/logs.js';
@@ -9,28 +8,27 @@ import { local } from './commands/local/local.js';
 import { auth } from './commands/auth/auth.js';
 import { contexts } from './commands/contexts/contexts.js';
 import { schedules } from './commands/schedules/schedules.js';
-import { readFile } from 'fs/promises';
+import { ContainerInstance } from 'typedi';
 
-const require = createRequire(import.meta.url);
+const createClientCli = (container: ContainerInstance) => {
+  const program = new Command();
+  program.exitOverride();
+  program.setOptionValue('_container', container);
+  program.addCommand(loads);
+  program.addCommand(runs);
+  program.addCommand(logs);
+  program.addCommand(artifacts);
+  program.addCommand(secrets);
+  program.addCommand(local);
+  program.addCommand(auth);
+  program.addCommand(contexts);
+  program.addCommand(schedules);
 
-const pkg = JSON.parse(await readFile(require.resolve('#pkg'), 'utf-8'));
+  return program;
+};
 
-program.addCommand(loads);
-program.addCommand(runs);
-program.addCommand(logs);
-program.addCommand(artifacts);
-program.addCommand(secrets);
-program.addCommand(local);
-program.addCommand(auth);
-program.addCommand(contexts);
-program.addCommand(schedules);
-
-program.version(pkg.version);
-
-const version = new Command('version');
-version.action(() => {
-  console.log(pkg.version);
-});
-program.addCommand(version);
-
-await program.parseAsync();
+export { CliApi } from './api/api.js';
+export { Context } from './context/context.js';
+export { Terminal } from './api/output.js';
+export { Paths } from './paths/paths.js';
+export { createClientCli };

packages/cli/src/paths/paths.ts

@@ -0,0 +1,17 @@
+import envPaths from 'env-paths';
+import { Service } from 'typedi';
+
+const paths = envPaths('mini-loader');
+
+@Service()
+class Paths {
+  public get config() {
+    return paths.config;
+  }
+
+  public get cache() {
+    return paths.cache;
+  }
+}
+
+export { Paths };

packages/cli/src/utils/command.ts

@@ -0,0 +1,11 @@
+import { Command } from 'commander';
+import { ContainerInstance } from 'typedi';
+import { CliApi } from '../api/api.js';
+
+const getApi = (command: Command) => {
+  const { _container } = command.optsWithGlobals() as { _container: ContainerInstance };
+  const api = _container.get(CliApi);
+  return api;
+};
+
+export { getApi };

packages/cli/src/utils/step.ts

@@ -1,15 +0,0 @@
-import ora from 'ora';
-
-const step = async <T>(message: string, fn: () => Promise<T>): Promise<T> => {
-  const spinner = ora(message).start();
-  try {
-    const result = await fn();
-    await spinner.succeed();
-    return result;
-  } catch (err) {
-    await spinner.fail();
-    throw err;
-  }
-};
-
-export { step };

packages/configs/tsconfig.esm.json

@@ -7,6 +7,7 @@
     "declarationMap": true,
     "sourceMap": true,
     "esModuleInterop": true,
+    "experimentalDecorators": true,
     "strict": true,
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true,

packages/server/bin/index.mjs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
 import 'source-map-support/register.js';
-import '../dist/esm/index.js';
+import '../dist/esm/bin.js';

packages/server/package.json

@@ -41,9 +41,11 @@
     "jsonwebtoken": "^9.0.2",
     "knex": "^3.1.0",
     "nanoid": "^5.0.4",
+    "reflect-metadata": "^0.2.1",
     "source-map-support": "^0.5.21",
     "sqlite3": "^5.1.7",
     "superjson": "^2.2.1",
+    "typedi": "^0.10.0",
     "zod": "^3.22.4"
   },
   "homepage": "https://github.com/morten-olsen/mini-loader",

packages/server/src/auth/auth.ts

@@ -4,17 +4,21 @@ import { existsSync } from 'fs';
 import { mkdir, readFile, writeFile } from 'fs/promises';
 import jwt from 'jsonwebtoken';
 import { Config } from '../config/config.js';
+import { ContainerInstance, Service } from 'typedi';
 
 type AuthOptions = {
   config: Config;
 };
 
+@Service()
 class Auth {
   #options: AuthOptions;
   #data: Promise<{ secret: string }>;
 
-  constructor(options: AuthOptions) {
-    this.#options = options;
+  constructor(container: ContainerInstance) {
+    this.#options = {
+      config: container.get(Config),
+    };
     this.#data = this.#setup();
   }
 

packages/server/src/bin.ts

@@ -0,0 +1,14 @@
+import { ContainerInstance } from 'typedi';
+import { createServerCli } from './index.js';
+
+const program = createServerCli(new ContainerInstance('server'));
+
+program.setOptionValue('output', (data: unknown) => {
+  console.log('got data', data);
+});
+
+await program.parseAsync(process.argv);
+
+process.on('unhandledRejection', (reason, p) => {
+  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});

packages/server/src/config/config.ts

@@ -1,10 +1,22 @@
 import { Knex } from 'knex';
+import { Service } from 'typedi';
+import envPaths from 'env-paths';
+import { join } from 'path';
 
-type Config = {
-  database: Omit<Knex.Config, 'migrations'>;
-  files: {
-    data: string;
-    cache: string;
+const paths = envPaths('mini-loader-server');
+
+@Service()
+class Config {
+  database: Omit<Knex.Config, 'migrations'> = {
+    client: 'sqlite3',
+    connection: {
+      filename: join(paths.data, 'db.sqlite'),
+    },
+    useNullAsDefault: true,
+  };
+  files = {
+    data: paths.data,
+    cache: paths.cache,
   };
   auth?: {
     oidc?: {
@@ -15,6 +27,6 @@ type Config = {
       };
     };
   };
-};
+}
 
-export type { Config };
+export { Config };

packages/server/src/database/database.ts

@@ -1,5 +1,7 @@
 import knex, { Knex } from 'knex';
+import { Service, ContainerInstance } from 'typedi';
 
+import { Config } from '../config/config.js';
 import { source } from './migrations/migrations.source.js';
 import { mkdir } from 'fs/promises';
 import { dirname } from 'path';
@@ -8,13 +10,15 @@ const tableNames = {
   loads: 'loads',
 };
 
+@Service()
 class Database {
   #instance?: Promise<Knex>;
   #config: Knex.Config;
 
-  constructor(config: Knex.Config) {
+  constructor(container: ContainerInstance) {
+    const config = container.get(Config);
     this.#config = {
-      ...config,
+      ...config.database,
       migrations: {
         migrationSource: source,
       },

packages/server/src/id/id.ts

@@ -0,0 +1,9 @@
+import { nanoid } from 'nanoid';
+import { Service } from 'typedi';
+
+@Service()
+class IdGenerator {
+  public generate = () => nanoid();
+}
+
+export { IdGenerator };

packages/server/src/index.ts

@@ -1,40 +1,42 @@
-import { program, Command } from 'commander';
+import 'reflect-metadata';
+import { Command } from 'commander';
 import { Runtime } from './runtime/runtime.js';
 import { createServer } from './server/server.js';
+import { ContainerInstance } from 'typedi';
 
-const start = new Command('start');
-start.action(async () => {
-  const port = 4500;
-  const runtime = await Runtime.create();
-  await runtime.scheduler.start();
-  const server = await createServer(runtime);
-  await server.listen({
-    port,
-    host: '0.0.0.0',
+const createServerCli = (container: ContainerInstance) => {
+  const program = new Command();
+
+  const start = new Command('start');
+  start.action(async () => {
+    const port = 4500;
+    const runtime = container.get(Runtime);
+    await runtime.scheduler.start();
+    const server = await createServer(container);
+    await server.listen({
+      port,
+      host: '0.0.0.0',
+    });
+
+    console.log(`Server listening on port ${port}`);
   });
 
-  console.log(`Server listening on port ${port}`);
-});
-
-const createToken = new Command('create-token');
-createToken.action(async () => {
-  const runtime = await Runtime.create();
-  const token = await runtime.auth.createToken({
-    policy: {
-      '*:*': ['*'],
-    },
+  const createToken = new Command('create-token');
+  createToken.action(async () => {
+    const runtime = container.get(Runtime);
+    const token = await runtime.auth.createToken({
+      policy: {
+        '*:*': ['*'],
+      },
+    });
+    console.log(token);
   });
-  console.log(token);
-});
 
-program.addCommand(start);
-program.addCommand(createToken);
+  program.addCommand(start);
+  program.addCommand(createToken);
+  return program;
+};
 
-await program.parseAsync(process.argv);
-
-process.on('unhandledRejection', (reason, p) => {
-  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
-});
-
-export type { Runtime } from './runtime/runtime.js';
+export { createServerCli, createServer, Runtime };
+export { Config } from './config/config.js';
 export type { RootRouter } from './router/router.js';

packages/server/src/repos/artifacts/artifacts.ts

@@ -1,21 +1,27 @@
 import { EventEmitter } from 'eventemitter3';
 import { Database } from '../../database/database.js';
-import { nanoid } from 'nanoid';
 import { AddArtifactOptions, FindArtifactsOptions } from './artifacts.schemas.js';
 import { createHash } from 'crypto';
+import { ContainerInstance, Service } from 'typedi';
+import { IdGenerator } from '../../id/id.js';
 
 type ArtifactRepoEvents = {};
 
 type ArtifactRepoOptions = {
   database: Database;
+  idGenerator: IdGenerator;
 };
 
+@Service()
 class ArtifactRepo extends EventEmitter<ArtifactRepoEvents> {
   #options: ArtifactRepoOptions;
 
-  constructor(options: ArtifactRepoOptions) {
+  constructor(container: ContainerInstance) {
     super();
-    this.#options = options;
+    this.#options = {
+      database: container.get(Database),
+      idGenerator: container.get(IdGenerator),
+    };
   }
 
   public get = async (id: string) => {
@@ -26,9 +32,9 @@ class ArtifactRepo extends EventEmitter<ArtifactRepoEvents> {
   };
 
   public add = async (options: AddArtifactOptions) => {
-    const { database } = this.#options;
+    const { database, idGenerator } = this.#options;
     const db = await database.instance;
-    const id = nanoid();
+    const id = idGenerator.generate();
 
     await db('artifacts').insert({
       id,

packages/server/src/repos/loads/loads.ts

@@ -1,11 +1,12 @@
 import { EventEmitter } from 'eventemitter3';
 import { Database } from '../../database/database.js';
 import { FindLoadsOptions, SetLoadOptions } from './loads.schemas.js';
-import { nanoid } from 'nanoid';
 import { createHash } from 'crypto';
 import { Config } from '../../config/config.js';
 import { mkdir, writeFile } from 'fs/promises';
 import { resolve } from 'path';
+import { ContainerInstance, Service } from 'typedi';
+import { IdGenerator } from '../../id/id.js';
 
 type LoadRepoEvents = {
   created: (id: string) => void;
@@ -16,14 +17,20 @@ type LoadRepoEvents = {
 type LoadRepoOptions = {
   database: Database;
   config: Config;
+  idGenerator: IdGenerator;
 };
 
+@Service()
 class LoadRepo extends EventEmitter<LoadRepoEvents> {
   #options: LoadRepoOptions;
 
-  constructor(options: LoadRepoOptions) {
+  constructor(container: ContainerInstance) {
     super();
-    this.#options = options;
+    this.#options = {
+      database: container.get(Database),
+      config: container.get(Config),
+      idGenerator: container.get(IdGenerator),
+    };
   }
 
   public getById = async (id: string) => {
@@ -58,9 +65,9 @@ class LoadRepo extends EventEmitter<LoadRepoEvents> {
   };
 
   public set = async (options: SetLoadOptions) => {
-    const { database } = this.#options;
+    const { database, idGenerator } = this.#options;
     const db = await database.instance;
-    const id = options.id || nanoid();
+    const id = options.id || idGenerator.generate();
     const script = createHash('sha256').update(options.script).digest('hex');
     const scriptDir = resolve(this.#options.config.files.data, 'scripts');
     await mkdir(scriptDir, { recursive: true });

packages/server/src/repos/logs/logs.ts

@@ -1,27 +1,33 @@
 import { EventEmitter } from 'eventemitter3';
 import { Database } from '../../database/database.js';
 import { AddLogOptions, FindLogsOptions } from './logs.schemas.js';
-import { nanoid } from 'nanoid';
 import { createHash } from 'crypto';
+import { ContainerInstance, Service } from 'typedi';
+import { IdGenerator } from '../../id/id.js';
 
 type LogRepoEvents = {};
 
 type LogRepoOptions = {
   database: Database;
+  idGenerator: IdGenerator;
 };
 
+@Service()
 class LogRepo extends EventEmitter<LogRepoEvents> {
   #options: LogRepoOptions;
 
-  constructor(options: LogRepoOptions) {
+  constructor(container: ContainerInstance) {
     super();
-    this.#options = options;
+    this.#options = {
+      database: container.get(Database),
+      idGenerator: container.get(IdGenerator),
+    };
   }
 
   public add = async (options: AddLogOptions) => {
-    const { database } = this.#options;
+    const { database, idGenerator } = this.#options;
     const db = await database.instance;
-    const id = nanoid();
+    const id = idGenerator.generate();
 
     await db('logs').insert({
       id,

packages/server/src/repos/repos.ts

@@ -1,5 +1,4 @@
-import { Config } from '../config/config.js';
-import { Database } from '../database/database.js';
+import { ContainerInstance, Service } from 'typedi';
 import { ArtifactRepo } from './artifacts/artifacts.js';
 import { LoadRepo } from './loads/loads.js';
 import { LogRepo } from './logs/logs.js';
@@ -7,64 +6,36 @@ import { RunRepo } from './runs/runs.js';
 import { ScheduleRepo } from './schedules/schedules.js';
 import { SecretRepo } from './secrets/secrets.js';
 
-type ReposOptions = {
-  database: Database;
-  config: Config;
-};
-
+@Service()
 class Repos {
-  #loads: LoadRepo;
-  #runs: RunRepo;
-  #logs: LogRepo;
-  #artifacts: ArtifactRepo;
-  #secrets: SecretRepo;
-  #schedule: ScheduleRepo;
+  #container: ContainerInstance;
 
-  constructor({ database, config }: ReposOptions) {
-    this.#loads = new LoadRepo({
-      database,
-      config,
-    });
-    this.#runs = new RunRepo({
-      database,
-      loads: this.#loads,
-    });
-    this.#logs = new LogRepo({
-      database,
-    });
-    this.#artifacts = new ArtifactRepo({
-      database,
-    });
-    this.#secrets = new SecretRepo({
-      database,
-    });
-    this.#schedule = new ScheduleRepo({
-      database,
-    });
+  constructor(container: ContainerInstance) {
+    this.#container = container;
   }
 
   public get loads() {
-    return this.#loads;
+    return this.#container.get(LoadRepo);
   }
 
   public get runs() {
-    return this.#runs;
+    return this.#container.get(RunRepo);
   }
 
   public get logs() {
-    return this.#logs;
+    return this.#container.get(LogRepo);
   }
 
   public get artifacts() {
-    return this.#artifacts;
+    return this.#container.get(ArtifactRepo);
   }
 
   public get secrets() {
-    return this.#secrets;
+    return this.#container.get(SecretRepo);
   }
 
   public get schedules() {
-    return this.#schedule;
+    return this.#container.get(ScheduleRepo);
   }
 }
 

packages/server/src/repos/runs/runs.ts

@@ -1,9 +1,10 @@
-import { nanoid } from 'nanoid';
 import { EventEmitter } from 'eventemitter3';
 import { Database } from '../../database/database.js';
 import { CreateRunOptions, FindRunsOptions, UpdateRunOptions } from './runs.schemas.js';
 import { LoadRepo } from '../loads/loads.js';
 import { createHash } from 'crypto';
+import { ContainerInstance, Service } from 'typedi';
+import { IdGenerator } from '../../id/id.js';
 
 type RunRepoEvents = {
   created: (args: { id: string; loadId: string }) => void;
@@ -15,16 +16,21 @@ type RunRepoEvents = {
 type RunRepoOptions = {
   database: Database;
   loads: LoadRepo;
+  idGenerator: IdGenerator;
 };
 
+@Service()
 class RunRepo extends EventEmitter<RunRepoEvents> {
   #options: RunRepoOptions;
-  #isReady: Promise<void>;
+  #isSetup?: Promise<void>;
 
-  constructor(options: RunRepoOptions) {
+  constructor(container: ContainerInstance) {
     super();
-    this.#options = options;
-    this.#isReady = this.#setup();
+    this.#options = {
+      database: container.get(Database),
+      loads: container.get(LoadRepo),
+      idGenerator: container.get(IdGenerator),
+    };
   }
 
   #setup = async () => {
@@ -33,6 +39,13 @@ class RunRepo extends EventEmitter<RunRepoEvents> {
     await db('runs').update({ status: 'failed', error: 'server was shut down' }).where({ status: 'running' });
   };
 
+  get #isReady() {
+    if (!this.#isSetup) {
+      this.#isSetup = this.#setup();
+    }
+    return this.#isSetup;
+  }
+
   public getById = async (id: string) => {
     await this.#isReady;
     const { database } = this.#options;
@@ -150,8 +163,8 @@ class RunRepo extends EventEmitter<RunRepoEvents> {
 
   public create = async (options: CreateRunOptions) => {
     await this.#isReady;
-    const { database, loads } = this.#options;
-    const id = nanoid();
+    const { database, loads, idGenerator } = this.#options;
+    const id = idGenerator.generate();
     const db = await database.instance;
 
     const script = await loads.getScript(options.loadId);

packages/server/src/repos/schedules/schedules.ts

@@ -1,8 +1,9 @@
 import { EventEmitter } from 'eventemitter3';
 import { Database } from '../../database/database.js';
-import { nanoid } from 'nanoid';
 import { AddScheduleOptions, FindSchedulesOptions } from './schedules.schemas.js';
 import { createHash } from 'crypto';
+import { ContainerInstance, Service } from 'typedi';
+import { IdGenerator } from '../../id/id.js';
 
 type ScheduleRepoEvents = {
   added: (id: string) => void;
@@ -11,14 +12,19 @@ type ScheduleRepoEvents = {
 
 type ScheduleRepoOptions = {
   database: Database;
+  idGenerator: IdGenerator;
 };
 
+@Service()
 class ScheduleRepo extends EventEmitter<ScheduleRepoEvents> {
   #options: ScheduleRepoOptions;
 
-  constructor(options: ScheduleRepoOptions) {
+  constructor(container: ContainerInstance) {
     super();
-    this.#options = options;
+    this.#options = {
+      database: container.get(Database),
+      idGenerator: container.get(IdGenerator),
+    };
   }
 
   public get = async (id: string) => {
@@ -29,9 +35,9 @@ class ScheduleRepo extends EventEmitter<ScheduleRepoEvents> {
   };
 
   public add = async (options: AddScheduleOptions) => {
-    const { database } = this.#options;
+    const { database, idGenerator } = this.#options;
     const db = await database.instance;
-    const id = nanoid();
+    const id = idGenerator.generate();
 
     await db('schedules').insert({
       id,

packages/server/src/repos/secrets/secrets.ts

@@ -1,6 +1,7 @@
 import { EventEmitter } from 'eventemitter3';
 import { Database } from '../../database/database.js';
 import { FindSecretOptions, SetSecretOptions } from './secrets.schemas.js';
+import { ContainerInstance, Service } from 'typedi';
 
 type LogRepoEvents = {};
 
@@ -8,12 +9,15 @@ type LogRepoOptions = {
   database: Database;
 };
 
+@Service()
 class SecretRepo extends EventEmitter<LogRepoEvents> {
   #options: LogRepoOptions;
 
-  constructor(options: LogRepoOptions) {
+  constructor(container: ContainerInstance) {
     super();
-    this.#options = options;
+    this.#options = {
+      database: container.get(Database),
+    };
   }
 
   public set = async (options: SetSecretOptions) => {

packages/server/src/router/router.utils.ts

@@ -2,13 +2,15 @@ import { initTRPC } from '@trpc/server';
 import { CreateFastifyContextOptions } from '@trpc/server/adapters/fastify';
 import superjson from 'superjson';
 import { Runtime } from '../runtime/runtime.js';
+import { ContainerInstance } from 'typedi';
 
 type ContextOptions = {
-  runtime: Runtime;
+  container: ContainerInstance;
 };
 
-const createContext = async ({ runtime }: ContextOptions) => {
+const createContext = async ({ container }: ContextOptions) => {
   return async ({ req }: CreateFastifyContextOptions) => {
+    const runtime = container.get(Runtime);
     const { authorization } = req.headers;
     const { auth } = runtime;
     if (!authorization) {
@@ -18,6 +20,7 @@ const createContext = async ({ runtime }: ContextOptions) => {
     await auth.validateToken(token);
     return {
       runtime,
+      container,
     };
   };
 };

packages/server/src/runner/runner.ts

@@ -1,3 +1,4 @@
+import { ContainerInstance, Service } from 'typedi';
 import { Config } from '../config/config.js';
 import { Repos } from '../repos/repos.js';
 import { RunnerInstance } from './runner.instance.js';
@@ -7,13 +8,17 @@ type RunnerOptions = {
   config: Config;
 };
 
+@Service()
 class Runner {
   #options: RunnerOptions;
   #instances: Map<string, RunnerInstance> = new Map();
 
-  constructor(options: RunnerOptions) {
-    this.#options = options;
-    const { repos } = options;
+  constructor(container: ContainerInstance) {
+    this.#options = {
+      repos: container.get(Repos),
+      config: container.get(Config),
+    };
+    const { repos } = this.#options;
     repos.runs.on('created', this.#start);
   }
 

packages/server/src/runtime/runtime.ts

@@ -1,26 +1,21 @@
-import { resolve } from 'path';
-import envPaths from 'env-paths';
-import { Database } from '../database/database.js';
+import { ContainerInstance, Service } from 'typedi';
 import { Repos } from '../repos/repos.js';
 import { Runner } from '../runner/runner.js';
-import { Config } from '../config/config.js';
 import { Auth } from '../auth/auth.js';
 import { Scheduler } from '../scheduler/scheduler.js';
 
-const paths = envPaths('mini-loader-server');
-
+@Service()
 class Runtime {
   #repos: Repos;
   #runner: Runner;
   #auth: Auth;
   #scheduler: Scheduler;
 
-  constructor(options: Config) {
-    const database = new Database(options.database);
-    this.#repos = new Repos({ database, config: options });
-    this.#runner = new Runner({ repos: this.#repos, config: options });
-    this.#auth = new Auth({ config: options });
-    this.#scheduler = new Scheduler({ runs: this.#repos.runs, schedules: this.#repos.schedules });
+  constructor(container: ContainerInstance) {
+    this.#repos = container.get(Repos);
+    this.#runner = container.get(Runner);
+    this.#auth = container.get(Auth);
+    this.#scheduler = container.get(Scheduler);
   }
 
   public get repos() {
@@ -38,24 +33,6 @@ class Runtime {
   public get scheduler() {
     return this.#scheduler;
   }
-
-  public static create = async () => {
-    const runtime = new Runtime({
-      database: {
-        client: 'sqlite3',
-        connection: {
-          filename: resolve(paths.data, 'database.sqlite'),
-        },
-        useNullAsDefault: true,
-      },
-      files: {
-        data: process.env.DATA_DIR || resolve(paths.data, 'data', 'files'),
-        cache: process.env.CACHE_DIR || resolve(paths.cache, 'data', 'cache'),
-      },
-    });
-
-    return runtime;
-  };
 }
 
 export { Runtime };

packages/server/src/scheduler/scheduler.ts

@@ -1,6 +1,7 @@
 import { CronJob } from 'cron';
 import { ScheduleRepo } from '../repos/schedules/schedules.js';
 import { RunRepo } from '../repos/runs/runs.js';
+import { ContainerInstance, Service } from 'typedi';
 
 type SchedulerOptions = {
   runs: RunRepo;
@@ -13,12 +14,16 @@ type RunningSchedule = {
   stop: () => Promise<void>;
 };
 
+@Service()
 class Scheduler {
   #running: RunningSchedule[] = [];
   #options: SchedulerOptions;
 
-  constructor(options: SchedulerOptions) {
-    this.#options = options;
+  constructor(container: ContainerInstance) {
+    this.#options = {
+      runs: container.get(RunRepo),
+      schedules: container.get(ScheduleRepo),
+    };
     const { schedules } = this.#options;
     schedules.on('added', this.#add);
     schedules.on('removed', this.#remove);

packages/server/src/server/server.ts

@@ -2,17 +2,12 @@ import { fastifyTRPCPlugin, FastifyTRPCPluginOptions } from '@trpc/server/adapte
 import fastify from 'fastify';
 import { RootRouter, rootRouter } from '../router/router.js';
 import { createContext } from '../router/router.utils.js';
-import { Runtime } from '../runtime/runtime.js';
 import { gateway } from '../gateway/gateway.js';
-import { createRequire } from 'module';
-import { readFile } from 'fs/promises';
-
-const require = createRequire(import.meta.url);
-
-const createServer = async (runtime: Runtime) => {
-  const pkgLocation = require.resolve('#pkg');
-  const pkg = JSON.parse(await readFile(pkgLocation, 'utf-8'));
+import { ContainerInstance } from 'typedi';
+import { Runtime } from '../runtime/runtime.js';
 
+const createServer = async (container: ContainerInstance) => {
+  const runtime = container.get(Runtime);
   const server = fastify({
     maxParamLength: 10000,
     bodyLimit: 30 * 1024 * 1024,
@@ -31,14 +26,14 @@ const createServer = async (runtime: Runtime) => {
         authorized = true;
       }
     } catch (error) {}
-    return { authorized, status: 'ok', version: pkg.version };
+    return { authorized, status: 'ok' };
   });
 
   server.register(fastifyTRPCPlugin, {
     prefix: '/trpc',
     trpcOptions: {
       router: rootRouter,
-      createContext: await createContext({ runtime }),
+      createContext: await createContext({ container }),
       onError({ error }) {
         console.error(error);
       },

packages/tests/.gitignore

@@ -0,0 +1,4 @@
+/dist/
+/node_modules/
+/coverage/
+/e2e-tmp/

packages/tests/README.md

@@ -0,0 +1 @@
+[Go to documentation](https://github.com/morten-olsen/mini-loader)

packages/tests/assets/simple.js

@@ -0,0 +1 @@
+console.log('simple');

packages/tests/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "@morten-olsen/mini-loader-tests",
+  "private": "true",
+  "version": "1.0.0",
+  "license": "GPL-3.0",
+  "main": "./dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "type": "module",
+  "files": [
+    "./dist"
+  ],
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.js"
+    }
+  },
+  "devDependencies": {
+    "@morten-olsen/mini-loader-configs": "workspace:^",
+    "@types/node": "^20.10.8",
+    "fastify": "^4.25.2",
+    "sqlite3": "^5.1.7",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.11"
+  },
+  "dependencies": {
+    "@morten-olsen/mini-loader": "workspace:^",
+    "@morten-olsen/mini-loader-cli": "workspace:^",
+    "@morten-olsen/mini-loader-server": "workspace:^",
+    "get-port": "^7.0.0",
+    "memfs": "^4.6.0",
+    "nanoid": "^5.0.4",
+    "typedi": "^0.10.0",
+    "vitest": "^1.2.0"
+  },
+  "homepage": "https://github.com/morten-olsen/mini-loader",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/morten-olsen/mini-loader"
+  }
+}

packages/tests/src/quick-start.test.ts

@@ -0,0 +1,56 @@
+import { describe, it, beforeAll, afterAll, vi } from 'vitest';
+import { TestEnv, createEnv } from './utils/env.js';
+import { writeFile } from 'fs/promises';
+import { resolve } from 'path';
+
+const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+describe('Quick start', () => {
+  let env: TestEnv;
+
+  beforeAll(async () => {
+    vi.mock('nanoid', () => {
+      let currentId = 0;
+      return {
+        nanoid: () => `id-${currentId++}`,
+      };
+    });
+    env = await createEnv();
+  });
+
+  afterAll(async () => {
+    vi.clearAllMocks();
+    await env.cleanup();
+  });
+
+  it('should be able to start the server', async () => {
+    const { server, port } = env;
+    await server.listen({ port });
+  });
+
+  it('should be able to login', async () => {
+    const { clientRun, port, token } = env;
+    await clientRun(['auth', 'login', '--host', `http://localhost:${port}`, '--token', token]);
+  });
+
+  it('should be able to push a load', async () => {
+    const { clientRun, location } = env;
+    const scriptPath = resolve(location, 'simple.js');
+    await writeFile(scriptPath, 'console.log("hello world")', 'utf-8');
+    await clientRun(['loads', 'push', scriptPath, '-i', 'demo', '-r']);
+
+    await sleep(100);
+  });
+
+  it('should be able to get the run', async () => {
+    const { clientRun } = env;
+    await clientRun(['runs', 'ls', 'demo']);
+  });
+
+  it('should be able to get logs', async () => {
+    const { clientRun, clientOutput } = env;
+    await clientRun(['logs', 'ls', '-l', 'demo']);
+
+    console.log(JSON.stringify(clientOutput, null, 2));
+  });
+});

packages/tests/src/utils/env.ts

@@ -0,0 +1,136 @@
+import { Paths, Terminal, createClientCli } from '@morten-olsen/mini-loader-cli';
+import { Runtime, createServer, Config } from '@morten-olsen/mini-loader-server';
+import { FastifyInstance } from 'fastify';
+import { ContainerInstance } from 'typedi';
+import { join, resolve } from 'path';
+import getPort from 'get-port';
+import { rm } from 'fs/promises';
+
+const cacheLocation = './e2e-tmp';
+
+const getUniqueIdentifier = () => {
+  return Math.random().toString(36).substr(2, 9);
+};
+
+type CliActionOutput =
+  | {
+      type: 'stdout';
+      data: string;
+    }
+  | {
+      type: 'stderr';
+      data: string;
+    }
+  | {
+      type: 'step';
+      message: string;
+      state: 'pending' | 'success' | 'error';
+    }
+  | {
+      type: 'output';
+      data: unknown;
+    };
+
+const createEnv = async () => {
+  const location = resolve(cacheLocation, getUniqueIdentifier());
+  const port = await getPort();
+
+  let clientOutput: CliActionOutput[] = [];
+  const serverContainer = new ContainerInstance(getUniqueIdentifier());
+
+  const clientRun = async (params: string[]) => {
+    const clientContainer = new ContainerInstance(getUniqueIdentifier());
+    clientContainer.set(Paths, {
+      config: join(location, 'client', 'config'),
+      cache: join(location, 'client', 'cache'),
+    });
+    clientContainer.set(Terminal, {
+      log: async (message: any) => {
+        clientOutput.push({
+          type: 'stdout',
+          data: message,
+        });
+      },
+      output: async (data: any) => {
+        clientOutput.push({
+          type: 'output',
+          data,
+        });
+      },
+      step: async (message: any, action: any) => {
+        clientOutput.push({
+          type: 'step',
+          message,
+          state: 'pending',
+        });
+        try {
+          const result = await action();
+          clientOutput.push({
+            type: 'step',
+            message,
+            state: 'success',
+          });
+          return result;
+        } catch (err) {
+          clientOutput.push({
+            type: 'step',
+            message,
+            state: 'error',
+          });
+          throw err;
+        }
+      },
+    });
+    const client = createClientCli(clientContainer);
+    client.configureOutput({
+      writeOut: (data) => {
+        clientOutput.push({
+          type: 'stdout',
+          data,
+        });
+      },
+      writeErr: (data) => {
+        clientOutput.push({
+          type: 'stderr',
+          data,
+        });
+        throw new Error(`Error in client ${data}`);
+      },
+    });
+
+    await client.parseAsync(['', '', ...params]);
+  };
+
+  serverContainer.set(Config, {
+    database: {
+      client: 'sqlite3',
+      connection: {
+        filename: join(location, 'server', 'data', 'db.sqlite'),
+      },
+      useNullAsDefault: true,
+    },
+    files: {
+      data: join(location, 'server', 'data'),
+      cache: join(location, 'server', 'cache'),
+    },
+  });
+  const server = await createServer(serverContainer);
+  const runtime = serverContainer.get(Runtime);
+  const token = await runtime.auth.createToken({
+    policy: {
+      '*:*': ['*'],
+    },
+  });
+
+  const cleanup = async () => {
+    await server.close();
+    await rm(location, { recursive: true, force: true });
+  };
+
+  return { clientRun, clientOutput, runtime, server, token, location, port, cleanup };
+};
+
+type TestEnv = Awaited<ReturnType<typeof createEnv>>;
+
+export type { TestEnv, FastifyInstance };
+export { createEnv };

packages/tests/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "@morten-olsen/mini-loader-configs/tsconfig.esm.json",
+  "compilerOptions": {
+    "outDir": "dist/esm",
+  },
+  "include": [
+    "src"
+  ],
+}

packages/tests/vitest.config.ts

@@ -0,0 +1,22 @@
+/// <reference types="vitest" />
+
+import { createRequire } from 'module';
+import { defineConfig } from 'vite';
+
+const require = createRequire(import.meta.url);
+
+const server = require.resolve('../server/src/index.ts');
+const cli = require.resolve('../cli/src/index.ts');
+const runner = require.resolve('../runner/src/index.ts');
+const sdk = require.resolve('../mini-loader/src/index.ts');
+
+export default defineConfig({
+  test: {
+    alias: {
+      '@morten-olsen/mini-loader-server': server,
+      '@morten-olsen/mini-loader-cli': cli,
+      '@morten-olsen/mini-loader-runner': runner,
+      '@morten-olsen/mini-loader': sdk,
+    },
+  },
+});

vitest.config.ts

@@ -0,0 +1,14 @@
+/// <reference types="vitest" />
+
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  test: {
+    coverage: {
+      reporter: ['text', 'json-summary', 'json', 'html'],
+      reportOnFailure: true,
+      include: ['packages/*/src/**/*.ts'],
+      exclude: ['packages/examples/**/*', 'packages/tests/**/*'],
+    },
+  },
+});

vitest.workspace.ts

@@ -0,0 +1 @@
+export default ['packages/*'];