trm-core 6.5.0 → 6.6.0

package/README.md

@@ -22,3 +22,5 @@ Make sure to open an issue first.
 Contributions will be merged upon approval.
 
 [Click here](https://docs.trmregistry.com/#/CONTRIBUTING) for the full list of TRM contribution guidelines.
+
+[<img src="https://trmregistry.com/public/contributors?image=true">](https://docs.trmregistry.com/#/?id=contributors)

package/changelog.txt

@@ -8,6 +8,17 @@ Legend
 + : added
 - : removed
 
+2025-05-08 v6.6.0
+-------------------
+* no integrity with trm-server/trm-rest dependency allowed
+! REST Client and RFC Client error generic -> specific
+! REST Client error xml body parsing with title as message
+! trm-server ^2.2.2
+
+2025-05-08 v6.5.1
+-------------------
+! rest error handling
+
 2025-05-05 v6.5.0
 -------------------
 ! trm-commons ^1.0.0

package/dist/actions/findDependencies/index.d.ts

@@ -29,6 +29,7 @@ export type SapEntriesDependency = {
 export type TrmDependency = {
     devclass: DEVCLASS;
     package: TrmPackage;
+    ignoreNoIntegrity: boolean;
     integrity?: string;
     sapEntries: SapEntriesDependency[];
 };

package/dist/actions/findDependencies/setTrmDependencies.js

@@ -98,6 +98,7 @@ const _getTadirDependencies = (tadirDependencies) => __awaiter(void 0, void 0, v
         var arrayIndex1;
         var arrayIndex2;
         var append;
+        var ignoreNoIntegrity;
         if (trmServerPackage.package && trmServerPackage.package.getDevclass() === tadir.devclass) {
             trm_commons_1.Logger.log(`Dependency with TRM SERVER package`, true);
             devclass = trmServerPackage.package.getDevclass();
@@ -110,6 +111,7 @@ const _getTadirDependencies = (tadirDependencies) => __awaiter(void 0, void 0, v
                 trmServerPackage.integrity = integrity;
             }
             append = true;
+            ignoreNoIntegrity = true;
         }
         else if (trmRestPackage.package && trmRestPackage.package.getDevclass() === tadir.devclass) {
             trm_commons_1.Logger.log(`Dependency with TRM REST package`, true);
@@ -123,8 +125,10 @@ const _getTadirDependencies = (tadirDependencies) => __awaiter(void 0, void 0, v
                 trmRestPackage.integrity = integrity;
             }
             append = true;
+            ignoreNoIntegrity = true;
         }
         else {
+            ignoreNoIntegrity = false;
             trm_commons_1.Logger.log(`Searching transports for object ${tadir.pgmid} ${tadir.object} ${tadir.objName}`, true);
             const allTransports = yield transport_1.Transport.getTransportsFromObject(tadir, transportsObjectCache);
             trm_commons_1.Logger.log(`Found ${allTransports.length} transports for object ${tadir.pgmid} ${tadir.object} ${tadir.objName}`, true);
@@ -213,6 +217,7 @@ const _getTadirDependencies = (tadirDependencies) => __awaiter(void 0, void 0, v
                     devclass,
                     package: trmPackage,
                     integrity,
+                    ignoreNoIntegrity,
                     sapEntries: []
                 });
                 arrayIndex1--;

package/dist/actions/publish/findDependencies.js

@@ -73,9 +73,16 @@ exports.findDependencies = {
                     const dependencyVersionRange = `^${dependencyManifest.version}`;
                     const dependencyRegistry = o.package.registry.getRegistryType() === registry_1.RegistryType.PUBLIC ? undefined : o.package.registry.endpoint;
                     if (!o.integrity) {
-                        throw new Error(`  (${i + 1}/${result.trmPackageDependencies.withTrmPackage.length}) ${dependencyManifest.name}: Integrity not found!`);
+                        if (o.ignoreNoIntegrity) {
+                            trm_commons_1.Logger.warning(`  (${i + 1}/${result.trmPackageDependencies.withTrmPackage.length}) ${dependencyManifest.name}: ${dependencyVersionRange} (Integrity not found!)`);
+                        }
+                        else {
+                            throw new Error(`  (${i + 1}/${result.trmPackageDependencies.withTrmPackage.length}) ${dependencyManifest.name}: Integrity not found!`);
+                        }
+                    }
+                    else {
+                        trm_commons_1.Logger.info(`  (${i + 1}/${result.trmPackageDependencies.withTrmPackage.length}) ${dependencyManifest.name} ${dependencyVersionRange}`);
                     }
-                    trm_commons_1.Logger.info(`  (${i + 1}/${result.trmPackageDependencies.withTrmPackage.length}) ${dependencyManifest.name} ${dependencyVersionRange}`);
                     context.runtime.trmPackage.manifest.dependencies.push({
                         name: dependencyManifest.name,
                         version: dependencyVersionRange,

package/dist/client/RESTClient.js

@@ -69,11 +69,17 @@ class RESTClient {
     open() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._connected) {
-                const response = yield this._axiosInstance.get('/', {
-                    timeout: 5000
-                });
+                var response;
+                try {
+                    response = yield this._axiosInstance.get('/', {
+                        timeout: 5000
+                    });
+                }
+                catch (e) {
+                    throw new _1.RESTClientError("ZNO_CONN", null, e, e.message);
+                }
                 if (response.status !== 200) {
-                    throw new Error(`Couldn't reach ${this.endpoint}!`);
+                    throw new _1.RESTClientError("ZNO_CONN", null, null, `Couldn't reach ${this.endpoint}!`);
                 }
                 else {
                     this._connected = true;
@@ -107,7 +113,7 @@ class RESTClient {
                         }
                         catch (k) {
                             messageError = k;
-                            message = `Couldn't read error message ${axiosError.response.data.message.abapMsgClass} ${axiosError.response.data.message.abapMsgNumber} ${axiosError.response.data.message.abapMsgV1} ${axiosError.response.data.message.abapMsgV2} ${axiosError.response.data.message.abapMsgV3} ${axiosError.response.data.message.abapMsgV4}`;
+                            message = `Couldn't read error message ${axiosError.response.data.message.msgid} ${axiosError.response.data.message.msgno} ${axiosError.response.data.message.msgv1} ${axiosError.response.data.message.msgv2} ${axiosError.response.data.message.msgv3} ${axiosError.response.data.message.msgv4}`;
                         }
                         var rfcClientError = new _1.RESTClientError(error.message, sapMessage, axiosError, message);
                         if (messageError) {
@@ -137,14 +143,23 @@ class RESTClient {
             const aT100 = yield this.readTable('T100', [{ fieldName: 'SPRSL' }, { fieldName: 'ARBGB' }, { fieldName: 'MSGNR' }, { fieldName: 'TEXT' }], `SPRSL EQ '${this._cLangu}' AND ARBGB EQ '${data.class}' AND MSGNR EQ '${msgnr}'`);
             if (aT100.length === 1 && aT100[0].text) {
                 var msg = aT100[0].text;
-                msg = msg.replace("&1", data.v1 || '');
-                msg = msg.replace("&2", data.v2 || '');
-                msg = msg.replace("&3", data.v3 || '');
-                msg = msg.replace("&4", data.v4 || '');
+                var counter = 1;
+                do {
+                    if (msg.includes(`&${counter}`)) {
+                        msg = msg.replace(new RegExp(`&${counter}`, 'gmi'), data[`v${counter}`] || '');
+                        msg = msg.replace(new RegExp(`&${counter}&`, 'gmi'), data[`v${counter}`] || '');
+                    }
+                    else {
+                        msg = msg.replace("&", data[`v${counter}`] || '');
+                    }
+                    counter++;
+                } while (counter <= 4);
+                msg = msg.replace(new RegExp(`&\\d*`, 'gmi'), '');
+                msg = msg.replace(new RegExp(`&`, 'gmi'), '');
                 return msg.trim();
             }
             else {
-                throw new Error(`Message ${msgnr}, class ${data.class}, lang ${this._cLangu} not found.`);
+                throw new _1.RESTClientError("ZMSG_NOT_FOUND", null, null, `Message ${msgnr}, class ${data.class}, lang ${this._cLangu} not found.`);
             }
         });
     }
@@ -600,7 +615,7 @@ class RESTClient {
                 };
             }
             catch (e) {
-                throw new Error(`Can't parse api data.`);
+                throw new _1.RESTClientError("ZPARSE_API_DATA", null, null, `Can't parse api data.`);
             }
         });
     }

package/dist/client/RFCClient.js

@@ -73,7 +73,7 @@ class RFCClient {
                 const libPath = path_1.default.join(globalPath, nodeRfcLib);
                 trm_commons_1.Logger.log(`Node RFC lib path: ${libPath}`, true);
                 if (!(0, fs_1.existsSync)(libPath)) {
-                    throw new Error(`${nodeRfcLib} not found. Run command "npm install ${nodeRfcLib} -g" to continue.`);
+                    throw new _1.RFCClientError("ZRFC_LIB_NOT_FOUND", null, null, `${nodeRfcLib} not found. Run command "npm install ${nodeRfcLib} -g" to continue.`);
                 }
                 this._rfcClient = new (yield Promise.resolve(`${libPath}`).then(s => __importStar(require(s)))).Client(this._rfcClientArgs);
             }
@@ -82,9 +82,14 @@ class RFCClient {
     }
     open() {
         return __awaiter(this, void 0, void 0, function* () {
-            trm_commons_1.Logger.loading(`Opening RFC connection`, true);
-            yield (yield this.getRfcClient()).open();
-            trm_commons_1.Logger.success(`RFC open`, true);
+            try {
+                trm_commons_1.Logger.loading(`Opening RFC connection`, true);
+                yield (yield this.getRfcClient()).open();
+                trm_commons_1.Logger.success(`RFC open`, true);
+            }
+            catch (e) {
+                throw new _1.RFCClientError("ZNO_CONN", null, e, e.message);
+            }
         });
     }
     checkConnection() {
@@ -194,7 +199,7 @@ class RFCClient {
                 return msg.trim();
             }
             else {
-                throw new Error(`Message ${msgnr}, class ${data.class}, lang ${this._cLangu} not found.`);
+                throw new _1.RFCClientError("ZMSG_NOT_FOUND", null, null, `Message ${msgnr}, class ${data.class}, lang ${this._cLangu} not found.`);
             }
         });
     }

package/dist/commons/getAxiosInstance.js

@@ -8,6 +8,7 @@ exports.getAxiosInstance = getAxiosInstance;
 const axios_1 = __importDefault(require("axios"));
 const util_1 = require("util");
 const trm_commons_1 = require("trm-commons");
+const node_html_parser_1 = require("node-html-parser");
 const uuid_1 = require("uuid");
 exports.AXIOS_SESSION_HEADER = 'X-TRM-SESSION-ID';
 exports.AXIOS_INTERNAL_HEADER = 'X-TRM-REQUEST-ID';
@@ -68,7 +69,17 @@ function getAxiosInstance(config, sCtx) {
                     sError = error.response.data.message;
                 }
                 else if (typeof (error.response.data) === 'string') {
-                    sError = error.response.data;
+                    if (error.response.data[0] === '<') {
+                        try {
+                            sError = (0, node_html_parser_1.parse)(error.response.data).querySelector('title').innerText;
+                        }
+                        catch (e) {
+                            sError = error.response.data;
+                        }
+                    }
+                    else {
+                        sError = error.response.data;
+                    }
                 }
                 else {
                     sError = error.response.statusText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-core",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,7 @@
   },
   "license": "MIT",
   "trmDependencies": {
-    "trm-server": "^2.2.0"
+    "trm-server": "^2.2.2"
   },
   "dependencies": {
     "@esm2cjs/normalize-url": "^8.0.0",
@@ -51,6 +51,7 @@
     "get-root-path": "^3.0.1",
     "get-stack-trace": "^3.1.1",
     "lodash": "^4.17.21",
+    "node-html-parser": "^7.0.1",
     "node-r3trans": "^1.5.0",
     "object-keys-normalizer": "^1.0.1",
     "opener": "^1.5.2",