tiramisu/seyfert
5
0
Fork 0
mirror of https://github.com/tiramisulabs/seyfert.git synced 2025-07-02 21:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correct types in event handler (#248)

Browse Source 
* fix: correct type in event values

* fix: spread custom args
This commit is contained in:
Marcos Susaña 2024-08-21 10:19:03 -04:00 committed by GitHub
parent 11fa0bb6d4
commit 40f261f921
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/events/handler.ts
View File

@ -7,6 +7,7 @@ import type {
import type { Client, WorkerClient } from '../client'; import type { Client, WorkerClient } from '../client';
import { import {
BaseHandler, BaseHandler,
type CamelCase,
ReplaceRegex, ReplaceRegex,
isCloudfareWorker, isCloudfareWorker,
magicImport, magicImport,
@ -15,13 +16,22 @@ import {
} from '../common'; } from '../common';
import type { ClientEvents } from '../events/hooks'; import type { ClientEvents } from '../events/hooks';
import * as RawEvents from '../events/hooks'; import * as RawEvents from '../events/hooks';
import type { ClientEvent, CustomEvents, CustomEventsKeys, ClientNameEvents } from './event'; import type { ClientEvent, CustomEvents, CustomEventsKeys, ClientNameEvents, EventContext } from './event';
import type { FileLoaded } from '../commands/handler'; import type { FileLoaded } from '../commands/handler';
export type EventValue = MakeRequired<ClientEvent, '__filePath'> & { fired?: boolean }; export type EventValue = MakeRequired<ClientEvent, '__filePath'> & { fired?: boolean };
export type GatewayEvents = Uppercase<SnakeCase<keyof ClientEvents>>; export type GatewayEvents = Uppercase<SnakeCase<keyof ClientEvents>>;
type ResolveEventParams<T extends CustomEventsKeys | GatewayEvents> = T extends CustomEventsKeys
? Parameters<CustomEvents[T]>
: EventContext<{ data: { name: CamelCase<T> } }>;
export type EventValues = {
[K in CustomEventsKeys | GatewayEvents]: Omit<EventValue, 'run'> & {
run(...args: ResolveEventParams<K>): any;
};
};
export class EventHandler extends BaseHandler { export class EventHandler extends BaseHandler {
constructor(protected client: Client | WorkerClient) { constructor(protected client: Client | WorkerClient) {
super(client.logger); super(client.logger);
@ -31,7 +41,7 @@ export class EventHandler extends BaseHandler {
this.logger.warn('<Client>.events.onFail', err, event); this.logger.warn('<Client>.events.onFail', err, event);
protected filter = (path: string) => path.endsWith('.js') || (!path.endsWith('.d.ts') && path.endsWith('.ts')); protected filter = (path: string) => path.endsWith('.js') || (!path.endsWith('.d.ts') && path.endsWith('.ts'));
values: Partial<Record<GatewayEvents | CustomEventsKeys, EventValue>> = {}; values: Partial<EventValues> = {};
discordEvents = Object.keys(RawEvents).map(x => ReplaceRegex.camel(x.toLowerCase())) as ClientNameEvents[]; discordEvents = Object.keys(RawEvents).map(x => ReplaceRegex.camel(x.toLowerCase())) as ClientNameEvents[];
@ -147,18 +157,26 @@ export class EventHandler extends BaseHandler {
} }
} }
async runCustom<T extends CustomEventsKeys>(name: T, ...args: Parameters<CustomEvents[T]>) { async runCustom<T extends CustomEventsKeys>(name: T, ...args: EventValues[T]) {
const Event = this.values[name]; const Event = this.values[name];
if (!Event) { if (!Event) {
return this.client.collectors.run(name, args as never, this.client); // @ts-expect-error working with non-existent types is hard
return this.client.collectors.run(name, ...args, this.client);
} }
try { try {
if (Event.data.once && Event.fired) { if (Event.data.once && Event.fired) {
return this.client.collectors.run(name, args as never, this.client); // @ts-expect-error working with non-existent types is hard
return this.client.collectors.run(name, ...args, this.client);
} }
Event.fired = true; Event.fired = true;
this.logger.debug(`executed a custom event [${name}]`, Event.data.once ? 'once' : ''); this.logger.debug(`executed a custom event [${name}]`, Event.data.once ? 'once' : '');
await Promise.all([Event.run(args, this.client), this.client.collectors.run(name, args as never, this.client)]);
await Promise.all([
// @ts-expect-error working with non-existent types is hard
Event.run(...args, this.client),
// @ts-expect-error working with non-existent types is hard
this.client.collectors.run(name, ...args, this.client),
]);
} catch (e) { } catch (e) {
await this.onFail(name, e); await this.onFail(name, e);
} }