@opensumi/ide-connection 3.0.2-next-1715690415.0 → 3.0.2-next-1715773842.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/lib/browser/ws-channel-handler.d.ts +6 -0
- package/lib/browser/ws-channel-handler.d.ts.map +1 -1
- package/lib/browser/ws-channel-handler.js +50 -4
- package/lib/browser/ws-channel-handler.js.map +1 -1
- package/lib/common/fury-extends/one-of.d.ts +2 -1
- package/lib/common/fury-extends/one-of.d.ts.map +1 -1
- package/lib/common/fury-extends/one-of.js +12 -5
- package/lib/common/fury-extends/one-of.js.map +1 -1
- package/lib/common/server-handler.d.ts +2 -2
- package/lib/common/server-handler.d.ts.map +1 -1
- package/lib/common/server-handler.js +24 -11
- package/lib/common/server-handler.js.map +1 -1
- package/lib/common/ws-channel.d.ts +65 -24
- package/lib/common/ws-channel.d.ts.map +1 -1
- package/lib/common/ws-channel.js +51 -7
- package/lib/common/ws-channel.js.map +1 -1
- package/lib/node/ws.d.ts.map +1 -1
- package/lib/node/ws.js +1 -0
- package/lib/node/ws.js.map +1 -1
- package/package.json +5 -5
- package/src/browser/ws-channel-handler.ts +56 -7
- package/src/common/fury-extends/one-of.ts +12 -3
- package/src/common/server-handler.ts +39 -17
- package/src/common/ws-channel.ts +110 -39
- package/src/node/ws.ts +1 -0
|
@@ -7,6 +7,9 @@ import { WSChannel } from '../common/ws-channel';
|
|
|
7
7
|
*/
|
|
8
8
|
export declare class WSChannelHandler {
|
|
9
9
|
connection: ReconnectingWebSocketConnection | NetSocketConnection;
|
|
10
|
+
private _disposables;
|
|
11
|
+
private _onChannelCreatedEmitter;
|
|
12
|
+
onChannelCreated(path: string, listener: (channel: WSChannel) => void): import("@opensumi/events").IDisposable;
|
|
10
13
|
private channelMap;
|
|
11
14
|
private channelCloseEventMap;
|
|
12
15
|
private logger;
|
|
@@ -23,7 +26,10 @@ export declare class WSChannelHandler {
|
|
|
23
26
|
setReporter(reporterService: IReporterService): void;
|
|
24
27
|
private heartbeatMessage;
|
|
25
28
|
initHandler(): Promise<void>;
|
|
29
|
+
private fillKey;
|
|
30
|
+
getChannel(channelPath: string): WSChannel | undefined;
|
|
26
31
|
openChannel(channelPath: string): Promise<WSChannel>;
|
|
27
32
|
dispose(): void;
|
|
33
|
+
awaitChannelReady(channelPath: string): Promise<void>;
|
|
28
34
|
}
|
|
29
35
|
//# sourceMappingURL=ws-channel-handler.d.ts.map
|
|
@@ -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":"AACA,OAAO,EAAsC,gBAAgB,EAAyB,MAAM,2BAA2B,CAAC;AAExH,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AAEtG,OAAO,EAAoB,SAAS,EAAsB,MAAM,sBAAsB,CAAC;AAEvF;;GAEG;AACH,qBAAa,gBAAgB;IAsBR,UAAU,EAAE,+BAA+B,GAAG,mBAAmB;IArBpF,OAAO,CAAC,YAAY,CAAyB;IAE7C,OAAO,CAAC,wBAAwB,CAA0E;IACnG,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI;IAI5E,OAAO,CAAC,UAAU,CAAqC;IACvD,OAAO,CAAC,oBAAoB,CAAuC;IACnE,OAAO,CAAC,MAAM,CAAW;IAClB,QAAQ,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,qBAAqB,CAAwB;IACrD,OAAO,CAAC,eAAe,CAAmB;IAE1C;;OAEG;IACH,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,EAAE,MAAM,CAAC;gBAEG,UAAU,EAAE,+BAA+B,GAAG,mBAAmB,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAMnH,aAAa,CAAC,MAAM,EAAE,GAAG;IAKzB,WAAW,CAAC,eAAe,EAAE,gBAAgB;IAG7C,OAAO,CAAC,gBAAgB;IAUX,WAAW;IAqExB,OAAO,CAAC,OAAO;IAIR,UAAU,CAAC,WAAW,EAAE,MAAM;IAIxB,WAAW,CAAC,WAAW,EAAE,MAAM;IA+DrC,OAAO;IAOd,iBAAiB,CAAC,WAAW,EAAE,MAAM;CAiBtC"}
|
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WSChannelHandler = void 0;
|
|
4
|
+
const events_1 = require("@opensumi/events");
|
|
4
5
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
5
6
|
const ws_channel_1 = require("../common/ws-channel");
|
|
6
7
|
/**
|
|
7
8
|
* Channel Handler in browser
|
|
8
9
|
*/
|
|
9
10
|
class WSChannelHandler {
|
|
11
|
+
onChannelCreated(path, listener) {
|
|
12
|
+
return this._onChannelCreatedEmitter.on(path, listener);
|
|
13
|
+
}
|
|
10
14
|
constructor(connection, logger, clientId) {
|
|
11
15
|
this.connection = connection;
|
|
16
|
+
this._disposables = new ide_core_common_1.DisposableStore();
|
|
17
|
+
this._onChannelCreatedEmitter = this._disposables.add(new events_1.EventEmitter());
|
|
12
18
|
this.channelMap = new Map();
|
|
13
19
|
this.channelCloseEventMap = new ide_core_common_1.MultiMap();
|
|
14
20
|
this.logger = console;
|
|
@@ -47,6 +53,21 @@ class WSChannelHandler {
|
|
|
47
53
|
case 'pong':
|
|
48
54
|
// pong 没有 msg.id, 且不需要分发, 不处理
|
|
49
55
|
break;
|
|
56
|
+
case 'error':
|
|
57
|
+
this.logger.error(this.LOG_TAG, `receive error: id: ${msg.id}, code: ${msg.code}, error: ${msg.message}`);
|
|
58
|
+
switch (msg.code) {
|
|
59
|
+
case ws_channel_1.ErrorMessageCode.ChannelNotFound:
|
|
60
|
+
if (this.channelMap.has(msg.id)) {
|
|
61
|
+
// 如果远程报错 channel 不存在但是本机存在，则重新打开
|
|
62
|
+
const channel = this.channelMap.get(msg.id);
|
|
63
|
+
if (channel.channelPath) {
|
|
64
|
+
channel.pause();
|
|
65
|
+
channel.open(channel.channelPath, this.clientId);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
break;
|
|
69
|
+
}
|
|
70
|
+
break;
|
|
50
71
|
default: {
|
|
51
72
|
const channel = this.channelMap.get(msg.id);
|
|
52
73
|
if (channel) {
|
|
@@ -67,7 +88,7 @@ class WSChannelHandler {
|
|
|
67
88
|
};
|
|
68
89
|
this.connection.onClose((code, reason) => {
|
|
69
90
|
this.channelMap.forEach((channel) => {
|
|
70
|
-
channel.close(code
|
|
91
|
+
channel.close(code, reason);
|
|
71
92
|
});
|
|
72
93
|
});
|
|
73
94
|
if (this.connection.isOpen()) {
|
|
@@ -86,11 +107,16 @@ class WSChannelHandler {
|
|
|
86
107
|
});
|
|
87
108
|
await this.openingBarrier.wait();
|
|
88
109
|
}
|
|
110
|
+
fillKey(channelPath) {
|
|
111
|
+
return `${this.clientId}:${channelPath}`;
|
|
112
|
+
}
|
|
113
|
+
getChannel(channelPath) {
|
|
114
|
+
return this.channelMap.get(this.fillKey(channelPath));
|
|
115
|
+
}
|
|
89
116
|
async openChannel(channelPath) {
|
|
90
|
-
const key =
|
|
117
|
+
const key = this.fillKey(channelPath);
|
|
91
118
|
if (this.channelMap.has(key)) {
|
|
92
|
-
|
|
93
|
-
channel.dispose();
|
|
119
|
+
this.channelMap.get(key).dispose();
|
|
94
120
|
this.logger.log(this.LOG_TAG, `channel ${key} already exists, dispose it`);
|
|
95
121
|
}
|
|
96
122
|
const channel = new ws_channel_1.WSChannel(this.connection, {
|
|
@@ -99,6 +125,7 @@ class WSChannelHandler {
|
|
|
99
125
|
ensureServerReady: true,
|
|
100
126
|
});
|
|
101
127
|
this.channelMap.set(channel.id, channel);
|
|
128
|
+
this._onChannelCreatedEmitter.emit(channelPath, channel);
|
|
102
129
|
let channelOpenedCount = 0;
|
|
103
130
|
channel.onOpen(() => {
|
|
104
131
|
channelOpenedCount++;
|
|
@@ -139,6 +166,25 @@ class WSChannelHandler {
|
|
|
139
166
|
if (this.heartbeatMessageTimer) {
|
|
140
167
|
clearTimeout(this.heartbeatMessageTimer);
|
|
141
168
|
}
|
|
169
|
+
this._disposables.dispose();
|
|
170
|
+
}
|
|
171
|
+
awaitChannelReady(channelPath) {
|
|
172
|
+
const channel = this.getChannel(channelPath);
|
|
173
|
+
const deferred = new ide_core_common_1.Deferred();
|
|
174
|
+
if (channel) {
|
|
175
|
+
channel.onServerReady(() => {
|
|
176
|
+
deferred.resolve();
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
const dispose = this.onChannelCreated(channelPath, (channel) => {
|
|
181
|
+
channel.onServerReady(() => {
|
|
182
|
+
deferred.resolve();
|
|
183
|
+
});
|
|
184
|
+
dispose.dispose();
|
|
185
|
+
});
|
|
186
|
+
}
|
|
187
|
+
return deferred.promise;
|
|
142
188
|
}
|
|
143
189
|
}
|
|
144
190
|
exports.WSChannelHandler = WSChannelHandler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ import { FuryFactoryReturn } from './shared';
|
|
|
3
3
|
type Writable = Record<string, any> & {
|
|
4
4
|
kind: string;
|
|
5
5
|
};
|
|
6
|
-
export declare const
|
|
6
|
+
export declare const oneOf: (schemas: [
|
|
7
|
+
TypeDescription,
|
|
7
8
|
TypeDescription,
|
|
8
9
|
TypeDescription,
|
|
9
10
|
TypeDescription,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"one-of.d.ts","sourceRoot":"","sources":["../../../src/common/fury-extends/one-of.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,eAAe,EAAE,MAAM,cAAc,CAAC;AAGlF,OAAO,EAAE,iBAAiB,EAAe,MAAM,UAAU,CAAC;AAE1D,KAAK,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"one-of.d.ts","sourceRoot":"","sources":["../../../src/common/fury-extends/one-of.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,eAAe,EAAE,MAAM,cAAc,CAAC;AAGlF,OAAO,EAAE,iBAAiB,EAAe,MAAM,UAAU,CAAC;AAE1D,KAAK,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAIvD,eAAO,MAAM,KAAK,YACP;IACP,eAAe;IACf,eAAe;IACf,eAAe;IACf,eAAe;IACf,eAAe;IACf,eAAe;IACf,eAAe;IACf,eAAe;CAChB,YACS,iBAAiB;yBAoBC,UAAU;mBAoChB,QAAQ;CAyC/B,CAAC"}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.oneOf = void 0;
|
|
4
4
|
const gen_1 = require("@furyjs/fury/dist/lib/gen");
|
|
5
5
|
const shared_1 = require("./shared");
|
|
6
|
-
const
|
|
6
|
+
const cap = 8;
|
|
7
|
+
const oneOf = (schemas, context) => {
|
|
7
8
|
if (!context) {
|
|
8
9
|
context = (0, shared_1.furyFactory)();
|
|
9
10
|
}
|
|
10
11
|
const { fury, reader, writer } = context;
|
|
11
|
-
const serializers = new Array(
|
|
12
|
-
const kinds = new Array(
|
|
12
|
+
const serializers = new Array(cap);
|
|
13
|
+
const kinds = new Array(cap);
|
|
13
14
|
const kindToIndex = {};
|
|
14
15
|
schemas.forEach((schema, i) => {
|
|
15
16
|
const kind = schema.options.tag;
|
|
@@ -43,6 +44,9 @@ const oneOf7 = (schemas, context) => {
|
|
|
43
44
|
case 6:
|
|
44
45
|
v = serializers[6].read();
|
|
45
46
|
break;
|
|
47
|
+
case 7:
|
|
48
|
+
v = serializers[7].read();
|
|
49
|
+
break;
|
|
46
50
|
}
|
|
47
51
|
v.kind = kinds[idx];
|
|
48
52
|
return v;
|
|
@@ -73,6 +77,9 @@ const oneOf7 = (schemas, context) => {
|
|
|
73
77
|
case 6:
|
|
74
78
|
serializers[6].write(v);
|
|
75
79
|
break;
|
|
80
|
+
case 7:
|
|
81
|
+
serializers[7].write(v);
|
|
82
|
+
break;
|
|
76
83
|
}
|
|
77
84
|
return writer.dump();
|
|
78
85
|
};
|
|
@@ -81,5 +88,5 @@ const oneOf7 = (schemas, context) => {
|
|
|
81
88
|
serialize,
|
|
82
89
|
};
|
|
83
90
|
};
|
|
84
|
-
exports.
|
|
91
|
+
exports.oneOf = oneOf;
|
|
85
92
|
//# sourceMappingURL=one-of.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"one-of.js","sourceRoot":"","sources":["../../../src/common/fury-extends/one-of.ts"],"names":[],"mappings":";;;AACA,mDAA+D;AAE/D,qCAA0D;
|
|
1
|
+
{"version":3,"file":"one-of.js","sourceRoot":"","sources":["../../../src/common/fury-extends/one-of.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export declare class CommonChannelPathHandler {
|
|
|
16
16
|
removeHandler(channelPath: string, handler: IPathHandler): void;
|
|
17
17
|
get(channelPath: string): IPathHandler[] | undefined;
|
|
18
18
|
disposeConnectionClientId(channel: any, clientId: string): void;
|
|
19
|
-
|
|
19
|
+
openChannel(path: string, channel: WSChannel, clientId: string): void;
|
|
20
20
|
getAll(): IPathHandler[][];
|
|
21
21
|
}
|
|
22
22
|
export declare const commonChannelPathHandler: CommonChannelPathHandler;
|
|
@@ -24,7 +24,7 @@ export declare abstract class BaseCommonChannelHandler {
|
|
|
24
24
|
handlerId: string;
|
|
25
25
|
protected logger: ILogger;
|
|
26
26
|
protected channelMap: Map<string, WSServerChannel>;
|
|
27
|
-
heartbeatTimer: NodeJS.Timeout | null;
|
|
27
|
+
protected heartbeatTimer: NodeJS.Timeout | null;
|
|
28
28
|
constructor(handlerId: string, logger?: ILogger);
|
|
29
29
|
abstract doHeartbeat(connection: any): void;
|
|
30
30
|
private heartbeat;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-handler.d.ts","sourceRoot":"","sources":["../../src/common/server-handler.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,
|
|
1
|
+
{"version":3,"file":"server-handler.d.ts","sourceRoot":"","sources":["../../src/common/server-handler.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAGL,SAAS,EACT,eAAe,EAIhB,MAAM,cAAc,CAAC;AAEtB,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D,OAAO,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;IAC7F,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/D,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,qBAAa,wBAAwB;IACnC,OAAO,CAAC,UAAU,CAA0C;IAC5D,OAAO,CAAC,SAAS,CAAkC;IAEnD,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY;IAqBnD,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAUrE,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY;IAcxD,GAAG,CAAC,WAAW,EAAE,MAAM;IAGvB,yBAAyB,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM;IAOxD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM;IAsB9D,MAAM;CAGP;AAED,eAAO,MAAM,wBAAwB,0BAAiC,CAAC;AAEvE,8BAAsB,wBAAwB;IAKzB,SAAS,EAAE,MAAM;IAAE,SAAS,CAAC,MAAM,EAAE,OAAO;IAJ/D,SAAS,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAa;IAE/D,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAQ;gBAEpC,SAAS,EAAE,MAAM,EAAY,MAAM,GAAE,OAAiB;IAEzE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI;IAE3C,OAAO,CAAC,SAAS;IAWjB,iBAAiB,CAAC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAuE1D,OAAO;CAKR;AAED,eAAO,MAAM,qBAAqB,eAAe,CAAC"}
|
|
@@ -62,7 +62,7 @@ class CommonChannelPathHandler {
|
|
|
62
62
|
});
|
|
63
63
|
});
|
|
64
64
|
}
|
|
65
|
-
|
|
65
|
+
openChannel(path, channel, clientId) {
|
|
66
66
|
// 根据 path 拿到注册的 handler
|
|
67
67
|
let handlerArr = this.get(path);
|
|
68
68
|
let params;
|
|
@@ -96,18 +96,25 @@ class BaseCommonChannelHandler {
|
|
|
96
96
|
this.heartbeatTimer = null;
|
|
97
97
|
}
|
|
98
98
|
heartbeat(connection) {
|
|
99
|
-
const timer = global.setTimeout(() => {
|
|
100
|
-
this.doHeartbeat(connection);
|
|
101
|
-
this.heartbeat(connection);
|
|
102
|
-
}, 5000);
|
|
103
99
|
if (this.heartbeatTimer) {
|
|
104
100
|
clearTimeout(this.heartbeatTimer);
|
|
105
101
|
}
|
|
106
|
-
this.heartbeatTimer =
|
|
102
|
+
this.heartbeatTimer = global.setTimeout(() => {
|
|
103
|
+
this.doHeartbeat(connection);
|
|
104
|
+
this.heartbeat(connection);
|
|
105
|
+
}, 5000);
|
|
107
106
|
}
|
|
108
107
|
receiveConnection(connection) {
|
|
109
108
|
let clientId;
|
|
110
109
|
this.heartbeat(connection);
|
|
110
|
+
const getOrCreateChannel = (id, clientId) => {
|
|
111
|
+
let channel = this.channelMap.get(id);
|
|
112
|
+
if (!channel) {
|
|
113
|
+
channel = new ws_channel_1.WSServerChannel(connection, { id, clientId, logger: this.logger });
|
|
114
|
+
this.channelMap.set(id, channel);
|
|
115
|
+
}
|
|
116
|
+
return channel;
|
|
117
|
+
};
|
|
111
118
|
connection.onMessage((data) => {
|
|
112
119
|
let msg;
|
|
113
120
|
try {
|
|
@@ -117,13 +124,12 @@ class BaseCommonChannelHandler {
|
|
|
117
124
|
connection.send(ws_channel_1.pongMessage);
|
|
118
125
|
break;
|
|
119
126
|
case 'open': {
|
|
120
|
-
const { id, path } = msg;
|
|
127
|
+
const { id, path, connectionToken } = msg;
|
|
121
128
|
clientId = msg.clientId;
|
|
122
129
|
this.logger.log(`open a new connection channel ${clientId} with path ${path}`);
|
|
123
|
-
const channel =
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
channel.serverReady();
|
|
130
|
+
const channel = getOrCreateChannel(id, clientId);
|
|
131
|
+
exports.commonChannelPathHandler.openChannel(path, channel, clientId);
|
|
132
|
+
channel.serverReady(connectionToken);
|
|
127
133
|
break;
|
|
128
134
|
}
|
|
129
135
|
default: {
|
|
@@ -133,6 +139,12 @@ class BaseCommonChannelHandler {
|
|
|
133
139
|
channel.dispatch(msg);
|
|
134
140
|
}
|
|
135
141
|
else {
|
|
142
|
+
connection.send((0, ws_channel_1.stringify)({
|
|
143
|
+
kind: 'error',
|
|
144
|
+
id,
|
|
145
|
+
code: ws_channel_1.ErrorMessageCode.ChannelNotFound,
|
|
146
|
+
message: `channel ${id} not found`,
|
|
147
|
+
}));
|
|
136
148
|
this.logger.warn(`channel ${id} is not found`);
|
|
137
149
|
}
|
|
138
150
|
}
|
|
@@ -143,6 +155,7 @@ class BaseCommonChannelHandler {
|
|
|
143
155
|
}
|
|
144
156
|
});
|
|
145
157
|
connection.onceClose(() => {
|
|
158
|
+
this.logger.log(`connection ${clientId} is closed, dispose all channels`);
|
|
146
159
|
exports.commonChannelPathHandler.disposeConnectionClientId(connection, clientId);
|
|
147
160
|
Array.from(this.channelMap.values())
|
|
148
161
|
.filter((channel) => channel.clientId === clientId)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-handler.js","sourceRoot":"","sources":["../../src/common/server-handler.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"server-handler.js","sourceRoot":"","sources":["../../src/common/server-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { EventEmitter } from '@opensumi/events';
|
|
3
|
-
import { DisposableStore, EventQueue } from '@opensumi/ide-core-common';
|
|
3
|
+
import { DisposableStore, EventQueue, StateTracer } from '@opensumi/ide-core-common';
|
|
4
4
|
import { IConnectionShape } from './connection/types';
|
|
5
5
|
import { ISumiConnectionOptions, SumiConnection } from './rpc/connection';
|
|
6
6
|
import { ILogger } from './types';
|
|
@@ -20,25 +20,6 @@ export interface PongMessage {
|
|
|
20
20
|
id: string;
|
|
21
21
|
clientId: string;
|
|
22
22
|
}
|
|
23
|
-
/**
|
|
24
|
-
* `open` message is used to open a new channel.
|
|
25
|
-
* `path` is used to identify which handler should be used to handle the channel.
|
|
26
|
-
* `clientId` is used to identify the client.
|
|
27
|
-
*/
|
|
28
|
-
export interface OpenMessage {
|
|
29
|
-
kind: 'open';
|
|
30
|
-
id: string;
|
|
31
|
-
path: string;
|
|
32
|
-
clientId: string;
|
|
33
|
-
}
|
|
34
|
-
/**
|
|
35
|
-
* when server receive a `open` message, it should reply a `server-ready` message.
|
|
36
|
-
* this is indicate that the channel is ready to use.
|
|
37
|
-
*/
|
|
38
|
-
export interface ServerReadyMessage {
|
|
39
|
-
kind: 'server-ready';
|
|
40
|
-
id: string;
|
|
41
|
-
}
|
|
42
23
|
/**
|
|
43
24
|
* `data` message indicate that the channel has received some data.
|
|
44
25
|
* the `content` field is the data, it should be a string.
|
|
@@ -59,7 +40,6 @@ export interface CloseMessage {
|
|
|
59
40
|
code: number;
|
|
60
41
|
reason: string;
|
|
61
42
|
}
|
|
62
|
-
export type ChannelMessage = PingMessage | PongMessage | OpenMessage | ServerReadyMessage | DataMessage | BinaryMessage | CloseMessage;
|
|
63
43
|
export interface IWSChannelCreateOptions {
|
|
64
44
|
/**
|
|
65
45
|
* every channel's unique id, it only used in client to server architecture.
|
|
@@ -94,14 +74,19 @@ export declare class WSChannel {
|
|
|
94
74
|
onOpen(cb: (id: string) => void): import("@opensumi/events").IDisposable;
|
|
95
75
|
onReopen(cb: () => void): import("@opensumi/events").IDisposable;
|
|
96
76
|
pause(): void;
|
|
77
|
+
onServerReady(cb: () => void): import("@opensumi/events").IDisposable | undefined;
|
|
97
78
|
resume(): void;
|
|
98
79
|
dispatch(msg: ChannelMessage): void;
|
|
99
|
-
|
|
80
|
+
stateTracer: StateTracer;
|
|
81
|
+
/**
|
|
82
|
+
* @param connectionToken 一个 connection token 用于在全链路中追踪一个 channel 的生命周期，防止 channel 被重复打开
|
|
83
|
+
*/
|
|
84
|
+
open(path: string, clientId: string, connectionToken?: string): string | undefined;
|
|
100
85
|
protected timer: NodeJS.Timeout;
|
|
101
86
|
/**
|
|
102
87
|
* 启动定时器，确保 server-ready 消息在一定时间内到达
|
|
103
88
|
*/
|
|
104
|
-
protected ensureOpenSend(path: string, clientId: string): void;
|
|
89
|
+
protected ensureOpenSend(path: string, clientId: string, connectionToken: string): void;
|
|
105
90
|
send(content: string): void;
|
|
106
91
|
sendBinary(data: Uint8Array): void;
|
|
107
92
|
onError(): void;
|
|
@@ -126,10 +111,13 @@ interface IWSServerChannelCreateOptions extends IWSChannelCreateOptions {
|
|
|
126
111
|
*/
|
|
127
112
|
export declare class WSServerChannel extends WSChannel {
|
|
128
113
|
connection: IConnectionShape<Uint8Array>;
|
|
114
|
+
messageQueue: ChannelMessage[];
|
|
129
115
|
clientId: string;
|
|
130
116
|
constructor(connection: IConnectionShape<Uint8Array>, options: IWSServerChannelCreateOptions);
|
|
131
|
-
serverReady(): void;
|
|
117
|
+
serverReady(token: string): void;
|
|
118
|
+
dispatch(msg: ChannelMessage): void;
|
|
132
119
|
}
|
|
120
|
+
export type ChannelMessage = PingMessage | PongMessage | OpenMessage | ServerReadyMessage | DataMessage | BinaryMessage | CloseMessage | ErrorMessage;
|
|
133
121
|
export declare const PingProtocol: {
|
|
134
122
|
type: import("@furyjs/fury").InternalSerializerType.FURY_TYPE_TAG;
|
|
135
123
|
options: {
|
|
@@ -158,6 +146,18 @@ export declare const PongProtocol: {
|
|
|
158
146
|
} | undefined;
|
|
159
147
|
};
|
|
160
148
|
};
|
|
149
|
+
/**
|
|
150
|
+
* `open` message is used to open a new channel.
|
|
151
|
+
* `path` is used to identify which handler should be used to handle the channel.
|
|
152
|
+
* `clientId` is used to identify the client.
|
|
153
|
+
*/
|
|
154
|
+
export interface OpenMessage {
|
|
155
|
+
kind: 'open';
|
|
156
|
+
id: string;
|
|
157
|
+
path: string;
|
|
158
|
+
clientId: string;
|
|
159
|
+
connectionToken: string;
|
|
160
|
+
}
|
|
161
161
|
export declare const OpenProtocol: {
|
|
162
162
|
type: import("@furyjs/fury").InternalSerializerType.FURY_TYPE_TAG;
|
|
163
163
|
options: {
|
|
@@ -172,9 +172,21 @@ export declare const OpenProtocol: {
|
|
|
172
172
|
path: {
|
|
173
173
|
type: import("@furyjs/fury").InternalSerializerType.STRING;
|
|
174
174
|
};
|
|
175
|
+
connectionToken: {
|
|
176
|
+
type: import("@furyjs/fury").InternalSerializerType.STRING;
|
|
177
|
+
};
|
|
175
178
|
} | undefined;
|
|
176
179
|
};
|
|
177
180
|
};
|
|
181
|
+
/**
|
|
182
|
+
* when server receive a `open` message, it should reply a `server-ready` message.
|
|
183
|
+
* this is indicate that the channel is ready to use.
|
|
184
|
+
*/
|
|
185
|
+
export interface ServerReadyMessage {
|
|
186
|
+
kind: 'server-ready';
|
|
187
|
+
id: string;
|
|
188
|
+
token: string;
|
|
189
|
+
}
|
|
178
190
|
export declare const ServerReadyProtocol: {
|
|
179
191
|
type: import("@furyjs/fury").InternalSerializerType.FURY_TYPE_TAG;
|
|
180
192
|
options: {
|
|
@@ -183,6 +195,35 @@ export declare const ServerReadyProtocol: {
|
|
|
183
195
|
id: {
|
|
184
196
|
type: import("@furyjs/fury").InternalSerializerType.STRING;
|
|
185
197
|
};
|
|
198
|
+
token: {
|
|
199
|
+
type: import("@furyjs/fury").InternalSerializerType.STRING;
|
|
200
|
+
};
|
|
201
|
+
} | undefined;
|
|
202
|
+
};
|
|
203
|
+
};
|
|
204
|
+
export declare enum ErrorMessageCode {
|
|
205
|
+
ChannelNotFound = 1
|
|
206
|
+
}
|
|
207
|
+
export interface ErrorMessage {
|
|
208
|
+
kind: 'error';
|
|
209
|
+
id: string;
|
|
210
|
+
code: ErrorMessageCode;
|
|
211
|
+
message: string;
|
|
212
|
+
}
|
|
213
|
+
export declare const ErrorProtocol: {
|
|
214
|
+
type: import("@furyjs/fury").InternalSerializerType.FURY_TYPE_TAG;
|
|
215
|
+
options: {
|
|
216
|
+
tag: string;
|
|
217
|
+
props: {
|
|
218
|
+
id: {
|
|
219
|
+
type: import("@furyjs/fury").InternalSerializerType.STRING;
|
|
220
|
+
};
|
|
221
|
+
code: {
|
|
222
|
+
type: import("@furyjs/fury").InternalSerializerType.UINT16;
|
|
223
|
+
};
|
|
224
|
+
message: {
|
|
225
|
+
type: import("@furyjs/fury").InternalSerializerType.STRING;
|
|
226
|
+
};
|
|
186
227
|
} | undefined;
|
|
187
228
|
};
|
|
188
229
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel.d.ts","sourceRoot":"","sources":["../../src/common/ws-channel.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"ws-channel.d.ts","sourceRoot":"","sources":["../../src/common/ws-channel.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAEL,eAAe,EACf,UAAU,EACV,WAAW,EAEZ,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,qBAAa,SAAS;IAyCD,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAxC3D,SAAS,CAAC,YAAY,kBAAyB;IAC/C,SAAS,CAAC,OAAO;iBAEJ,CAAC,IAAI,EAAE,MAAM,CAAC;cACjB,CAAC,EAAE,EAAE,MAAM,CAAC;gBACV,EAAE;eACH,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC;gBAC/B,CAAC,IAAI,EAAE,UAAU,CAAC;OAE5B;IAEF,SAAS,CAAC,aAAa,yBAAuD;IAE9E,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,CAAM;IACvC,SAAS,CAAC,cAAc,UAAS;IACjC,SAAS,CAAC,kBAAkB,EAAE,OAAO,GAAG,SAAS,CAAC;IAE3C,EAAE,EAAE,MAAM,CAAC;IAEX,WAAW,EAAE,MAAM,CAAC;IAE3B,MAAM,EAAE,OAAO,CAAW;IAE1B,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB;gBAiBxE,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB;IAa7F,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU;IAWlC,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG;IAGnC,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,GAAG;IAGtC,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI;IAG/B,QAAQ,CAAC,EAAE,EAAE,MAAM,IAAI;IAIvB,KAAK;IAIL,aAAa,CAAC,EAAE,EAAE,MAAM,IAAI;IAQ5B,MAAM;IAUN,QAAQ,CAAC,GAAG,EAAE,cAAc;IAmB5B,WAAW,cAA4C;IAEvD;;OAEG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,SAAmB;IA6BvE,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;IAChC;;OAEG;IACH,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAahF,IAAI,CAAC,OAAO,EAAE,MAAM;IAUpB,UAAU,CAAC,IAAI,EAAE,UAAU;IAS3B,OAAO;IACP,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAIpC,UAAU;IAGV,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI;IAGlD,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI;IAIpD,gBAAgB;+BAEW,MAAM,UAAU,MAAM,KAAK,IAAI;+BAC/B,UAAU,KAAK,GAAG;qBAC5B,UAAU;;;IAO3B,oBAAoB,CAAC,OAAO,GAAE,sBAA2B;IAKzD,OAAO;CAOR;AAED,UAAU,6BAA8B,SAAQ,uBAAuB;IACrE,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,SAAS;IAIzB,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAH3D,YAAY,EAAE,cAAc,EAAE,CAAM;IAEpC,QAAQ,EAAE,MAAM,CAAC;gBACE,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,6BAA6B;IAInG,WAAW,CAAC,KAAK,EAAE,MAAM;IAUzB,QAAQ,CAAC,GAAG,EAAE,cAAc;CAU7B;AAED,MAAM,MAAM,cAAc,GACtB,WAAW,GACX,WAAW,GACX,WAAW,GACX,kBAAkB,GAClB,WAAW,GACX,aAAa,GACb,YAAY,GACZ,YAAY,CAAC;AAEjB,eAAO,MAAM,YAAY;;;;;;;;;;;;;CAGvB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;CAGvB,CAAC;AAEH;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;CAKvB,CAAC;AAEH;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,cAAc,CAAC;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;CAG9B,CAAC;AAEH,oBAAY,gBAAgB;IAC1B,eAAe,IAAI;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,gBAAgB,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;CAIxB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;CAGvB,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;CAGzB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;CAIxB,CAAC;AAaH,wBAAgB,SAAS,CAAC,GAAG,EAAE,cAAc,GAAG,UAAU,CAEzD;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,cAAc,CAEvD;AAcD,eAAO,MAAM,WAAW,YAA0B,CAAC;AACnD,eAAO,MAAM,WAAW,YAA0B,CAAC"}
|