moost 0.3.44 → 0.4.0

package/dist/index.cjs

@@ -4,11 +4,11 @@ var eventCore = require('@wooksjs/event-core');
 var infact$1 = require('@prostojs/infact');
 var mate$1 = require('@prostojs/mate');
 var logger = require('@prostojs/logger');
+var hookable = require('hookable');
 
-async function runPipes(pipes, initialValue, metas, level, restoreCtx) {
+async function runPipes(pipes, initialValue, metas, level) {
     let v = initialValue;
     for (const pipe of pipes) {
-        restoreCtx?.();
         v = await pipe.handler(v, metas, level);
     }
     return v;
@@ -83,13 +83,13 @@ function getNewMoostInfact() {
 }
 
 function setControllerContext(controller, method) {
-    const { store } = eventCore.useEventContext();
+    const { store } = eventCore.useAsyncEventContext();
     const { set } = store('controller');
     set('instance', controller);
     set('method', method);
 }
 function useControllerContext() {
-    const { store } = eventCore.useEventContext();
+    const { store } = eventCore.useAsyncEventContext();
     const { get } = store('controller');
     const getController = () => get('instance');
     const getMethod = () => get('method');
@@ -120,13 +120,11 @@ function registerEventScope(scopeId) {
 }
 function defineMoostEventHandler(options) {
     return async () => {
-        const { restoreCtx } = eventCore.useEventContext(options.contextType);
         const scopeId = eventCore.useEventId().getId();
         const logger = eventCore.useEventLogger(options.loggerTitle);
         const unscope = registerEventScope(scopeId);
         let response;
         const hookOptions = {
-            restoreCtx,
             scopeId,
             logger,
             unscope,
@@ -136,16 +134,13 @@ function defineMoostEventHandler(options) {
         };
         if (options.hooks?.init) {
             await options.hooks.init(hookOptions);
-            restoreCtx();
         }
         const instance = await options.getControllerInstance();
-        restoreCtx();
         if (instance) {
             setControllerContext(instance, options.controllerMethod || '');
         }
         const interceptorHandler = await options.getIterceptorHandler();
         if (interceptorHandler) {
-            restoreCtx();
             try {
                 response = await interceptorHandler.init();
                 if (response !== undefined) {
@@ -160,7 +155,6 @@ function defineMoostEventHandler(options) {
         }
         let args = [];
         if (options.resolveArgs) {
-            restoreCtx();
             try {
                 args = await options.resolveArgs();
             }
@@ -171,14 +165,12 @@ function defineMoostEventHandler(options) {
             }
         }
         if (interceptorHandler) {
-            restoreCtx();
             response = await interceptorHandler.fireBefore(response);
             if (response !== undefined) {
                 return endWithResponse();
             }
         }
         const callControllerMethod = () => {
-            restoreCtx();
             if (options.callControllerMethod) {
                 return options.callControllerMethod(args);
             }
@@ -198,7 +190,6 @@ function defineMoostEventHandler(options) {
         }
         async function endWithResponse(raise = false) {
             if (interceptorHandler) {
-                restoreCtx();
                 try {
                     response = await interceptorHandler.fireAfter(response);
                 }
@@ -264,16 +255,13 @@ function getDefaultLogger(topic) {
     }, topic);
 }
 
-async function getCallableFn(targetInstance, fn, restoreCtx, pipes, logger) {
+async function getCallableFn(targetInstance, fn, pipes, logger) {
     const mate = getMoostMate();
     const meta = mate.read(fn);
     if (meta?.injectable) {
         const infact = getMoostInfact();
         infact.silent(true);
         const instance = (await infact.getForInstance(targetInstance, fn, {
-            syncContextFn: () => {
-                restoreCtx();
-            },
             customData: {
                 pipes: [...(pipes || []), ...(meta.pipes || [])].sort((a, b) => a.priority - b.priority),
             },
@@ -302,9 +290,7 @@ class InterceptorHandler {
         this.responseOverwritten = true;
     }
     async init() {
-        const { restoreCtx } = eventCore.useEventContext();
         for (const handler of this.handlers) {
-            restoreCtx();
             const response = await handler(fn => {
                 this.before.push(fn);
             }, fn => {
@@ -318,10 +304,8 @@ class InterceptorHandler {
         }
     }
     async fireBefore(response) {
-        const { restoreCtx } = eventCore.useEventContext();
         this.response = response;
         for (const handler of this.before) {
-            restoreCtx();
             await handler(this.replyFn.bind(this));
             if (this.responseOverwritten) {
                 break;
@@ -330,17 +314,14 @@ class InterceptorHandler {
         return this.response;
     }
     async fireAfter(response) {
-        const { restoreCtx } = eventCore.useEventContext();
         this.response = response;
         if (response instanceof Error) {
             for (const handler of this.onError) {
-                restoreCtx();
                 await handler(response, this.replyFn.bind(this));
             }
         }
         else {
             for (const handler of this.after) {
-                restoreCtx();
                 await handler(response, this.replyFn.bind(this));
             }
         }
@@ -356,10 +337,8 @@ function getIterceptorHandlerFactory(interceptors, getTargetInstance, pipes, log
             const interceptorMeta = mate.read(handler);
             if (interceptorMeta?.injectable) {
                 interceptorHandlers.push(async (...args) => {
-                    const { restoreCtx } = eventCore.useEventContext();
                     const targetInstance = await getTargetInstance();
-                    restoreCtx();
-                    return (await getCallableFn(targetInstance, handler, restoreCtx, pipes, logger))(...args);
+                    return (await getCallableFn(targetInstance, handler, pipes, logger))(...args);
                 });
             }
             else {
@@ -412,7 +391,6 @@ async function bindControllerMethods(options) {
         }
         const resolveArgs = async () => {
             const args = [];
-            const { restoreCtx } = eventCore.useEventContext();
             for (const [i, { pipes, meta: paramMeta }] of argsPipes.entries()) {
                 args[i] = await runPipes(pipes, undefined, {
                     classMeta: meta,
@@ -422,7 +400,7 @@ async function bindControllerMethods(options) {
                     key: method,
                     index: i,
                     targetMeta: paramMeta,
-                }, 'PARAM', restoreCtx);
+                }, 'PARAM');
             }
             return args;
         };
@@ -645,8 +623,9 @@ const sharedPipes = [
     },
 ];
 
-class Moost {
+class Moost extends hookable.Hookable {
     constructor(options) {
+        super();
         this.options = options;
         this.pipes = Array.from(sharedPipes);
         this.interceptors = [];
@@ -660,6 +639,12 @@ class Moost {
         const mate = getMoostMate();
         Object.assign(mate, { logger: this.getLogger('mate') });
     }
+    _fireEventStart(source) {
+        this.callHook('event-start', source);
+    }
+    _fireEventEnd(source) {
+        this.callHook('event-end', source);
+    }
     getLogger(topic) {
         if (this.logger instanceof logger.ProstoLogger) {
             return this.logger.createTopic(topic);
@@ -718,12 +703,13 @@ class Moost {
         const infactOpts = { provide, replace, customData: { pipes } };
         if (isControllerConsructor &&
             (classMeta?.injectable === 'SINGLETON' || classMeta?.injectable === true)) {
-            eventCore.createEventContext({
+            await eventCore.createAsyncEventContext({
                 event: { type: 'init' },
                 options: {},
+            })(async () => {
+                setControllerContext(this, 'bindController');
+                instance = (await infact.get(controller, infactOpts));
             });
-            setControllerContext(this, 'bindController');
-            instance = (await infact.get(controller, infactOpts));
         }
         else if (!isControllerConsructor) {
             instance = controller;
@@ -733,10 +719,8 @@ class Moost {
             ? () => Promise.resolve(instance)
             : async () => {
                 infact.silent(true);
-                const { restoreCtx } = eventCore.useEventContext();
                 const instance = (await infact.get(controller, {
                     ...infactOpts,
-                    syncContextFn: restoreCtx,
                 }));
                 infact.silent(false);
                 return instance;
@@ -839,9 +823,13 @@ Object.defineProperty(exports, "EventLogger", {
   enumerable: true,
   get: function () { return eventCore.EventLogger; }
 });
-Object.defineProperty(exports, "useEventContext", {
+Object.defineProperty(exports, "eventContextHooks", {
+  enumerable: true,
+  get: function () { return eventCore.eventContextHooks; }
+});
+Object.defineProperty(exports, "useAsyncEventContext", {
   enumerable: true,
-  get: function () { return eventCore.useEventContext; }
+  get: function () { return eventCore.useAsyncEventContext; }
 });
 Object.defineProperty(exports, "useEventLogger", {
   enumerable: true,

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 import { useEventLogger } from '@wooksjs/event-core';
-export { EventLogger, THook, useEventContext, useEventLogger } from '@wooksjs/event-core';
+export { EventLogger, THook, eventContextHooks, useAsyncEventContext, useEventLogger } from '@wooksjs/event-core';
 import { TProvideRegistry, Infact, TReplaceRegistry, TProvideFn } from '@prostojs/infact';
 export { TProvideRegistry, createProvideRegistry, createReplaceRegistry } from '@prostojs/infact';
 import { TConsoleBase } from '@prostojs/logger';
+import { Hookable } from 'hookable';
 import * as _prostojs_mate from '@prostojs/mate';
 import { TMateParamMeta, Mate } from '@prostojs/mate';
 export { getConstructor, isConstructor } from '@prostojs/mate';
@@ -332,7 +333,6 @@ declare class InterceptorHandler {
 }
 
 interface TMoostEventHandlerHookOptions<T> {
-    restoreCtx: () => void;
     scopeId: string;
     logger: ReturnType<typeof useEventLogger>;
     unscope: () => void;
@@ -437,7 +437,7 @@ interface TMoostOptions {
  * │  app.init()
  * ```
  */
-declare class Moost {
+declare class Moost extends Hookable {
     protected options?: TMoostOptions | undefined;
     protected logger: TConsoleBase;
     protected pipes: TPipeData[];
@@ -448,6 +448,8 @@ declare class Moost {
     protected replace: TReplaceRegistry;
     protected unregisteredControllers: Array<TObject | TFunction | [string, TObject | TFunction]>;
     constructor(options?: TMoostOptions | undefined);
+    _fireEventStart(source: TMoostAdapter<unknown>): void;
+    _fireEventEnd(source: TMoostAdapter<unknown>): void;
     /**
      * ### getLogger
      * Provides application logger
@@ -510,6 +512,7 @@ interface TMoostAdapterOptions<H, T> {
     register: (handler: TMoostHandler<TEmpty>, path: string, args: string[]) => void;
 }
 interface TMoostAdapter<H> {
+    name: string;
     bindHandler: <T extends TObject = TObject>(options: TMoostAdapterOptions<H, T>) => void | Promise<void>;
     onInit?: (moost: Moost) => void | Promise<void>;
     getProvideRegistry?: () => TProvideRegistry;

package/dist/index.mjs

@@ -1,15 +1,15 @@
-import { useEventId, useEventContext, useEventLogger, useRouteParams, createEventContext } from '@wooksjs/event-core';
-export { EventLogger, useEventContext, useEventLogger } from '@wooksjs/event-core';
+import { useEventId, useAsyncEventContext, useEventLogger, useRouteParams, createAsyncEventContext } from '@wooksjs/event-core';
+export { EventLogger, eventContextHooks, useAsyncEventContext, useEventLogger } from '@wooksjs/event-core';
 import { Infact, createProvideRegistry, createReplaceRegistry } from '@prostojs/infact';
 export { createProvideRegistry, createReplaceRegistry } from '@prostojs/infact';
 import { Mate, getConstructor, isConstructor } from '@prostojs/mate';
 export { getConstructor, isConstructor } from '@prostojs/mate';
 import { ProstoLogger, createConsoleTransort, coloredConsole } from '@prostojs/logger';
+import { Hookable } from 'hookable';
 
-async function runPipes(pipes, initialValue, metas, level, restoreCtx) {
+async function runPipes(pipes, initialValue, metas, level) {
     let v = initialValue;
     for (const pipe of pipes) {
-        restoreCtx?.();
         v = await pipe.handler(v, metas, level);
     }
     return v;
@@ -84,13 +84,13 @@ function getNewMoostInfact() {
 }
 
 function setControllerContext(controller, method) {
-    const { store } = useEventContext();
+    const { store } = useAsyncEventContext();
     const { set } = store('controller');
     set('instance', controller);
     set('method', method);
 }
 function useControllerContext() {
-    const { store } = useEventContext();
+    const { store } = useAsyncEventContext();
     const { get } = store('controller');
     const getController = () => get('instance');
     const getMethod = () => get('method');
@@ -121,13 +121,11 @@ function registerEventScope(scopeId) {
 }
 function defineMoostEventHandler(options) {
     return async () => {
-        const { restoreCtx } = useEventContext(options.contextType);
         const scopeId = useEventId().getId();
         const logger = useEventLogger(options.loggerTitle);
         const unscope = registerEventScope(scopeId);
         let response;
         const hookOptions = {
-            restoreCtx,
             scopeId,
             logger,
             unscope,
@@ -137,16 +135,13 @@ function defineMoostEventHandler(options) {
         };
         if (options.hooks?.init) {
             await options.hooks.init(hookOptions);
-            restoreCtx();
         }
         const instance = await options.getControllerInstance();
-        restoreCtx();
         if (instance) {
             setControllerContext(instance, options.controllerMethod || '');
         }
         const interceptorHandler = await options.getIterceptorHandler();
         if (interceptorHandler) {
-            restoreCtx();
             try {
                 response = await interceptorHandler.init();
                 if (response !== undefined) {
@@ -161,7 +156,6 @@ function defineMoostEventHandler(options) {
         }
         let args = [];
         if (options.resolveArgs) {
-            restoreCtx();
             try {
                 args = await options.resolveArgs();
             }
@@ -172,14 +166,12 @@ function defineMoostEventHandler(options) {
             }
         }
         if (interceptorHandler) {
-            restoreCtx();
             response = await interceptorHandler.fireBefore(response);
             if (response !== undefined) {
                 return endWithResponse();
             }
         }
         const callControllerMethod = () => {
-            restoreCtx();
             if (options.callControllerMethod) {
                 return options.callControllerMethod(args);
             }
@@ -199,7 +191,6 @@ function defineMoostEventHandler(options) {
         }
         async function endWithResponse(raise = false) {
             if (interceptorHandler) {
-                restoreCtx();
                 try {
                     response = await interceptorHandler.fireAfter(response);
                 }
@@ -265,16 +256,13 @@ function getDefaultLogger(topic) {
     }, topic);
 }
 
-async function getCallableFn(targetInstance, fn, restoreCtx, pipes, logger) {
+async function getCallableFn(targetInstance, fn, pipes, logger) {
     const mate = getMoostMate();
     const meta = mate.read(fn);
     if (meta?.injectable) {
         const infact = getMoostInfact();
         infact.silent(true);
         const instance = (await infact.getForInstance(targetInstance, fn, {
-            syncContextFn: () => {
-                restoreCtx();
-            },
             customData: {
                 pipes: [...(pipes || []), ...(meta.pipes || [])].sort((a, b) => a.priority - b.priority),
             },
@@ -303,9 +291,7 @@ class InterceptorHandler {
         this.responseOverwritten = true;
     }
     async init() {
-        const { restoreCtx } = useEventContext();
         for (const handler of this.handlers) {
-            restoreCtx();
             const response = await handler(fn => {
                 this.before.push(fn);
             }, fn => {
@@ -319,10 +305,8 @@ class InterceptorHandler {
         }
     }
     async fireBefore(response) {
-        const { restoreCtx } = useEventContext();
         this.response = response;
         for (const handler of this.before) {
-            restoreCtx();
             await handler(this.replyFn.bind(this));
             if (this.responseOverwritten) {
                 break;
@@ -331,17 +315,14 @@ class InterceptorHandler {
         return this.response;
     }
     async fireAfter(response) {
-        const { restoreCtx } = useEventContext();
         this.response = response;
         if (response instanceof Error) {
             for (const handler of this.onError) {
-                restoreCtx();
                 await handler(response, this.replyFn.bind(this));
             }
         }
         else {
             for (const handler of this.after) {
-                restoreCtx();
                 await handler(response, this.replyFn.bind(this));
             }
         }
@@ -357,10 +338,8 @@ function getIterceptorHandlerFactory(interceptors, getTargetInstance, pipes, log
             const interceptorMeta = mate.read(handler);
             if (interceptorMeta?.injectable) {
                 interceptorHandlers.push(async (...args) => {
-                    const { restoreCtx } = useEventContext();
                     const targetInstance = await getTargetInstance();
-                    restoreCtx();
-                    return (await getCallableFn(targetInstance, handler, restoreCtx, pipes, logger))(...args);
+                    return (await getCallableFn(targetInstance, handler, pipes, logger))(...args);
                 });
             }
             else {
@@ -413,7 +392,6 @@ async function bindControllerMethods(options) {
         }
         const resolveArgs = async () => {
             const args = [];
-            const { restoreCtx } = useEventContext();
             for (const [i, { pipes, meta: paramMeta }] of argsPipes.entries()) {
                 args[i] = await runPipes(pipes, undefined, {
                     classMeta: meta,
@@ -423,7 +401,7 @@ async function bindControllerMethods(options) {
                     key: method,
                     index: i,
                     targetMeta: paramMeta,
-                }, 'PARAM', restoreCtx);
+                }, 'PARAM');
             }
             return args;
         };
@@ -646,8 +624,9 @@ const sharedPipes = [
     },
 ];
 
-class Moost {
+class Moost extends Hookable {
     constructor(options) {
+        super();
         this.options = options;
         this.pipes = Array.from(sharedPipes);
         this.interceptors = [];
@@ -661,6 +640,12 @@ class Moost {
         const mate = getMoostMate();
         Object.assign(mate, { logger: this.getLogger('mate') });
     }
+    _fireEventStart(source) {
+        this.callHook('event-start', source);
+    }
+    _fireEventEnd(source) {
+        this.callHook('event-end', source);
+    }
     getLogger(topic) {
         if (this.logger instanceof ProstoLogger) {
             return this.logger.createTopic(topic);
@@ -719,12 +704,13 @@ class Moost {
         const infactOpts = { provide, replace, customData: { pipes } };
         if (isControllerConsructor &&
             (classMeta?.injectable === 'SINGLETON' || classMeta?.injectable === true)) {
-            createEventContext({
+            await createAsyncEventContext({
                 event: { type: 'init' },
                 options: {},
+            })(async () => {
+                setControllerContext(this, 'bindController');
+                instance = (await infact.get(controller, infactOpts));
             });
-            setControllerContext(this, 'bindController');
-            instance = (await infact.get(controller, infactOpts));
         }
         else if (!isControllerConsructor) {
             instance = controller;
@@ -734,10 +720,8 @@ class Moost {
             ? () => Promise.resolve(instance)
             : async () => {
                 infact.silent(true);
-                const { restoreCtx } = useEventContext();
                 const instance = (await infact.get(controller, {
                     ...infactOpts,
-                    syncContextFn: restoreCtx,
                 }));
                 infact.silent(false);
                 return instance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.3.44",
+  "version": "0.4.0",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -34,8 +34,9 @@
     "@prostojs/infact": "^0.2.3",
     "@prostojs/mate": "^0.3.2",
     "@prostojs/logger": "^0.4.0",
-    "@wooksjs/event-core": "^0.4.35",
-    "wooks": "^0.4.35"
+    "@wooksjs/event-core": "^0.5.0",
+    "hookable": "^5.5.3",
+    "wooks": "^0.5.0"
   },
   "author": "Artem Maltsev",
   "license": "MIT",