trm-core 6.1.8 → 6.1.10
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/README.md +1 -1
- package/dist/actions/findDependencies/setTrmDependencies.js +26 -0
- package/dist/actions/findDependencies/setTrmDependencies.js.map +1 -1
- package/dist/actions/publish/init.js +1 -6
- package/dist/actions/publish/setCustomizingTransports.js +1 -1
- package/dist/actions/publish/setManifestValues.js.map +1 -1
- package/dist/client/RESTClient.d.ts +1 -0
- package/dist/client/RESTClient.js +7 -1
- package/dist/client/RFCClient.d.ts +1 -0
- package/dist/client/RFCClient.js +6 -0
- package/dist/systemConnector/ISystemConnectorBase.d.ts +1 -0
- package/dist/systemConnector/RESTSystemConnector.d.ts +1 -0
- package/dist/systemConnector/RESTSystemConnector.js +5 -0
- package/dist/systemConnector/RFCSystemConnector.d.ts +1 -0
- package/dist/systemConnector/RFCSystemConnector.js +5 -0
- package/dist/systemConnector/SystemConnector.d.ts +1 -0
- package/dist/systemConnector/SystemConnector.js +7 -0
- package/dist/systemConnector/SystemConnectorBase.d.ts +3 -0
- package/dist/systemConnector/SystemConnectorBase.js +47 -5
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -15,7 +15,7 @@ Full documentation can be seen at [https://docs.trmregistry.com](https://docs.tr
|
|
|
15
15
|
|
|
16
16
|
# Contributing <!-- {docsify-remove} -->
|
|
17
17
|
|
|
18
|
-
Like every other TRM open-
|
|
18
|
+
Like every other TRM open-source projects, contributions are always welcomed ❤️.
|
|
19
19
|
|
|
20
20
|
Make sure to open an issue first.
|
|
21
21
|
|
|
@@ -16,6 +16,7 @@ const transport_1 = require("../../transport");
|
|
|
16
16
|
const trmPackage_1 = require("../../trmPackage");
|
|
17
17
|
var aRootDevclass = [];
|
|
18
18
|
var trmServerPackage;
|
|
19
|
+
var trmRestPackage;
|
|
19
20
|
const _getRootDevclass = (devclass) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20
21
|
const oRootDevclass = aRootDevclass.find(o => o.devclass === devclass);
|
|
21
22
|
if (oRootDevclass) {
|
|
@@ -63,6 +64,20 @@ const _getTadirDependencies = (tadirDependencies) => __awaiter(void 0, void 0, v
|
|
|
63
64
|
trmServerPackage = {};
|
|
64
65
|
}
|
|
65
66
|
}
|
|
67
|
+
if (!trmRestPackage) {
|
|
68
|
+
try {
|
|
69
|
+
const systemTrmRestPackage = yield systemConnector_1.SystemConnector.getTrmRestPackage();
|
|
70
|
+
if (systemTrmRestPackage.manifest) {
|
|
71
|
+
trmRestPackage = { package: systemTrmRestPackage };
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
trmRestPackage = {};
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
catch (e) {
|
|
78
|
+
trmRestPackage = {};
|
|
79
|
+
}
|
|
80
|
+
}
|
|
66
81
|
for (const tadirDependency of tadirDependencies) {
|
|
67
82
|
const tadir = tadirDependency.object;
|
|
68
83
|
var trmRelevantTransports = [];
|
|
@@ -83,6 +98,17 @@ const _getTadirDependencies = (tadirDependencies) => __awaiter(void 0, void 0, v
|
|
|
83
98
|
integrity = yield systemConnector_1.SystemConnector.getPackageIntegrity(trmPackage);
|
|
84
99
|
}
|
|
85
100
|
}
|
|
101
|
+
else if (trmRestPackage.package && trmRestPackage.package.getDevclass() === tadir.devclass) {
|
|
102
|
+
logger_1.Logger.log(`Dependency with TRM REST package`, true);
|
|
103
|
+
devclass = trmRestPackage.package.getDevclass();
|
|
104
|
+
trmPackage = trmRestPackage.package;
|
|
105
|
+
if (trmRestPackage.integrity) {
|
|
106
|
+
integrity = trmRestPackage.integrity;
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
integrity = yield systemConnector_1.SystemConnector.getPackageIntegrity(trmPackage);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
86
112
|
else {
|
|
87
113
|
logger_1.Logger.log(`Searching transports for object ${tadir.pgmid} ${tadir.object} ${tadir.objName}`, true);
|
|
88
114
|
const allTransports = yield transport_1.Transport.getTransportsFromObject(tadir);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setTrmDependencies.js","sourceRoot":"","sources":["../../../src/actions/findDependencies/setTrmDependencies.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,yCAAsC;AAEtC,2DAAwD;AACxD,+CAA4C;AAC5C,iDAA8C;
|
|
1
|
+
{"version":3,"file":"setTrmDependencies.js","sourceRoot":"","sources":["../../../src/actions/findDependencies/setTrmDependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,12 +25,7 @@ exports.init = {
|
|
|
25
25
|
const registry = context.rawInput.packageData.registry;
|
|
26
26
|
if (registry.getRegistryType() === registry_1.RegistryType.PUBLIC) {
|
|
27
27
|
logger_1.Logger.log(`Public registry, checking if logged in`, true);
|
|
28
|
-
|
|
29
|
-
yield registry.whoAmI();
|
|
30
|
-
}
|
|
31
|
-
catch (e) {
|
|
32
|
-
throw new Error(`Publish not allowed: ${e.message}`);
|
|
33
|
-
}
|
|
28
|
+
yield registry.whoAmI();
|
|
34
29
|
}
|
|
35
30
|
context.rawInput.packageData.name = (0, commons_1.parsePackageName)({
|
|
36
31
|
fullName: context.rawInput.packageData.name
|
|
@@ -78,7 +78,7 @@ exports.setCustomizingTransports = {
|
|
|
78
78
|
logger_1.Logger.log(`Transport ${transport.trkorr} doesn't exist`, true);
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
-
logger_1.Logger.info(`${
|
|
81
|
+
logger_1.Logger.info(`${validatedTransports} customizing transports/tasks will be published.`);
|
|
82
82
|
}
|
|
83
83
|
})
|
|
84
84
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setManifestValues.js","sourceRoot":"","sources":["../../../src/actions/publish/setManifestValues.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setManifestValues.js","sourceRoot":"","sources":["../../../src/actions/publish/setManifestValues.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,7 @@ export declare class RESTClient implements IClient {
|
|
|
39
39
|
setInstallDevc(installDevc: struct.ZTRM_INSTALLDEVC[]): Promise<void>;
|
|
40
40
|
getObjectsList(): Promise<struct.KO100[]>;
|
|
41
41
|
getTrmServerVersion(): Promise<string>;
|
|
42
|
+
getTrmRestVersion(): Promise<string>;
|
|
42
43
|
trmServerPing(): Promise<string>;
|
|
43
44
|
renameTransportRequest(trkorr: components.TRKORR, as4text: components.AS4TEXT): Promise<void>;
|
|
44
45
|
setPackageIntegrity(integrity: struct.ZTRM_INTEGRITY): Promise<void>;
|
|
@@ -409,7 +409,13 @@ class RESTClient {
|
|
|
409
409
|
getTrmServerVersion() {
|
|
410
410
|
return __awaiter(this, void 0, void 0, function* () {
|
|
411
411
|
const result = (yield this._axiosInstance.get('/version')).data;
|
|
412
|
-
return result.
|
|
412
|
+
return result.serverVersion;
|
|
413
|
+
});
|
|
414
|
+
}
|
|
415
|
+
getTrmRestVersion() {
|
|
416
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
417
|
+
const result = (yield this._axiosInstance.get('/version')).data;
|
|
418
|
+
return result.restVersion;
|
|
413
419
|
});
|
|
414
420
|
}
|
|
415
421
|
trmServerPing() {
|
|
@@ -41,6 +41,7 @@ export declare class RFCClient implements IClient {
|
|
|
41
41
|
setInstallDevc(installDevc: struct.ZTRM_INSTALLDEVC[]): Promise<void>;
|
|
42
42
|
getObjectsList(): Promise<struct.KO100[]>;
|
|
43
43
|
getTrmServerVersion(): Promise<string>;
|
|
44
|
+
getTrmRestVersion(): Promise<string>;
|
|
44
45
|
trmServerPing(): Promise<string>;
|
|
45
46
|
renameTransportRequest(trkorr: components.TRKORR, as4text: components.AS4TEXT): Promise<void>;
|
|
46
47
|
setPackageIntegrity(integrity: struct.ZTRM_INTEGRITY): Promise<void>;
|
package/dist/client/RFCClient.js
CHANGED
|
@@ -428,6 +428,12 @@ class RFCClient {
|
|
|
428
428
|
return result['evVersion'];
|
|
429
429
|
});
|
|
430
430
|
}
|
|
431
|
+
getTrmRestVersion() {
|
|
432
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
433
|
+
const result = yield this._call("ZTRM_VERSION");
|
|
434
|
+
return result['evRest'];
|
|
435
|
+
});
|
|
436
|
+
}
|
|
431
437
|
trmServerPing() {
|
|
432
438
|
return __awaiter(this, void 0, void 0, function* () {
|
|
433
439
|
const result = yield this._call("ZTRM_PING");
|
|
@@ -31,4 +31,5 @@ export interface ISystemConnectorBase {
|
|
|
31
31
|
getR3transUnicode: () => Promise<boolean>;
|
|
32
32
|
isTransportLayerExist: (devlayer: components.DEVLAYER) => Promise<boolean>;
|
|
33
33
|
getTrmServerPackage: () => Promise<TrmPackage>;
|
|
34
|
+
getTrmRestPackage: () => Promise<TrmPackage>;
|
|
34
35
|
}
|
|
@@ -23,6 +23,7 @@ export declare class RESTSystemConnector extends SystemConnectorBase implements
|
|
|
23
23
|
getLogonLanguage(c?: boolean): string;
|
|
24
24
|
protected readTable(tableName: components.TABNAME, fields: struct.RFC_DB_FLD[], options?: string): Promise<any[]>;
|
|
25
25
|
protected getTrmServerVersion(): Promise<string>;
|
|
26
|
+
protected getTrmRestVersion(): Promise<string>;
|
|
26
27
|
protected listDevclassObjects(devclass: DEVCLASS): Promise<TADIR[]>;
|
|
27
28
|
protected tdevcInterface(devclass: components.DEVCLASS, parentcl?: components.DEVCLASS, rmParentCl?: boolean, devlayer?: components.DEVLAYER): Promise<void>;
|
|
28
29
|
protected getR3transInfo(): Promise<string>;
|
|
@@ -76,6 +76,11 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
|
|
|
76
76
|
return this._client.getTrmServerVersion();
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
|
+
getTrmRestVersion() {
|
|
80
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
81
|
+
return this._client.getTrmRestVersion();
|
|
82
|
+
});
|
|
83
|
+
}
|
|
79
84
|
listDevclassObjects(devclass) {
|
|
80
85
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
86
|
return this._client.getDevclassObjects(devclass);
|
|
@@ -23,6 +23,7 @@ export declare class RFCSystemConnector extends SystemConnectorBase implements I
|
|
|
23
23
|
getLogonLanguage(c?: boolean): string;
|
|
24
24
|
protected readTable(tableName: components.TABNAME, fields: struct.RFC_DB_FLD[], options?: string): Promise<any[]>;
|
|
25
25
|
protected getTrmServerVersion(): Promise<string>;
|
|
26
|
+
protected getTrmRestVersion(): Promise<string>;
|
|
26
27
|
protected listDevclassObjects(devclass: DEVCLASS): Promise<TADIR[]>;
|
|
27
28
|
protected tdevcInterface(devclass: components.DEVCLASS, parentcl?: components.DEVCLASS, rmParentCl?: boolean, devlayer?: components.DEVLAYER): Promise<void>;
|
|
28
29
|
protected getR3transInfo(): Promise<string>;
|
|
@@ -58,6 +58,11 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
|
|
|
58
58
|
return this._client.getTrmServerVersion();
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
|
+
getTrmRestVersion() {
|
|
62
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
63
|
+
return this._client.getTrmRestVersion();
|
|
64
|
+
});
|
|
65
|
+
}
|
|
61
66
|
listDevclassObjects(devclass) {
|
|
62
67
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
68
|
return this._client.getDevclassObjects(devclass);
|
|
@@ -75,4 +75,5 @@ export declare namespace SystemConnector {
|
|
|
75
75
|
function getR3transUnicode(): Promise<boolean>;
|
|
76
76
|
function isTransportLayerExist(devlayer: components.DEVLAYER): Promise<boolean>;
|
|
77
77
|
function getTrmServerPackage(): Promise<TrmPackage>;
|
|
78
|
+
function getTrmRestPackage(): Promise<TrmPackage>;
|
|
78
79
|
}
|
|
@@ -450,4 +450,11 @@ var SystemConnector;
|
|
|
450
450
|
});
|
|
451
451
|
}
|
|
452
452
|
SystemConnector.getTrmServerPackage = getTrmServerPackage;
|
|
453
|
+
function getTrmRestPackage() {
|
|
454
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
455
|
+
yield checkSystemConnector();
|
|
456
|
+
return SystemConnector.systemConnector.getTrmRestPackage();
|
|
457
|
+
});
|
|
458
|
+
}
|
|
459
|
+
SystemConnector.getTrmRestPackage = getTrmRestPackage;
|
|
453
460
|
})(SystemConnector || (exports.SystemConnector = SystemConnector = {}));
|
|
@@ -8,6 +8,7 @@ import * as struct from "../client/struct";
|
|
|
8
8
|
import { ISystemConnectorBase } from "./ISystemConnectorBase";
|
|
9
9
|
import { Registry } from "../registry";
|
|
10
10
|
export declare const TRM_SERVER_PACKAGE_NAME: string;
|
|
11
|
+
export declare const TRM_REST_PACKAGE_NAME: string;
|
|
11
12
|
export declare const SRC_TRKORR_TABL = "ZTRM_SRC_TRKORR";
|
|
12
13
|
export declare const SKIP_TRKORR_TABL = "ZTRM_SKIP_TRKORR";
|
|
13
14
|
export declare abstract class SystemConnectorBase implements ISystemConnectorBase {
|
|
@@ -18,6 +19,7 @@ export declare abstract class SystemConnectorBase implements ISystemConnectorBas
|
|
|
18
19
|
protected abstract getSysname(): string;
|
|
19
20
|
protected abstract getLangu(c: boolean): string;
|
|
20
21
|
protected abstract getTrmServerVersion(): Promise<string>;
|
|
22
|
+
protected abstract getTrmRestVersion(): Promise<string>;
|
|
21
23
|
protected abstract listDevclassObjects(devclass: components.DEVCLASS): Promise<struct.TADIR[]>;
|
|
22
24
|
protected abstract tdevcInterface(devclass: components.DEVCLASS, parentcl?: components.DEVCLASS, rmParentCl?: boolean, devlayer?: components.DEVLAYER): Promise<void>;
|
|
23
25
|
protected abstract getR3transInfo(): Promise<string>;
|
|
@@ -28,6 +30,7 @@ export declare abstract class SystemConnectorBase implements ISystemConnectorBas
|
|
|
28
30
|
getObject(pgmid: PGMID, object: TROBJTYPE, objName: SOBJ_NAME): Promise<TADIR>;
|
|
29
31
|
getIgnoredTrkorr(): Promise<TRKORR[]>;
|
|
30
32
|
getTrmServerPackage(): Promise<TrmPackage>;
|
|
33
|
+
getTrmRestPackage(): Promise<TrmPackage>;
|
|
31
34
|
getInstalledPackages(includeSoruces?: boolean, refresh?: boolean): Promise<TrmPackage[]>;
|
|
32
35
|
getDevclass(devclass: DEVCLASS): Promise<TDEVC>;
|
|
33
36
|
getTransportTargets(): Promise<TMSCSYS[]>;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.SystemConnectorBase = exports.SKIP_TRKORR_TABL = exports.SRC_TRKORR_TABL = exports.TRM_SERVER_PACKAGE_NAME = void 0;
|
|
12
|
+
exports.SystemConnectorBase = exports.SKIP_TRKORR_TABL = exports.SRC_TRKORR_TABL = exports.TRM_REST_PACKAGE_NAME = exports.TRM_SERVER_PACKAGE_NAME = void 0;
|
|
13
13
|
const semver_1 = require("semver");
|
|
14
14
|
const logger_1 = require("../logger");
|
|
15
15
|
const manifest_1 = require("../manifest");
|
|
@@ -18,6 +18,7 @@ const trmPackage_1 = require("../trmPackage");
|
|
|
18
18
|
const registry_1 = require("../registry");
|
|
19
19
|
const node_r3trans_1 = require("node-r3trans");
|
|
20
20
|
exports.TRM_SERVER_PACKAGE_NAME = 'trm-server';
|
|
21
|
+
exports.TRM_REST_PACKAGE_NAME = 'trm-rest';
|
|
21
22
|
exports.SRC_TRKORR_TABL = 'ZTRM_SRC_TRKORR';
|
|
22
23
|
exports.SKIP_TRKORR_TABL = 'ZTRM_SKIP_TRKORR';
|
|
23
24
|
class SystemConnectorBase {
|
|
@@ -110,8 +111,8 @@ class SystemConnectorBase {
|
|
|
110
111
|
return __awaiter(this, void 0, void 0, function* () {
|
|
111
112
|
var oPackage;
|
|
112
113
|
const oPublicRegistry = new registry_1.Registry(registry_1.PUBLIC_RESERVED_KEYWORD);
|
|
113
|
-
const
|
|
114
|
-
if (
|
|
114
|
+
const intf = yield this.getObject('R3TR', 'INTF', 'ZIF_TRM');
|
|
115
|
+
if (intf) {
|
|
115
116
|
try {
|
|
116
117
|
const trmServerVersion = yield this.getTrmServerVersion();
|
|
117
118
|
const oManifest = new manifest_1.Manifest({
|
|
@@ -119,7 +120,7 @@ class SystemConnectorBase {
|
|
|
119
120
|
version: trmServerVersion
|
|
120
121
|
});
|
|
121
122
|
if ((0, semver_1.valid)(trmServerVersion)) {
|
|
122
|
-
oPackage = new trmPackage_1.TrmPackage(exports.TRM_SERVER_PACKAGE_NAME, oPublicRegistry, oManifest).setDevclass(
|
|
123
|
+
oPackage = new trmPackage_1.TrmPackage(exports.TRM_SERVER_PACKAGE_NAME, oPublicRegistry, oManifest).setDevclass(intf.devclass);
|
|
123
124
|
}
|
|
124
125
|
}
|
|
125
126
|
catch (e) { }
|
|
@@ -130,6 +131,30 @@ class SystemConnectorBase {
|
|
|
130
131
|
return oPackage;
|
|
131
132
|
});
|
|
132
133
|
}
|
|
134
|
+
getTrmRestPackage() {
|
|
135
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
136
|
+
var oPackage;
|
|
137
|
+
const oPublicRegistry = new registry_1.Registry(registry_1.PUBLIC_RESERVED_KEYWORD);
|
|
138
|
+
const intf = yield this.getObject('R3TR', 'INTF', 'ZIF_TRM_REST');
|
|
139
|
+
if (intf) {
|
|
140
|
+
try {
|
|
141
|
+
const trmRestVersion = yield this.getTrmRestVersion();
|
|
142
|
+
const oManifest = new manifest_1.Manifest({
|
|
143
|
+
name: exports.TRM_REST_PACKAGE_NAME,
|
|
144
|
+
version: trmRestVersion
|
|
145
|
+
});
|
|
146
|
+
if ((0, semver_1.valid)(trmRestVersion)) {
|
|
147
|
+
oPackage = new trmPackage_1.TrmPackage(exports.TRM_REST_PACKAGE_NAME, oPublicRegistry, oManifest).setDevclass(intf.devclass);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
catch (e) { }
|
|
151
|
+
}
|
|
152
|
+
if (!oPackage) {
|
|
153
|
+
throw new Error(`Package ${exports.TRM_REST_PACKAGE_NAME} was not found.`);
|
|
154
|
+
}
|
|
155
|
+
return oPackage;
|
|
156
|
+
});
|
|
157
|
+
}
|
|
133
158
|
getInstalledPackages() {
|
|
134
159
|
return __awaiter(this, arguments, void 0, function* (includeSoruces = true, refresh) {
|
|
135
160
|
if (!refresh) {
|
|
@@ -210,7 +235,24 @@ class SystemConnectorBase {
|
|
|
210
235
|
trmPackages.push(generatedTrmServerPackage);
|
|
211
236
|
}
|
|
212
237
|
catch (e) {
|
|
213
|
-
logger_1.Logger.warning(
|
|
238
|
+
logger_1.Logger.warning(`${exports.TRM_SERVER_PACKAGE_NAME} is not installed`, true);
|
|
239
|
+
}
|
|
240
|
+
logger_1.Logger.log(`Excluding trm-rest (adding it manually)`, true);
|
|
241
|
+
try {
|
|
242
|
+
const trmRestPackage = trmPackages.find(o => o.packageName === exports.TRM_REST_PACKAGE_NAME && o.compareRegistry(new registry_1.Registry(registry_1.PUBLIC_RESERVED_KEYWORD)));
|
|
243
|
+
var generatedTrmRestPackage = yield this.getTrmRestPackage();
|
|
244
|
+
if (trmRestPackage && trmRestPackage.manifest) {
|
|
245
|
+
logger_1.Logger.log(`trm-rest was found (it was imported via transport)`, true);
|
|
246
|
+
if (trmRestPackage.manifest.get().version === generatedTrmRestPackage.manifest.get().version) {
|
|
247
|
+
logger_1.Logger.log(`trm-rest imported is the one currenlty in use`, true);
|
|
248
|
+
generatedTrmRestPackage.manifest = trmRestPackage.manifest;
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
trmPackages = trmPackages.filter(o => !(o.packageName === exports.TRM_REST_PACKAGE_NAME && o.compareRegistry(new registry_1.Registry(registry_1.PUBLIC_RESERVED_KEYWORD))));
|
|
252
|
+
trmPackages.push(generatedTrmRestPackage);
|
|
253
|
+
}
|
|
254
|
+
catch (e) {
|
|
255
|
+
logger_1.Logger.warning(`${exports.TRM_SERVER_PACKAGE_NAME} is not installed`, true);
|
|
214
256
|
}
|
|
215
257
|
if (includeSoruces) {
|
|
216
258
|
this._installedPackagesI = trmPackages;
|