moon
/
ditto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

policy: improve error handling

This commit is contained in:
Alex Gleason 2024-05-15 19:29:58 -05:00
parent 8a672c93ec
commit 6a1b8b0943
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pipeline.ts
View File

@ -2,7 +2,6 @@ import { NKinds, NostrEvent, NPolicy, NSchema as n } from '@nostrify/nostrify';
import { LNURL } from '@nostrify/nostrify/ln'; import { LNURL } from '@nostrify/nostrify/ln';
import { PipePolicy } from '@nostrify/nostrify/policies'; import { PipePolicy } from '@nostrify/nostrify/policies';
import Debug from '@soapbox/stickynotes/debug'; import Debug from '@soapbox/stickynotes/debug';
import { Stickynotes } from '@soapbox/stickynotes';
import { sql } from 'kysely'; import { sql } from 'kysely';
import { Conf } from '@/config.ts'; import { Conf } from '@/config.ts';
@ -56,7 +55,7 @@ async function handleEvent(event: DittoEvent, signal: AbortSignal): Promise<void
} }
async function policyFilter(event: NostrEvent): Promise<void> { async function policyFilter(event: NostrEvent): Promise<void> {
const console = new Stickynotes('ditto:policy'); const debug = Debug('ditto:policy');
const policies: NPolicy[] = [ const policies: NPolicy[] = [
new MuteListPolicy(Conf.pubkey, await Storages.admin()), new MuteListPolicy(Conf.pubkey, await Storages.admin()),
@ -65,17 +64,30 @@ async function policyFilter(event: NostrEvent): Promise<void> {
try { try {
const CustomPolicy = (await import(Conf.policy)).default; const CustomPolicy = (await import(Conf.policy)).default;
policies.push(new CustomPolicy()); policies.push(new CustomPolicy());
console.info(`Using custom policy: ${Conf.policy}`); debug(`Using custom policy: ${Conf.policy}`);
} catch { } catch (e) {
console.info('Custom policy not found <https://docs.soapbox.pub/ditto/policies/>'); if (e.code === 'ERR_MODULE_NOT_FOUND') {
debug('Custom policy not found <https://docs.soapbox.pub/ditto/policies/>');
} else {
console.error(`DITTO_POLICY (error importing policy): ${Conf.policy}`, e);
throw new RelayError('blocked', 'policy could not be loaded');
}
} }
const policy = new PipePolicy(policies.reverse()); const policy = new PipePolicy(policies.reverse());
try {
const result = await policy.call(event); const result = await policy.call(event);
console.debug(JSON.stringify(result)); debug(JSON.stringify(result));
RelayError.assert(result); RelayError.assert(result);
} catch (e) {
if (e instanceof RelayError) {
throw e;
} else {
console.error('POLICY ERROR:', e);
throw new RelayError('blocked', 'policy error');
}
}
} }
/** Encounter the event, and return whether it has already been encountered. */ /** Encounter the event, and return whether it has already been encountered. */