diff --git a/src/handlers/ready-event.ts b/src/handlers/ready-event.ts index b92aa9e..188875d 100644 --- a/src/handlers/ready-event.ts +++ b/src/handlers/ready-event.ts @@ -11,12 +11,11 @@ const once = (log: Logging | undefined) => pipe( export function readyHandler( [sEmitter, , log, client]: DependencyList, - allPaths: ObservableInput, ) { //Todo: add module manager on on ready const ready$ = fromEvent(client!, 'ready').pipe(once(log)); - return concat(ready$).pipe(callInitPlugins(sEmitter)) + return concat(ready$).pipe(callInitPlugins(sEmitter)).subscribe() // const validModuleType = module.type >= 0 && module.type <= 1 << 10; // assert.ok(validModuleType, // `Found ${module.name} at ${module.meta.fullPath}, which does not have a valid type`); diff --git a/src/handlers/user-defined-events.ts b/src/handlers/user-defined-events.ts index 7cefb6a..31bd390 100644 --- a/src/handlers/user-defined-events.ts +++ b/src/handlers/user-defined-events.ts @@ -1,13 +1,13 @@ -import { ObservableInput } from 'rxjs'; +import { ObservableInput, map, mergeAll } from 'rxjs'; import { EventType, SernError } from '../core/structures/enums'; -import { eventDispatcher } from './event-utils' +import { callInitPlugins, eventDispatcher, handleCrash } from './event-utils' import { Service } from '../core/ioc'; import type { DependencyList } from '../types/ioc'; import type { EventModule, Processed } from '../types/core-modules'; export function eventsHandler( [emitter, err, log, client]: DependencyList, - allPaths: ObservableInput, + //allPaths: ObservableInput, ) { //code smell const intoDispatcher = (e: { module: Processed }) => { @@ -22,14 +22,14 @@ export function eventsHandler( throw Error(SernError.InvalidModuleType + ' while creating event handler'); } }; - buildModules(allPaths) - .pipe( - callInitPlugins(emitter), - map(intoDispatcher), - /** - * Where all events are turned on - */ - mergeAll(), - handleCrash(err, emitter, log)) - .subscribe(); + //buildModules(allPaths) +// pipe( +// callInitPlugins(emitter), +// map(intoDispatcher), +// /** +// * Where all events are turned on +// */ +// mergeAll(), +// handleCrash(err, emitter, log)) +// .subscribe(); } diff --git a/src/sern.ts b/src/sern.ts index fbf8f39..8d89de7 100644 --- a/src/sern.ts +++ b/src/sern.ts @@ -38,13 +38,13 @@ export function init(wrapper?: Wrapper) { errorHandler = dependencies[1]; if (wrapper.events !== undefined) { - eventsHandler(dependencies, Files.getFullPathTree(wrapper.events)); + eventsHandler(dependencies); } const initCallsite = callsites()[1].getFileName(); const presencePath = Files.shouldHandle(initCallsite!, "presence"); //Ready event: load all modules and when finished, time should be taken and logged - readyHandler(dependencies, Files.getFullPathTree(wrapper.commands)) + readyHandler(dependencies) .add(() => { logger?.info({ message: "Client signaled ready, registering modules" }); const time = ((performance.now() - startTime) / 1000).toFixed(2);