Merge branch 'hotfix/v1.0.3'

yc-server · Apr 22, 2018 · 1c90b09 · 1c90b09
2 parents 2a40cf3 + a0f6658
commit 1c90b09
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ycs-plugin-mosca",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "ycs-plugin-mosca",
   "license": "MIT",
   "repository": "https://github.com/yc-server/ycs-plugin-mosca.git",
@@ -36,7 +36,8 @@
   "devDependencies": {
     "@types/jest": "^20.0.5",
     "@types/node": "^8.0.0",
-    "@ycs/core": "^0.1.12",
+    "@types/socket.io": "^1.4.33",
+    "@ycs/core": "^1.0.5",
     "colors": "^1.1.2",
     "coveralls": "^2.0.0",
     "jest": "^20.0.4",

diff --git a/src/setup.ts b/src/setup.ts
@@ -1,4 +1,5 @@
 import { Ycs } from '@ycs/core';
+import { preListenActions } from '@ycs/core/lib/http';
 import { Router } from '@ycs/core/lib/routers';
 import * as colors from 'colors/safe';
 import * as koa from 'koa';
@@ -38,6 +39,9 @@ function setupMosca(app: Ycs, config: IConfig) {
         new koa().use(serve(path.dirname(require.resolve('mosca')) + '/public'))
       )
     );
+    preListenActions.push(httpServer => {
+      serve.attachHttpServer(httpServer);
+    });
   } else {
     server = new mosca.Server({
       port: config.port,