@opensumi/ide-core-node 2.21.13 → 2.22.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 +2 -0
- package/lib/bootstrap/app.d.ts.map +1 -1
- package/lib/bootstrap/app.js +3 -3
- package/lib/bootstrap/app.js.map +1 -1
- package/lib/bootstrap/shell-path.js +1 -1
- package/lib/bootstrap/shell-path.js.map +1 -1
- package/lib/common-module/common.server.js.map +1 -1
- package/lib/common-module/credential.server.d.ts.map +1 -1
- package/lib/common-module/credential.server.js +3 -1
- package/lib/common-module/credential.server.js.map +1 -1
- package/lib/common-module/crypto.server.js.map +1 -1
- package/lib/common-module/index.js.map +1 -1
- package/lib/connection.d.ts +1 -0
- package/lib/connection.d.ts.map +1 -1
- package/lib/connection.js +3 -7
- package/lib/connection.js.map +1 -1
- package/lib/hash-calculate/hash-calculate.contribution.js.map +1 -1
- package/lib/logger/node-logger.d.ts +1 -1
- package/lib/logger/node-logger.d.ts.map +1 -1
- package/lib/logger/node-logger.js.map +1 -1
- package/lib/types.d.ts +4 -2
- package/lib/types.d.ts.map +1 -1
- package/package.json +8 -7
- package/src/bootstrap/app.ts +252 -0
- package/src/bootstrap/index.ts +2 -0
- package/src/bootstrap/inner-providers.ts +42 -0
- package/src/bootstrap/shell-path.ts +116 -0
- package/src/common-module/common.server.ts +9 -0
- package/src/common-module/credential.server.ts +92 -0
- package/src/common-module/crypto.server.ts +50 -0
- package/src/common-module/index.ts +49 -0
- package/src/connection.ts +142 -0
- package/src/hash-calculate/hash-calculate.contribution.ts +19 -0
- package/src/index.ts +12 -0
- package/src/logger/node-logger.ts +68 -0
- package/src/node-module.ts +3 -0
- package/src/types.ts +143 -0
package/lib/bootstrap/app.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":"
|
|
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,EAAyC,MAAM,2BAA2B,CAAC;AAIxG,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,CAAc;IAE5B,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;IA6CxC,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;YA8B9C,MAAM;IAYpB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IA6B1B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;CAyB1B"}
|
package/lib/bootstrap/app.js
CHANGED
|
@@ -35,11 +35,11 @@ class ServerApp {
|
|
|
35
35
|
logLevel: opts.logLevel,
|
|
36
36
|
LogServiceClass: opts.LogServiceClass,
|
|
37
37
|
marketplace: Object.assign({
|
|
38
|
-
endpoint: const_1.
|
|
38
|
+
endpoint: const_1.DEFAULT_TRS_REGISTRY.ENDPOINT,
|
|
39
39
|
extensionDir: path_1.default.join(os_1.default.homedir(), ...(ide_core_common_1.isWindows ? [ide_core_common_2.StoragePaths.WINDOWS_APP_DATA_DIR, ide_core_common_2.StoragePaths.WINDOWS_ROAMING_DIR] : ['']), ide_core_common_2.StoragePaths.DEFAULT_STORAGE_DIR_NAME, ide_core_common_2.StoragePaths.MARKETPLACE_DIR),
|
|
40
40
|
showBuiltinExtensions: false,
|
|
41
|
-
accountId:
|
|
42
|
-
masterKey:
|
|
41
|
+
accountId: const_1.DEFAULT_TRS_REGISTRY.ACCOUNT_ID,
|
|
42
|
+
masterKey: const_1.DEFAULT_TRS_REGISTRY.MASTER_KEY,
|
|
43
43
|
ignoreId: [],
|
|
44
44
|
}, opts.marketplace),
|
|
45
45
|
processCloseExitThreshold: opts.processCloseExitThreshold,
|
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,+DAAwG;AACxG,+DAA+G;AAC/G,+
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/bootstrap/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ async function createUpdateShellPathPromise() {
|
|
|
43
43
|
try {
|
|
44
44
|
shellPath = await new Promise((resolve, reject) => {
|
|
45
45
|
const buf = [];
|
|
46
|
-
const proc = (0, child_process_1.spawn)(
|
|
46
|
+
const proc = (0, child_process_1.spawn)('/bin/bash', ['-ilc', 'echo -n "_SHELL_ENV_DELIMITER_"; env; echo -n "_SHELL_ENV_DELIMITER_"; exit;'], {
|
|
47
47
|
stdio: ['ignore', 'pipe', 'pipe'],
|
|
48
48
|
detached: true, // 在有些场景 zsh 会卡住， detached 后正常
|
|
49
49
|
});
|
|
@@ -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,GAAW,CAAC;IAChB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QAC5B,IAAI,GAAG,EAAE;YACP,IAAI;gBACF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACnB;YAAC,OAAO,KAAK,EAAE;gBACd,SAAS;aACV;SACF;IACH,CAAC,EAAE,aAAa,CAAC,CAAC;IAElB,IAAI;QACF,SAAS,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAChD,MAAM,GAAG,GAAa,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,IAAA,qBAAK,EAChB,
|
|
1
|
+
{"version":3,"file":"shell-path.js","sourceRoot":"","sources":["../../src/bootstrap/shell-path.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.server.js","sourceRoot":"","sources":["../../src/common-module/common.server.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAA+E;
|
|
1
|
+
{"version":3,"file":"common.server.js","sourceRoot":"","sources":["../../src/common-module/common.server.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAA+E;AAGxE,IAAM,YAAY,GAAlB,MAAM,YAAY;IACvB,KAAK,CAAC,YAAY;QAChB,OAAO,oBAAE,CAAC,IAAI,EAAE,CAAC;IACnB,CAAC;CACF,CAAA;AAJY,YAAY;IADxB,IAAA,eAAU,GAAE;GACA,YAAY,CAIxB;AAJY,oCAAY"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential.server.d.ts","sourceRoot":"","sources":["../../src/common-module/credential.server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"credential.server.d.ts","sourceRoot":"","sources":["../../src/common-module/credential.server.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,wBAAwB,EAAa,MAAM,2BAA2B,CAAC;AAIlG,qBACa,iBAAkB,YAAW,wBAAwB;IAChE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAQ;IACnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAA+C;IAG1F,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IAEhC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwB9E,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAM/C,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IA0B5C,YAAY,CAAC,OAAO,EAAE,MAAM;IAS5B,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;YAK/E,UAAU;CAOzB"}
|
|
@@ -3,6 +3,7 @@ var CredentialService_1;
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.CredentialService = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
|
+
/* eslint-disable @typescript-eslint/ban-ts-comment */
|
|
6
7
|
const di_1 = require("@opensumi/di");
|
|
7
8
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
9
|
const types_1 = require("../types");
|
|
@@ -74,7 +75,8 @@ let CredentialService = CredentialService_1 = class CredentialService {
|
|
|
74
75
|
if (this.appConfig.disableKeytar) {
|
|
75
76
|
throw new Error('keytar has been disabled via --disable-keytar option');
|
|
76
77
|
}
|
|
77
|
-
|
|
78
|
+
// @ts-ignore
|
|
79
|
+
return await import('keytar');
|
|
78
80
|
}
|
|
79
81
|
};
|
|
80
82
|
CredentialService.MAX_PASSWORD_LENGTH = 2500;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential.server.js","sourceRoot":"","sources":["../../src/common-module/credential.server.ts"],"names":[],"mappings":";;;;;AAAA,qCAAqD;AACrD,+DAAkG;AAElG,oCAAqC;
|
|
1
|
+
{"version":3,"file":"credential.server.js","sourceRoot":"","sources":["../../src/common-module/credential.server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crypto.server.js","sourceRoot":"","sources":["../../src/common-module/crypto.server.ts"],"names":[],"mappings":";;;;;AAAA,4DAA4B;AAE5B,qCAA0C;
|
|
1
|
+
{"version":3,"file":"crypto.server.js","sourceRoot":"","sources":["../../src/common-module/crypto.server.ts"],"names":[],"mappings":";;;;;AAAA,4DAA4B;AAE5B,qCAA0C;AAInC,IAAM,aAAa,qBAAnB,MAAM,aAAa;IAShB,MAAM,CAAC,IAAqB;QAClC,OAAO,gBAAM,CAAC,UAAU,CAAC,eAAa,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAgB;QAC5B,MAAM,EAAE,GAAG,gBAAM,CAAC,WAAW,CAAC,eAAa,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,IAAI,GAAG,gBAAM,CAAC,WAAW,CAAC,eAAa,CAAC,WAAW,CAAC,CAAC;QAE3D,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE9B,MAAM,MAAM,GAAG,gBAAM,CAAC,cAAc,CAAC,eAAa,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QACvE,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAEnF,MAAM,GAAG,GAAI,MAAc,CAAC,UAAU,EAAE,CAAC;QAEzC,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY;QACxB,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,eAAa,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,eAAa,CAAC,WAAW,EAAE,eAAa,CAAC,YAAY,CAAC,CAAC;QACpF,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,eAAa,CAAC,YAAY,EAAE,eAAa,CAAC,kBAAkB,CAAC,CAAC;QAC5F,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,eAAa,CAAC,kBAAkB,CAAC,CAAC;QAEtE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE9B,MAAM,QAAQ,GAAG,gBAAM,CAAC,gBAAgB,CAAC,eAAa,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAE1E,QAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAElC,OAAO,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7D,CAAC;;AAzCc,wBAAU,GAAG,eAAe,CAAC;AAC7B,uBAAS,GAAG,EAAE,CAAC;AACf,yBAAW,GAAG,EAAE,CAAC;AACjB,wBAAU,GAAG,EAAE,CAAC;AAChB,uBAAS,GAAG,aAAa,CAAC;AAC1B,0BAAY,GAAW,eAAa,CAAC,WAAW,GAAG,eAAa,CAAC,SAAS,CAAC;AAC3E,gCAAkB,GAAW,eAAa,CAAC,YAAY,GAAG,eAAa,CAAC,UAAU,CAAC;AAPvF,aAAa;IADzB,IAAA,eAAU,GAAE;GACA,aAAa,CA2CzB;AA3CY,sCAAa"}
|
|
@@ -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;
|
|
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;aACrB;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;AA9BY,kBAAkB;IAD9B,IAAA,eAAU,GAAE;GACA,kBAAkB,CA8B9B;AA9BY,gDAAkB"}
|
package/lib/connection.d.ts
CHANGED
package/lib/connection.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"
|
|
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;AAItB,OAAO,EAAE,QAAQ,EAAiD,MAAM,cAAc,CAAC;AACvF,OAAO,EAA6B,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEvF,OAAO,EAEL,gBAAgB,EAIjB,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;AAE5B,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,QAAQ,KAAA,EACR,gBAAgB,KAAA,EAChB,UAAU,EAAE,gBAAgB,EAAE,EAC9B,aAAa,EAAE,cAAc,QAsC9B;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,KAAA,EAAE,gBAAgB,KAAA,oBAqBvF;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,UAAU,EAAE,EACrB,aAAa,EAAE,gBAAgB,EAC/B,QAAQ,CAAC,EAAE,MAAM,YA+ClB"}
|
package/lib/connection.js
CHANGED
|
@@ -16,7 +16,7 @@ function createServerConnection2(server, injector, modulesInstances, handlerArr,
|
|
|
16
16
|
// 事件由 connection 的时机来触发
|
|
17
17
|
node_1.commonChannelPathHandler.register('RPCService', {
|
|
18
18
|
handler: (connection, clientId) => {
|
|
19
|
-
logger.log(`
|
|
19
|
+
logger.log(`New RPC connection ${clientId}`);
|
|
20
20
|
const serviceCenter = new ide_connection_1.RPCServiceCenter(undefined, logger);
|
|
21
21
|
const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, clientId);
|
|
22
22
|
const serverConnection = (0, message_1.createWebSocketConnection)(connection);
|
|
@@ -25,10 +25,10 @@ function createServerConnection2(server, injector, modulesInstances, handlerArr,
|
|
|
25
25
|
connection.onClose(() => {
|
|
26
26
|
serviceCenter.removeConnection(serverConnection);
|
|
27
27
|
serviceChildInjector.disposeAll();
|
|
28
|
-
logger.log(`
|
|
28
|
+
logger.log(`Remove RPC connection ${clientId}`);
|
|
29
29
|
});
|
|
30
30
|
},
|
|
31
|
-
dispose: (
|
|
31
|
+
dispose: () => { },
|
|
32
32
|
});
|
|
33
33
|
socketRoute.registerHandler(channelHandler);
|
|
34
34
|
if (handlerArr) {
|
|
@@ -44,27 +44,23 @@ function createNetServerConnection(server, injector, modulesInstances) {
|
|
|
44
44
|
const serviceCenter = new ide_connection_1.RPCServiceCenter(undefined, logger);
|
|
45
45
|
const serviceChildInjector = bindModuleBackService(injector, modulesInstances, serviceCenter, process.env.CODE_WINDOW_CLIENT_ID);
|
|
46
46
|
server.on('connection', (connection) => {
|
|
47
|
-
logger.log('set net rpc connection');
|
|
48
47
|
const serverConnection = (0, node_1.createSocketConnection)(connection);
|
|
49
48
|
serviceCenter.setConnection(serverConnection);
|
|
50
49
|
connection.on('close', () => {
|
|
51
50
|
serviceCenter.removeConnection(serverConnection);
|
|
52
51
|
serviceChildInjector.disposeAll();
|
|
53
|
-
logger.log('remove net rpc connection');
|
|
54
52
|
});
|
|
55
53
|
});
|
|
56
54
|
return serviceCenter;
|
|
57
55
|
}
|
|
58
56
|
exports.createNetServerConnection = createNetServerConnection;
|
|
59
57
|
function bindModuleBackService(injector, modules, serviceCenter, clientId) {
|
|
60
|
-
const logger = injector.get(node_logger_1.INodeLogger);
|
|
61
58
|
const { createRPCService } = (0, ide_connection_1.initRPCService)(serviceCenter);
|
|
62
59
|
const childInjector = injector.createChild();
|
|
63
60
|
for (const module of modules) {
|
|
64
61
|
if (module.backServices) {
|
|
65
62
|
for (const service of module.backServices) {
|
|
66
63
|
if (service.token) {
|
|
67
|
-
logger.log('back service', service.token);
|
|
68
64
|
const serviceToken = service.token;
|
|
69
65
|
if (!injector.creatorMap.has(serviceToken)) {
|
|
70
66
|
continue;
|
package/lib/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":";;;AAMA,6DAAuF;AAc9E,iGAd2B,iCAAgB,OAc3B;AAbzB,yEAAwF;AACxF,4DAM2C;AAE3C,sDAAmD;AAMnD,SAAgB,uBAAuB,CACrC,MAAmB,EACnB,QAAQ,EACR,gBAAgB,EAChB,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,UAAqB,EAAE,QAAgB,EAAE,EAAE;YACnD,MAAM,CAAC,GAAG,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAC;YAE7C,MAAM,aAAa,GAAG,IAAI,iCAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC9D,MAAM,oBAAoB,GAAG,qBAAqB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;YAExG,MAAM,gBAAgB,GAAG,IAAA,mCAAyB,EAAC,UAAU,CAAC,CAAC;YAC/D,UAAU,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;YAChD,aAAa,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;YAE9C,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE;gBACtB,aAAa,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;gBACjD,oBAAoB,CAAC,UAAU,EAAE,CAAC;gBAElC,MAAM,CAAC,GAAG,CAAC,yBAAyB,QAAQ,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hash-calculate.contribution.js","sourceRoot":"","sources":["../../src/hash-calculate/hash-calculate.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,uEAAiE;AACjE,gGAAoG;AAEpG,oCAAiD;
|
|
1
|
+
{"version":3,"file":"hash-calculate.contribution.js","sourceRoot":"","sources":["../../src/hash-calculate/hash-calculate.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,uEAAiE;AACjE,gGAAoG;AAEpG,oCAAiD;AAG1C,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAIpC,KAAK,CAAC,UAAU;QACd,IAAI;YACF,MAAM,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,CAAC;SAC9C;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,sCAAsC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;SACtE;IACH,CAAC;CACF,CAAA;AAVC;IAAC,IAAA,cAAS,EAAC,sCAAqB,CAAC;;uEAC4B;AAFlD,yBAAyB;IADrC,IAAA,kBAAM,EAAC,6BAAqB,CAAC;GACjB,yBAAyB,CAWrC;AAXY,8DAAyB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ILogService, LogLevel } from '@opensumi/ide-core-common';
|
|
2
|
-
export
|
|
2
|
+
export type INodeLogger = ILogService;
|
|
3
3
|
export declare const INodeLogger: unique symbol;
|
|
4
4
|
export declare class NodeLogger implements INodeLogger {
|
|
5
5
|
private loggerManger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-logger.d.ts","sourceRoot":"","sources":["../../src/logger/node-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAA2C,WAAW,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE3G,
|
|
1
|
+
{"version":3,"file":"node-logger.d.ts","sourceRoot":"","sources":["../../src/logger/node-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAA2C,WAAW,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAE3G,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC;AACtC,eAAO,MAAM,WAAW,eAAwB,CAAC;AAEjD,qBACa,UAAW,YAAW,WAAW;IAE5C,OAAO,CAAC,YAAY,CAAqB;IAEzC,OAAO,CAAC,MAAM,CAAc;;IAM5B,KAAK,CAAC,GAAG,IAAI,OAAA;IAIb,IAAI,CAAC,GAAG,IAAI,OAAA;IAIZ,GAAG,CAAC,GAAG,IAAI,OAAA;IAGX,KAAK,CAAC,GAAG,IAAI,OAAA;IAIb,OAAO,CAAC,GAAG,IAAI,OAAA;IAIf,QAAQ,CAAC,GAAG,IAAI,OAAA;IAIhB,OAAO;IAIP,UAAU,CAAC,OAAO,KAAA;IAIlB,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM;IAIxC,IAAI;IAIJ,KAAK;IAIL,QAAQ;IAIR,QAAQ,CAAC,KAAK,EAAE,QAAQ;CAGzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-logger.js","sourceRoot":"","sources":["../../src/logger/node-logger.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAA2G;AAG9F,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"node-logger.js","sourceRoot":"","sources":["../../src/logger/node-logger.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAA2G;AAG9F,QAAA,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AAG1C,IAAM,UAAU,GAAhB,MAAM,UAAU;IAMrB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,qCAAmB,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,GAAG,IAAI;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,GAAG,IAAI;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,GAAG,CAAC,GAAG,IAAI;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAClC,CAAC;IACD,KAAK,CAAC,GAAG,IAAI;QACX,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,CAAC,GAAG,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,QAAQ,CAAC,GAAG,IAAI;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IAC/B,CAAC;IAED,UAAU,CAAC,OAAO;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,CAAC,KAAe,EAAE,OAAe;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;IAChC,CAAC;IAED,QAAQ,CAAC,KAAe;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;CACF,CAAA;AA3DC;IAAC,IAAA,cAAS,EAAC,oCAAkB,CAAC;;gDACW;AAF9B,UAAU;IADtB,IAAA,eAAU,GAAE;;GACA,UAAU,CA4DtB;AA5DY,gCAAU"}
|
package/lib/types.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
3
|
+
/// <reference types="node" />
|
|
2
4
|
import type cp from 'child_process';
|
|
3
5
|
import type http from 'http';
|
|
4
6
|
import type https from 'https';
|
|
@@ -10,8 +12,8 @@ import type { ConstructorOf, ILogService, LogLevel, MaybePromise } from '@opensu
|
|
|
10
12
|
import { BasicModule } from '@opensumi/ide-core-common';
|
|
11
13
|
export declare abstract class NodeModule extends BasicModule {
|
|
12
14
|
}
|
|
13
|
-
export
|
|
14
|
-
export
|
|
15
|
+
export type ModuleConstructor = ConstructorOf<NodeModule>;
|
|
16
|
+
export type ContributionConstructor = ConstructorOf<ServerAppContribution>;
|
|
15
17
|
export declare const AppConfig: unique symbol;
|
|
16
18
|
export interface MarketplaceRequest {
|
|
17
19
|
path?: string;
|
package/lib/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-core-node",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.22.0",
|
|
4
4
|
"description": "@opensumi/ide-core-node",
|
|
5
5
|
"files": [
|
|
6
|
-
"lib"
|
|
6
|
+
"lib",
|
|
7
|
+
"src"
|
|
7
8
|
],
|
|
8
9
|
"license": "MIT",
|
|
9
10
|
"main": "lib/index.js",
|
|
10
11
|
"scripts": {
|
|
11
|
-
"prepublishOnly": "
|
|
12
|
+
"prepublishOnly": "yarn run build",
|
|
12
13
|
"build": "tsc --build ../../configs/ts/references/tsconfig.core-node.json"
|
|
13
14
|
},
|
|
14
15
|
"typings": "lib/index.d.ts",
|
|
@@ -17,12 +18,12 @@
|
|
|
17
18
|
"url": "git@github.com:opensumi/core.git"
|
|
18
19
|
},
|
|
19
20
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "2.
|
|
21
|
-
"@opensumi/ide-core-common": "2.
|
|
21
|
+
"@opensumi/ide-connection": "2.22.0",
|
|
22
|
+
"@opensumi/ide-core-common": "2.22.0",
|
|
22
23
|
"keytar": "^7.7.0"
|
|
23
24
|
},
|
|
24
25
|
"devDependencies": {
|
|
25
|
-
"@opensumi/ide-dev-tool": "
|
|
26
|
+
"@opensumi/ide-dev-tool": "1.3.1"
|
|
26
27
|
},
|
|
27
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "927717e1c60f9cf5f01622fd51085b318a175eeb"
|
|
28
29
|
}
|
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
import http from 'http';
|
|
2
|
+
import https from 'https';
|
|
3
|
+
import net from 'net';
|
|
4
|
+
import os from 'os';
|
|
5
|
+
import path from 'path';
|
|
6
|
+
|
|
7
|
+
import Koa from 'koa';
|
|
8
|
+
|
|
9
|
+
import { Injector } from '@opensumi/di';
|
|
10
|
+
import { WebSocketHandler } from '@opensumi/ide-connection/lib/node';
|
|
11
|
+
import { ContributionProvider, createContributionProvider, isWindows } from '@opensumi/ide-core-common';
|
|
12
|
+
import { ILogServiceManager, ILogService, SupportLogNamespace, StoragePaths } from '@opensumi/ide-core-common';
|
|
13
|
+
import { DEFAULT_TRS_REGISTRY } from '@opensumi/ide-core-common/lib/const';
|
|
14
|
+
|
|
15
|
+
import { createServerConnection2, createNetServerConnection, RPCServiceCenter } from '../connection';
|
|
16
|
+
import { NodeModule } from '../node-module';
|
|
17
|
+
import { AppConfig, IServerApp, IServerAppOpts, ModuleConstructor, ServerAppContribution } from '../types';
|
|
18
|
+
|
|
19
|
+
import { injectInnerProviders } from './inner-providers';
|
|
20
|
+
|
|
21
|
+
export class ServerApp implements IServerApp {
|
|
22
|
+
private _injector: Injector;
|
|
23
|
+
|
|
24
|
+
private config: IServerAppOpts;
|
|
25
|
+
|
|
26
|
+
private logger: ILogService;
|
|
27
|
+
|
|
28
|
+
private webSocketHandler: WebSocketHandler[];
|
|
29
|
+
|
|
30
|
+
private modulesInstances: NodeModule[];
|
|
31
|
+
|
|
32
|
+
use: (middleware: Koa.Middleware<Koa.ParameterizedContext<any, any>>) => void;
|
|
33
|
+
|
|
34
|
+
protected contributionsProvider: ContributionProvider<ServerAppContribution>;
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* 启动初始化
|
|
38
|
+
* 1. 绑定 process 报错处理
|
|
39
|
+
* 2. 初始化内置的 Provider
|
|
40
|
+
* 3. 获取 Modules 的实例
|
|
41
|
+
* 4. 设置默认的实例
|
|
42
|
+
* @param opts
|
|
43
|
+
*/
|
|
44
|
+
constructor(private opts: IServerAppOpts) {
|
|
45
|
+
this._injector = opts.injector || new Injector();
|
|
46
|
+
this.webSocketHandler = opts.webSocketHandler || [];
|
|
47
|
+
// 使用外部传入的中间件
|
|
48
|
+
this.use = opts.use || ((middleware) => null);
|
|
49
|
+
this.config = {
|
|
50
|
+
injector: this.injector,
|
|
51
|
+
logDir: opts.logDir,
|
|
52
|
+
logLevel: opts.logLevel,
|
|
53
|
+
LogServiceClass: opts.LogServiceClass,
|
|
54
|
+
marketplace: Object.assign(
|
|
55
|
+
{
|
|
56
|
+
endpoint: DEFAULT_TRS_REGISTRY.ENDPOINT,
|
|
57
|
+
extensionDir: path.join(
|
|
58
|
+
os.homedir(),
|
|
59
|
+
...(isWindows ? [StoragePaths.WINDOWS_APP_DATA_DIR, StoragePaths.WINDOWS_ROAMING_DIR] : ['']),
|
|
60
|
+
StoragePaths.DEFAULT_STORAGE_DIR_NAME,
|
|
61
|
+
StoragePaths.MARKETPLACE_DIR,
|
|
62
|
+
),
|
|
63
|
+
showBuiltinExtensions: false,
|
|
64
|
+
accountId: DEFAULT_TRS_REGISTRY.ACCOUNT_ID,
|
|
65
|
+
masterKey: DEFAULT_TRS_REGISTRY.MASTER_KEY,
|
|
66
|
+
ignoreId: [],
|
|
67
|
+
},
|
|
68
|
+
opts.marketplace,
|
|
69
|
+
),
|
|
70
|
+
processCloseExitThreshold: opts.processCloseExitThreshold,
|
|
71
|
+
terminalPtyCloseThreshold: opts.terminalPtyCloseThreshold,
|
|
72
|
+
staticAllowOrigin: opts.staticAllowOrigin,
|
|
73
|
+
staticAllowPath: opts.staticAllowPath,
|
|
74
|
+
extLogServiceClassPath: opts.extLogServiceClassPath,
|
|
75
|
+
maxExtProcessCount: opts.maxExtProcessCount,
|
|
76
|
+
onDidCreateExtensionHostProcess: opts.onDidCreateExtensionHostProcess,
|
|
77
|
+
extHost: process.env.EXTENSION_HOST_ENTRY || opts.extHost,
|
|
78
|
+
blockPatterns: opts.blockPatterns,
|
|
79
|
+
extHostIPCSockPath: opts.extHostIPCSockPath,
|
|
80
|
+
extHostForkOptions: opts.extHostForkOptions,
|
|
81
|
+
};
|
|
82
|
+
this.bindProcessHandler();
|
|
83
|
+
this.initBaseProvider();
|
|
84
|
+
this.createNodeModules(opts.modules, opts.modulesInstances);
|
|
85
|
+
this.logger = this.injector.get(ILogServiceManager).getLogger(SupportLogNamespace.App);
|
|
86
|
+
this.contributionsProvider = this.injector.get(ServerAppContribution);
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
get injector() {
|
|
90
|
+
return this._injector;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* 将被依赖但未被加入modules的模块加入到待加载模块最后
|
|
95
|
+
*/
|
|
96
|
+
public resolveModuleDeps(moduleConstructor: ModuleConstructor, modules: any[]) {
|
|
97
|
+
const dependencies = Reflect.getMetadata('dependencies', moduleConstructor) as [];
|
|
98
|
+
if (dependencies) {
|
|
99
|
+
dependencies.forEach((dep) => {
|
|
100
|
+
if (modules.indexOf(dep) === -1) {
|
|
101
|
+
modules.push(dep);
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
private get contributions(): ServerAppContribution[] {
|
|
108
|
+
return this.contributionsProvider.getContributions();
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
private initBaseProvider() {
|
|
112
|
+
// 创建 contributionsProvider
|
|
113
|
+
createContributionProvider(this.injector, ServerAppContribution);
|
|
114
|
+
|
|
115
|
+
this.injector.addProviders({
|
|
116
|
+
token: AppConfig,
|
|
117
|
+
useValue: this.config,
|
|
118
|
+
});
|
|
119
|
+
injectInnerProviders(this.injector);
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
private async initializeContribution() {
|
|
123
|
+
for (const contribution of this.contributions) {
|
|
124
|
+
if (contribution.initialize) {
|
|
125
|
+
try {
|
|
126
|
+
await contribution.initialize(this);
|
|
127
|
+
} catch (error) {
|
|
128
|
+
this.logger.error('Could not initialize contribution', error);
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
private async startContribution() {
|
|
135
|
+
for (const contrib of this.contributions) {
|
|
136
|
+
if (contrib.onStart) {
|
|
137
|
+
try {
|
|
138
|
+
await contrib.onStart(this);
|
|
139
|
+
} catch (error) {
|
|
140
|
+
this.logger.error('Could not start contribution', error);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
async start(
|
|
147
|
+
server: http.Server | https.Server | net.Server,
|
|
148
|
+
serviceHandler?: (serviceCenter: RPCServiceCenter) => void,
|
|
149
|
+
) {
|
|
150
|
+
await this.initializeContribution();
|
|
151
|
+
|
|
152
|
+
let serviceCenter;
|
|
153
|
+
|
|
154
|
+
if (serviceHandler) {
|
|
155
|
+
serviceCenter = new RPCServiceCenter();
|
|
156
|
+
serviceHandler(serviceCenter);
|
|
157
|
+
} else {
|
|
158
|
+
if (server instanceof http.Server || server instanceof https.Server) {
|
|
159
|
+
// 创建 websocket 通道
|
|
160
|
+
serviceCenter = createServerConnection2(
|
|
161
|
+
server,
|
|
162
|
+
this.injector,
|
|
163
|
+
this.modulesInstances,
|
|
164
|
+
this.webSocketHandler,
|
|
165
|
+
this.opts,
|
|
166
|
+
);
|
|
167
|
+
} else if (server instanceof net.Server) {
|
|
168
|
+
serviceCenter = createNetServerConnection(server, this.injector, this.modulesInstances);
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
// TODO: 每次链接来的时候绑定一次，或者是服务获取的时候多实例化出来
|
|
173
|
+
// bindModuleBackService(this.injector, this.modulesInstances, serviceCenter);
|
|
174
|
+
|
|
175
|
+
await this.startContribution();
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
private async onStop() {
|
|
179
|
+
for (const contrib of this.contributions) {
|
|
180
|
+
if (contrib.onStop) {
|
|
181
|
+
try {
|
|
182
|
+
await contrib.onStop(this);
|
|
183
|
+
} catch (error) {
|
|
184
|
+
this.logger.error('Could not stop contribution', error);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
/**
|
|
191
|
+
* 绑定 process 退出逻辑
|
|
192
|
+
*/
|
|
193
|
+
private bindProcessHandler() {
|
|
194
|
+
process.on('uncaughtException', (error) => {
|
|
195
|
+
if (error) {
|
|
196
|
+
this.logger.error('Uncaught Exception: ', error.toString());
|
|
197
|
+
if (error.stack) {
|
|
198
|
+
this.logger.error(error.stack);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
});
|
|
202
|
+
// Handles normal process termination.
|
|
203
|
+
process.on('exit', () => {
|
|
204
|
+
this.logger.log('process exit');
|
|
205
|
+
});
|
|
206
|
+
// Handles `Ctrl+C`.
|
|
207
|
+
process.on('SIGINT', async () => {
|
|
208
|
+
this.logger.log('process SIGINT');
|
|
209
|
+
await this.onStop();
|
|
210
|
+
this.logger.log('process SIGINT DONE');
|
|
211
|
+
process.exit(0);
|
|
212
|
+
});
|
|
213
|
+
// Handles `kill pid`.
|
|
214
|
+
process.on('SIGTERM', async () => {
|
|
215
|
+
this.logger.log('process SIGTERM');
|
|
216
|
+
await this.onStop();
|
|
217
|
+
this.logger.log('process SIGTERM DONE');
|
|
218
|
+
process.exit(0);
|
|
219
|
+
});
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
/**
|
|
223
|
+
* 收集 module 实例
|
|
224
|
+
* @param Constructors
|
|
225
|
+
* @param modules
|
|
226
|
+
*/
|
|
227
|
+
private createNodeModules(Constructors: ModuleConstructor[] = [], modules: NodeModule[] = []) {
|
|
228
|
+
const allModules = [...modules];
|
|
229
|
+
Constructors.forEach((c) => {
|
|
230
|
+
this.resolveModuleDeps(c, Constructors);
|
|
231
|
+
});
|
|
232
|
+
for (const Constructor of Constructors) {
|
|
233
|
+
allModules.push(this.injector.get(Constructor));
|
|
234
|
+
}
|
|
235
|
+
for (const instance of allModules) {
|
|
236
|
+
if (instance.providers) {
|
|
237
|
+
this.injector.addProviders(...instance.providers);
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
if (instance.contributionProvider) {
|
|
241
|
+
if (Array.isArray(instance.contributionProvider)) {
|
|
242
|
+
for (const contributionProvider of instance.contributionProvider) {
|
|
243
|
+
createContributionProvider(this.injector, contributionProvider);
|
|
244
|
+
}
|
|
245
|
+
} else {
|
|
246
|
+
createContributionProvider(this.injector, instance.contributionProvider);
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
}
|
|
250
|
+
this.modulesInstances = allModules;
|
|
251
|
+
}
|
|
252
|
+
}
|