trm-core 6.4.1 → 6.5.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.
Files changed (126) hide show
  1. package/changelog.txt +6 -0
  2. package/dist/actions/checkPackageDependencies/analyze.js +7 -7
  3. package/dist/actions/checkPackageDependencies/index.js +3 -3
  4. package/dist/actions/checkPackageDependencies/init.js +2 -2
  5. package/dist/actions/checkSapEntries/analyze.js +8 -8
  6. package/dist/actions/checkSapEntries/index.js +3 -3
  7. package/dist/actions/checkSapEntries/init.js +2 -2
  8. package/dist/actions/commons/setSystemPackages.js +3 -3
  9. package/dist/actions/findDependencies/index.js +3 -3
  10. package/dist/actions/findDependencies/init.js +4 -4
  11. package/dist/actions/findDependencies/parseSenvi.js +10 -10
  12. package/dist/actions/findDependencies/print.js +4 -4
  13. package/dist/actions/findDependencies/readRepositoryEnvironment.js +6 -6
  14. package/dist/actions/findDependencies/setObjects.js +6 -7
  15. package/dist/actions/findDependencies/setTrmDependencies.js +16 -16
  16. package/dist/actions/install/addNamespace.js +10 -11
  17. package/dist/actions/install/checkAlreadyInstalled.js +6 -6
  18. package/dist/actions/install/checkDependencies.js +9 -9
  19. package/dist/actions/install/checkIntegrity.js +6 -6
  20. package/dist/actions/install/checkObjectTypes.js +6 -6
  21. package/dist/actions/install/checkSapEntries.js +8 -8
  22. package/dist/actions/install/checkTransports.js +32 -32
  23. package/dist/actions/install/executePostActivities.js +15 -8
  24. package/dist/actions/install/generateDevclass.js +17 -11
  25. package/dist/actions/install/generateInstallTransport.js +26 -24
  26. package/dist/actions/install/importCustTransport.js +10 -10
  27. package/dist/actions/install/importDevcTransport.js +11 -11
  28. package/dist/actions/install/importLangTransport.js +10 -10
  29. package/dist/actions/install/importTadirTransport.js +22 -17
  30. package/dist/actions/install/index.js +5 -3
  31. package/dist/actions/install/init.js +11 -11
  32. package/dist/actions/install/installDependencies.js +16 -17
  33. package/dist/actions/install/migrate.js +5 -5
  34. package/dist/actions/install/readDevc.js +5 -5
  35. package/dist/actions/install/readTadir.js +9 -9
  36. package/dist/actions/install/refreshTmsTxt.js +11 -6
  37. package/dist/actions/install/setInstallDevclass.js +5 -6
  38. package/dist/actions/install/setPackageIntegrity.js +3 -3
  39. package/dist/actions/install/setR3trans.js +7 -7
  40. package/dist/actions/install/setTrmServerUpgradeService.d.ts +3 -0
  41. package/dist/actions/install/setTrmServerUpgradeService.js +32 -0
  42. package/dist/actions/installDependency/findInstallRelease.js +2 -2
  43. package/dist/actions/installDependency/index.js +3 -3
  44. package/dist/actions/installDependency/init.js +6 -7
  45. package/dist/actions/installDependency/installRelease.js +4 -4
  46. package/dist/actions/publish/finalizePublish.js +7 -7
  47. package/dist/actions/publish/findDependencies.js +21 -22
  48. package/dist/actions/publish/generateCustTransport.js +10 -10
  49. package/dist/actions/publish/generateDevcTransport.js +8 -8
  50. package/dist/actions/publish/generateLangTransport.js +12 -12
  51. package/dist/actions/publish/generateTadirTransport.js +9 -9
  52. package/dist/actions/publish/getSourceCode.js +5 -5
  53. package/dist/actions/publish/index.js +3 -3
  54. package/dist/actions/publish/init.js +16 -16
  55. package/dist/actions/publish/publishToRegistry.js +4 -4
  56. package/dist/actions/publish/releaseTransports.js +8 -9
  57. package/dist/actions/publish/setCustomizingTransports.js +10 -11
  58. package/dist/actions/publish/setDevclass.js +10 -10
  59. package/dist/actions/publish/setManifestValues.js +11 -11
  60. package/dist/actions/publish/setReadme.js +5 -6
  61. package/dist/actions/publish/setTransportTarget.js +7 -7
  62. package/dist/client/ClientError.d.ts +7 -0
  63. package/dist/client/ClientError.js +13 -0
  64. package/dist/client/RESTClient.js +13 -14
  65. package/dist/client/RESTClientError.d.ts +10 -0
  66. package/dist/client/RESTClientError.js +15 -0
  67. package/dist/client/RFCClient.js +32 -28
  68. package/dist/client/RFCClientError.d.ts +8 -0
  69. package/dist/client/RFCClientError.js +15 -0
  70. package/dist/client/index.d.ts +3 -0
  71. package/dist/client/index.js +3 -0
  72. package/dist/commons/TrmServerUpgradeService.d.ts +15 -0
  73. package/dist/commons/TrmServerUpgradeService.js +81 -0
  74. package/dist/commons/getAxiosInstance.js +8 -8
  75. package/dist/commons/getNodePackage.js +47 -6
  76. package/dist/commons/getNpmGlobalPath.js +3 -3
  77. package/dist/commons/index.d.ts +1 -0
  78. package/dist/commons/index.js +1 -0
  79. package/dist/index.d.ts +0 -2
  80. package/dist/index.js +0 -2
  81. package/dist/manifest/Manifest.js +3 -3
  82. package/dist/manifest/PostActivity.js +5 -5
  83. package/dist/registry/Registry.js +12 -13
  84. package/dist/systemConnector/RESTSystemConnector.js +6 -6
  85. package/dist/systemConnector/RFCSystemConnector.js +4 -4
  86. package/dist/systemConnector/SystemConnectorBase.js +29 -29
  87. package/dist/transport/Transport.js +48 -50
  88. package/dist/trmPackage/TrmArtifact.js +11 -11
  89. package/dist/trmPackage/TrmPackage.js +2 -2
  90. package/dist/{inquirer/validators → validators}/validateDevclass.d.ts +1 -1
  91. package/dist/{inquirer/validators → validators}/validateDevclass.js +1 -1
  92. package/dist/{inquirer/validators → validators}/validatePackageVisibility.d.ts +1 -1
  93. package/dist/{inquirer/validators → validators}/validatePackageVisibility.js +2 -2
  94. package/dist/{inquirer/validators → validators}/validateTransportTarget.d.ts +1 -1
  95. package/package.json +2 -4
  96. package/dist/inquirer/CliInquirer.d.ts +0 -10
  97. package/dist/inquirer/CliInquirer.js +0 -103
  98. package/dist/inquirer/IInquirer.d.ts +0 -7
  99. package/dist/inquirer/IInquirer.js +0 -2
  100. package/dist/inquirer/Inquirer.d.ts +0 -9
  101. package/dist/inquirer/Inquirer.js +0 -31
  102. package/dist/inquirer/Question.d.ts +0 -12
  103. package/dist/inquirer/Question.js +0 -2
  104. package/dist/inquirer/index.d.ts +0 -5
  105. package/dist/inquirer/index.js +0 -21
  106. package/dist/logger/CliLogFileLogger.d.ts +0 -25
  107. package/dist/logger/CliLogFileLogger.js +0 -92
  108. package/dist/logger/CliLogger.d.ts +0 -25
  109. package/dist/logger/CliLogger.js +0 -227
  110. package/dist/logger/ConsoleLogger.d.ts +0 -21
  111. package/dist/logger/ConsoleLogger.js +0 -104
  112. package/dist/logger/DummyLogger.d.ts +0 -20
  113. package/dist/logger/DummyLogger.js +0 -22
  114. package/dist/logger/ILogger.d.ts +0 -18
  115. package/dist/logger/ILogger.js +0 -2
  116. package/dist/logger/JSONLog.d.ts +0 -4
  117. package/dist/logger/JSONLog.js +0 -2
  118. package/dist/logger/Logger.d.ts +0 -21
  119. package/dist/logger/Logger.js +0 -86
  120. package/dist/logger/TreeLog.d.ts +0 -4
  121. package/dist/logger/TreeLog.js +0 -2
  122. package/dist/logger/index.d.ts +0 -8
  123. package/dist/logger/index.js +0 -24
  124. /package/dist/{inquirer/validators → validators}/index.d.ts +0 -0
  125. /package/dist/{inquirer/validators → validators}/index.js +0 -0
  126. /package/dist/{inquirer/validators → validators}/validateTransportTarget.js +0 -0
@@ -52,11 +52,10 @@ const axios_1 = require("axios");
52
52
  const trm_registry_types_1 = require("trm-registry-types");
53
53
  const TrmArtifact_1 = require("../trmPackage/TrmArtifact");
54
54
  const FormData = __importStar(require("form-data"));
55
- const logger_1 = require("../logger");
55
+ const trm_commons_1 = require("trm-commons");
56
56
  const crypto_1 = require("crypto");
57
57
  const protocol_1 = require("../protocol");
58
58
  const opener_1 = __importDefault(require("opener"));
59
- const Inquirer_1 = require("../inquirer/Inquirer");
60
59
  const commons_1 = require("../commons");
61
60
  const AXIOS_CTX = "Registry";
62
61
  exports.PUBLIC_RESERVED_KEYWORD = 'public';
@@ -65,7 +64,7 @@ class Registry {
65
64
  this.endpoint = endpoint;
66
65
  this.name = name;
67
66
  var envEndpoint = process.env.TRM_PUBLIC_REGISTRY_ENDPOINT;
68
- logger_1.Logger.log(`TRM_PUBLIC_REGISTRY_ENDPOINT Environment variable: ${envEndpoint}`, true);
67
+ trm_commons_1.Logger.log(`TRM_PUBLIC_REGISTRY_ENDPOINT Environment variable: ${envEndpoint}`, true);
69
68
  if (!envEndpoint || envEndpoint.trim().toLowerCase() === exports.PUBLIC_RESERVED_KEYWORD) {
70
69
  envEndpoint = 'https://www.trmregistry.com/registry';
71
70
  }
@@ -82,13 +81,13 @@ class Registry {
82
81
  else {
83
82
  this.endpoint = endpoint;
84
83
  }
85
- logger_1.Logger.log(`Endpoint type: ${this._registryType}`, true);
86
- logger_1.Logger.log(`Endpoint before normalize: ${this.endpoint}`, true);
84
+ trm_commons_1.Logger.log(`Endpoint type: ${this._registryType}`, true);
85
+ trm_commons_1.Logger.log(`Endpoint before normalize: ${this.endpoint}`, true);
87
86
  this.endpoint = (0, normalize_url_1.default)(this.endpoint, {
88
87
  stripHash: true,
89
88
  removeQueryParameters: true
90
89
  });
91
- logger_1.Logger.log(`Endpoint after normalize: ${this.endpoint}`, true);
90
+ trm_commons_1.Logger.log(`Endpoint after normalize: ${this.endpoint}`, true);
92
91
  if (this.endpoint.length > 100) {
93
92
  throw new Error(`Registry address length is too long! Maximum allowed is 100.`);
94
93
  }
@@ -109,9 +108,9 @@ class Registry {
109
108
  }
110
109
  authenticate() {
111
110
  return __awaiter(this, arguments, void 0, function* (defaultData = {}) {
112
- logger_1.Logger.log(`Registry authentication request`, true);
111
+ trm_commons_1.Logger.log(`Registry authentication request`, true);
113
112
  const ping = yield this.ping();
114
- logger_1.Logger.log(`Registry authentication type is: ${ping.authenticationType}`, true);
113
+ trm_commons_1.Logger.log(`Registry authentication type is: ${ping.authenticationType}`, true);
115
114
  if (ping.authenticationType !== trm_registry_types_1.AuthenticationType.NO_AUTH) {
116
115
  if (ping.authenticationType === trm_registry_types_1.AuthenticationType.BASIC) {
117
116
  yield this._basicAuth(defaultData);
@@ -136,7 +135,7 @@ class Registry {
136
135
  };
137
136
  var username = defaultData.username;
138
137
  var password = defaultData.password;
139
- const inq1 = yield Inquirer_1.Inquirer.prompt([{
138
+ const inq1 = yield trm_commons_1.Inquirer.prompt([{
140
139
  type: "input",
141
140
  name: "username",
142
141
  message: "Registry username",
@@ -174,10 +173,10 @@ class Registry {
174
173
  };
175
174
  var token = defaultData.token;
176
175
  if (!token && this._registryType == RegistryType_1.RegistryType.PUBLIC) {
177
- logger_1.Logger.info(`To authenticate, generate a new token.`);
178
- logger_1.Logger.info(`Follow the instructions https://docs.trmregistry.com/#/registry/public/authentication.`);
176
+ trm_commons_1.Logger.info(`To authenticate, generate a new token.`);
177
+ trm_commons_1.Logger.info(`Follow the instructions https://docs.trmregistry.com/#/registry/public/authentication.`);
179
178
  }
180
- const inq1 = yield Inquirer_1.Inquirer.prompt([{
179
+ const inq1 = yield trm_commons_1.Inquirer.prompt([{
181
180
  type: "input",
182
181
  name: "token",
183
182
  message: "Registry token",
@@ -262,7 +261,7 @@ class Registry {
262
261
  if (oAuth2.scope) {
263
262
  sAuth2Url = `${sAuth2Url}&scope=${oAuth2.scope}`;
264
263
  }
265
- logger_1.Logger.info(`Open login url at ${sAuth2Url}`);
264
+ trm_commons_1.Logger.info(`Open login url at ${sAuth2Url}`);
266
265
  (0, opener_1.default)(sAuth2Url);
267
266
  const oAuth2Callback = yield new protocol_1.Protocol().run();
268
267
  if (oAuth2Callback.path.startsWith(sRedirectUri)) {
@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.RESTSystemConnector = void 0;
16
- const logger_1 = require("../logger");
16
+ const trm_commons_1 = require("trm-commons");
17
17
  const SystemConnectorBase_1 = require("./SystemConnectorBase");
18
18
  const client_1 = require("../client");
19
19
  const normalize_url_1 = __importDefault(require("@esm2cjs/normalize-url"));
@@ -31,7 +31,7 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
31
31
  this._login.user = this._login.user.toUpperCase();
32
32
  this._lang = this._login.lang;
33
33
  this._user = this._login.user;
34
- logger_1.Logger.log(`REST connection data before normalize: ${JSON.stringify(this._connection)}`, true);
34
+ trm_commons_1.Logger.log(`REST connection data before normalize: ${JSON.stringify(this._connection)}`, true);
35
35
  this._connection.endpoint = (0, normalize_url_1.default)(this._connection.endpoint, {
36
36
  removeTrailingSlash: true
37
37
  });
@@ -46,7 +46,7 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
46
46
  this.supportedBulk.getExistingObjects = false;
47
47
  }
48
48
  this._connection.rfcdest = this._connection.rfcdest.toUpperCase().trim();
49
- logger_1.Logger.log(`REST connection data after normalize: ${JSON.stringify(this._connection)}`, true);
49
+ trm_commons_1.Logger.log(`REST connection data after normalize: ${JSON.stringify(this._connection)}`, true);
50
50
  this._client = new client_1.RESTClient(this._connection.endpoint, this._connection.rfcdest, this._login, this._lang[0]);
51
51
  }
52
52
  getSysname() {
@@ -104,14 +104,14 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
104
104
  }
105
105
  connect() {
106
106
  return __awaiter(this, void 0, void 0, function* () {
107
- logger_1.Logger.loading(`Connecting to ${this.getDest()}...`);
107
+ trm_commons_1.Logger.loading(`Connecting to ${this.getDest()}...`);
108
108
  try {
109
109
  yield this._client.open();
110
110
  this._dest = yield this._client.getDest();
111
- logger_1.Logger.success(`Connected to ${this.getDest()} as ${this._user}.`, false);
111
+ trm_commons_1.Logger.success(`Connected to ${this.getDest()} as ${this._user}.`, false);
112
112
  }
113
113
  catch (e) {
114
- logger_1.Logger.error(`Connection to ${this.getDest()} as ${this._user} failed.`, false);
114
+ trm_commons_1.Logger.error(`Connection to ${this.getDest()} as ${this._user} failed.`, false);
115
115
  throw e;
116
116
  }
117
117
  });
@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.RFCSystemConnector = void 0;
13
- const logger_1 = require("../logger");
13
+ const trm_commons_1 = require("trm-commons");
14
14
  const client_1 = require("../client");
15
15
  const SystemConnectorBase_1 = require("./SystemConnectorBase");
16
16
  class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
@@ -86,13 +86,13 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
86
86
  }
87
87
  connect() {
88
88
  return __awaiter(this, void 0, void 0, function* () {
89
- logger_1.Logger.loading(`Connecting to ${this.getDest()}...`);
89
+ trm_commons_1.Logger.loading(`Connecting to ${this.getDest()}...`);
90
90
  try {
91
91
  yield this._client.open();
92
- logger_1.Logger.success(`Connected to ${this.getDest()} as ${this._user}.`, false);
92
+ trm_commons_1.Logger.success(`Connected to ${this.getDest()} as ${this._user}.`, false);
93
93
  }
94
94
  catch (e) {
95
- logger_1.Logger.error(`Connection to ${this.getDest()} as ${this._user} failed.`, false);
95
+ trm_commons_1.Logger.error(`Connection to ${this.getDest()} as ${this._user} failed.`, false);
96
96
  throw e;
97
97
  }
98
98
  });
@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
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
- const logger_1 = require("../logger");
14
+ const trm_commons_1 = require("trm-commons");
15
15
  const manifest_1 = require("../manifest");
16
16
  const transport_1 = require("../transport");
17
17
  const trmPackage_1 = require("../trmPackage");
@@ -72,11 +72,11 @@ class SystemConnectorBase {
72
72
  getSourceTrkorr(refresh) {
73
73
  return __awaiter(this, void 0, void 0, function* () {
74
74
  if (!this._sourceTrkorr || refresh) {
75
- logger_1.Logger.log(`Ready to read installed packages`, true);
76
- logger_1.Logger.log(`Checking if ${exports.SRC_TRKORR_TABL} exists`, true);
75
+ trm_commons_1.Logger.log(`Ready to read installed packages`, true);
76
+ trm_commons_1.Logger.log(`Checking if ${exports.SRC_TRKORR_TABL} exists`, true);
77
77
  const tablExists = yield this.readTable('TADIR', [{ fieldName: 'OBJ_NAME' }], `PGMID EQ 'R3TR' AND OBJECT EQ 'TABL' AND OBJ_NAME EQ '${exports.SRC_TRKORR_TABL}'`);
78
78
  if (tablExists.length === 1) {
79
- logger_1.Logger.log(`TABL ${exports.SRC_TRKORR_TABL} exists`, true);
79
+ trm_commons_1.Logger.log(`TABL ${exports.SRC_TRKORR_TABL} exists`, true);
80
80
  const srcTrkorr = yield this.readTable(exports.SRC_TRKORR_TABL, [{ fieldName: 'TRKORR' }]);
81
81
  this._sourceTrkorr = srcTrkorr.map(o => o.trkorr);
82
82
  }
@@ -98,11 +98,11 @@ class SystemConnectorBase {
98
98
  getIgnoredTrkorr(refresh) {
99
99
  return __awaiter(this, void 0, void 0, function* () {
100
100
  if (!this._ignoredTrkorr || refresh) {
101
- logger_1.Logger.log(`Reading ignored transports`, true);
102
- logger_1.Logger.log(`Checking if ${exports.SKIP_TRKORR_TABL} exists`, true);
101
+ trm_commons_1.Logger.log(`Reading ignored transports`, true);
102
+ trm_commons_1.Logger.log(`Checking if ${exports.SKIP_TRKORR_TABL} exists`, true);
103
103
  const tablExists = yield this.readTable('TADIR', [{ fieldName: 'OBJ_NAME' }], `PGMID EQ 'R3TR' AND OBJECT EQ 'TABL' AND OBJ_NAME EQ '${exports.SKIP_TRKORR_TABL}'`);
104
104
  if (tablExists.length === 1) {
105
- logger_1.Logger.log(`TABLE ${exports.SKIP_TRKORR_TABL} exists`, true);
105
+ trm_commons_1.Logger.log(`TABLE ${exports.SKIP_TRKORR_TABL} exists`, true);
106
106
  const skipTrkorr = yield this.readTable(exports.SKIP_TRKORR_TABL, [{ fieldName: 'TRKORR' }]);
107
107
  this._ignoredTrkorr = skipTrkorr.map(o => o.trkorr);
108
108
  }
@@ -165,22 +165,22 @@ class SystemConnectorBase {
165
165
  return __awaiter(this, arguments, void 0, function* (includeSoruces = true, refresh, includeLocals) {
166
166
  if (!refresh) {
167
167
  if (includeSoruces && this._installedPackagesI) {
168
- logger_1.Logger.log(`Cached version of installed packages with sources`, true);
168
+ trm_commons_1.Logger.log(`Cached version of installed packages with sources`, true);
169
169
  return this._installedPackagesI;
170
170
  }
171
171
  else if (!includeSoruces && this._installedPackages) {
172
- logger_1.Logger.log(`Cached version of installed packages without sources`, true);
172
+ trm_commons_1.Logger.log(`Cached version of installed packages without sources`, true);
173
173
  return this._installedPackages;
174
174
  }
175
175
  }
176
176
  var trmPackages = [];
177
177
  var packageTransports = [];
178
- logger_1.Logger.log(`Ready to read installed packages`, true);
179
- logger_1.Logger.log(`Include sources: ${includeSoruces}`, true);
178
+ trm_commons_1.Logger.log(`Ready to read installed packages`, true);
179
+ trm_commons_1.Logger.log(`Include sources: ${includeSoruces}`, true);
180
180
  const aSourceTrkorr = includeSoruces ? (yield this.getSourceTrkorr(refresh)) : [];
181
- logger_1.Logger.log(`Source trkorr ${JSON.stringify(aSourceTrkorr)}`, true);
181
+ trm_commons_1.Logger.log(`Source trkorr ${JSON.stringify(aSourceTrkorr)}`, true);
182
182
  var aSkipTrkorr = yield this.getIgnoredTrkorr();
183
- logger_1.Logger.log(`Ignored trkorr ${JSON.stringify(aSkipTrkorr)}`, true);
183
+ trm_commons_1.Logger.log(`Ignored trkorr ${JSON.stringify(aSkipTrkorr)}`, true);
184
184
  var aMigrationTrkorr;
185
185
  var aActualTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}'`)).map(o => o.trkorr);
186
186
  aActualTrkorr = Array.from(new Set(aActualTrkorr));
@@ -203,10 +203,10 @@ class SystemConnectorBase {
203
203
  }));
204
204
  for (const sTrkorr of aTrkorr) {
205
205
  if (!aSourceTrkorr.includes(sTrkorr.trkorr)) {
206
- logger_1.Logger.log(`${sTrkorr.trkorr} not from source`, true);
206
+ trm_commons_1.Logger.log(`${sTrkorr.trkorr} not from source`, true);
207
207
  var aTrkorrStatusCheck;
208
208
  try {
209
- logger_1.Logger.log(`Checking ${sTrkorr.trkorr} TMS import result`, true);
209
+ trm_commons_1.Logger.log(`Checking ${sTrkorr.trkorr} TMS import result`, true);
210
210
  if (!sTrkorr.migration) {
211
211
  aTrkorrStatusCheck = (yield this.readTable('TMSBUFFER', [{ fieldName: 'TRKORR' }, { fieldName: 'MAXRC' }], `SYSNAM EQ '${this.getSysname()}' AND TRKORR EQ '${sTrkorr.trkorr}' AND IMPSING NE 'X'`));
212
212
  }
@@ -219,20 +219,20 @@ class SystemConnectorBase {
219
219
  aTrkorrStatusCheck = [];
220
220
  }
221
221
  if (aTrkorrStatusCheck.length === 0) {
222
- logger_1.Logger.log(`Adding ${sTrkorr.trkorr} to skipped filter`, true);
222
+ trm_commons_1.Logger.log(`Adding ${sTrkorr.trkorr} to skipped filter`, true);
223
223
  aSkipTrkorr.push(sTrkorr.trkorr);
224
224
  }
225
225
  }
226
226
  }
227
227
  aTrkorr = aTrkorr.filter(trkorr => !aSkipTrkorr.includes(trkorr.trkorr));
228
- logger_1.Logger.log(`Final transports ${JSON.stringify(aTrkorr)}`, true);
228
+ trm_commons_1.Logger.log(`Final transports ${JSON.stringify(aTrkorr)}`, true);
229
229
  const transports = aTrkorr.map(trkorr => new transport_1.Transport(trkorr.trkorr, null, trkorr.migration));
230
230
  for (const transport of transports) {
231
231
  const trmPackage = yield transport.getLinkedPackage();
232
232
  if (trmPackage) {
233
- logger_1.Logger.log(`Transport ${transport.trkorr}, found linked package`, true);
233
+ trm_commons_1.Logger.log(`Transport ${transport.trkorr}, found linked package`, true);
234
234
  if (trmPackage.registry.getRegistryType() === registry_1.RegistryType.LOCAL && !includeLocals) {
235
- logger_1.Logger.log(`Package is local, skipping`, true);
235
+ trm_commons_1.Logger.log(`Package is local, skipping`, true);
236
236
  continue;
237
237
  }
238
238
  var arrayIndex = packageTransports.findIndex(o => trmPackage_1.TrmPackage.compare(o.package, trmPackage));
@@ -246,7 +246,7 @@ class SystemConnectorBase {
246
246
  packageTransports[arrayIndex].transports.push(transport);
247
247
  }
248
248
  }
249
- logger_1.Logger.log(`Package Transports map: ${(0, logger_1.inspect)(packageTransports.map(o => {
249
+ trm_commons_1.Logger.log(`Package Transports map: ${(0, trm_commons_1.inspect)(packageTransports.map(o => {
250
250
  return {
251
251
  packageName: o.package.packageName,
252
252
  registry: o.package.registry.endpoint,
@@ -259,15 +259,15 @@ class SystemConnectorBase {
259
259
  trmPackages.push(yield latestTransport.getLinkedPackage());
260
260
  }
261
261
  }
262
- logger_1.Logger.log(`Packages found: ${(0, logger_1.inspect)(trmPackages, { breakLength: Infinity, compact: true })}`, true);
263
- logger_1.Logger.log(`Excluding trm-server (adding it manually)`, true);
262
+ trm_commons_1.Logger.log(`Packages found: ${(0, trm_commons_1.inspect)(trmPackages, { breakLength: Infinity, compact: true })}`, true);
263
+ trm_commons_1.Logger.log(`Excluding trm-server (adding it manually)`, true);
264
264
  try {
265
265
  const trmServerPackage = trmPackages.find(o => o.packageName === exports.TRM_SERVER_PACKAGE_NAME && o.compareRegistry(registry_1.RegistryProvider.getRegistry()));
266
266
  var generatedTrmServerPackage = yield this.getTrmServerPackage();
267
267
  if (trmServerPackage && trmServerPackage.manifest) {
268
- logger_1.Logger.log(`trm-server was found (it was imported via transport)`, true);
268
+ trm_commons_1.Logger.log(`trm-server was found (it was imported via transport)`, true);
269
269
  if (trmServerPackage.manifest.get().version === generatedTrmServerPackage.manifest.get().version) {
270
- logger_1.Logger.log(`trm-server imported is the one currenlty in use`, true);
270
+ trm_commons_1.Logger.log(`trm-server imported is the one currenlty in use`, true);
271
271
  generatedTrmServerPackage.manifest = trmServerPackage.manifest;
272
272
  }
273
273
  }
@@ -275,16 +275,16 @@ class SystemConnectorBase {
275
275
  trmPackages.push(generatedTrmServerPackage);
276
276
  }
277
277
  catch (e) {
278
- logger_1.Logger.warning(`${exports.TRM_SERVER_PACKAGE_NAME} is not installed`, true);
278
+ trm_commons_1.Logger.warning(`${exports.TRM_SERVER_PACKAGE_NAME} is not installed`, true);
279
279
  }
280
- logger_1.Logger.log(`Excluding trm-rest (adding it manually)`, true);
280
+ trm_commons_1.Logger.log(`Excluding trm-rest (adding it manually)`, true);
281
281
  try {
282
282
  const trmRestPackage = trmPackages.find(o => o.packageName === exports.TRM_REST_PACKAGE_NAME && o.compareRegistry(registry_1.RegistryProvider.getRegistry()));
283
283
  var generatedTrmRestPackage = yield this.getTrmRestPackage();
284
284
  if (trmRestPackage && trmRestPackage.manifest) {
285
- logger_1.Logger.log(`trm-rest was found (it was imported via transport)`, true);
285
+ trm_commons_1.Logger.log(`trm-rest was found (it was imported via transport)`, true);
286
286
  if (trmRestPackage.manifest.get().version === generatedTrmRestPackage.manifest.get().version) {
287
- logger_1.Logger.log(`trm-rest imported is the one currenlty in use`, true);
287
+ trm_commons_1.Logger.log(`trm-rest imported is the one currenlty in use`, true);
288
288
  generatedTrmRestPackage.manifest = trmRestPackage.manifest;
289
289
  }
290
290
  }
@@ -292,7 +292,7 @@ class SystemConnectorBase {
292
292
  trmPackages.push(generatedTrmRestPackage);
293
293
  }
294
294
  catch (e) {
295
- logger_1.Logger.warning(`${exports.TRM_SERVER_PACKAGE_NAME} is not installed`, true);
295
+ trm_commons_1.Logger.warning(`${exports.TRM_SERVER_PACKAGE_NAME} is not installed`, true);
296
296
  }
297
297
  if (includeSoruces) {
298
298
  this._installedPackagesI = trmPackages;
@@ -46,7 +46,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
46
46
  };
47
47
  Object.defineProperty(exports, "__esModule", { value: true });
48
48
  exports.Transport = exports.COMMENT_OBJ = void 0;
49
- const logger_1 = require("../logger");
50
49
  const commons_1 = require("../commons");
51
50
  const node_r3trans_1 = require("node-r3trans");
52
51
  const TrmTransportIdentifier_1 = require("./TrmTransportIdentifier");
@@ -55,8 +54,7 @@ const promises_1 = require("timers/promises");
55
54
  const fs = __importStar(require("fs"));
56
55
  const path_1 = __importDefault(require("path"));
57
56
  const cliProgress = __importStar(require("cli-progress"));
58
- const CliLogger_1 = require("../logger/CliLogger");
59
- const CliLogFileLogger_1 = require("../logger/CliLogFileLogger");
57
+ const trm_commons_1 = require("trm-commons");
60
58
  const systemConnector_1 = require("../systemConnector");
61
59
  exports.COMMENT_OBJ = 'ZTRM';
62
60
  class Transport {
@@ -204,10 +202,10 @@ class Transport {
204
202
  data: null
205
203
  };
206
204
  const filePaths = yield Transport._getFilePaths(this._fileNames);
207
- logger_1.Logger.loading(`Reading ${this.trkorr} binary files...`, true);
205
+ trm_commons_1.Logger.loading(`Reading ${this.trkorr} binary files...`, true);
208
206
  binaryTransport.header = yield systemConnector_1.SystemConnector.getBinaryFile(filePaths.header);
209
207
  binaryTransport.data = yield systemConnector_1.SystemConnector.getBinaryFile(filePaths.data);
210
- logger_1.Logger.success(`${this.trkorr} file read success.`, true);
208
+ trm_commons_1.Logger.success(`${this.trkorr} file read success.`, true);
211
209
  return {
212
210
  binaries: binaryTransport,
213
211
  filenames: this._fileNames
@@ -236,16 +234,16 @@ class Transport {
236
234
  });
237
235
  }
238
236
  });
239
- logger_1.Logger.loading(`Setting ${this.trkorr} documentation...`, true);
237
+ trm_commons_1.Logger.loading(`Setting ${this.trkorr} documentation...`, true);
240
238
  yield systemConnector_1.SystemConnector.setTransportDoc(this.trkorr, doc);
241
- logger_1.Logger.success(`${this.trkorr} documentation updated.`, true);
239
+ trm_commons_1.Logger.success(`${this.trkorr} documentation updated.`, true);
242
240
  return this;
243
241
  });
244
242
  }
245
243
  getDocumentation() {
246
244
  return __awaiter(this, void 0, void 0, function* () {
247
245
  if (!this._docs || this._docs.length === 0) {
248
- logger_1.Logger.loading(`Reading ${this.trkorr} documentation...`, true);
246
+ trm_commons_1.Logger.loading(`Reading ${this.trkorr} documentation...`, true);
249
247
  const fields = [{ fieldName: 'LANGU' }, { fieldName: 'DOKVERSION' }, { fieldName: 'LINE' }, { fieldName: 'DOKTEXT' }];
250
248
  var doktl;
251
249
  if (!this._migration) {
@@ -256,7 +254,7 @@ class Transport {
256
254
  }
257
255
  this._docs = Transport.doktlToDoc(doktl);
258
256
  this._docs = this._docs.sort((a, b) => b.version - a.version);
259
- logger_1.Logger.success(`Found ${this.trkorr} ${this._docs.length} documentation.`, true);
257
+ trm_commons_1.Logger.success(`Found ${this.trkorr} ${this._docs.length} documentation.`, true);
260
258
  }
261
259
  return this._docs;
262
260
  });
@@ -370,7 +368,7 @@ class Transport {
370
368
  release(lock, skipLog, tmpFolder, secondsTimeout) {
371
369
  return __awaiter(this, void 0, void 0, function* () {
372
370
  var rc;
373
- logger_1.Logger.loading('Releasing transport...', skipLog);
371
+ trm_commons_1.Logger.loading('Releasing transport...', skipLog);
374
372
  yield systemConnector_1.SystemConnector.releaseTrkorr(this.trkorr, lock, secondsTimeout);
375
373
  yield systemConnector_1.SystemConnector.dequeueTransport(this.trkorr);
376
374
  if (tmpFolder) {
@@ -382,16 +380,16 @@ class Transport {
382
380
  if (!skipLog && !tmpFolder) {
383
381
  switch (rc) {
384
382
  case 4:
385
- logger_1.Logger.warning(`${this.trkorr} release ended with warning.`);
383
+ trm_commons_1.Logger.warning(`${this.trkorr} release ended with warning.`);
386
384
  break;
387
385
  case 8:
388
- logger_1.Logger.error(`${this.trkorr} release ended with error.`);
386
+ trm_commons_1.Logger.error(`${this.trkorr} release ended with error.`);
389
387
  break;
390
388
  case 12:
391
- logger_1.Logger.error(`${this.trkorr} release was cancelled.`);
389
+ trm_commons_1.Logger.error(`${this.trkorr} release was cancelled.`);
392
390
  break;
393
391
  case 16:
394
- logger_1.Logger.error(`${this.trkorr} release was cancelled.`);
392
+ trm_commons_1.Logger.error(`${this.trkorr} release was cancelled.`);
395
393
  break;
396
394
  }
397
395
  }
@@ -403,10 +401,10 @@ class Transport {
403
401
  const localPath = path_1.default.join(tmpFolder, this._fileNames.releaseLog);
404
402
  const systemR3transVersion = yield systemConnector_1.SystemConnector.getR3transVersion();
405
403
  const systemR3transUnicode = yield systemConnector_1.SystemConnector.getR3transUnicode();
406
- logger_1.Logger.log(`System R3trans: ${systemR3transVersion}`, true);
407
- logger_1.Logger.log(`System R3trans unicode: ${systemR3transUnicode}`, true);
408
- if (logger_1.Logger.logger instanceof CliLogger_1.CliLogger || logger_1.Logger.logger instanceof CliLogFileLogger_1.CliLogFileLogger) {
409
- logger_1.Logger.logger.forceStop();
404
+ trm_commons_1.Logger.log(`System R3trans: ${systemR3transVersion}`, true);
405
+ trm_commons_1.Logger.log(`System R3trans unicode: ${systemR3transUnicode}`, true);
406
+ if (trm_commons_1.Logger.logger instanceof trm_commons_1.CliLogger || trm_commons_1.Logger.logger instanceof trm_commons_1.CliLogFileLogger) {
407
+ trm_commons_1.Logger.logger.forceStop();
410
408
  }
411
409
  const multibar = new cliProgress.MultiBar({
412
410
  clearOnComplete: true,
@@ -533,11 +531,11 @@ class Transport {
533
531
  error = new Error(`Error occurred during transport ${this.trkorr} release.`);
534
532
  }
535
533
  if (whileResult === "SUCCESS") {
536
- logger_1.Logger.success(`Transport ${this.trkorr} released with success.`);
534
+ trm_commons_1.Logger.success(`Transport ${this.trkorr} released with success.`);
537
535
  rc = 0;
538
536
  }
539
537
  if (whileResult === "WARNING") {
540
- logger_1.Logger.warning(`Transport ${this.trkorr} released with warning.`);
538
+ trm_commons_1.Logger.warning(`Transport ${this.trkorr} released with warning.`);
541
539
  rc = 4;
542
540
  }
543
541
  }
@@ -556,7 +554,7 @@ class Transport {
556
554
  _isInTmsQueue(skipLog_1) {
557
555
  return __awaiter(this, arguments, void 0, function* (skipLog, checkImpSing = false, secondsTimeout) {
558
556
  const timeoutDate = new Date((new Date()).getTime() + (secondsTimeout * 1000));
559
- logger_1.Logger.log(`TMS check for transport ${this.trkorr}, timeout date set to ${timeoutDate}`, true);
557
+ trm_commons_1.Logger.log(`TMS check for transport ${this.trkorr}, timeout date set to ${timeoutDate}`, true);
560
558
  var inQueue = false;
561
559
  var rc = 12;
562
560
  if (this._trTarget) {
@@ -564,8 +562,8 @@ class Transport {
564
562
  var inQueueAttempts = 0;
565
563
  while (!inQueue && (new Date()).getTime() < timeoutDate.getTime()) {
566
564
  inQueueAttempts++;
567
- logger_1.Logger.log(`Attempt ${inQueueAttempts}`, true);
568
- logger_1.Logger.loading(`Reading transport queue...`, skipLog);
565
+ trm_commons_1.Logger.log(`Attempt ${inQueueAttempts}`, true);
566
+ trm_commons_1.Logger.loading(`Reading transport queue...`, skipLog);
569
567
  yield (0, promises_1.setTimeout)(6000);
570
568
  var tmsQueue = yield systemConnector_1.SystemConnector.readTmsQueue(this._trTarget);
571
569
  tmsQueue = tmsQueue.filter(o => o.trkorr === this.trkorr);
@@ -589,11 +587,11 @@ class Transport {
589
587
  throw new Error(`Transport request not found in queue, timed out after ${inQueueAttempts + 1} attempts`);
590
588
  }
591
589
  else {
592
- logger_1.Logger.success(`Transport ${this.trkorr} ${sLog}.`, skipLog);
590
+ trm_commons_1.Logger.success(`Transport ${this.trkorr} ${sLog}.`, skipLog);
593
591
  }
594
592
  }
595
593
  else {
596
- logger_1.Logger.error(`No target specified, unable to check queue!!`, true);
594
+ trm_commons_1.Logger.error(`No target specified, unable to check queue!!`, true);
597
595
  }
598
596
  return rc;
599
597
  });
@@ -625,11 +623,11 @@ class Transport {
625
623
  }
626
624
  static _getFilePaths(fileNames) {
627
625
  return __awaiter(this, void 0, void 0, function* () {
628
- logger_1.Logger.loading(`Reading system data...`, true);
626
+ trm_commons_1.Logger.loading(`Reading system data...`, true);
629
627
  const dirTrans = yield systemConnector_1.SystemConnector.getDirTrans();
630
628
  const fileSys = yield systemConnector_1.SystemConnector.getFileSystem();
631
629
  const pathSeparator = (0, commons_1.getFileSysSeparator)(fileSys.filesys);
632
- logger_1.Logger.success(`Data read success.`, true);
630
+ trm_commons_1.Logger.success(`Data read success.`, true);
633
631
  return {
634
632
  header: `${dirTrans}${pathSeparator}cofiles${pathSeparator}${fileNames.header}`,
635
633
  data: `${dirTrans}${pathSeparator}data${pathSeparator}${fileNames.data}`,
@@ -645,25 +643,25 @@ class Transport {
645
643
  }
646
644
  static createToc(data) {
647
645
  return __awaiter(this, void 0, void 0, function* () {
648
- logger_1.Logger.loading(`Creating transport request (TOC)...`, true);
646
+ trm_commons_1.Logger.loading(`Creating transport request (TOC)...`, true);
649
647
  const trkorr = yield systemConnector_1.SystemConnector.createTocTransport(data.text, data.target);
650
- logger_1.Logger.success(`Transport request ${trkorr} generated successfully.`, true);
648
+ trm_commons_1.Logger.success(`Transport request ${trkorr} generated successfully.`, true);
651
649
  return new Transport(trkorr, data.target).setTrmIdentifier(data.trmIdentifier);
652
650
  });
653
651
  }
654
652
  static createLang(data) {
655
653
  return __awaiter(this, void 0, void 0, function* () {
656
- logger_1.Logger.loading(`Creating transport request (LANG)...`, true);
654
+ trm_commons_1.Logger.loading(`Creating transport request (LANG)...`, true);
657
655
  const trkorr = yield systemConnector_1.SystemConnector.createWbTransport(data.text, data.target);
658
- logger_1.Logger.success(`Transport request ${trkorr} generated successfully.`, true);
656
+ trm_commons_1.Logger.success(`Transport request ${trkorr} generated successfully.`, true);
659
657
  return new Transport(trkorr, data.target).setTrmIdentifier(TrmTransportIdentifier_1.TrmTransportIdentifier.LANG);
660
658
  });
661
659
  }
662
660
  static createWb(data) {
663
661
  return __awaiter(this, void 0, void 0, function* () {
664
- logger_1.Logger.loading(`Creating transport request (WB)...`, true);
662
+ trm_commons_1.Logger.loading(`Creating transport request (WB)...`, true);
665
663
  const trkorr = yield systemConnector_1.SystemConnector.createWbTransport(data.text, data.target);
666
- logger_1.Logger.success(`Transport request ${trkorr} generated successfully.`, true);
664
+ trm_commons_1.Logger.success(`Transport request ${trkorr} generated successfully.`, true);
667
665
  return new Transport(trkorr, null);
668
666
  });
669
667
  }
@@ -685,19 +683,19 @@ class Transport {
685
683
  }
686
684
  static upload(data) {
687
685
  return __awaiter(this, void 0, void 0, function* () {
688
- logger_1.Logger.loading(`Reading binary content...`, true);
686
+ trm_commons_1.Logger.loading(`Reading binary content...`, true);
689
687
  const fileContent = yield Transport.getContent(data.binary.data, data.r3transOption);
690
688
  const trkorr = fileContent.trkorr;
691
- logger_1.Logger.success(`Transport ${trkorr} read success.`, true);
689
+ trm_commons_1.Logger.success(`Transport ${trkorr} read success.`, true);
692
690
  const fileNames = Transport._getFileNames(trkorr, systemConnector_1.SystemConnector.getDest());
693
691
  const filePaths = yield Transport._getFilePaths(fileNames);
694
- logger_1.Logger.loading(`Uploading ${trkorr} header to "${filePaths.header}"...`, true);
692
+ trm_commons_1.Logger.loading(`Uploading ${trkorr} header to "${filePaths.header}"...`, true);
695
693
  yield systemConnector_1.SystemConnector.writeBinaryFile(filePaths.header, data.binary.header);
696
- logger_1.Logger.success(`Header uploaded successfully.`, true);
697
- logger_1.Logger.loading(`Uploading ${trkorr} data to "${filePaths.data}"...`, true);
694
+ trm_commons_1.Logger.success(`Header uploaded successfully.`, true);
695
+ trm_commons_1.Logger.loading(`Uploading ${trkorr} data to "${filePaths.data}"...`, true);
698
696
  yield systemConnector_1.SystemConnector.writeBinaryFile(filePaths.data, data.binary.data);
699
- logger_1.Logger.success(`Data uploaded successfully.`, true);
700
- logger_1.Logger.success(`Transport request ${trkorr} uploaded successfully.`, true);
697
+ trm_commons_1.Logger.success(`Data uploaded successfully.`, true);
698
+ trm_commons_1.Logger.success(`Transport request ${trkorr} uploaded successfully.`, true);
701
699
  return new Transport(trkorr, data.trTarget);
702
700
  });
703
701
  }
@@ -719,7 +717,7 @@ class Transport {
719
717
  transports.push(oTransport);
720
718
  }
721
719
  catch (e) {
722
- logger_1.Logger.error(`Transport instance skip for ${trkorr}: ${e.toString()}`, true);
720
+ trm_commons_1.Logger.error(`Transport instance skip for ${trkorr}: ${e.toString()}`, true);
723
721
  }
724
722
  }
725
723
  return transports;
@@ -746,26 +744,26 @@ class Transport {
746
744
  if (!this._trTarget) {
747
745
  throw new Error('Missing transport target.');
748
746
  }
749
- logger_1.Logger.log(`Starting transport ${this.trkorr} import, timeout set to ${timeout}`, true);
750
- logger_1.Logger.loading(`Forwarding transport ${this.trkorr}`, true);
747
+ trm_commons_1.Logger.log(`Starting transport ${this.trkorr} import, timeout set to ${timeout}`, true);
748
+ trm_commons_1.Logger.loading(`Forwarding transport ${this.trkorr}`, true);
751
749
  yield systemConnector_1.SystemConnector.forwardTransport(this.trkorr, this._trTarget, this._trTarget, true);
752
- logger_1.Logger.loading(`Importing transport ${this.trkorr}`, true);
750
+ trm_commons_1.Logger.loading(`Importing transport ${this.trkorr}`, true);
753
751
  yield systemConnector_1.SystemConnector.importTransport(this.trkorr, this._trTarget);
754
- logger_1.Logger.log(`Starting transport ${this.trkorr} TMS queue status check`, true);
752
+ trm_commons_1.Logger.log(`Starting transport ${this.trkorr} TMS queue status check`, true);
755
753
  const rc = yield this._isInTmsQueue(false, true, timeout);
756
- logger_1.Logger.log(`Transport ${this.trkorr} import ended: return code ${rc}`, true);
754
+ trm_commons_1.Logger.log(`Transport ${this.trkorr} import ended: return code ${rc}`, true);
757
755
  switch (rc) {
758
756
  case 4:
759
- logger_1.Logger.warning(`${this.trkorr} import ended with warning.`);
757
+ trm_commons_1.Logger.warning(`${this.trkorr} import ended with warning.`);
760
758
  break;
761
759
  case 8:
762
- logger_1.Logger.error(`${this.trkorr} import ended with error.`);
760
+ trm_commons_1.Logger.error(`${this.trkorr} import ended with error.`);
763
761
  break;
764
762
  case 12:
765
- logger_1.Logger.error(`${this.trkorr} import was cancelled.`);
763
+ trm_commons_1.Logger.error(`${this.trkorr} import was cancelled.`);
766
764
  break;
767
765
  case 16:
768
- logger_1.Logger.error(`${this.trkorr} import was cancelled.`);
766
+ trm_commons_1.Logger.error(`${this.trkorr} import was cancelled.`);
769
767
  break;
770
768
  }
771
769
  });