fix: decorator manager singleton (#1211)

* fix: decorator manager singleton * fix: ws typings
midwayjs · Aug 7, 2021 · 7e9150e · 7e9150e
1 parent 7d978a2
commit 7e9150e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/decorator/src/common/decoratorManager.ts b/packages/decorator/src/common/decoratorManager.ts
@@ -390,11 +390,12 @@ export class DecoratorManager extends Map {
   }
 }
 
-const manager = new DecoratorManager();
+let manager = new DecoratorManager();
 if (global['MIDWAY_GLOBAL_DECORATOR_MANAGER']) {
   console.warn(
     'DecoratorManager not singleton and please check @midwayjs/decorator version by "npm ls @midwayjs/decorator"'
   );
+  manager = global['MIDWAY_GLOBAL_DECORATOR_MANAGER'];
 } else {
   global['MIDWAY_GLOBAL_DECORATOR_MANAGER'] = manager;
 }

diff --git a/packages/ws/src/framework.ts b/packages/ws/src/framework.ts
@@ -54,7 +54,7 @@ export class MidwayWSFramework extends BaseFramework<
     }
 
     server.on('upgrade', (request, socket, head) => {
-      this.app.handleUpgrade(request, socket, head, ws => {
+      this.app.handleUpgrade(request, socket as any, head, ws => {
         this.app.emit('connection', ws, request);
       });
     });