@opensumi/ide-core-node 3.1.5-next-1721991901.0 → 3.1.5-next-1722006339.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/bootstrap/app.d.ts.map +1 -1
- package/lib/bootstrap/app.js +1 -0
- package/lib/bootstrap/app.js.map +1 -1
- package/lib/connection.d.ts +1 -0
- package/lib/connection.d.ts.map +1 -1
- package/lib/connection.js +15 -5
- package/lib/connection.js.map +1 -1
- package/package.json +5 -5
- package/src/bootstrap/app.ts +7 -1
- package/src/connection.ts +14 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":";;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AAItB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EACL,oBAAoB,EAQrB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":";;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AAItB,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EACL,oBAAoB,EAQrB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EACL,gBAAgB,EAIjB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAa,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAI3G,qBAAa,SAAU,YAAW,UAAU;IAuB9B,OAAO,CAAC,IAAI;IAtBxB,OAAO,CAAC,SAAS,CAAW;IAE5B,OAAO,CAAC,MAAM,CAAiB;IAE/B,OAAO,CAAC,MAAM,CAAwD;IAEtE,OAAO,CAAC,gBAAgB,CAAqB;IAE7C,OAAO,CAAC,gBAAgB,CAAe;IAEvC,GAAG,EAAE,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC;IAE9E,SAAS,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,qBAAqB,CAAC,CAAC;IAE7E;;;;;;;OAOG;gBACiB,IAAI,EAAE,cAAc;IAkCxC,IAAI,QAAQ,aAEX;IAED;;OAEG;IACI,iBAAiB,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,EAAE;IAW7E,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,gBAAgB;YAYV,sBAAsB;YAYtB,iBAAiB;IAYzB,KAAK,CACT,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,EAC/C,cAAc,CAAC,EAAE,CAAC,aAAa,EAAE,gBAAgB,KAAK,IAAI;YAkB9C,MAAM;IAYpB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA6B1B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;CAyB1B"}
|
package/lib/bootstrap/app.js
CHANGED
|
@@ -70,6 +70,7 @@ class ServerApp {
|
|
|
70
70
|
useValue: this.config,
|
|
71
71
|
});
|
|
72
72
|
(0, inner_providers_1.injectInnerProviders)(this.injector);
|
|
73
|
+
(0, connection_1.injectConnectionProviders)(this.injector);
|
|
73
74
|
}
|
|
74
75
|
async initializeContribution() {
|
|
75
76
|
for (const contribution of this.contributions) {
|
package/lib/bootstrap/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AACxB,0DAA0B;AAC1B,sDAAsB;AACtB,oDAAoB;AACpB,wDAAwB;AAIxB,qCAAwC;AAExC,+DASmC;AACnC,+DAAoF;AAEpF,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":"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"}
|
package/lib/connection.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ import { WebSocketHandler } from '@opensumi/ide-connection/lib/node';
|
|
|
8
8
|
import { NodeModule } from './node-module';
|
|
9
9
|
import { IServerAppOpts } from './types';
|
|
10
10
|
export { RPCServiceCenter };
|
|
11
|
+
export declare function injectConnectionProviders(injector: Injector): void;
|
|
11
12
|
export declare function createServerConnection2(server: http.Server, injector: Injector, modulesInstances: NodeModule[], handlerArr: WebSocketHandler[], serverAppOpts: IServerAppOpts): void;
|
|
12
13
|
export declare function createNetServerConnection(server: net.Server, injector: Injector, modulesInstances: NodeModule[]): void;
|
|
13
14
|
export declare function bindModuleBackService(injector: Injector, modules: NodeModule[], serviceCenter: RPCServiceCenter, clientId?: string): Injector;
|
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;AAE5B,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,QAM3D;AAyBD,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,QAyB9B;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,UAAU,EAAE,QAc/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
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.bindModuleBackService = exports.createNetServerConnection = exports.createServerConnection2 = exports.RPCServiceCenter = void 0;
|
|
3
|
+
exports.bindModuleBackService = exports.createNetServerConnection = exports.createServerConnection2 = exports.injectConnectionProviders = exports.RPCServiceCenter = void 0;
|
|
4
4
|
const ide_connection_1 = require("@opensumi/ide-connection");
|
|
5
5
|
Object.defineProperty(exports, "RPCServiceCenter", { enumerable: true, get: function () { return ide_connection_1.RPCServiceCenter; } });
|
|
6
6
|
const server_handler_1 = require("@opensumi/ide-connection/lib/common/server-handler");
|
|
7
7
|
const electron_1 = require("@opensumi/ide-connection/lib/electron");
|
|
8
8
|
const node_1 = require("@opensumi/ide-connection/lib/node");
|
|
9
9
|
const node_logger_1 = require("./logger/node-logger");
|
|
10
|
+
function injectConnectionProviders(injector) {
|
|
11
|
+
const commonChannelPathHandler = new server_handler_1.CommonChannelPathHandler();
|
|
12
|
+
injector.addProviders({
|
|
13
|
+
token: server_handler_1.CommonChannelPathHandler,
|
|
14
|
+
useValue: commonChannelPathHandler,
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
exports.injectConnectionProviders = injectConnectionProviders;
|
|
10
18
|
function handleClientChannel(injector, modulesInstances, channel, clientId, logger) {
|
|
11
19
|
logger.log(`New RPC connection ${clientId}`);
|
|
12
20
|
const serviceCenter = new ide_connection_1.RPCServiceCenter(undefined, logger);
|
|
@@ -21,13 +29,14 @@ function handleClientChannel(injector, modulesInstances, channel, clientId, logg
|
|
|
21
29
|
}
|
|
22
30
|
function createServerConnection2(server, injector, modulesInstances, handlerArr, serverAppOpts) {
|
|
23
31
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
32
|
+
const commonChannelPathHandler = injector.get(server_handler_1.CommonChannelPathHandler);
|
|
24
33
|
const socketRoute = new node_1.WebSocketServerRoute(server, logger);
|
|
25
|
-
const channelHandler = new node_1.CommonChannelHandler('/service', logger, {
|
|
34
|
+
const channelHandler = new node_1.CommonChannelHandler('/service', commonChannelPathHandler, logger, {
|
|
26
35
|
pathMatchOptions: serverAppOpts.pathMatchOptions,
|
|
27
36
|
wsServerOptions: serverAppOpts.wsServerOptions,
|
|
28
37
|
});
|
|
29
38
|
// 事件由 connection 的时机来触发
|
|
30
|
-
|
|
39
|
+
commonChannelPathHandler.register(server_handler_1.RPCServiceChannelPath, {
|
|
31
40
|
handler: (channel, clientId) => {
|
|
32
41
|
handleClientChannel(injector, modulesInstances, channel, clientId, logger);
|
|
33
42
|
},
|
|
@@ -44,9 +53,10 @@ function createServerConnection2(server, injector, modulesInstances, handlerArr,
|
|
|
44
53
|
exports.createServerConnection2 = createServerConnection2;
|
|
45
54
|
function createNetServerConnection(server, injector, modulesInstances) {
|
|
46
55
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
47
|
-
const
|
|
56
|
+
const commonChannelPathHandler = injector.get(server_handler_1.CommonChannelPathHandler);
|
|
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-1722006339.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-1722006339.0",
|
|
22
|
+
"@opensumi/ide-core-common": "3.1.5-next-1722006339.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-1722006339.0"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "b7a8c9e527f1ba8b138a04940f126c3fc032bc44"
|
|
29
29
|
}
|
package/src/bootstrap/app.ts
CHANGED
|
@@ -20,7 +20,12 @@ import {
|
|
|
20
20
|
} from '@opensumi/ide-core-common';
|
|
21
21
|
import { DEFAULT_ALIPAY_CLOUD_REGISTRY } from '@opensumi/ide-core-common/lib/const';
|
|
22
22
|
|
|
23
|
-
import {
|
|
23
|
+
import {
|
|
24
|
+
RPCServiceCenter,
|
|
25
|
+
createNetServerConnection,
|
|
26
|
+
createServerConnection2,
|
|
27
|
+
injectConnectionProviders,
|
|
28
|
+
} from '../connection';
|
|
24
29
|
import { NodeModule } from '../node-module';
|
|
25
30
|
import { AppConfig, IServerApp, IServerAppOpts, ModuleConstructor, ServerAppContribution } from '../types';
|
|
26
31
|
|
|
@@ -114,6 +119,7 @@ export class ServerApp implements IServerApp {
|
|
|
114
119
|
useValue: this.config,
|
|
115
120
|
});
|
|
116
121
|
injectInnerProviders(this.injector);
|
|
122
|
+
injectConnectionProviders(this.injector);
|
|
117
123
|
}
|
|
118
124
|
|
|
119
125
|
private async initializeContribution() {
|
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';
|
|
@@ -18,6 +13,14 @@ import { IServerAppOpts } from './types';
|
|
|
18
13
|
|
|
19
14
|
export { RPCServiceCenter };
|
|
20
15
|
|
|
16
|
+
export function injectConnectionProviders(injector: Injector) {
|
|
17
|
+
const commonChannelPathHandler = new CommonChannelPathHandler();
|
|
18
|
+
injector.addProviders({
|
|
19
|
+
token: CommonChannelPathHandler,
|
|
20
|
+
useValue: commonChannelPathHandler,
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
|
|
21
24
|
function handleClientChannel(
|
|
22
25
|
injector: Injector,
|
|
23
26
|
modulesInstances: NodeModule[],
|
|
@@ -49,8 +52,9 @@ export function createServerConnection2(
|
|
|
49
52
|
serverAppOpts: IServerAppOpts,
|
|
50
53
|
) {
|
|
51
54
|
const logger = injector.get(INodeLogger);
|
|
55
|
+
const commonChannelPathHandler = injector.get(CommonChannelPathHandler);
|
|
52
56
|
const socketRoute = new WebSocketServerRoute(server, logger);
|
|
53
|
-
const channelHandler = new CommonChannelHandler('/service', logger, {
|
|
57
|
+
const channelHandler = new CommonChannelHandler('/service', commonChannelPathHandler, logger, {
|
|
54
58
|
pathMatchOptions: serverAppOpts.pathMatchOptions,
|
|
55
59
|
wsServerOptions: serverAppOpts.wsServerOptions,
|
|
56
60
|
});
|
|
@@ -74,8 +78,9 @@ export function createServerConnection2(
|
|
|
74
78
|
|
|
75
79
|
export function createNetServerConnection(server: net.Server, injector: Injector, modulesInstances: NodeModule[]) {
|
|
76
80
|
const logger = injector.get(INodeLogger) as INodeLogger;
|
|
81
|
+
const commonChannelPathHandler = injector.get(CommonChannelPathHandler);
|
|
77
82
|
|
|
78
|
-
const handler = new ElectronChannelHandler(server, logger);
|
|
83
|
+
const handler = new ElectronChannelHandler(server, commonChannelPathHandler, logger);
|
|
79
84
|
// 事件由 connection 的时机来触发
|
|
80
85
|
commonChannelPathHandler.register(RPCServiceChannelPath, {
|
|
81
86
|
handler: (channel: WSChannel, clientId: string) => {
|