trm-client 4.4.1 → 4.6.0

package/README.md

@@ -56,3 +56,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,20 @@ Legend
 + : added
 - : removed
 
+2025-05-08 v4.6.0
+-------------------
+
+! trm-core ^6.8.0
+* saprouter in alias
+
+2025-05-08 v4.5.0
+-------------------
+
+! trm-core ^6.7.0
+! error handling
+* alias command/saprouter alias save
+* fix connection validators
+
 2025-04-28 v4.4.1
 -------------------
 

package/dist/commands/alias.js

@@ -27,6 +27,7 @@ const _create = () => __awaiter(void 0, void 0, void 0, function* () {
     });
 });
 const _view = (alias) => {
+    const client = alias.login.client;
     const lang = alias.login.lang;
     const user = alias.login.user;
     const hasPassword = alias.login.passwd ? true : false;
@@ -83,6 +84,12 @@ const _view = (alias) => {
     else {
         trm_commons_1.Logger.warning(`Logon language: Unknown`);
     }
+    if (client) {
+        trm_commons_1.Logger.info(`Logon client: ${client}`);
+    }
+    else {
+        trm_commons_1.Logger.warning(`Logon client: Unknown`);
+    }
     if (user) {
         trm_commons_1.Logger.info(`Logon user: ${user}`);
     }
@@ -90,7 +97,7 @@ const _view = (alias) => {
         trm_commons_1.Logger.warning(`Logon user: Unknown`);
     }
     if (hasPassword) {
-        trm_commons_1.Logger.info(`Logon password: Saved`);
+        trm_commons_1.Logger.info(`Logon password: SAVED IN PLAIN TEXT`);
     }
     else {
         trm_commons_1.Logger.warning(`Logon password: Unknown`);
@@ -138,7 +145,8 @@ const _edit = (alias) => __awaiter(void 0, void 0, void 0, function* () {
             }, {
                 lang: connectionArgs.lang,
                 passwd: connectionArgs.passwd,
-                user: connectionArgs.user
+                user: connectionArgs.user,
+                client: connectionArgs.client
             });
         }
         yield updatedAlias.getConnection().connect();
@@ -174,7 +182,8 @@ const _edit = (alias) => __awaiter(void 0, void 0, void 0, function* () {
                 }, {
                     lang: alias.login.lang,
                     passwd: alias.login.passwd,
-                    user: alias.login.user
+                    user: alias.login.user,
+                    client: alias.login.client
                 });
             }
         }
@@ -188,35 +197,38 @@ const _delete = (alias) => __awaiter(void 0, void 0, void 0, function* () {
 function alias(commandArgs) {
     return __awaiter(this, void 0, void 0, function* () {
         const aAlias = systemAlias_1.SystemAlias.getAll();
-        var aliasPick;
-        if (commandArgs.systemAlias) {
-            if (!aAlias.find(o => o.alias === commandArgs.systemAlias)) {
-                trm_commons_1.Logger.warning(`Alias "${commandArgs.systemAlias}" not found.`);
+        var aliasPick = '';
+        var inq1Choices = [];
+        if (commandArgs.alias) {
+            if (!aAlias.find(o => o.alias === commandArgs.alias)) {
+                trm_commons_1.Logger.warning(`Alias "${commandArgs.alias}" not found.`);
+                inq1Choices.push({
+                    name: `Create alias`,
+                    value: `create`
+                });
             }
             else {
-                aliasPick = commandArgs.systemAlias;
+                aliasPick = commandArgs.alias;
             }
         }
+        inq1Choices = inq1Choices.concat([{
+                name: aliasPick ? `View "${aliasPick}"` : `View alias`,
+                value: `pick_view`
+            }, {
+                name: aliasPick ? `Check "${aliasPick}" connection` : `Check alias connection`,
+                value: `pick_check`
+            }, {
+                name: aliasPick ? `Edit "${aliasPick}"` : `Edit alias`,
+                value: `pick_edit`
+            }, {
+                name: aliasPick ? `Delete "${aliasPick}"` : `Delete alias`,
+                value: `pick_delete`
+            }]);
         const inq1 = yield trm_commons_1.Inquirer.prompt({
             name: `action`,
             message: `Action`,
             type: `list`,
-            choices: [{
-                    name: `Create alias`,
-                    value: `create`
-                }, {
-                    name: `View alias`,
-                    value: `pick_view`
-                }, {
-                    name: `Check alias connection`,
-                    value: `pick_check`
-                }, {
-                    name: `Edit alias`,
-                    value: `pick_edit`
-                }, {
-                    name: `Delete alias`,
-                    value: `pick_delete`
-                }]
+            choices: inq1Choices
         });
         if (inq1.action.startsWith(`pick_`) && !aliasPick) {
             const inq2 = yield trm_commons_1.Inquirer.prompt({

package/dist/commands/arguments/AliasArguments.d.ts

@@ -1,3 +1,3 @@
 export type AliasArguments = {
-    systemAlias: string;
+    alias?: string;
 };

package/dist/commands/createAlias.js

@@ -20,6 +20,7 @@ function createAlias(commandArgs) {
             noSystemAlias: true,
             force: true
         }, false);
+        trm_commons_1.Logger.loading(`Connecting to "${commandArgs.alias}"...`);
         var alias;
         if (connectionArgs.type === utils_1.SystemConnectorType.RFC) {
             alias = systemAlias_1.SystemAlias.create(commandArgs.alias, connectionArgs.type, {
@@ -41,7 +42,8 @@ function createAlias(commandArgs) {
             }, {
                 lang: connectionArgs.lang,
                 passwd: connectionArgs.passwd,
-                user: connectionArgs.user
+                user: connectionArgs.user,
+                client: connectionArgs.client
             });
         }
         if (alias) {

package/dist/commands/prompts/connect.js

@@ -174,7 +174,7 @@ function connect(commandArgs, createAliasIfNotExist = true, addNoConnection) {
                     type: `input`,
                     name: `forwardRfcDest`,
                     message: `Forward RFC Destination`,
-                    default: commandArgs.forwardRfcDest,
+                    default: commandArgs.forwardRfcDest || 'NONE',
                     when: (hash) => {
                         return hash.type === 'REST' && (commandArgs.forwardRfcDest || force);
                     }
@@ -194,6 +194,14 @@ function connect(commandArgs, createAliasIfNotExist = true, addNoConnection) {
                     default: commandArgs.dest,
                     when: (hash) => {
                         return hash.type === 'RFC' && ((commandArgs.dest ? false : true) || force);
+                    },
+                    validate: (val) => {
+                        if (val && /^\w{3}$/.test(val)) {
+                            return true;
+                        }
+                        else {
+                            return `Invalid input: expected length 3, only letters allowed`;
+                        }
                     }
                 }, {
                     type: `input`,
@@ -202,6 +210,14 @@ function connect(commandArgs, createAliasIfNotExist = true, addNoConnection) {
                     default: commandArgs.sysnr,
                     when: (hash) => {
                         return hash.type === 'RFC' && ((commandArgs.sysnr ? false : true) || force);
+                    },
+                    validate: (val) => {
+                        if (val && /^\d{2}$/.test(val)) {
+                            return true;
+                        }
+                        else {
+                            return `Invalid input: expected length 2, only numbers allowed`;
+                        }
                     }
                 }, {
                     type: `input`,
@@ -217,7 +233,15 @@ function connect(commandArgs, createAliasIfNotExist = true, addNoConnection) {
                     message: `Logon Client`,
                     default: commandArgs.client,
                     when: (hash) => {
-                        return (hash.type === 'RFC' || inputType === 'logon') && ((commandArgs.client ? false : true) || force);
+                        return (commandArgs.client ? false : true) || force;
+                    },
+                    validate: (val) => {
+                        if (val && /^\d{3}$/.test(val)) {
+                            return true;
+                        }
+                        else {
+                            return `Invalid input: expected length 3, only numbers allowed`;
+                        }
                     }
                 }, {
                     type: `input`,
@@ -281,6 +305,7 @@ function connect(commandArgs, createAliasIfNotExist = true, addNoConnection) {
         else if (result.type === utils_1.SystemConnectorType.REST) {
             result.endpoint = result.endpoint || commandArgs.endpoint;
             result.forwardRfcDest = result.forwardRfcDest || commandArgs.forwardRfcDest;
+            result.client = result.client || commandArgs.client;
             if (result.forwardRfcDest) {
                 result.forwardRfcDest = result.forwardRfcDest.toUpperCase();
             }
@@ -295,7 +320,8 @@ function connect(commandArgs, createAliasIfNotExist = true, addNoConnection) {
                 login: {
                     user: result.user,
                     passwd: result.passwd,
-                    lang: result.lang
+                    lang: result.lang,
+                    client: result.client
                 }
             });
         }

package/dist/index.js

@@ -11,15 +11,12 @@ program
     .version((0, utils_1.getClientVersion)(), `-cv, --clientVersion`, `Client version.`);
 const createAlias = program.command(`createAlias <alias>`)
     .description(`Create a new system alias.`);
-(0, utils_1.registerCommand)(createAlias, {
-    noSystemAlias: true,
-});
+(0, utils_1.registerCommand)(createAlias);
 const deleteAlias = program.command(`deleteAlias <alias>`)
     .description(`Delete a system alias.`);
 (0, utils_1.registerCommand)(deleteAlias);
-const manageAliases = program.command(`alias`)
-    .description(`List and manage aliases.`)
-    .option(`-a, --systemAlias <systemAlias>`, `System Alias.`);
+const manageAliases = program.command(`alias [alias]`)
+    .description(`List and manage aliases.`);
 (0, utils_1.registerCommand)(manageAliases);
 const addRegistry = program.command(`addRegistry <registryName>`)
     .description(`Add a new registry.`)

package/dist/systemAlias/SystemAlias.js

@@ -71,12 +71,16 @@ class SystemAlias {
                     passwd: o.login.passwd,
                     lang: o.login.lang
                 };
+                if (o.connection.saprouter) {
+                    oContent[o.alias].saprouter = o.connection.saprouter;
+                }
             }
             else if (o.type === utils_1.SystemConnectorType.REST) {
                 oContent[o.alias] = {
                     type: o.type,
                     endpoint: o.connection.endpoint,
                     rfcdest: o.connection.rfcdest || 'NONE',
+                    client: o.login.client,
                     user: o.login.user,
                     passwd: o.login.passwd,
                     lang: o.login.lang
@@ -127,7 +131,8 @@ class SystemAlias {
                     login: {
                         user: oIni[sAlias].user,
                         passwd: oIni[sAlias].passwd,
-                        lang: oIni[sAlias].lang
+                        lang: oIni[sAlias].lang,
+                        client: oIni[sAlias].client
                     }
                 });
             }

package/dist/utils/NoConnection.d.ts

@@ -72,4 +72,5 @@ export declare class NoConnection implements ISystemConnector {
     getAbapgitSource: () => Promise<any>;
     executePostActivity: () => Promise<any>;
     readClassDescriptions: () => Promise<any>;
+    regenProg: () => Promise<any>;
 }

package/dist/utils/NoConnection.js

@@ -97,6 +97,7 @@ class NoConnection {
         this.getAbapgitSource = () => __awaiter(this, void 0, void 0, function* () { return this._throw(); });
         this.executePostActivity = () => __awaiter(this, void 0, void 0, function* () { return this._throw(); });
         this.readClassDescriptions = () => __awaiter(this, void 0, void 0, function* () { return this._throw(); });
+        this.regenProg = () => __awaiter(this, void 0, void 0, function* () { return this._throw(); });
     }
     _throw() {
         throw new Error(`No connection to SAP server.`);

package/dist/utils/executeCommand.js

@@ -88,21 +88,6 @@ function executeCommand(args) {
             const registryAuthBlacklist = args.registryAuthBlacklist;
             const ignoreRegistryUnreachable = args.ignoreRegistryUnreachable;
             yield (0, checkCliUpdate_1.checkCliUpdate)(true);
-            if (requiresConnection) {
-                var system;
-                if (args.systemAlias) {
-                    system = systemAlias_1.SystemAlias.get(args.systemAlias).getConnection();
-                }
-                else {
-                    const skipCreateAlias = ['createAlias', 'deleteAlias', 'alias'];
-                    system = (yield commands.connect(args, !skipCreateAlias.includes(args.command), args.addNoConnection)).connection;
-                }
-                yield system.connect();
-                trm_core_1.SystemConnector.systemConnector = system;
-                if (requiresTrmDependencies) {
-                    yield (0, checkTrmDependencies_1.checkTrmDependencies)(args);
-                }
-            }
             if (requiresRegistry) {
                 var registryAlias;
                 var registry;
@@ -155,6 +140,21 @@ function executeCommand(args) {
                     }
                 });
             }
+            if (requiresConnection) {
+                var system;
+                if (args.systemAlias) {
+                    system = systemAlias_1.SystemAlias.get(args.systemAlias).getConnection();
+                }
+                else {
+                    const skipCreateAlias = ['createAlias', 'deleteAlias', 'alias'];
+                    system = (yield commands.connect(args, !skipCreateAlias.includes(args.command), args.addNoConnection)).connection;
+                }
+                yield system.connect();
+                trm_core_1.SystemConnector.systemConnector = system;
+                if (requiresTrmDependencies) {
+                    yield (0, checkTrmDependencies_1.checkTrmDependencies)(args);
+                }
+            }
             var commandFn = args.command;
             if (!commands[commandFn]) {
                 commandFn = `_${commandFn}`;

package/dist/utils/logError.js

@@ -16,8 +16,10 @@ exports.logError = void 0;
 const trm_core_1 = require("trm-core");
 const util_1 = require("util");
 const chalk_1 = __importDefault(require("chalk"));
-const node_html_parser_1 = require("node-html-parser");
 const trm_commons_1 = require("trm-commons");
+const _getUnauthorizedError = () => {
+    return `User "${trm_core_1.SystemConnector.getLogonUser()}" is not authorized to execute TRM RFC functions. Follow this guide https://docs.trmregistry.com/#/server/docs/setup?id=user-authorization-maintenance.`;
+};
 function logError(err) {
     return __awaiter(this, void 0, void 0, function* () {
         var originalException;
@@ -35,6 +37,7 @@ function logError(err) {
         var sError = (originalException.message || 'Unknown error.').trim();
         var aError = [];
         if (originalException.name === 'ExitPromptError') {
+            trm_commons_1.Logger.log(`User exited prompt: ${originalException.message}`, true);
             return;
         }
         else if (originalException.name === 'TrmRegistryError') {
@@ -43,30 +46,38 @@ function logError(err) {
             }
         }
         else if (originalException.name === 'TrmRFCClient') {
-            if (originalException.rfcError && originalException.rfcError) {
-                sError = `${chalk_1.default.black.bgRed(originalException.rfcError.key)} ${sError}`;
-                if (originalException.rfcError.key === "TRM_RFC_UNAUTHORIZED") {
-                    aError.push(chalk_1.default.black.bgRed(`\nUser "${trm_core_1.SystemConnector.getLogonUser()}" is not authorized to execute TRM RFC functions. Follow this guide https://docs.trmregistry.com/#/server/docs/setup?id=user-authorization-maintenance.`));
+            const rfcClientError = originalException;
+            if (rfcClientError.rfcError && rfcClientError.rfcError.key) {
+                if (rfcClientError.rfcError.key[0] === 'Z') {
+                    trm_commons_1.Logger.error(`${rfcClientError.rfcError.key} ${sError}`, true);
+                }
+                else {
+                    sError = `${chalk_1.default.black.bgRed(rfcClientError.rfcError.key)} ${sError}`;
+                    if (rfcClientError.rfcError.key === "TRM_RFC_UNAUTHORIZED") {
+                        sError = chalk_1.default.black.bgRed(`${chalk_1.default.black.bgRed(rfcClientError.rfcError.key)} ${_getUnauthorizedError()}`);
+                    }
                 }
             }
         }
-        else if (originalException.name === 'TrmRestServerError') {
-            if (sError[0] === '<') {
-                try {
-                    sError = (0, node_html_parser_1.parse)(sError).querySelector('title').innerText;
+        else if (originalException.name === 'TrmRESTClient') {
+            const restClientError = originalException;
+            if (restClientError.restError) {
+                if (restClientError.restError.status === 401) {
+                    aError.push(chalk_1.default.black.bgRed(`${chalk_1.default.black.bgRed(restClientError.restError.status)} ${_getUnauthorizedError()}`));
                 }
-                catch (e) { }
-            }
-            if (originalException.status) {
-                if (originalException.status === 404) {
-                    aError.push(`Service cannot be reached (Check if trm-rest is installed and activated correctly).`);
+                else if (restClientError.restError.status === 404) {
+                    aError.push(`${chalk_1.default.black.bgRed(restClientError.restError.status)} Service cannot be reached (Check if trm-rest is installed and activated correctly).`);
                 }
-                sError = `${chalk_1.default.black.bgRed(originalException.status)} ${sError}`;
+                sError = `${chalk_1.default.black.bgRed(restClientError.restError.status)} ${sError}`;
             }
         }
-        aError.push(sError);
+        if (sError) {
+            trm_commons_1.Logger.error(sError);
+        }
         aError.forEach(message => {
-            trm_commons_1.Logger.error(message);
+            if (message) {
+                trm_commons_1.Logger.error(message);
+            }
         });
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-client",
-  "version": "4.4.1",
+  "version": "4.6.0",
   "description": "TRM (Transport Request Manager) Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -43,10 +43,9 @@
     "get-latest-version": "^5.1.0",
     "get-root-path": "^2.0.2",
     "ini": "^4.1.1",
-    "node-html-parser": "^6.1.13",
     "semver": "^7.5.4",
     "trm-commons": "^1.0.0",
-    "trm-core": "^6.5.0",
+    "trm-core": "^6.8.0",
     "trm-registry-types": "^1.2.0",
     "xml2js": "^0.6.2"
   },