@midwayjs/web 3.10.7 → 3.10.10

package/dist/base.js

@@ -10,6 +10,7 @@ const router_1 = require("@eggjs/router");
 const util_1 = require("util");
 const lifecycle_1 = require("./framework/lifecycle");
 const web_1 = require("./framework/web");
+const interface_1 = require("./interface");
 const ROUTER = Symbol('EggCore#router');
 const EGG_LOADER = Symbol.for('egg#loader');
 const EGG_PATH = Symbol.for('egg#eggPath');
@@ -236,6 +237,11 @@ const createAgentWorkerLoader = () => {
                 debug('[egg]: start "initializeAgentApplicationContext"');
                 await (0, utils_1.initializeAgentApplicationContext)(this.app);
                 super.load();
+                debug('[egg]: start runAgent decorator');
+                const runInAgentModules = (0, core_1.listModule)(interface_1.RUN_IN_AGENT_KEY);
+                for (const module of runInAgentModules) {
+                    await this.app.applicationContext.getAsync(module);
+                }
                 debug('[egg]: agent load run complete');
             });
         }

package/dist/decorator.d.ts

@@ -0,0 +1,3 @@
+export declare function AgentApp(): PropertyDecorator;
+export declare function RunInEggAgent(): ClassDecorator;
+//# sourceMappingURL=decorator.d.ts.map

package/dist/decorator.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RunInEggAgent = exports.AgentApp = void 0;
+const core_1 = require("@midwayjs/core");
+const interface_1 = require("./interface");
+function AgentApp() {
+    return (0, core_1.createCustomPropertyDecorator)(interface_1.EGG_AGENT_APP_KEY, {});
+}
+exports.AgentApp = AgentApp;
+function RunInEggAgent() {
+    return function (target) {
+        (0, core_1.saveModule)(interface_1.RUN_IN_AGENT_KEY, target);
+    };
+}
+exports.RunInEggAgent = RunInEggAgent;
+//# sourceMappingURL=decorator.js.map

package/dist/interface.d.ts

@@ -3,6 +3,8 @@ import { Context as EggContext, Application as EggApplication } from 'egg';
 import { IMidwayContainer, IMidwayContext, IMidwayApplication, IConfigurationOptions, NextFunction as BaseNextFunction } from '@midwayjs/core';
 import { DefaultState, Middleware } from 'koa';
 import { ILogger, LoggerOptions } from '@midwayjs/logger';
+export declare const RUN_IN_AGENT_KEY = "egg:run_in_agent";
+export declare const EGG_AGENT_APP_KEY = "egg_agent_app";
 export interface IMidwayWebBaseApplication {
     applicationContext: IMidwayContainer;
     getLogger(name?: string): ILogger;

package/dist/interface.js

@@ -1,3 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EGG_AGENT_APP_KEY = exports.RUN_IN_AGENT_KEY = void 0;
+exports.RUN_IN_AGENT_KEY = 'egg:run_in_agent';
+exports.EGG_AGENT_APP_KEY = 'egg_agent_app';
 //# sourceMappingURL=interface.js.map

package/dist/utils.js

@@ -8,6 +8,7 @@ const core_1 = require("@midwayjs/core");
 const core_2 = require("@midwayjs/core");
 const web_1 = require("./framework/web");
 const util_1 = require("util");
+const interface_1 = require("./interface");
 const debug = (0, util_1.debuglog)('midway:debug');
 function isTypeScriptEnvironment() {
     const TS_MODE_PROCESS_FLAG = process.env.MIDWAY_TS_MODE;
@@ -77,11 +78,15 @@ async function initializeAgentApplicationContext(agent) {
     agentFramework.loggerService = applicationContext.get(core_1.MidwayLoggerService);
     agentFramework.informationService = applicationContext.get(core_1.MidwayInformationService);
     agentFramework.overwriteApplication('agent');
+    // init decorator service
+    const decoratorService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayDecoratorService);
+    // register @Logger decorator handler
+    decoratorService.registerPropertyHandler(interface_1.EGG_AGENT_APP_KEY, (propertyName, meta) => {
+        return agent;
+    });
     if (process.env['EGG_CLUSTER_MODE'] === 'true') {
         // init aop support
         const aspectService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayAspectService);
-        // init decorator service
-        const decoratorService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayDecoratorService);
         const configService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayConfigService);
         const loggerService = (0, core_1.getCurrentApplicationContext)().get(core_1.MidwayLoggerService);
         // framework/config/plugin/logger/app decorator support

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/web",
-  "version": "3.10.7",
+  "version": "3.10.10",
   "description": "Midway Web Framework for Egg.js",
   "main": "dist/index",
   "typings": "index.d.ts",
@@ -29,7 +29,7 @@
   "license": "MIT",
   "devDependencies": {
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/mock": "^3.10.7",
+    "@midwayjs/mock": "^3.10.10",
     "dayjs": "1.11.7",
     "egg-logger": "2.9.1",
     "egg-mock": "4.2.1",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "@eggjs/router": "^2.0.0",
-    "@midwayjs/core": "^3.10.7",
+    "@midwayjs/core": "^3.10.10",
     "egg": "^2.28.0",
     "egg-cluster": "^1.27.1",
     "find-up": "5.0.0",
@@ -59,5 +59,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "63bb5a11574dc6cae158c5de51fa5c5d5d482545"
+  "gitHead": "93d333e82e75b6eb44ab83f74a378172508730d6"
 }