@opensumi/ide-core-node 2.27.2 → 2.27.3-next-1706077936.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 +3 -7
- package/lib/bootstrap/app.js.map +1 -1
- package/lib/bootstrap/shell-path.js.map +1 -1
- package/lib/common-module/index.d.ts +7 -2
- package/lib/common-module/index.d.ts.map +1 -1
- package/lib/common-module/index.js +4 -2
- package/lib/common-module/index.js.map +1 -1
- package/lib/connection.d.ts +2 -2
- package/lib/connection.d.ts.map +1 -1
- package/lib/connection.js +56 -53
- package/lib/connection.js.map +1 -1
- package/package.json +4 -4
- package/src/bootstrap/app.ts +3 -15
- package/src/bootstrap/shell-path.ts +1 -1
- package/src/common-module/index.ts +2 -0
- package/src/connection.ts +79 -74
|
@@ -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,EAAE,oBAAoB,EAAyD,MAAM,2BAA2B,CAAC;AAIxH,OAAO,EAAsD,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErG,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;IA8CxC,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;YAWV,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;
|
|
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,EAAE,oBAAoB,EAAyD,MAAM,2BAA2B,CAAC;AAIxH,OAAO,EAAsD,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAErG,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;IA8CxC,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;YAWV,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
|
@@ -116,22 +116,18 @@ class ServerApp {
|
|
|
116
116
|
}
|
|
117
117
|
async start(server, serviceHandler) {
|
|
118
118
|
await this.initializeContribution();
|
|
119
|
-
let serviceCenter;
|
|
120
119
|
if (serviceHandler) {
|
|
121
|
-
|
|
122
|
-
serviceHandler(serviceCenter);
|
|
120
|
+
serviceHandler(new connection_1.RPCServiceCenter());
|
|
123
121
|
}
|
|
124
122
|
else {
|
|
125
123
|
if (server instanceof http_1.default.Server || server instanceof https_1.default.Server) {
|
|
126
124
|
// 创建 websocket 通道
|
|
127
|
-
|
|
125
|
+
(0, connection_1.createServerConnection2)(server, this.injector, this.modulesInstances, this.webSocketHandler, this.opts);
|
|
128
126
|
}
|
|
129
127
|
else if (server instanceof net_1.default.Server) {
|
|
130
|
-
|
|
128
|
+
(0, connection_1.createNetServerConnection)(server, this.injector, this.modulesInstances);
|
|
131
129
|
}
|
|
132
130
|
}
|
|
133
|
-
// TODO: 每次链接来的时候绑定一次，或者是服务获取的时候多实例化出来
|
|
134
|
-
// bindModuleBackService(this.injector, this.modulesInstances, serviceCenter);
|
|
135
131
|
await this.startContribution();
|
|
136
132
|
}
|
|
137
133
|
async onStop() {
|
package/lib/bootstrap/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-path.js","sourceRoot":"","sources":["../../src/bootstrap/shell-path.ts"],"names":[],"mappings":";;;AAAA,iDAAsC;AAEtC,+DAAiE;AAEjE,sBAAsB;AACtB,MAAM,sBAAsB,GAAG,CAAC,GAAG,IAAI,CAAC;AAExC,kBAAkB;AAClB,oDAAoD;AACpD,MAAM,aAAa,GAAG,EAAE,GAAG,IAAI,CAAC;AAEhC,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;AACjC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;AAC5C,IAAI,QAAmC,CAAC;AAExC,UAAU;AACV,IAAI,UAAU,GAAG,KAAK,CAAC;AAEvB,sBAAsB;AACtB,kBAAkB;AAClB,IAAI,CAAC,UAAU,EAAE;IACf,eAAe,EAAE,CAAC;CACnB;AAED,SAAS,QAAQ,CAAC,GAAW;IAC3B,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,GAAG,GAA8B,EAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,IAAA,2BAAS,EAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,GAAG,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC7B;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,4BAA4B;IACzC,IAAI,
|
|
1
|
+
{"version":3,"file":"shell-path.js","sourceRoot":"","sources":["../../src/bootstrap/shell-path.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,9 +14,14 @@ export declare class ServerCommonModule extends NodeModule {
|
|
|
14
14
|
token: symbol;
|
|
15
15
|
useClass: typeof CryptoService;
|
|
16
16
|
})[];
|
|
17
|
-
backServices: {
|
|
17
|
+
backServices: ({
|
|
18
18
|
servicePath: string;
|
|
19
19
|
token: symbol;
|
|
20
|
-
|
|
20
|
+
protocol: import("@opensumi/ide-connection/lib/common/rpc/types").TSumiProtocol;
|
|
21
|
+
} | {
|
|
22
|
+
servicePath: string;
|
|
23
|
+
token: symbol;
|
|
24
|
+
protocol?: undefined;
|
|
25
|
+
})[];
|
|
21
26
|
}
|
|
22
27
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common-module/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common-module/index.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBACa,kBAAmB,SAAQ,UAAU;IAChD,SAAS;;;;;;;;;SAcP;IACF,YAAY;;;;;;;;SAcV;CACH"}
|
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ServerCommonModule = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
|
+
const common_server_1 = require("@opensumi/ide-connection/lib/common/protocols/common-server");
|
|
6
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
7
8
|
const hash_calculate_contribution_1 = require("../hash-calculate/hash-calculate.contribution");
|
|
8
9
|
const node_module_1 = require("../node-module");
|
|
9
|
-
const
|
|
10
|
+
const common_server_2 = require("./common.server");
|
|
10
11
|
const credential_server_1 = require("./credential.server");
|
|
11
12
|
const crypto_server_1 = require("./crypto.server");
|
|
12
13
|
let ServerCommonModule = class ServerCommonModule extends node_module_1.NodeModule {
|
|
@@ -16,7 +17,7 @@ let ServerCommonModule = class ServerCommonModule extends node_module_1.NodeModu
|
|
|
16
17
|
hash_calculate_contribution_1.HashCalculateContribution,
|
|
17
18
|
{
|
|
18
19
|
token: ide_core_common_1.ICommonServer,
|
|
19
|
-
useClass:
|
|
20
|
+
useClass: common_server_2.CommonServer,
|
|
20
21
|
},
|
|
21
22
|
{
|
|
22
23
|
token: ide_core_common_1.INativeCredentialService,
|
|
@@ -31,6 +32,7 @@ let ServerCommonModule = class ServerCommonModule extends node_module_1.NodeModu
|
|
|
31
32
|
{
|
|
32
33
|
servicePath: ide_core_common_1.CommonServerPath,
|
|
33
34
|
token: ide_core_common_1.ICommonServer,
|
|
35
|
+
protocol: common_server_1.CommonServerProtocol,
|
|
34
36
|
},
|
|
35
37
|
{
|
|
36
38
|
servicePath: ide_core_common_1.KeytarServicePath,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common-module/index.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAOmC;AAEnC,+FAA0F;AAC1F,gDAA4C;AAE5C,mDAA+C;AAC/C,2DAAwD;AACxD,mDAAgD;AAGzC,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,wBAAU;IAA3C;;QACL,cAAS,GAAG;YACV,uDAAyB;YACzB;gBACE,KAAK,EAAE,+BAAa;gBACpB,QAAQ,EAAE,4BAAY;aACvB;YACD;gBACE,KAAK,EAAE,0CAAwB;gBAC/B,QAAQ,EAAE,qCAAiB;aAC5B;YACD;gBACE,KAAK,EAAE,sCAAoB;gBAC3B,QAAQ,EAAE,6BAAa;aACxB;SACF,CAAC;QACF,iBAAY,GAAG;YACb;gBACE,WAAW,EAAE,kCAAgB;gBAC7B,KAAK,EAAE,+BAAa;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common-module/index.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+FAAmG;AACnG,+DAOmC;AAEnC,+FAA0F;AAC1F,gDAA4C;AAE5C,mDAA+C;AAC/C,2DAAwD;AACxD,mDAAgD;AAGzC,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,wBAAU;IAA3C;;QACL,cAAS,GAAG;YACV,uDAAyB;YACzB;gBACE,KAAK,EAAE,+BAAa;gBACpB,QAAQ,EAAE,4BAAY;aACvB;YACD;gBACE,KAAK,EAAE,0CAAwB;gBAC/B,QAAQ,EAAE,qCAAiB;aAC5B;YACD;gBACE,KAAK,EAAE,sCAAoB;gBAC3B,QAAQ,EAAE,6BAAa;aACxB;SACF,CAAC;QACF,iBAAY,GAAG;YACb;gBACE,WAAW,EAAE,kCAAgB;gBAC7B,KAAK,EAAE,+BAAa;gBACpB,QAAQ,EAAE,oCAAoB;aAC/B;YACD;gBACE,WAAW,EAAE,mCAAiB;gBAC9B,KAAK,EAAE,0CAAwB;aAChC;YACD;gBACE,WAAW,EAAE,mCAAiB;gBAC9B,KAAK,EAAE,sCAAoB;aAC5B;SACF,CAAC;IACJ,CAAC;CAAA,CAAA;AA/BY,kBAAkB;IAD9B,IAAA,eAAU,GAAE;GACA,kBAAkB,CA+B9B;AA/BY,gDAAkB"}
|
package/lib/connection.d.ts
CHANGED
|
@@ -8,7 +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 createServerConnection2(server: http.Server, injector:
|
|
12
|
-
export declare function createNetServerConnection(server: net.Server, injector:
|
|
11
|
+
export declare function createServerConnection2(server: http.Server, injector: Injector, modulesInstances: NodeModule[], handlerArr: WebSocketHandler[], serverAppOpts: IServerAppOpts): void;
|
|
12
|
+
export declare function createNetServerConnection(server: net.Server, injector: Injector, modulesInstances: NodeModule[]): void;
|
|
13
13
|
export declare function bindModuleBackService(injector: Injector, modules: NodeModule[], serviceCenter: RPCServiceCenter, clientId?: string): Injector;
|
|
14
14
|
//# sourceMappingURL=connection.d.ts.map
|
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,EAAE,QAAQ,EAAiD,MAAM,cAAc,CAAC;AACvF,OAAO,EAA6B,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAEL,gBAAgB,
|
|
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,EAAE,QAAQ,EAAiD,MAAM,cAAc,CAAC;AACvF,OAAO,EAA6B,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAEL,gBAAgB,EAGjB,MAAM,mCAAmC,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAwB5B,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,QAwB9B;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,UAAU,EAAE,QAW/G;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,UAAU,EAAE,EACrB,aAAa,EAAE,gBAAgB,EAC/B,QAAQ,CAAC,EAAE,MAAM,YAuDlB"}
|
package/lib/connection.js
CHANGED
|
@@ -3,9 +3,20 @@ 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
5
|
Object.defineProperty(exports, "RPCServiceCenter", { enumerable: true, get: function () { return ide_connection_1.RPCServiceCenter; } });
|
|
6
|
-
const
|
|
6
|
+
const connection_1 = require("@opensumi/ide-connection/lib/common/connection");
|
|
7
7
|
const node_1 = require("@opensumi/ide-connection/lib/node");
|
|
8
8
|
const node_logger_1 = require("./logger/node-logger");
|
|
9
|
+
function handleClientChannel(injector, modulesInstances, channel, clientId, logger) {
|
|
10
|
+
logger.log(`New RPC connection ${clientId}`);
|
|
11
|
+
const serviceCenter = new ide_connection_1.RPCServiceCenter(undefined, logger);
|
|
12
|
+
const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, clientId);
|
|
13
|
+
const remove = serviceCenter.setChannel(channel);
|
|
14
|
+
channel.onClose(() => {
|
|
15
|
+
remove.dispose();
|
|
16
|
+
serviceChildInjector.disposeAll();
|
|
17
|
+
logger.log(`Remove RPC connection ${clientId}`);
|
|
18
|
+
});
|
|
19
|
+
}
|
|
9
20
|
function createServerConnection2(server, injector, modulesInstances, handlerArr, serverAppOpts) {
|
|
10
21
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
11
22
|
const socketRoute = new node_1.WebSocketServerRoute(server, logger);
|
|
@@ -15,18 +26,8 @@ function createServerConnection2(server, injector, modulesInstances, handlerArr,
|
|
|
15
26
|
});
|
|
16
27
|
// 事件由 connection 的时机来触发
|
|
17
28
|
node_1.commonChannelPathHandler.register('RPCService', {
|
|
18
|
-
handler: (
|
|
19
|
-
|
|
20
|
-
const serviceCenter = new ide_connection_1.RPCServiceCenter(undefined, logger);
|
|
21
|
-
const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, clientId);
|
|
22
|
-
const serverConnection = (0, message_1.createWebSocketConnection)(connection);
|
|
23
|
-
connection.messageConnection = serverConnection;
|
|
24
|
-
serviceCenter.setConnection(serverConnection);
|
|
25
|
-
connection.onClose(() => {
|
|
26
|
-
serviceCenter.removeConnection(serverConnection);
|
|
27
|
-
serviceChildInjector.disposeAll();
|
|
28
|
-
logger.log(`Remove RPC connection ${clientId}`);
|
|
29
|
-
});
|
|
29
|
+
handler: (channel, clientId) => {
|
|
30
|
+
handleClientChannel(injector, modulesInstances, channel, clientId, logger);
|
|
30
31
|
},
|
|
31
32
|
dispose: () => { },
|
|
32
33
|
});
|
|
@@ -41,15 +42,13 @@ function createServerConnection2(server, injector, modulesInstances, handlerArr,
|
|
|
41
42
|
exports.createServerConnection2 = createServerConnection2;
|
|
42
43
|
function createNetServerConnection(server, injector, modulesInstances) {
|
|
43
44
|
const logger = injector.get(node_logger_1.INodeLogger);
|
|
44
|
-
server.on('connection', (
|
|
45
|
-
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
connection.on('close', () => {
|
|
50
|
-
serviceCenter.removeConnection(serverConnection);
|
|
51
|
-
serviceChildInjector.disposeAll();
|
|
45
|
+
server.on('connection', (socket) => {
|
|
46
|
+
logger.log('new connection', socket.remoteAddress, socket.remotePort);
|
|
47
|
+
const channel = ide_connection_1.WSChannel.forClient(new connection_1.NetSocketConnection(socket), {
|
|
48
|
+
id: 'RPCService-' + process.env.CODE_WINDOW_CLIENT_ID,
|
|
49
|
+
logger,
|
|
52
50
|
});
|
|
51
|
+
handleClientChannel(injector, modulesInstances, channel, process.env.CODE_WINDOW_CLIENT_ID, logger);
|
|
53
52
|
});
|
|
54
53
|
}
|
|
55
54
|
exports.createNetServerConnection = createNetServerConnection;
|
|
@@ -57,38 +56,42 @@ function bindModuleBackService(injector, modules, serviceCenter, clientId) {
|
|
|
57
56
|
const { createRPCService } = (0, ide_connection_1.initRPCService)(serviceCenter);
|
|
58
57
|
const childInjector = injector.createChild();
|
|
59
58
|
for (const module of modules) {
|
|
60
|
-
if (module.backServices) {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
59
|
+
if (!module.backServices) {
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
for (const service of module.backServices) {
|
|
63
|
+
if (!service.token) {
|
|
64
|
+
continue;
|
|
65
|
+
}
|
|
66
|
+
const serviceToken = service.token;
|
|
67
|
+
if (!injector.creatorMap.has(serviceToken)) {
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
const creator = injector.creatorMap.get(serviceToken);
|
|
71
|
+
if (creator.useFactory) {
|
|
72
|
+
const serviceFactory = creator.useFactory;
|
|
73
|
+
childInjector.addProviders({
|
|
74
|
+
token: serviceToken,
|
|
75
|
+
useValue: serviceFactory(childInjector),
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const serviceClass = creator.useClass;
|
|
80
|
+
childInjector.addProviders({
|
|
81
|
+
token: serviceToken,
|
|
82
|
+
useClass: serviceClass,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
const serviceInstance = childInjector.get(serviceToken);
|
|
86
|
+
if (serviceInstance.setConnectionClientId && clientId) {
|
|
87
|
+
serviceInstance.setConnectionClientId(clientId);
|
|
88
|
+
}
|
|
89
|
+
if (service.protocol) {
|
|
90
|
+
serviceCenter.loadProtocol(service.protocol);
|
|
91
|
+
}
|
|
92
|
+
const createService = createRPCService(service.servicePath, serviceInstance);
|
|
93
|
+
if (!serviceInstance.rpcClient) {
|
|
94
|
+
serviceInstance.rpcClient = [createService];
|
|
92
95
|
}
|
|
93
96
|
}
|
|
94
97
|
}
|
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":";;;AAIA,6DAAuF;AAa9E,iGAb2B,iCAAgB,OAa3B;AAZzB,+EAAqF;AACrF,4DAK2C;AAE3C,sDAAmD;AAMnD,SAAS,mBAAmB,CAC1B,QAAkB,EAClB,gBAA8B,EAC9B,OAAkB,EAClB,QAAgB,EAChB,MAAmB;IAEnB,MAAM,CAAC,GAAG,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAC;IAE7C,MAAM,aAAa,GAAG,IAAI,iCAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC9D,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;IAExG,MAAM,MAAM,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAEjD,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;QACnB,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,oBAAoB,CAAC,UAAU,EAAE,CAAC;QAElC,MAAM,CAAC,GAAG,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,uBAAuB,CACrC,MAAmB,EACnB,QAAkB,EAClB,gBAA8B,EAC9B,UAA8B,EAC9B,aAA6B;IAE7B,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,yBAAW,CAAC,CAAC;IACzC,MAAM,WAAW,GAAG,IAAI,2BAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7D,MAAM,cAAc,GAAG,IAAI,2BAAoB,CAAC,UAAU,EAAE,MAAM,EAAE;QAClE,gBAAgB,EAAE,aAAa,CAAC,gBAAgB;QAChD,eAAe,EAAE,aAAa,CAAC,eAAe;KAC/C,CAAC,CAAC;IAEH,wBAAwB;IACxB,+BAAwB,CAAC,QAAQ,CAAC,YAAY,EAAE;QAC9C,OAAO,EAAE,CAAC,OAAkB,EAAE,QAAgB,EAAE,EAAE;YAChD,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC7E,CAAC;QACD,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;KAClB,CAAC,CAAC;IAEH,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;IAC5C,IAAI,UAAU,EAAE;QACd,KAAK,MAAM,OAAO,IAAI,UAAU,EAAE;YAChC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;SACtC;KACF;IACD,WAAW,CAAC,IAAI,EAAE,CAAC;AACrB,CAAC;AA7BD,0DA6BC;AAED,SAAgB,yBAAyB,CAAC,MAAkB,EAAE,QAAkB,EAAE,gBAA8B;IAC9G,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,yBAAW,CAAgB,CAAC;IAExD,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE;QACjC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,OAAO,GAAG,0BAAS,CAAC,SAAS,CAAC,IAAI,gCAAmB,CAAC,MAAM,CAAC,EAAE;YACnE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAsB;YACtD,MAAM;SACP,CAAC,CAAC;QACH,mBAAmB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAsB,EAAE,MAAM,CAAC,CAAC;IACvG,CAAC,CAAC,CAAC;AACL,CAAC;AAXD,8DAWC;AAED,SAAgB,qBAAqB,CACnC,QAAkB,EAClB,OAAqB,EACrB,aAA+B,EAC/B,QAAiB;IAEjB,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAA,+BAAc,EAAC,aAAa,CAAC,CAAC;IAE3D,MAAM,aAAa,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC7C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YACxB,SAAS;SACV;QAED,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,YAAY,EAAE;YACzC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;gBAClB,SAAS;aACV;YAED,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC;YAEnC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;gBAC1C,SAAS;aACV;YAED,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAoB,CAAC;YAEzE,IAAK,OAA0B,CAAC,UAAU,EAAE;gBAC1C,MAAM,cAAc,GAAI,OAA0B,CAAC,UAAU,CAAC;gBAC9D,aAAa,CAAC,YAAY,CAAC;oBACzB,KAAK,EAAE,YAAY;oBACnB,QAAQ,EAAE,cAAc,CAAC,aAAa,CAAC;iBACxC,CAAC,CAAC;aACJ;iBAAM;gBACL,MAAM,YAAY,GAAI,OAAwB,CAAC,QAAQ,CAAC;gBACxD,aAAa,CAAC,YAAY,CAAC;oBACzB,KAAK,EAAE,YAAY;oBACnB,QAAQ,EAAE,YAAY;iBACvB,CAAC,CAAC;aACJ;YAED,MAAM,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAExD,IAAI,eAAe,CAAC,qBAAqB,IAAI,QAAQ,EAAE;gBACrD,eAAe,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;aACjD;YACD,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACpB,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;aAC9C;YAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;YAE7E,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE;gBAC9B,eAAe,CAAC,SAAS,GAAG,CAAC,aAAa,CAAC,CAAC;aAC7C;SACF;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AA3DD,sDA2DC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-core-node",
|
|
3
|
-
"version": "2.27.
|
|
3
|
+
"version": "2.27.3-next-1706077936.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": "2.27.
|
|
22
|
-
"@opensumi/ide-core-common": "2.27.
|
|
21
|
+
"@opensumi/ide-connection": "2.27.3-next-1706077936.0",
|
|
22
|
+
"@opensumi/ide-core-common": "2.27.3-next-1706077936.0",
|
|
23
23
|
"keytar": "^7.7.0"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@opensumi/ide-dev-tool": "1.3.1"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "aee2428fd9fc6117cf124170e2c0eda48a7b62ca"
|
|
29
29
|
}
|
package/src/bootstrap/app.ts
CHANGED
|
@@ -150,29 +150,17 @@ export class ServerApp implements IServerApp {
|
|
|
150
150
|
) {
|
|
151
151
|
await this.initializeContribution();
|
|
152
152
|
|
|
153
|
-
let serviceCenter;
|
|
154
|
-
|
|
155
153
|
if (serviceHandler) {
|
|
156
|
-
|
|
157
|
-
serviceHandler(serviceCenter);
|
|
154
|
+
serviceHandler(new RPCServiceCenter());
|
|
158
155
|
} else {
|
|
159
156
|
if (server instanceof http.Server || server instanceof https.Server) {
|
|
160
157
|
// 创建 websocket 通道
|
|
161
|
-
|
|
162
|
-
server,
|
|
163
|
-
this.injector,
|
|
164
|
-
this.modulesInstances,
|
|
165
|
-
this.webSocketHandler,
|
|
166
|
-
this.opts,
|
|
167
|
-
);
|
|
158
|
+
createServerConnection2(server, this.injector, this.modulesInstances, this.webSocketHandler, this.opts);
|
|
168
159
|
} else if (server instanceof net.Server) {
|
|
169
|
-
|
|
160
|
+
createNetServerConnection(server, this.injector, this.modulesInstances);
|
|
170
161
|
}
|
|
171
162
|
}
|
|
172
163
|
|
|
173
|
-
// TODO: 每次链接来的时候绑定一次，或者是服务获取的时候多实例化出来
|
|
174
|
-
// bindModuleBackService(this.injector, this.modulesInstances, serviceCenter);
|
|
175
|
-
|
|
176
164
|
await this.startContribution();
|
|
177
165
|
}
|
|
178
166
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Injectable } from '@opensumi/di';
|
|
2
|
+
import { CommonServerProtocol } from '@opensumi/ide-connection/lib/common/protocols/common-server';
|
|
2
3
|
import {
|
|
3
4
|
ICommonServer,
|
|
4
5
|
CommonServerPath,
|
|
@@ -36,6 +37,7 @@ export class ServerCommonModule extends NodeModule {
|
|
|
36
37
|
{
|
|
37
38
|
servicePath: CommonServerPath,
|
|
38
39
|
token: ICommonServer,
|
|
40
|
+
protocol: CommonServerProtocol,
|
|
39
41
|
},
|
|
40
42
|
{
|
|
41
43
|
servicePath: KeytarServicePath,
|
package/src/connection.ts
CHANGED
|
@@ -3,13 +3,12 @@ import net from 'net';
|
|
|
3
3
|
|
|
4
4
|
import { Injector, InstanceCreator, ClassCreator, FactoryCreator } from '@opensumi/di';
|
|
5
5
|
import { WSChannel, initRPCService, RPCServiceCenter } from '@opensumi/ide-connection';
|
|
6
|
-
import {
|
|
6
|
+
import { NetSocketConnection } from '@opensumi/ide-connection/lib/common/connection';
|
|
7
7
|
import {
|
|
8
8
|
WebSocketServerRoute,
|
|
9
9
|
WebSocketHandler,
|
|
10
10
|
CommonChannelHandler,
|
|
11
11
|
commonChannelPathHandler,
|
|
12
|
-
createSocketConnection,
|
|
13
12
|
} from '@opensumi/ide-connection/lib/node';
|
|
14
13
|
|
|
15
14
|
import { INodeLogger } from './logger/node-logger';
|
|
@@ -18,10 +17,32 @@ import { IServerAppOpts } from './types';
|
|
|
18
17
|
|
|
19
18
|
export { RPCServiceCenter };
|
|
20
19
|
|
|
20
|
+
function handleClientChannel(
|
|
21
|
+
injector: Injector,
|
|
22
|
+
modulesInstances: NodeModule[],
|
|
23
|
+
channel: WSChannel,
|
|
24
|
+
clientId: string,
|
|
25
|
+
logger: INodeLogger,
|
|
26
|
+
) {
|
|
27
|
+
logger.log(`New RPC connection ${clientId}`);
|
|
28
|
+
|
|
29
|
+
const serviceCenter = new RPCServiceCenter(undefined, logger);
|
|
30
|
+
const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, clientId);
|
|
31
|
+
|
|
32
|
+
const remove = serviceCenter.setChannel(channel);
|
|
33
|
+
|
|
34
|
+
channel.onClose(() => {
|
|
35
|
+
remove.dispose();
|
|
36
|
+
serviceChildInjector.disposeAll();
|
|
37
|
+
|
|
38
|
+
logger.log(`Remove RPC connection ${clientId}`);
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
|
|
21
42
|
export function createServerConnection2(
|
|
22
43
|
server: http.Server,
|
|
23
|
-
injector,
|
|
24
|
-
modulesInstances,
|
|
44
|
+
injector: Injector,
|
|
45
|
+
modulesInstances: NodeModule[],
|
|
25
46
|
handlerArr: WebSocketHandler[],
|
|
26
47
|
serverAppOpts: IServerAppOpts,
|
|
27
48
|
) {
|
|
@@ -34,22 +55,8 @@ export function createServerConnection2(
|
|
|
34
55
|
|
|
35
56
|
// 事件由 connection 的时机来触发
|
|
36
57
|
commonChannelPathHandler.register('RPCService', {
|
|
37
|
-
handler: (
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
const serviceCenter = new RPCServiceCenter(undefined, logger);
|
|
41
|
-
const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, clientId);
|
|
42
|
-
|
|
43
|
-
const serverConnection = createWebSocketConnection(connection);
|
|
44
|
-
connection.messageConnection = serverConnection;
|
|
45
|
-
serviceCenter.setConnection(serverConnection);
|
|
46
|
-
|
|
47
|
-
connection.onClose(() => {
|
|
48
|
-
serviceCenter.removeConnection(serverConnection);
|
|
49
|
-
serviceChildInjector.disposeAll();
|
|
50
|
-
|
|
51
|
-
logger.log(`Remove RPC connection ${clientId}`);
|
|
52
|
-
});
|
|
58
|
+
handler: (channel: WSChannel, clientId: string) => {
|
|
59
|
+
handleClientChannel(injector, modulesInstances, channel, clientId, logger);
|
|
53
60
|
},
|
|
54
61
|
dispose: () => {},
|
|
55
62
|
});
|
|
@@ -63,26 +70,16 @@ export function createServerConnection2(
|
|
|
63
70
|
socketRoute.init();
|
|
64
71
|
}
|
|
65
72
|
|
|
66
|
-
export function createNetServerConnection(server: net.Server, injector, modulesInstances) {
|
|
67
|
-
const logger = injector.get(INodeLogger);
|
|
68
|
-
|
|
69
|
-
server.on('connection', (connection) => {
|
|
70
|
-
const serverConnection = createSocketConnection(connection);
|
|
71
|
-
const serviceCenter = new RPCServiceCenter(undefined, logger);
|
|
73
|
+
export function createNetServerConnection(server: net.Server, injector: Injector, modulesInstances: NodeModule[]) {
|
|
74
|
+
const logger = injector.get(INodeLogger) as INodeLogger;
|
|
72
75
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
serviceCenter,
|
|
79
|
-
process.env.CODE_WINDOW_CLIENT_ID as string,
|
|
80
|
-
);
|
|
81
|
-
|
|
82
|
-
connection.on('close', () => {
|
|
83
|
-
serviceCenter.removeConnection(serverConnection);
|
|
84
|
-
serviceChildInjector.disposeAll();
|
|
76
|
+
server.on('connection', (socket) => {
|
|
77
|
+
logger.log('new connection', socket.remoteAddress, socket.remotePort);
|
|
78
|
+
const channel = WSChannel.forClient(new NetSocketConnection(socket), {
|
|
79
|
+
id: 'RPCService-' + process.env.CODE_WINDOW_CLIENT_ID!,
|
|
80
|
+
logger,
|
|
85
81
|
});
|
|
82
|
+
handleClientChannel(injector, modulesInstances, channel, process.env.CODE_WINDOW_CLIENT_ID!, logger);
|
|
86
83
|
});
|
|
87
84
|
}
|
|
88
85
|
|
|
@@ -96,42 +93,50 @@ export function bindModuleBackService(
|
|
|
96
93
|
|
|
97
94
|
const childInjector = injector.createChild();
|
|
98
95
|
for (const module of modules) {
|
|
99
|
-
if (module.backServices) {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
96
|
+
if (!module.backServices) {
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
for (const service of module.backServices) {
|
|
101
|
+
if (!service.token) {
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
const serviceToken = service.token;
|
|
106
|
+
|
|
107
|
+
if (!injector.creatorMap.has(serviceToken)) {
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
const creator = injector.creatorMap.get(serviceToken) as InstanceCreator;
|
|
112
|
+
|
|
113
|
+
if ((creator as FactoryCreator).useFactory) {
|
|
114
|
+
const serviceFactory = (creator as FactoryCreator).useFactory;
|
|
115
|
+
childInjector.addProviders({
|
|
116
|
+
token: serviceToken,
|
|
117
|
+
useValue: serviceFactory(childInjector),
|
|
118
|
+
});
|
|
119
|
+
} else {
|
|
120
|
+
const serviceClass = (creator as ClassCreator).useClass;
|
|
121
|
+
childInjector.addProviders({
|
|
122
|
+
token: serviceToken,
|
|
123
|
+
useClass: serviceClass,
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
const serviceInstance = childInjector.get(serviceToken);
|
|
128
|
+
|
|
129
|
+
if (serviceInstance.setConnectionClientId && clientId) {
|
|
130
|
+
serviceInstance.setConnectionClientId(clientId);
|
|
131
|
+
}
|
|
132
|
+
if (service.protocol) {
|
|
133
|
+
serviceCenter.loadProtocol(service.protocol);
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
const createService = createRPCService(service.servicePath, serviceInstance);
|
|
137
|
+
|
|
138
|
+
if (!serviceInstance.rpcClient) {
|
|
139
|
+
serviceInstance.rpcClient = [createService];
|
|
135
140
|
}
|
|
136
141
|
}
|
|
137
142
|
}
|