trm-core 5.0.0 → 6.0.0

package/dist/systemConnector/RESTSystemConnector.js

@@ -25,7 +25,8 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
         this._connection = _connection;
         this._login = _login;
         this.supportedBulk = {
-            getTransportObjects: true
+            getTransportObjects: true,
+            getExistingObjects: true
         };
         this._login.user = this._login.user.toUpperCase();
         this._lang = this._login.lang;
@@ -42,10 +43,11 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
         }
         else {
             this.supportedBulk.getTransportObjects = false;
+            this.supportedBulk.getExistingObjects = false;
         }
         this._connection.rfcdest = this._connection.rfcdest.toUpperCase().trim();
         logger_1.Logger.log(`REST connection data after normalize: ${JSON.stringify(this._connection)}`, true);
-        this._client = new client_1.RESTClient(this._connection.endpoint, this._connection.rfcdest, this._login);
+        this._client = new client_1.RESTClient(this._connection.endpoint, this._connection.rfcdest, this._login, this._lang[0]);
     }
     getSysname() {
         return this.getDest();
@@ -58,7 +60,7 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
     }
     getLogonLanguage(c = false) {
         if (c) {
-            return Array.from(this._lang)[0];
+            return this._lang[0];
         }
         else {
             return this._lang;
@@ -79,9 +81,14 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
             return this._client.getDevclassObjects(devclass);
         });
     }
-    tdevcInterface(devclass, parentcl, rmParentCl) {
+    tdevcInterface(devclass, parentcl, rmParentCl, devlayer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._client.tdevcInterface(devclass, parentcl, rmParentCl);
+            return this._client.tdevcInterface(devclass, parentcl, rmParentCl, devlayer);
+        });
+    }
+    getR3transInfo() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._client.getR3transInfo();
         });
     }
     getConnectionData() {
@@ -249,6 +256,20 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
             return this._client.getTransportObjectsBulk(trkorr);
         });
     }
+    getExistingObjectsBulk(objects) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._client.getExistingObjectsBulk(objects);
+        });
+    }
+    addNamespace(namespace, replicense, texts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._client.addNamespace(namespace, replicense, texts);
+        });
+    }
+    getMessage(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._client.getMessage(data);
+        });
+    }
 }
 exports.RESTSystemConnector = RESTSystemConnector;
-//# sourceMappingURL=RESTSystemConnector.js.map

package/dist/systemConnector/RFCConnection.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=RFCConnection.js.map

package/dist/systemConnector/RFCSystemConnector.d.ts

@@ -1,7 +1,8 @@
+import { SapMessage } from "../client";
 import { DEVCLASS } from "../client/components";
 import { TADIR } from "../client/struct";
 import { RFCConnection } from "./RFCConnection";
-import { Login } from "./Login";
+import { Login } from "../client/Login";
 import { ISystemConnector } from "./ISystemConnector";
 import * as components from "../client/components";
 import * as struct from "../client/struct";
@@ -10,11 +11,12 @@ import { SystemConnectorSupportedBulk } from "./SystemConnectorSupportedBulk";
 export declare class RFCSystemConnector extends SystemConnectorBase implements ISystemConnector {
     private _connection;
     private _login;
+    private _traceDir?;
     private _lang;
     private _user;
     private _client;
     supportedBulk: SystemConnectorSupportedBulk;
-    constructor(_connection: RFCConnection, _login: Login);
+    constructor(_connection: RFCConnection, _login: Login, _traceDir?: string);
     protected getSysname(): string;
     getDest(): string;
     protected getLangu(c: boolean): string;
@@ -22,7 +24,8 @@ export declare class RFCSystemConnector extends SystemConnectorBase implements I
     protected readTable(tableName: components.TABNAME, fields: struct.RFC_DB_FLD[], options?: string): Promise<any[]>;
     protected getTrmServerVersion(): Promise<string>;
     protected listDevclassObjects(devclass: DEVCLASS): Promise<TADIR[]>;
-    protected tdevcInterface(devclass: components.DEVCLASS, parentcl?: components.DEVCLASS, rmParentCl?: boolean): Promise<void>;
+    protected tdevcInterface(devclass: components.DEVCLASS, parentcl?: components.DEVCLASS, rmParentCl?: boolean, devlayer?: components.DEVLAYER): Promise<void>;
+    protected getR3transInfo(): Promise<string>;
     getConnectionData(): RFCConnection;
     getLogonUser(): string;
     connect(): Promise<void>;
@@ -54,4 +57,6 @@ export declare class RFCSystemConnector extends SystemConnectorBase implements I
     setPackageIntegrity(integrity: struct.ZTRM_INTEGRITY): Promise<void>;
     addTranslationToTr(trkorr: components.TRKORR, devclassFilter: struct.LXE_TT_PACKG_LINE[]): Promise<void>;
     trCopy(from: components.TRKORR, to: components.TRKORR, doc: boolean): Promise<void>;
+    addNamespace(namespace: components.NAMESPACE, replicense: components.TRNLICENSE, texts: struct.TRNSPACETT[]): Promise<void>;
+    getMessage(data: SapMessage): Promise<string>;
 }

package/dist/systemConnector/RFCSystemConnector.js

@@ -14,12 +14,14 @@ const logger_1 = require("../logger");
 const client_1 = require("../client");
 const SystemConnectorBase_1 = require("./SystemConnectorBase");
 class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
-    constructor(_connection, _login) {
+    constructor(_connection, _login, _traceDir) {
         super();
         this._connection = _connection;
         this._login = _login;
+        this._traceDir = _traceDir;
         this.supportedBulk = {
-            getTransportObjects: false
+            getTransportObjects: false,
+            getExistingObjects: false
         };
         this._login.user = this._login.user.toUpperCase();
         this._lang = this._login.lang;
@@ -27,7 +29,7 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
         if (!this._connection.saprouter) {
             delete this._connection.saprouter;
         }
-        this._client = new client_1.RFCClient(Object.assign(Object.assign({}, this._connection), this._login));
+        this._client = new client_1.RFCClient(Object.assign(Object.assign({}, this._connection), this._login), this._lang[0], this._traceDir);
     }
     getSysname() {
         return this.getDest();
@@ -40,7 +42,7 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
     }
     getLogonLanguage(c = false) {
         if (c) {
-            return Array.from(this._lang)[0];
+            return this._lang[0];
         }
         else {
             return this._lang;
@@ -61,9 +63,14 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
             return this._client.getDevclassObjects(devclass);
         });
     }
-    tdevcInterface(devclass, parentcl, rmParentCl) {
+    tdevcInterface(devclass, parentcl, rmParentCl, devlayer) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._client.tdevcInterface(devclass, parentcl, rmParentCl);
+            return this._client.tdevcInterface(devclass, parentcl, rmParentCl, devlayer);
+        });
+    }
+    getR3transInfo() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._client.getR3transInfo();
         });
     }
     getConnectionData() {
@@ -225,6 +232,15 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
             return this._client.trCopy(from, to, doc);
         });
     }
+    addNamespace(namespace, replicense, texts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._client.addNamespace(namespace, replicense, texts);
+        });
+    }
+    getMessage(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._client.getMessage(data);
+        });
+    }
 }
 exports.RFCSystemConnector = RFCSystemConnector;
-//# sourceMappingURL=RFCSystemConnector.js.map

package/dist/systemConnector/SystemConnector.d.ts

@@ -4,7 +4,7 @@ import { Transport } from "../transport";
 import { TrmPackage } from "../trmPackage";
 import { ISystemConnector } from "./ISystemConnector";
 import { InstallPackage } from "./InstallPackage";
-import { SapMessage } from "./SapMessage";
+import { SapMessage } from "../client/SapMessage";
 import * as components from "../client/components";
 import * as struct from "../client/struct";
 import { SystemConnectorSupportedBulk } from "./SystemConnectorSupportedBulk";
@@ -33,6 +33,7 @@ export declare namespace SystemConnector {
     function getInstallPackages(packageName: string, registry: Registry): Promise<InstallPackage[]>;
     function setPackageSuperpackage(devclass: DEVCLASS, superpackage: DEVCLASS): Promise<void>;
     function clearPackageSuperpackage(devclass: DEVCLASS): Promise<void>;
+    function setPackageTransportLayer(devclass: DEVCLASS, devlayer: components.DEVLAYER): Promise<void>;
     function getMessage(data: SapMessage): Promise<string>;
     function checkSapEntryExists(table: string, sapEntry: any): Promise<boolean>;
     function ping(): Promise<string>;
@@ -63,4 +64,14 @@ export declare namespace SystemConnector {
     function addTranslationToTr(trkorr: components.TRKORR, devclassFilter: struct.LXE_TT_PACKG_LINE[]): Promise<void>;
     function getFunctionModule(func: components.RS38L_FNAME): Promise<struct.TFDIR>;
     function getTransportObjectsBulk(trkorr: components.TRKORR): Promise<struct.TADIR[]>;
+    function getExistingObjects(objects: struct.TADIR[]): Promise<struct.TADIR[]>;
+    function getExistingObjectsBulk(objects: struct.TADIR[]): Promise<struct.TADIR[]>;
+    function getNamespace(namespace: components.NAMESPACE): Promise<{
+        trnspacet: struct.TRNSPACET;
+        trnspacett: struct.TRNSPACETT[];
+    }>;
+    function addNamespace(namespace: components.NAMESPACE, replicense: components.TRNLICENSE, texts: struct.TRNSPACETT[]): Promise<void>;
+    function getR3transVersion(): Promise<string>;
+    function getR3transUnicode(): Promise<boolean>;
+    function isTransportLayerExist(devlayer: components.DEVLAYER): Promise<boolean>;
 }

package/dist/systemConnector/SystemConnector.js

@@ -177,6 +177,13 @@ var SystemConnector;
         });
     }
     SystemConnector.clearPackageSuperpackage = clearPackageSuperpackage;
+    function setPackageTransportLayer(devclass, devlayer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield checkSystemConnector();
+            yield SystemConnector.systemConnector.setPackageTransportLayer(devclass, devlayer);
+        });
+    }
+    SystemConnector.setPackageTransportLayer = setPackageTransportLayer;
     function getMessage(data) {
         return __awaiter(this, void 0, void 0, function* () {
             yield checkSystemConnector();
@@ -387,5 +394,53 @@ var SystemConnector;
         });
     }
     SystemConnector.getTransportObjectsBulk = getTransportObjectsBulk;
+    function getExistingObjects(objects) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield checkSystemConnector();
+            return SystemConnector.systemConnector.getExistingObjects(objects);
+        });
+    }
+    SystemConnector.getExistingObjects = getExistingObjects;
+    function getExistingObjectsBulk(objects) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield checkSystemConnector();
+            return SystemConnector.systemConnector.getExistingObjectsBulk(objects);
+        });
+    }
+    SystemConnector.getExistingObjectsBulk = getExistingObjectsBulk;
+    function getNamespace(namespace) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield checkSystemConnector();
+            return SystemConnector.systemConnector.getNamespace(namespace);
+        });
+    }
+    SystemConnector.getNamespace = getNamespace;
+    function addNamespace(namespace, replicense, texts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield checkSystemConnector();
+            return SystemConnector.systemConnector.addNamespace(namespace, replicense, texts);
+        });
+    }
+    SystemConnector.addNamespace = addNamespace;
+    function getR3transVersion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield checkSystemConnector();
+            return SystemConnector.systemConnector.getR3transVersion();
+        });
+    }
+    SystemConnector.getR3transVersion = getR3transVersion;
+    function getR3transUnicode() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield checkSystemConnector();
+            return SystemConnector.systemConnector.getR3transUnicode();
+        });
+    }
+    SystemConnector.getR3transUnicode = getR3transUnicode;
+    function isTransportLayerExist(devlayer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield checkSystemConnector();
+            return SystemConnector.systemConnector.isTransportLayerExist(devlayer);
+        });
+    }
+    SystemConnector.isTransportLayerExist = isTransportLayerExist;
 })(SystemConnector || (exports.SystemConnector = SystemConnector = {}));
-//# sourceMappingURL=SystemConnector.js.map

package/dist/systemConnector/SystemConnectorBase.d.ts

@@ -3,7 +3,6 @@ import { TADIR, TDEVC, TMSCSYS } from "../client/struct";
 import { Transport } from "../transport";
 import { TrmPackage } from "../trmPackage";
 import { InstallPackage } from "./InstallPackage";
-import { SapMessage } from "./SapMessage";
 import * as components from "../client/components";
 import * as struct from "../client/struct";
 import { ISystemConnectorBase } from "./ISystemConnectorBase";
@@ -14,12 +13,14 @@ export declare const SKIP_TRKORR_TABL = "ZTRM_SKIP_TRKORR";
 export declare abstract class SystemConnectorBase implements ISystemConnectorBase {
     private _installedPackages;
     private _installedPackagesI;
+    private _r3transInfoLog;
     protected abstract readTable(tableName: components.TABNAME, fields: struct.RFC_DB_FLD[], options?: string): Promise<any[]>;
     protected abstract getSysname(): string;
     protected abstract getLangu(c: boolean): string;
     protected abstract getTrmServerVersion(): Promise<string>;
     protected abstract listDevclassObjects(devclass: components.DEVCLASS): Promise<struct.TADIR[]>;
-    protected abstract tdevcInterface(devclass: components.DEVCLASS, parentcl?: components.DEVCLASS, rmParentCl?: boolean): Promise<void>;
+    protected abstract tdevcInterface(devclass: components.DEVCLASS, parentcl?: components.DEVCLASS, rmParentCl?: boolean, devlayer?: components.DEVLAYER): Promise<void>;
+    protected abstract getR3transInfo(): Promise<string>;
     constructor();
     getTransportStatus(trkorr: TRKORR): Promise<string>;
     getPackageWorkbenchTransport(oPackage: TrmPackage): Promise<Transport>;
@@ -35,8 +36,16 @@ export declare abstract class SystemConnectorBase implements ISystemConnectorBas
     getInstallPackages(packageName: string, registry: Registry): Promise<InstallPackage[]>;
     setPackageSuperpackage(devclass: DEVCLASS, superpackage: DEVCLASS): Promise<void>;
     clearPackageSuperpackage(devclass: DEVCLASS): Promise<void>;
-    getMessage(data: SapMessage): Promise<string>;
+    setPackageTransportLayer(devclass: DEVCLASS, devlayer: components.DEVLAYER): Promise<void>;
     checkSapEntryExists(table: string, sapEntry: any): Promise<boolean>;
     getPackageIntegrity(oPackage: TrmPackage): Promise<string>;
     getFunctionModule(func: string): Promise<struct.TFDIR>;
+    getExistingObjects(objects: TADIR[]): Promise<TADIR[]>;
+    getNamespace(namespace: components.NAMESPACE): Promise<{
+        trnspacet: struct.TRNSPACET;
+        trnspacett: struct.TRNSPACETT[];
+    }>;
+    getR3transVersion(): Promise<string>;
+    getR3transUnicode(): Promise<boolean>;
+    isTransportLayerExist(devlayer: components.DEVLAYER): Promise<boolean>;
 }

package/dist/systemConnector/SystemConnectorBase.js

@@ -16,6 +16,7 @@ const manifest_1 = require("../manifest");
 const transport_1 = require("../transport");
 const trmPackage_1 = require("../trmPackage");
 const registry_1 = require("../registry");
+const node_r3trans_1 = require("node-r3trans");
 exports.TRM_SERVER_PACKAGE_NAME = 'trm-server';
 exports.SRC_TRKORR_TABL = 'ZTRM_SRC_TRKORR';
 exports.SKIP_TRKORR_TABL = 'ZTRM_SKIP_TRKORR';
@@ -292,24 +293,9 @@ class SystemConnectorBase {
             return yield this.tdevcInterface(devclass, null, true);
         });
     }
-    getMessage(data) {
+    setPackageTransportLayer(devclass, devlayer) {
         return __awaiter(this, void 0, void 0, function* () {
-            var msgnr = data.no;
-            while (msgnr.length < 3) {
-                msgnr = `0${msgnr}`;
-            }
-            const aT100 = yield this.readTable('T100', [{ fieldName: 'SPRSL' }, { fieldName: 'ARBGB' }, { fieldName: 'MSGNR' }, { fieldName: 'TEXT' }], `SPRSL EQ '${this.getLangu(true)}' AND ARBGB EQ '${data.class}' AND MSGNR EQ '${msgnr}'`);
-            if (aT100.length === 1) {
-                var msg = aT100[0].text;
-                msg = msg.replace(/&(1)?/, data.v1 || '');
-                msg = msg.replace(/&(2)?/, data.v2 || '');
-                msg = msg.replace(/&(3)?/, data.v3 || '');
-                msg = msg.replace(/&(4)?/, data.v4 || '');
-                return msg;
-            }
-            else {
-                throw new Error(`Message ${msgnr}, class ${data.class}, lang ${this.getLangu(true)} not found.`);
-            }
+            return yield this.tdevcInterface(devclass, null, null, devlayer);
         });
     }
     checkSapEntryExists(table, sapEntry) {
@@ -348,6 +334,51 @@ class SystemConnectorBase {
             }
         });
     }
+    getExistingObjects(objects) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var ret = [];
+            for (const object of objects) {
+                const oTadir = yield this.getObject(object.pgmid, object.object, object.objName);
+                if (oTadir) {
+                    ret.push(oTadir);
+                }
+            }
+            return ret;
+        });
+    }
+    getNamespace(namespace) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aNamespace = yield this.readTable('TRNSPACET', [{ fieldName: 'NAMESPACE' }, { fieldName: 'REPLICENSE' }], `NAMESPACE EQ '${namespace.toUpperCase()}'`);
+            if (aNamespace.length === 1) {
+                const aNamespacet = yield this.readTable('TRNSPACETT', [{ fieldName: 'NAMESPACE' }, { fieldName: 'SPRAS' }, { fieldName: 'DESCRIPTN' }, { fieldName: 'OWNER' }], `NAMESPACE EQ '${namespace.toUpperCase()}'`);
+                return {
+                    trnspacet: aNamespace[0],
+                    trnspacett: aNamespacet
+                };
+            }
+        });
+    }
+    getR3transVersion() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._r3transInfoLog) {
+                this._r3transInfoLog = yield this.getR3transInfo();
+            }
+            return node_r3trans_1.R3trans.getVersion(this._r3transInfoLog);
+        });
+    }
+    getR3transUnicode() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._r3transInfoLog) {
+                this._r3transInfoLog = yield this.getR3transInfo();
+            }
+            return node_r3trans_1.R3trans.isUnicode(this._r3transInfoLog);
+        });
+    }
+    isTransportLayerExist(devlayer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aTransportLayer = (yield this.readTable('TCETRAL', [{ fieldName: 'VERSION' }, { fieldName: 'TRANSLAYER' }], `TRANSLAYER EQ '${devlayer}'`));
+            return aTransportLayer.length > 0;
+        });
+    }
 }
 exports.SystemConnectorBase = SystemConnectorBase;
-//# sourceMappingURL=SystemConnectorBase.js.map

package/dist/systemConnector/SystemConnectorSupportedBulk.d.ts

@@ -1,3 +1,4 @@
 export type SystemConnectorSupportedBulk = {
     getTransportObjects: boolean;
+    getExistingObjects: boolean;
 };

package/dist/systemConnector/SystemConnectorSupportedBulk.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=SystemConnectorSupportedBulk.js.map

package/dist/systemConnector/index.d.ts

@@ -1,13 +1,13 @@
 export * from "./RFCConnection";
-export * from "./Login";
+export * from "../client/Login";
 export * from "./InstallPackage";
-export * from "./SapMessage";
+export * from "../client/SapMessage";
 export * from "./ISystemConnector";
 export * from "./SystemConnector";
 export * from "./ISystemConnectorBase";
 export * from "./SystemConnectorBase";
-export * from "./RFCSystemConnector";
 export * from "./RFCConnection";
 export * from "./RESTSystemConnector";
 export * from "./RESTConnection";
 export * from "./SystemConnectorSupportedBulk";
+export * from "./RFCSystemConnector";

package/dist/systemConnector/index.js

@@ -15,16 +15,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./RFCConnection"), exports);
-__exportStar(require("./Login"), exports);
+__exportStar(require("../client/Login"), exports);
 __exportStar(require("./InstallPackage"), exports);
-__exportStar(require("./SapMessage"), exports);
+__exportStar(require("../client/SapMessage"), exports);
 __exportStar(require("./ISystemConnector"), exports);
 __exportStar(require("./SystemConnector"), exports);
 __exportStar(require("./ISystemConnectorBase"), exports);
 __exportStar(require("./SystemConnectorBase"), exports);
-__exportStar(require("./RFCSystemConnector"), exports);
 __exportStar(require("./RFCConnection"), exports);
 __exportStar(require("./RESTSystemConnector"), exports);
 __exportStar(require("./RESTConnection"), exports);
 __exportStar(require("./SystemConnectorSupportedBulk"), exports);
-//# sourceMappingURL=index.js.map
+__exportStar(require("./RFCSystemConnector"), exports);

package/dist/transport/BinaryTransport.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=BinaryTransport.js.map

package/dist/transport/Documentation.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=Documentation.js.map

package/dist/transport/FileNames.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=FileNames.js.map

package/dist/transport/FilePaths.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=FilePaths.js.map

package/dist/transport/Transport.d.ts

@@ -40,8 +40,8 @@ export declare class Transport {
     addTranslations(aDevclass: DEVCLASS[]): Promise<void>;
     getLinkedPackage(): Promise<TrmPackage>;
     delete(): Promise<null>;
-    release(lock: boolean, skipLog: boolean, tmpFolder?: string, secondsTimeout?: number): Promise<Transport>;
-    readReleaseLog(tmpFolder: string, secondsTimeout: number): Promise<void>;
+    release(lock: boolean, skipLog: boolean, tmpFolder?: string, secondsTimeout?: number): Promise<void>;
+    readReleaseLog(tmpFolder: string, secondsTimeout: number): Promise<number>;
     readImportLog(tmpFolder: string): Promise<void>;
     private _isInTmsQueue;
     private static _getFileNames;

package/dist/transport/Transport.js

@@ -303,25 +303,42 @@ class Transport {
     }
     release(lock, skipLog, tmpFolder, secondsTimeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger_1.Logger.loading('Releasing...', skipLog);
+            var rc;
+            logger_1.Logger.loading('Releasing transport...', skipLog);
             yield systemConnector_1.SystemConnector.releaseTrkorr(this.trkorr, lock, secondsTimeout);
             yield systemConnector_1.SystemConnector.dequeueTransport(this.trkorr);
             if (tmpFolder) {
-                yield this.readReleaseLog(tmpFolder, secondsTimeout);
-                logger_1.Logger.loading(`Finalizing release...`, skipLog);
-                yield this._isInTmsQueue(true, false, secondsTimeout);
+                rc = yield this.readReleaseLog(tmpFolder, secondsTimeout);
             }
             else {
-                yield this._isInTmsQueue(skipLog, false, secondsTimeout);
+                rc = yield this._isInTmsQueue(skipLog, false, secondsTimeout);
+            }
+            if (!skipLog && !tmpFolder) {
+                switch (rc) {
+                    case 4:
+                        logger_1.Logger.warning(`${this.trkorr} release ended with warning.`);
+                        break;
+                    case 8:
+                        logger_1.Logger.error(`${this.trkorr} release ended with error.`);
+                        break;
+                    case 12:
+                        logger_1.Logger.error(`${this.trkorr} release was cancelled.`);
+                        break;
+                    case 16:
+                        logger_1.Logger.error(`${this.trkorr} release was cancelled.`);
+                        break;
+                }
             }
-            return this;
         });
     }
     readReleaseLog(tmpFolder, secondsTimeout) {
         return __awaiter(this, void 0, void 0, function* () {
             const filePaths = yield Transport._getFilePaths(this._fileNames);
             const localPath = path_1.default.join(tmpFolder, this._fileNames.releaseLog);
-            const oParser = new node_r3trans_1.R3transLogParser(localPath);
+            const systemR3transVersion = yield systemConnector_1.SystemConnector.getR3transVersion();
+            const systemR3transUnicode = yield systemConnector_1.SystemConnector.getR3transUnicode();
+            logger_1.Logger.log(`System R3trans: ${systemR3transVersion}`, true);
+            logger_1.Logger.log(`System R3trans unicode: ${systemR3transUnicode}`, true);
             if (logger_1.Logger.logger instanceof CliLogger_1.CliLogger || logger_1.Logger.logger instanceof CliLogFileLogger_1.CliLogFileLogger) {
                 logger_1.Logger.logger.forceStop();
             }
@@ -356,7 +373,7 @@ class Transport {
                 try {
                     const logBinary = yield systemConnector_1.SystemConnector.getBinaryFile(filePaths.releaseLog);
                     fs.writeFileSync(localPath, logBinary);
-                    logResult = yield oParser.getReleaseLog();
+                    logResult = yield (new node_r3trans_1.R3transLogParser(localPath, systemR3transUnicode)).getReleaseLog();
                     fs.unlinkSync(localPath);
                 }
                 catch (e) {
@@ -441,6 +458,7 @@ class Transport {
             }
             multibar.stop();
             var error;
+            var rc;
             if (!exitWhile) {
                 error = new Error(`Timed out waiting for release.`);
             }
@@ -450,14 +468,19 @@ class Transport {
                 }
                 if (whileResult === "SUCCESS") {
                     logger_1.Logger.success(`Transport ${this.trkorr} released with success.`);
+                    rc = 0;
                 }
                 if (whileResult === "WARNING") {
                     logger_1.Logger.warning(`Transport ${this.trkorr} released with warning.`);
+                    rc = 4;
                 }
             }
             if (error) {
                 throw error;
             }
+            else {
+                return rc;
+            }
         });
     }
     readImportLog(tmpFolder) {
@@ -469,12 +492,15 @@ class Transport {
             const timeoutDate = new Date((new Date()).getTime() + (secondsTimeout * 1000));
             logger_1.Logger.log(`TMS check for transport ${this.trkorr}, timeout date set to ${timeoutDate}`, true);
             var inQueue = false;
+            var rc = 12;
             if (this._trTarget) {
                 var sLog = `status unknown`;
                 var inQueueAttempts = 0;
                 while (!inQueue && (new Date()).getTime() < timeoutDate.getTime()) {
                     inQueueAttempts++;
-                    logger_1.Logger.loading(`Reading transport queue, attempt ${inQueueAttempts}...`, skipLog);
+                    logger_1.Logger.log(`Attempt ${inQueueAttempts}`, true);
+                    logger_1.Logger.loading(`Reading transport queue...`, skipLog);
+                    yield (0, promises_1.setTimeout)(6000);
                     var tmsQueue = yield systemConnector_1.SystemConnector.readTmsQueue(this._trTarget);
                     tmsQueue = tmsQueue.filter(o => o.trkorr === this.trkorr);
                     tmsQueue = tmsQueue.sort((a, b) => parseInt(b.bufpos) - parseInt(a.bufpos));
@@ -486,12 +512,12 @@ class Transport {
                         sLog = `imported`;
                         if (tmsQueue.length > 0) {
                             inQueue = tmsQueue[0].impsing !== 'X';
+                            rc = parseInt(tmsQueue[0].maxrc);
                         }
                         else {
                             inQueue = false;
                         }
                     }
-                    yield (0, promises_1.setTimeout)(6000);
                 }
                 if (!inQueue) {
                     throw new Error(`Transport request not found in queue, timed out after ${inQueueAttempts + 1} attempts`);
@@ -503,7 +529,7 @@ class Transport {
             else {
                 logger_1.Logger.error(`No target specified, unable to check queue!!`, true);
             }
-            return inQueue;
+            return rc;
         });
     }
     static _getFileNames(trkorr, targetSystem) {
@@ -659,7 +685,22 @@ class Transport {
             logger_1.Logger.loading(`Importing transport ${this.trkorr}`, true);
             yield systemConnector_1.SystemConnector.importTransport(this.trkorr, this._trTarget);
             logger_1.Logger.log(`Starting transport ${this.trkorr} TMS queue status check`, true);
-            yield this._isInTmsQueue(false, true, timeout);
+            const rc = yield this._isInTmsQueue(false, true, timeout);
+            logger_1.Logger.log(`Transport ${this.trkorr} import ended: return code ${rc}`, true);
+            switch (rc) {
+                case 4:
+                    logger_1.Logger.warning(`${this.trkorr} import ended with warning.`);
+                    break;
+                case 8:
+                    logger_1.Logger.error(`${this.trkorr} import ended with error.`);
+                    break;
+                case 12:
+                    logger_1.Logger.error(`${this.trkorr} import was cancelled.`);
+                    break;
+                case 16:
+                    logger_1.Logger.error(`${this.trkorr} import was cancelled.`);
+                    break;
+            }
         });
     }
     rename(as4text) {
@@ -680,4 +721,3 @@ class Transport {
     }
 }
 exports.Transport = Transport;
-//# sourceMappingURL=Transport.js.map

package/dist/transport/TransportContent.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=TransportContent.js.map