fix: add health checks and volumes to docker file (#2)

Co-authored-by: Morten Olsen <morten-olsen@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -0,0 +1,5 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+  }
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CODE_OF_CONDUCT.md

@@ -0,0 +1,43 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned with this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at s56gkgkq@void.black. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

CONTRIBUTING.md

@@ -0,0 +1,59 @@
+# Contributing to mini loader
+
+First off, thank you for considering contributing to mini loader! It's people like you that make mini loader such a great tool.
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the [mini loader Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to s56gkgkq@void.black.
+
+## How Can I Contribute?
+
+### Reporting Bugs
+
+This section guides you through submitting a bug report for mini loader. Following these guidelines helps maintainers and the community understand your report, reproduce the behavior, and find related reports.
+
+**Before Submitting A Bug Report**
+
+- Ensure the bug was not already reported by searching on GitHub under [Issues](https://github.com/morten-olsen/mini-loader/issues).
+- If you're unable to find an open issue addressing the problem, open a new one. Be sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case demonstrating the expected behavior that is not occurring.
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for mini loader, including completely new features and minor improvements to existing functionality.
+
+**Before Submitting An Enhancement Suggestion**
+
+- Check if the enhancement has already been suggested under [Issues](https://github.com/morten-olsen/mini-loader/issues).
+- If it hasn't, create a new issue and provide a concise description of the enhancement with as much detail as possible.
+
+### Your First Code Contribution
+
+Unsure where to begin contributing to mini loader? You can start by looking through `beginner` and `help-wanted` issues:
+
+- Beginner issues - issues which should only require a few lines of code, and a test or two.
+- Help wanted issues - issues which should be a bit more involved than `beginner` issues.
+
+### Pull Requests
+
+- Fill in the required template
+- Do not include issue numbers in the PR title
+- Follow the coding style used throughout the project
+- Include appropriate test coverage. New features should include new tests.
+- Document new code based on the [Documentation Styleguide](#documentation-styleguide)
+
+## Documentation Styleguide
+
+Use this style guide for documentation:
+
+- Use Markdown
+- Reference methods and classes in markdown backticks. For example, `ClassName.methodName`
+- Document new code or add comments in code to explain parts that might be confusing.
+
+## Use a Consistent Coding Style
+
+* 2 spaces for indentation rather than tabs
+* You can try running `pnpm run test:lint` for style unification
+
+## License
+
+By contributing to mini loader, you agree that your contributions will be licensed under its GPL-3 License.

README.md

@@ -1,10 +1,6 @@
 
 
-<p>
+![banner](./assets/banner.png)
-<center>
-    <img src="./assets/logo.png" width="300" height="300" />
-</center>
-</p>
 
 # Welcome to Mini Loader! 🌐
 

docker-compose.yaml

@@ -5,5 +5,9 @@ services:
     build:
       context: .
       dockerfile: ./docker/Dockerfile
+    volumes:
+      - data:/app/data
     ports:
       - 4500:4500
+volumes:
+  data:

docker/Dockerfile

@@ -27,6 +27,7 @@ COPY --from=builder /app/out/full/ .
 RUN pnpm turbo run build --filter=@morten-olsen/mini-loader-server
 
 FROM base AS runner
+RUN apk add --no-cache jq curl
 WORKDIR /app
 
 # Don't run production as root
@@ -38,5 +39,12 @@ RUN chmod +x /entrypoint.sh
 
 COPY --from=installer /app .
 EXPOSE 4500
+VOLUME /app/data
+
+HEALTHCHECK \
+  --interval=10s \
+  --start-period=10s \
+  CMD curl -f http://localhost:4500/health || exit 1
+
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["mini-loader-server", "start"]

packages/cli/package.json

@@ -20,6 +20,7 @@
     }
   },
   "dependencies": {
+    "@morten-olsen/mini-loader-runner": "workspace:^",
     "@rollup/plugin-auto-install": "^3.0.5",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-json": "^6.1.0",
@@ -38,7 +39,6 @@
   },
   "devDependencies": {
     "@morten-olsen/mini-loader-configs": "workspace:^",
-    "@morten-olsen/mini-loader-runner": "workspace:^",
     "@morten-olsen/mini-loader-server": "workspace:^",
     "@types/inquirer": "^9.0.7",
     "typescript": "^5.3.3"

packages/cli/src/bundler/bundler.ts

@@ -17,12 +17,12 @@ const bundle = async ({ entry, autoInstall }: BundleOptions) => {
   const entryFile = resolve(entry);
   const codeBundler = await rollup({
     plugins: [
+      fix(json)(),
       fix(sucrase)({
         transforms: ['typescript', 'jsx'],
       }),
       ...[autoInstall ? fix(auto) : []],
-      nodeResolve({ extensions: ['.js', '.jsx', '.ts', '.tsx'] }),
+      nodeResolve({ preferBuiltins: true, extensions: ['.js', '.jsx', '.ts', '.tsx'] }),
-      fix(json)(),
       fix(commonjs)({ include: /node_modules/ }),
     ],
     input: entryFile,

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

@@ -25,7 +25,7 @@ push
     const code = await step('Bundling', async () => {
       return await bundle({ entry: location, autoInstall: opts.autoInstall });
     });
-    const id = await step('Creating load', async () => {
+    const id = await step(`Creating load ${(code.length / 1024).toFixed(0)}`, async () => {
       return await client.loads.set.mutate({
         id: opts.id,
         name: opts.name,
@@ -34,9 +34,10 @@ push
     });
     console.log('created load with id', id);
     if (opts.run) {
-      await step('Creating run', async () => {
+      const runId = await step('Creating run', async () => {
-        await client.runs.create.mutate({ loadId: id });
+        return await client.runs.create.mutate({ loadId: id });
       });
+      console.log('created run with id', runId);
     }
   });
 

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

@@ -0,0 +1,59 @@
+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';
+
+const remove = new Command('remove');
+
+const toInt = (value?: string) => {
+  if (!value) {
+    return undefined;
+  }
+  return parseInt(value, 10);
+};
+
+remove
+  .alias('ls')
+  .description('List logs')
+  .option('-l, --load-id <loadId>', 'Load ID')
+  .option('-o, --offset <offset>', 'Offset')
+  .option('-a, --limit <limit>', 'Limit', '1000')
+  .action(async () => {
+    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,
+        offset: toInt(offset),
+        limit: toInt(limit),
+      });
+    });
+
+    if (!response.ids.length) {
+      console.log('No logs to delete');
+      return;
+    }
+    const { confirm } = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'confirm',
+        message: `Are you sure you want to delete ${response.ids.length} logs?`,
+      },
+    ]);
+
+    if (!confirm) {
+      return;
+    }
+
+    await step('Deleting artifacts', async () => {
+      await client.runs.remove.mutate(response);
+    });
+  });
+
+export { remove };

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

@@ -0,0 +1,23 @@
+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';
+
+const terminate = new Command('terminate');
+
+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);
+    });
+    await step('Terminating run', async () => {
+      await client.runs.terminate.mutate(runId);
+    });
+  });
+
+export { terminate };

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

@@ -1,8 +1,14 @@
 import { Command } from 'commander';
 import { create } from './runs.create.js';
 import { list } from './runs.list.js';
+import { remove } from './runs.remove.js';
+import { terminate } from './runs.terminate.js';
 
 const runs = new Command('runs');
-runs.description('Manage runs').addCommand(create).addCommand(list);
+runs.description('Manage runs');
+runs.addCommand(create);
+runs.addCommand(list);
+runs.addCommand(remove);
+runs.addCommand(terminate);
 
 export { runs };

packages/examples/package.json

@@ -18,9 +18,9 @@
     }
   },
   "devDependencies": {
-    "@morten-olsen/mini-loader-configs": "workspace:^",
-    "@morten-olsen/mini-loader-cli": "workspace:^",
     "@morten-olsen/mini-loader": "workspace:^",
+    "@morten-olsen/mini-loader-cli": "workspace:^",
+    "@morten-olsen/mini-loader-configs": "workspace:^",
     "@types/node": "^20.10.8",
     "typescript": "^5.3.3"
   },
@@ -28,5 +28,8 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/morten-olsen/mini-loader"
+  },
+  "dependencies": {
+    "fastify": "^4.25.2"
   }
 }

packages/examples/src/http.ts

@@ -0,0 +1,12 @@
+import { http } from '@morten-olsen/mini-loader';
+import fastify from 'fastify';
+
+const server = fastify();
+
+server.all('*', async (req) => {
+  return req.url;
+});
+
+server.listen({
+  path: http.getPath(),
+});

packages/examples/src/simple.ts

@@ -3,6 +3,7 @@ import { artifacts, logger } from '@morten-olsen/mini-loader';
 const run = async () => {
   await logger.info('Hello world');
   await artifacts.create('foo', 'bar');
+  process.exit(0);
 };
 
 run();

packages/mini-loader/src/http/http.ts

@@ -0,0 +1,7 @@
+const getPath = () => process.env.HTTP_GATEWAY_PATH!;
+
+const http = {
+  getPath,
+};
+
+export { http };

packages/mini-loader/src/index.ts

@@ -8,3 +8,4 @@ export { logger } from './logger/logger.js';
 export { artifacts } from './artifacts/artifacts.js';
 export { input } from './input/input.js';
 export { secrets } from './secrets/secrets.js';
+export { http } from './http/http.js';

packages/runner/package.json

@@ -17,12 +17,12 @@
     }
   },
   "devDependencies": {
-    "@morten-olsen/mini-loader": "workspace:^",
     "@morten-olsen/mini-loader-configs": "workspace:^",
     "@types/node": "^20.10.8",
     "typescript": "^5.3.3"
   },
   "dependencies": {
+    "@morten-olsen/mini-loader": "workspace:^",
     "eventemitter3": "^5.0.1",
     "nanoid": "^5.0.4"
   },

packages/runner/src/index.ts

@@ -1,17 +1,5 @@
 import { Worker } from 'worker_threads';
-import os from 'os';
+import { setup } from './setup/setup.js';
-import { EventEmitter } from 'eventemitter3';
-import { Event } from '@morten-olsen/mini-loader';
-import { join } from 'path';
-import { createServer } from 'http';
-import { nanoid } from 'nanoid';
-import { chmod, mkdir, rm, writeFile } from 'fs/promises';
-
-type RunEvents = {
-  message: (event: Event) => void;
-  error: (error: Error) => void;
-  exit: () => void;
-};
 
 type RunOptions = {
   script: string;
@@ -20,44 +8,17 @@ type RunOptions = {
 };
 
 const run = async ({ script, input, secrets }: RunOptions) => {
-  const dataDir = join(os.tmpdir(), 'mini-loader', nanoid());
+  const info = await setup({ script, input, secrets });
-  await mkdir(dataDir, { recursive: true });
-  await chmod(dataDir, 0o700);
-  const hostSocket = join(dataDir, 'host');
-  const server = createServer();
-  const inputLocation = join(dataDir, 'input');
 
-  if (input) {
+  const worker = new Worker(info.scriptLocation, {
-    await writeFile(inputLocation, input);
-  }
-
-  const emitter = new EventEmitter<RunEvents>();
-
-  server.on('connection', (socket) => {
-    socket.on('data', (data) => {
-      const message = JSON.parse(data.toString());
-      emitter.emit('message', message);
-    });
-  });
-  server.listen(hostSocket);
-
-  const worker = new Worker(script, {
-    eval: true,
     stdin: false,
     stdout: false,
     stderr: false,
-    env: {
+    env: info.env,
-      HOST_SOCKET: hostSocket,
-      SECRETS: JSON.stringify(secrets),
-      INPUT_PATH: inputLocation,
-    },
-    workerData: {
-      input,
-    },
   });
 
   worker.stdout?.on('data', (data) => {
-    emitter.emit('message', {
+    info.emitter.emit('message', {
       type: 'log',
       payload: {
         severity: 'info',
@@ -67,7 +28,7 @@ const run = async ({ script, input, secrets }: RunOptions) => {
   });
 
   worker.stderr?.on('data', (data) => {
-    emitter.emit('message', {
+    info.emitter.emit('message', {
       type: 'log',
       payload: {
         severity: 'error',
@@ -78,20 +39,24 @@ const run = async ({ script, input, secrets }: RunOptions) => {
 
   const promise = new Promise<void>((resolve, reject) => {
     worker.on('exit', async () => {
-      server.close();
+      await info.teardown();
-      await rm(dataDir, { recursive: true, force: true });
       resolve();
     });
     worker.on('error', async (error) => {
-      server.close();
       reject(error);
     });
   });
 
   return {
-    emitter,
+    ...info,
+    teardown: async () => {
+      worker.terminate();
+    },
     promise,
   };
 };
 
+type RunInfo = Awaited<ReturnType<typeof run>>;
+
+export type { RunInfo };
 export { run };

packages/runner/src/setup/setup.ts

@@ -0,0 +1,71 @@
+import { join } from 'path';
+import os from 'os';
+import { nanoid } from 'nanoid';
+import { chmod, mkdir, rm, writeFile } from 'fs/promises';
+import { createServer } from 'net';
+import { EventEmitter } from 'eventemitter3';
+
+type SetupOptions = {
+  input?: Buffer | string;
+  script: string;
+  secrets?: Record<string, string>;
+};
+
+type RunEvents = {
+  message: (event: any) => void;
+  error: (error: Error) => void;
+  exit: () => void;
+};
+
+const setup = async (options: SetupOptions) => {
+  const { input, script, secrets } = options;
+  const emitter = new EventEmitter<RunEvents>();
+  const dataDir = join(os.tmpdir(), 'mini-loader', nanoid());
+
+  await mkdir(dataDir, { recursive: true });
+  await chmod(dataDir, 0o700);
+  const hostSocket = join(dataDir, 'host');
+  const httpGatewaySocket = join(dataDir, 'socket');
+  const server = createServer();
+  const inputLocation = join(dataDir, 'input');
+  const scriptLocation = join(dataDir, 'script.js');
+
+  if (input) {
+    await writeFile(inputLocation, input);
+  }
+  await writeFile(scriptLocation, script);
+  const env = {
+    HOST_SOCKET: hostSocket,
+    SECRETS: JSON.stringify(secrets || {}),
+    INPUT_PATH: inputLocation,
+    HTTP_GATEWAY_PATH: httpGatewaySocket,
+  };
+
+  const teardown = async () => {
+    server.close();
+    await rm(dataDir, { recursive: true, force: true });
+  };
+
+  server.on('connection', (socket) => {
+    socket.on('data', (data) => {
+      const message = JSON.parse(data.toString());
+      emitter.emit('message', message);
+    });
+  });
+
+  server.listen(hostSocket);
+
+  return {
+    env,
+    emitter,
+    teardown,
+    httpGatewaySocket,
+    scriptLocation,
+    hostSocket,
+  };
+};
+
+type Setup = Awaited<ReturnType<typeof setup>>;
+
+export type { Setup };
+export { setup };

packages/server/package.json

@@ -27,6 +27,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
+    "@fastify/reply-from": "^9.7.0",
     "@trpc/client": "^10.45.0",
     "@trpc/server": "^10.45.0",
     "commander": "^11.1.0",

packages/server/src/gateway/gateway.ts

@@ -0,0 +1,34 @@
+import { FastifyPluginAsync } from 'fastify';
+import FastifyReplyFrom from '@fastify/reply-from';
+import { escape } from 'querystring';
+import { Runtime } from '../runtime/runtime.js';
+
+type Options = {
+  runtime: Runtime;
+};
+
+const gateway: FastifyPluginAsync<Options> = async (fastify, { runtime }) => {
+  await fastify.register(FastifyReplyFrom, {
+    http: {},
+  });
+
+  fastify.all('/gateway/*', (req, res) => {
+    const [runId, ...pathSegments] = (req.params as any)['*'].split('/').filter(Boolean);
+    const run = runtime.runner.getInstance(runId);
+    if (!run) {
+      res.statusCode = 404;
+      res.send({ error: 'Run not found' });
+      return;
+    }
+    const socketPath = run.run?.httpGatewaySocket;
+    if (!socketPath) {
+      res.statusCode = 404;
+      res.send({ error: 'No socket path to run' });
+      return;
+    }
+    const path = pathSegments.join('/');
+    res.from(`unix+http://${escape(socketPath)}/${path}`);
+  });
+};
+
+export { gateway };

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

@@ -3,6 +3,7 @@ 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';
 
 type RunRepoEvents = {
   created: (args: { id: string; loadId: string }) => void;
@@ -18,13 +19,22 @@ type RunRepoOptions = {
 
 class RunRepo extends EventEmitter<RunRepoEvents> {
   #options: RunRepoOptions;
+  #isReady: Promise<void>;
 
   constructor(options: RunRepoOptions) {
     super();
     this.#options = options;
+    this.#isReady = this.#setup();
   }
 
+  #setup = async () => {
+    const { database } = this.#options;
+    const db = await database.instance;
+    await db('runs').update({ status: 'failed', error: 'server was shut down' }).where({ status: 'running' });
+  };
+
   public getById = async (id: string) => {
+    await this.#isReady;
     const { database } = this.#options;
     const db = await database.instance;
 
@@ -36,6 +46,7 @@ class RunRepo extends EventEmitter<RunRepoEvents> {
   };
 
   public getByLoadId = async (loadId: string) => {
+    await this.#isReady;
     const { database } = this.#options;
     const db = await database.instance;
 
@@ -44,6 +55,7 @@ class RunRepo extends EventEmitter<RunRepoEvents> {
   };
 
   public find = async (options: FindRunsOptions) => {
+    await this.#isReady;
     const { database } = this.#options;
     const db = await database.instance;
     const query = db('runs').select(['id', 'status', 'startedAt', 'status', 'error', 'endedAt']);
@@ -62,19 +74,41 @@ class RunRepo extends EventEmitter<RunRepoEvents> {
     return runs;
   };
 
-  public remove = async (options: FindRunsOptions) => {
+  public prepareRemove = async (options: FindRunsOptions) => {
+    await this.#isReady;
     const { database } = this.#options;
     const db = await database.instance;
-    const query = db('runs');
+    const query = db('runs').select('id');
 
     if (options.loadId) {
       query.where({ loadId: options.loadId });
     }
 
-    await query.del();
+    const result = await query;
+    const ids = result.map((row) => row.id);
+    const token = ids.map((id) => Buffer.from(id).toString('base64')).join('|');
+    const hash = createHash('sha256').update(token).digest('hex');
+    return {
+      ids,
+      hash,
+    };
+  };
+
+  public remove = async (hash: string, ids: string[]) => {
+    const { database } = this.#options;
+    const db = await database.instance;
+    const token = ids.map((id) => Buffer.from(id).toString('base64')).join('|');
+    const actualHash = createHash('sha256').update(token).digest('hex');
+
+    if (hash !== actualHash) {
+      throw new Error('Invalid hash');
+    }
+
+    await db('runs').whereIn('id', ids).delete();
   };
 
   public started = async (id: string) => {
+    await this.#isReady;
     const { database } = this.#options;
     const db = await database.instance;
     const current = await this.getById(id);
@@ -92,6 +126,7 @@ class RunRepo extends EventEmitter<RunRepoEvents> {
   };
 
   public finished = async (id: string, options: UpdateRunOptions) => {
+    await this.#isReady;
     const { database } = this.#options;
     const db = await database.instance;
     const { loadId } = await this.getById(id);
@@ -114,6 +149,7 @@ class RunRepo extends EventEmitter<RunRepoEvents> {
   };
 
   public create = async (options: CreateRunOptions) => {
+    await this.#isReady;
     const { database, loads } = this.#options;
     const id = nanoid();
     const db = await database.instance;

packages/server/src/router/router.runs.ts

@@ -1,3 +1,4 @@
+import { z } from 'zod';
 import { createRunSchema, findRunsSchema } from '../repos/repos.js';
 import { publicProcedure, router } from './router.utils.js';
 
@@ -17,17 +18,50 @@ const find = publicProcedure.input(findRunsSchema).query(async ({ input, ctx })
   return results;
 });
 
-const remove = publicProcedure.input(findRunsSchema).mutation(async ({ input, ctx }) => {
+const prepareRemove = publicProcedure.input(findRunsSchema).query(async ({ input, ctx }) => {
   const { runtime } = ctx;
   const { repos } = runtime;
   const { runs } = repos;
-  await runs.remove(input);
+  return await runs.prepareRemove(input);
+});
+
+const remove = publicProcedure
+
+  .input(
+    z.object({
+      hash: z.string(),
+      ids: z.array(z.string()),
+    }),
+  )
+  .mutation(async ({ input, ctx }) => {
+    const { runtime } = ctx;
+    const { repos } = runtime;
+    const { runs } = repos;
+    for (const id of input.ids) {
+      const instance = runtime.runner.getInstance(id);
+      if (instance) {
+        await instance.run?.teardown();
+      }
+    }
+    await runs.remove(input.hash, input.ids);
+  });
+
+const terminate = publicProcedure.input(z.string()).mutation(async ({ input, ctx }) => {
+  const { runtime } = ctx;
+  const { runner } = runtime;
+  const instance = runner.getInstance(input);
+  if (!instance || !instance.run) {
+    return;
+  }
+  await instance.run.teardown();
 });
 
 const runsRouter = router({
   create,
   find,
   remove,
+  prepareRemove,
+  terminate,
 });
 
 export { runsRouter };

packages/server/src/runner/runner.instance.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
-import { run } from '@morten-olsen/mini-loader-runner';
+import { RunInfo, run } from '@morten-olsen/mini-loader-runner';
 import { Repos } from '../repos/repos.js';
 import { LoggerEvent } from '../../../mini-loader/dist/esm/logger/logger.js';
 import { ArtifactCreateEvent } from '../../../mini-loader/dist/esm/artifacts/artifacts.js';
@@ -20,12 +20,17 @@ type RunnerInstanceOptions = {
 
 class RunnerInstance extends EventEmitter<RunnerInstanceEvents> {
   #options: RunnerInstanceOptions;
+  #run?: RunInfo;
 
   constructor(options: RunnerInstanceOptions) {
     super();
     this.#options = options;
   }
 
+  public get run() {
+    return this.#run;
+  }
+
   #addLog = async (event: LoggerEvent['payload']) => {
     const { repos, id, loadId } = this.#options;
     const { logs } = repos;
@@ -58,11 +63,13 @@ class RunnerInstance extends EventEmitter<RunnerInstanceEvents> {
       const script = await readFile(scriptLocation, 'utf-8');
       const allSecrets = await secrets.getAll();
       await runs.started(id);
-      const { promise, emitter } = await run({
+      const current = await run({
         script,
         secrets: allSecrets,
         input,
       });
+      this.#run = current;
+      const { promise, emitter } = current;
       emitter.on('message', (message) => {
         switch (message.type) {
           case 'log': {
@@ -84,9 +91,11 @@ class RunnerInstance extends EventEmitter<RunnerInstanceEvents> {
       }
       await runs.finished(id, { status: 'failed', error: errorMessage });
     } finally {
+      this.#run = undefined;
       this.emit('completed', { id });
     }
   };
 }
 
+export type { RunInfo };
 export { RunnerInstance };

packages/server/src/runner/runner.ts

@@ -36,6 +36,10 @@ class Runner {
     this.#instances.set(args.id, instance);
     await instance.start();
   };
+
+  public getInstance = (id: string) => {
+    return this.#instances.get(id);
+  };
 }
 
 export { Runner };

packages/server/src/server/server.ts

@@ -3,9 +3,16 @@ 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';
 
 const createServer = async (runtime: Runtime) => {
-  const server = fastify({});
+  const server = fastify({
+    maxParamLength: 10000,
+    bodyLimit: 30 * 1024 * 1024,
+    logger: {
+      level: 'warn',
+    },
+  });
   server.get('/', async () => {
     return { hello: 'world' };
   });
@@ -33,6 +40,14 @@ const createServer = async (runtime: Runtime) => {
       },
     } satisfies FastifyTRPCPluginOptions<RootRouter>['trpcOptions'],
   });
+
+  server.register(gateway, {
+    runtime,
+  });
+
+  server.addHook('onError', async (request, reply, error) => {
+    console.error(error);
+  });
   await server.ready();
 
   return server;

pnpm-lock.yaml

@@ -36,6 +36,9 @@ importers:
 
   packages/cli:
     dependencies:
+      '@morten-olsen/mini-loader-runner':
+        specifier: workspace:^
+        version: link:../runner
       '@rollup/plugin-auto-install':
         specifier: ^3.0.5
         version: 3.0.5(rollup@4.9.4)
@@ -85,9 +88,6 @@ importers:
       '@morten-olsen/mini-loader-configs':
         specifier: workspace:^
         version: link:../configs
-      '@morten-olsen/mini-loader-runner':
-        specifier: workspace:^
-        version: link:../runner
       '@morten-olsen/mini-loader-server':
         specifier: workspace:^
         version: link:../server
@@ -101,6 +101,10 @@ importers:
   packages/configs: {}
 
   packages/examples:
+    dependencies:
+      fastify:
+        specifier: ^4.25.2
+        version: 4.25.2
     devDependencies:
       '@morten-olsen/mini-loader':
         specifier: workspace:^
@@ -132,6 +136,9 @@ importers:
 
   packages/runner:
     dependencies:
+      '@morten-olsen/mini-loader':
+        specifier: workspace:^
+        version: link:../mini-loader
       eventemitter3:
         specifier: ^5.0.1
         version: 5.0.1
@@ -139,9 +146,6 @@ importers:
         specifier: ^5.0.4
         version: 5.0.4
     devDependencies:
-      '@morten-olsen/mini-loader':
-        specifier: workspace:^
-        version: link:../mini-loader
       '@morten-olsen/mini-loader-configs':
         specifier: workspace:^
         version: link:../configs
@@ -154,6 +158,9 @@ importers:
 
   packages/server:
     dependencies:
+      '@fastify/reply-from':
+        specifier: ^9.7.0
+        version: 9.7.0
       '@trpc/client':
         specifier: ^10.45.0
         version: 10.45.0(@trpc/server@10.45.0)
@@ -476,6 +483,11 @@ packages:
       fast-uri: 2.3.0
     dev: false
 
+  /@fastify/busboy@2.1.0:
+    resolution: {integrity: sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==}
+    engines: {node: '>=14'}
+    dev: false
+
   /@fastify/deepmerge@1.3.0:
     resolution: {integrity: sha512-J8TOSBq3SoZbDhM9+R/u77hP93gz/rajSA+K2kGyijPpORPWUXHUpTaleoj+92As0S9uPRP7Oi8IqMf0u+ro6A==}
     dev: false
@@ -490,6 +502,19 @@ packages:
       fast-json-stringify: 5.10.0
     dev: false
 
+  /@fastify/reply-from@9.7.0:
+    resolution: {integrity: sha512-/F1QBl3FGlTqStjmiuoLRDchVxP967TZh6FZPwQteWhdLsDec8mqSACE+cRzw6qHUj3v9hfdd7JNgmb++fyFhQ==}
+    dependencies:
+      '@fastify/error': 3.4.1
+      end-of-stream: 1.4.4
+      fast-content-type-parse: 1.1.0
+      fast-querystring: 1.1.2
+      fastify-plugin: 4.5.1
+      pump: 3.0.0
+      tiny-lru: 11.2.5
+      undici: 5.28.2
+    dev: false
+
   /@gar/promisify@1.1.3:
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
     requiresBuild: true
@@ -2683,6 +2708,10 @@ packages:
     resolution: {integrity: sha512-eel5UKGn369gGEWOqBShmFJWfq/xSJvsgDzgLYC845GneayWvXBf0lJCBn5qTABfewy1ZDPoaR5OZCP+kssfuw==}
     dev: false
 
+  /fastify-plugin@4.5.1:
+    resolution: {integrity: sha512-stRHYGeuqpEZTL1Ef0Ovr2ltazUT9g844X5z/zEBFLG8RYlpDiOCIG+ATvYEp+/zmc7sN29mcIMp8gvYplYPIQ==}
+    dev: false
+
   /fastify@4.25.2:
     resolution: {integrity: sha512-SywRouGleDHvRh054onj+lEZnbC1sBCLkR0UY3oyJwjD4BdZJUrxBqfkfCaqn74pVCwBaRHGuL3nEWeHbHzAfw==}
     dependencies:
@@ -5151,6 +5180,11 @@ packages:
     engines: {node: '>=8'}
     dev: false
 
+  /tiny-lru@11.2.5:
+    resolution: {integrity: sha512-JpqM0K33lG6iQGKiigcwuURAKZlq6rHXfrgeL4/I8/REoyJTGU+tEMszvT/oTRVHG2OiylhGDjqPp1jWMlr3bw==}
+    engines: {node: '>=12'}
+    dev: false
+
   /tmp@0.0.33:
     resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
     engines: {node: '>=0.6.0'}
@@ -5368,6 +5402,13 @@ packages:
   /undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
 
+  /undici@5.28.2:
+    resolution: {integrity: sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w==}
+    engines: {node: '>=14.0'}
+    dependencies:
+      '@fastify/busboy': 2.1.0
+    dev: false
+
   /unique-filename@1.1.1:
     resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
     requiresBuild: true

tsconfig.json

@@ -1,15 +1,15 @@
 {
   "include": [],
   "references": [
+    {
+      "path": "./packages/mini-loader/tsconfig.json"
+    },
     {
       "path": "./packages/runner/tsconfig.json"
     },
     {
       "path": "./packages/server/tsconfig.json"
     },
-    {
-      "path": "./packages/mini-loader/tsconfig.json"
-    },
     {
       "path": "./packages/cli/tsconfig.json"
     },