@opensumi/ide-core-node 2.15.3 → 2.15.4-next-1646710624.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 +2 -2
- package/lib/connection.d.ts.map +1 -1
- package/lib/connection.js +9 -9
- package/lib/connection.js.map +1 -1
- package/package.json +4 -4
package/lib/connection.d.ts
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
import http from 'http';
|
|
3
3
|
import net from 'net';
|
|
4
4
|
import { NodeModule } from './node-module';
|
|
5
|
-
import { WebSocketHandler } from '@opensumi/ide-connection';
|
|
6
|
-
import { Injector } from '@opensumi/di';
|
|
7
5
|
import { RPCServiceCenter } from '@opensumi/ide-connection';
|
|
6
|
+
import { WebSocketHandler } from '@opensumi/ide-connection/lib/node';
|
|
7
|
+
import { Injector } from '@opensumi/di';
|
|
8
8
|
export { RPCServiceCenter };
|
|
9
9
|
export declare function createServerConnection2(server: http.Server, injector: any, modulesInstances: any, handlerArr?: WebSocketHandler[]): void;
|
|
10
10
|
export declare function createNetServerConnection(server: net.Server, injector: any, modulesInstances: any): RPCServiceCenter;
|
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;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,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;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAA6B,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAEL,gBAAgB,EAIjB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAiD,MAAM,cAAc,CAAC;AAKvF,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAE5B,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,QAAQ,KAAA,EACR,gBAAgB,KAAA,EAChB,UAAU,CAAC,EAAE,gBAAgB,EAAE,QAmChC;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,KAAA,EAAE,gBAAgB,KAAA,oBAwBvF;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,UAAU,EAAE,EACrB,aAAa,EAAE,gBAAgB,EAC/B,QAAQ,CAAC,EAAE,MAAM,YAiDlB"}
|
package/lib/connection.js
CHANGED
|
@@ -2,19 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.bindModuleBackService = exports.createNetServerConnection = exports.createServerConnection2 = exports.RPCServiceCenter = void 0;
|
|
4
4
|
const ide_connection_1 = require("@opensumi/ide-connection");
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
Object.defineProperty(exports, "RPCServiceCenter", { enumerable: true, get: function () { return ide_connection_1.RPCServiceCenter; } });
|
|
6
|
+
const node_1 = require("@opensumi/ide-connection/lib/node");
|
|
7
7
|
const message_1 = require("@opensumi/ide-connection/lib/common/message");
|
|
8
8
|
const node_logger_1 = require("./logger/node-logger");
|
|
9
9
|
function createServerConnection2(server, injector, modulesInstances, handlerArr) {
|
|
10
10
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
11
|
-
const socketRoute = new
|
|
12
|
-
const channelHandler = new
|
|
11
|
+
const socketRoute = new node_1.WebSocketServerRoute(server, logger);
|
|
12
|
+
const channelHandler = new node_1.CommonChannelHandler('/service', logger);
|
|
13
13
|
// 事件由 connection 的时机来触发
|
|
14
|
-
|
|
14
|
+
node_1.commonChannelPathHandler.register('RPCService', {
|
|
15
15
|
handler: (connection, clientId) => {
|
|
16
16
|
logger.log(`set rpc connection ${clientId}`);
|
|
17
|
-
const serviceCenter = new
|
|
17
|
+
const serviceCenter = new ide_connection_1.RPCServiceCenter(undefined, logger);
|
|
18
18
|
const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, clientId);
|
|
19
19
|
const serverConnection = (0, message_1.createWebSocketConnection)(connection);
|
|
20
20
|
connection.messageConnection = serverConnection;
|
|
@@ -38,11 +38,11 @@ function createServerConnection2(server, injector, modulesInstances, handlerArr)
|
|
|
38
38
|
exports.createServerConnection2 = createServerConnection2;
|
|
39
39
|
function createNetServerConnection(server, injector, modulesInstances) {
|
|
40
40
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
41
|
-
const serviceCenter = new
|
|
41
|
+
const serviceCenter = new ide_connection_1.RPCServiceCenter(undefined, logger);
|
|
42
42
|
const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, process.env.CODE_WINDOW_CLIENT_ID);
|
|
43
43
|
server.on('connection', (connection) => {
|
|
44
44
|
logger.log('set net rpc connection');
|
|
45
|
-
const serverConnection = (0,
|
|
45
|
+
const serverConnection = (0, node_1.createSocketConnection)(connection);
|
|
46
46
|
serviceCenter.setConnection(serverConnection);
|
|
47
47
|
connection.on('close', () => {
|
|
48
48
|
serviceCenter.removeConnection(serverConnection);
|
|
@@ -55,7 +55,7 @@ function createNetServerConnection(server, injector, modulesInstances) {
|
|
|
55
55
|
exports.createNetServerConnection = createNetServerConnection;
|
|
56
56
|
function bindModuleBackService(injector, modules, serviceCenter, clientId) {
|
|
57
57
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
58
|
-
const { createRPCService } = (0,
|
|
58
|
+
const { createRPCService } = (0, ide_connection_1.initRPCService)(serviceCenter);
|
|
59
59
|
const childInjector = injector.createChild();
|
|
60
60
|
for (const module of modules) {
|
|
61
61
|
if (module.backServices) {
|
package/lib/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;;AAGA,
|
|
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": "2.15.
|
|
3
|
+
"version": "2.15.4-next-1646710624.0",
|
|
4
4
|
"description": "@opensumi/ide-core-node",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib"
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "2.15.
|
|
21
|
-
"@opensumi/ide-core-common": "2.15.
|
|
20
|
+
"@opensumi/ide-connection": "2.15.4-next-1646710624.0",
|
|
21
|
+
"@opensumi/ide-core-common": "2.15.4-next-1646710624.0",
|
|
22
22
|
"keytar": "^7.7.0"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@opensumi/ide-dev-tool": "^1.3.1"
|
|
26
26
|
},
|
|
27
|
-
"gitHead": "
|
|
27
|
+
"gitHead": "2689bc40b3d238ae49c9a445d2fdbbe1cc0956d5"
|
|
28
28
|
}
|