trm-client 10.0.2 → 10.0.3

package/dist/command/AbstractCommand.d.ts

@@ -49,5 +49,4 @@ export declare abstract class AbstractCommand {
     parseNumberArg(name: string): number;
     run(args?: any, options?: AbstractCommandRunOptions): Promise<void>;
     private execute;
-    private executePrepared;
 }

package/dist/command/AbstractCommand.js

@@ -404,19 +404,21 @@ class AbstractCommand {
         return __awaiter(this, arguments, void 0, function* (args = {}, options = {}) {
             this.args = this.normalizeArgs(args);
             this.onArgs();
-            yield this.executePrepared(false, options);
+            this.registry = options.registry;
+            try {
+                yield this.handler();
+            }
+            catch (e) {
+                yield (0, utils_1.logError)(e);
+                throw new Error("Action failed.");
+            }
         });
     }
     execute(...args) {
         return __awaiter(this, void 0, void 0, function* () {
+            var exitCode = 0;
             this.args = this.parseCommandArgs(args);
             this.onArgs();
-            const exitCode = yield this.executePrepared(true);
-            process.exit(exitCode);
-        });
-    }
-    executePrepared(logErrors_1) {
-        return __awaiter(this, arguments, void 0, function* (logErrors, options = {}) {
             try {
                 yield utils_1.GlobalContext.getInstance().load();
                 yield Commons.Plugin.call("client", "loadCore", { core: Core });
@@ -432,10 +434,7 @@ class AbstractCommand {
                 if (this.registerOpts.requiresRegistry) {
                     var registryAlias;
                     var registry;
-                    if (options.registry) {
-                        registry = options.registry;
-                    }
-                    else if (this.args.registry) {
+                    if (this.args.registry) {
                         registryAlias = registryAlias_1.RegistryAlias.get(this.args.registry);
                     }
                     else if (this.args.registryEndpoint) {
@@ -508,14 +507,10 @@ class AbstractCommand {
                 if (Commons.Logger.logger instanceof Commons.CliLogger || Commons.Logger.logger instanceof Commons.CliLogFileLogger) {
                     Commons.Logger.logger.forceStop();
                 }
-                return 0;
             }
             catch (e) {
-                if (logErrors) {
-                    yield (0, utils_1.logError)(e);
-                    return 1;
-                }
-                throw e;
+                yield (0, utils_1.logError)(e);
+                exitCode = 1;
             }
             finally {
                 if (Core.SystemConnector.systemConnector) {
@@ -532,6 +527,7 @@ class AbstractCommand {
                     const logFilePath = Commons.Logger.logger.getFilePath();
                     Commons.Logger.info(`Saved log output "${logFilePath}" for session ID ${sessionId}.`);
                 }
+                process.exit(exitCode);
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-client",
-  "version": "10.0.2",
+  "version": "10.0.3",
   "description": "TRM (Transport Request Manager) Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",