@opensumi/ide-connection 2.24.6-next-1686045771.0 → 2.24.6
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/connect.d.ts +7 -7
- package/lib/common/connect.d.ts.map +1 -1
- package/lib/common/connect.js +10 -23
- package/lib/common/connect.js.map +1 -1
- package/lib/common/proxy.d.ts +1 -4
- package/lib/common/proxy.d.ts.map +1 -1
- package/lib/common/proxy.js.map +1 -1
- package/package.json +4 -4
- package/src/common/connect.ts +17 -30
- package/src/common/proxy.ts +2 -6
package/lib/common/connect.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MessageConnection } from '@opensumi/vscode-jsonrpc/lib/common/connection';
|
|
2
|
-
import { RPCProxy
|
|
2
|
+
import { RPCProxy } from './proxy';
|
|
3
3
|
export type RPCServiceMethod = (...args: any[]) => any;
|
|
4
4
|
export type ServiceProxy = any;
|
|
5
5
|
export declare enum ServiceType {
|
|
@@ -10,15 +10,15 @@ export declare class RPCServiceStub {
|
|
|
10
10
|
private serviceName;
|
|
11
11
|
private center;
|
|
12
12
|
private type;
|
|
13
|
-
constructor(serviceName: string, center:
|
|
14
|
-
ready(): Promise<
|
|
13
|
+
constructor(serviceName: string, center: any, type: ServiceType);
|
|
14
|
+
ready(): Promise<any>;
|
|
15
15
|
getNotificationName(name: string): string;
|
|
16
16
|
getRequestName(name: string): string;
|
|
17
17
|
on(name: string, method: RPCServiceMethod): void;
|
|
18
18
|
getServiceMethod(service: any): string[];
|
|
19
19
|
onRequestService(service: any): void;
|
|
20
20
|
onRequest(name: string, method: RPCServiceMethod): void;
|
|
21
|
-
broadcast(name: string, ...args: any[]):
|
|
21
|
+
broadcast(name: string, ...args: any[]): any;
|
|
22
22
|
getMethodName(name: string): string;
|
|
23
23
|
getProxy: <T>() => RPCServiceStub & T;
|
|
24
24
|
}
|
|
@@ -48,13 +48,13 @@ export declare class RPCServiceCenter {
|
|
|
48
48
|
private connectionPromise;
|
|
49
49
|
private connectionPromiseResolve;
|
|
50
50
|
private logger;
|
|
51
|
-
constructor(bench?: IBench | undefined, logger?:
|
|
51
|
+
constructor(bench?: IBench | undefined, logger?: any);
|
|
52
52
|
registerService(serviceName: string, type: ServiceType): void;
|
|
53
53
|
when(): Promise<void>;
|
|
54
54
|
setConnection(connection: MessageConnection): void;
|
|
55
55
|
removeConnection(connection: MessageConnection): boolean;
|
|
56
|
-
onRequest(name:
|
|
57
|
-
broadcast(name:
|
|
56
|
+
onRequest(name: any, method: RPCServiceMethod): void;
|
|
57
|
+
broadcast(name: any, ...args: any[]): Promise<any>;
|
|
58
58
|
}
|
|
59
59
|
export {};
|
|
60
60
|
//# sourceMappingURL=connect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/common/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAEnF,OAAO,EAAE,QAAQ,EAAqB,
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/common/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAEnF,OAAO,EAAE,QAAQ,EAAqB,MAAM,SAAS,CAAC;AAEtD,MAAM,MAAM,gBAAgB,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AACvD,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC;AAE/B,oBAAY,WAAW;IACrB,OAAO,IAAA;IACP,IAAI,IAAA;CACL;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,WAAW;IAAU,OAAO,CAAC,MAAM;IAAE,OAAO,CAAC,IAAI;gBAAjD,WAAW,EAAE,MAAM,EAAU,MAAM,KAAA,EAAU,IAAI,EAAE,WAAW;IAM5E,KAAK;IAGX,mBAAmB,CAAC,IAAI,EAAE,MAAM;IAGhC,cAAc,CAAC,IAAI,EAAE,MAAM;IAI3B,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB;IAGzC,gBAAgB,CAAC,OAAO,KAAA,GAAG,MAAM,EAAE;IAmBnC,gBAAgB,CAAC,OAAO,EAAE,GAAG;IAO7B,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB;IAGhD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI,OAAA;IAI/B,aAAa,CAAC,IAAI,EAAE,MAAM;IAG1B,QAAQ,8BAoBH;CACN;AAED,wBAAgB,cAAc,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,gBAAgB;6BAEpC,MAAM,YAAY,GAAG;0BAQxB,MAAM;EAE/B;AAED,UAAU,MAAM;IACd,eAAe,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAC5C;AAED,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,GAAG,CAEtF;AAED,wBAAgB,aAAa,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,GAAG,GAAG,CAEnF;AAED,qBAAa,gBAAgB;IAcf,OAAO,CAAC,KAAK,CAAC;IAbnB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,QAAQ,EAAE,CAAM;IAC1B,YAAY,EAAE,YAAY,EAAE,CAAM;IACzC,OAAO,CAAC,UAAU,CAAgC;IAClD,OAAO,CAAC,gBAAgB,CAAyB;IAEjD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,iBAAiB,CAAgB;IACzC,OAAO,CAAC,wBAAwB,CAAa;IAC7C,OAAO,CAAC,MAAM,CAAC;gBAEK,KAAK,CAAC,oBAAQ,EAAE,MAAM,CAAC,EAAE,GAAG;IAQhD,eAAe,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI;IAW7D,IAAI;IAIJ,aAAa,CAAC,UAAU,EAAE,iBAAiB;IAc3C,gBAAgB,CAAC,UAAU,EAAE,iBAAiB;IAU9C,SAAS,CAAC,IAAI,KAAA,EAAE,MAAM,EAAE,gBAAgB;IASxC,SAAS,CAAC,IAAI,KAAA,EAAE,GAAG,IAAI,OAAA,GAAG,OAAO,CAAC,GAAG,CAAC;CAKvC"}
|
package/lib/common/connect.js
CHANGED
|
@@ -20,7 +20,12 @@ class RPCServiceStub {
|
|
|
20
20
|
return Promise.resolve();
|
|
21
21
|
}
|
|
22
22
|
else {
|
|
23
|
-
return (...args) => this.ready().then(() =>
|
|
23
|
+
return (...args) => this.ready().then(() => {
|
|
24
|
+
const name = this.getMethodName(prop);
|
|
25
|
+
return Promise.all(this.center.serviceProxy.map((proxy) => proxy[name](...args)))
|
|
26
|
+
.then((result) => result.filter((res) => res !== proxy_1.NOTREGISTERMETHOD))
|
|
27
|
+
.then((result) => (result.length === 1 ? result[0] : result));
|
|
28
|
+
});
|
|
24
29
|
}
|
|
25
30
|
}
|
|
26
31
|
else {
|
|
@@ -160,28 +165,10 @@ class RPCServiceCenter {
|
|
|
160
165
|
});
|
|
161
166
|
}
|
|
162
167
|
}
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
}
|
|
168
|
-
const doubtfulResult = [];
|
|
169
|
-
const result = [];
|
|
170
|
-
for (const i of broadcastResult) {
|
|
171
|
-
if (i === proxy_1.NOTREGISTERMETHOD) {
|
|
172
|
-
doubtfulResult.push(i);
|
|
173
|
-
}
|
|
174
|
-
else {
|
|
175
|
-
result.push(i);
|
|
176
|
-
}
|
|
177
|
-
}
|
|
178
|
-
if (doubtfulResult.length > 0) {
|
|
179
|
-
this.logger.warn(`broadcast rpc \`${name}\` getting doubtful responses: ${doubtfulResult.join(',')}`);
|
|
180
|
-
}
|
|
181
|
-
// FIXME: this is an unreasonable design, if remote service only returned doubtful result, we will return an empty array.
|
|
182
|
-
// but actually we should throw an error to tell user that no remote service can handle this call.
|
|
183
|
-
// or just return `undefined`.
|
|
184
|
-
return result.length === 1 ? result[0] : result;
|
|
168
|
+
broadcast(name, ...args) {
|
|
169
|
+
return Promise.all(this.serviceProxy.map((proxy) => proxy[name](...args)))
|
|
170
|
+
.then((result) => result.filter((res) => res !== proxy_1.NOTREGISTERMETHOD))
|
|
171
|
+
.then((result) => (result.length === 1 ? result[0] : result));
|
|
185
172
|
}
|
|
186
173
|
}
|
|
187
174
|
exports.RPCServiceCenter = RPCServiceCenter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/common/connect.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/common/connect.ts"],"names":[],"mappings":"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"}
|
package/lib/common/proxy.d.ts
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
import type { MessageConnection } from '@opensumi/vscode-jsonrpc/lib/common/connection';
|
|
2
|
-
export interface ILogger {
|
|
3
|
-
warn(...args: any[]): void;
|
|
4
|
-
}
|
|
5
2
|
export declare abstract class RPCService<T = any> {
|
|
6
3
|
rpcClient?: T[];
|
|
7
4
|
rpcRegistered?: boolean;
|
|
@@ -23,7 +20,7 @@ export declare class RPCProxy {
|
|
|
23
20
|
private proxyService;
|
|
24
21
|
private logger;
|
|
25
22
|
private capture;
|
|
26
|
-
constructor(target?: RPCService<any> | undefined, logger?:
|
|
23
|
+
constructor(target?: RPCService<any> | undefined, logger?: any);
|
|
27
24
|
listenService(service: any): void;
|
|
28
25
|
listen(connection: MessageConnection): void;
|
|
29
26
|
createProxy(): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/common/proxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAIxF,
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/common/proxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAIxF,8BAAsB,UAAU,CAAC,CAAC,GAAG,GAAG;IACtC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,CAAC;IAC7B,IAAI,MAAM,kBAET;CACF;AAED,eAAO,MAAM,iBAAiB,wBAAwB,CAAC;AAEvD,qBAAa,WAAW;IACf,KAAK,EAAE,GAAG,CAAC;IACX,aAAa,EAAE,MAAM,EAAE,CAAC;gBAEnB,KAAK,EAAE,GAAG,EAAE,aAAa,WAAW;IAIzC,SAAS;CAcjB;AAMD,qBAAa,QAAQ;IAcA,MAAM,CAAC;IAb1B,OAAO,CAAC,iBAAiB,CAA6B;IACtD,OAAO,CAAC,wBAAwB,CAA0C;IAC1E,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,YAAY,CAAW;IAC/B,OAAO,CAAC,MAAM,CAAM;IAEpB,OAAO,CAAC,OAAO;gBAOI,MAAM,CAAC,6BAAY,EAAE,MAAM,CAAC,EAAE,GAAG;IAI7C,aAAa,CAAC,OAAO,KAAA;IAerB,MAAM,CAAC,UAAU,EAAE,iBAAiB;IAUpC,WAAW,IAAI,GAAG;IAMlB,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,WAAW,aAGnB,GAAG,EAAE;IAmExB,OAAO,CAAC,gBAAgB;IAmBxB,OAAO,CAAC,aAAa;IAkErB,OAAO,CAAC,iBAAiB;IAMzB;;;;;;;;OAQG;IACH,OAAO,CAAC,kBAAkB;YASZ,SAAS;IAmBvB,OAAO,CAAC,cAAc;CAOvB"}
|
package/lib/common/proxy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/common/proxy.ts"],"names":[],"mappings":";;;AAAA,+DAA4D;AAG5D,mCAAqF;
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../src/common/proxy.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.24.6
|
|
3
|
+
"version": "2.24.6",
|
|
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.24.6
|
|
20
|
+
"@opensumi/ide-core-common": "2.24.6",
|
|
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.24.6
|
|
27
|
+
"@opensumi/ide-components": "2.24.6",
|
|
28
28
|
"@opensumi/ide-dev-tool": "1.3.1",
|
|
29
29
|
"mock-socket": "^9.0.2"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "eaa523bf30631fed0c6cd7d2e83e4bae4b345ec5"
|
|
32
32
|
}
|
package/src/common/connect.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MessageConnection } from '@opensumi/vscode-jsonrpc/lib/common/connection';
|
|
2
2
|
|
|
3
|
-
import { RPCProxy, NOTREGISTERMETHOD
|
|
3
|
+
import { RPCProxy, NOTREGISTERMETHOD } from './proxy';
|
|
4
4
|
|
|
5
5
|
export type RPCServiceMethod = (...args: any[]) => any;
|
|
6
6
|
export type ServiceProxy = any;
|
|
@@ -11,7 +11,7 @@ export enum ServiceType {
|
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
export class RPCServiceStub {
|
|
14
|
-
constructor(private serviceName: string, private center
|
|
14
|
+
constructor(private serviceName: string, private center, private type: ServiceType) {
|
|
15
15
|
if (this.type === ServiceType.Service) {
|
|
16
16
|
this.center.registerService(serviceName, this.type);
|
|
17
17
|
}
|
|
@@ -59,7 +59,7 @@ export class RPCServiceStub {
|
|
|
59
59
|
onRequest(name: string, method: RPCServiceMethod) {
|
|
60
60
|
this.center.onRequest(this.getMethodName(name), method);
|
|
61
61
|
}
|
|
62
|
-
broadcast(name: string, ...args)
|
|
62
|
+
broadcast(name: string, ...args) {
|
|
63
63
|
return this.center.broadcast(this.getMethodName(name), ...args);
|
|
64
64
|
}
|
|
65
65
|
|
|
@@ -74,7 +74,13 @@ export class RPCServiceStub {
|
|
|
74
74
|
if (typeof prop === 'symbol') {
|
|
75
75
|
return Promise.resolve();
|
|
76
76
|
} else {
|
|
77
|
-
return (...args) =>
|
|
77
|
+
return (...args) =>
|
|
78
|
+
this.ready().then(() => {
|
|
79
|
+
const name = this.getMethodName(prop);
|
|
80
|
+
return Promise.all(this.center.serviceProxy.map((proxy) => proxy[name](...args)))
|
|
81
|
+
.then((result) => result.filter((res) => res !== NOTREGISTERMETHOD))
|
|
82
|
+
.then((result) => (result.length === 1 ? result[0] : result));
|
|
83
|
+
});
|
|
78
84
|
}
|
|
79
85
|
} else {
|
|
80
86
|
return target[prop];
|
|
@@ -127,9 +133,9 @@ export class RPCServiceCenter {
|
|
|
127
133
|
|
|
128
134
|
private connectionPromise: Promise<void>;
|
|
129
135
|
private connectionPromiseResolve: () => void;
|
|
130
|
-
private logger
|
|
136
|
+
private logger;
|
|
131
137
|
|
|
132
|
-
constructor(private bench?: IBench, logger?:
|
|
138
|
+
constructor(private bench?: IBench, logger?: any) {
|
|
133
139
|
this.uid = 'RPCServiceCenter:' + process.pid;
|
|
134
140
|
this.connectionPromise = new Promise((resolve) => {
|
|
135
141
|
this.connectionPromiseResolve = resolve;
|
|
@@ -176,7 +182,7 @@ export class RPCServiceCenter {
|
|
|
176
182
|
|
|
177
183
|
return removeIndex !== -1;
|
|
178
184
|
}
|
|
179
|
-
onRequest(name
|
|
185
|
+
onRequest(name, method: RPCServiceMethod) {
|
|
180
186
|
if (!this.connection.length) {
|
|
181
187
|
this.serviceMethodMap[name] = method;
|
|
182
188
|
} else {
|
|
@@ -185,28 +191,9 @@ export class RPCServiceCenter {
|
|
|
185
191
|
});
|
|
186
192
|
}
|
|
187
193
|
}
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
}
|
|
193
|
-
|
|
194
|
-
const doubtfulResult = [] as any[];
|
|
195
|
-
const result = [] as any[];
|
|
196
|
-
for (const i of broadcastResult) {
|
|
197
|
-
if (i === NOTREGISTERMETHOD) {
|
|
198
|
-
doubtfulResult.push(i);
|
|
199
|
-
} else {
|
|
200
|
-
result.push(i);
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
|
|
204
|
-
if (doubtfulResult.length > 0) {
|
|
205
|
-
this.logger.warn(`broadcast rpc \`${name}\` getting doubtful responses: ${doubtfulResult.join(',')}`);
|
|
206
|
-
}
|
|
207
|
-
// FIXME: this is an unreasonable design, if remote service only returned doubtful result, we will return an empty array.
|
|
208
|
-
// but actually we should throw an error to tell user that no remote service can handle this call.
|
|
209
|
-
// or just return `undefined`.
|
|
210
|
-
return result.length === 1 ? result[0] : result;
|
|
194
|
+
broadcast(name, ...args): Promise<any> {
|
|
195
|
+
return Promise.all(this.serviceProxy.map((proxy) => proxy[name](...args)) as Promise<any>[])
|
|
196
|
+
.then((result) => result.filter((res) => res !== NOTREGISTERMETHOD))
|
|
197
|
+
.then((result) => (result.length === 1 ? result[0] : result));
|
|
211
198
|
}
|
|
212
199
|
}
|
package/src/common/proxy.ts
CHANGED
|
@@ -3,10 +3,6 @@ import type { MessageConnection } from '@opensumi/vscode-jsonrpc/lib/common/conn
|
|
|
3
3
|
|
|
4
4
|
import { MessageType, ResponseStatus, ICapturedMessage, getCapturer } from './utils';
|
|
5
5
|
|
|
6
|
-
export interface ILogger {
|
|
7
|
-
warn(...args: any[]): void;
|
|
8
|
-
}
|
|
9
|
-
|
|
10
6
|
export abstract class RPCService<T = any> {
|
|
11
7
|
rpcClient?: T[];
|
|
12
8
|
rpcRegistered?: boolean;
|
|
@@ -51,7 +47,7 @@ export class RPCProxy {
|
|
|
51
47
|
private connectionPromiseResolve: (connection: MessageConnection) => void;
|
|
52
48
|
private connection: MessageConnection;
|
|
53
49
|
private proxyService: any = {};
|
|
54
|
-
private logger:
|
|
50
|
+
private logger: any;
|
|
55
51
|
// capture messages for opensumi devtools
|
|
56
52
|
private capture(message: ICapturedMessage): void {
|
|
57
53
|
const capturer = getCapturer();
|
|
@@ -60,7 +56,7 @@ export class RPCProxy {
|
|
|
60
56
|
}
|
|
61
57
|
}
|
|
62
58
|
|
|
63
|
-
constructor(public target?: RPCService, logger?:
|
|
59
|
+
constructor(public target?: RPCService, logger?: any) {
|
|
64
60
|
this.waitForConnection();
|
|
65
61
|
this.logger = logger || console;
|
|
66
62
|
}
|