Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 46 additions & 42 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@types/node-cron": "^3.0.11",
"@typescript-eslint/eslint-plugin": "5.58.0",
"@typescript-eslint/parser": "5.59.1",
"discord.js": "^14.14.1",
"discord.js": "^14.22.1",
"eslint": "8.39.0",
"typescript": "5.0.2",
"vitest": "^1.6.0"
Expand Down
88 changes: 51 additions & 37 deletions src/handlers/ready.ts
Original file line number Diff line number Diff line change
@@ -1,44 +1,58 @@
import * as Files from '../core/module-loading'
import { once } from 'node:events';
import { createLookupTable, resultPayload } from '../core/functions';
import { CommandType } from '../core/structures/enums';
import { Module, SernOptionsData } from '../types/core-modules';
import type { UnpackedDependencies, Wrapper } from '../types/utility';
import { callInitPlugins } from './event-utils';
import { SernAutocompleteData } from '..';
import * as Files from "../core/module-loading";
import { once } from "node:events";
import { createLookupTable, resultPayload } from "../core/functions";
import { CommandType } from "../core/structures/enums";
import { Module, SernOptionsData } from "../types/core-modules";
import type { UnpackedDependencies, Wrapper } from "../types/utility";
import { callInitPlugins } from "./event-utils";
import { SernAutocompleteData } from "..";
import { Events } from "discord.js";

export default async function(dirs: string | string[], deps : UnpackedDependencies) {
const { '@sern/client': client,
'@sern/logger': log,
'@sern/emitter': sEmitter,
'@sern/modules': commands } = deps;
log?.info({ message: "Waiting on discord client to be ready..." })
await once(client, "ready");
log?.info({ message: "Client signaled ready, registering modules" });
export default async function (
dirs: string | string[],
deps: UnpackedDependencies,
) {
const {
"@sern/client": client,
"@sern/logger": log,
"@sern/emitter": sEmitter,
"@sern/modules": commands,
} = deps;
log?.info({ message: "Waiting on discord client to be ready..." });
await once(client, Events.ClientReady);
log?.info({ message: "Client signaled ready, registering modules" });

// https://observablehq.com/@ehouais/multiple-promises-as-an-async-generator
// possibly optimize to concurrently import modules
// https://observablehq.com/@ehouais/multiple-promises-as-an-async-generator
// possibly optimize to concurrently import modules

const directories = Array.isArray(dirs) ? dirs : [dirs];
const directories = Array.isArray(dirs) ? dirs : [dirs];

for (const dir of directories) {
for await (const path of Files.readRecursive(dir)) {
let { module } = await Files.importModule<Module>(path);
const validType = module.type >= CommandType.Text && module.type <= CommandType.ChannelSelect;
if(!validType) {
throw Error(`Found ${module.name} at ${module.meta.absPath}, which has incorrect \`type\``);
}
const resultModule = await callInitPlugins(module, deps, true);
for (const dir of directories) {
for await (const path of Files.readRecursive(dir)) {
const { module } = await Files.importModule<Module>(path);
const validType =
module.type >= CommandType.Text &&
module.type <= CommandType.ChannelSelect;
if (!validType) {
throw Error(
`Found ${module.name} at ${module.meta.absPath}, which has incorrect \`type\``,
);
}
const resultModule = await callInitPlugins(module, deps, true);

if(module.type === CommandType.Both || module.type === CommandType.Slash) {
const options = (Reflect.get(module, 'options') ?? []) as SernOptionsData[];
const lookupTable = createLookupTable(options)
module.locals['@sern/lookup-table'] = lookupTable;
}
// FREEZE! no more writing!!
commands.set(resultModule.meta.id, Object.freeze(resultModule));
sEmitter.emit('module.register', resultPayload('success', resultModule));
}
if (
module.type === CommandType.Both ||
module.type === CommandType.Slash
) {
const options = (Reflect.get(module, "options") ??
[]) as SernOptionsData[];
const lookupTable = createLookupTable(options);
module.locals["@sern/lookup-table"] = lookupTable;
}
// FREEZE! no more writing!!
commands.set(resultModule.meta.id, Object.freeze(resultModule));
sEmitter.emit("module.register", resultPayload("success", resultModule));
}
sEmitter.emit('modulesLoaded');
}
sEmitter.emit("modulesLoaded");
}
Loading