@opensumi/ide-connection 2.26.8 → 2.26.9-next-1695201123.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 +1 -0
- package/lib/browser/ws-channel-handler.d.ts.map +1 -1
- package/lib/browser/ws-channel-handler.js +19 -1
- package/lib/browser/ws-channel-handler.js.map +1 -1
- package/lib/common/utils.d.ts +14 -0
- package/lib/common/utils.d.ts.map +1 -1
- package/lib/common/utils.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/ws-channel-handler.ts +21 -2
- package/src/common/utils.ts +13 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel-handler.d.ts","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAe,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGvF,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"ws-channel-handler.d.ts","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAe,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGvF,OAAO,EAAE,SAAS,EAAiB,MAAM,sBAAsB,CAAC;AAGhE,qBAAa,gBAAgB;IASR,MAAM,EAAE,WAAW;IAAsB,SAAS,CAAC;IAR/D,UAAU,EAAE,SAAS,CAAC;IAC7B,OAAO,CAAC,UAAU,CAA8C;IAChE,OAAO,CAAC,oBAAoB,CAAgD;IAC5E,OAAO,CAAC,MAAM,CAAW;IAClB,QAAQ,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,qBAAqB,CAAsB;IACnD,OAAO,CAAC,eAAe,CAAmB;gBAEvB,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAS,SAAS,CAAC,sBAAU,EAAE,QAAQ,CAAC,EAAE,MAAM;IAMnG,aAAa,CAAC,MAAM,EAAE,GAAG;IAKzB,WAAW,CAAC,eAAe,EAAE,gBAAgB;IAG7C,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,gBAAgB;IAcX,WAAW;IAqDxB,OAAO,CAAC,cAAc,CAMpB;IACW,WAAW,CAAC,WAAW,EAAE,MAAM;IAwBrC,OAAO;CAKf"}
|
|
@@ -13,6 +13,7 @@ class WSChannelHandler {
|
|
|
13
13
|
this.wsPath = wsPath;
|
|
14
14
|
this.protocols = protocols;
|
|
15
15
|
this.channelMap = new Map();
|
|
16
|
+
this.channelCloseEventMap = new Map();
|
|
16
17
|
this.logger = console;
|
|
17
18
|
this.getChannelSend = (connection) => (content) => {
|
|
18
19
|
connection.send(content, (err) => {
|
|
@@ -82,7 +83,9 @@ class WSChannelHandler {
|
|
|
82
83
|
if (this.channelMap.size) {
|
|
83
84
|
this.channelMap.forEach((channel) => {
|
|
84
85
|
channel.onOpen(() => {
|
|
85
|
-
|
|
86
|
+
const closeInfo = this.channelCloseEventMap.get(channel.id);
|
|
87
|
+
this.reporterService &&
|
|
88
|
+
this.reporterService.point(ide_core_common_2.REPORT_NAME.CHANNEL_RECONNECT, ide_core_common_2.REPORT_NAME.CHANNEL_RECONNECT, closeInfo);
|
|
86
89
|
this.logger && this.logger.log(`channel reconnect ${this.clientId}:${channel.channelPath}`);
|
|
87
90
|
});
|
|
88
91
|
channel.open(channel.channelPath);
|
|
@@ -93,6 +96,13 @@ class WSChannelHandler {
|
|
|
93
96
|
});
|
|
94
97
|
}
|
|
95
98
|
});
|
|
99
|
+
this.connection.addEventListener('close', (event) => {
|
|
100
|
+
if (this.channelMap.size) {
|
|
101
|
+
this.channelMap.forEach((channel) => {
|
|
102
|
+
channel.close(event.code, event.reason);
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
});
|
|
96
106
|
});
|
|
97
107
|
}
|
|
98
108
|
async openChannel(channelPath) {
|
|
@@ -104,6 +114,14 @@ class WSChannelHandler {
|
|
|
104
114
|
channel.onOpen(() => {
|
|
105
115
|
resolve(undefined);
|
|
106
116
|
});
|
|
117
|
+
channel.onClose((code, reason) => {
|
|
118
|
+
this.channelCloseEventMap.set(channelId, {
|
|
119
|
+
channelPath,
|
|
120
|
+
closeEvent: { code, reason },
|
|
121
|
+
connectInfo: navigator.connection,
|
|
122
|
+
});
|
|
123
|
+
this.logger.log('channel close: ', code, reason);
|
|
124
|
+
});
|
|
107
125
|
channel.open(channelPath);
|
|
108
126
|
});
|
|
109
127
|
return channel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":";;;;AAAA,4FAA2D;AAE3D,+DAAiD;AACjD,+DAAuF;AAEvF,
|
|
1
|
+
{"version":3,"file":"ws-channel-handler.js","sourceRoot":"","sources":["../../src/browser/ws-channel-handler.ts"],"names":[],"mappings":"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"}
|
package/lib/common/utils.d.ts
CHANGED
|
@@ -24,6 +24,20 @@ export interface ICapturedMessage {
|
|
|
24
24
|
data?: any;
|
|
25
25
|
error?: any;
|
|
26
26
|
}
|
|
27
|
+
export interface ConnectionInfo {
|
|
28
|
+
type: string;
|
|
29
|
+
downlink: number;
|
|
30
|
+
uplink: number;
|
|
31
|
+
rtt: number;
|
|
32
|
+
}
|
|
33
|
+
export interface WSCloseInfo {
|
|
34
|
+
channelPath: string;
|
|
35
|
+
closeEvent: {
|
|
36
|
+
code: number;
|
|
37
|
+
reason: string;
|
|
38
|
+
};
|
|
39
|
+
connectInfo: ConnectionInfo;
|
|
40
|
+
}
|
|
27
41
|
export declare function stringify(obj: any): string;
|
|
28
42
|
export declare function parse(input: string, reviver?: (this: any, key: string, value: any) => any): any;
|
|
29
43
|
export declare function getCapturer(): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,iCAAiC,EAAE,GAAG,CAAC;KACxC;CACF;AAED,oBAAY,WAAW;IACrB,gBAAgB,qBAAqB;IACrC,WAAW,gBAAgB;IAC3B,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,eAAe,oBAAoB;CACpC;AAED,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAE1C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,GAAG,GAAG,CAE/F;AAED,wBAAgB,WAAW,QAK1B"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM;QACd,iCAAiC,EAAE,GAAG,CAAC;KACxC;CACF;AAED,oBAAY,WAAW;IACrB,gBAAgB,qBAAqB;IACrC,WAAW,gBAAgB;IAC3B,aAAa,kBAAkB;IAC/B,cAAc,mBAAmB;IACjC,SAAS,cAAc;IACvB,eAAe,oBAAoB;CACpC;AAED,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,IAAI,SAAS;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,KAAK,CAAC,EAAE,GAAG,CAAC;CACb;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAC7C,WAAW,EAAE,cAAc,CAAC;CAC7B;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,CAE1C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,GAAG,GAAG,GAAG,CAE/F;AAED,wBAAgB,WAAW,QAK1B"}
|
package/lib/common/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAMA,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,oDAAqC,CAAA;IACrC,0CAA2B,CAAA;IAC3B,8CAA+B,CAAA;IAC/B,gDAAiC,CAAA;IACjC,sCAAuB,CAAA;IACvB,kDAAmC,CAAA;AACrC,CAAC,EAPW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAOtB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,qCAAmB,CAAA;IACnB,+BAAa,CAAA;AACf,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAMA,IAAY,WAOX;AAPD,WAAY,WAAW;IACrB,oDAAqC,CAAA;IACrC,0CAA2B,CAAA;IAC3B,8CAA+B,CAAA;IAC/B,gDAAiC,CAAA;IACjC,sCAAuB,CAAA;IACvB,kDAAmC,CAAA;AACrC,CAAC,EAPW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAOtB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACxB,qCAAmB,CAAA;IACnB,+BAAa,CAAA;AACf,CAAC,EAHW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAGzB;AAyBD,SAAgB,SAAS,CAAC,GAAQ;IAChC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAFD,8BAEC;AAED,SAAgB,KAAK,CAAC,KAAa,EAAE,OAAqD;IACxF,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC;AAFD,sBAEC;AAED,SAAgB,WAAW;;IACzB,IAAI,OAAO,MAAM,KAAK,WAAW,KAAI,MAAA,MAAM,CAAC,iCAAiC,0CAAE,UAAU,CAAA,EAAE;QACzF,OAAO,MAAM,CAAC,iCAAiC,CAAC,UAAU,CAAC;KAC5D;IACD,OAAO;AACT,CAAC;AALD,kCAKC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-connection",
|
|
3
|
-
"version": "2.26.
|
|
3
|
+
"version": "2.26.9-next-1695201123.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,16 +17,16 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-core-common": "2.26.
|
|
20
|
+
"@opensumi/ide-core-common": "2.26.9-next-1695201123.0",
|
|
21
21
|
"@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
|
|
22
22
|
"path-match": "^1.2.4",
|
|
23
23
|
"reconnecting-websocket": "^4.2.0",
|
|
24
24
|
"ws": "^8.9.0"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@opensumi/ide-components": "2.26.
|
|
27
|
+
"@opensumi/ide-components": "2.26.9-next-1695201123.0",
|
|
28
28
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
29
29
|
"mock-socket": "^9.0.2"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "c86a97bbe9d95982165f3d31f43d20a5e65eaa97"
|
|
32
32
|
}
|
|
@@ -3,13 +3,14 @@ import ReconnectingWebSocket from 'reconnecting-websocket';
|
|
|
3
3
|
import { uuid } from '@opensumi/ide-core-common';
|
|
4
4
|
import { IReporterService, REPORT_NAME, UrlProvider } from '@opensumi/ide-core-common';
|
|
5
5
|
|
|
6
|
-
import { stringify, parse } from '../common/utils';
|
|
6
|
+
import { stringify, parse, WSCloseInfo, ConnectionInfo } from '../common/utils';
|
|
7
7
|
import { WSChannel, MessageString } from '../common/ws-channel';
|
|
8
8
|
|
|
9
9
|
// 前台链接管理类
|
|
10
10
|
export class WSChannelHandler {
|
|
11
11
|
public connection: WebSocket;
|
|
12
12
|
private channelMap: Map<number | string, WSChannel> = new Map();
|
|
13
|
+
private channelCloseEventMap: Map<number | string, WSCloseInfo> = new Map();
|
|
13
14
|
private logger = console;
|
|
14
15
|
public clientId: string;
|
|
15
16
|
private heartbeatMessageTimer: NodeJS.Timer | null;
|
|
@@ -79,7 +80,9 @@ export class WSChannelHandler {
|
|
|
79
80
|
if (this.channelMap.size) {
|
|
80
81
|
this.channelMap.forEach((channel) => {
|
|
81
82
|
channel.onOpen(() => {
|
|
82
|
-
|
|
83
|
+
const closeInfo = this.channelCloseEventMap.get(channel.id);
|
|
84
|
+
this.reporterService &&
|
|
85
|
+
this.reporterService.point(REPORT_NAME.CHANNEL_RECONNECT, REPORT_NAME.CHANNEL_RECONNECT, closeInfo);
|
|
83
86
|
this.logger && this.logger.log(`channel reconnect ${this.clientId}:${channel.channelPath}`);
|
|
84
87
|
});
|
|
85
88
|
channel.open(channel.channelPath);
|
|
@@ -91,6 +94,14 @@ export class WSChannelHandler {
|
|
|
91
94
|
});
|
|
92
95
|
}
|
|
93
96
|
});
|
|
97
|
+
|
|
98
|
+
this.connection.addEventListener('close', (event) => {
|
|
99
|
+
if (this.channelMap.size) {
|
|
100
|
+
this.channelMap.forEach((channel) => {
|
|
101
|
+
channel.close(event.code, event.reason);
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
});
|
|
94
105
|
});
|
|
95
106
|
}
|
|
96
107
|
private getChannelSend = (connection) => (content: string) => {
|
|
@@ -110,6 +121,14 @@ export class WSChannelHandler {
|
|
|
110
121
|
channel.onOpen(() => {
|
|
111
122
|
resolve(undefined);
|
|
112
123
|
});
|
|
124
|
+
channel.onClose((code: number, reason: string) => {
|
|
125
|
+
this.channelCloseEventMap.set(channelId, {
|
|
126
|
+
channelPath,
|
|
127
|
+
closeEvent: { code, reason },
|
|
128
|
+
connectInfo: (navigator as any).connection as ConnectionInfo,
|
|
129
|
+
});
|
|
130
|
+
this.logger.log('channel close: ', code, reason);
|
|
131
|
+
});
|
|
113
132
|
channel.open(channelPath);
|
|
114
133
|
});
|
|
115
134
|
|
package/src/common/utils.ts
CHANGED
|
@@ -28,6 +28,19 @@ export interface ICapturedMessage {
|
|
|
28
28
|
error?: any;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
+
export interface ConnectionInfo {
|
|
32
|
+
type: string;
|
|
33
|
+
downlink: number;
|
|
34
|
+
uplink: number;
|
|
35
|
+
rtt: number;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export interface WSCloseInfo {
|
|
39
|
+
channelPath: string;
|
|
40
|
+
closeEvent: { code: number; reason: string };
|
|
41
|
+
connectInfo: ConnectionInfo;
|
|
42
|
+
}
|
|
43
|
+
|
|
31
44
|
export function stringify(obj: any): string {
|
|
32
45
|
return JSON.stringify(obj);
|
|
33
46
|
}
|