chore(main): release 4.0.3 (#370)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [4.0.3](https://github.com/sern-handler/handler/compare/v4.0.2...v4.0.3) (2024-10-06)
+
+
+### Bug Fixes
+
+* async presence ([#369](https://github.com/sern-handler/handler/issues/369)) ([eabfb81](https://github.com/sern-handler/handler/commit/eabfb81819b53a4656d8eac6e21cfb488b724a42))
+* fix eventModule typing for Discord events ([#368](https://github.com/sern-handler/handler/issues/368)) ([1789ccb](https://github.com/sern-handler/handler/commit/1789ccb2f22f502f87538fecdb07106ff7110434))
+
+## [4.0.2](https://github.com/sern-handler/handler/compare/v4.0.1...v4.0.2) (2024-08-13)
+
+
+### Bug Fixes
+
+* type issue ([2106cdc](https://github.com/sern-handler/handler/commit/2106cdc1d033f88b6ee4ccca6754fe7a595a9328))
+
 ## [4.0.1](https://github.com/sern-handler/handler/compare/v4.0.0...v4.0.1) (2024-07-19)
 
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@sern/handler",
     "packageManager": "yarn@3.5.0",
-    "version": "4.0.1",
+    "version": "4.0.3",
     "description": "A complete, customizable, typesafe, & reactive framework for discord bots.",
     "main": "./dist/index.js",
     "module": "./dist/index.js",
@@ -39,8 +39,7 @@
         "callsites": "^3.1.0",
         "cron": "^3.1.7",
         "deepmerge": "^4.3.1",
-        "rxjs": "^7.8.0",
-        "ts-results-es": "^4.1.0"
+        "rxjs": "^7.8.0"
     },
     "devDependencies": {
         "@faker-js/faker": "^8.0.1",

src/core/module-loading.ts

@@ -1,6 +1,7 @@
 import path from 'node:path';
-import { type Dirent, existsSync } from 'node:fs';
+import { existsSync } from 'node:fs';
 import { readdir } from 'fs/promises';
+import assert from 'node:assert';
 import * as Id from './id'
 import { Module } from '../types/core-modules';
 
@@ -37,9 +38,8 @@ export async function importModule<T>(absPath: string) {
     let fileModule = await import(absPath);
 
     let commandModule: Module = fileModule.default;
-    if(!commandModule) { 
-        throw Error(`No default export @ ${absPath}`);
-    }
+
+    assert(commandModule , `No default export @ ${absPath}`);
     if ('default' in commandModule) {
         commandModule = commandModule.default as Module;
     }
@@ -53,18 +53,16 @@ export async function importModule<T>(absPath: string) {
 }
 
 
-export async function* readRecursive(dir: string, directoryPlugins: string[] = []): AsyncGenerator<[string, string[]]> {
+export async function* readRecursive(dir: string): AsyncGenerator<string> {
     const files = await readdir(dir, { withFileTypes: true });
-    const pluginFile = files.find(file => file.isFile() && file.name.startsWith('!plugins')) as Dirent;
     for (const file of files) {
         const fullPath = path.posix.join(dir, file.name);
-        const plugins = pluginFile ? [...directoryPlugins, path.posix.join(dir, pluginFile.name) ] : directoryPlugins
         if (file.isDirectory()) {
             if (!file.name.startsWith('!')) {
-                yield* readRecursive(fullPath, plugins);
+                yield* readRecursive(fullPath);
             }
         } else if (!file.name.startsWith('!')) {
-            yield ["file:///"+path.resolve(fullPath), plugins];
+            yield "file:///"+path.resolve(fullPath);
         }
     }
 }

src/core/modules.ts

@@ -26,7 +26,7 @@ export function commandModule(mod: InputCommand): Module {
  * The wrapper function to define event modules for sern
  * @param mod
  */
-export function eventModule(mod: InputEvent): Module {
+export function eventModule<T extends keyof ClientEvents = keyof ClientEvents>(mod: InputEvent<T>): Module {
     const [onEvent, plugins] = partitionPlugins(mod.plugins);
     if(onEvent.length !== 0) throw Error("Event modules cannot have ControlPlugins");
     return { ...mod,
@@ -35,8 +35,9 @@ export function eventModule(mod: InputEvent): Module {
 }
 
 /** Create event modules from discord.js client events,
- * This is an {@link eventModule} for discord events,
- * where typings can be very bad.
+ * This was an {@link eventModule} for discord events,
+ * where typings were bad.
+ * @deprecated Use {@link eventModule} instead
  * @param mod
  */
 export function discordEvent<T extends keyof ClientEvents>(mod: {

src/core/plugin.ts

@@ -1,6 +1,6 @@
 import { CommandType, PluginType } from './structures/enums';
 import type { Plugin, PluginResult, CommandArgs, InitArgs } from '../types/core-plugin';
-import { Err, Ok } from 'ts-results-es';
+import { Err, Ok } from './structures/result';
 
 export function makePlugin<V extends unknown[]>(
     type: PluginType,

src/core/presences.ts

@@ -1,11 +1,10 @@
 import type { ActivitiesOptions } from "discord.js";
 import type { IntoDependencies } from "./ioc";
 import type { Emitter } from "./interfaces";
+import { Awaitable } from "../types/utility";
 
 type Status = 'online' | 'idle' | 'invisible' | 'dnd'
-type PresenceReduce = (previous: Presence.Result) => Presence.Result;
-
-
+type PresenceReduce = (previous: Presence.Result) => Awaitable<Presence.Result>;
 
 export const Presence = {
     /**
@@ -50,7 +49,7 @@ export const Presence = {
 export declare namespace Presence {
     export type Config<T extends (keyof Dependencies)[]> = {
         inject?: [...T]
-        execute: (...v: IntoDependencies<T>) => Presence.Result;
+        execute: (...v: IntoDependencies<T>) => Awaitable<Presence.Result>;
 
     }
 
@@ -60,7 +59,7 @@ export declare namespace Presence {
         activities?: ActivitiesOptions[];
         shardId?: number[];
         repeat?: number | [Emitter, string];
-        onRepeat?: (previous: Result) => Result; 
+        onRepeat?: PresenceReduce 
     }
 }
 

src/core/structures/context.ts

@@ -8,8 +8,7 @@ import type {
     Snowflake,
     User,
 } from 'discord.js';
-import { CoreContext } from '../structures/core-context';
-import { Result, Ok, Err } from 'ts-results-es';
+import { Result, Ok, Err, val } from './result';
 import * as assert from 'assert';
 import type { ReplyOptions } from '../../types/utility';
 import { fmt } from '../functions'
@@ -21,39 +20,32 @@ import { SernError } from './enums';
  * Provides values shared between
  * Message and ChatInputCommandInteraction
  */
-export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
+export class Context {
     
     get options() {
         if(this.isMessage()) {
             const [, ...rest] = fmt(this.message.content, this.prefix);
             return rest;
-        } else {
-            return this.interaction.options;
-        }
+        } 
+        return this.interaction.options;
     }
     
 
     protected constructor(protected ctx: Result<Message, ChatInputCommandInteraction>,
-                          private __prefix?: string) {
-        super(ctx);
-    }
+                          private __prefix?: string) { }
     public get prefix() {
         return this.__prefix;
     }
     public get id(): Snowflake {
-        return safeUnwrap(this.ctx
-                            .map(m => m.id)
-                            .mapErr(i => i.id));
+        return val(this.ctx).id
     }
 
     public get channel() {
-        return safeUnwrap(this.ctx.map(m => m.channel).mapErr(i => i.channel));
+        return val(this.ctx).channel;
     }
 
     public get channelId(): Snowflake {
-        return safeUnwrap(this.ctx
-                            .map(m => m.channelId)
-                            .mapErr(i => i.channelId));
+        return val(this.ctx).channelId;
     }
     
     /**
@@ -61,9 +53,11 @@ export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
      * else, interaction.user
      */
     public get user(): User {
-        return safeUnwrap(this.ctx
-                            .map(m => m.author)
-                            .mapErr(i => i.user));
+        if(this.ctx.ok) {
+            return this.ctx.value.author;
+        } 
+        return this.ctx.error.user;
+        
     }
 
     public get userId(): Snowflake {
@@ -71,59 +65,60 @@ export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
     }
 
     public get createdTimestamp(): number {
-        return safeUnwrap(this.ctx 
-                            .map(m => m.createdTimestamp)
-                            .mapErr(i => i.createdTimestamp));
+        return val(this.ctx).createdTimestamp;
     }
 
     public get guild() {
-        return safeUnwrap(this.ctx
-                            .map(m => m.guild)
-                            .mapErr(i => i.guild));
+        return val(this.ctx).guild;
     }
 
     public get guildId() {
-        return safeUnwrap(this.ctx
-                            .map(m => m.guildId)
-                            .mapErr(i => i.guildId));
+        return val(this.ctx).guildId;
     }
     /*
      * interactions can return APIGuildMember if the guild it is emitted from is not cached
      */
     public get member() {
-        return safeUnwrap(this.ctx
-                            .map(m => m.member)
-                            .mapErr(i => i.member));
+        return val(this.ctx).member;
     }
 
     get message(): Message {
-        return this.ctx.expect(SernError.MismatchEvent);
+        if(this.ctx.ok) {
+            return this.ctx.value;
+        }
+        throw Error(SernError.MismatchEvent);
+    }
+    public isMessage(): this is Context & { ctx: Result<Message, never> } {
+        return this.ctx.ok;
+    }
+
+    public isSlash(): this is Context & { ctx: Result<never, ChatInputCommandInteraction> } {
+        return !this.isMessage();
     }
 
     get interaction(): ChatInputCommandInteraction {
-        return this.ctx.expectErr(SernError.MismatchEvent);
+        if(!this.ctx.ok) {
+            return this.ctx.error;
+        }
+        throw Error(SernError.MismatchEvent);
     }
 
 
     public get client(): Client {
-        return safeUnwrap(this.ctx
-                            .map(m => m.client)
-                            .mapErr(i => i.client));
+        return val(this.ctx).client;
     }
 
     public get inGuild(): boolean {
-        return safeUnwrap(this.ctx
-                            .map(m => m.inGuild())
-                            .mapErr(i => i.inGuild()));
+        return val(this.ctx).inGuild()
     }
 
     public async reply(content: ReplyOptions) {
-        return safeUnwrap(
-            this.ctx
-                .map(m => m.reply(content as MessageReplyOptions))
-                .mapErr(i =>
-                    i.reply(content as InteractionReplyOptions).then(() => i.fetchReply())),
-        );
+        if(this.ctx.ok) {
+            return this.ctx.value.reply(content as MessageReplyOptions)
+        } 
+        interface FetchReply { fetchReply: true };
+        return this.ctx.error.reply(content as InteractionReplyOptions & FetchReply)
+       
     }
 
     static wrap(wrappable: BaseInteraction | Message, prefix?: string): Context {
@@ -134,10 +129,3 @@ export class Context extends CoreContext<Message, ChatInputCommandInteraction> {
         return new Context(Err(wrappable), prefix);
     }
 }
-
-function safeUnwrap<T>(res: Result<T, T>) {
-    if(res.isOk()) {
-        return res.expect("Tried unwrapping message field: " + res)
-    } 
-    return res.expectErr("Tried unwrapping interaction field" + res)
-}

src/core/structures/core-context.ts

@@ -1,18 +0,0 @@
-import { Result as Either } from 'ts-results-es';
-import * as assert from 'node:assert';
-
-/**
- * @since 3.0.0
- */
-export abstract class CoreContext<M, I> {
-    protected constructor(protected ctx: Either<M, I>) {
-        assert.ok(typeof ctx === 'object' && ctx != null, "Context was nonobject or null");
-    }
-    public isMessage(): this is CoreContext<M, never> {
-        return this.ctx.isOk();
-    }
-
-    public isSlash(): this is CoreContext<never, I> {
-        return !this.isMessage();
-    }
-}

src/core/structures/result.ts

@@ -0,0 +1,20 @@
+export type Result<Ok, Err> =
+  | { ok: true; value: Ok }
+  | { ok: false; error: Err };
+
+export const Ok = <Ok>(value: Ok) => ({ ok: true, value } as const);
+export const Err = <Err>(error: Err) => ({ ok: false, error } as const);
+
+export const val = <O, E>(r: Result<O, E>) => r.ok ? r.value : r.error;
+export const EMPTY_ERR = Err(undefined);
+
+/**
+ * Wrap an async operation that may throw an Error (`try-catch` style) into checked exception style
+ * @param op The operation function
+ */
+export async function wrapAsync<T, E = unknown>(op: () => Promise<T>): Promise<Result<T, E>> {
+    try { return op()
+            .then(Ok)
+            .catch(Err); } 
+    catch (e) { return Promise.resolve(Err(e as E)); }
+}

src/handlers/event-utils.ts

@@ -8,7 +8,7 @@ import {
 import * as Id from '../core/id'
 import type { Emitter, ErrorHandling, Logging } from '../core/interfaces';
 import { SernError } from '../core/structures/enums'
-import { Err, Ok, Result } from 'ts-results-es';
+import { EMPTY_ERR, Err, Ok, Result,  wrapAsync } from '../core/structures/result';
 import type { UnpackedDependencies } from '../types/utility';
 import type { CommandModule, Module, Processed } from '../types/core-modules';
 import * as assert from 'node:assert';
@@ -17,6 +17,7 @@ import { CommandType } from '../core/structures/enums'
 import { inspect } from 'node:util'
 import { disposeAll } from '../core/ioc';
 import { resultPayload, isAutocomplete, treeSearch, fmt } from '../core/functions'
+
 import merge from 'deepmerge'
 
 function handleError<C>(crashHandler: ErrorHandling, emitter: Emitter, logging?: Logging) {
@@ -43,7 +44,7 @@ interface ExecutePayload {
 
 export const filterTap = <K, R>(onErr: (e: R) => void): OperatorFunction<Result<K, R>, K> => 
     concatMap(result => {
-        if(result.isOk()) {
+        if(result.ok){
             return of(result.value)
         }
         onErr(result.error);
@@ -142,7 +143,7 @@ export function createInteractionHandler<T extends Interaction>(
                 .map(({ id, params }) => ({ module: mg.get(id), params }))
                 .filter(({ module }) => module !== undefined);
             if(modules.length == 0) {
-                return Err.EMPTY;
+                return EMPTY_ERR;
             }
             const [{module, params}] = modules;
             return Ok(createDispatcher({ 
@@ -179,9 +180,9 @@ export function createMessageHandler(
  * @param task the deferred execution which will be called
  */
 export function executeModule(emitter: Emitter, { module, args }: ExecutePayload) {
-    return from(Result.wrapAsync(async () => module.execute(...args)))
+    return from(wrapAsync(async () => module.execute(...args)))
         .pipe(concatMap(result => { 
-            if (result.isOk()) {
+            if (result.ok){
                 emitter.emit('module.activate', resultPayload('success', module));
                 return EMPTY;
             }
@@ -206,10 +207,10 @@ export function createResultResolver<Output>(config: {
     return async (payload: ExecutePayload) => {
         const task = await callPlugins(payload);
         if (!task) throw Error("Plugin did not return anything.");
-        if(task.isOk()) {
-            return onNext(payload, task.value) as Output;
-        } else {
+        if(!task.ok) {
             onStop?.(payload.module, String(task.error));
+        } else {
+            return onNext(payload, task.value) as Output;
         }
     };
 };
@@ -225,12 +226,13 @@ export async function callInitPlugins(_module: Module, deps: Dependencies, emit?
     for(const plugin of module.plugins ?? []) {
         const result = await plugin.execute({ module, absPath: module.meta.absPath, deps });
         if (!result) throw Error("Plugin did not return anything. " + inspect(plugin, false, Infinity, true));
-        if(result.isErr()) {
+        if(!result.ok) {
             if(emit) {
                 emitter?.emit('module.register',
                               resultPayload('failure', module, result.error ?? SernError.PluginFailure));
             }
-            throw Error(result.error ?? SernError.PluginFailure);
+            throw Error((result.error ?? SernError.PluginFailure) +
+                        'on module ' + module.name + " " + module.meta.absPath);
         }
     }
     return module
@@ -240,7 +242,7 @@ export async function callPlugins({ args, module, deps, params }: ExecutePayload
     let state = {};
     for(const plugin of module.onEvent??[]) {
         const result = await plugin.execute(...args, { state, deps, params, type: module.type });
-        if(result.isErr()) {
+        if(!result.ok) {
             return result;
         }
         if(isObject(result.value)) {

src/handlers/presence.ts

@@ -1,4 +1,4 @@
-import { concatMap, from, interval, of, map, scan, startWith, fromEvent, take } from "rxjs"
+import { concatMap, from, interval, of, map, scan, startWith, fromEvent, take, mergeScan } from "rxjs"
 import { Presence  } from "../core/presences";
 import { Services } from "../core/ioc";
 import assert from "node:assert";
@@ -14,7 +14,7 @@ const parseConfig = async (conf: Promise<Presence.Result>) => {
             const src$ = typeof repeat === 'number' 
                 ? interval(repeat)
                 : fromEvent(...repeat);
-                return src$.pipe(scan(onRepeat, s), 
+                return src$.pipe(mergeScan(async (args) => onRepeat(args), s), 
                                  startWith(s));
         }
         return of(s).pipe(take(1));

src/handlers/ready.ts

@@ -17,8 +17,7 @@ export default async function(dir: string, deps : UnpackedDependencies) {
 
     // https://observablehq.com/@ehouais/multiple-promises-as-an-async-generator
     // possibly optimize to concurrently import modules
-    for await (const [path, directoryPlugins] of Files.readRecursive(dir)) {
-        console.log(path, directoryPlugins)
+    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) {

src/handlers/tasks.ts

@@ -6,7 +6,7 @@ import { fileURLToPath } from "url";
 
 export const registerTasks = async (tasksPath: string, deps: UnpackedDependencies) => {
     const taskManager = deps['@sern/scheduler']
-    for await (const [f, _] of Files.readRecursive(tasksPath)) {
+    for await (const f of Files.readRecursive(tasksPath)) {
         let { module } = await Files.importModule<ScheduledTask>(f);
         //module.name is assigned by Files.importModule<>
         // the id created for the task is unique

src/handlers/user-defined-events.ts

@@ -20,8 +20,7 @@ const intoDispatcher = (deps: UnpackedDependencies) =>
 
 export default async function(deps: UnpackedDependencies, eventDir: string) {
     const eventModules: EventModule[] = [];
-    for await (const [path, _] of Files.readRecursive(eventDir)) {
-        console.log(path, _)
+    for await (const path of Files.readRecursive(eventDir)) {
         let { module } = await Files.importModule<Module>(path);
         await callInitPlugins(module, deps)
         eventModules.push(module as EventModule);

src/types/core-modules.ts

@@ -167,9 +167,9 @@ export interface CommandModuleDefs {
     [CommandType.Modal]: ModalSubmitCommand;
 }
 
-export interface EventModuleDefs {
+export interface EventModuleDefs<T extends keyof ClientEvents = keyof ClientEvents> {
     [EventType.Sern]: SernEventCommand;
-    [EventType.Discord]: DiscordEventCommand;
+    [EventType.Discord]: DiscordEventCommand<T>;
     [EventType.External]: ExternalEventCommand;
 }
 
@@ -186,12 +186,12 @@ export interface SernAutocompleteData
 type CommandModuleNoPlugins = {
     [T in CommandType]: Omit<CommandModuleDefs[T], 'plugins' | 'onEvent' | 'meta' | 'locals'>;
 };
-type EventModulesNoPlugins = {
-    [T in EventType]: Omit<EventModuleDefs[T], 'plugins' | 'onEvent' | 'meta' | 'locals'> ;
+type EventModulesNoPlugins<K extends keyof ClientEvents = keyof ClientEvents> = {
+    [T in EventType]: Omit<EventModuleDefs<K>[T], 'plugins' | 'onEvent' | 'meta' | 'locals'> ;
 };
 
-export type InputEvent = {
-    [T in EventType]: EventModulesNoPlugins[T] & {
+export type InputEvent<K extends keyof ClientEvents = keyof ClientEvents> = {
+    [T in EventType]: EventModulesNoPlugins<K>[T] & {
         once?: boolean;
         plugins?: InitPlugin[] 
     };

src/types/core-plugin.ts

@@ -11,7 +11,6 @@
  * Plugins are reminiscent of middleware in express.
  */
 
-import type { Result } from 'ts-results-es';
 import type {
     Module,
     Processed,
@@ -23,6 +22,7 @@ import type { Context } from '../core/structures/context'
 import type {
     ButtonInteraction,
     ChannelSelectMenuInteraction,
+    ChatInputCommandInteraction,
     MentionableSelectMenuInteraction,
     MessageContextMenuCommandInteraction,
     ModalSubmitInteraction,
@@ -31,6 +31,7 @@ import type {
     UserContextMenuCommandInteraction,
     UserSelectMenuInteraction,
 } from 'discord.js';
+import { Result } from '../core/structures/result';
 
 export type PluginResult = Awaitable<Result<Record<string,unknown>|undefined, string|undefined>>;
 export interface InitArgs<T extends Processed<Module> = Processed<Module>> {
@@ -56,8 +57,8 @@ export type AnyPlugin = ControlPlugin | InitPlugin<[InitArgs<Processed<Module>>]
 export type CommandArgs<I extends CommandType = CommandType> = CommandArgsMatrix[I]
 
 interface CommandArgsMatrix {
-    [CommandType.Text]: [Context, SDT];
-    [CommandType.Slash]: [Context, SDT];
+    [CommandType.Text]: [Context & { get options(): string[]}, SDT];
+    [CommandType.Slash]: [Context  & { get options(): ChatInputCommandInteraction['options']}, SDT];
     [CommandType.Both]: [Context, SDT];
     [CommandType.CtxMsg]: [MessageContextMenuCommandInteraction, SDT];
     [CommandType.CtxUser]: [UserContextMenuCommandInteraction, SDT];

src/types/utility.ts

@@ -1,6 +1,6 @@
 import type { InteractionReplyOptions, MessageReplyOptions } from 'discord.js';
 import type { Module } from './core-modules';
-import type { Result } from 'ts-results-es';
+import type { Result } from '../core/structures/result';
 
 export type Awaitable<T> = PromiseLike<T> | T;
 

test/handlers.test.ts

@@ -120,13 +120,6 @@ test('init plugins replace array', async () => {
     expect(['a']).deep.equal(s.opts)
 })
 
-test('call control plugin ', async () => {
-    const plugin = CommandControlPlugin<CommandType.Slash>((ctx,sdt) => {
-        return controller.next();
-    });
-    const res = await plugin.execute(new ChatInputCommandInteraction(), {})
-    expect(res.isOk()).toBe(true)
-})
 
 test('form sdt', async () => {
 

yarn.lock

@@ -557,7 +557,6 @@ __metadata:
     discord.js: ^14.15.3
     eslint: 8.39.0
     rxjs: ^7.8.0
-    ts-results-es: ^4.1.0
     typescript: 5.0.2
     vitest: ^1.6.0
   languageName: unknown
@@ -2959,13 +2958,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-results-es@npm:^4.1.0":
-  version: 4.2.0
-  resolution: "ts-results-es@npm:4.2.0"
-  checksum: ff475c2f6d44377e0204211e6eafdbcabddf3ad09d40540ad5dee3d817eefbd48c07a21f5ad86864ef82cd8a5542a266af9dd8dd4d58d4766fdd6e79370519bb
-  languageName: node
-  linkType: hard
-
 "tslib@npm:2.6.2":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"