trm-client 5.1.1 → 5.2.0

package/changelog.txt

@@ -8,6 +8,15 @@ Legend
 + : added
 - : removed
 
+2025-10-01 v5.2.0
+-------------------
+
+! trm-core ^7.5.5
+! trm-commons ^3.4.2
+* connection data problems
++ cache time consuming data
++ on after login update alias on changes
+
 2025-09-25 v5.1.1
 -------------------
 

package/dist/commands/alias.js

@@ -27,7 +27,7 @@ const _create = () => __awaiter(void 0, void 0, void 0, function* () {
     });
 });
 const _view = (alias) => {
-    const connection = utils_1.Context.getInstance().connections.find(o => o.name === alias.type);
+    const connection = utils_1.Context.getInstance().getConnections().find(o => o.name === alias.type);
     if (!connection) {
         throw new Error(`Unknown connection type "${alias.type}".`);
     }

package/dist/commands/content.js

@@ -30,9 +30,9 @@ function content(commandArgs) {
         const packageContent = yield remotePackage.fetchRemoteContent(commandArgs.version, {
             tempDirPath: (0, utils_1.getTempFolder)(),
             r3transDirPath: commandArgs.r3transPath,
-            useDocker: utils_1.Context.getInstance().settings.r3transDocker,
+            useDocker: utils_1.Context.getInstance().getSettings().r3transDocker,
             dockerOptions: {
-                name: utils_1.Context.getInstance().settings.r3transDockerName
+                name: utils_1.Context.getInstance().getSettings().r3transDockerName
             }
         });
         if (!commandArgs.all) {

package/dist/commands/createAlias.js

@@ -19,9 +19,7 @@ function createAlias(commandArgs) {
             noSystemAlias: true,
             force: true
         }, false, false);
-        const data = connection.getData();
-        systemAlias_1.SystemAlias.create(commandArgs.alias, connection.name, data);
-        connection.setData(data);
+        systemAlias_1.SystemAlias.create(commandArgs.alias, connection.name, connection.getData());
         trm_commons_1.Logger.loading(`Connecting to "${commandArgs.alias}"...`);
         var connectionSuccess = true;
         try {

package/dist/commands/import.js

@@ -39,9 +39,9 @@ function _import(commandArgs) {
                 r3transOptions: {
                     tempDirPath: (0, utils_1.getTempFolder)(),
                     r3transDirPath: commandArgs.r3transPath,
-                    useDocker: utils_1.Context.getInstance().settings.r3transDocker,
+                    useDocker: utils_1.Context.getInstance().getSettings().r3transDocker,
                     dockerOptions: {
-                        name: utils_1.Context.getInstance().settings.r3transDockerName
+                        name: utils_1.Context.getInstance().getSettings().r3transDockerName
                     }
                 },
                 noInquirer: commandArgs.noPrompts,

package/dist/commands/info.js

@@ -17,7 +17,7 @@ const trm_core_1 = require("trm-core");
 const utils_1 = require("../utils");
 const commons_1 = require("./commons");
 const fs_1 = require("fs");
-const path_1 = __importDefault(require("path"));
+const path_1 = require("path");
 const get_root_path_1 = require("get-root-path");
 const chalk_1 = __importDefault(require("chalk"));
 const semver_1 = require("semver");
@@ -25,10 +25,10 @@ const trm_commons_1 = require("trm-commons");
 const _getDependencyVersion = (moduleName, rootModule = 'trm-client') => {
     var file;
     try {
-        file = (0, fs_1.readFileSync)(path_1.default.join(get_root_path_1.rootPath, `/node_modules/${rootModule}/node_modules/${moduleName}/package.json`));
+        file = (0, fs_1.readFileSync)((0, path_1.join)(get_root_path_1.rootPath, `/node_modules/${rootModule}/node_modules/${moduleName}/package.json`));
     }
     catch (e) {
-        file = (0, fs_1.readFileSync)(path_1.default.join(get_root_path_1.rootPath, `/node_modules/${moduleName}/package.json`));
+        file = (0, fs_1.readFileSync)((0, path_1.join)(get_root_path_1.rootPath, `/node_modules/${moduleName}/package.json`));
     }
     if (!file) {
         trm_commons_1.Logger.warning(`Library ${moduleName} (root ${rootModule}) was not found!`, true);
@@ -40,7 +40,7 @@ const _getDependencyVersion = (moduleName, rootModule = 'trm-client') => {
 const _getNodeRfcVersion = (npmGlobal) => {
     var file;
     try {
-        file = (0, fs_1.readFileSync)(path_1.default.join(npmGlobal, `/node-rfc/package.json`));
+        file = (0, fs_1.readFileSync)((0, path_1.join)(npmGlobal, `/node-rfc/package.json`));
     }
     catch (e) {
     }
@@ -69,7 +69,7 @@ const _getNpmLatestForText = (packageName, installedVersion, text) => __awaiter(
 function info(commandArgs) {
     return __awaiter(this, void 0, void 0, function* () {
         trm_commons_1.Logger.loading(`Reading data...`);
-        const npmGlobal = utils_1.Context.getInstance().settings.globalNodeModules;
+        const npmGlobal = utils_1.Context.getInstance().getSettings().globalNodeModules;
         const clientLatest = yield (0, utils_1.checkCliUpdate)(false);
         const clientVersion = (0, utils_1.getClientVersion)();
         const clientDependencies = (0, utils_1.getClientNodeDependencies)();
@@ -199,24 +199,33 @@ function info(commandArgs) {
             text: chalk_1.default.bold(`Client`),
             children: clientChildrenTree
         };
-        trm_commons_1.Logger.tree(clientTree);
         const serverTree = {
             text: chalk_1.default.bold(`Server (${trm_core_1.SystemConnector.getDest()})`),
             children: serverDependenciesTree
         };
-        if (!(trm_core_1.SystemConnector.systemConnector instanceof utils_1.DummyConnector)) {
-            trm_commons_1.Logger.tree(serverTree);
-        }
         const pluginsTree = {
             text: chalk_1.default.bold(`Plugins`),
             children: []
         };
-        utils_1.Context.getInstance().plugins.forEach(p => {
-            pluginsTree.children.push({
-                text: p,
-                children: []
-            });
-        });
+        for (const plugin of utils_1.Context.getInstance().getPlugins()) {
+            try {
+                const installedVersion = JSON.parse((0, fs_1.readFileSync)((0, path_1.join)(plugin.location, 'package.json')).toString()).version;
+                pluginsTree.children.push({
+                    text: yield _getNpmLatestForText(plugin.name, installedVersion, `${plugin.name} ${installedVersion}`),
+                    children: []
+                });
+            }
+            catch (_a) {
+                pluginsTree.children.push({
+                    text: plugin.name,
+                    children: []
+                });
+            }
+        }
+        trm_commons_1.Logger.tree(clientTree);
+        if (!(trm_core_1.SystemConnector.systemConnector instanceof utils_1.DummyConnector)) {
+            trm_commons_1.Logger.tree(serverTree);
+        }
         if (pluginsTree.children.length > 0) {
             trm_commons_1.Logger.tree(pluginsTree);
         }

package/dist/commands/install.js

@@ -38,9 +38,9 @@ function install(commandArgs) {
                 r3transOptions: {
                     tempDirPath: (0, utils_1.getTempFolder)(),
                     r3transDirPath: commandArgs.r3transPath,
-                    useDocker: utils_1.Context.getInstance().settings.r3transDocker,
+                    useDocker: utils_1.Context.getInstance().getSettings().r3transDocker,
                     dockerOptions: {
-                        name: utils_1.Context.getInstance().settings.r3transDockerName
+                        name: utils_1.Context.getInstance().getSettings().r3transDockerName
                     }
                 },
                 noInquirer: commandArgs.noPrompts,

package/dist/commands/prompts/connect.js

@@ -13,6 +13,7 @@ exports.connect = connect;
 const systemAlias_1 = require("../../systemAlias");
 const utils_1 = require("../../utils");
 const trm_commons_1 = require("trm-commons");
+const lodash_1 = require("lodash");
 const languageList = [
     { value: 'AR', name: 'AR (Arabic)' },
     { value: 'BG', name: 'BG (Bulgarian)' },
@@ -120,30 +121,36 @@ function connect(commandArgs_1) {
                     };
                 })
             })).alias;
-            const connection = utils_1.Context.getInstance().connections.find(o => o.name === inq2.type);
+            const connection = utils_1.Context.getInstance().getConnections().find(o => o.name === inq2.type);
             if (!connection) {
                 throw new Error(`Unknown connection type "${inq2.type}" in alias "${inq2.name}"`);
             }
             connection.setData(inq2.data);
+            if (connection.onAfterLoginData) {
+                yield connection.onAfterLoginData(force, commandArgs);
+            }
+            if (!(0, lodash_1.isEqual)(inq2.data, connection.getData())) {
+                systemAlias_1.SystemAlias.delete(inq2.alias);
+                systemAlias_1.SystemAlias.create(inq2.alias, inq2.type, connection.getData());
+            }
             return connection;
         }
         else {
             if (inputType === 'logon') {
-                const inq3 = yield trm_commons_1.Inquirer.prompt({
+                const logonConnection = (yield trm_commons_1.Inquirer.prompt({
                     type: `list`,
-                    name: `logonConnection`,
+                    name: `data`,
                     message: `Select connection`,
                     choices: aSapLogonConnections.map(o => {
                         return {
-                            value: o.id, name: o.name
+                            value: o, name: o.name
                         };
                     })
-                });
-                const logonConnection = aSapLogonConnections.find(o => o.id === inq3.logonConnection);
+                })).data;
                 commandArgs.ashost = logonConnection.ashost;
                 commandArgs.dest = logonConnection.dest;
                 commandArgs.sysnr = logonConnection.sysnr;
-                commandArgs.saprouter = logonConnection.saprouter;
+                commandArgs.saprouter = logonConnection.saprouter || ' ';
                 type = 'RFC';
             }
             if (!type || force) {
@@ -151,7 +158,7 @@ function connect(commandArgs_1) {
                     type: `list`,
                     name: `type`,
                     message: `Connection type`,
-                    choices: utils_1.Context.getInstance().connections.map(o => {
+                    choices: utils_1.Context.getInstance().getConnections().map(o => {
                         return {
                             name: o.description,
                             value: o.name
@@ -159,7 +166,7 @@ function connect(commandArgs_1) {
                     })
                 })).type;
             }
-            const connectionType = utils_1.Context.getInstance().connections.find(o => o.name === type);
+            const connectionType = utils_1.Context.getInstance().getConnections().find(o => o.name === type);
             if (!connectionType) {
                 throw new Error(`Invalid connection type "${type}"`);
             }
@@ -209,7 +216,7 @@ function connect(commandArgs_1) {
                             return (commandArgs.lang ? false : true) || force;
                         },
                         validate: (input) => {
-                            return languageList.includes(input.trim().toUpperCase());
+                            return languageList.find(o => o.value === input.trim().toUpperCase()) ? true : `Unknown language "${input}".`;
                         },
                         choices: languageList
                     }

package/dist/commands/settings.js

@@ -24,7 +24,7 @@ function settings(commandArgs) {
             const value = aSplit[1];
             utils_1.Context.getInstance().setSetting(key, value);
         }
-        const settingsData = utils_1.Context.getInstance().settings;
+        const settingsData = utils_1.Context.getInstance().getSettings();
         Object.keys(settingsData).forEach(k => {
             trm_commons_1.Logger.log(`${k}: ${settingsData[k]}`);
         });

package/dist/systemAlias/SystemAlias.js

@@ -58,9 +58,9 @@ class SystemAlias {
         this._data = _data;
     }
     getConnection() {
-        const connection = utils_1.Context.getInstance().connections.find(o => o.name === this.type);
+        const connection = utils_1.Context.getInstance().getConnections().find(o => o.name === this.type);
         if (!connection) {
-            throw new Error(`Unknown connection type "${this.type}". Possible values are ${utils_1.Context.getInstance().connections.map(k => k.name).join(', ')}.`);
+            throw new Error(`Unknown connection type "${this.type}". Possible values are ${utils_1.Context.getInstance().getConnections().map(k => k.name).join(', ')}.`);
         }
         connection.setData(this._data);
         return connection.getSystemConnector();
@@ -71,7 +71,7 @@ class SystemAlias {
         }
         var oContent = {};
         content.forEach(o => {
-            const connection = utils_1.Context.getInstance().connections.find(k => k.name === o.type);
+            const connection = utils_1.Context.getInstance().getConnections().find(k => k.name === o.type);
             if (connection) {
                 oContent[o.alias] = o.data;
                 oContent[o.alias].type = o.type;
@@ -95,13 +95,12 @@ class SystemAlias {
             if (!oIni[sAlias].type) {
                 oIni[sAlias].type = 'RFC';
             }
-            const connection = utils_1.Context.getInstance().connections.find(o => o.name === oIni[sAlias].type);
+            const connection = utils_1.Context.getInstance().getConnections().find(o => o.name === oIni[sAlias].type);
             if (connection) {
-                connection.setData(oIni[sAlias]);
                 aAlias.push({
                     alias: sAlias,
                     type: oIni[sAlias].type,
-                    data: connection.getData()
+                    data: oIni[sAlias]
                 });
             }
         });

package/dist/utils/CacheData.d.ts

@@ -0,0 +1,7 @@
+export type Cache = {
+    ts: number;
+    data: any;
+};
+export type CacheData = {
+    latestVersion?: Cache;
+};

package/dist/utils/CacheData.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/utils/Context.d.ts

@@ -1,16 +1,29 @@
+import { CacheData } from ".";
 import { SettingsData } from "./";
-import { IConnect } from "trm-commons";
+import { IConnect, PluginModule } from "trm-commons";
 export declare class Context {
     private static _instance;
-    settings: SettingsData;
-    connections: IConnect[];
-    plugins: string[];
+    private _pluginsLoaded;
+    private _settings;
+    private _cache;
+    private _connections;
+    private _plugins;
     constructor();
+    getSettings(): SettingsData;
+    getCache(): CacheData;
     load(): Promise<void>;
+    getPlugins(): PluginModule[];
+    getConnections(): IConnect[];
     setSetting(key: string, value: string): void;
+    setCache(key: string, value: any): void;
+    private cloneInstance;
+    private cloneArrayOfInstances;
     private getSettingsFilePath;
+    private getCacheFilePath;
     private getDefaultSettings;
-    private getSettings;
+    private getSettingsInternal;
+    private getCacheInternal;
     private generateSettingsFile;
+    private generateCacheFile;
     static getInstance(): Context;
 }

package/dist/utils/Context.js

@@ -52,6 +52,7 @@ const fs = __importStar(require("fs"));
 const ini = __importStar(require("ini"));
 const trm_commons_1 = require("trm-commons");
 const trm_core_1 = require("trm-core");
+const CACHE_FILE_NAME = ".cache";
 const SETTINGS_FILE_NAME = "settings.ini";
 class RESTConnectExtended extends trm_commons_1.RESTConnect {
     getSystemConnector() {
@@ -62,41 +63,74 @@ class RESTConnectExtended extends trm_commons_1.RESTConnect {
 class RFCConnectExtended extends trm_commons_1.RFCConnect {
     getSystemConnector() {
         const data = this.getData();
-        return new trm_core_1.RFCSystemConnector(data, data, (0, _1.getTempFolder)(), Context.getInstance().settings.globalNodeModules);
+        return new trm_core_1.RFCSystemConnector(data, data, (0, _1.getTempFolder)(), Context.getInstance().getSettings().globalNodeModules);
     }
 }
 class Context {
     constructor() {
-        this.settings = this.getSettings();
-        if (typeof (this.settings.r3transDocker) !== 'boolean') {
+        this._pluginsLoaded = false;
+        this._connections = [];
+        this._plugins = [];
+        this._settings = this.getSettingsInternal();
+        this._cache = this.getCacheInternal();
+        if (typeof (this._settings.r3transDocker) !== 'boolean') {
             if (process.platform === 'darwin') {
                 trm_commons_1.Logger.info(`R3trans defaults to docker in darwin os.`, true);
-                this.settings.r3transDocker = true;
+                this._settings.r3transDocker = true;
             }
         }
     }
+    getSettings() {
+        return this._settings;
+    }
+    getCache() {
+        return this._cache;
+    }
     load() {
         return __awaiter(this, void 0, void 0, function* () {
-            const plugins = yield trm_commons_1.Plugin.load({
-                globalNodeModulesPath: this.settings.globalNodeModules
-            });
-            this.plugins = [...new Set(plugins)];
-            if (!this.connections) {
-                this.connections = yield trm_commons_1.Plugin.call("client", "onContextLoadConnections", [new RESTConnectExtended(), new RFCConnectExtended()]);
+            if (!this._pluginsLoaded) {
+                this._plugins = yield trm_commons_1.Plugin.load({
+                    globalNodeModulesPath: this._settings.globalNodeModules
+                });
+                this._connections = yield trm_commons_1.Plugin.call("client", "onContextLoadConnections", [new RESTConnectExtended(), new RFCConnectExtended()]);
+                this._pluginsLoaded = true;
             }
         });
     }
+    getPlugins() {
+        return this._plugins;
+    }
+    getConnections() {
+        return this.cloneArrayOfInstances(this._connections);
+    }
     setSetting(key, value) {
-        if (this.settings[key] === undefined) {
+        if (this._settings[key] === undefined) {
             throw new Error(`Invalid key ${key}.`);
         }
         const filePath = this.getSettingsFilePath();
-        this.settings[key] = value;
-        this.generateSettingsFile(this.settings, filePath);
+        this._settings[key] = value;
+        this.generateSettingsFile(this._settings, filePath);
+    }
+    setCache(key, value) {
+        const filePath = this.getCacheFilePath();
+        this._cache[key] = {
+            ts: Date.now(),
+            data: value
+        };
+        this.generateCacheFile(this._cache, filePath);
+    }
+    cloneInstance(obj) {
+        return Object.assign(Object.create(Object.getPrototypeOf(obj)), obj);
+    }
+    cloneArrayOfInstances(arr) {
+        return arr.map(this.cloneInstance);
     }
     getSettingsFilePath() {
         return path_1.default.join((0, _1.getRoamingFolder)(), SETTINGS_FILE_NAME);
     }
+    getCacheFilePath() {
+        return path_1.default.join((0, _1.getRoamingFolder)(), CACHE_FILE_NAME);
+    }
     getDefaultSettings() {
         var sapLandscape = path_1.default.join((0, _1.getRoamingPath)(), process.platform === 'win32' ? 'SAP\\Common\\SAPUILandscape.xml' : 'SAP/SAPGUILandscape.xml');
         if (!fs.existsSync(sapLandscape)) {
@@ -109,7 +143,7 @@ class Context {
             sapLandscape
         };
     }
-    getSettings() {
+    getSettingsInternal() {
         var defaultSettings;
         const filePath = this.getSettingsFilePath();
         if (fs.existsSync(filePath)) {
@@ -134,9 +168,23 @@ class Context {
         this.generateSettingsFile(defaultSettings, filePath);
         return defaultSettings;
     }
+    getCacheInternal() {
+        const filePath = this.getCacheFilePath();
+        if (fs.existsSync(filePath)) {
+            try {
+                return JSON.parse(fs.readFileSync(filePath).toString());
+            }
+            catch (e) { }
+        }
+        this.generateCacheFile({}, filePath);
+        return {};
+    }
     generateSettingsFile(data, filePath) {
         fs.writeFileSync(filePath, ini.encode(data), { encoding: 'utf8', flag: 'w' });
     }
+    generateCacheFile(data, filePath) {
+        fs.writeFileSync(filePath, JSON.stringify(data), { encoding: 'utf8', flag: 'w' });
+    }
     static getInstance() {
         if (!this._instance) {
             this._instance = new Context();

package/dist/utils/checkCliUpdate.js

@@ -18,10 +18,19 @@ const getClientVersion_1 = require("./getClientVersion");
 const chalk_1 = __importDefault(require("chalk"));
 const getNpmPackageLatestVersion_1 = require("./getNpmPackageLatestVersion");
 const trm_commons_1 = require("trm-commons");
+const Context_1 = require("./Context");
 function checkCliUpdate(print) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const latestVersion = yield (0, getNpmPackageLatestVersion_1.getNpmPackageLatestVersion)('trm-client');
+            var latestVersion;
+            const cache = Context_1.Context.getInstance().getCache().latestVersion;
+            if (cache && cache.ts && Date.now() - cache.ts <= 60000) {
+                latestVersion = cache.data;
+            }
+            else {
+                latestVersion = yield (0, getNpmPackageLatestVersion_1.getNpmPackageLatestVersion)('trm-client');
+                Context_1.Context.getInstance().setCache('latestVersion', latestVersion);
+            }
             const localVersion = (0, getClientVersion_1.getClientVersion)();
             const versionDiff = (0, semver_1.diff)(localVersion, latestVersion);
             if ((versionDiff === 'minor' || versionDiff === 'major') && (0, semver_1.gt)(latestVersion, localVersion)) {

package/dist/utils/getSapLogonConnections.js

@@ -49,9 +49,9 @@ const Context_1 = require("./Context");
 function getSapLogonConnections() {
     return __awaiter(this, void 0, void 0, function* () {
         var systems = [];
-        const sapLandscape = Context_1.Context.getInstance().settings.sapLandscape;
+        const sapLandscape = Context_1.Context.getInstance().getSettings().sapLandscape;
         if (sapLandscape) {
-            const sXml = fs.readFileSync(Context_1.Context.getInstance().settings.sapLandscape, { encoding: 'utf8', flag: 'r' });
+            const sXml = fs.readFileSync(Context_1.Context.getInstance().getSettings().sapLandscape, { encoding: 'utf8', flag: 'r' });
             const result = yield (0, xml2js_1.xml2js)(sXml);
             try {
                 result.Landscape.Services[0].Service.forEach((xmlObj) => {

package/dist/utils/index.d.ts

@@ -15,4 +15,5 @@ export * from "./getClientNodeDependencies";
 export * from "./DummyConnector";
 export * from "./getNpmPackageLatestVersion";
 export * from "./SettingsData";
+export * from "./CacheData";
 export * from "./Context";

package/dist/utils/index.js

@@ -31,4 +31,5 @@ __exportStar(require("./getClientNodeDependencies"), exports);
 __exportStar(require("./DummyConnector"), exports);
 __exportStar(require("./getNpmPackageLatestVersion"), exports);
 __exportStar(require("./SettingsData"), exports);
+__exportStar(require("./CacheData"), exports);
 __exportStar(require("./Context"), exports);

package/dist/utils/registerCommand.js

@@ -24,8 +24,8 @@ function registerCommand(command, args) {
     const ignoreRegistryUnreachable = args.ignoreRegistryUnreachable ? true : false;
     const noSystemAlias = args.noSystemAlias ? true : false;
     const registryAuthBlacklist = args.registryAuthBlacklist || [];
-    const defaultLogger = Context_1.Context.getInstance().settings.loggerType;
-    const logOutputFolder = Context_1.Context.getInstance().settings.logOutputFolder;
+    const defaultLogger = Context_1.Context.getInstance().getSettings().loggerType;
+    const logOutputFolder = Context_1.Context.getInstance().getSettings().logOutputFolder;
     if (requiresConnection) {
         command.option(`-de, --dest <dest>`, `System ID.`)
             .option(`-us, --user <user>`, `System User Logon.`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-client",
-  "version": "5.1.1",
+  "version": "5.2.0",
   "description": "TRM (Transport Request Manager) Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,17 +44,19 @@
     "get-latest-version": "^5.1.0",
     "get-root-path": "^2.0.2",
     "ini": "^4.1.1",
+    "lodash": "^4.17.21",
     "semver": "^7.5.4",
-    "trm-commons": "^3.3.2",
-    "trm-core": "^7.5.3",
+    "trm-commons": "^3.4.2",
+    "trm-core": "^7.5.5",
     "trm-registry-types": "^1.2.0",
     "xml2js": "^0.6.2"
   },
   "peerDependencies": {
-    "trm-commons": "^3.3.2"
+    "trm-commons": "^3.4.2"
   },
   "devDependencies": {
     "@types/ini": "^1.3.31",
+    "@types/lodash": "^4.17.20",
     "@types/node": "^20.4.8",
     "@types/semver": "^7.5.3",
     "@types/xml2js": "^0.4.11",