trm-client 4.10.0 → 5.0.1

package/dist/{settings/Settings.js → utils/Context.js}

@@ -32,44 +32,74 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Settings = void 0;
+exports.Context = void 0;
 const path_1 = __importDefault(require("path"));
-const utils_1 = require("../utils");
+const _1 = require(".");
 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 SETTINGS_FILE_NAME = "settings.ini";
-const defaultData = {
+const defaultSettings = {
     loggerType: 'CLI',
     logOutputFolder: 'default'
 };
-class Settings {
+class RESTConnectExtended extends trm_commons_1.RESTConnect {
+    getSystemConnector() {
+        const data = this.getData();
+        return new trm_core_1.RESTSystemConnector(data, data);
+    }
+}
+class RFCConnectExtended extends trm_commons_1.RFCConnect {
+    getSystemConnector() {
+        const data = this.getData();
+        return new trm_core_1.RFCSystemConnector(data, data, (0, _1.getTempFolder)());
+    }
+}
+class Context {
     constructor() {
-        this.data = this.getSettings();
-        if (typeof (this.data.r3transDocker) !== 'boolean') {
+        this.settings = this.getSettings();
+        if (typeof (this.settings.r3transDocker) !== 'boolean') {
             if (process.platform === 'darwin') {
                 trm_commons_1.Logger.info(`R3trans defaults to docker in darwin os.`, true);
-                this.data.r3transDocker = true;
+                this.settings.r3transDocker = true;
             }
         }
     }
-    set(key, value) {
-        if (this.data[key] === undefined) {
+    load() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield trm_commons_1.Plugin.load();
+            if (!this.connections) {
+                this.connections = yield trm_commons_1.Plugin.call("client", "onContextLoadConnections", [new RESTConnectExtended(), new RFCConnectExtended()]);
+            }
+        });
+    }
+    setSetting(key, value) {
+        if (this.settings[key] === undefined) {
             throw new Error(`Invalid key ${key}.`);
         }
-        const filePath = this.getFilePath();
-        this.data[key] = value;
-        this.generateFile(this.data, filePath);
+        const filePath = this.getSettingsFilePath();
+        this.settings[key] = value;
+        this.generateSettingsFile(this.settings, filePath);
     }
-    getFilePath() {
-        return path_1.default.join((0, utils_1.getRoamingFolder)(), SETTINGS_FILE_NAME);
+    getSettingsFilePath() {
+        return path_1.default.join((0, _1.getRoamingFolder)(), SETTINGS_FILE_NAME);
     }
     getSettings() {
-        const filePath = this.getFilePath();
+        const filePath = this.getSettingsFilePath();
         if (fs.existsSync(filePath)) {
             try {
                 const sIni = fs.readFileSync(filePath).toString();
@@ -78,18 +108,18 @@ class Settings {
             }
             catch (e) { }
         }
-        this.generateFile(defaultData, filePath);
-        return defaultData;
+        this.generateSettingsFile(defaultSettings, filePath);
+        return defaultSettings;
     }
-    generateFile(data, filePath) {
+    generateSettingsFile(data, filePath) {
         fs.writeFileSync(filePath, ini.encode(data), { encoding: 'utf8', flag: 'w' });
     }
     static getInstance() {
         if (!this._instance) {
-            this._instance = new Settings();
+            this._instance = new Context();
         }
         return this._instance;
     }
 }
-exports.Settings = Settings;
-Settings._instance = null;
+exports.Context = Context;
+Context._instance = null;

package/dist/utils/NoConnection.d.ts

@@ -7,6 +7,7 @@ export declare class NoConnection implements ISystemConnector {
     getLogonLanguage: (c: boolean) => "X" | "XX";
     getLogonUser: () => string;
     connect: () => Promise<void>;
+    closeConnection: () => Promise<any>;
     checkConnection: () => Promise<boolean>;
     ping: () => Promise<string>;
     getFileSystem: () => Promise<any>;

package/dist/utils/NoConnection.js

@@ -30,6 +30,7 @@ class NoConnection {
         this.connect = () => __awaiter(this, void 0, void 0, function* () {
             return;
         });
+        this.closeConnection = () => __awaiter(this, void 0, void 0, function* () { return this._throw(); });
         this.checkConnection = () => __awaiter(this, void 0, void 0, function* () { return true; });
         this.ping = () => __awaiter(this, void 0, void 0, function* () { return 'PONG'; });
         this.getFileSystem = () => __awaiter(this, void 0, void 0, function* () { return this._throw(); });

package/dist/utils/executeCommand.js

@@ -45,6 +45,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InquirerType = exports.LoggerType = void 0;
 exports.executeCommand = executeCommand;
 const commands = __importStar(require("../commands"));
+const Core = __importStar(require("trm-core"));
+const Commons = __importStar(require("trm-commons"));
 const systemAlias_1 = require("../systemAlias");
 const logError_1 = require("./logError");
 const checkTrmDependencies_1 = require("./checkTrmDependencies");
@@ -54,6 +56,7 @@ const getLogFolder_1 = require("./getLogFolder");
 const registryAlias_1 = require("../registryAlias");
 const commons_1 = require("../commands/commons");
 const trm_commons_1 = require("trm-commons");
+const Context_1 = require("./Context");
 var LoggerType;
 (function (LoggerType) {
     LoggerType["CLI"] = "CLI";
@@ -88,6 +91,9 @@ function executeCommand(args) {
     return __awaiter(this, void 0, void 0, function* () {
         var exitCode;
         try {
+            yield Context_1.Context.getInstance().load();
+            yield trm_commons_1.Plugin.call("client", "loadCore", { core: Core });
+            yield trm_commons_1.Plugin.call("client", "loadCommons", { commons: Commons });
             trm_commons_1.Inquirer.inquirer = _getInquirer(InquirerType.CLI);
             trm_commons_1.Logger.logger = _getLogger(args.logType, args.debug, args.logOutputFolder);
             if (process.platform !== 'win32' && process.platform !== 'darwin') {
@@ -158,11 +164,11 @@ function executeCommand(args) {
                     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;
+                    system = (yield commands.connect(args, true, args.addNoConnection)).getSystemConnector();
                 }
                 yield system.connect();
                 trm_core_1.SystemConnector.systemConnector = system;
+                yield trm_commons_1.Plugin.call("client", "onInitializeSystemConnector", trm_core_1.SystemConnector.systemConnector);
                 if (requiresTrmDependencies) {
                     yield (0, checkTrmDependencies_1.checkTrmDependencies)(args);
                 }
@@ -185,6 +191,15 @@ function executeCommand(args) {
             exitCode = 1;
         }
         finally {
+            if (trm_core_1.SystemConnector.systemConnector) {
+                try {
+                    yield trm_core_1.SystemConnector.closeConnection();
+                }
+                catch (e) {
+                    trm_commons_1.Logger.log(`Couldn't close system connection!`, true);
+                    trm_commons_1.Logger.log(e.toString(), true);
+                }
+            }
             if (trm_commons_1.Logger.logger instanceof trm_commons_1.CliLogFileLogger) {
                 const sessionId = trm_commons_1.Logger.logger.getSessionId();
                 const logFilePath = trm_commons_1.Logger.logger.getFilePath();

package/dist/utils/index.d.ts

@@ -12,6 +12,7 @@ export * from "./getClientVersion";
 export * from "./getTempFolder";
 export * from "./getLogFolder";
 export * from "./getClientNodeDependencies";
-export * from "./getSystemConnector";
 export * from "./NoConnection";
 export * from "./getNpmPackageLatestVersion";
+export * from "./SettingsData";
+export * from "./Context";

package/dist/utils/index.js

@@ -28,6 +28,7 @@ __exportStar(require("./getClientVersion"), exports);
 __exportStar(require("./getTempFolder"), exports);
 __exportStar(require("./getLogFolder"), exports);
 __exportStar(require("./getClientNodeDependencies"), exports);
-__exportStar(require("./getSystemConnector"), exports);
 __exportStar(require("./NoConnection"), exports);
 __exportStar(require("./getNpmPackageLatestVersion"), exports);
+__exportStar(require("./SettingsData"), exports);
+__exportStar(require("./Context"), exports);

package/dist/utils/registerCommand.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerCommand = registerCommand;
 const executeCommand_1 = require("./executeCommand");
-const settings_1 = require("../settings");
+const Context_1 = require("./Context");
 function registerCommand(command, args) {
     const commandName = command.name();
     if (!args) {
@@ -24,9 +24,9 @@ function registerCommand(command, args) {
     const ignoreRegistryUnreachable = args.ignoreRegistryUnreachable ? true : false;
     const noSystemAlias = args.noSystemAlias ? true : false;
     const registryAuthBlacklist = args.registryAuthBlacklist || [];
-    const defaultLogger = settings_1.Settings.getInstance().data.loggerType;
-    const logOutputFolder = settings_1.Settings.getInstance().data.logOutputFolder;
-    if (requiresConnection || commandName === 'createAlias') {
+    const defaultLogger = Context_1.Context.getInstance().settings.loggerType;
+    const logOutputFolder = Context_1.Context.getInstance().settings.logOutputFolder;
+    if (requiresConnection) {
         command.option(`-de, --dest <dest>`, `System ID.`)
             .option(`-us, --user <user>`, `System User Logon.`)
             .option(`-pw, --passwd <passwd>`, `System User Logon Password.`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-client",
-  "version": "4.10.0",
+  "version": "5.0.1",
   "description": "TRM (Transport Request Manager) Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,13 +44,13 @@
     "get-root-path": "^2.0.2",
     "ini": "^4.1.1",
     "semver": "^7.5.4",
-    "trm-commons": "^2.0.0",
-    "trm-core": "^7.4.5",
+    "trm-core": "^7.5.1",
     "trm-registry-types": "^1.2.0",
+    "trm-commons": "^3.2.0",
     "xml2js": "^0.6.2"
   },
   "peerDependencies": {
-    "trm-commons": "^2.0.0"
+    "trm-commons": "^3.2.0"
   },
   "devDependencies": {
     "@types/ini": "^1.3.31",

package/dist/settings/Settings.d.ts

@@ -1,11 +0,0 @@
-import { SettingsData } from "./SettingsData";
-export declare class Settings {
-    private static _instance;
-    data: SettingsData;
-    constructor();
-    set(key: string, value: string): void;
-    private getFilePath;
-    private getSettings;
-    private generateFile;
-    static getInstance(): Settings;
-}

package/dist/settings/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./Settings";
-export * from "./SettingsData";

package/dist/settings/index.js

@@ -1,18 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./Settings"), exports);
-__exportStar(require("./SettingsData"), exports);

package/dist/utils/getSystemConnector.d.ts

@@ -1,9 +0,0 @@
-import { ISystemConnector, Login } from "trm-core";
-export declare enum SystemConnectorType {
-    RFC = "RFC",
-    REST = "REST"
-}
-export declare function getSystemConnector(type: SystemConnectorType, args: {
-    connection: any;
-    login: Login;
-}): ISystemConnector;

package/dist/utils/getSystemConnector.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemConnectorType = void 0;
-exports.getSystemConnector = getSystemConnector;
-const trm_core_1 = require("trm-core");
-const getTempFolder_1 = require("./getTempFolder");
-var SystemConnectorType;
-(function (SystemConnectorType) {
-    SystemConnectorType["RFC"] = "RFC";
-    SystemConnectorType["REST"] = "REST";
-})(SystemConnectorType || (exports.SystemConnectorType = SystemConnectorType = {}));
-function getSystemConnector(type, args) {
-    const parsingError = new Error(`Unable to parse connection data of type "${type}".`);
-    switch (type) {
-        case SystemConnectorType.RFC:
-            try {
-                return new trm_core_1.RFCSystemConnector(args.connection, args.login, (0, getTempFolder_1.getTempFolder)());
-            }
-            catch (e) {
-                throw parsingError;
-            }
-        case SystemConnectorType.REST:
-            try {
-                return new trm_core_1.RESTSystemConnector(args.connection, args.login);
-            }
-            catch (e) {
-                throw parsingError;
-            }
-        default:
-            throw new Error(`Unknown connection type "${type}". Possible values are ${Object.keys(SystemConnectorType).map(k => SystemConnectorType[k]).join(', ')}.`);
-    }
-}