From df797666ecbd007ce100e4fdd2dd1cb84ecddec9 Mon Sep 17 00:00:00 2001 From: Andrey Platov Date: Wed, 4 Aug 2021 10:05:05 +0200 Subject: [PATCH] refactor `Request` Signed-off-by: Andrey Platov --- packages/platform/src/rpc.ts | 7 +------ server/server/src/__tests__/server.test.ts | 5 ++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/platform/src/rpc.ts b/packages/platform/src/rpc.ts index da39f36f11..c6b35666d5 100644 --- a/packages/platform/src/rpc.ts +++ b/packages/platform/src/rpc.ts @@ -24,15 +24,10 @@ export type ReqId = string | number /** * @public */ -export class Request

{ +export interface Request

{ id?: ReqId method: M params: P - - constructor (method: M, params: P, id?: ReqId) { - this.method = method - this.params = params - } } /** diff --git a/server/server/src/__tests__/server.test.ts b/server/server/src/__tests__/server.test.ts index e92e06b138..8291ba496d 100644 --- a/server/server/src/__tests__/server.test.ts +++ b/server/server/src/__tests__/server.test.ts @@ -14,7 +14,7 @@ // limitations under the License. // -import { Request, readResponse, serialize } from '@anticrm/platform' +import { readResponse, serialize } from '@anticrm/platform' import { start, _Token } from '../server' import { encode } from 'jwt-simple' import WebSocket from 'ws' @@ -43,7 +43,6 @@ describe('server', () => { it('should not connect to server without token', (done) => { const conn = new WebSocket('ws://localhost:3333/xyz') conn.on('error', () => { - console.log('error') conn.close() done() }) @@ -55,7 +54,7 @@ describe('server', () => { // const start = Date.now() conn.on('open', () => { for (let i = 0; i < total; i++) { - conn.send(serialize(new Request('ping', [], i))) + conn.send(serialize({ method: 'ping', params: [], id: i })) } }) let received = 0