Improve the construction of WS context

moleculerjs · Jun 4, 2020 · e50dafa · e50dafa
1 parent 566371f
commit e50dafa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/service.js b/src/service.js
@@ -39,9 +39,12 @@ module.exports = function(mixinOptions) {
 				},
 				handler(ctx) {
 					const { socket, connectionParams } = ctx.params;
-					socket.$ctx = ctx;
-					socket.$params = { body: connectionParams, query: socket.upgradeReq.query };
-					return connectionParams;
+					return {
+						$ctx: ctx,
+						$socket: socket,
+						$service: this,
+						$params: { body: connectionParams, query: socket.upgradeReq.query },
+					};
 				},
 			},
 		},
@@ -619,11 +622,8 @@ module.exports = function(mixinOptions) {
 								dataLoaders: new Map(), // create an empty map to load DataLoader instances into
 							}),
 							subscriptions: {
-								onConnect: async (connectionParams, socket) => ({
-									...(await this.actions.ws({ connectionParams, socket })),
-									socket,
-									$service: this,
-								}),
+								onConnect: (connectionParams, socket) =>
+									this.actions.ws({ connectionParams, socket }),
 							},
 						}),
 					});

diff --git a/test/unit/service.spec.js b/test/unit/service.spec.js
@@ -1489,10 +1489,9 @@ describe("Test Service", () => {
 			const connect = await onConnect(connectionParams, socket);
 
 			expect(connect.$service).toEqual(svc);
-			expect(connect.b).toEqual(100);
-			expect(socket.$ctx).toBeDefined();
-			expect(socket.$params.body).toEqual(connectionParams);
-			expect(socket.$params.query).toEqual(socket.upgradeReq.query);
+			expect(connect.$ctx).toBeDefined();
+			expect(connect.$params.body).toEqual(connectionParams);
+			expect(connect.$params.query).toEqual(socket.upgradeReq.query);
 
 			await stop();
 		});