@opensumi/ide-core-node 3.1.5-next-1721991901.0 → 3.1.5-next-1722003770.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/connection.d.ts.map +1 -1
- package/lib/connection.js +14 -4
- package/lib/connection.js.map +1 -1
- package/package.json +5 -5
- package/src/connection.ts +15 -9
package/lib/connection.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAgC,QAAQ,EAAmB,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAA6B,MAAM,0BAA0B,CAAC;AAGvF,OAAO,
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAgC,QAAQ,EAAmB,MAAM,cAAc,CAAC;AACvF,OAAO,EAAE,gBAAgB,EAA6B,MAAM,0BAA0B,CAAC;AAGvF,OAAO,EAAwB,gBAAgB,EAAwB,MAAM,mCAAmC,CAAC;AAGjH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAyB5B,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,UAAU,EAAE,EAC9B,UAAU,EAAE,gBAAgB,EAAE,EAC9B,aAAa,EAAE,cAAc,QA8B9B;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,UAAU,EAAE,QAkB/G;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,UAAU,EAAE,EACrB,aAAa,EAAE,gBAAgB,EAC/B,QAAQ,CAAC,EAAE,MAAM,YAwDlB"}
|
package/lib/connection.js
CHANGED
|
@@ -21,13 +21,18 @@ function handleClientChannel(injector, modulesInstances, channel, clientId, logg
|
|
|
21
21
|
}
|
|
22
22
|
function createServerConnection2(server, injector, modulesInstances, handlerArr, serverAppOpts) {
|
|
23
23
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
24
|
+
const commonChannelPathHandler = new server_handler_1.CommonChannelPathHandler();
|
|
25
|
+
injector.addProviders({
|
|
26
|
+
token: server_handler_1.CommonChannelPathHandler,
|
|
27
|
+
useValue: commonChannelPathHandler,
|
|
28
|
+
});
|
|
24
29
|
const socketRoute = new node_1.WebSocketServerRoute(server, logger);
|
|
25
|
-
const channelHandler = new node_1.CommonChannelHandler('/service', logger, {
|
|
30
|
+
const channelHandler = new node_1.CommonChannelHandler('/service', commonChannelPathHandler, logger, {
|
|
26
31
|
pathMatchOptions: serverAppOpts.pathMatchOptions,
|
|
27
32
|
wsServerOptions: serverAppOpts.wsServerOptions,
|
|
28
33
|
});
|
|
29
34
|
// 事件由 connection 的时机来触发
|
|
30
|
-
|
|
35
|
+
commonChannelPathHandler.register(server_handler_1.RPCServiceChannelPath, {
|
|
31
36
|
handler: (channel, clientId) => {
|
|
32
37
|
handleClientChannel(injector, modulesInstances, channel, clientId, logger);
|
|
33
38
|
},
|
|
@@ -44,9 +49,14 @@ function createServerConnection2(server, injector, modulesInstances, handlerArr,
|
|
|
44
49
|
exports.createServerConnection2 = createServerConnection2;
|
|
45
50
|
function createNetServerConnection(server, injector, modulesInstances) {
|
|
46
51
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
47
|
-
const
|
|
52
|
+
const commonChannelPathHandler = new server_handler_1.CommonChannelPathHandler();
|
|
53
|
+
injector.addProviders({
|
|
54
|
+
token: server_handler_1.CommonChannelPathHandler,
|
|
55
|
+
useValue: commonChannelPathHandler,
|
|
56
|
+
});
|
|
57
|
+
const handler = new electron_1.ElectronChannelHandler(server, commonChannelPathHandler, logger);
|
|
48
58
|
// 事件由 connection 的时机来触发
|
|
49
|
-
|
|
59
|
+
commonChannelPathHandler.register(server_handler_1.RPCServiceChannelPath, {
|
|
50
60
|
handler: (channel, clientId) => {
|
|
51
61
|
handleClientChannel(injector, modulesInstances, channel, clientId, logger);
|
|
52
62
|
},
|
package/lib/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;;AAIA,6DAAuF;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-core-node",
|
|
3
|
-
"version": "3.1.5-next-
|
|
3
|
+
"version": "3.1.5-next-1722003770.0",
|
|
4
4
|
"description": "@opensumi/ide-core-node",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib",
|
|
@@ -18,12 +18,12 @@
|
|
|
18
18
|
"url": "git@github.com:opensumi/core.git"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@opensumi/ide-connection": "3.1.5-next-
|
|
22
|
-
"@opensumi/ide-core-common": "3.1.5-next-
|
|
21
|
+
"@opensumi/ide-connection": "3.1.5-next-1722003770.0",
|
|
22
|
+
"@opensumi/ide-core-common": "3.1.5-next-1722003770.0",
|
|
23
23
|
"keytar": "^7.7.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@opensumi/ide-dev-tool": "3.1.5-next-
|
|
26
|
+
"@opensumi/ide-dev-tool": "3.1.5-next-1722003770.0"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "c107801265382829d1142664d217e3997ee865ac"
|
|
29
29
|
}
|
package/src/connection.ts
CHANGED
|
@@ -3,14 +3,9 @@ import net from 'net';
|
|
|
3
3
|
|
|
4
4
|
import { ClassCreator, FactoryCreator, Injector, InstanceCreator } from '@opensumi/di';
|
|
5
5
|
import { RPCServiceCenter, WSChannel, initRPCService } from '@opensumi/ide-connection';
|
|
6
|
-
import { RPCServiceChannelPath } from '@opensumi/ide-connection/lib/common/server-handler';
|
|
6
|
+
import { CommonChannelPathHandler, RPCServiceChannelPath } from '@opensumi/ide-connection/lib/common/server-handler';
|
|
7
7
|
import { ElectronChannelHandler } from '@opensumi/ide-connection/lib/electron';
|
|
8
|
-
import {
|
|
9
|
-
CommonChannelHandler,
|
|
10
|
-
WebSocketHandler,
|
|
11
|
-
WebSocketServerRoute,
|
|
12
|
-
commonChannelPathHandler,
|
|
13
|
-
} from '@opensumi/ide-connection/lib/node';
|
|
8
|
+
import { CommonChannelHandler, WebSocketHandler, WebSocketServerRoute } from '@opensumi/ide-connection/lib/node';
|
|
14
9
|
|
|
15
10
|
import { INodeLogger } from './logger/node-logger';
|
|
16
11
|
import { NodeModule } from './node-module';
|
|
@@ -49,8 +44,14 @@ export function createServerConnection2(
|
|
|
49
44
|
serverAppOpts: IServerAppOpts,
|
|
50
45
|
) {
|
|
51
46
|
const logger = injector.get(INodeLogger);
|
|
47
|
+
const commonChannelPathHandler = new CommonChannelPathHandler();
|
|
48
|
+
injector.addProviders({
|
|
49
|
+
token: CommonChannelPathHandler,
|
|
50
|
+
useValue: commonChannelPathHandler,
|
|
51
|
+
});
|
|
52
|
+
|
|
52
53
|
const socketRoute = new WebSocketServerRoute(server, logger);
|
|
53
|
-
const channelHandler = new CommonChannelHandler('/service', logger, {
|
|
54
|
+
const channelHandler = new CommonChannelHandler('/service', commonChannelPathHandler, logger, {
|
|
54
55
|
pathMatchOptions: serverAppOpts.pathMatchOptions,
|
|
55
56
|
wsServerOptions: serverAppOpts.wsServerOptions,
|
|
56
57
|
});
|
|
@@ -74,8 +75,13 @@ export function createServerConnection2(
|
|
|
74
75
|
|
|
75
76
|
export function createNetServerConnection(server: net.Server, injector: Injector, modulesInstances: NodeModule[]) {
|
|
76
77
|
const logger = injector.get(INodeLogger) as INodeLogger;
|
|
78
|
+
const commonChannelPathHandler = new CommonChannelPathHandler();
|
|
79
|
+
injector.addProviders({
|
|
80
|
+
token: CommonChannelPathHandler,
|
|
81
|
+
useValue: commonChannelPathHandler,
|
|
82
|
+
});
|
|
77
83
|
|
|
78
|
-
const handler = new ElectronChannelHandler(server, logger);
|
|
84
|
+
const handler = new ElectronChannelHandler(server, commonChannelPathHandler, logger);
|
|
79
85
|
// 事件由 connection 的时机来触发
|
|
80
86
|
commonChannelPathHandler.register(RPCServiceChannelPath, {
|
|
81
87
|
handler: (channel: WSChannel, clientId: string) => {
|