@midwayjs/socketio 3.0.0-beta.3 → 3.0.0-beta.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,44 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ # [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * middleware with ctx.body ([#1389](https://github.com/midwayjs/midway/issues/1389)) ([77af5c0](https://github.com/midwayjs/midway/commit/77af5c0b456f1843f4dcfd3dbfd2c0aa244c51bd))
12
+
13
+
14
+
15
+
16
+
17
+ # [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
18
+
19
+ **Note:** Version bump only for package @midwayjs/socketio
20
+
21
+
22
+
23
+
24
+
25
+ # [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
26
+
27
+ **Note:** Version bump only for package @midwayjs/socketio
28
+
29
+
30
+
31
+
32
+
33
+ # [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
34
+
35
+
36
+ ### Features
37
+
38
+ * add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55))
39
+
40
+
41
+
42
+
43
+
6
44
  # [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
7
45
 
8
46
 
@@ -1,7 +1,3 @@
1
- import { MidwaySocketIOFramework } from './framework';
2
1
  export declare class SocketIOConfiguration {
3
- framework: MidwaySocketIOFramework;
4
- onReady(): Promise<void>;
5
- onServerReady(): Promise<void>;
6
2
  }
7
3
  //# sourceMappingURL=configuration.d.ts.map
@@ -5,23 +5,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
5
5
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
8
  Object.defineProperty(exports, "__esModule", { value: true });
12
9
  exports.SocketIOConfiguration = void 0;
13
10
  const decorator_1 = require("@midwayjs/decorator");
14
- const framework_1 = require("./framework");
15
11
  let SocketIOConfiguration = class SocketIOConfiguration {
16
- async onReady() { }
17
- async onServerReady() {
18
- await this.framework.run();
19
- }
20
12
  };
21
- __decorate([
22
- (0, decorator_1.Inject)(),
23
- __metadata("design:type", framework_1.MidwaySocketIOFramework)
24
- ], SocketIOConfiguration.prototype, "framework", void 0);
25
13
  SocketIOConfiguration = __decorate([
26
14
  (0, decorator_1.Configuration)({
27
15
  namespace: 'socketIO',
package/dist/framework.js CHANGED
@@ -93,14 +93,11 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
93
93
  // on user custom event
94
94
  socket.on(wsEventInfo.messageEventName, async (...args) => {
95
95
  debug('got message', wsEventInfo.messageEventName, args);
96
- const { result, error } = await (await this.getMiddleware(async (ctx, next) => {
97
- // eslint-disable-next-line prefer-spread
98
- return controller[wsEventInfo.propertyName].apply(controller, args);
99
- }))(socket);
100
- if (error) {
101
- this.logger.error(error);
102
- }
103
- else {
96
+ try {
97
+ const result = await (await this.getMiddleware(async (ctx, next) => {
98
+ // eslint-disable-next-line prefer-spread
99
+ return controller[wsEventInfo.propertyName].apply(controller, args);
100
+ }))(socket);
104
101
  if (typeof args[args.length - 1] === 'function') {
105
102
  // ack
106
103
  args[args.length - 1](result);
@@ -110,6 +107,9 @@ let MidwaySocketIOFramework = class MidwaySocketIOFramework extends core_1.BaseF
110
107
  await this.bindSocketResponse(result, socket, wsEventInfo.propertyName, methodMap);
111
108
  }
112
109
  }
110
+ catch (error) {
111
+ this.logger.error(error);
112
+ }
113
113
  });
114
114
  }
115
115
  else if (wsEventInfo.eventType === decorator_1.WSEventTypeEnum.ON_DISCONNECTION) {
@@ -1,5 +1,5 @@
1
1
  import * as SocketIO from 'socket.io';
2
- import { IConfigurationOptions, IMidwayApplication, IMidwayContext } from '@midwayjs/core';
2
+ import { IConfigurationOptions, IMidwayApplication, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core';
3
3
  export declare type IMidwaySocketIOApplication = IMidwayApplication<IMidwaySocketIOContext, {
4
4
  use(fn: (socket: IMidwaySocketIOContext, fn: (err?: any) => void) => void): SocketIO.Namespace;
5
5
  } & SocketIO.Server>;
@@ -14,6 +14,7 @@ export declare type IMidwaySocketIOContext = IMidwayContext<SocketIO.Socket & {
14
14
  export declare type Application = IMidwaySocketIOApplication;
15
15
  export interface Context extends IMidwaySocketIOContext {
16
16
  }
17
+ export declare type NextFunction = BaseNextFunction;
17
18
  declare module '@midwayjs/core/dist/interface' {
18
19
  interface MidwayConfig {
19
20
  socketIO?: IMidwaySocketIOConfigurationOptions;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@midwayjs/socketio",
3
- "version": "3.0.0-beta.3",
3
+ "version": "3.0.0-beta.7",
4
4
  "description": "Midway Web Framework for socket.io",
5
5
  "main": "dist/index",
6
6
  "typings": "dist/index.d.ts",
@@ -23,15 +23,15 @@
23
23
  ],
24
24
  "license": "MIT",
25
25
  "devDependencies": {
26
- "@midwayjs/decorator": "^3.0.0-beta.3",
27
- "@midwayjs/mock": "^3.0.0-beta.3",
26
+ "@midwayjs/decorator": "^3.0.0-beta.7",
27
+ "@midwayjs/mock": "^3.0.0-beta.7",
28
28
  "@types/socket.io-client": "^1.4.36",
29
29
  "fs-extra": "^8.0.1",
30
30
  "socket.io-client": "^4.0.0"
31
31
  },
32
32
  "dependencies": {
33
- "@midwayjs/core": "^3.0.0-beta.3",
34
- "@midwayjs/logger": "^3.0.0-beta.3",
33
+ "@midwayjs/core": "^3.0.0-beta.7",
34
+ "@midwayjs/logger": "^3.0.0-beta.7",
35
35
  "socket.io": "^4.0.0",
36
36
  "socket.io-redis": "^6.1.0"
37
37
  },
@@ -43,5 +43,5 @@
43
43
  "engines": {
44
44
  "node": ">=12"
45
45
  },
46
- "gitHead": "a46b7f83d1cb161ec312f2892a9b33ff2d290d7e"
46
+ "gitHead": "24590729121d9110e2d960db5b5e587cf55a1efc"
47
47
  }