trm-core 7.5.6 → 8.0.1

package/dist/registry/{Registry.js → RegistryV2.js}

@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Registry = exports.PUBLIC_RESERVED_KEYWORD = void 0;
+exports.RegistryV2 = exports.PUBLIC_RESERVED_KEYWORD = void 0;
 const RegistryType_1 = require("./RegistryType");
 const normalize_url_1 = __importDefault(require("@esm2cjs/normalize-url"));
 const axios_1 = require("axios");
@@ -57,12 +57,14 @@ const crypto_1 = require("crypto");
 const protocol_1 = require("../protocol");
 const opener_1 = __importDefault(require("opener"));
 const commons_1 = require("../commons");
-const AXIOS_CTX = "Registry";
+const node_cache_1 = __importDefault(require("node-cache"));
+const AXIOS_CTX = "RegistryV2";
 exports.PUBLIC_RESERVED_KEYWORD = 'public';
-class Registry {
+class RegistryV2 {
     constructor(endpoint, name = 'Unknown') {
         this.endpoint = endpoint;
         this.name = name;
+        this._cache = new node_cache_1.default({ stdTTL: 60, useClones: false });
         var envEndpoint = process.env.TRM_PUBLIC_REGISTRY_ENDPOINT;
         trm_commons_1.Logger.log(`TRM_PUBLIC_REGISTRY_ENDPOINT Environment variable: ${envEndpoint}`, true);
         if (!envEndpoint || envEndpoint.trim().toLowerCase() === exports.PUBLIC_RESERVED_KEYWORD) {
@@ -92,11 +94,23 @@ class Registry {
             throw new Error(`Registry address length is too long! Maximum allowed is 100.`);
         }
         this._axiosInstance = (0, commons_1.getAxiosInstance)({
-            baseURL: this.endpoint
+            baseURL: this.endpoint,
+            headers: this.getDefaultAxiosHeaders()
         }, AXIOS_CTX);
     }
+    getDefaultAxiosHeaders() {
+        var axiosHeaders = new axios_1.AxiosHeaders();
+        if (!this._userAgent) {
+            try {
+                this._userAgent = `trm-core v${(0, commons_1.getNodePackage)().version}`;
+            }
+            catch (_a) { }
+        }
+        axiosHeaders.setUserAgent(this._userAgent || `trm-core`);
+        return axiosHeaders;
+    }
     compare(registry) {
-        if (registry instanceof Registry) {
+        if (registry instanceof RegistryV2) {
             return this.endpoint === registry.endpoint;
         }
         else {
@@ -110,25 +124,25 @@ class Registry {
         return __awaiter(this, arguments, void 0, function* (defaultData = {}) {
             trm_commons_1.Logger.log(`Registry authentication request`, true);
             const ping = yield this.ping();
-            trm_commons_1.Logger.log(`Registry authentication type is: ${ping.authenticationType}`, true);
-            if (ping.authenticationType !== trm_registry_types_1.AuthenticationType.NO_AUTH) {
-                if (ping.authenticationType === trm_registry_types_1.AuthenticationType.BASIC) {
+            trm_commons_1.Logger.log(`Registry authentication type is: ${ping.authentication_type}`, true);
+            if (ping.authentication_type !== trm_registry_types_1.AuthenticationType.NO_AUTH) {
+                if (ping.authentication_type === trm_registry_types_1.AuthenticationType.BASIC) {
                     yield this._basicAuth(defaultData);
                 }
-                if (ping.authenticationType === trm_registry_types_1.AuthenticationType.OAUTH2) {
+                if (ping.authentication_type === trm_registry_types_1.AuthenticationType.OAUTH2) {
                     yield this._oauth2(defaultData);
                 }
-                if (ping.authenticationType === trm_registry_types_1.AuthenticationType.TOKEN) {
+                if (ping.authentication_type === trm_registry_types_1.AuthenticationType.TOKEN) {
                     yield this._tokenAuth(defaultData);
                 }
             }
-            this._whoami = null;
+            this._cache.flushAll();
             return this;
         });
     }
     _basicAuth() {
         return __awaiter(this, arguments, void 0, function* (defaultData = {}) {
-            var axiosHeaders = new axios_1.AxiosHeaders();
+            var axiosHeaders = this.getDefaultAxiosHeaders();
             var axiosDefaults = {
                 baseURL: this.endpoint,
                 headers: axiosHeaders
@@ -166,7 +180,7 @@ class Registry {
     }
     _tokenAuth() {
         return __awaiter(this, arguments, void 0, function* (defaultData = {}) {
-            var axiosHeaders = new axios_1.AxiosHeaders();
+            var axiosHeaders = this.getDefaultAxiosHeaders();
             var axiosDefaults = {
                 baseURL: this.endpoint,
                 headers: axiosHeaders
@@ -186,7 +200,7 @@ class Registry {
                     when: !token
                 }]);
             token = token || inq1.token;
-            axiosHeaders.setAuthorization(`token ${token}`);
+            axiosHeaders.setAuthorization(`Bearer ${token}`);
             this._axiosInstance = (0, commons_1.getAxiosInstance)(axiosDefaults, AXIOS_CTX);
             this._authData = {
                 token
@@ -248,13 +262,13 @@ class Registry {
                 runAuthFlow = true;
             }
             if (runAuthFlow) {
-                const oAuth2 = ping.authenticationData;
+                const oAuth2 = ping.authentication_data;
                 const oAuth2ProtocolPath = "//oauth2";
                 const sRedirectUri = `trm:${oAuth2ProtocolPath}`;
-                const oAuth2Url = new URL(oAuth2.authorizationUrl);
+                const oAuth2Url = new URL(oAuth2.authorization_url);
                 const oAuth2State = (0, crypto_1.randomUUID)();
-                oAuth2Url.searchParams.append("client_id", oAuth2.clientId);
-                oAuth2Url.searchParams.append("response_type", oAuth2.responseType);
+                oAuth2Url.searchParams.append("client_id", oAuth2.client_id);
+                oAuth2Url.searchParams.append("response_type", oAuth2.response_type);
                 oAuth2Url.searchParams.append("redirect_uri", sRedirectUri);
                 oAuth2Url.searchParams.append("state", oAuth2State);
                 var sAuth2Url = oAuth2Url.toString();
@@ -291,7 +305,7 @@ class Registry {
                 }
             }
             this._authData = authData;
-            var axiosHeaders = new axios_1.AxiosHeaders();
+            var axiosHeaders = this.getDefaultAxiosHeaders();
             var axiosDefaults = {
                 baseURL: this.endpoint,
                 headers: axiosHeaders
@@ -305,97 +319,155 @@ class Registry {
     }
     ping() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._ping) {
+            var data = this._cache.get('ping');
+            if (!data) {
                 try {
-                    this._ping = (yield this._axiosInstance.get('/')).data;
+                    data = (yield this._axiosInstance.get('/', {
+                        headers: {}
+                    })).data;
                 }
                 catch (e) {
-                    throw new Error('Registry cannot be reached.');
+                    if (e.errors) {
+                        e.errors.forEach(err => trm_commons_1.Logger.error(err.message));
+                    }
+                    data = new Error(`Registry "${this.name}" cannot be reached.`);
                 }
+                this._cache.set('ping', data);
+            }
+            if (data instanceof Error) {
+                throw data;
+            }
+            else {
+                return data;
             }
-            return this._ping;
         });
     }
     whoAmI() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this._whoami) {
-                this._whoami = (yield this._axiosInstance.get('/whoami')).data;
+            var data = this._cache.get('whoami');
+            if (!data) {
+                try {
+                    data = (yield this._axiosInstance.get('/whoami')).data;
+                }
+                catch (e) {
+                    data = e;
+                }
+                this._cache.set('whoami', data);
+            }
+            if (data instanceof Error) {
+                throw data;
+            }
+            else {
+                return data;
             }
-            return this._whoami;
         });
     }
-    packageExists(name, version) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var responseStatus;
-            try {
-                responseStatus = (yield this._axiosInstance.get('/view', {
-                    params: {
-                        name,
-                        version
+    getPackage(fullName_1) {
+        return __awaiter(this, arguments, void 0, function* (fullName, version = 'latest') {
+            var data = this._cache.get(`package-${fullName}-${version}`);
+            if (!data) {
+                var ttl;
+                try {
+                    data = (yield this._axiosInstance.get(`/package/${fullName}`, {
+                        params: {
+                            version
+                        }
+                    })).data;
+                    if (data.download_link_expiry) {
+                        try {
+                            ttl = Math.max(0, Math.floor((data.download_link_expiry - Date.now()) / 1000));
+                        }
+                        catch (_a) { }
                     }
-                })).status;
+                }
+                catch (e) {
+                    data = e;
+                }
+                this._cache.set(`package-${fullName}-${version}`, data, ttl);
+            }
+            if (data instanceof Error) {
+                throw data;
+            }
+            else {
+                return data;
+            }
+        });
+    }
+    downloadArtifact(fullName_1) {
+        return __awaiter(this, arguments, void 0, function* (fullName, version = 'latest') {
+            var buffer;
+            const packageData = yield this.getPackage(fullName, version);
+            try {
+                buffer = (yield this._axiosInstance.get(packageData.download_link, {
+                    headers: {
+                        'Accept': 'application/octet-stream',
+                    },
+                    maxRedirects: 10,
+                    responseType: 'arraybuffer',
+                    validateStatus: s => s >= 200 && s < 400,
+                })).data;
             }
             catch (e) {
-                responseStatus = 404;
+                trm_commons_1.Logger.error(e.toString(), true);
+                trm_commons_1.Logger.error(`Failed to fetch package at ${packageData.download_link}: ${e.message}`);
+                throw e;
             }
-            return responseStatus === 200;
+            return new TrmArtifact_1.TrmArtifact(buffer);
         });
     }
-    view(name_1) {
-        return __awaiter(this, arguments, void 0, function* (name, version = 'latest') {
-            const response = (yield this._axiosInstance.get('/view', {
+    validatePublish(fullName_1) {
+        return __awaiter(this, arguments, void 0, function* (fullName, version = 'latest') {
+            const status = (yield this._axiosInstance.get(`/publish/check/${fullName}`, {
                 params: {
-                    name,
                     version
                 }
-            })).data;
-            return response;
+            })).status;
+            if (status !== 204) {
+                throw new Error(`Package cannot be published`);
+            }
         });
     }
-    getArtifact(name_1) {
-        return __awaiter(this, arguments, void 0, function* (name, version = 'latest') {
-            const response = (yield this._axiosInstance.get('/install', {
+    publish(fullName, version, artifact, readme) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const fileName = `${fullName}_v${version}`.replace('.', '_') + '.trm';
+            const formData = new FormData.default();
+            formData.append('artifact', artifact.binary, {
+                filename: fileName,
+                contentType: 'application/octet-stream'
+            });
+            if (readme) {
+                formData.append('readme', Buffer.from(readme), {
+                    filename: 'readme.md',
+                    contentType: 'text/markdown'
+                });
+            }
+            return (yield this._axiosInstance.post(`/publish/${fullName}`, formData, {
                 params: {
-                    name,
                     version
                 },
-                headers: {
-                    'Accept': 'application/octet-stream'
-                },
-                responseType: 'arraybuffer'
-            })).data;
-            return new TrmArtifact_1.TrmArtifact(response);
-        });
-    }
-    publishArtifact(packageName, version, artifact, readme) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fileName = `${packageName}@${version}`.replace('.', '_') + '.trm';
-            const formData = new FormData.default();
-            formData.append('artifact', artifact.binary, fileName);
-            formData.append('readme', readme);
-            yield this._axiosInstance.post('/publish', formData, {
                 headers: formData.getHeaders()
-            });
+            })).data;
         });
     }
-    unpublish(packageName, version) {
+    unpublish(fullName, version) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._axiosInstance.post('/unpublish', {
-                package: packageName,
-                version
+            yield this._axiosInstance.post(`/unpublish/${fullName}`, null, {
+                params: {
+                    version
+                }
             });
         });
     }
-    getReleases(packageName, versionRange) {
+    deprecate(fullName, version, reason) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = (yield this._axiosInstance.get('/releases', {
+            yield this._axiosInstance.post(`/deprecate/${fullName}`, {
+                deprecate_note: reason
+            }, {
                 params: {
-                    name: packageName,
-                    version: versionRange
+                    version
                 }
-            })).data;
-            return response;
+            });
         });
     }
 }
-exports.Registry = Registry;
+exports.RegistryV2 = RegistryV2;

package/dist/registry/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./Registry";
+export * from "./RegistryV2";
 export * from "./RegistryType";
 export * from "./AbstractRegistry";
 export * from "./FileSystem";

package/dist/registry/index.js

@@ -14,7 +14,7 @@ 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("./Registry"), exports);
+__exportStar(require("./RegistryV2"), exports);
 __exportStar(require("./RegistryType"), exports);
 __exportStar(require("./AbstractRegistry"), exports);
 __exportStar(require("./FileSystem"), exports);

package/dist/systemConnector/ISystemConnectorBase.d.ts

@@ -6,7 +6,7 @@ import { TrmPackage } from "../trmPackage";
 import { InstallPackage } from "./InstallPackage";
 export interface ISystemConnectorBase {
     getTransportStatus: (trkorr: components.TRKORR) => Promise<string>;
-    getPackageWorkbenchTransport: (oPackage: TrmPackage) => Promise<Transport>;
+    getWbTransports: (trmPackage?: string | TrmPackage) => Promise<Transport[]>;
     getSourceTrkorr: () => Promise<components.TRKORR[]>;
     getIgnoredTrkorr: () => Promise<components.TRKORR[]>;
     getObject: (pgmid: components.PGMID, object: components.TROBJTYPE, objName: components.SOBJ_NAME) => Promise<struct.TADIR>;

package/dist/systemConnector/SystemConnector.d.ts

@@ -19,7 +19,7 @@ export declare namespace SystemConnector {
     function closeConnection(): Promise<void>;
     function checkConnection(): Promise<boolean>;
     function getTransportStatus(trkorr: TRKORR): Promise<string>;
-    function getPackageWorkbenchTransport(oPackage: TrmPackage): Promise<Transport>;
+    function getWbTransports(trmPackage?: string | TrmPackage): Promise<Transport[]>;
     function getInstalledPackages(includeSources: boolean, refresh?: boolean, includeLocals?: boolean): Promise<TrmPackage[]>;
     function getDevclass(devclass: DEVCLASS): Promise<TDEVC>;
     function getTransportTargets(): Promise<TMSCSYS[]>;

package/dist/systemConnector/SystemConnector.js

@@ -79,13 +79,13 @@ var SystemConnector;
         });
     }
     SystemConnector.getTransportStatus = getTransportStatus;
-    function getPackageWorkbenchTransport(oPackage) {
+    function getWbTransports(trmPackage) {
         return __awaiter(this, void 0, void 0, function* () {
             yield checkSystemConnector();
-            return SystemConnector.systemConnector.getPackageWorkbenchTransport(oPackage);
+            return SystemConnector.systemConnector.getWbTransports(trmPackage);
         });
     }
-    SystemConnector.getPackageWorkbenchTransport = getPackageWorkbenchTransport;
+    SystemConnector.getWbTransports = getWbTransports;
     function getInstalledPackages(includeSources, refresh, includeLocals) {
         return __awaiter(this, void 0, void 0, function* () {
             yield checkSystemConnector();

package/dist/systemConnector/SystemConnectorBase.d.ts

@@ -29,7 +29,7 @@ export declare abstract class SystemConnectorBase implements ISystemConnectorBas
     protected abstract getInstalledPackagesBackend(): Promise<struct.ZTY_TRM_PACKAGE[]>;
     constructor();
     getTransportStatus(trkorr: TRKORR): Promise<string>;
-    getPackageWorkbenchTransport(oPackage: TrmPackage): Promise<Transport>;
+    getWbTransports(trmPackage?: string | TrmPackage): Promise<Transport[]>;
     getSourceTrkorr(refresh?: boolean): Promise<TRKORR[]>;
     getObject(pgmid: PGMID, object: TROBJTYPE, objName: SOBJ_NAME): Promise<TADIR>;
     getIgnoredTrkorr(refresh?: boolean): Promise<TRKORR[]>;

package/dist/systemConnector/SystemConnectorBase.js

@@ -36,9 +36,16 @@ class SystemConnectorBase {
             }
         });
     }
-    getPackageWorkbenchTransport(oPackage) {
+    getWbTransports(trmPackage) {
         return __awaiter(this, void 0, void 0, function* () {
-            var aTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}'`)).map(o => o.trkorr);
+            var sqlWhere = `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}'`;
+            if (trmPackage instanceof trmPackage_1.TrmPackage) {
+                sqlWhere += ` AND OBJ_NAME EQ 'name=${trmPackage.packageName}'`;
+            }
+            else if (typeof trmPackage === 'string') {
+                sqlWhere += ` AND OBJ_NAME EQ 'name=${trmPackage}'`;
+            }
+            var aTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], sqlWhere)).map(o => o.trkorr);
             aTrkorr = Array.from(new Set(aTrkorr));
             var aSkipTrkorr = [];
             for (const sTrkorr of aTrkorr) {
@@ -54,20 +61,35 @@ class SystemConnectorBase {
                 }
             }
             aTrkorr = aTrkorr.filter(trkorr => !aSkipTrkorr.includes(trkorr));
-            const transports = aTrkorr.map(trkorr => new transport_1.Transport(trkorr));
             var packageTransports = [];
-            for (const transport of transports) {
-                const transportPackage = yield transport.getLinkedPackage();
-                if (transportPackage) {
-                    if (trmPackage_1.TrmPackage.compare(transportPackage, oPackage)) {
+            var transports = aTrkorr.map(trkorr => new transport_1.Transport(trkorr));
+            for (let i = transports.length - 1; i >= 0; i--) {
+                if (!(yield transports[i].getLinkedPackage())) {
+                    transports.splice(i, 1);
+                }
+            }
+            if (trmPackage instanceof trmPackage_1.TrmPackage) {
+                for (const transport of transports) {
+                    const transportPackage = yield transport.getLinkedPackage();
+                    if (transportPackage) {
+                        if (trmPackage_1.TrmPackage.compare(transportPackage, trmPackage)) {
+                            packageTransports.push(transport);
+                        }
+                    }
+                }
+                return [yield transport_1.Transport.getLatest(packageTransports)];
+            }
+            else if (typeof trmPackage === 'string') {
+                for (const transport of transports) {
+                    if ((yield transport.getTrmPackageName()) === trmPackage) {
                         packageTransports.push(transport);
                     }
                 }
+                return packageTransports;
             }
-            if (packageTransports.length > 0) {
-                return yield transport_1.Transport.getLatest(packageTransports);
+            else {
+                return transports;
             }
-            return null;
         });
     }
     getSourceTrkorr(refresh) {
@@ -231,7 +253,7 @@ class SystemConnectorBase {
             var aSkipTrkorr = yield this.getIgnoredTrkorr();
             trm_commons_1.Logger.log(`Ignored trkorr ${JSON.stringify(aSkipTrkorr)}`, true);
             var aMigrationTrkorr;
-            var aActualTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}' AND TRKORR EQ 'RSTK906391'`)).map(o => o.trkorr);
+            var aActualTrkorr = (yield this.readTable('E071', [{ fieldName: 'TRKORR' }], `PGMID EQ '*' AND OBJECT EQ '${transport_1.COMMENT_OBJ}'`)).map(o => o.trkorr);
             aActualTrkorr = Array.from(new Set(aActualTrkorr));
             try {
                 aMigrationTrkorr = (yield this.readTable('ZTRM_E070', [{ fieldName: 'TRM_TROKRR' }])).map(o => o.trmTrokrr);

package/dist/transport/Transport.d.ts

@@ -16,7 +16,8 @@ export declare class Transport {
     private _e070;
     private _e071;
     private _docs;
-    private _trmRelevant;
+    private _trmPackageName;
+    private _trmPackageVersion;
     private _linkedTrmPackage;
     private _rootDevclass;
     trmIdentifier?: TrmTransportIdentifier;
@@ -29,6 +30,8 @@ export declare class Transport {
     getTasks(): Promise<Transport[]>;
     getDevclass(aTdevc?: TDEVC[]): Promise<DEVCLASS>;
     getDate(): Promise<Date>;
+    getTrmPackageName(): Promise<string>;
+    getTrmPackageVersion(): Promise<string>;
     isTrmRelevant(): Promise<boolean>;
     download(): Promise<{
         binaries: BinaryTransport;

package/dist/transport/Transport.js

@@ -183,17 +183,46 @@ class Transport {
             return (0, commons_1.fromAbapToDate)(e070.as4Date, e070.as4Time);
         });
     }
-    isTrmRelevant() {
+    getTrmPackageName() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this._trmRelevant === undefined) {
+            if (this._trmPackageName === undefined) {
                 const e071 = yield this.getE071();
                 const trmComments = e071.filter(o => o.pgmid === '*' && o.object === exports.COMMENT_OBJ);
-                const hasName = trmComments.find(o => /name=/i.test(o.objName));
-                const hasVersion = trmComments.find(o => /version=/i.test(o.objName));
-                const hasDocumentation = (yield this.getDocumentation()).length > 0;
-                this._trmRelevant = (hasName && hasVersion && hasDocumentation) ? true : false;
+                trmComments.forEach(s => {
+                    if (!this._trmPackageName) {
+                        try {
+                            this._trmPackageName = /name=(\S*)/i.exec(s.objName)[1];
+                        }
+                        catch (e) { }
+                    }
+                });
+            }
+            return this._trmPackageName;
+        });
+    }
+    getTrmPackageVersion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._trmPackageVersion === undefined) {
+                const e071 = yield this.getE071();
+                const trmComments = e071.filter(o => o.pgmid === '*' && o.object === exports.COMMENT_OBJ);
+                trmComments.forEach(s => {
+                    if (!this._trmPackageVersion) {
+                        try {
+                            this._trmPackageVersion = /version=(\S*)/i.exec(s.objName)[1];
+                        }
+                        catch (e) { }
+                    }
+                });
             }
-            return this._trmRelevant;
+            return this._trmPackageVersion;
+        });
+    }
+    isTrmRelevant() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const packageName = yield this.getTrmPackageName();
+            const packageVersion = yield this.getTrmPackageVersion();
+            const hasDocumentation = (yield this.getDocumentation()).length > 0;
+            return !!(packageName && packageVersion && hasDocumentation);
         });
     }
     download() {
@@ -368,31 +397,14 @@ class Transport {
     }
     release(lock, skipLog, tmpFolder, secondsTimeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            var rc;
             trm_commons_1.Logger.loading('Releasing transport...', skipLog);
             yield systemConnector_1.SystemConnector.releaseTrkorr(this.trkorr, lock, secondsTimeout);
             yield systemConnector_1.SystemConnector.dequeueTransport(this.trkorr);
             if (tmpFolder) {
-                rc = yield this.readReleaseLog(tmpFolder, secondsTimeout);
+                yield this.readReleaseLog(tmpFolder, secondsTimeout);
             }
             else {
-                rc = yield this._isInTmsQueue(skipLog, false, secondsTimeout);
-            }
-            if (!skipLog && !tmpFolder) {
-                switch (rc) {
-                    case 4:
-                        trm_commons_1.Logger.warning(`${this.trkorr} release ended with warning.`);
-                        break;
-                    case 8:
-                        trm_commons_1.Logger.error(`${this.trkorr} release ended with error.`);
-                        break;
-                    case 12:
-                        trm_commons_1.Logger.error(`${this.trkorr} release was cancelled.`);
-                        break;
-                    case 16:
-                        trm_commons_1.Logger.error(`${this.trkorr} release was cancelled.`);
-                        break;
-                }
+                yield this._isInTmsQueue(skipLog, false, secondsTimeout);
             }
         });
     }
@@ -559,7 +571,6 @@ class Transport {
             var inQueue = false;
             var rc = 12;
             if (this._trTarget) {
-                var sLog = `status unknown`;
                 var inQueueAttempts = 0;
                 while (!inQueue && (new Date()).getTime() < timeoutDate.getTime()) {
                     inQueueAttempts++;
@@ -570,14 +581,17 @@ class Transport {
                     tmsQueue = tmsQueue.filter(o => o.trkorr === this.trkorr);
                     tmsQueue = tmsQueue.sort((a, b) => parseInt(b.bufpos) - parseInt(a.bufpos));
                     if (!checkImpSing) {
-                        sLog = `released`;
                         inQueue = tmsQueue.length > 0;
                     }
                     else {
-                        sLog = `imported`;
                         if (tmsQueue.length > 0) {
                             inQueue = tmsQueue[0].impsing !== 'X';
-                            rc = parseInt(tmsQueue[0].maxrc);
+                            if (!tmsQueue[0].maxrc) {
+                                rc = -1;
+                            }
+                            else {
+                                rc = parseInt(tmsQueue[0].maxrc);
+                            }
                         }
                         else {
                             inQueue = false;
@@ -588,7 +602,10 @@ class Transport {
                     throw new Error(`${this.trkorr} not found in queue, timed out after ${inQueueAttempts + 1} attempts`);
                 }
                 else {
-                    trm_commons_1.Logger.success(`${this.trkorr} ${sLog}.`, skipLog);
+                    if (!checkImpSing) {
+                        trm_commons_1.Logger.success(`${this.trkorr} released.`, skipLog);
+                        rc = -1;
+                    }
                 }
             }
             else {
@@ -754,6 +771,12 @@ class Transport {
             const rc = yield this._isInTmsQueue(false, true, timeout);
             trm_commons_1.Logger.log(`Transport ${this.trkorr} import ended: return code ${rc}`, true);
             switch (rc) {
+                case -1:
+                    trm_commons_1.Logger.error(`${this.trkorr} import has no return code!`);
+                    break;
+                case 0:
+                    trm_commons_1.Logger.success(`${this.trkorr} import ended with success.`);
+                    break;
                 case 4:
                     trm_commons_1.Logger.warning(`${this.trkorr} import ended with warning.`);
                     break;

package/dist/trmPackage/TrmArtifact.js

@@ -84,7 +84,7 @@ class TrmArtifact {
         return this._manifest;
     }
     replaceManifest(oManifest) {
-        const manifestBuffer = Buffer.from(JSON.stringify(oManifest.get(false), null, 2), 'utf8');
+        const manifestBuffer = Buffer.from(oManifest.getJSON(), 'utf8');
         this._zip.updateFile('manifest.json', manifestBuffer);
     }
     getDistFolder() {
@@ -218,10 +218,8 @@ class TrmArtifact {
                     trm_commons_1.Logger.error(`Couldn't add source code to TRM artifact!`);
                 }
             }
-            var oManifest = data.manifest.get(false);
-            var oSapEntries = oManifest.sapEntries;
-            delete oManifest.sapEntries;
-            const manifestBuffer = Buffer.from(JSON.stringify(oManifest, null, 2), 'utf8');
+            const oSapEntries = data.manifest.get().sapEntries;
+            const manifestBuffer = Buffer.from(data.manifest.getJSON(["sapEntries"]), 'utf8');
             trm_commons_1.Logger.log(`Adding manifest.json`, true);
             artifact.addFile(`manifest.json`, manifestBuffer, `manifest`);
             if (oSapEntries && Object.keys(oSapEntries).length > 0) {