@opensumi/ide-connection 2.27.3-rc-1714116491.0 → 2.27.3-rc-1714982362.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 +4 -0
- package/lib/browser/ws-channel-handler.d.ts.map +1 -1
- package/lib/browser/ws-channel-handler.js +48 -37
- package/lib/browser/ws-channel-handler.js.map +1 -1
- package/lib/common/connection/drivers/reconnecting-websocket.d.ts +1 -0
- package/lib/common/connection/drivers/reconnecting-websocket.d.ts.map +1 -1
- package/lib/common/connection/drivers/reconnecting-websocket.js +13 -3
- package/lib/common/connection/drivers/reconnecting-websocket.js.map +1 -1
- package/lib/common/connection/drivers/stream.d.ts +1 -0
- package/lib/common/connection/drivers/stream.d.ts.map +1 -1
- package/lib/common/connection/drivers/stream.js +20 -10
- package/lib/common/connection/drivers/stream.js.map +1 -1
- package/lib/common/rpc-service/center.d.ts.map +1 -1
- package/lib/common/rpc-service/center.js +5 -6
- package/lib/common/rpc-service/center.js.map +1 -1
- package/lib/node/common-channel-handler.d.ts +6 -0
- package/lib/node/common-channel-handler.d.ts.map +1 -1
- package/lib/node/common-channel-handler.js +1 -1
- package/lib/node/common-channel-handler.js.map +1 -1
- package/lib/node/ws.d.ts.map +1 -1
- package/lib/node/ws.js +3 -2
- package/lib/node/ws.js.map +1 -1
- package/package.json +5 -5
- package/src/browser/ws-channel-handler.ts +59 -40
- package/src/common/connection/drivers/reconnecting-websocket.ts +14 -4
- package/src/common/connection/drivers/stream.ts +22 -11
- package/src/common/rpc-service/center.ts +5 -7
- package/src/node/common-channel-handler.ts +8 -2
- package/src/node/ws.ts +4 -2
|
@@ -13,6 +13,10 @@ export declare class WSChannelHandler {
|
|
|
13
13
|
clientId: string;
|
|
14
14
|
private heartbeatMessageTimer;
|
|
15
15
|
private reporterService;
|
|
16
|
+
/**
|
|
17
|
+
* 保证在连接建立后再执行后续操作
|
|
18
|
+
*/
|
|
19
|
+
private openingBarrier;
|
|
16
20
|
LOG_TAG: string;
|
|
17
21
|
constructor(connection: ReconnectingWebSocketConnection | NetSocketConnection, logger: any, clientId: string);
|
|
18
22
|
replaceLogger(logger: any): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel-handler.d.ts","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"ws-channel-handler.d.ts","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,gBAAgB,EAAyB,MAAM,2BAA2B,CAAC;AAEvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,+BAA+B,EAAE,MAAM,qDAAqD,CAAC;AAEtG,OAAO,EAAE,SAAS,EAAsB,MAAM,sBAAsB,CAAC;AAErE;;GAEG;AACH,qBAAa,gBAAgB;IAeR,UAAU,EAAE,+BAA+B,GAAG,mBAAmB;IAdpF,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;IAuDX,WAAW,CAAC,WAAW,EAAE,MAAM;IA8CrC,OAAO;CAKf"}
|
|
@@ -10,8 +10,12 @@ class WSChannelHandler {
|
|
|
10
10
|
constructor(connection, logger, clientId) {
|
|
11
11
|
this.connection = connection;
|
|
12
12
|
this.channelMap = new Map();
|
|
13
|
-
this.channelCloseEventMap = new
|
|
13
|
+
this.channelCloseEventMap = new ide_core_common_1.MultiMap();
|
|
14
14
|
this.logger = console;
|
|
15
|
+
/**
|
|
16
|
+
* 保证在连接建立后再执行后续操作
|
|
17
|
+
*/
|
|
18
|
+
this.openingBarrier = new ide_core_common_1.Barrier();
|
|
15
19
|
this.logger = logger || this.logger;
|
|
16
20
|
this.clientId = clientId;
|
|
17
21
|
this.LOG_TAG = `[WSChannelHandler] [client-id:${this.clientId}]`;
|
|
@@ -54,63 +58,70 @@ class WSChannelHandler {
|
|
|
54
58
|
}
|
|
55
59
|
});
|
|
56
60
|
const reopenExistsChannel = () => {
|
|
57
|
-
if (this.channelMap.size) {
|
|
61
|
+
if (this.channelMap.size > 0) {
|
|
58
62
|
this.channelMap.forEach((channel) => {
|
|
59
|
-
channel.onOpen(() => {
|
|
60
|
-
const closeInfo = this.channelCloseEventMap.get(channel.id);
|
|
61
|
-
this.reporterService &&
|
|
62
|
-
this.reporterService.point(ide_core_common_1.REPORT_NAME.CHANNEL_RECONNECT, ide_core_common_1.REPORT_NAME.CHANNEL_RECONNECT, closeInfo);
|
|
63
|
-
this.logger.log(this.LOG_TAG, `channel reconnect ${this.clientId}:${channel.channelPath}`);
|
|
64
|
-
});
|
|
65
63
|
channel.open(channel.channelPath, this.clientId);
|
|
66
64
|
// 针对前端需要重新设置下后台状态的情况
|
|
67
65
|
channel.fireReopen();
|
|
68
66
|
});
|
|
69
67
|
}
|
|
70
68
|
};
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
69
|
+
this.connection.onClose((code, reason) => {
|
|
70
|
+
this.channelMap.forEach((channel) => {
|
|
71
|
+
channel.close(code !== null && code !== void 0 ? code : 1000, reason !== null && reason !== void 0 ? reason : '');
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
if (this.connection.isOpen()) {
|
|
75
|
+
this.heartbeatMessage();
|
|
76
|
+
this.openingBarrier.open();
|
|
77
|
+
}
|
|
78
|
+
this.connection.onOpen(() => {
|
|
79
|
+
this.heartbeatMessage();
|
|
80
|
+
// 说明是重连
|
|
81
|
+
if (this.openingBarrier.isOpen()) {
|
|
75
82
|
reopenExistsChannel();
|
|
76
83
|
}
|
|
77
84
|
else {
|
|
78
|
-
this.
|
|
79
|
-
this.heartbeatMessage();
|
|
80
|
-
resolve();
|
|
81
|
-
reopenExistsChannel();
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
});
|
|
85
|
-
this.connection.onceClose((code, reason) => {
|
|
86
|
-
if (this.channelMap.size) {
|
|
87
|
-
this.channelMap.forEach((channel) => {
|
|
88
|
-
channel.close(code !== null && code !== void 0 ? code : 1000, reason !== null && reason !== void 0 ? reason : '');
|
|
89
|
-
});
|
|
85
|
+
this.openingBarrier.open();
|
|
90
86
|
}
|
|
91
87
|
});
|
|
88
|
+
await this.openingBarrier.wait();
|
|
92
89
|
}
|
|
93
90
|
async openChannel(channelPath) {
|
|
94
|
-
const channelId = `${this.clientId}:${channelPath}`;
|
|
95
91
|
const channel = new ws_channel_1.WSChannel(this.connection, {
|
|
96
|
-
id:
|
|
92
|
+
id: `${this.clientId}:${channelPath}`,
|
|
97
93
|
logger: this.logger,
|
|
98
94
|
});
|
|
99
95
|
this.channelMap.set(channel.id, channel);
|
|
100
|
-
|
|
101
|
-
channel.
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
channelPath,
|
|
107
|
-
closeEvent: { code, reason },
|
|
108
|
-
connectInfo: navigator.connection,
|
|
96
|
+
channel.onOpen(() => {
|
|
97
|
+
const closeInfo = this.channelCloseEventMap.get(channel.id);
|
|
98
|
+
if (closeInfo) {
|
|
99
|
+
closeInfo.forEach((info) => {
|
|
100
|
+
this.reporterService &&
|
|
101
|
+
this.reporterService.point(ide_core_common_1.REPORT_NAME.CHANNEL_RECONNECT, ide_core_common_1.REPORT_NAME.CHANNEL_RECONNECT, info);
|
|
109
102
|
});
|
|
110
|
-
this.
|
|
103
|
+
this.channelCloseEventMap.delete(channel.id);
|
|
104
|
+
this.logger.log(this.LOG_TAG, `channel reconnect ${this.clientId}:${channel.channelPath}`);
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
this.logger.log(this.LOG_TAG, `channel open ${this.clientId}:${channel.channelPath}`);
|
|
108
|
+
}
|
|
109
|
+
});
|
|
110
|
+
channel.onClose((code, reason) => {
|
|
111
|
+
this.channelCloseEventMap.set(channel.id, {
|
|
112
|
+
channelPath,
|
|
113
|
+
closeEvent: { code, reason },
|
|
114
|
+
connectInfo: navigator.connection,
|
|
111
115
|
});
|
|
112
|
-
|
|
116
|
+
this.logger.log(this.LOG_TAG, 'channel close: ', `code: ${code}, reason: ${reason}`);
|
|
117
|
+
});
|
|
118
|
+
const deferred = new ide_core_common_1.Deferred();
|
|
119
|
+
const dispose = channel.onOpen(() => {
|
|
120
|
+
deferred.resolve();
|
|
121
|
+
dispose.dispose();
|
|
113
122
|
});
|
|
123
|
+
channel.open(channelPath, this.clientId);
|
|
124
|
+
await deferred.promise;
|
|
114
125
|
return channel;
|
|
115
126
|
}
|
|
116
127
|
dispose() {
|
|
@@ -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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"}
|
|
@@ -9,6 +9,7 @@ export declare class ReconnectingWebSocketConnection extends BaseConnection<Uint
|
|
|
9
9
|
onOpen(cb: () => void): IDisposable;
|
|
10
10
|
onMessage(cb: (data: Uint8Array) => void): IDisposable;
|
|
11
11
|
onceClose(cb: (code?: number, reason?: string) => void): IDisposable;
|
|
12
|
+
onClose(cb: (code?: number, reason?: string) => void): IDisposable;
|
|
12
13
|
onError(cb: (e: Error) => void): IDisposable;
|
|
13
14
|
dispose(): void;
|
|
14
15
|
static forURL(url: UrlProvider, protocols?: string | string[], options?: ReconnectingWebSocketOptions): ReconnectingWebSocketConnection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconnecting-websocket.d.ts","sourceRoot":"","sources":["../../../../src/common/connection/drivers/reconnecting-websocket.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,EAAE,EAAE,OAAO,IAAI,4BAA4B,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErH,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAIxC,qBAAa,+BAAgC,SAAQ,cAAc,CAAC,UAAU,CAAC;IACjE,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,qBAAqB;IAIjD,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAI5B,MAAM,IAAI,OAAO;IAIjB,MAAM,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,WAAW;IASnC,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,WAAW;IAuBtD,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,WAAW;IAapE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,WAAW;IAa5C,OAAO,IAAI,IAAI;IAIf,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,4BAA4B;
|
|
1
|
+
{"version":3,"file":"reconnecting-websocket.d.ts","sourceRoot":"","sources":["../../../../src/common/connection/drivers/reconnecting-websocket.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,EAAE,EAAE,OAAO,IAAI,4BAA4B,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErH,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAIxC,qBAAa,+BAAgC,SAAQ,cAAc,CAAC,UAAU,CAAC;IACjE,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,qBAAqB;IAIjD,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAI5B,MAAM,IAAI,OAAO;IAIjB,MAAM,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,WAAW;IASnC,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,WAAW;IAuBtD,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,WAAW;IAapE,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,WAAW;IAYlE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,KAAK,IAAI,GAAG,WAAW;IAa5C,OAAO,IAAI,IAAI;IAIf,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,4BAA4B;CAKtG"}
|
|
@@ -50,9 +50,20 @@ class ReconnectingWebSocketConnection extends base_1.BaseConnection {
|
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
onceClose(cb) {
|
|
53
|
+
const disposable = this.onClose(wrapper);
|
|
54
|
+
return {
|
|
55
|
+
dispose: () => {
|
|
56
|
+
disposable.dispose();
|
|
57
|
+
},
|
|
58
|
+
};
|
|
59
|
+
function wrapper(code, reason) {
|
|
60
|
+
cb(code, reason);
|
|
61
|
+
disposable.dispose();
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
onClose(cb) {
|
|
53
65
|
const handler = (e) => {
|
|
54
66
|
cb(e.code, e.reason);
|
|
55
|
-
this.socket.removeEventListener('close', handler);
|
|
56
67
|
};
|
|
57
68
|
this.socket.addEventListener('close', handler);
|
|
58
69
|
return {
|
|
@@ -78,8 +89,7 @@ class ReconnectingWebSocketConnection extends base_1.BaseConnection {
|
|
|
78
89
|
static forURL(url, protocols, options) {
|
|
79
90
|
const rawConnection = new reconnecting_websocket_1.default(url, protocols, options);
|
|
80
91
|
rawConnection.binaryType = 'arraybuffer';
|
|
81
|
-
|
|
82
|
-
return connection;
|
|
92
|
+
return new ReconnectingWebSocketConnection(rawConnection);
|
|
83
93
|
}
|
|
84
94
|
}
|
|
85
95
|
exports.ReconnectingWebSocketConnection = ReconnectingWebSocketConnection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconnecting-websocket.js","sourceRoot":"","sources":["../../../../src/common/connection/drivers/reconnecting-websocket.ts"],"names":[],"mappings":";;;;AAAA,4FAAqH;AAIrH,iCAAwC;AAIxC,MAAa,+BAAgC,SAAQ,qBAA0B;IAC7E,YAAoB,MAA6B;QAC/C,KAAK,EAAE,CAAC;QADU,WAAM,GAAN,MAAM,CAAuB;IAEjD,CAAC;IAED,IAAI,CAAC,IAAgB;QACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,MAAM,CAAC,EAAc;QACnB,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACzC,OAAO;YACL,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC9C,CAAC;SACF,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,EAA8B;QACtC,MAAM,OAAO,GAAG,CAAC,CAAe,EAAE,EAAE;;YAClC,IAAI,MAA4B,CAAC;YACjC,IAAI,CAAC,CAAC,IAAI,YAAY,IAAI,EAAE;gBAC1B,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;aAC/B;iBAAM,IAAI,CAAC,CAAC,IAAI,YAAY,WAAW,EAAE;gBACxC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAClC;iBAAM,IAAI,CAAA,MAAA,MAAA,CAAC,CAAC,IAAI,0CAAE,WAAW,0CAAE,IAAI,MAAK,QAAQ,EAAE;gBACjD,uDAAuD;gBACvD,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAClC;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,8DAA8D,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;aACjG;YACD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC7D,CAAC,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACjD,OAAO;YACL,OAAO,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACtD,CAAC;SACF,CAAC;IACJ,CAAC;IACD,SAAS,CAAC,EAA4C;QACpD,MAAM,
|
|
1
|
+
{"version":3,"file":"reconnecting-websocket.js","sourceRoot":"","sources":["../../../../src/common/connection/drivers/reconnecting-websocket.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ export declare class StreamConnection extends BaseConnection<Uint8Array> {
|
|
|
11
11
|
send(data: Uint8Array): void;
|
|
12
12
|
onMessage(cb: (data: Uint8Array) => void): IDisposable;
|
|
13
13
|
onceClose(cb: (code?: number, reason?: string) => void): IDisposable;
|
|
14
|
+
onClose(cb: (code?: number, reason?: string) => void): IDisposable;
|
|
14
15
|
onError(cb: (err: Error) => void): IDisposable;
|
|
15
16
|
dispose(): void;
|
|
16
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../src/common/connection/drivers/stream.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEjD,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,UAAU,CAAC;IAG3C,QAAQ,EAAE,QAAQ;IAAS,QAAQ,EAAE,QAAQ;IAFhE,SAAS,CAAC,OAAO,+BAAsC;gBAEpC,QAAQ,EAAE,QAAQ,EAAS,QAAQ,EAAE,QAAQ;IAYhE,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAO5B,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,WAAW;IAItD,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,WAAW;
|
|
1
|
+
{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../../../src/common/connection/drivers/stream.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,4BAA4B,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEjD,qBAAa,gBAAiB,SAAQ,cAAc,CAAC,UAAU,CAAC;IAG3C,QAAQ,EAAE,QAAQ;IAAS,QAAQ,EAAE,QAAQ;IAFhE,SAAS,CAAC,OAAO,+BAAsC;gBAEpC,QAAQ,EAAE,QAAQ,EAAS,QAAQ,EAAE,QAAQ;IAYhE,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAO5B,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,WAAW;IAItD,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,WAAW;IAcpE,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,WAAW;IAsBlE,OAAO,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,WAAW;IAc9C,OAAO,IAAI,IAAI;CAGhB"}
|
|
@@ -28,24 +28,34 @@ class StreamConnection extends base_1.BaseConnection {
|
|
|
28
28
|
return this.decoder.onData(cb);
|
|
29
29
|
}
|
|
30
30
|
onceClose(cb) {
|
|
31
|
+
const disposable = this.onClose(wrapper);
|
|
32
|
+
return {
|
|
33
|
+
dispose: () => {
|
|
34
|
+
disposable.dispose();
|
|
35
|
+
},
|
|
36
|
+
};
|
|
37
|
+
function wrapper(code, reason) {
|
|
38
|
+
cb(code, reason);
|
|
39
|
+
disposable.dispose();
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
onClose(cb) {
|
|
31
43
|
const wrapper = (hadError) => {
|
|
32
44
|
const code = hadError ? 1 : 0;
|
|
33
45
|
const reason = hadError ? 'had error' : '';
|
|
34
46
|
cb(code, reason);
|
|
35
|
-
dispose();
|
|
36
|
-
};
|
|
37
|
-
const dispose = () => {
|
|
38
|
-
this.readable.off('close', wrapper);
|
|
39
|
-
if (this.writable !== this.readable) {
|
|
40
|
-
this.writable.off('close', wrapper);
|
|
41
|
-
}
|
|
42
47
|
};
|
|
43
|
-
this.readable.
|
|
48
|
+
this.readable.on('close', wrapper);
|
|
44
49
|
if (this.writable !== this.readable) {
|
|
45
|
-
this.writable.
|
|
50
|
+
this.writable.on('close', wrapper);
|
|
46
51
|
}
|
|
47
52
|
return {
|
|
48
|
-
dispose
|
|
53
|
+
dispose: () => {
|
|
54
|
+
this.readable.off('close', wrapper);
|
|
55
|
+
if (this.writable !== this.readable) {
|
|
56
|
+
this.writable.off('close', wrapper);
|
|
57
|
+
}
|
|
58
|
+
},
|
|
49
59
|
};
|
|
50
60
|
}
|
|
51
61
|
onError(cb) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/common/connection/drivers/stream.ts"],"names":[],"mappings":";;;AAEA,iCAAwC;AACxC,mDAA+D;AAI/D,MAAa,gBAAiB,SAAQ,qBAA0B;IAG9D,YAAmB,QAAkB,EAAS,QAAkB;QAC9D,KAAK,EAAE,CAAC;QADS,aAAQ,GAAR,QAAQ,CAAU;QAAS,aAAQ,GAAR,QAAQ,CAAU;QAFtD,YAAO,GAAG,IAAI,4CAA4B,EAAE,CAAC;QAIrD,MAAM,MAAM,GAAG,CAAC,KAAiB,EAAE,EAAE;YACnC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAgB;QACnB,MAAM,MAAM,GAAG,4CAA4B,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE;YAC/B,qBAAqB;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,EAA8B;QACtC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,SAAS,CAAC,EAA4C;QACpD,MAAM,OAAO,GAAG,CAAC,QAAiB,EAAE,EAAE;YACpC,MAAM,IAAI,GAAW,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtC,MAAM,MAAM,GAAW,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YACnD,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../../src/common/connection/drivers/stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"center.d.ts","sourceRoot":"","sources":["../../../src/common/rpc-service/center.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"center.d.ts","sourceRoot":"","sources":["../../../src/common/rpc-service/center.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAM1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAIlE,qBAAa,gBAAgB;IAWf,OAAO,CAAC,KAAK,CAAC;IAVnB,GAAG,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,OAAO,CAAwB;IAEvC,OAAO,CAAC,eAAe,CAAyB;IAChD,OAAO,CAAC,gBAAgB,CAA0B;IAElD,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,MAAM,CAAU;gBAEJ,KAAK,CAAC,oBAAQ,EAAE,MAAM,CAAC,EAAE,OAAO;IAKpD,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI;IAQ7D,KAAK;IAIL,YAAY,CAAC,QAAQ,EAAE,aAAa;IAMpC,iBAAiB,CAAC,UAAU,EAAE,cAAc;;;IAoB5C,aAAa,CAAC,UAAU,EAAE,iBAAiB;;;IAkB3C,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB;IAItE,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IAM5C,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;CA6BlF;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAEpE;AACD,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAE/D;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,UAE9D"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getMethodName = exports.getRequestName = exports.getNotificationName = exports.RPCServiceCenter = void 0;
|
|
4
4
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
5
|
+
const arrays_1 = require("@opensumi/ide-utils/lib/arrays");
|
|
5
6
|
const constants_1 = require("../constants");
|
|
6
7
|
const types_1 = require("../types");
|
|
7
8
|
const proxy_1 = require("./proxy");
|
|
@@ -37,13 +38,12 @@ class RPCServiceCenter {
|
|
|
37
38
|
this.deferred.resolve();
|
|
38
39
|
}
|
|
39
40
|
this.protocolRegistry.applyTo(connection.io);
|
|
40
|
-
const index = this.proxies.length - 1;
|
|
41
41
|
const proxy = new proxy_1.ProxySumi(this.serviceRegistry, this.logger);
|
|
42
42
|
proxy.listen(connection);
|
|
43
|
-
this.proxies
|
|
43
|
+
const remove = (0, arrays_1.addElement)(this.proxies, proxy);
|
|
44
44
|
return {
|
|
45
45
|
dispose: () => {
|
|
46
|
-
|
|
46
|
+
remove.dispose();
|
|
47
47
|
proxy.dispose();
|
|
48
48
|
},
|
|
49
49
|
};
|
|
@@ -52,13 +52,12 @@ class RPCServiceCenter {
|
|
|
52
52
|
if (this.proxies.length === 0) {
|
|
53
53
|
this.deferred.resolve();
|
|
54
54
|
}
|
|
55
|
-
const index = this.proxies.length - 1;
|
|
56
55
|
const proxy = new proxy_1.ProxyJson(this.serviceRegistry, this.logger);
|
|
57
56
|
proxy.listen(connection);
|
|
58
|
-
this.proxies
|
|
57
|
+
const remove = (0, arrays_1.addElement)(this.proxies, proxy);
|
|
59
58
|
return {
|
|
60
59
|
dispose: () => {
|
|
61
|
-
|
|
60
|
+
remove.dispose();
|
|
62
61
|
proxy.dispose();
|
|
63
62
|
},
|
|
64
63
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"center.js","sourceRoot":"","sources":["../../../src/common/rpc-service/center.ts"],"names":[],"mappings":";;;AAAA,+DAAqD;
|
|
1
|
+
{"version":3,"file":"center.js","sourceRoot":"","sources":["../../../src/common/rpc-service/center.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
import { MatchFunction } from 'path-to-regexp';
|
|
2
|
+
import WebSocket from 'ws';
|
|
2
3
|
import { ILogger } from '../common';
|
|
3
4
|
import { WSWebSocketConnection } from '../common/connection';
|
|
4
5
|
import { BaseCommonChannelHandler, commonChannelPathHandler } from '../common/server-handler';
|
|
5
6
|
import { CommonChannelHandlerOptions, WebSocketHandler } from './ws';
|
|
6
7
|
export { commonChannelPathHandler };
|
|
8
|
+
export interface WebSocketConnection extends WebSocket {
|
|
9
|
+
routeParam: {
|
|
10
|
+
pathname: string;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
7
13
|
/**
|
|
8
14
|
* Channel Handler for nodejs
|
|
9
15
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-channel-handler.d.ts","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"common-channel-handler.d.ts","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,gBAAgB,CAAC;AACtD,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAErE,OAAO,EAAE,wBAAwB,EAAE,CAAC;AAEpC,MAAM,WAAW,mBAAoB,SAAQ,SAAS;IACpD,UAAU,EAAE;QACV,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,wBAAyB,YAAW,gBAAgB;IAIlC,OAAO,CAAC,OAAO;IAHzE,OAAO,CAAC,QAAQ,CAAmB;IACnC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;gBAE1B,SAAS,EAAE,MAAM,EAAE,MAAM,GAAE,OAAiB,EAAU,OAAO,GAAE,2BAAgC;IAM3G,WAAW,CAAC,UAAU,EAAE,qBAAqB,GAAG,IAAI;IAIpD,OAAO,CAAC,YAAY;IAYb,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO;CAgBtF"}
|
|
@@ -21,7 +21,7 @@ class CommonChannelHandler extends server_handler_1.BaseCommonChannelHandler {
|
|
|
21
21
|
connection.socket.ping();
|
|
22
22
|
}
|
|
23
23
|
initWSServer() {
|
|
24
|
-
this.logger.log('init
|
|
24
|
+
this.logger.log('init common channel handler');
|
|
25
25
|
this.wsServer = new ws_1.default.Server(Object.assign({ noServer: true }, this.options.wsServerOptions));
|
|
26
26
|
this.wsServer.on('connection', (connection) => {
|
|
27
27
|
const wsConnection = new connection_1.WSWebSocketConnection(connection);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-channel-handler.js","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":";;;;AAAA,mDAAsD;AACtD,oDAA2B;AAG3B,qDAA6D;AAC7D,6DAA8F;AAIrF,yGAJ0B,yCAAwB,OAI1B;
|
|
1
|
+
{"version":3,"file":"common-channel-handler.js","sourceRoot":"","sources":["../../src/node/common-channel-handler.ts"],"names":[],"mappings":";;;;AAAA,mDAAsD;AACtD,oDAA2B;AAG3B,qDAA6D;AAC7D,6DAA8F;AAIrF,yGAJ0B,yCAAwB,OAI1B;AAQjC;;GAEG;AACH,MAAa,oBAAqB,SAAQ,yCAAwB;IAIhE,YAAY,SAAiB,EAAE,SAAkB,OAAO,EAAU,UAAuC,EAAE;QACzG,KAAK,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC;QAD0B,YAAO,GAAP,OAAO,CAAkC;QAEzG,IAAI,CAAC,YAAY,GAAG,IAAA,sBAAK,EAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,EAAE,CAAC;IACtB,CAAC;IAED,WAAW,CAAC,UAAiC;QAC3C,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAEO,YAAY;QAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAS,CAAC,MAAM,iBAClC,QAAQ,EAAE,IAAI,IACX,IAAI,CAAC,OAAO,CAAC,eAAe,EAC/B,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,UAAqB,EAAE,EAAE;YACvD,MAAM,YAAY,GAAG,IAAI,kCAAqB,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,aAAa,CAAC,QAAgB,EAAE,OAAY,EAAE,MAAW,EAAE,IAAS;QACzE,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEhD,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,UAAU,EAAE,EAAE;gBAC/D,UAAkC,CAAC,UAAU,GAAG;oBAC/C,QAAQ;iBACT,CAAC;gBAEF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;SACb;QAED,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AA1CD,oDA0CC"}
|
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":";AACA,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../../src/node/ws.ts"],"names":[],"mappings":";AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,8BAAsB,gBAAgB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO;IACvF,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;CA2BtB"}
|
package/lib/node/ws.js
CHANGED
|
@@ -4,7 +4,6 @@ exports.WebSocketServerRoute = exports.WebSocketHandler = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const assert_1 = tslib_1.__importDefault(require("assert"));
|
|
6
6
|
const http_1 = tslib_1.__importDefault(require("http"));
|
|
7
|
-
const url_1 = tslib_1.__importDefault(require("url"));
|
|
8
7
|
class WebSocketHandler {
|
|
9
8
|
}
|
|
10
9
|
exports.WebSocketHandler = WebSocketHandler;
|
|
@@ -66,7 +65,9 @@ class WebSocketServerRoute {
|
|
|
66
65
|
const wsServerHandlerArr = this.wsServerHandlerArr;
|
|
67
66
|
server.on('upgrade', (request, socket, head) => {
|
|
68
67
|
(0, assert_1.default)(request.url, 'cannot parse url from http request');
|
|
69
|
-
|
|
68
|
+
// request.url: `/path?query=a#hash`
|
|
69
|
+
const url = new URL(request.url, 'wss://base');
|
|
70
|
+
const wsPathname = url.pathname;
|
|
70
71
|
let wsHandlerIndex = 0;
|
|
71
72
|
const wsHandlerLength = wsServerHandlerArr.length;
|
|
72
73
|
for (; wsHandlerIndex < wsHandlerLength; wsHandlerIndex++) {
|
package/lib/node/ws.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/node/ws.ts"],"names":[],"mappings":";;;;AAAA,4DAA4B;AAC5B,wDAAwB;
|
|
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.27.3-rc-
|
|
3
|
+
"version": "2.27.3-rc-1714982362.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -19,16 +19,16 @@
|
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@furyjs/fury": "0.5.9-beta",
|
|
21
21
|
"@opensumi/events": "^1.0.0",
|
|
22
|
-
"@opensumi/ide-core-common": "2.27.3-rc-
|
|
22
|
+
"@opensumi/ide-core-common": "2.27.3-rc-1714982362.0",
|
|
23
23
|
"@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
|
|
24
24
|
"path-to-regexp": "^6.2.1",
|
|
25
25
|
"reconnecting-websocket": "^4.4.0",
|
|
26
26
|
"ws": "^8.16.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
|
-
"@opensumi/ide-components": "2.27.3-rc-
|
|
30
|
-
"@opensumi/ide-dev-tool": "2.27.3-rc-
|
|
29
|
+
"@opensumi/ide-components": "2.27.3-rc-1714982362.0",
|
|
30
|
+
"@opensumi/ide-dev-tool": "2.27.3-rc-1714982362.0",
|
|
31
31
|
"@opensumi/mock-socket": "^9.3.1"
|
|
32
32
|
},
|
|
33
|
-
"gitHead": "
|
|
33
|
+
"gitHead": "197b8ef9917d764baced87ea93e800b1ce43ac82"
|
|
34
34
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IReporterService, REPORT_NAME } from '@opensumi/ide-core-common';
|
|
1
|
+
import { Barrier, Deferred, IReporterService, MultiMap, REPORT_NAME } from '@opensumi/ide-core-common';
|
|
2
2
|
|
|
3
3
|
import { NetSocketConnection } from '../common/connection';
|
|
4
4
|
import { ReconnectingWebSocketConnection } from '../common/connection/drivers/reconnecting-websocket';
|
|
@@ -10,12 +10,17 @@ import { WSChannel, parse, pingMessage } from '../common/ws-channel';
|
|
|
10
10
|
*/
|
|
11
11
|
export class WSChannelHandler {
|
|
12
12
|
private channelMap: Map<string, WSChannel> = new Map();
|
|
13
|
-
private channelCloseEventMap
|
|
13
|
+
private channelCloseEventMap = new MultiMap<string, WSCloseInfo>();
|
|
14
14
|
private logger = console;
|
|
15
15
|
public clientId: string;
|
|
16
16
|
private heartbeatMessageTimer: NodeJS.Timeout | null;
|
|
17
17
|
private reporterService: IReporterService;
|
|
18
18
|
|
|
19
|
+
/**
|
|
20
|
+
* 保证在连接建立后再执行后续操作
|
|
21
|
+
*/
|
|
22
|
+
private openingBarrier = new Barrier();
|
|
23
|
+
|
|
19
24
|
LOG_TAG: string;
|
|
20
25
|
|
|
21
26
|
constructor(public connection: ReconnectingWebSocketConnection | NetSocketConnection, logger: any, clientId: string) {
|
|
@@ -64,15 +69,8 @@ export class WSChannelHandler {
|
|
|
64
69
|
});
|
|
65
70
|
|
|
66
71
|
const reopenExistsChannel = () => {
|
|
67
|
-
if (this.channelMap.size) {
|
|
72
|
+
if (this.channelMap.size > 0) {
|
|
68
73
|
this.channelMap.forEach((channel) => {
|
|
69
|
-
channel.onOpen(() => {
|
|
70
|
-
const closeInfo = this.channelCloseEventMap.get(channel.id);
|
|
71
|
-
this.reporterService &&
|
|
72
|
-
this.reporterService.point(REPORT_NAME.CHANNEL_RECONNECT, REPORT_NAME.CHANNEL_RECONNECT, closeInfo);
|
|
73
|
-
this.logger.log(this.LOG_TAG, `channel reconnect ${this.clientId}:${channel.channelPath}`);
|
|
74
|
-
});
|
|
75
|
-
|
|
76
74
|
channel.open(channel.channelPath, this.clientId);
|
|
77
75
|
// 针对前端需要重新设置下后台状态的情况
|
|
78
76
|
channel.fireReopen();
|
|
@@ -80,52 +78,73 @@ export class WSChannelHandler {
|
|
|
80
78
|
}
|
|
81
79
|
};
|
|
82
80
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
81
|
+
this.connection.onClose((code, reason) => {
|
|
82
|
+
this.channelMap.forEach((channel) => {
|
|
83
|
+
channel.close(code ?? 1000, reason ?? '');
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
if (this.connection.isOpen()) {
|
|
88
|
+
this.heartbeatMessage();
|
|
89
|
+
this.openingBarrier.open();
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
this.connection.onOpen(() => {
|
|
93
|
+
this.heartbeatMessage();
|
|
94
|
+
// 说明是重连
|
|
95
|
+
if (this.openingBarrier.isOpen()) {
|
|
87
96
|
reopenExistsChannel();
|
|
88
97
|
} else {
|
|
89
|
-
this.
|
|
90
|
-
this.heartbeatMessage();
|
|
91
|
-
resolve();
|
|
92
|
-
reopenExistsChannel();
|
|
93
|
-
});
|
|
98
|
+
this.openingBarrier.open();
|
|
94
99
|
}
|
|
95
100
|
});
|
|
96
101
|
|
|
97
|
-
this.
|
|
98
|
-
if (this.channelMap.size) {
|
|
99
|
-
this.channelMap.forEach((channel) => {
|
|
100
|
-
channel.close(code ?? 1000, reason ?? '');
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
|
-
});
|
|
102
|
+
await this.openingBarrier.wait();
|
|
104
103
|
}
|
|
104
|
+
|
|
105
105
|
public async openChannel(channelPath: string) {
|
|
106
|
-
const channelId = `${this.clientId}:${channelPath}`;
|
|
107
106
|
const channel = new WSChannel(this.connection, {
|
|
108
|
-
id:
|
|
107
|
+
id: `${this.clientId}:${channelPath}`,
|
|
109
108
|
logger: this.logger,
|
|
110
109
|
});
|
|
111
|
-
|
|
112
110
|
this.channelMap.set(channel.id, channel);
|
|
113
111
|
|
|
114
|
-
|
|
115
|
-
channel.
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
channelPath,
|
|
121
|
-
closeEvent: { code, reason },
|
|
122
|
-
connectInfo: (navigator as any).connection as ConnectionInfo,
|
|
112
|
+
channel.onOpen(() => {
|
|
113
|
+
const closeInfo = this.channelCloseEventMap.get(channel.id);
|
|
114
|
+
if (closeInfo) {
|
|
115
|
+
closeInfo.forEach((info) => {
|
|
116
|
+
this.reporterService &&
|
|
117
|
+
this.reporterService.point(REPORT_NAME.CHANNEL_RECONNECT, REPORT_NAME.CHANNEL_RECONNECT, info);
|
|
123
118
|
});
|
|
124
|
-
|
|
119
|
+
|
|
120
|
+
this.channelCloseEventMap.delete(channel.id);
|
|
121
|
+
|
|
122
|
+
this.logger.log(this.LOG_TAG, `channel reconnect ${this.clientId}:${channel.channelPath}`);
|
|
123
|
+
} else {
|
|
124
|
+
this.logger.log(this.LOG_TAG, `channel open ${this.clientId}:${channel.channelPath}`);
|
|
125
|
+
}
|
|
126
|
+
});
|
|
127
|
+
|
|
128
|
+
channel.onClose((code: number, reason: string) => {
|
|
129
|
+
this.channelCloseEventMap.set(channel.id, {
|
|
130
|
+
channelPath,
|
|
131
|
+
closeEvent: { code, reason },
|
|
132
|
+
connectInfo: (navigator as any).connection as ConnectionInfo,
|
|
125
133
|
});
|
|
126
|
-
|
|
134
|
+
this.logger.log(this.LOG_TAG, 'channel close: ', `code: ${code}, reason: ${reason}`);
|
|
127
135
|
});
|
|
128
136
|
|
|
137
|
+
const deferred = new Deferred<void>();
|
|
138
|
+
|
|
139
|
+
const dispose = channel.onOpen(() => {
|
|
140
|
+
deferred.resolve();
|
|
141
|
+
dispose.dispose();
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
channel.open(channelPath, this.clientId);
|
|
145
|
+
|
|
146
|
+
await deferred.promise;
|
|
147
|
+
|
|
129
148
|
return channel;
|
|
130
149
|
}
|
|
131
150
|
|
|
@@ -52,9 +52,21 @@ export class ReconnectingWebSocketConnection extends BaseConnection<Uint8Array>
|
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
54
|
onceClose(cb: (code?: number, reason?: string) => void): IDisposable {
|
|
55
|
+
const disposable = this.onClose(wrapper);
|
|
56
|
+
|
|
57
|
+
return {
|
|
58
|
+
dispose: () => {
|
|
59
|
+
disposable.dispose();
|
|
60
|
+
},
|
|
61
|
+
};
|
|
62
|
+
function wrapper(code: number, reason: string) {
|
|
63
|
+
cb(code, reason);
|
|
64
|
+
disposable.dispose();
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
onClose(cb: (code?: number, reason?: string) => void): IDisposable {
|
|
55
68
|
const handler = (e: CloseEvent) => {
|
|
56
69
|
cb(e.code, e.reason);
|
|
57
|
-
this.socket.removeEventListener('close', handler);
|
|
58
70
|
};
|
|
59
71
|
|
|
60
72
|
this.socket.addEventListener('close', handler);
|
|
@@ -84,8 +96,6 @@ export class ReconnectingWebSocketConnection extends BaseConnection<Uint8Array>
|
|
|
84
96
|
static forURL(url: UrlProvider, protocols?: string | string[], options?: ReconnectingWebSocketOptions) {
|
|
85
97
|
const rawConnection = new ReconnectingWebSocket(url, protocols, options);
|
|
86
98
|
rawConnection.binaryType = 'arraybuffer';
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
return connection;
|
|
99
|
+
return new ReconnectingWebSocketConnection(rawConnection);
|
|
90
100
|
}
|
|
91
101
|
}
|
|
@@ -32,27 +32,38 @@ export class StreamConnection extends BaseConnection<Uint8Array> {
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
onceClose(cb: (code?: number, reason?: string) => void): IDisposable {
|
|
35
|
+
const disposable = this.onClose(wrapper);
|
|
36
|
+
return {
|
|
37
|
+
dispose: () => {
|
|
38
|
+
disposable.dispose();
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
function wrapper(code: number, reason: string) {
|
|
43
|
+
cb(code, reason);
|
|
44
|
+
disposable.dispose();
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
onClose(cb: (code?: number, reason?: string) => void): IDisposable {
|
|
35
49
|
const wrapper = (hadError: boolean) => {
|
|
36
50
|
const code: number = hadError ? 1 : 0;
|
|
37
51
|
const reason: string = hadError ? 'had error' : '';
|
|
38
52
|
cb(code, reason);
|
|
39
|
-
dispose();
|
|
40
|
-
};
|
|
41
|
-
|
|
42
|
-
const dispose = () => {
|
|
43
|
-
this.readable.off('close', wrapper);
|
|
44
|
-
if ((this.writable as any) !== (this.readable as any)) {
|
|
45
|
-
this.writable.off('close', wrapper);
|
|
46
|
-
}
|
|
47
53
|
};
|
|
48
54
|
|
|
49
|
-
this.readable.
|
|
55
|
+
this.readable.on('close', wrapper);
|
|
50
56
|
if ((this.writable as any) !== (this.readable as any)) {
|
|
51
|
-
this.writable.
|
|
57
|
+
this.writable.on('close', wrapper);
|
|
52
58
|
}
|
|
53
59
|
|
|
54
60
|
return {
|
|
55
|
-
dispose
|
|
61
|
+
dispose: () => {
|
|
62
|
+
this.readable.off('close', wrapper);
|
|
63
|
+
if ((this.writable as any) !== (this.readable as any)) {
|
|
64
|
+
this.writable.off('close', wrapper);
|
|
65
|
+
}
|
|
66
|
+
},
|
|
56
67
|
};
|
|
57
68
|
}
|
|
58
69
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Deferred } from '@opensumi/ide-core-common';
|
|
2
|
+
import { addElement } from '@opensumi/ide-utils/lib/arrays';
|
|
2
3
|
|
|
3
4
|
import { METHOD_NOT_REGISTERED } from '../constants';
|
|
4
5
|
import { TSumiProtocol } from '../rpc';
|
|
@@ -54,15 +55,14 @@ export class RPCServiceCenter {
|
|
|
54
55
|
|
|
55
56
|
this.protocolRegistry.applyTo(connection.io);
|
|
56
57
|
|
|
57
|
-
const index = this.proxies.length - 1;
|
|
58
58
|
const proxy = new ProxySumi(this.serviceRegistry, this.logger);
|
|
59
59
|
proxy.listen(connection);
|
|
60
60
|
|
|
61
|
-
this.proxies
|
|
61
|
+
const remove = addElement(this.proxies, proxy);
|
|
62
62
|
|
|
63
63
|
return {
|
|
64
64
|
dispose: () => {
|
|
65
|
-
|
|
65
|
+
remove.dispose();
|
|
66
66
|
proxy.dispose();
|
|
67
67
|
},
|
|
68
68
|
};
|
|
@@ -73,16 +73,14 @@ export class RPCServiceCenter {
|
|
|
73
73
|
this.deferred.resolve();
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
-
const index = this.proxies.length - 1;
|
|
77
|
-
|
|
78
76
|
const proxy = new ProxyJson(this.serviceRegistry, this.logger);
|
|
79
77
|
proxy.listen(connection);
|
|
80
78
|
|
|
81
|
-
this.proxies
|
|
79
|
+
const remove = addElement(this.proxies, proxy);
|
|
82
80
|
|
|
83
81
|
return {
|
|
84
82
|
dispose: () => {
|
|
85
|
-
|
|
83
|
+
remove.dispose();
|
|
86
84
|
proxy.dispose();
|
|
87
85
|
},
|
|
88
86
|
};
|
|
@@ -9,6 +9,12 @@ import { CommonChannelHandlerOptions, WebSocketHandler } from './ws';
|
|
|
9
9
|
|
|
10
10
|
export { commonChannelPathHandler };
|
|
11
11
|
|
|
12
|
+
export interface WebSocketConnection extends WebSocket {
|
|
13
|
+
routeParam: {
|
|
14
|
+
pathname: string;
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
|
|
12
18
|
/**
|
|
13
19
|
* Channel Handler for nodejs
|
|
14
20
|
*/
|
|
@@ -27,7 +33,7 @@ export class CommonChannelHandler extends BaseCommonChannelHandler implements We
|
|
|
27
33
|
}
|
|
28
34
|
|
|
29
35
|
private initWSServer() {
|
|
30
|
-
this.logger.log('init
|
|
36
|
+
this.logger.log('init common channel handler');
|
|
31
37
|
this.wsServer = new WebSocket.Server({
|
|
32
38
|
noServer: true,
|
|
33
39
|
...this.options.wsServerOptions,
|
|
@@ -43,7 +49,7 @@ export class CommonChannelHandler extends BaseCommonChannelHandler implements We
|
|
|
43
49
|
|
|
44
50
|
if (routeResult) {
|
|
45
51
|
this.wsServer.handleUpgrade(request, socket, head, (connection) => {
|
|
46
|
-
(connection as
|
|
52
|
+
(connection as WebSocketConnection).routeParam = {
|
|
47
53
|
pathname,
|
|
48
54
|
};
|
|
49
55
|
|
package/src/node/ws.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import assert from 'assert';
|
|
2
2
|
import http from 'http';
|
|
3
|
-
import url from 'url';
|
|
4
3
|
|
|
5
4
|
import ws from 'ws';
|
|
6
5
|
|
|
@@ -90,7 +89,10 @@ export class WebSocketServerRoute {
|
|
|
90
89
|
|
|
91
90
|
server.on('upgrade', (request, socket, head) => {
|
|
92
91
|
assert(request.url, 'cannot parse url from http request');
|
|
93
|
-
|
|
92
|
+
|
|
93
|
+
// request.url: `/path?query=a#hash`
|
|
94
|
+
const url = new URL(request.url, 'wss://base');
|
|
95
|
+
const wsPathname: string = url.pathname;
|
|
94
96
|
|
|
95
97
|
let wsHandlerIndex = 0;
|
|
96
98
|
const wsHandlerLength = wsServerHandlerArr.length;
|