@wooksjs/event-core 0.5.5 → 0.5.7

package/dist/index.cjs

@@ -4,53 +4,19 @@ var crypto = require('crypto');
 var node_async_hooks = require('node:async_hooks');
 var logger = require('@prostojs/logger');
 
-class Hookable {
-    constructor() {
-        this.hooks = {};
-    }
-    hook(name, cb) {
-        if (!this.hooks[name]) {
-            this.hooks[name] = [];
-        }
-        this.hooks[name].push(cb);
-        return () => {
-            this.unhook(name, cb);
-        };
-    }
-    callHook(name, ...args) {
-        if (this.hooks[name]) {
-            for (const cb of this.hooks[name]) {
-                try {
-                    cb(...args);
-                }
-                catch (error) {
-                    console.error(`Error in hook ${name}:`, error);
-                }
-            }
-        }
-    }
-    unhook(name, cb) {
-        if (this.hooks[name]) {
-            this.hooks[name] = this.hooks[name].filter(hookCb => hookCb !== cb);
-        }
+class ContextInjector {
+    with(name, attributes, cb) {
+        const fn = typeof attributes === 'function' ? attributes : cb;
+        return fn();
     }
 }
-
-class EventContextHooks extends Hookable {
-    fireStartEvent(eventType) {
-        this.callHook('start-event', eventType);
-    }
-    fireEndEvent(eventType, abortReason) {
-        this.callHook('end-event', eventType, abortReason);
-    }
-    onStartEvent(cb) {
-        return this.hook('start-event', cb);
-    }
-    onEndEvent(cb) {
-        return this.hook('end-event', cb);
-    }
+let ci = new ContextInjector();
+function getContextInjector() {
+    return ci;
+}
+function replaceContextInjector(newCi) {
+    ci = newCi;
 }
-const eventContextHooks = new EventContextHooks();
 
 function attachHook(target, opts, name) {
     Object.defineProperty(target, name || 'value', {
@@ -63,40 +29,8 @@ function attachHook(target, opts, name) {
 const asyncStorage = new node_async_hooks.AsyncLocalStorage();
 function createAsyncEventContext(data) {
     const newContext = { ...data };
-    return (cb) => {
-        asyncStorage.run(newContext, () => {
-            eventContextHooks.fireStartEvent(newContext.event.type);
-        });
-        const result = asyncStorage.run(newContext, cb);
-        if (result instanceof Promise) {
-            result
-                .then(r => {
-                endEvent(r);
-                return r;
-            })
-                .catch(error => {
-                endEvent(error);
-            });
-        }
-        else {
-            endEvent(result);
-        }
-        function endEvent(output) {
-            if (!newContext._ended) {
-                if (output instanceof Error) {
-                    asyncStorage.run(newContext, () => {
-                        eventContextHooks.fireEndEvent(newContext.event.type, output.message);
-                    });
-                }
-                else {
-                    asyncStorage.run(newContext, () => {
-                        eventContextHooks.fireEndEvent(newContext.event.type);
-                    });
-                }
-            }
-        }
-        return result;
-    };
+    const ci = getContextInjector();
+    return (cb) => asyncStorage.run(newContext, () => ci.with(`${newContext.event.type} event`, cb));
 }
 function useAsyncEventContext(expectedTypes) {
     let cc = asyncStorage.getStore();
@@ -194,12 +128,6 @@ function _getCtxHelpers(cc) {
     const hasParentCtx = () => !!cc.parentCtx;
     return {
         getCtx,
-        endEvent: (abortReason) => {
-            if (cc && !cc._ended) {
-                cc._ended = true;
-                eventContextHooks.fireEndEvent(cc.event.type, abortReason);
-            }
-        },
         store,
         getStore: get,
         setStore: set,
@@ -266,11 +194,13 @@ function useRouteParams() {
     };
 }
 
+exports.ContextInjector = ContextInjector;
 exports.EventLogger = EventLogger;
 exports.asyncStorage = asyncStorage;
 exports.attachHook = attachHook;
 exports.createAsyncEventContext = createAsyncEventContext;
-exports.eventContextHooks = eventContextHooks;
+exports.getContextInjector = getContextInjector;
+exports.replaceContextInjector = replaceContextInjector;
 exports.useAsyncEventContext = useAsyncEventContext;
 exports.useEventId = useEventId;
 exports.useEventLogger = useEventLogger;

package/dist/index.d.ts

@@ -35,7 +35,6 @@ declare const asyncStorage: AsyncLocalStorage<unknown>;
 declare function createAsyncEventContext<S = TEmpty, EventTypeToCreate = TEmpty>(data: S & TGenericContextStore<EventTypeToCreate>): <T>(cb: (...a: any[]) => T) => T;
 declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTypes?: string | string[]): {
     getCtx: () => S & TGenericContextStore<EventType>;
-    endEvent: (abortReason?: string | undefined) => void;
     store: <K extends keyof S | keyof TGenericContextStore<EventType>>(key: K) => {
         value: (S & TGenericContextStore<EventType>)[K];
         hook: <K2 extends keyof Required<S & TGenericContextStore<EventType>>[K]>(key2: K2) => {
@@ -56,7 +55,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
     hasParentCtx: () => boolean;
     getParentCtx: <T2 = S & TGenericContextStore<EventType>>() => {
         getCtx: () => T2;
-        endEvent: (abortReason?: string | undefined) => void;
         store: <K_3 extends keyof T2>(key: K_3) => {
             value: T2[K_3];
             hook: <K2_6 extends keyof Required<T2>[K_3]>(key2: K2_6) => {
@@ -77,7 +75,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
         hasParentCtx: () => boolean;
         getParentCtx: <T2_1 = T2>() => {
             getCtx: () => T2_1;
-            endEvent: (abortReason?: string | undefined) => void;
             store: <K_6 extends keyof T2_1>(key: K_6) => {
                 value: T2_1[K_6];
                 hook: <K2_12 extends keyof Required<T2_1>[K_6]>(key2: K2_12) => {
@@ -98,7 +95,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
             hasParentCtx: () => boolean;
             getParentCtx: <T2_2 = T2_1>() => {
                 getCtx: () => T2_2;
-                endEvent: (abortReason?: string | undefined) => void;
                 store: <K_9 extends keyof T2_2>(key: K_9) => {
                     value: T2_2[K_9];
                     hook: <K2_18 extends keyof Required<T2_2>[K_9]>(key2: K2_18) => {
@@ -119,7 +115,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
                 hasParentCtx: () => boolean;
                 getParentCtx: <T2_3 = T2_2>() => {
                     getCtx: () => T2_3;
-                    endEvent: (abortReason?: string | undefined) => void;
                     store: <K_12 extends keyof T2_3>(key: K_12) => {
                         value: T2_3[K_12];
                         hook: <K2_24 extends keyof Required<T2_3>[K_12]>(key2: K2_24) => {
@@ -140,7 +135,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
                     hasParentCtx: () => boolean;
                     getParentCtx: <T2_4 = T2_3>() => {
                         getCtx: () => T2_4;
-                        endEvent: (abortReason?: string | undefined) => void;
                         store: <K_15 extends keyof T2_4>(key: K_15) => {
                             value: T2_4[K_15];
                             hook: <K2_30 extends keyof Required<T2_4>[K_15]>(key2: K2_30) => {
@@ -161,7 +155,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
                         hasParentCtx: () => boolean;
                         getParentCtx: <T2_5 = T2_4>() => {
                             getCtx: () => T2_5;
-                            endEvent: (abortReason?: string | undefined) => void;
                             store: <K_18 extends keyof T2_5>(key: K_18) => {
                                 value: T2_5[K_18];
                                 hook: <K2_36 extends keyof Required<T2_5>[K_18]>(key2: K2_36) => {
@@ -182,7 +175,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
                             hasParentCtx: () => boolean;
                             getParentCtx: <T2_6 = T2_5>() => {
                                 getCtx: () => T2_6;
-                                endEvent: (abortReason?: string | undefined) => void;
                                 store: <K_21 extends keyof T2_6>(key: K_21) => {
                                     value: T2_6[K_21];
                                     hook: <K2_42 extends keyof Required<T2_6>[K_21]>(key2: K2_42) => {
@@ -203,7 +195,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
                                 hasParentCtx: () => boolean;
                                 getParentCtx: <T2_7 = T2_6>() => {
                                     getCtx: () => T2_7;
-                                    endEvent: (abortReason?: string | undefined) => void;
                                     store: <K_24 extends keyof T2_7>(key: K_24) => {
                                         value: T2_7[K_24];
                                         hook: <K2_48 extends keyof Required<T2_7>[K_24]>(key2: K2_48) => {
@@ -224,7 +215,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
                                     hasParentCtx: () => boolean;
                                     getParentCtx: <T2_8 = T2_7>() => {
                                         getCtx: () => T2_8;
-                                        endEvent: (abortReason?: string | undefined) => void;
                                         store: <K_27 extends keyof T2_8>(key: K_27) => {
                                             value: T2_8[K_27];
                                             hook: <K2_54 extends keyof Required<T2_8>[K_27]>(key2: K2_54) => {
@@ -245,7 +235,6 @@ declare function useAsyncEventContext<S = TEmpty, EventType = TEmpty>(expectedTy
                                         hasParentCtx: () => boolean;
                                         getParentCtx: <T2_9 = T2_8>() => {
                                             getCtx: () => T2_9;
-                                            endEvent: (abortReason?: string | undefined) => void;
                                             store: <K_30 extends keyof T2_9>(key: K_30) => {
                                                 value: T2_9[K_30];
                                                 hook: <K2_60 extends keyof Required<T2_9>[K_30]>(key2: K2_60) => {
@@ -291,36 +280,19 @@ declare function useRouteParams<T extends object = Record<string, string | strin
     get: <K extends keyof T>(name: K) => T[K];
 };
 
-type HookCallback = (...args: any[]) => any;
-declare class Hookable {
-    private hooks;
-    /**
-     * Registers a callback to a specific hook name.
-     * @param name - The name of the hook.
-     * @param cb - The callback to register.
-     */
-    hook(name: string, cb: HookCallback): () => void;
-    /**
-     * Calls all callbacks registered to the specified hook name.
-     * @param name - The name of the hook.
-     * @param args - The arguments to pass to each callback.
-     */
-    callHook(name: string, ...args: any[]): void;
-    /**
-     * Unregisters a specific callback from a hook name.
-     * @param name - The name of the hook.
-     * @param cb - The callback to unregister.
-     */
-    unhook(name: string, cb: HookCallback): void;
-}
-
-declare class EventContextHooks extends Hookable {
-    fireStartEvent(eventType: string): void;
-    fireEndEvent(eventType: string, abortReason?: string): void;
-    onStartEvent(cb: (eventType: string) => void): () => void;
-    onEndEvent(cb: (eventType: string, abortReason?: string) => void): () => void;
+/**
+ * ContextInjector
+ *
+ * Provides a way to inject context
+ * Usefull when working with opentelemetry spans
+ */
+declare class ContextInjector {
+    with<T>(name: string, attributes: Record<string, string | number | boolean>, cb: TContextInjectorCallback<T>): T;
+    with<T>(name: string, cb: TContextInjectorCallback<T>): T;
 }
-declare const eventContextHooks: EventContextHooks;
+type TContextInjectorCallback<T> = () => T;
+declare function getContextInjector(): ContextInjector;
+declare function replaceContextInjector(newCi: ContextInjector): void;
 
 declare function attachHook<V = unknown, T extends object | Function = object, P extends PropertyKey = 'value'>(target: T, opts: {
     get: () => V | undefined;
@@ -330,4 +302,4 @@ type THook<T = string, K extends PropertyKey = 'value'> = {
     [key in K]: T;
 };
 
-export { EventLogger, type TEmpty, type TEventLoggerData, type TEventOptions, type TGenericContextStore, type TGenericEvent, type THook, asyncStorage, attachHook, createAsyncEventContext, eventContextHooks, useAsyncEventContext, useEventId, useEventLogger, useRouteParams };
+export { ContextInjector, EventLogger, type TEmpty, type TEventLoggerData, type TEventOptions, type TGenericContextStore, type TGenericEvent, type THook, asyncStorage, attachHook, createAsyncEventContext, getContextInjector, replaceContextInjector, useAsyncEventContext, useEventId, useEventLogger, useRouteParams };

package/dist/index.mjs

@@ -2,53 +2,19 @@ import { randomUUID } from 'crypto';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import { ProstoLogger, createConsoleTransort, coloredConsole } from '@prostojs/logger';
 
-class Hookable {
-    constructor() {
-        this.hooks = {};
-    }
-    hook(name, cb) {
-        if (!this.hooks[name]) {
-            this.hooks[name] = [];
-        }
-        this.hooks[name].push(cb);
-        return () => {
-            this.unhook(name, cb);
-        };
-    }
-    callHook(name, ...args) {
-        if (this.hooks[name]) {
-            for (const cb of this.hooks[name]) {
-                try {
-                    cb(...args);
-                }
-                catch (error) {
-                    console.error(`Error in hook ${name}:`, error);
-                }
-            }
-        }
-    }
-    unhook(name, cb) {
-        if (this.hooks[name]) {
-            this.hooks[name] = this.hooks[name].filter(hookCb => hookCb !== cb);
-        }
+class ContextInjector {
+    with(name, attributes, cb) {
+        const fn = typeof attributes === 'function' ? attributes : cb;
+        return fn();
     }
 }
-
-class EventContextHooks extends Hookable {
-    fireStartEvent(eventType) {
-        this.callHook('start-event', eventType);
-    }
-    fireEndEvent(eventType, abortReason) {
-        this.callHook('end-event', eventType, abortReason);
-    }
-    onStartEvent(cb) {
-        return this.hook('start-event', cb);
-    }
-    onEndEvent(cb) {
-        return this.hook('end-event', cb);
-    }
+let ci = new ContextInjector();
+function getContextInjector() {
+    return ci;
+}
+function replaceContextInjector(newCi) {
+    ci = newCi;
 }
-const eventContextHooks = new EventContextHooks();
 
 function attachHook(target, opts, name) {
     Object.defineProperty(target, name || 'value', {
@@ -61,40 +27,8 @@ function attachHook(target, opts, name) {
 const asyncStorage = new AsyncLocalStorage();
 function createAsyncEventContext(data) {
     const newContext = { ...data };
-    return (cb) => {
-        asyncStorage.run(newContext, () => {
-            eventContextHooks.fireStartEvent(newContext.event.type);
-        });
-        const result = asyncStorage.run(newContext, cb);
-        if (result instanceof Promise) {
-            result
-                .then(r => {
-                endEvent(r);
-                return r;
-            })
-                .catch(error => {
-                endEvent(error);
-            });
-        }
-        else {
-            endEvent(result);
-        }
-        function endEvent(output) {
-            if (!newContext._ended) {
-                if (output instanceof Error) {
-                    asyncStorage.run(newContext, () => {
-                        eventContextHooks.fireEndEvent(newContext.event.type, output.message);
-                    });
-                }
-                else {
-                    asyncStorage.run(newContext, () => {
-                        eventContextHooks.fireEndEvent(newContext.event.type);
-                    });
-                }
-            }
-        }
-        return result;
-    };
+    const ci = getContextInjector();
+    return (cb) => asyncStorage.run(newContext, () => ci.with(`${newContext.event.type} event`, cb));
 }
 function useAsyncEventContext(expectedTypes) {
     let cc = asyncStorage.getStore();
@@ -192,12 +126,6 @@ function _getCtxHelpers(cc) {
     const hasParentCtx = () => !!cc.parentCtx;
     return {
         getCtx,
-        endEvent: (abortReason) => {
-            if (cc && !cc._ended) {
-                cc._ended = true;
-                eventContextHooks.fireEndEvent(cc.event.type, abortReason);
-            }
-        },
         store,
         getStore: get,
         setStore: set,
@@ -264,4 +192,4 @@ function useRouteParams() {
     };
 }
 
-export { EventLogger, asyncStorage, attachHook, createAsyncEventContext, eventContextHooks, useAsyncEventContext, useEventId, useEventLogger, useRouteParams };
+export { ContextInjector, EventLogger, asyncStorage, attachHook, createAsyncEventContext, getContextInjector, replaceContextInjector, useAsyncEventContext, useEventId, useEventLogger, useRouteParams };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-core",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "description": "@wooksjs/event-core",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",