fix: beginModuleScope should be reentrant (#86)

eggjs · Jan 29, 2023 · 648aeaf · 648aeaf
1 parent 4e5f026
commit 648aeaf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/plugin/tegg/lib/ctx_lifecycle_middleware.ts b/plugin/tegg/lib/ctx_lifecycle_middleware.ts
@@ -1,8 +1,14 @@
 import { TEggPluginContext } from '../app/extend/context';
 import { EggContextImpl } from './EggContextImpl';
-import { ROOT_PROTO } from '@eggjs/egg-module-common';
+import { ROOT_PROTO, TEGG_CONTEXT } from '@eggjs/egg-module-common';
 
 export default async function ctxLifecycleMiddleware(ctx: TEggPluginContext, next) {
+  // should not recreate teggContext
+  if (ctx[TEGG_CONTEXT]) {
+    await next();
+    return;
+  }
+
   const lifecycle = {};
 
   const teggCtx = new EggContextImpl(ctx);

diff --git a/plugin/tegg/test/app/extend/context.test.ts b/plugin/tegg/test/app/extend/context.test.ts
@@ -39,4 +39,15 @@ describe('test/app/extend/context.test.ts', () => {
       });
     });
   });
+
+  describe('beginModuleScope', () => {
+    it('should be reentrant', async () => {
+      await app.mockModuleContextScope(async ctx => {
+        await ctx.beginModuleScope(async () => {
+          // ...do nothing
+        });
+        assert(ctx.teggContext.destroyed === false);
+      });
+    });
+  });
 });