@opensumi/ide-connection 2.27.3-rc-1713838390.0 → 2.27.3-rc-1713855854.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/common/capturer.d.ts +21 -1
- package/lib/common/capturer.d.ts.map +1 -1
- package/lib/common/capturer.js +130 -4
- package/lib/common/capturer.js.map +1 -1
- package/lib/common/index.d.ts +0 -1
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +0 -1
- package/lib/common/index.js.map +1 -1
- package/lib/common/rpc/connection.d.ts +8 -2
- package/lib/common/rpc/connection.d.ts.map +1 -1
- package/lib/common/rpc/connection.js +17 -6
- package/lib/common/rpc/connection.js.map +1 -1
- package/lib/common/rpc-service/center.d.ts +1 -1
- package/lib/common/rpc-service/center.d.ts.map +1 -1
- package/lib/common/rpc-service/center.js.map +1 -1
- package/lib/common/rpc-service/proxy/base.d.ts +2 -11
- package/lib/common/rpc-service/proxy/base.d.ts.map +1 -1
- package/lib/common/rpc-service/proxy/base.js +3 -82
- package/lib/common/rpc-service/proxy/base.js.map +1 -1
- package/lib/common/rpc-service/proxy/json.d.ts +3 -1
- package/lib/common/rpc-service/proxy/json.d.ts.map +1 -1
- package/lib/common/rpc-service/proxy/json.js +12 -10
- package/lib/common/rpc-service/proxy/json.js.map +1 -1
- package/lib/common/rpc-service/proxy/sumi.d.ts.map +1 -1
- package/lib/common/rpc-service/proxy/sumi.js +3 -31
- package/lib/common/rpc-service/proxy/sumi.js.map +1 -1
- package/lib/common/ws-channel.d.ts +0 -1
- package/lib/common/ws-channel.d.ts.map +1 -1
- package/lib/common/ws-channel.js +0 -4
- package/lib/common/ws-channel.js.map +1 -1
- package/package.json +5 -5
- package/src/common/capturer.ts +169 -3
- package/src/common/index.ts +0 -1
- package/src/common/rpc/connection.ts +34 -7
- package/src/common/rpc-service/center.ts +2 -1
- package/src/common/rpc-service/proxy/base.ts +5 -101
- package/src/common/rpc-service/proxy/json.ts +14 -12
- package/src/common/rpc-service/proxy/sumi.ts +3 -30
- package/src/common/ws-channel.ts +0 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/base.ts"],"names":[],"mappings":";;;AAAA,+
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/base.ts"],"names":[],"mappings":";;;AAAA,+DAAsE;AAWtE,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;AAE5D,IAAI,SAAS,GAAG,CAAC,CAAC;AAElB,MAAsB,SAAS;IAU7B,YAAmB,QAAyB,EAAE,MAAgB;QAA3C,aAAQ,GAAR,QAAQ,CAAiB;QANlC,sBAAiB,GAAmB,IAAI,0BAAQ,EAAQ,CAAC;QAEzD,iBAAY,GAAG,IAAI,iCAAe,EAAE,CAAC;QAK7C,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,OAAO,CAAC;QAEhC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC1C,IAAI,IAAI,CAAC,UAAU,EAAE;gBACnB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,aAAa;QACrB,OAAO,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,UAAa;QAClB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAE1C,UAAU,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;IACnC,CAAC;IAEM,aAAa,CAAC,OAAuB;QAC1C,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,OAAO;QACL,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAKM,cAAc;QACnB,OAAO,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACpC,GAAG,EAAE,CAAC,MAAW,EAAE,CAAc,EAAE,EAAE;gBACnC,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE;oBACzB,OAAO,IAAI,CAAC;iBACb;gBACD,IAAI,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBACjC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;iBAC1B;gBAED,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;oBACd,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;iBACzD;gBACD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;YACnB,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF;AA7DD,8BA6DC"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Capturer } from '../../capturer';
|
|
2
2
|
import { ProxyBase } from './base';
|
|
3
|
+
import type { MessageConnection } from '@opensumi/vscode-jsonrpc';
|
|
3
4
|
export declare class ProxyJson extends ProxyBase<MessageConnection> {
|
|
4
5
|
protected engine: "json";
|
|
6
|
+
protected capturer: Capturer;
|
|
5
7
|
protected bindMethods(methods: string[]): void;
|
|
6
8
|
invoke(prop: string, ...args: any[]): Promise<any>;
|
|
7
9
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/json.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAOlE,qBAAa,SAAU,SAAQ,SAAS,CAAC,iBAAiB,CAAC;IACzD,SAAS,CAAC,MAAM,SAAmB;IACnC,SAAS,CAAC,QAAQ,WAAoD;IAEtE,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAyCxC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IA+CxD;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;IAa1B,MAAM,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI;CAe5C"}
|
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ProxyJson = void 0;
|
|
4
|
+
const capturer_1 = require("../../capturer");
|
|
4
5
|
const constants_1 = require("../../constants");
|
|
5
6
|
const base_1 = require("./base");
|
|
6
7
|
class ProxyJson extends base_1.ProxyBase {
|
|
7
8
|
constructor() {
|
|
8
9
|
super(...arguments);
|
|
9
10
|
this.engine = 'json';
|
|
11
|
+
this.capturer = this._disposables.add(new capturer_1.Capturer(this.engine));
|
|
10
12
|
}
|
|
11
13
|
bindMethods(methods) {
|
|
12
14
|
for (const method of methods) {
|
|
13
15
|
if (method.startsWith('on')) {
|
|
14
16
|
this.connection.onNotification(method, async (...args) => {
|
|
15
|
-
this.captureOnNotification(method, args);
|
|
17
|
+
this.capturer.captureOnNotification('_', method, args);
|
|
16
18
|
try {
|
|
17
19
|
await this.registry.invoke(method, ...this.serializeArguments(args));
|
|
18
20
|
}
|
|
@@ -24,17 +26,17 @@ class ProxyJson extends base_1.ProxyBase {
|
|
|
24
26
|
else {
|
|
25
27
|
this.connection.onRequest(method, async (...args) => {
|
|
26
28
|
const requestId = this.nextRequestId();
|
|
27
|
-
this.captureOnRequest(requestId, method, args);
|
|
29
|
+
this.capturer.captureOnRequest(requestId, method, args);
|
|
28
30
|
try {
|
|
29
31
|
const result = await this.registry.invoke(method, ...this.serializeArguments(args));
|
|
30
|
-
this.captureOnRequestResult(requestId, method, result);
|
|
32
|
+
this.capturer.captureOnRequestResult(requestId, method, result);
|
|
31
33
|
return {
|
|
32
34
|
error: false,
|
|
33
35
|
data: result,
|
|
34
36
|
};
|
|
35
37
|
}
|
|
36
38
|
catch (e) {
|
|
37
|
-
this.captureOnRequestFail(requestId, method, e);
|
|
39
|
+
this.capturer.captureOnRequestFail(requestId, method, e);
|
|
38
40
|
return {
|
|
39
41
|
error: true,
|
|
40
42
|
data: {
|
|
@@ -55,7 +57,7 @@ class ProxyJson extends base_1.ProxyBase {
|
|
|
55
57
|
}
|
|
56
58
|
// 调用方法为 on 开头时，作为单项通知
|
|
57
59
|
if (prop.startsWith('on')) {
|
|
58
|
-
this.captureSendNotification(prop, args);
|
|
60
|
+
this.capturer.captureSendNotification('_', prop, args);
|
|
59
61
|
if (isSingleArray) {
|
|
60
62
|
this.connection.sendNotification(prop, [...args]);
|
|
61
63
|
}
|
|
@@ -73,18 +75,18 @@ class ProxyJson extends base_1.ProxyBase {
|
|
|
73
75
|
else {
|
|
74
76
|
requestResult = this.connection.sendRequest(prop, ...args);
|
|
75
77
|
}
|
|
76
|
-
this.captureSendRequest(requestId, prop, args);
|
|
78
|
+
this.capturer.captureSendRequest(requestId, prop, args);
|
|
77
79
|
const result = await requestResult;
|
|
78
80
|
if (result.error) {
|
|
79
81
|
const error = new Error(result.data.message);
|
|
80
82
|
if (result.data.stack) {
|
|
81
83
|
error.stack = result.data.stack;
|
|
82
84
|
}
|
|
83
|
-
this.captureSendRequestFail(requestId, prop, result.data);
|
|
85
|
+
this.capturer.captureSendRequestFail(requestId, prop, result.data);
|
|
84
86
|
throw error;
|
|
85
87
|
}
|
|
86
88
|
else {
|
|
87
|
-
this.captureSendRequestResult(requestId, prop, result.data);
|
|
89
|
+
this.capturer.captureSendRequestResult(requestId, prop, result.data);
|
|
88
90
|
return result.data;
|
|
89
91
|
}
|
|
90
92
|
}
|
|
@@ -112,11 +114,11 @@ class ProxyJson extends base_1.ProxyBase {
|
|
|
112
114
|
connection.onRequest((method) => {
|
|
113
115
|
if (!this.registry.has(method)) {
|
|
114
116
|
const requestId = this.nextRequestId();
|
|
115
|
-
this.captureOnRequest(requestId, method, []);
|
|
117
|
+
this.capturer.captureOnRequest(requestId, method, []);
|
|
116
118
|
const result = {
|
|
117
119
|
data: constants_1.METHOD_NOT_REGISTERED,
|
|
118
120
|
};
|
|
119
|
-
this.captureOnRequestFail(requestId, method, result.data);
|
|
121
|
+
this.capturer.captureOnRequestFail(requestId, method, result.data);
|
|
120
122
|
return result;
|
|
121
123
|
}
|
|
122
124
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/json.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/json.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sumi.d.ts","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/sumi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,qBAAa,SAAU,SAAQ,SAAS,CAAC,cAAc,CAAC;IACtD,SAAS,CAAC,MAAM,SAAmB;IAEnC,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"sumi.d.ts","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/sumi.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,qBAAa,SAAU,SAAQ,SAAS,CAAC,cAAc,CAAC;IACtD,SAAS,CAAC,MAAM,SAAmB;IAEnC,SAAS,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI;IAgBxC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAWxD,MAAM,CAAC,UAAU,EAAE,cAAc,GAAG,IAAI;CAMzC"}
|
|
@@ -12,7 +12,6 @@ class ProxySumi extends base_1.ProxyBase {
|
|
|
12
12
|
for (const method of methods) {
|
|
13
13
|
if (method.startsWith('on')) {
|
|
14
14
|
this.connection.onNotification(method, async (...args) => {
|
|
15
|
-
this.captureOnNotification(method, args);
|
|
16
15
|
try {
|
|
17
16
|
await this.registry.invoke(method, ...args);
|
|
18
17
|
}
|
|
@@ -22,19 +21,7 @@ class ProxySumi extends base_1.ProxyBase {
|
|
|
22
21
|
});
|
|
23
22
|
}
|
|
24
23
|
else {
|
|
25
|
-
this.connection.onRequest(method, async (...args) =>
|
|
26
|
-
const requestId = this.nextRequestId();
|
|
27
|
-
this.captureOnRequest(requestId, method, args);
|
|
28
|
-
try {
|
|
29
|
-
const result = await this.registry.invoke(method, ...args);
|
|
30
|
-
this.captureOnRequestResult(requestId, method, result);
|
|
31
|
-
return result;
|
|
32
|
-
}
|
|
33
|
-
catch (e) {
|
|
34
|
-
this.captureOnRequestFail(requestId, method, e);
|
|
35
|
-
throw e;
|
|
36
|
-
}
|
|
37
|
-
});
|
|
24
|
+
this.connection.onRequest(method, async (...args) => await this.registry.invoke(method, ...args));
|
|
38
25
|
}
|
|
39
26
|
}
|
|
40
27
|
}
|
|
@@ -42,30 +29,15 @@ class ProxySumi extends base_1.ProxyBase {
|
|
|
42
29
|
await this.connectionPromise.promise;
|
|
43
30
|
// 调用方法为 on 开头时，作为单项通知
|
|
44
31
|
if (prop.startsWith('on')) {
|
|
45
|
-
this.captureSendNotification(prop, args);
|
|
46
32
|
this.connection.sendNotification(prop, ...args);
|
|
47
33
|
}
|
|
48
34
|
else {
|
|
49
|
-
|
|
50
|
-
const requestId = this.nextRequestId();
|
|
51
|
-
this.captureSendRequest(requestId, prop, args);
|
|
52
|
-
try {
|
|
53
|
-
const result = await this.connection.sendRequest(prop, ...args);
|
|
54
|
-
this.captureSendRequestResult(requestId, prop, result);
|
|
55
|
-
return result;
|
|
56
|
-
}
|
|
57
|
-
catch (error) {
|
|
58
|
-
this.captureSendRequestFail(requestId, prop, error);
|
|
59
|
-
throw error;
|
|
60
|
-
}
|
|
35
|
+
return await this.connection.sendRequest(prop, ...args);
|
|
61
36
|
}
|
|
62
37
|
}
|
|
63
38
|
listen(connection) {
|
|
64
39
|
super.listen(connection);
|
|
65
|
-
connection.onRequestNotFound((
|
|
66
|
-
const requestId = this.nextRequestId();
|
|
67
|
-
this.captureOnRequest(requestId, method, []);
|
|
68
|
-
this.captureOnRequestFail(requestId, method, constants_1.METHOD_NOT_REGISTERED);
|
|
40
|
+
connection.onRequestNotFound(() => {
|
|
69
41
|
throw constants_1.METHOD_NOT_REGISTERED;
|
|
70
42
|
});
|
|
71
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sumi.js","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/sumi.ts"],"names":[],"mappings":";;;AAAA,+CAAwD;AAGxD,iCAAmC;AAEnC,MAAa,SAAU,SAAQ,gBAAyB;IAAxD;;QACY,WAAM,GAAG,MAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"sumi.js","sourceRoot":"","sources":["../../../../src/common/rpc-service/proxy/sumi.ts"],"names":[],"mappings":";;;AAAA,+CAAwD;AAGxD,iCAAmC;AAEnC,MAAa,SAAU,SAAQ,gBAAyB;IAAxD;;QACY,WAAM,GAAG,MAAe,CAAC;IAmCrC,CAAC;IAjCW,WAAW,CAAC,OAAiB;QACrC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;YAC5B,IAAI,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;gBAC3B,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE;oBAC9D,IAAI;wBACF,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC;qBAC7C;oBAAC,OAAO,CAAC,EAAE;wBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,MAAM,QAAQ,EAAE,CAAC,CAAC,CAAC;qBAC1D;gBACH,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAW,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;aAC1G;SACF;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY,EAAE,GAAG,IAAW;QACvC,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;QAErC,sBAAsB;QACtB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACzB,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;SACjD;aAAM;YACL,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;SACzD;IACH,CAAC;IAED,MAAM,CAAC,UAA0B;QAC/B,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACzB,UAAU,CAAC,iBAAiB,CAAC,GAAG,EAAE;YAChC,MAAM,iCAAqB,CAAC;QAC9B,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AApCD,8BAoCC"}
|
|
@@ -94,7 +94,6 @@ export declare class WSChannel {
|
|
|
94
94
|
fireReopen(): void;
|
|
95
95
|
onClose(cb: (code: number, reason: string) => void): import("@opensumi/events").IDisposable;
|
|
96
96
|
onceClose(cb: (code: number, reason: string) => void): import("@opensumi/events").IDisposable;
|
|
97
|
-
createMessageConnection(): import("@opensumi/vscode-jsonrpc").MessageConnection;
|
|
98
97
|
createConnection(): {
|
|
99
98
|
onceClose: (cb: (code: number, reason: string) => void) => import("@opensumi/events").IDisposable;
|
|
100
99
|
onMessage: (cb: (data: Uint8Array) => any) => import("@opensumi/events").IDisposable;
|
|
@@ -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;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;
|
|
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;AAGhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,cAAc,CAAC;IACrB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,cAAc,GACtB,WAAW,GACX,WAAW,GACX,WAAW,GACX,kBAAkB,GAClB,WAAW,GACX,aAAa,GACb,YAAY,CAAC;AAEjB,MAAM,WAAW,uBAAuB;IACtC;;;OAGG;IACH,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,qBAAa,SAAS;IAmCD,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC;IAlC3D,SAAS,CAAC,OAAO;iBACN,CAAC,IAAI,EAAE,MAAM,CAAC;cACjB,CAAC,EAAE,EAAE,MAAM,CAAC;gBACV,EAAE;eACH,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC;gBAC/B,CAAC,IAAI,EAAE,UAAU,CAAC;OACvB;IAEE,EAAE,EAAE,MAAM,CAAC;IAEX,WAAW,EAAE,MAAM,CAAC;IAE3B,MAAM,EAAE,OAAO,CAAW;IAE1B,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB;gBAoBxE,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,uBAAuB;IAS7F,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,GAAG;IAGnC,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,GAAG;IAGtC,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI;IAG/B,QAAQ,CAAC,EAAE,EAAE,MAAM,IAAI;IAIvB,WAAW;IASX,sBAAsB,CAAC,GAAG,EAAE,cAAc;IAc1C,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAYnC,IAAI,CAAC,OAAO,EAAE,MAAM;IAUpB,UAAU,CAAC,IAAI,EAAE,UAAU;IAS3B,OAAO;IACP,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAGpC,UAAU;IAGV,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI;IAGlD,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI;IAIpD,gBAAgB;+BAEW,MAAM,UAAU,MAAM,KAAK,IAAI;+BAC/B,UAAU,KAAK,GAAG;qBAC5B,UAAU;;;IAO3B,oBAAoB,CAAC,OAAO,GAAE,sBAA2B;IAKzD,OAAO;CAGR;AAED,eAAO,MAAM,YAAY;;;;;;;;;;;;;CAGvB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;CAGvB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;CAIvB,CAAC;AAEH,eAAO,MAAM,mBAAmB;;;;;;;;;;CAE9B,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;CAGvB,CAAC;AAEH,eAAO,MAAM,cAAc;;;;;;;;;;;;;CAGzB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;CAIxB,CAAC;AAYH,wBAAgB,SAAS,CAAC,GAAG,EAAE,cAAc,GAAG,UAAU,CAEzD;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,cAAc,CAEvD;AAcD,eAAO,MAAM,WAAW,YAA0B,CAAC;AACnD,eAAO,MAAM,WAAW,YAA0B,CAAC"}
|
package/lib/common/ws-channel.js
CHANGED
|
@@ -5,7 +5,6 @@ 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");
|
|
7
7
|
const one_of_1 = require("./fury-extends/one-of");
|
|
8
|
-
const message_1 = require("./message");
|
|
9
8
|
const connection_1 = require("./rpc/connection");
|
|
10
9
|
class WSChannel {
|
|
11
10
|
static forClient(connection, options) {
|
|
@@ -97,9 +96,6 @@ class WSChannel {
|
|
|
97
96
|
onceClose(cb) {
|
|
98
97
|
return this.emitter.once('close', cb);
|
|
99
98
|
}
|
|
100
|
-
createMessageConnection() {
|
|
101
|
-
return (0, message_1.createWebSocketConnection)(this);
|
|
102
|
-
}
|
|
103
99
|
createConnection() {
|
|
104
100
|
return {
|
|
105
101
|
onceClose: (cb) => this.onceClose(cb),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-channel.js","sourceRoot":"","sources":["../../src/common/ws-channel.ts"],"names":[],"mappings":";;;AAAA,uCAAoC;AAEpC,6CAAgD;AAChD,+DAAiE;AAGjE,kDAA+C;AAC/C,
|
|
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": "2.27.3-rc-
|
|
3
|
+
"version": "2.27.3-rc-1713855854.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-1713855854.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-1713855854.0",
|
|
30
|
+
"@opensumi/ide-dev-tool": "2.27.3-rc-1713855854.0",
|
|
31
31
|
"@opensumi/mock-socket": "^9.3.1"
|
|
32
32
|
},
|
|
33
|
-
"gitHead": "
|
|
33
|
+
"gitHead": "5d54570c10c2130db6590717fb701147cd7102ef"
|
|
34
34
|
}
|
package/src/common/capturer.ts
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
import {
|
|
2
|
+
DisposableStore,
|
|
3
|
+
IDisposable,
|
|
4
|
+
isUint8Array,
|
|
5
|
+
randomString,
|
|
6
|
+
transformErrorForSerialization,
|
|
7
|
+
} from '@opensumi/ide-core-common';
|
|
8
|
+
import { DevtoolsLantencyCommand, EDevtoolsEvent } from '@opensumi/ide-core-common/lib/devtools';
|
|
9
|
+
|
|
1
10
|
declare global {
|
|
2
11
|
interface Window {
|
|
3
12
|
__OPENSUMI_DEVTOOLS_GLOBAL_HOOK__: any;
|
|
@@ -22,15 +31,172 @@ export interface ICapturedMessage {
|
|
|
22
31
|
type: MessageType;
|
|
23
32
|
serviceMethod: string;
|
|
24
33
|
arguments?: any;
|
|
25
|
-
requestId?: string;
|
|
34
|
+
requestId?: string | number;
|
|
26
35
|
status?: ResponseStatus;
|
|
27
36
|
data?: any;
|
|
28
37
|
error?: any;
|
|
38
|
+
|
|
39
|
+
source?: string;
|
|
29
40
|
}
|
|
30
41
|
|
|
42
|
+
const _global = (typeof window !== 'undefined' ? window : global) || {
|
|
43
|
+
__OPENSUMI_DEVTOOLS_GLOBAL_HOOK__: undefined,
|
|
44
|
+
};
|
|
45
|
+
|
|
31
46
|
export function getCapturer() {
|
|
32
|
-
|
|
33
|
-
|
|
47
|
+
const hook = _global.__OPENSUMI_DEVTOOLS_GLOBAL_HOOK__;
|
|
48
|
+
if (hook) {
|
|
49
|
+
return hook.captureRPC;
|
|
34
50
|
}
|
|
35
51
|
return;
|
|
36
52
|
}
|
|
53
|
+
|
|
54
|
+
export class Capturer implements IDisposable {
|
|
55
|
+
protected _disposables = new DisposableStore();
|
|
56
|
+
|
|
57
|
+
protected capturer: ((data: any) => void) | null = null;
|
|
58
|
+
protected prefix: string;
|
|
59
|
+
|
|
60
|
+
protected setupListener = (event: CustomEvent) => {
|
|
61
|
+
const { command } = event.detail;
|
|
62
|
+
if (command === DevtoolsLantencyCommand.Start) {
|
|
63
|
+
this.capturer = getCapturer();
|
|
64
|
+
} else if (command === DevtoolsLantencyCommand.Stop) {
|
|
65
|
+
this.capturer = null;
|
|
66
|
+
}
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
constructor(protected source: string) {
|
|
70
|
+
this.prefix = randomString(6);
|
|
71
|
+
this.capturer = getCapturer();
|
|
72
|
+
|
|
73
|
+
// capturer should only be used in browser environment
|
|
74
|
+
if (typeof _global.addEventListener === 'function') {
|
|
75
|
+
_global.addEventListener(EDevtoolsEvent.Latency, this.setupListener);
|
|
76
|
+
this._disposables.add({
|
|
77
|
+
dispose: () => {
|
|
78
|
+
_global.removeEventListener(EDevtoolsEvent.Latency, this.setupListener);
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
capture(message: ICapturedMessage): void {
|
|
85
|
+
if (!this.capturer) {
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
const data: ICapturedMessage = {
|
|
90
|
+
...message,
|
|
91
|
+
source: this.source,
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
if (data.data) {
|
|
95
|
+
if (isUint8Array(data.data)) {
|
|
96
|
+
data.data = '<Uint8Array>';
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
if (message.requestId) {
|
|
101
|
+
data.requestId = `${this.prefix}-${message.requestId}`;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
if (message.error) {
|
|
105
|
+
data.error = transformErrorForSerialization(message.error);
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
this.capturer(data);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
captureOnRequest(requestId: ICapturedMessage['requestId'], serviceMethod: string, args: any[]): void {
|
|
112
|
+
if (!this.capturer) {
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
this.capture({ type: MessageType.OnRequest, requestId: `↓${requestId}`, serviceMethod, arguments: args });
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
captureOnRequestResult(requestId: ICapturedMessage['requestId'], serviceMethod: string, data: any): void {
|
|
120
|
+
if (!this.capturer) {
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
this.capture({
|
|
125
|
+
type: MessageType.OnRequestResult,
|
|
126
|
+
status: ResponseStatus.Success,
|
|
127
|
+
requestId: `↓${requestId}`,
|
|
128
|
+
serviceMethod,
|
|
129
|
+
data,
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
captureOnRequestFail(requestId: ICapturedMessage['requestId'], serviceMethod: string, error: any): void {
|
|
134
|
+
if (!this.capturer) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
this.capture({
|
|
139
|
+
type: MessageType.OnRequestResult,
|
|
140
|
+
status: ResponseStatus.Fail,
|
|
141
|
+
requestId: `↓${requestId}`,
|
|
142
|
+
serviceMethod,
|
|
143
|
+
error,
|
|
144
|
+
});
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
captureSendRequest(requestId: ICapturedMessage['requestId'] | number, serviceMethod: string, args: any[]): void {
|
|
148
|
+
if (!this.capturer) {
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
this.capture({ type: MessageType.SendRequest, requestId, serviceMethod, arguments: args });
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
captureSendRequestResult(requestId: ICapturedMessage['requestId'], serviceMethod: string, data: any): void {
|
|
156
|
+
if (!this.capturer) {
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
this.capture({
|
|
161
|
+
type: MessageType.RequestResult,
|
|
162
|
+
status: ResponseStatus.Success,
|
|
163
|
+
requestId,
|
|
164
|
+
serviceMethod,
|
|
165
|
+
data,
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
captureSendRequestFail(requestId: ICapturedMessage['requestId'], serviceMethod: string, error: any): void {
|
|
170
|
+
if (!this.capturer) {
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
this.capture({
|
|
175
|
+
type: MessageType.RequestResult,
|
|
176
|
+
status: ResponseStatus.Fail,
|
|
177
|
+
requestId,
|
|
178
|
+
serviceMethod,
|
|
179
|
+
error,
|
|
180
|
+
});
|
|
181
|
+
}
|
|
182
|
+
|
|
183
|
+
captureSendNotification(requestId: ICapturedMessage['requestId'], serviceMethod: string, args: any[]): void {
|
|
184
|
+
if (!this.capturer) {
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
this.capture({ type: MessageType.SendNotification, serviceMethod, arguments: args, requestId });
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
captureOnNotification(requestId: ICapturedMessage['requestId'], serviceMethod: string, args: any[]): void {
|
|
192
|
+
if (!this.capturer) {
|
|
193
|
+
return;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
this.capture({ type: MessageType.OnNotification, serviceMethod, arguments: args, requestId: `↓${requestId}` });
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
dispose(): void {
|
|
200
|
+
this._disposables.dispose();
|
|
201
|
+
}
|
|
202
|
+
}
|
package/src/common/index.ts
CHANGED