@opensumi/ide-connection 2.18.10 → 2.18.11-next-1657791786.0
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/README.md +36 -42
- package/lib/browser/ws-channel-handler.d.ts +3 -3
- package/lib/browser/ws-channel-handler.d.ts.map +1 -1
- package/lib/browser/ws-channel-handler.js +3 -6
- package/lib/browser/ws-channel-handler.js.map +1 -1
- package/lib/node/common-channel-handler.d.ts +4 -3
- package/lib/node/common-channel-handler.d.ts.map +1 -1
- package/lib/node/common-channel-handler.js +4 -3
- package/lib/node/common-channel-handler.js.map +1 -1
- package/lib/node/ws.d.ts +9 -2
- package/lib/node/ws.d.ts.map +1 -1
- package/lib/node/ws.js.map +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -2,22 +2,22 @@
|
|
|
2
2
|
|
|
3
3
|
基于 jsonrpc 完成多端远程调用场景，兼容 lsp 等通信方式
|
|
4
4
|
|
|
5
|
-
|
|
6
5
|
### opensumi 中使用
|
|
7
6
|
|
|
8
7
|
**准备**
|
|
8
|
+
|
|
9
9
|
1. 框架中服务分为运行在浏览器环境的 前端服务(frontService) 与运行在 node 环境的 后端服务(backService)，服务在两端的实现方式是一致的
|
|
10
10
|
2. 目前在 `tools/dev-tool` 中的启动逻辑中完成了服务的注册和获取逻辑，在具体功能模块中无需关心具体的通信注册获取逻辑
|
|
11
11
|
|
|
12
|
-
**后端服务(backService)**
|
|
13
|
-
后端服务(backService) 即在 Web Server 暴露的能力，类似 web 应用框架中 controller提供的请求响应逻辑
|
|
12
|
+
**后端服务(backService)** 后端服务(backService) 即在 Web Server 暴露的能力，类似 web 应用框架中 controller 提供的请求响应逻辑
|
|
14
13
|
|
|
15
14
|
1. 注册服务
|
|
16
15
|
|
|
17
16
|
`packages/file-service/src/node/index.ts`
|
|
17
|
+
|
|
18
18
|
```javascript
|
|
19
19
|
import { FileSystemNodeOptions, FileService } from './file-service';
|
|
20
|
-
import {servicePath} from '../common/index';
|
|
20
|
+
import { servicePath } from '../common/index';
|
|
21
21
|
|
|
22
22
|
export class FileServiceModule extends NodeModule {
|
|
23
23
|
providers = [{ token: 'FileServiceOptions', useValue: FileSystemNodeOptions.DEFAULT }];
|
|
@@ -36,26 +36,25 @@ export class FileServiceModule extends NodeModule {
|
|
|
36
36
|
2. 服务调用
|
|
37
37
|
|
|
38
38
|
`packages/file-tree/src/browser/index.ts`
|
|
39
|
-
```javascript
|
|
40
39
|
|
|
41
|
-
|
|
40
|
+
```javascript
|
|
41
|
+
import { servicePath as FileServicePath } from '@opensumi/ide-file-service';
|
|
42
42
|
|
|
43
43
|
@Injectable()
|
|
44
44
|
export class FileTreeModule extends BrowserModule {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
providers: Provider[] = [createFileTreeAPIProvider(FileTreeAPIImpl)];
|
|
46
|
+
backServices = [
|
|
47
|
+
{
|
|
48
|
+
servicePath: FileServicePath,
|
|
49
|
+
},
|
|
48
50
|
];
|
|
49
|
-
backServices = [{
|
|
50
|
-
servicePath: FileServicePath,
|
|
51
|
-
}];
|
|
52
51
|
}
|
|
53
|
-
|
|
54
52
|
```
|
|
55
53
|
|
|
56
54
|
例如在 file-tree 模块中，首先在模块入口位置声明需要用到的 `backServices`，传入引用的服务 `servicePath`，与服务注册时的 `servicePath` 一致
|
|
57
55
|
|
|
58
56
|
`packages/file-tree/src/browser/file-tree.service.ts`
|
|
57
|
+
|
|
59
58
|
```javascript
|
|
60
59
|
import {servicePath as FileServicePath} from '@opensumi/ide-file-service';
|
|
61
60
|
|
|
@@ -71,13 +70,13 @@ export default class FileTreeService extends Disposable {
|
|
|
71
70
|
@Autowired(CommandService)
|
|
72
71
|
private commandService: CommandService;
|
|
73
72
|
|
|
74
|
-
constructor(@Inject(FileServicePath) protected readonly
|
|
73
|
+
constructor(@Inject(FileServicePath) protected readonly fileService) {
|
|
75
74
|
super();
|
|
76
75
|
|
|
77
76
|
this.getFiles();
|
|
78
77
|
}
|
|
79
78
|
createFile = async () => {
|
|
80
|
-
const {content} = await this.
|
|
79
|
+
const {content} = await this.fileService.resolveContent('/Users/franklife/work/ide/ac/ide-framework/tsconfig.json');
|
|
81
80
|
const file = await this.fileAPI.createFile({
|
|
82
81
|
name: 'name' + Date.now() + '\n' + content,
|
|
83
82
|
path: 'path' + Date.now(),
|
|
@@ -98,7 +97,7 @@ export default class FileTreeService extends Disposable {
|
|
|
98
97
|
在 file-tree.service.ts 中通过 `servicePath` 进行注入，并直接调用在服务类上的方法
|
|
99
98
|
|
|
100
99
|
```javascript
|
|
101
|
-
constructor(@Inject(FileServicePath) protected readonly
|
|
100
|
+
constructor(@Inject(FileServicePath) protected readonly fileService) {
|
|
102
101
|
super();
|
|
103
102
|
|
|
104
103
|
this.getFiles();
|
|
@@ -108,30 +107,30 @@ constructor(@Inject(FileServicePath) protected readonly fileSevice) {
|
|
|
108
107
|
方法调用会转换成一个远程调用进行响应，返回结果
|
|
109
108
|
|
|
110
109
|
```javascript
|
|
111
|
-
const {content} = await this.
|
|
110
|
+
const { content } = await this.fileService.resolveContent('/Users/franklife/work/ide/ac/ide-framework/tsconfig.json');
|
|
112
111
|
```
|
|
113
112
|
|
|
114
|
-
|
|
115
|
-
**前端服务(frontService)**
|
|
116
|
-
后端服务(backService) 即在 Browser 环境下运行的代码暴露的能力
|
|
113
|
+
**前端服务(frontService)** 后端服务(backService) 即在 Browser 环境下运行的代码暴露的能力
|
|
117
114
|
|
|
118
115
|
1. 注册服务
|
|
119
116
|
|
|
120
117
|
`packages/file-ree/src/browser/index.ts`
|
|
118
|
+
|
|
121
119
|
```javascript
|
|
122
120
|
@Injectable()
|
|
123
121
|
export class FileTreeModule extends BrowserModule {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
122
|
+
providers: Provider[] = [createFileTreeAPIProvider(FileTreeAPIImpl)];
|
|
123
|
+
backServices = [
|
|
124
|
+
{
|
|
125
|
+
servicePath: FileServicePath,
|
|
126
|
+
},
|
|
127
|
+
];
|
|
128
|
+
frontServices = [
|
|
129
|
+
{
|
|
130
|
+
servicePath: FileTreeServicePath,
|
|
131
|
+
token: FileTreeService,
|
|
132
|
+
},
|
|
127
133
|
];
|
|
128
|
-
backServices = [{
|
|
129
|
-
servicePath: FileServicePath,
|
|
130
|
-
}];
|
|
131
|
-
frontServices = [{
|
|
132
|
-
servicePath: FileTreeServicePath,
|
|
133
|
-
token: FileTreeService,
|
|
134
|
-
}];
|
|
135
134
|
}
|
|
136
135
|
```
|
|
137
136
|
|
|
@@ -140,8 +139,9 @@ export class FileTreeModule extends BrowserModule {
|
|
|
140
139
|
2. 服务使用
|
|
141
140
|
|
|
142
141
|
`packages/file-service/src/node/index.ts`
|
|
142
|
+
|
|
143
143
|
```javascript
|
|
144
|
-
import {servicePath as FileTreeServicePath} from '@opensumi/ide-file-tree';
|
|
144
|
+
import { servicePath as FileTreeServicePath } from '@opensumi/ide-file-tree';
|
|
145
145
|
|
|
146
146
|
@Injectable()
|
|
147
147
|
export class FileServiceModule extends NodeModule {
|
|
@@ -164,6 +164,7 @@ export class FileServiceModule extends NodeModule {
|
|
|
164
164
|
与使用后端服务一致，在模块定义中声明需要使用的前端服务 `frontServices`，传入前端服务注册时用的 `servicePath` 一致
|
|
165
165
|
|
|
166
166
|
`packages/file-service/src/node/file-service.ts`
|
|
167
|
+
|
|
167
168
|
```javascript
|
|
168
169
|
@Injectable()
|
|
169
170
|
export class FileService implements IFileService {
|
|
@@ -192,17 +193,10 @@ export class FileService implements IFileService {
|
|
|
192
193
|
```
|
|
193
194
|
|
|
194
195
|
方法调用会转换成一个远程调用进行响应，返回结果
|
|
196
|
+
|
|
195
197
|
```javascript
|
|
196
|
-
const fileTree = await this.fileTreeService
|
|
197
|
-
fileTree.fileName(uri.substr(-5))
|
|
198
|
+
const fileTree = await this.fileTreeService;
|
|
199
|
+
fileTree.fileName(uri.substr(-5));
|
|
198
200
|
```
|
|
199
201
|
|
|
200
|
-
与后端服务调用区别的是，目前因前端代码后置执行，所以首先需要获取服务 `await
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
202
|
+
与后端服务调用区别的是，目前因前端代码后置执行，所以首先需要获取服务 `await this.fileTreeService` 后进行调用
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { IReporterService } from '@opensumi/ide-core-common';
|
|
1
|
+
import { IReporterService, UrlProvider } from '@opensumi/ide-core-common';
|
|
2
2
|
import { WSChannel } from '../common/ws-channel';
|
|
3
3
|
export declare class WSChannelHandler {
|
|
4
|
-
wsPath:
|
|
4
|
+
wsPath: UrlProvider;
|
|
5
5
|
protocols?: string[] | undefined;
|
|
6
6
|
connection: WebSocket;
|
|
7
7
|
private channelMap;
|
|
@@ -9,7 +9,7 @@ export declare class WSChannelHandler {
|
|
|
9
9
|
clientId: string;
|
|
10
10
|
private heartbeatMessageTimer;
|
|
11
11
|
private reporterService;
|
|
12
|
-
constructor(wsPath:
|
|
12
|
+
constructor(wsPath: UrlProvider, logger: any, protocols?: string[] | undefined, clientId?: string);
|
|
13
13
|
replaceLogger(logger: any): void;
|
|
14
14
|
setReporter(reporterService: IReporterService): void;
|
|
15
15
|
private clientMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel-handler.d.ts","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ws-channel-handler.d.ts","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAe,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGvF,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,gBAAgB;IAQR,MAAM,EAAE,WAAW;IAAsB,SAAS,CAAC;IAP/D,UAAU,EAAE,SAAS,CAAC;IAC7B,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,MAAM,CAAW;IAClB,QAAQ,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,eAAe,CAAmB;gBAEvB,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAS,SAAS,CAAC,sBAAU,EAAE,QAAQ,CAAC,EAAE,MAAM;IAMnG,aAAa,CAAC,MAAM,EAAE,GAAG;IAKzB,WAAW,CAAC,eAAe,EAAE,gBAAgB;IAG7C,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,gBAAgB;IAcX,WAAW;IA2CxB,OAAO,CAAC,cAAc,CAMpB;IACW,WAAW,CAAC,WAAW,EAAE,MAAM;IAgBrC,OAAO;CAKf"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WSChannelHandler = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const reconnecting_websocket_1 = tslib_1.__importDefault(require("reconnecting-websocket"));
|
|
4
6
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
5
7
|
const ide_core_common_2 = require("@opensumi/ide-core-common");
|
|
6
8
|
const utils_1 = require("../common/utils");
|
|
7
9
|
const ws_channel_1 = require("../common/ws-channel");
|
|
8
|
-
let ReconnectingWebSocket = require('reconnecting-websocket');
|
|
9
|
-
if (ReconnectingWebSocket.default) {
|
|
10
|
-
/* istanbul ignore next */
|
|
11
|
-
ReconnectingWebSocket = ReconnectingWebSocket.default;
|
|
12
|
-
}
|
|
13
10
|
// 前台链接管理类
|
|
14
11
|
class WSChannelHandler {
|
|
15
12
|
constructor(wsPath, logger, protocols, clientId) {
|
|
@@ -26,7 +23,7 @@ class WSChannelHandler {
|
|
|
26
23
|
};
|
|
27
24
|
this.logger = logger || this.logger;
|
|
28
25
|
this.clientId = clientId || `CLIENT_ID_${(0, ide_core_common_1.uuid)()}`;
|
|
29
|
-
this.connection = new
|
|
26
|
+
this.connection = new reconnecting_websocket_1.default(wsPath, protocols, {}); // new WebSocket(wsPath, protocols);
|
|
30
27
|
}
|
|
31
28
|
// 为解决建立连接之后，替换成可落盘的 logger
|
|
32
29
|
replaceLogger(logger) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import ws from 'ws';
|
|
2
|
-
import { WebSocketHandler } from './ws';
|
|
2
|
+
import { WebSocketHandler, CommonChannelHandlerOptions } from './ws';
|
|
3
3
|
export interface IPathHander {
|
|
4
4
|
dispose: (connection: any, connectionId: string) => void;
|
|
5
5
|
handler: (connection: any, connectionId: string, params?: any) => void;
|
|
@@ -19,14 +19,15 @@ export declare class CommonChannelPathHandler {
|
|
|
19
19
|
export declare const commonChannelPathHandler: CommonChannelPathHandler;
|
|
20
20
|
export declare class CommonChannelHandler extends WebSocketHandler {
|
|
21
21
|
private logger;
|
|
22
|
+
private options;
|
|
22
23
|
static channelId: number;
|
|
23
24
|
handlerId: string;
|
|
24
25
|
private wsServer;
|
|
25
|
-
|
|
26
|
+
protected handlerRoute: (wsPathname: string) => any;
|
|
26
27
|
private channelMap;
|
|
27
28
|
private connectionMap;
|
|
28
29
|
private heartbeatMap;
|
|
29
|
-
constructor(routePath: string, logger?: any);
|
|
30
|
+
constructor(routePath: string, logger?: any, options?: CommonChannelHandlerOptions);
|
|
30
31
|
private hearbeat;
|
|
31
32
|
private initWSServer;
|
|
32
33
|
private channelConnectionSend;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-channel-handler.d.ts","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,IAAI,CAAC;AAKpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"common-channel-handler.d.ts","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,IAAI,CAAC;AAKpB,OAAO,EAAE,gBAAgB,EAAE,2BAA2B,EAAE,MAAM,MAAM,CAAC;AAErE,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IACzD,OAAO,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACvE,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,UAAU,CAAyC;IAC3D,OAAO,CAAC,SAAS,CAAkC;IAEnD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAqBlD,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAU5C,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW;IAcvD,GAAG,CAAC,WAAW,EAAE,MAAM;IAGvB,yBAAyB,CAAC,UAAU,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM;IAO1D,MAAM;CAGP;AAED,eAAO,MAAM,wBAAwB,0BAAiC,CAAC;AAGvE,qBAAa,oBAAqB,SAAQ,gBAAgB;IAUzB,OAAO,CAAC,MAAM;IAAiB,OAAO,CAAC,OAAO;IAT7E,MAAM,CAAC,SAAS,SAAK;IAEd,SAAS,SAAoB;IACpC,OAAO,CAAC,QAAQ,CAAY;IAC5B,SAAS,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,GAAG,CAAC;IACpD,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,YAAY,CAA0C;gBAElD,SAAS,EAAE,MAAM,EAAU,MAAM,GAAE,GAAa,EAAU,OAAO,GAAE,2BAAgC;IAM/G,OAAO,CAAC,QAAQ;IAUhB,OAAO,CAAC,YAAY;IAwFpB,OAAO,CAAC,qBAAqB,CAQ3B;IACK,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO;CAiBxF"}
|
|
@@ -7,7 +7,6 @@ const ws_1 = tslib_1.__importDefault(require("ws"));
|
|
|
7
7
|
const utils_1 = require("../common/utils");
|
|
8
8
|
const ws_channel_1 = require("../common/ws-channel");
|
|
9
9
|
const ws_2 = require("./ws");
|
|
10
|
-
const route = (0, path_match_1.default)();
|
|
11
10
|
class CommonChannelPathHandler {
|
|
12
11
|
constructor() {
|
|
13
12
|
this.handlerMap = new Map();
|
|
@@ -76,9 +75,10 @@ exports.CommonChannelPathHandler = CommonChannelPathHandler;
|
|
|
76
75
|
exports.commonChannelPathHandler = new CommonChannelPathHandler();
|
|
77
76
|
// 后台 Web 链接处理类
|
|
78
77
|
class CommonChannelHandler extends ws_2.WebSocketHandler {
|
|
79
|
-
constructor(routePath, logger = console) {
|
|
78
|
+
constructor(routePath, logger = console, options = {}) {
|
|
80
79
|
super();
|
|
81
80
|
this.logger = logger;
|
|
81
|
+
this.options = options;
|
|
82
82
|
this.handlerId = 'common-channel';
|
|
83
83
|
this.channelMap = new Map();
|
|
84
84
|
this.connectionMap = new Map();
|
|
@@ -92,6 +92,7 @@ class CommonChannelHandler extends ws_2.WebSocketHandler {
|
|
|
92
92
|
});
|
|
93
93
|
}
|
|
94
94
|
};
|
|
95
|
+
const route = (0, path_match_1.default)(options.pathMatchOptions);
|
|
95
96
|
this.handlerRoute = route(`${routePath}`);
|
|
96
97
|
this.initWSServer();
|
|
97
98
|
}
|
|
@@ -105,7 +106,7 @@ class CommonChannelHandler extends ws_2.WebSocketHandler {
|
|
|
105
106
|
}
|
|
106
107
|
initWSServer() {
|
|
107
108
|
this.logger.log('init Common Channel Handler');
|
|
108
|
-
this.wsServer = new ws_1.default.Server({ noServer: true });
|
|
109
|
+
this.wsServer = new ws_1.default.Server(Object.assign({ noServer: true }, this.options.wsServerOptions));
|
|
109
110
|
this.wsServer.on('connection', (connection) => {
|
|
110
111
|
let connectionId;
|
|
111
112
|
connection.on('message', (msg) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-channel-handler.js","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":";;;;AAAA,oEAAmC;AACnC,oDAAoB;AAEpB,2CAAmD;AACnD,qDAAiE;AAEjE,
|
|
1
|
+
{"version":3,"file":"common-channel-handler.js","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":"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"}
|
package/lib/node/ws.d.ts
CHANGED
|
@@ -1,16 +1,23 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import http from 'http';
|
|
3
|
+
import ws from 'ws';
|
|
3
4
|
export declare abstract class WebSocketHandler {
|
|
4
5
|
abstract handlerId: string;
|
|
5
6
|
abstract handleUpgrade(wsPathname: string, request: any, socket: any, head: any): boolean;
|
|
6
7
|
init?(): void;
|
|
7
8
|
}
|
|
9
|
+
export interface CommonChannelHandlerOptions {
|
|
10
|
+
wsServerOptions?: ws.ServerOptions;
|
|
11
|
+
pathMatchOptions?: {
|
|
12
|
+
end?: boolean;
|
|
13
|
+
};
|
|
14
|
+
}
|
|
8
15
|
export declare class WebSocketServerRoute {
|
|
9
16
|
private logger;
|
|
10
|
-
port?: number;
|
|
11
17
|
server: http.Server;
|
|
18
|
+
port?: number;
|
|
12
19
|
private wsServerHandlerArr;
|
|
13
|
-
constructor(server
|
|
20
|
+
constructor(server: http.Server, logger?: any, port?: number, wsServerHandlerArr?: WebSocketHandler[]);
|
|
14
21
|
registerHandler(handler: WebSocketHandler): void;
|
|
15
22
|
deleteHandler(handler: WebSocketHandler | string): boolean;
|
|
16
23
|
init(): void;
|
package/lib/node/ws.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/node/ws.ts"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,8BAAsB,gBAAgB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO;IACzF,IAAI,CAAC,IAAI,IAAI;CACd;AAED,qBAAa,oBAAoB;IAO7B,OAAO,CAAC,MAAM;IANT,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/node/ws.ts"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAGxB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,8BAAsB,gBAAgB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO;IACzF,IAAI,CAAC,IAAI,IAAI;CACd;AAED,MAAM,WAAW,2BAA2B;IAC1C,eAAe,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC;IACnC,gBAAgB,CAAC,EAAE;QAEjB,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH;AAED,qBAAa,oBAAoB;IAO7B,OAAO,CAAC,MAAM;IANT,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,kBAAkB,CAAqB;gBAG7C,MAAM,EAAE,IAAI,CAAC,MAAM,EACX,MAAM,GAAE,GAAa,EAC7B,IAAI,SAAO,EACX,kBAAkB,GAAE,gBAAgB,EAAO;IAUtC,eAAe,CAAC,OAAO,EAAE,gBAAgB;IASzC,aAAa,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM;IAkBhD,IAAI;IAKX,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,WAAW;IAOnB,OAAO,CAAC,aAAa;CAuBtB"}
|
package/lib/node/ws.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/node/ws.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,sDAAsB;
|
|
1
|
+
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/node/ws.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-connection",
|
|
3
|
-
"version": "2.18.
|
|
3
|
+
"version": "2.18.11-next-1657791786.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib"
|
|
6
6
|
],
|
|
@@ -16,15 +16,15 @@
|
|
|
16
16
|
"url": "git@github.com:opensumi/core.git"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@opensumi/ide-core-common": "2.18.
|
|
19
|
+
"@opensumi/ide-core-common": "2.18.11-next-1657791786.0",
|
|
20
20
|
"@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
|
|
21
21
|
"path-match": "^1.2.4",
|
|
22
22
|
"ws": "^7.2.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
|
-
"@opensumi/ide-components": "2.18.
|
|
25
|
+
"@opensumi/ide-components": "2.18.11-next-1657791786.0",
|
|
26
26
|
"@opensumi/ide-dev-tool": "^1.3.1",
|
|
27
27
|
"mock-socket": "^9.0.2"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "706e10f23f1a5ccc0109626093206b145016a624"
|
|
30
30
|
}
|