trm-client 4.10.0 → 5.0.1

package/changelog.txt

@@ -8,6 +8,16 @@ Legend
 + : added
 - : removed
 
+2025-09-03 v5.0.0
+-------------------
+
+! trm-core ^7.5.1
+! trm-commons ^3.2.0
+! moved settings to context
++ plugin calls
++ gracefully close connection
+! moved connection prompts to commons
+
 2025-08-13 v4.10.0
 -------------------
 

package/dist/commands/alias.js

@@ -11,10 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.alias = alias;
 const systemAlias_1 = require("../systemAlias");
+const utils_1 = require("../utils");
 const createAlias_1 = require("./createAlias");
 const deleteAlias_1 = require("./deleteAlias");
 const prompts_1 = require("./prompts");
-const utils_1 = require("../utils");
 const trm_commons_1 = require("trm-commons");
 const _create = () => __awaiter(void 0, void 0, void 0, function* () {
     const inq1 = yield trm_commons_1.Inquirer.prompt({
@@ -27,88 +27,23 @@ 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;
-    if (alias.type === utils_1.SystemConnectorType.RFC) {
-        const dest = alias.connection.dest;
-        const ashost = alias.connection.ashost;
-        const sysnr = alias.connection.sysnr;
-        const saprouter = alias.connection.saprouter;
-        const client = alias.login.client;
-        if (dest) {
-            trm_commons_1.Logger.info(`System ID: ${dest}`);
-        }
-        else {
-            trm_commons_1.Logger.warning(`System ID: Unknown`);
-        }
-        if (ashost) {
-            trm_commons_1.Logger.info(`Application server: ${ashost}`);
-        }
-        else {
-            trm_commons_1.Logger.warning(`Application server: Unknown`);
-        }
-        if (sysnr) {
-            trm_commons_1.Logger.info(`Instance number: ${sysnr}`);
-        }
-        else {
-            trm_commons_1.Logger.warning(`Instance number: Unknown`);
-        }
-        if (saprouter) {
-            trm_commons_1.Logger.info(`SAProuter: ${saprouter}`);
-        }
-        if (client) {
-            trm_commons_1.Logger.info(`Logon client: ${client}`);
-        }
-        else {
-            trm_commons_1.Logger.warning(`Logon client: Unknown`);
-        }
-    }
-    else if (alias.type === utils_1.SystemConnectorType.REST) {
-        const endpoint = alias.connection.endpoint;
-        const rfcdest = alias.connection.rfcdest;
-        if (endpoint) {
-            trm_commons_1.Logger.info(`System endpoint: ${endpoint}`);
-        }
-        else {
-            trm_commons_1.Logger.warning(`System endpoint: Unknown`);
-        }
-        if (rfcdest) {
-            trm_commons_1.Logger.info(`RFC Forward: ${rfcdest}`);
-        }
+    const connection = utils_1.Context.getInstance().connections.find(o => o.name === alias.type);
+    if (!connection) {
+        throw new Error(`Unknown connection type "${alias.type}".`);
     }
-    if (lang) {
-        trm_commons_1.Logger.info(`Logon language: ${lang}`);
+    if (connection.logData) {
+        connection.logData();
     }
     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}`);
-    }
-    else {
-        trm_commons_1.Logger.warning(`Logon user: Unknown`);
-    }
-    if (hasPassword) {
-        trm_commons_1.Logger.info(`Logon password: SAVED IN PLAIN TEXT`);
-    }
-    else {
-        trm_commons_1.Logger.warning(`Logon password: Unknown`);
+        trm_commons_1.Logger.info(`No data to show.`);
     }
 };
 const _check = (alias) => __awaiter(void 0, void 0, void 0, function* () {
     trm_commons_1.Logger.loading(`Checking connection with alias "${alias.alias}"...`);
-    const oSystemAlias = new systemAlias_1.SystemAlias(alias.type, alias.connection, alias.login);
+    const oSystemAlias = new systemAlias_1.SystemAlias(alias.type, alias.data);
     try {
         yield oSystemAlias.getConnection().connect();
-        trm_commons_1.Logger.success(`Connection OK.`);
+        trm_commons_1.Logger.success(`Connection to alias "${alias.alias}" OK.`);
     }
     catch (e) {
         trm_commons_1.Logger.error(`Connection failed!`);
@@ -117,39 +52,14 @@ const _check = (alias) => __awaiter(void 0, void 0, void 0, function* () {
 });
 const _edit = (alias) => __awaiter(void 0, void 0, void 0, function* () {
     var connectionSuccess = true;
-    const connectionArgs = yield (0, prompts_1.connect)(Object.assign(Object.assign(Object.assign({}, alias.connection), alias.login), {
+    const connectionArgs = yield (0, prompts_1.connect)(Object.assign(Object.assign({}, alias.data), {
         type: alias.type,
         noSystemAlias: true,
         force: true
     }), false);
     try {
         systemAlias_1.SystemAlias.delete(alias.alias);
-        var updatedAlias;
-        if (connectionArgs.type === utils_1.SystemConnectorType.RFC) {
-            updatedAlias = systemAlias_1.SystemAlias.create(alias.alias, connectionArgs.type, {
-                ashost: connectionArgs.ashost,
-                dest: connectionArgs.dest,
-                sysnr: connectionArgs.sysnr,
-                saprouter: connectionArgs.saprouter
-            }, {
-                client: connectionArgs.client,
-                lang: connectionArgs.lang,
-                passwd: connectionArgs.passwd,
-                user: connectionArgs.user
-            });
-        }
-        else if (connectionArgs.type === utils_1.SystemConnectorType.REST) {
-            updatedAlias = systemAlias_1.SystemAlias.create(alias.alias, connectionArgs.type, {
-                endpoint: connectionArgs.endpoint,
-                rfcdest: connectionArgs.forwardRfcDest
-            }, {
-                lang: connectionArgs.lang,
-                passwd: connectionArgs.passwd,
-                user: connectionArgs.user,
-                client: connectionArgs.client
-            });
-        }
-        yield updatedAlias.getConnection().connect();
+        yield systemAlias_1.SystemAlias.create(alias.alias, connectionArgs.name, connectionArgs.getData()).getConnection().connect();
     }
     catch (e) {
         connectionSuccess = false;
@@ -162,30 +72,7 @@ const _edit = (alias) => __awaiter(void 0, void 0, void 0, function* () {
         else {
             trm_commons_1.Logger.error(`Alias "${alias.alias}" couldn't be updated.`);
             systemAlias_1.SystemAlias.delete(alias.alias);
-            if (alias.type === utils_1.SystemConnectorType.RFC) {
-                systemAlias_1.SystemAlias.create(alias.alias, alias.type, {
-                    ashost: alias.connection.ashost,
-                    dest: alias.connection.dest,
-                    sysnr: alias.connection.sysnr,
-                    saprouter: alias.connection.saprouter
-                }, {
-                    client: alias.login.client,
-                    lang: alias.login.lang,
-                    passwd: alias.login.passwd,
-                    user: alias.login.user
-                });
-            }
-            else if (alias.type === utils_1.SystemConnectorType.REST) {
-                systemAlias_1.SystemAlias.create(alias.alias, alias.type, {
-                    endpoint: alias.connection.endpoint,
-                    rfcdest: alias.connection.rfcdest
-                }, {
-                    lang: alias.login.lang,
-                    passwd: alias.login.passwd,
-                    user: alias.login.user,
-                    client: alias.login.client
-                });
-            }
+            systemAlias_1.SystemAlias.create(alias.alias, alias.type, alias.data);
         }
     }
 });

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

@@ -1,7 +1,6 @@
 import { ISystemConnector } from "trm-core";
-import { SystemConnectorType } from "../../utils";
 export type ConnectArguments = {
-    type?: SystemConnectorType;
+    type?: string;
     dest?: string;
     ashost?: string;
     sysnr?: string;

package/dist/commands/compare.js

@@ -48,11 +48,7 @@ const systemAlias_1 = require("../systemAlias");
 const prompts_1 = require("./prompts");
 const commons_1 = require("./commons");
 const trm_core_1 = require("trm-core");
-const utils_1 = require("../utils");
 const trm_commons_1 = require("trm-commons");
-const _compareConnectionData = (a, b) => {
-    return false;
-};
 const _promptConnections = (aConnections) => __awaiter(void 0, void 0, void 0, function* () {
     if (aConnections.length > 0) {
         trm_commons_1.Logger.info(`Compare systems: ${aConnections.map(o => o.getDest()).join(', ')}`);
@@ -67,44 +63,10 @@ const _promptConnections = (aConnections) => __awaiter(void 0, void 0, void 0, f
         }]);
     askConnection = inq1.continue !== undefined ? inq1.continue : askConnection;
     if (askConnection) {
-        const connectArgs = yield (0, prompts_1.connect)({}, false);
-        var oConnection;
-        if (connectArgs.type === utils_1.SystemConnectorType.RFC) {
-            oConnection = (0, utils_1.getSystemConnector)(connectArgs.type, {
-                connection: {
-                    ashost: connectArgs.ashost,
-                    dest: connectArgs.dest,
-                    sysnr: connectArgs.sysnr,
-                    saprouter: connectArgs.saprouter
-                },
-                login: {
-                    user: connectArgs.user,
-                    passwd: connectArgs.passwd,
-                    lang: connectArgs.lang,
-                    client: connectArgs.client
-                }
-            });
-        }
-        else if (connectArgs.type === utils_1.SystemConnectorType.REST) {
-            oConnection = (0, utils_1.getSystemConnector)(connectArgs.type, {
-                connection: {
-                    endpoint: connectArgs.endpoint,
-                    rfcdest: connectArgs.forwardRfcDest
-                },
-                login: {
-                    user: connectArgs.user,
-                    passwd: connectArgs.passwd,
-                    lang: connectArgs.lang,
-                    client: connectArgs.client
-                }
-            });
-        }
-        if (oConnection) {
-            if (!aConnections.find(o => _compareConnectionData(o.getConnectionData(), oConnection.getConnectionData()))) {
-                yield oConnection.connect();
-                aConnections.push(oConnection);
-            }
-        }
+        const connectArgs = yield (0, prompts_1.connect)({}, false, false);
+        const systemConnector = connectArgs.getSystemConnector();
+        yield systemConnector.connect();
+        aConnections.push(systemConnector);
     }
     return {
         continue: askConnection,
@@ -136,10 +98,7 @@ function compare(commandArgs) {
             for (const sAlias of aInputConnections) {
                 const oAlias = systemAlias_1.SystemAlias.get(sAlias);
                 const oConnection = oAlias.getConnection();
-                if (!aConnections.find(o => _compareConnectionData(o.getConnectionData(), oConnection.getConnectionData()))) {
-                    yield oConnection.connect();
-                    aConnections.push(oConnection);
-                }
+                aConnections.push(oConnection);
             }
         }
         if (aConnections.length === 0) {

package/dist/commands/content.js

@@ -18,7 +18,6 @@ const commons_1 = require("./commons");
 const utils_1 = require("../utils");
 const chalk_1 = __importDefault(require("chalk"));
 const trm_commons_1 = require("trm-commons");
-const settings_1 = require("../settings");
 function content(commandArgs) {
     return __awaiter(this, void 0, void 0, function* () {
         trm_commons_1.Logger.loading(`Searching package "${commandArgs.package}"...`);
@@ -31,9 +30,9 @@ function content(commandArgs) {
         const packageContent = yield remotePackage.fetchRemoteContent(commandArgs.version, {
             tempDirPath: (0, utils_1.getTempFolder)(),
             r3transDirPath: commandArgs.r3transPath,
-            useDocker: settings_1.Settings.getInstance().data.r3transDocker,
+            useDocker: utils_1.Context.getInstance().settings.r3transDocker,
             dockerOptions: {
-                name: settings_1.Settings.getInstance().data.r3transDockerName
+                name: utils_1.Context.getInstance().settings.r3transDockerName
             }
         });
         if (!commandArgs.all) {

package/dist/commands/createAlias.js

@@ -12,60 +12,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAlias = createAlias;
 const systemAlias_1 = require("../systemAlias");
 const prompts_1 = require("./prompts");
-const utils_1 = require("../utils");
 const trm_commons_1 = require("trm-commons");
 function createAlias(commandArgs) {
     return __awaiter(this, void 0, void 0, function* () {
-        const connectionArgs = yield (0, prompts_1.connect)({
+        const connection = yield (0, prompts_1.connect)({
             noSystemAlias: true,
             force: true
-        }, false);
+        }, false, false);
+        systemAlias_1.SystemAlias.create(commandArgs.alias, connection.name, connection.getData());
         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, {
-                ashost: connectionArgs.ashost,
-                dest: connectionArgs.dest,
-                sysnr: connectionArgs.sysnr,
-                saprouter: connectionArgs.saprouter
-            }, {
-                client: connectionArgs.client,
-                lang: connectionArgs.lang,
-                passwd: connectionArgs.passwd,
-                user: connectionArgs.user
-            });
+        var connectionSuccess = true;
+        try {
+            yield connection.getSystemConnector().connect();
         }
-        else if (connectionArgs.type === utils_1.SystemConnectorType.REST) {
-            alias = systemAlias_1.SystemAlias.create(commandArgs.alias, connectionArgs.type, {
-                endpoint: connectionArgs.endpoint,
-                rfcdest: connectionArgs.forwardRfcDest
-            }, {
-                lang: connectionArgs.lang,
-                passwd: connectionArgs.passwd,
-                user: connectionArgs.user,
-                client: connectionArgs.client
-            });
+        catch (e) {
+            connectionSuccess = false;
+            throw e;
         }
-        if (alias) {
-            var connectionSuccess = true;
-            try {
-                yield alias.getConnection().connect();
+        finally {
+            if (connectionSuccess) {
+                trm_commons_1.Logger.success(`Alias "${commandArgs.alias}" created.`);
             }
-            catch (e) {
-                connectionSuccess = false;
-                throw e;
+            else {
+                systemAlias_1.SystemAlias.delete(commandArgs.alias);
             }
-            finally {
-                if (connectionSuccess) {
-                    trm_commons_1.Logger.success(`Alias "${commandArgs.alias}" created.`);
-                }
-                else {
-                    systemAlias_1.SystemAlias.delete(commandArgs.alias);
-                }
-            }
-        }
-        else {
-            throw new Error(`Alias "${commandArgs.alias}" couldn't be created.`);
         }
     });
 }

package/dist/commands/import.js

@@ -14,7 +14,6 @@ const trm_core_1 = require("trm-core");
 const utils_1 = require("../utils");
 const commons_1 = require("./commons");
 const trm_commons_1 = require("trm-commons");
-const settings_1 = require("../settings");
 const _parsePackageReplacementsArgument = (arg) => {
     if (arg) {
         try {
@@ -40,9 +39,9 @@ function _import(commandArgs) {
                 r3transOptions: {
                     tempDirPath: (0, utils_1.getTempFolder)(),
                     r3transDirPath: commandArgs.r3transPath,
-                    useDocker: settings_1.Settings.getInstance().data.r3transDocker,
+                    useDocker: utils_1.Context.getInstance().settings.r3transDocker,
                     dockerOptions: {
-                        name: settings_1.Settings.getInstance().data.r3transDockerName
+                        name: utils_1.Context.getInstance().settings.r3transDockerName
                     }
                 },
                 noInquirer: commandArgs.noPrompts,

package/dist/commands/install.js

@@ -14,7 +14,6 @@ const trm_core_1 = require("trm-core");
 const utils_1 = require("../utils");
 const commons_1 = require("./commons");
 const trm_commons_1 = require("trm-commons");
-const settings_1 = require("../settings");
 const _parsePackageReplacementsArgument = (arg) => {
     if (arg) {
         try {
@@ -39,9 +38,9 @@ function install(commandArgs) {
                 r3transOptions: {
                     tempDirPath: (0, utils_1.getTempFolder)(),
                     r3transDirPath: commandArgs.r3transPath,
-                    useDocker: settings_1.Settings.getInstance().data.r3transDocker,
+                    useDocker: utils_1.Context.getInstance().settings.r3transDocker,
                     dockerOptions: {
-                        name: settings_1.Settings.getInstance().data.r3transDockerName
+                        name: utils_1.Context.getInstance().settings.r3transDockerName
                     }
                 },
                 noInquirer: commandArgs.noPrompts,

package/dist/commands/prompts/connect.d.ts

@@ -1,2 +1,3 @@
 import { ConnectArguments } from "../arguments";
-export declare function connect(commandArgs: ConnectArguments, createAliasIfNotExist?: boolean, addNoConnection?: boolean): Promise<ConnectArguments>;
+import { IConnect } from "trm-commons";
+export declare function connect(commandArgs: ConnectArguments, createAliasIfNotExist?: boolean, addNoConnection?: boolean): Promise<IConnect>;