mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

api: set vars while constructing DittoApp

Browse source
This commit is contained in:
Alex Gleason 2025-02-17 15:09:46 -06:00
parent 30f4d45fca
commit 951c145138
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
3 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/api/DittoApp.test.ts
View file

@ -1,10 +1,17 @@
import { DittoConf } from '@ditto/conf';
import { DittoDB } from '@ditto/db';
import { Hono } from '@hono/hono';
import { MockRelay } from '@nostrify/nostrify/test';
import { DittoApp } from './DittoApp.ts';
import { DittoRoute } from './DittoRoute.ts';
Deno.test('DittoApp', () => {
const app = new DittoApp();
Deno.test('DittoApp', async () => {
await using db = DittoDB.create('memory://');
const conf = new DittoConf(new Map());
const store = new MockRelay();
const app = new DittoApp({ conf, db, store });
const hono = new Hono();
const route = new DittoRoute();

13
packages/api/DittoApp.ts
View file

@ -1,8 +1,21 @@
import { Hono } from '@hono/hono';
import type { HonoOptions } from '@hono/hono/hono-base';
import type { DittoEnv } from './DittoEnv.ts';
export class DittoApp extends Hono<DittoEnv> {
// @ts-ignore Require a DittoRoute for type safety.
declare route: (path: string, app: Hono<DittoEnv>) => Hono<DittoEnv>;
constructor(vars: Omit<DittoEnv['Variables'], 'signal'>, opts: HonoOptions<DittoEnv> = {}) {
super(opts);
this.use((c, next) => {
c.set('db', vars.db);
c.set('conf', vars.conf);
c.set('store', vars.store);
c.set('signal', c.req.raw.signal);
return next();
});
}
}

9
packages/api/DittoRoute.ts
View file

@ -1,4 +1,4 @@
import { type Context, type ErrorHandler, Hono } from '@hono/hono';
import { type ErrorHandler, Hono } from '@hono/hono';
import { HTTPException } from '@hono/hono/http-exception';
import type { HonoOptions } from '@hono/hono/hono-base';
@ -13,7 +13,6 @@ export class DittoRoute extends Hono<DittoEnv> {
super(opts);
this.use((c, next) => {
this.setSignal(c);
this.assertVars(c.var);
return next();
});
@ -21,12 +20,6 @@ export class DittoRoute extends Hono<DittoEnv> {
this.onError(this._errorHandler);
}
private setSignal(c: Context<DittoEnv>): void {
if (!c.var.signal) {
c.set('signal', c.req.raw.signal);
}
}
private assertVars(vars: Partial<DittoEnv['Variables']>): DittoEnv['Variables'] {
if (!vars.db) this.throwMissingVar('db');
if (!vars.conf) this.throwMissingVar('conf');