@opensumi/ide-connection 3.0.1 → 3.0.2-next-1715606713.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.map +1 -1
- package/lib/browser/ws-channel-handler.js +17 -19
- package/lib/browser/ws-channel-handler.js.map +1 -1
- package/lib/common/rpc/multiplexer.d.ts +1 -1
- package/lib/common/rpc/multiplexer.d.ts.map +1 -1
- package/lib/common/rpc/multiplexer.js +2 -2
- package/lib/common/rpc/multiplexer.js.map +1 -1
- package/lib/common/server-handler.d.ts.map +1 -1
- package/lib/common/server-handler.js +2 -2
- package/lib/common/server-handler.js.map +1 -1
- package/lib/common/ws-channel.d.ts +19 -4
- package/lib/common/ws-channel.d.ts.map +1 -1
- package/lib/common/ws-channel.js +52 -17
- package/lib/common/ws-channel.js.map +1 -1
- package/package.json +5 -5
- package/src/browser/ws-channel-handler.ts +20 -18
- package/src/common/rpc/multiplexer.ts +2 -2
- package/src/common/server-handler.ts +3 -3
- package/src/common/ws-channel.ts +71 -28
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;IA+CX,WAAW,CAAC,WAAW,EAAE,MAAM;IAwDrC,OAAO;CAKf"}
|
|
@@ -36,33 +36,25 @@ class WSChannelHandler {
|
|
|
36
36
|
this.heartbeatMessageTimer = global.setTimeout(() => {
|
|
37
37
|
this.connection.send(ws_channel_1.pingMessage);
|
|
38
38
|
this.heartbeatMessage();
|
|
39
|
-
},
|
|
39
|
+
}, 10 * 1000);
|
|
40
40
|
}
|
|
41
41
|
async initHandler() {
|
|
42
42
|
this.connection.onMessage((message) => {
|
|
43
43
|
// 一个心跳周期内如果有收到消息，则不需要再发送心跳
|
|
44
44
|
this.heartbeatMessage();
|
|
45
45
|
const msg = (0, ws_channel_1.parse)(message);
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
channel.dispatchChannelMessage(msg);
|
|
53
|
-
}
|
|
54
|
-
else {
|
|
55
|
-
this.logger.warn(this.LOG_TAG, `channel ${msg.id} not found`);
|
|
56
|
-
}
|
|
57
|
-
}
|
|
46
|
+
const channel = this.channelMap.get(msg.id);
|
|
47
|
+
if (channel) {
|
|
48
|
+
channel.dispatch(msg);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
this.logger.warn(this.LOG_TAG, `channel ${msg.id} not found`);
|
|
58
52
|
}
|
|
59
53
|
});
|
|
60
54
|
const reopenExistsChannel = () => {
|
|
61
55
|
if (this.channelMap.size > 0) {
|
|
62
56
|
this.channelMap.forEach((channel) => {
|
|
63
57
|
channel.open(channel.channelPath, this.clientId);
|
|
64
|
-
// 针对前端需要重新设置下后台状态的情况
|
|
65
|
-
channel.fireReopen();
|
|
66
58
|
});
|
|
67
59
|
}
|
|
68
60
|
};
|
|
@@ -91,9 +83,19 @@ class WSChannelHandler {
|
|
|
91
83
|
const channel = new ws_channel_1.WSChannel(this.connection, {
|
|
92
84
|
id: `${this.clientId}:${channelPath}`,
|
|
93
85
|
logger: this.logger,
|
|
86
|
+
ensureServerReady: true,
|
|
94
87
|
});
|
|
95
88
|
this.channelMap.set(channel.id, channel);
|
|
89
|
+
let channelOpenedCount = 0;
|
|
96
90
|
channel.onOpen(() => {
|
|
91
|
+
channelOpenedCount++;
|
|
92
|
+
if (channelOpenedCount > 1) {
|
|
93
|
+
channel.fireReopen();
|
|
94
|
+
this.logger.log(this.LOG_TAG, `channel reconnect ${this.clientId}:${channel.channelPath}, count: ${channelOpenedCount}`);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
this.logger.log(this.LOG_TAG, `channel open ${this.clientId}:${channel.channelPath}`);
|
|
98
|
+
}
|
|
97
99
|
const closeInfo = this.channelCloseEventMap.get(channel.id);
|
|
98
100
|
if (closeInfo) {
|
|
99
101
|
closeInfo.forEach((info) => {
|
|
@@ -101,10 +103,6 @@ class WSChannelHandler {
|
|
|
101
103
|
this.reporterService.point(ide_core_common_1.REPORT_NAME.CHANNEL_RECONNECT, ide_core_common_1.REPORT_NAME.CHANNEL_RECONNECT, info);
|
|
102
104
|
});
|
|
103
105
|
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
106
|
}
|
|
109
107
|
});
|
|
110
108
|
channel.onClose((code, reason) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":";;;AAAA,+DAAuG;AAKvG,qDAAqE;AAErE;;GAEG;AACH,MAAa,gBAAgB;IAe3B,YAAmB,UAAiE,EAAE,MAAW,EAAE,QAAgB;QAAhG,eAAU,GAAV,UAAU,CAAuD;QAd5E,eAAU,GAA2B,IAAI,GAAG,EAAE,CAAC;QAC/C,yBAAoB,GAAG,IAAI,0BAAQ,EAAuB,CAAC;QAC3D,WAAM,GAAG,OAAO,CAAC;QAKzB;;WAEG;QACK,mBAAc,GAAG,IAAI,yBAAO,EAAE,CAAC;QAKrC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,iCAAiC,IAAI,CAAC,QAAQ,GAAG,CAAC;IACnE,CAAC;IACD,2BAA2B;IAC3B,aAAa,CAAC,MAAW;QACvB,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;IACH,CAAC;IACD,WAAW,CAAC,eAAiC;QAC3C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IACO,gBAAgB;QACtB,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QACD,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;YAClD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,wBAAW,CAAC,CAAC;YAClC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC,EAAE,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":";;;AAAA,+DAAuG;AAKvG,qDAAqE;AAErE;;GAEG;AACH,MAAa,gBAAgB;IAe3B,YAAmB,UAAiE,EAAE,MAAW,EAAE,QAAgB;QAAhG,eAAU,GAAV,UAAU,CAAuD;QAd5E,eAAU,GAA2B,IAAI,GAAG,EAAE,CAAC;QAC/C,yBAAoB,GAAG,IAAI,0BAAQ,EAAuB,CAAC;QAC3D,WAAM,GAAG,OAAO,CAAC;QAKzB;;WAEG;QACK,mBAAc,GAAG,IAAI,yBAAO,EAAE,CAAC;QAKrC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,iCAAiC,IAAI,CAAC,QAAQ,GAAG,CAAC;IACnE,CAAC;IACD,2BAA2B;IAC3B,aAAa,CAAC,MAAW;QACvB,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;SACtB;IACH,CAAC;IACD,WAAW,CAAC,eAAiC;QAC3C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;IACzC,CAAC;IACO,gBAAgB;QACtB,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;QACD,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;YAClD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,wBAAW,CAAC,CAAC;YAClC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,WAAW;QACtB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YACpC,2BAA2B;YAC3B,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAExB,MAAM,GAAG,GAAG,IAAA,kBAAK,EAAC,OAAO,CAAC,CAAC;YAE3B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC5C,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;aACvB;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,CAAC,EAAE,YAAY,CAAC,CAAC;aAC/D;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE;gBAC5B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnD,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACvC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAClC,OAAO,CAAC,KAAK,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,IAAI,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE;YAC5B,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;SAC5B;QAED,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC1B,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,QAAQ;YACR,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,EAAE;gBAChC,mBAAmB,EAAE,CAAC;aACvB;iBAAM;gBACL,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,WAAmB;QAC1C,MAAM,OAAO,GAAG,IAAI,sBAAS,CAAC,IAAI,CAAC,UAAU,EAAE;YAC7C,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,WAAW,EAAE;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAEzC,IAAI,kBAAkB,GAAG,CAAC,CAAC;QAE3B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAClB,kBAAkB,EAAE,CAAC;YACrB,IAAI,kBAAkB,GAAG,CAAC,EAAE;gBAC1B,OAAO,CAAC,UAAU,EAAE,CAAC;gBACrB,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,IAAI,CAAC,OAAO,EACZ,qBAAqB,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,YAAY,kBAAkB,EAAE,CAC1F,CAAC;aACH;iBAAM;gBACL,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;aACvF;YAED,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC5D,IAAI,SAAS,EAAE;gBACb,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACzB,IAAI,CAAC,eAAe;wBAClB,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,6BAAW,CAAC,iBAAiB,EAAE,6BAAW,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;gBACnG,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aAC9C;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,MAAc,EAAE,EAAE;YAC/C,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE;gBACxC,WAAW;gBACX,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;gBAC5B,WAAW,EAAG,SAAiB,CAAC,UAA4B;aAC7D,CAAC,CAAC;YACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,wBAAwB,IAAI,aAAa,MAAM,EAAE,CAAC,CAAC;QACnF,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,0BAAQ,EAAQ,CAAC;QAEtC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE;YAClC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzC,MAAM,QAAQ,CAAC,OAAO,CAAC;QAEvB,OAAO,OAAO,CAAC;IACjB,CAAC;IAEM,OAAO;QACZ,IAAI,IAAI,CAAC,qBAAqB,EAAE;YAC9B,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SAC1C;IACH,CAAC;CACF;AAnJD,4CAmJC"}
|
|
@@ -40,7 +40,7 @@ export declare class SumiConnectionMultiplexer extends SumiConnection implements
|
|
|
40
40
|
protected loadProtocol(rpcId: string, protocol: TSumiProtocol): void;
|
|
41
41
|
getProxy<T>(proxyId: ProxyIdentifier<T>): any;
|
|
42
42
|
protected _createProxy(rpcId: string): any;
|
|
43
|
-
|
|
43
|
+
invoke(rpcName: string, args: any[]): Promise<any>;
|
|
44
44
|
getSocket(): BaseConnection<Uint8Array>;
|
|
45
45
|
}
|
|
46
46
|
//# sourceMappingURL=multiplexer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiplexer.d.ts","sourceRoot":"","sources":["../../../src/common/rpc/multiplexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG/C,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,qBAAa,eAAe,CAAC,CAAC,GAAG,GAAG;IAClC,OAAc,KAAK,SAAK;IAExB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,OAAO,EAAE,MAAM,CAAC;gBACpB,SAAS,EAAE,MAAM;IAK7B,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM;CAG7B;AAED,MAAM,WAAW,iCAAkC,SAAQ,sBAAsB;IAC/E;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CAChD;AAED,eAAO,MAAM,YAAY,eAAyB,CAAC;AACnD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5C,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IACvD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;CAC3C;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,cAAe,YAAW,YAAY;IAqBvE,SAAS,CAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC;IAAE,SAAS,CAAC,OAAO,EAAE,iCAAiC;IApB9G,SAAS,CAAC,MAAM,CAAC,GAAG,SAAO;IAC3B,SAAS,CAAC,MAAM,CAAC,UAAU,SAAwC;IAEnE,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAIjE,SAAS,CAAC,MAAM,CAAC,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAKzE,SAAS,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,MAAM;IAIrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9C,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;gBAEnC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAAY,OAAO,GAAE,iCAAsC;IAc5G,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG;IAWpD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAI5C,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa;IAMtD,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IAe9C,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"multiplexer.d.ts","sourceRoot":"","sources":["../../../src/common/rpc/multiplexer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAG/C,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEtE,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,qBAAa,eAAe,CAAC,CAAC,GAAG,GAAG;IAClC,OAAc,KAAK,SAAK;IAExB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAClC,SAAgB,OAAO,EAAE,MAAM,CAAC;gBACpB,SAAS,EAAE,MAAM;IAK7B,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM;CAG7B;AAED,MAAM,WAAW,iCAAkC,SAAQ,sBAAsB;IAC/E;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CAChD;AAED,eAAO,MAAM,YAAY,eAAyB,CAAC;AACnD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAC5C,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;IACvD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;CAC3C;AAED;;GAEG;AACH,qBAAa,yBAA0B,SAAQ,cAAe,YAAW,YAAY;IAqBvE,SAAS,CAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC;IAAE,SAAS,CAAC,OAAO,EAAE,iCAAiC;IApB9G,SAAS,CAAC,MAAM,CAAC,GAAG,SAAO;IAC3B,SAAS,CAAC,MAAM,CAAC,UAAU,SAAwC;IAEnE,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAIjE,SAAS,CAAC,MAAM,CAAC,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAKzE,SAAS,CAAC,MAAM,CAAC,kBAAkB,CAAC,SAAS,EAAE,MAAM;IAIrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9C,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;gBAEnC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAAY,OAAO,GAAE,iCAAsC;IAc5G,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG;IAWpD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC;IAI5C,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa;IAMtD,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;IAe9C,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM;IAmBvB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAe/D,SAAS;CAGV"}
|
|
@@ -38,7 +38,7 @@ class SumiConnectionMultiplexer extends connection_1.SumiConnection {
|
|
|
38
38
|
this._proxies = new Map();
|
|
39
39
|
this._knownProtocols = options.knownProtocols || {};
|
|
40
40
|
this.io.setAnySerializer(new message_io_1.AnyProtocolSerializer(this.io.writer, this.io.reader, any_1.ExtObjectTransfer));
|
|
41
|
-
this.onRequestNotFound((rpcName, args) => this.
|
|
41
|
+
this.onRequestNotFound((rpcName, args) => this.invoke(rpcName, args));
|
|
42
42
|
// call `listen` implicitly
|
|
43
43
|
// compatible behavior with the RPCProtocol
|
|
44
44
|
this.listen();
|
|
@@ -87,7 +87,7 @@ class SumiConnectionMultiplexer extends connection_1.SumiConnection {
|
|
|
87
87
|
};
|
|
88
88
|
return new Proxy(Object.create(null), handler);
|
|
89
89
|
}
|
|
90
|
-
async
|
|
90
|
+
async invoke(rpcName, args) {
|
|
91
91
|
const [rpcId, methodName] = SumiConnectionMultiplexer.extractServiceAndMethod(rpcName);
|
|
92
92
|
const actor = this._locals.get(rpcId);
|
|
93
93
|
if (!actor) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiplexer.js","sourceRoot":"","sources":["../../../src/common/rpc/multiplexer.ts"],"names":[],"mappings":";;;AACA,6CAAwD;AAExD,6CAAsE;AACtE,6CAAqD;AAGrD,MAAa,eAAe;IAK1B,YAAY,SAAiB;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,OAAO,GAAG,EAAE,eAAe,CAAC,KAAK,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,SAAiB;QAC1B,OAAO,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;;AAZH,0CAaC;AAZe,qBAAK,GAAG,CAAC,CAAC;AAqBb,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAOnD;;GAEG;AACH,MAAa,yBAA0B,SAAQ,2BAAc;IAIjD,MAAM,CAAC,UAAU,CAAC,SAAiB,EAAE,UAAkB;QAC/D,OAAO,GAAG,SAAS,GAAG,yBAAyB,CAAC,GAAG,GAAG,UAAU,EAAE,CAAC;IACrE,CAAC;IAES,MAAM,CAAC,uBAAuB,CAAC,KAAa;QACpD,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,GAAG,yBAAyB,CAAC,UAAU,CAAC,CAAC,CAAC;IAChG,CAAC;IAES,MAAM,CAAC,kBAAkB,CAAC,SAAiB;QACnD,OAAO,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;IAMD,YAAsB,MAAkC,EAAY,UAA6C,EAAE;QACjH,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QADH,WAAM,GAAN,MAAM,CAA4B;QAAY,YAAO,GAAP,OAAO,CAAwC;QAEjH,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,IAAI,EAAE,CAAC;QACpD,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,IAAI,kCAAqB,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,uBAAiB,CAAC,CAAC,CAAC;QAEvG,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAe,EAAE,IAAW,EAAE,EAAE,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"multiplexer.js","sourceRoot":"","sources":["../../../src/common/rpc/multiplexer.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EAAkB,SAAS,
|
|
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,EAAkB,SAAS,EAAuC,MAAM,cAAc,CAAC;AAE9F,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,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM;IAsBtE,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,SAAS,CAAC,CAAa;IAEzD,cAAc,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,CAAQ;gBAE1B,SAAS,EAAE,MAAM,EAAY,MAAM,GAAE,OAAiB;IAEzE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,GAAG,GAAG,IAAI;IAE3C,OAAO,CAAC,SAAS;IAajB,iBAAiB,CAAC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAsD1D,OAAO;CAKR;AAED,eAAO,MAAM,qBAAqB,eAAe,CAAC"}
|
|
@@ -120,7 +120,7 @@ class BaseCommonChannelHandler {
|
|
|
120
120
|
const { id, path } = msg;
|
|
121
121
|
clientId = msg.clientId;
|
|
122
122
|
this.logger.log(`open a new connection channel ${clientId} with path ${path}`);
|
|
123
|
-
const channel = new ws_channel_1.
|
|
123
|
+
const channel = new ws_channel_1.WSServerChannel(connection, { id, logger: this.logger });
|
|
124
124
|
this.channelMap.set(id, channel);
|
|
125
125
|
exports.commonChannelPathHandler.dispatchChannelOpen(path, channel, clientId);
|
|
126
126
|
channel.serverReady();
|
|
@@ -130,7 +130,7 @@ class BaseCommonChannelHandler {
|
|
|
130
130
|
const { id } = msg;
|
|
131
131
|
const channel = this.channelMap.get(id);
|
|
132
132
|
if (channel) {
|
|
133
|
-
channel.
|
|
133
|
+
channel.dispatch(msg);
|
|
134
134
|
}
|
|
135
135
|
else {
|
|
136
136
|
this.logger.warn(`channel ${id} is not found`);
|
|
@@ -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,4 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from '@opensumi/events';
|
|
2
|
+
import { DisposableStore, EventQueue } from '@opensumi/ide-core-common';
|
|
2
3
|
import { IConnectionShape } from './connection/types';
|
|
3
4
|
import { ISumiConnectionOptions, SumiConnection } from './rpc/connection';
|
|
4
5
|
import { ILogger } from './types';
|
|
@@ -65,9 +66,11 @@ export interface IWSChannelCreateOptions {
|
|
|
65
66
|
*/
|
|
66
67
|
id: string;
|
|
67
68
|
logger?: ILogger;
|
|
69
|
+
ensureServerReady?: boolean;
|
|
68
70
|
}
|
|
69
71
|
export declare class WSChannel {
|
|
70
72
|
connection: IConnectionShape<Uint8Array>;
|
|
73
|
+
protected _disposables: DisposableStore;
|
|
71
74
|
protected emitter: EventEmitter<{
|
|
72
75
|
message: [data: string];
|
|
73
76
|
open: [id: string];
|
|
@@ -75,17 +78,23 @@ export declare class WSChannel {
|
|
|
75
78
|
close: [code?: number, reason?: string];
|
|
76
79
|
binary: [data: Uint8Array];
|
|
77
80
|
}>;
|
|
81
|
+
protected onBinaryQueue: EventQueue<Uint8Array>;
|
|
82
|
+
protected sendQueue: Uint8Array[];
|
|
83
|
+
protected _isServerReady: boolean;
|
|
84
|
+
protected _ensureServerReady: boolean | undefined;
|
|
78
85
|
id: string;
|
|
79
86
|
channelPath: string;
|
|
80
87
|
logger: ILogger;
|
|
81
88
|
static forClient(connection: IConnectionShape<Uint8Array>, options: IWSChannelCreateOptions): WSChannel;
|
|
82
89
|
constructor(connection: IConnectionShape<Uint8Array>, options: IWSChannelCreateOptions);
|
|
90
|
+
protected inqueue(data: Uint8Array): void;
|
|
83
91
|
onMessage(cb: (data: string) => any): import("@opensumi/events").IDisposable;
|
|
84
|
-
onBinary(cb: (data: Uint8Array) => any): import("@opensumi/
|
|
92
|
+
onBinary(cb: (data: Uint8Array) => any): import("@opensumi/ide-core-common").IDisposable;
|
|
85
93
|
onOpen(cb: (id: string) => void): import("@opensumi/events").IDisposable;
|
|
86
94
|
onReopen(cb: () => void): import("@opensumi/events").IDisposable;
|
|
87
|
-
|
|
88
|
-
|
|
95
|
+
pause(): void;
|
|
96
|
+
resume(): void;
|
|
97
|
+
dispatch(msg: ChannelMessage): void;
|
|
89
98
|
open(path: string, clientId: string): void;
|
|
90
99
|
send(content: string): void;
|
|
91
100
|
sendBinary(data: Uint8Array): void;
|
|
@@ -96,13 +105,19 @@ export declare class WSChannel {
|
|
|
96
105
|
onceClose(cb: (code: number, reason: string) => void): import("@opensumi/events").IDisposable;
|
|
97
106
|
createConnection(): {
|
|
98
107
|
onceClose: (cb: (code: number, reason: string) => void) => import("@opensumi/events").IDisposable;
|
|
99
|
-
onMessage: (cb: (data: Uint8Array) => any) => import("@opensumi/
|
|
108
|
+
onMessage: (cb: (data: Uint8Array) => any) => import("@opensumi/ide-core-common").IDisposable;
|
|
100
109
|
send: (data: Uint8Array) => void;
|
|
101
110
|
dispose(): void;
|
|
102
111
|
};
|
|
103
112
|
createSumiConnection(options?: ISumiConnectionOptions): SumiConnection;
|
|
104
113
|
dispose(): void;
|
|
105
114
|
}
|
|
115
|
+
/**
|
|
116
|
+
* The server side channel, it will send a `server-ready` message after it receive a `open` message.
|
|
117
|
+
*/
|
|
118
|
+
export declare class WSServerChannel extends WSChannel {
|
|
119
|
+
serverReady(): void;
|
|
120
|
+
}
|
|
106
121
|
export declare const PingProtocol: {
|
|
107
122
|
type: import("@furyjs/fury").InternalSerializerType.FURY_TYPE_TAG;
|
|
108
123
|
options: {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"ws-channel.d.ts","sourceRoot":"","sources":["../../src/common/ws-channel.ts"],"names":[],"mappings":"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"}
|
package/lib/common/ws-channel.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.pongMessage = exports.pingMessage = exports.parse = exports.stringify = exports.CloseProtocol = exports.BinaryProtocol = exports.DataProtocol = exports.ServerReadyProtocol = exports.OpenProtocol = exports.PongProtocol = exports.PingProtocol = exports.WSChannel = void 0;
|
|
3
|
+
exports.pongMessage = exports.pingMessage = exports.parse = exports.stringify = exports.CloseProtocol = exports.BinaryProtocol = exports.DataProtocol = exports.ServerReadyProtocol = exports.OpenProtocol = exports.PongProtocol = exports.PingProtocol = exports.WSServerChannel = exports.WSChannel = void 0;
|
|
4
4
|
const fury_1 = require("@furyjs/fury");
|
|
5
5
|
const events_1 = require("@opensumi/events");
|
|
6
6
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
@@ -11,29 +11,44 @@ class WSChannel {
|
|
|
11
11
|
const disposable = new ide_core_common_1.DisposableCollection();
|
|
12
12
|
const channel = new WSChannel(connection, options);
|
|
13
13
|
disposable.push(connection.onMessage((data) => {
|
|
14
|
-
channel.
|
|
14
|
+
channel.dispatch(parse(data));
|
|
15
15
|
}));
|
|
16
|
-
|
|
17
|
-
disposable.push(connection.onceClose(() => {
|
|
16
|
+
connection.onceClose(() => {
|
|
18
17
|
disposable.dispose();
|
|
19
|
-
})
|
|
18
|
+
});
|
|
20
19
|
return channel;
|
|
21
20
|
}
|
|
22
21
|
constructor(connection, options) {
|
|
23
22
|
this.connection = connection;
|
|
24
|
-
this.
|
|
23
|
+
this._disposables = new ide_core_common_1.DisposableStore();
|
|
24
|
+
this.emitter = this._disposables.add(new events_1.EventEmitter());
|
|
25
|
+
this.onBinaryQueue = this._disposables.add(new ide_core_common_1.EventQueue());
|
|
26
|
+
this.sendQueue = [];
|
|
27
|
+
this._isServerReady = false;
|
|
25
28
|
this.logger = console;
|
|
26
|
-
const { id, logger } = options;
|
|
29
|
+
const { id, logger, ensureServerReady } = options;
|
|
27
30
|
this.id = id;
|
|
28
31
|
if (logger) {
|
|
29
32
|
this.logger = logger;
|
|
30
33
|
}
|
|
34
|
+
this._ensureServerReady = Boolean(ensureServerReady);
|
|
35
|
+
this._disposables.add(this.emitter.on('binary', (data) => this.onBinaryQueue.push(data)));
|
|
36
|
+
}
|
|
37
|
+
inqueue(data) {
|
|
38
|
+
if (this._ensureServerReady && !this._isServerReady) {
|
|
39
|
+
if (!this.sendQueue) {
|
|
40
|
+
this.sendQueue = [];
|
|
41
|
+
}
|
|
42
|
+
this.sendQueue.push(data);
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
this.connection.send(data);
|
|
31
46
|
}
|
|
32
47
|
onMessage(cb) {
|
|
33
48
|
return this.emitter.on('message', cb);
|
|
34
49
|
}
|
|
35
50
|
onBinary(cb) {
|
|
36
|
-
return this.
|
|
51
|
+
return this.onBinaryQueue.on(cb);
|
|
37
52
|
}
|
|
38
53
|
onOpen(cb) {
|
|
39
54
|
return this.emitter.on('open', cb);
|
|
@@ -41,15 +56,22 @@ class WSChannel {
|
|
|
41
56
|
onReopen(cb) {
|
|
42
57
|
return this.emitter.on('reopen', cb);
|
|
43
58
|
}
|
|
44
|
-
|
|
45
|
-
this.
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
59
|
+
pause() {
|
|
60
|
+
this._isServerReady = false;
|
|
61
|
+
}
|
|
62
|
+
resume() {
|
|
63
|
+
this._isServerReady = true;
|
|
64
|
+
if (this.sendQueue) {
|
|
65
|
+
for (const item of this.sendQueue) {
|
|
66
|
+
this.connection.send(item);
|
|
67
|
+
}
|
|
68
|
+
this.sendQueue = [];
|
|
69
|
+
}
|
|
49
70
|
}
|
|
50
|
-
|
|
71
|
+
dispatch(msg) {
|
|
51
72
|
switch (msg.kind) {
|
|
52
73
|
case 'server-ready':
|
|
74
|
+
this.resume();
|
|
53
75
|
this.emitter.emit('open', msg.id);
|
|
54
76
|
break;
|
|
55
77
|
case 'data':
|
|
@@ -70,14 +92,14 @@ class WSChannel {
|
|
|
70
92
|
}));
|
|
71
93
|
}
|
|
72
94
|
send(content) {
|
|
73
|
-
this.
|
|
95
|
+
this.inqueue(stringify({
|
|
74
96
|
kind: 'data',
|
|
75
97
|
id: this.id,
|
|
76
98
|
content,
|
|
77
99
|
}));
|
|
78
100
|
}
|
|
79
101
|
sendBinary(data) {
|
|
80
|
-
this.
|
|
102
|
+
this.inqueue(stringify({
|
|
81
103
|
kind: 'binary',
|
|
82
104
|
id: this.id,
|
|
83
105
|
binary: data,
|
|
@@ -85,6 +107,7 @@ class WSChannel {
|
|
|
85
107
|
}
|
|
86
108
|
onError() { }
|
|
87
109
|
close(code, reason) {
|
|
110
|
+
this.pause();
|
|
88
111
|
this.emitter.emit('close', code, reason);
|
|
89
112
|
}
|
|
90
113
|
fireReopen() {
|
|
@@ -111,10 +134,22 @@ class WSChannel {
|
|
|
111
134
|
return conn;
|
|
112
135
|
}
|
|
113
136
|
dispose() {
|
|
114
|
-
this.
|
|
137
|
+
this._disposables.dispose();
|
|
115
138
|
}
|
|
116
139
|
}
|
|
117
140
|
exports.WSChannel = WSChannel;
|
|
141
|
+
/**
|
|
142
|
+
* The server side channel, it will send a `server-ready` message after it receive a `open` message.
|
|
143
|
+
*/
|
|
144
|
+
class WSServerChannel extends WSChannel {
|
|
145
|
+
serverReady() {
|
|
146
|
+
this.connection.send(stringify({
|
|
147
|
+
kind: 'server-ready',
|
|
148
|
+
id: this.id,
|
|
149
|
+
}));
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
exports.WSServerChannel = WSServerChannel;
|
|
118
153
|
exports.PingProtocol = fury_1.Type.object('ping', {
|
|
119
154
|
clientId: fury_1.Type.string(),
|
|
120
155
|
id: fury_1.Type.string(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel.js","sourceRoot":"","sources":["../../src/common/ws-channel.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAEpC,6CAAgD;AAChD,+
|
|
1
|
+
{"version":3,"file":"ws-channel.js","sourceRoot":"","sources":["../../src/common/ws-channel.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": "3.0.
|
|
3
|
+
"version": "3.0.2-next-1715606713.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": "3.0.
|
|
22
|
+
"@opensumi/ide-core-common": "3.0.2-next-1715606713.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": "3.0.
|
|
30
|
-
"@opensumi/ide-dev-tool": "3.0.
|
|
29
|
+
"@opensumi/ide-components": "3.0.2-next-1715606713.0",
|
|
30
|
+
"@opensumi/ide-dev-tool": "3.0.2-next-1715606713.0",
|
|
31
31
|
"@opensumi/mock-socket": "^9.3.1"
|
|
32
32
|
},
|
|
33
|
-
"gitHead": "
|
|
33
|
+
"gitHead": "96373325c9744f04c80cd5abe366b0d4b66e80d0"
|
|
34
34
|
}
|
|
@@ -44,7 +44,7 @@ export class WSChannelHandler {
|
|
|
44
44
|
this.heartbeatMessageTimer = global.setTimeout(() => {
|
|
45
45
|
this.connection.send(pingMessage);
|
|
46
46
|
this.heartbeatMessage();
|
|
47
|
-
},
|
|
47
|
+
}, 10 * 1000);
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
public async initHandler() {
|
|
@@ -54,17 +54,11 @@ export class WSChannelHandler {
|
|
|
54
54
|
|
|
55
55
|
const msg = parse(message);
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
if (channel) {
|
|
63
|
-
channel.dispatchChannelMessage(msg);
|
|
64
|
-
} else {
|
|
65
|
-
this.logger.warn(this.LOG_TAG, `channel ${msg.id} not found`);
|
|
66
|
-
}
|
|
67
|
-
}
|
|
57
|
+
const channel = this.channelMap.get(msg.id);
|
|
58
|
+
if (channel) {
|
|
59
|
+
channel.dispatch(msg);
|
|
60
|
+
} else {
|
|
61
|
+
this.logger.warn(this.LOG_TAG, `channel ${msg.id} not found`);
|
|
68
62
|
}
|
|
69
63
|
});
|
|
70
64
|
|
|
@@ -72,8 +66,6 @@ export class WSChannelHandler {
|
|
|
72
66
|
if (this.channelMap.size > 0) {
|
|
73
67
|
this.channelMap.forEach((channel) => {
|
|
74
68
|
channel.open(channel.channelPath, this.clientId);
|
|
75
|
-
// 针对前端需要重新设置下后台状态的情况
|
|
76
|
-
channel.fireReopen();
|
|
77
69
|
});
|
|
78
70
|
}
|
|
79
71
|
};
|
|
@@ -106,10 +98,24 @@ export class WSChannelHandler {
|
|
|
106
98
|
const channel = new WSChannel(this.connection, {
|
|
107
99
|
id: `${this.clientId}:${channelPath}`,
|
|
108
100
|
logger: this.logger,
|
|
101
|
+
ensureServerReady: true,
|
|
109
102
|
});
|
|
110
103
|
this.channelMap.set(channel.id, channel);
|
|
111
104
|
|
|
105
|
+
let channelOpenedCount = 0;
|
|
106
|
+
|
|
112
107
|
channel.onOpen(() => {
|
|
108
|
+
channelOpenedCount++;
|
|
109
|
+
if (channelOpenedCount > 1) {
|
|
110
|
+
channel.fireReopen();
|
|
111
|
+
this.logger.log(
|
|
112
|
+
this.LOG_TAG,
|
|
113
|
+
`channel reconnect ${this.clientId}:${channel.channelPath}, count: ${channelOpenedCount}`,
|
|
114
|
+
);
|
|
115
|
+
} else {
|
|
116
|
+
this.logger.log(this.LOG_TAG, `channel open ${this.clientId}:${channel.channelPath}`);
|
|
117
|
+
}
|
|
118
|
+
|
|
113
119
|
const closeInfo = this.channelCloseEventMap.get(channel.id);
|
|
114
120
|
if (closeInfo) {
|
|
115
121
|
closeInfo.forEach((info) => {
|
|
@@ -118,10 +124,6 @@ export class WSChannelHandler {
|
|
|
118
124
|
});
|
|
119
125
|
|
|
120
126
|
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
127
|
}
|
|
126
128
|
});
|
|
127
129
|
|
|
@@ -65,7 +65,7 @@ export class SumiConnectionMultiplexer extends SumiConnection implements IRPCPro
|
|
|
65
65
|
this._knownProtocols = options.knownProtocols || {};
|
|
66
66
|
this.io.setAnySerializer(new AnyProtocolSerializer(this.io.writer, this.io.reader, ExtObjectTransfer));
|
|
67
67
|
|
|
68
|
-
this.onRequestNotFound((rpcName: string, args: any[]) => this.
|
|
68
|
+
this.onRequestNotFound((rpcName: string, args: any[]) => this.invoke(rpcName, args));
|
|
69
69
|
|
|
70
70
|
// call `listen` implicitly
|
|
71
71
|
// compatible behavior with the RPCProtocol
|
|
@@ -127,7 +127,7 @@ export class SumiConnectionMultiplexer extends SumiConnection implements IRPCPro
|
|
|
127
127
|
return new Proxy(Object.create(null), handler);
|
|
128
128
|
}
|
|
129
129
|
|
|
130
|
-
|
|
130
|
+
public async invoke(rpcName: string, args: any[]): Promise<any> {
|
|
131
131
|
const [rpcId, methodName] = SumiConnectionMultiplexer.extractServiceAndMethod(rpcName);
|
|
132
132
|
|
|
133
133
|
const actor = this._locals.get(rpcId);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IConnectionShape } from './connection/types';
|
|
2
2
|
import { ILogger } from './types';
|
|
3
|
-
import { ChannelMessage, WSChannel, parse, pongMessage } from './ws-channel';
|
|
3
|
+
import { ChannelMessage, WSChannel, WSServerChannel, parse, pongMessage } from './ws-channel';
|
|
4
4
|
|
|
5
5
|
export interface IPathHandler {
|
|
6
6
|
dispose: (channel: WSChannel, connectionId: string) => void;
|
|
@@ -137,7 +137,7 @@ export abstract class BaseCommonChannelHandler {
|
|
|
137
137
|
clientId = msg.clientId;
|
|
138
138
|
this.logger.log(`open a new connection channel ${clientId} with path ${path}`);
|
|
139
139
|
|
|
140
|
-
const channel = new
|
|
140
|
+
const channel = new WSServerChannel(connection, { id, logger: this.logger });
|
|
141
141
|
this.channelMap.set(id, channel);
|
|
142
142
|
|
|
143
143
|
commonChannelPathHandler.dispatchChannelOpen(path, channel, clientId);
|
|
@@ -148,7 +148,7 @@ export abstract class BaseCommonChannelHandler {
|
|
|
148
148
|
const { id } = msg;
|
|
149
149
|
const channel = this.channelMap.get(id);
|
|
150
150
|
if (channel) {
|
|
151
|
-
channel.
|
|
151
|
+
channel.dispatch(msg);
|
|
152
152
|
} else {
|
|
153
153
|
this.logger.warn(`channel ${id} is not found`);
|
|
154
154
|
}
|
package/src/common/ws-channel.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Type } from '@furyjs/fury';
|
|
2
2
|
|
|
3
3
|
import { EventEmitter } from '@opensumi/events';
|
|
4
|
-
import { DisposableCollection } from '@opensumi/ide-core-common';
|
|
4
|
+
import { DisposableCollection, DisposableStore, EventQueue } from '@opensumi/ide-core-common';
|
|
5
5
|
|
|
6
6
|
import { IConnectionShape } from './connection/types';
|
|
7
7
|
import { oneOf7 } from './fury-extends/one-of';
|
|
@@ -86,16 +86,27 @@ export interface IWSChannelCreateOptions {
|
|
|
86
86
|
*/
|
|
87
87
|
id: string;
|
|
88
88
|
logger?: ILogger;
|
|
89
|
+
|
|
90
|
+
ensureServerReady?: boolean;
|
|
89
91
|
}
|
|
90
92
|
|
|
91
93
|
export class WSChannel {
|
|
92
|
-
protected
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
94
|
+
protected _disposables = new DisposableStore();
|
|
95
|
+
protected emitter = this._disposables.add(
|
|
96
|
+
new EventEmitter<{
|
|
97
|
+
message: [data: string];
|
|
98
|
+
open: [id: string];
|
|
99
|
+
reopen: [];
|
|
100
|
+
close: [code?: number, reason?: string];
|
|
101
|
+
binary: [data: Uint8Array];
|
|
102
|
+
}>(),
|
|
103
|
+
);
|
|
104
|
+
|
|
105
|
+
protected onBinaryQueue = this._disposables.add(new EventQueue<Uint8Array>());
|
|
106
|
+
|
|
107
|
+
protected sendQueue: Uint8Array[] = [];
|
|
108
|
+
protected _isServerReady = false;
|
|
109
|
+
protected _ensureServerReady: boolean | undefined;
|
|
99
110
|
|
|
100
111
|
public id: string;
|
|
101
112
|
|
|
@@ -109,34 +120,46 @@ export class WSChannel {
|
|
|
109
120
|
|
|
110
121
|
disposable.push(
|
|
111
122
|
connection.onMessage((data) => {
|
|
112
|
-
channel.
|
|
123
|
+
channel.dispatch(parse(data));
|
|
113
124
|
}),
|
|
114
125
|
);
|
|
115
|
-
disposable.push(channel);
|
|
116
126
|
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
}),
|
|
121
|
-
);
|
|
127
|
+
connection.onceClose(() => {
|
|
128
|
+
disposable.dispose();
|
|
129
|
+
});
|
|
122
130
|
|
|
123
131
|
return channel;
|
|
124
132
|
}
|
|
125
133
|
|
|
126
134
|
constructor(public connection: IConnectionShape<Uint8Array>, options: IWSChannelCreateOptions) {
|
|
127
|
-
const { id, logger } = options;
|
|
135
|
+
const { id, logger, ensureServerReady } = options;
|
|
128
136
|
this.id = id;
|
|
129
137
|
|
|
130
138
|
if (logger) {
|
|
131
139
|
this.logger = logger;
|
|
132
140
|
}
|
|
141
|
+
|
|
142
|
+
this._ensureServerReady = Boolean(ensureServerReady);
|
|
143
|
+
|
|
144
|
+
this._disposables.add(this.emitter.on('binary', (data) => this.onBinaryQueue.push(data)));
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
protected inqueue(data: Uint8Array) {
|
|
148
|
+
if (this._ensureServerReady && !this._isServerReady) {
|
|
149
|
+
if (!this.sendQueue) {
|
|
150
|
+
this.sendQueue = [];
|
|
151
|
+
}
|
|
152
|
+
this.sendQueue.push(data);
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
this.connection.send(data);
|
|
133
156
|
}
|
|
134
157
|
|
|
135
158
|
onMessage(cb: (data: string) => any) {
|
|
136
159
|
return this.emitter.on('message', cb);
|
|
137
160
|
}
|
|
138
161
|
onBinary(cb: (data: Uint8Array) => any) {
|
|
139
|
-
return this.
|
|
162
|
+
return this.onBinaryQueue.on(cb);
|
|
140
163
|
}
|
|
141
164
|
onOpen(cb: (id: string) => void) {
|
|
142
165
|
return this.emitter.on('open', cb);
|
|
@@ -145,18 +168,24 @@ export class WSChannel {
|
|
|
145
168
|
return this.emitter.on('reopen', cb);
|
|
146
169
|
}
|
|
147
170
|
|
|
148
|
-
|
|
149
|
-
this.
|
|
150
|
-
stringify({
|
|
151
|
-
kind: 'server-ready',
|
|
152
|
-
id: this.id,
|
|
153
|
-
}),
|
|
154
|
-
);
|
|
171
|
+
pause() {
|
|
172
|
+
this._isServerReady = false;
|
|
155
173
|
}
|
|
156
174
|
|
|
157
|
-
|
|
175
|
+
resume() {
|
|
176
|
+
this._isServerReady = true;
|
|
177
|
+
if (this.sendQueue) {
|
|
178
|
+
for (const item of this.sendQueue) {
|
|
179
|
+
this.connection.send(item);
|
|
180
|
+
}
|
|
181
|
+
this.sendQueue = [];
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
|
|
185
|
+
dispatch(msg: ChannelMessage) {
|
|
158
186
|
switch (msg.kind) {
|
|
159
187
|
case 'server-ready':
|
|
188
|
+
this.resume();
|
|
160
189
|
this.emitter.emit('open', msg.id);
|
|
161
190
|
break;
|
|
162
191
|
case 'data':
|
|
@@ -181,7 +210,7 @@ export class WSChannel {
|
|
|
181
210
|
}
|
|
182
211
|
|
|
183
212
|
send(content: string) {
|
|
184
|
-
this.
|
|
213
|
+
this.inqueue(
|
|
185
214
|
stringify({
|
|
186
215
|
kind: 'data',
|
|
187
216
|
id: this.id,
|
|
@@ -191,7 +220,7 @@ export class WSChannel {
|
|
|
191
220
|
}
|
|
192
221
|
|
|
193
222
|
sendBinary(data: Uint8Array) {
|
|
194
|
-
this.
|
|
223
|
+
this.inqueue(
|
|
195
224
|
stringify({
|
|
196
225
|
kind: 'binary',
|
|
197
226
|
id: this.id,
|
|
@@ -201,6 +230,7 @@ export class WSChannel {
|
|
|
201
230
|
}
|
|
202
231
|
onError() {}
|
|
203
232
|
close(code?: number, reason?: string) {
|
|
233
|
+
this.pause();
|
|
204
234
|
this.emitter.emit('close', code, reason);
|
|
205
235
|
}
|
|
206
236
|
fireReopen() {
|
|
@@ -230,10 +260,23 @@ export class WSChannel {
|
|
|
230
260
|
}
|
|
231
261
|
|
|
232
262
|
dispose() {
|
|
233
|
-
this.
|
|
263
|
+
this._disposables.dispose();
|
|
234
264
|
}
|
|
235
265
|
}
|
|
236
266
|
|
|
267
|
+
/**
|
|
268
|
+
* The server side channel, it will send a `server-ready` message after it receive a `open` message.
|
|
269
|
+
*/
|
|
270
|
+
export class WSServerChannel extends WSChannel {
|
|
271
|
+
serverReady() {
|
|
272
|
+
this.connection.send(
|
|
273
|
+
stringify({
|
|
274
|
+
kind: 'server-ready',
|
|
275
|
+
id: this.id,
|
|
276
|
+
}),
|
|
277
|
+
);
|
|
278
|
+
}
|
|
279
|
+
}
|
|
237
280
|
export const PingProtocol = Type.object('ping', {
|
|
238
281
|
clientId: Type.string(),
|
|
239
282
|
id: Type.string(),
|