trm-core 6.7.2 → 6.9.0

package/README.md

@@ -5,13 +5,18 @@
 [![Core Latest version](https://img.shields.io/npm/v/trm-core)](https://www.npmjs.com/package/trm-core)
 [![Core Installs](https://img.shields.io/npm/dt/trm-core)](https://www.npmjs.com/package/trm-core)
 
-This module contains the core functionalities of TRM (Transport Request Manager).
+| 🚀 This project is funded and maintained by 🏦 | 🔗                                                             |
+|-------------------------------------------------|----------------------------------------------------------------|
+| Regesta S.p.A.                                  | [https://www.regestaitalia.eu/](https://www.regestaitalia.eu/) |
+| Clarex S.r.l.                                   | [https://www.clarex.it/](https://www.clarex.it/)               |
+
+This module contains the core functionalities of [TRM (Transport Request Manager)](https://trmregistry.com/).
 
 TRM is a software designed to make transports between SAP ECC/S4 systems easy.
 
 # Documentation <!-- {docsify-remove} -->
 
-Full documentation can be seen at [https://docs.trmregistry.com](https://docs.trmregistry.com).
+Full documentation can be seen at [https://docs.trmregistry.com/](https://docs.trmregistry.com).
 
 # Contributing <!-- {docsify-remove} -->
 

package/changelog.txt

@@ -8,6 +8,19 @@ Legend
 + : added
 - : removed
 
+2025-05-29 v6.9.0
+-------------------
+! check server api auth before install and publish
+! trm-server ^3.1.0
+! read wb transport from package
+
+2025-05-27 v6.8.0
+-------------------
+! on install transport update, check tasks before add object attempt
+* commit before post activity run on RFC
+* post activity error log
++ node-rfc #327 -> device or resource busy, added workaround
+
 2025-05-20 v6.7.1
 -------------------
 ! get installed packages from backend with trm-server version check

package/dist/actions/commons/checkServerAuth.d.ts

@@ -0,0 +1,3 @@
+import { Step } from "@simonegaffurini/sammarksworkflow";
+import { IActionContext } from "..";
+export declare const checkServerAuth: Step<IActionContext>;

package/dist/actions/commons/checkServerAuth.js

@@ -0,0 +1,25 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkServerAuth = void 0;
+const trm_commons_1 = require("trm-commons");
+const systemConnector_1 = require("../../systemConnector");
+const client_1 = require("../../client");
+exports.checkServerAuth = {
+    name: 'check-server-auth',
+    run: (context) => __awaiter(void 0, void 0, void 0, function* () {
+        trm_commons_1.Logger.log('Check server auth step', true);
+        const auth = yield systemConnector_1.SystemConnector.isServerApisAllowed();
+        if (auth instanceof client_1.ClientError) {
+            throw auth;
+        }
+    })
+};

package/dist/actions/commons/index.d.ts

@@ -1,2 +1,3 @@
 export * from "./IActionContext";
 export * from "./setSystemPackages";
+export * from "./checkServerAuth";

package/dist/actions/commons/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./IActionContext"), exports);
 __exportStar(require("./setSystemPackages"), exports);
+__exportStar(require("./checkServerAuth"), exports);

package/dist/actions/commons/setSystemPackages.js

@@ -13,7 +13,7 @@ exports.setSystemPackages = void 0;
 const trm_commons_1 = require("trm-commons");
 const systemConnector_1 = require("../../systemConnector");
 exports.setSystemPackages = {
-    name: 'setSystemPackages',
+    name: 'set-system-packages',
     run: (context) => __awaiter(void 0, void 0, void 0, function* () {
         trm_commons_1.Logger.log('Set system packages step', true);
         if (context.rawInput.contextData.systemPackages === undefined) {

package/dist/actions/install/checkTransports.js

@@ -144,8 +144,8 @@ exports.checkTransports = {
                     else {
                         trm_commons_1.Logger.log(`${trkorr} is linked to another package, will later be migrated`, true);
                         context.runtime.generatedData.migrations.push(oTransport);
-                        context.runtime.generatedData.tmsTxtRefresh.push(oTransport);
                     }
+                    context.runtime.generatedData.tmsTxtRefresh.push(oTransport);
                 }
                 else if (trmRelevant) {
                     trm_commons_1.Logger.log(`${trkorr} is TRM relevant but no linked package (could be DEVC, LANG etc..). No migration, just tms refresh`, true);

package/dist/actions/install/commit.d.ts

@@ -0,0 +1,3 @@
+import { Step } from "@simonegaffurini/sammarksworkflow";
+import { InstallWorkflowContext } from ".";
+export declare const commit: Step<InstallWorkflowContext>;

package/dist/actions/install/commit.js

@@ -0,0 +1,33 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commit = void 0;
+const trm_commons_1 = require("trm-commons");
+const systemConnector_1 = require("../../systemConnector");
+exports.commit = {
+    name: 'commit',
+    filter: (context) => __awaiter(void 0, void 0, void 0, function* () {
+        if (systemConnector_1.SystemConnector.systemConnector instanceof systemConnector_1.RFCSystemConnector) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }),
+    run: (context) => __awaiter(void 0, void 0, void 0, function* () {
+        trm_commons_1.Logger.log('Commit (RFC Connection) step', true);
+        trm_commons_1.Logger.loading(`Closing rfc connection...`, true);
+        yield systemConnector_1.SystemConnector.systemConnector.close();
+        trm_commons_1.Logger.loading(`Opening rfc connection...`, true);
+        yield systemConnector_1.SystemConnector.systemConnector.connect(true);
+        trm_commons_1.Logger.success(`Commit OK`, true);
+    })
+};

package/dist/actions/install/executePostActivities.js

@@ -61,7 +61,7 @@ exports.executePostActivities = {
                 yield postActivity.execute();
             }
             catch (e) {
-                trm_commons_1.Logger.error(`Failed execution of post activity: ${e.toString()}`);
+                trm_commons_1.Logger.error(`Failed execution of post activity: ${e.message}`);
             }
             trm_commons_1.Logger.removePrefix();
         }

package/dist/actions/install/generateInstallTransport.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateInstallTransport = void 0;
 const trm_commons_1 = require("trm-commons");
 const commons_1 = require("../../commons");
-const systemConnector_1 = require("../../systemConnector");
 const transport_1 = require("../../transport");
 exports.generateInstallTransport = {
     name: 'generate-install-transport',
@@ -33,7 +32,7 @@ exports.generateInstallTransport = {
                 return;
             }
             trm_commons_1.Logger.loading(`Checking install transport...`);
-            context.runtime.installData.transport = yield systemConnector_1.SystemConnector.getPackageWorkbenchTransport(context.runtime.remotePackageData.trmPackage);
+            context.runtime.installData.transport = yield context.runtime.remotePackageData.trmPackage.getWbTransport();
             if (context.runtime.installData.transport) {
                 trm_commons_1.Logger.log(`Install transport (${context.runtime.installData.transport.trkorr}) already exists, won't create a new one.`, true);
                 trm_commons_1.Logger.loading(`Updating install transport...`);
@@ -74,6 +73,14 @@ exports.generateInstallTransport = {
                     };
                 }));
             }
+            var trObjs = yield context.runtime.installData.transport.getE071();
+            const tasks = yield context.runtime.installData.transport.getTasks();
+            for (const task of tasks) {
+                trObjs = trObjs.concat(yield task.getE071());
+            }
+            trObjs.forEach(o => {
+                tadirObjects = tadirObjects.filter(k => !(k.pgmid === o.pgmid && k.object === o.object && k.objName === o.objName));
+            });
             for (const tadir of tadirObjects) {
                 try {
                     try {

package/dist/actions/install/importCustTransport.js

@@ -42,7 +42,9 @@ exports.importCustTransport = {
         });
         yield context.runtime.packageTransports.cust.instance.deleteFromTms(systemConnector_1.SystemConnector.getDest());
         trm_commons_1.Logger.loading(`Importing ${context.runtime.packageTransports.cust.binaries.trkorr}`, true);
+        trm_commons_1.Logger.setPrefix(`(Customizing) `);
         yield context.runtime.packageTransports.cust.instance.import(importTimeout);
+        trm_commons_1.Logger.removePrefix();
         trm_commons_1.Logger.success(`Transport ${context.runtime.packageTransports.cust.binaries.trkorr} imported`, true);
     }),
     revert: (context) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/actions/install/importDevcTransport.js

@@ -38,7 +38,9 @@ exports.importDevcTransport = {
         });
         yield context.runtime.packageTransports.devc.instance.deleteFromTms(systemConnector_1.SystemConnector.getDest());
         trm_commons_1.Logger.loading(`Importing ${context.runtime.packageTransports.devc.binaries.trkorr}`, true);
+        trm_commons_1.Logger.setPrefix(`(SAP Package) `);
         yield context.runtime.packageTransports.devc.instance.import(importTimeout);
+        trm_commons_1.Logger.removePrefix();
         trm_commons_1.Logger.success(`Transport ${context.runtime.packageTransports.devc.binaries.trkorr} imported`, true);
         trm_commons_1.Logger.loading(`Finalizing import...`);
         if (rootDevclass && rootDevclass.parentcl) {

package/dist/actions/install/importLangTransport.js

@@ -42,7 +42,9 @@ exports.importLangTransport = {
         });
         yield context.runtime.packageTransports.lang.instance.deleteFromTms(systemConnector_1.SystemConnector.getDest());
         trm_commons_1.Logger.loading(`Importing ${context.runtime.packageTransports.lang.binaries.trkorr}`, true);
+        trm_commons_1.Logger.setPrefix(`(Translations) `);
         yield context.runtime.packageTransports.lang.instance.import(importTimeout);
+        trm_commons_1.Logger.removePrefix();
         trm_commons_1.Logger.success(`Transport ${context.runtime.packageTransports.lang.binaries.trkorr} imported`, true);
     }),
     revert: (context) => __awaiter(void 0, void 0, void 0, function* () {

package/dist/actions/install/importTadirTransport.js

@@ -34,7 +34,9 @@ exports.importTadirTransport = {
             yield context.runtime.packageTransports.tadir.instance.deleteFromTms(systemConnector_1.SystemConnector.getDest());
         }
         trm_commons_1.Logger.loading(`Importing ${context.runtime.packageTransports.tadir.binaries.trkorr}`, true);
+        trm_commons_1.Logger.setPrefix(`(Workbench) `);
         yield context.runtime.packageTransports.tadir.instance.import(importTimeout);
+        trm_commons_1.Logger.removePrefix();
         trm_commons_1.Logger.success(`Transport ${context.runtime.packageTransports.tadir.binaries.trkorr} imported`, true);
         trm_commons_1.Logger.loading(`Finalizing import...`);
         for (const tadir of context.runtime.packageTransportsData.tadir) {

package/dist/actions/install/index.js

@@ -17,6 +17,7 @@ const sammarksworkflow_1 = __importDefault(require("@simonegaffurini/sammarkswor
 const util_1 = require("util");
 const trm_commons_1 = require("trm-commons");
 const init_1 = require("./init");
+const __1 = require("..");
 const setSystemPackages_1 = require("../commons/setSystemPackages");
 const checkAlreadyInstalled_1 = require("./checkAlreadyInstalled");
 const checkIntegrity_1 = require("./checkIntegrity");
@@ -41,11 +42,13 @@ const refreshTmsTxt_1 = require("./refreshTmsTxt");
 const migrate_1 = require("./migrate");
 const executePostActivities_1 = require("./executePostActivities");
 const setTrmServerUpgradeService_1 = require("./setTrmServerUpgradeService");
+const commit_1 = require("./commit");
 ;
 const WORKFLOW_NAME = 'install';
 function install(inputData) {
     return __awaiter(this, void 0, void 0, function* () {
         const workflow = [
+            __1.checkServerAuth,
             init_1.init,
             setSystemPackages_1.setSystemPackages,
             setTrmServerUpgradeService_1.setTrmServerUpgradeService,
@@ -70,6 +73,7 @@ function install(inputData) {
             refreshTmsTxt_1.refreshTmsTxt,
             setPackageIntegrity_1.setPackageIntegrity,
             generateInstallTransport_1.generateInstallTransport,
+            commit_1.commit,
             executePostActivities_1.executePostActivities
         ];
         trm_commons_1.Logger.log(`Ready to execute workflow ${WORKFLOW_NAME}, input data: ${(0, util_1.inspect)(inputData, { breakLength: Infinity, compact: true })}`, true);

package/dist/actions/publish/getSourceCode.js

@@ -31,13 +31,14 @@ exports.getSourceCode = {
                         if ((0, minimatch_1.minimatch)(abapgitObject.fullPath, pattern, { matchBase: true })) {
                             if (!context.runtime.abapGitData.sourceCode.ignoredObjects.find(k => k.pgmid === o.pgmid && k.object === o.object && k.objName === o.objName)) {
                                 context.runtime.abapGitData.sourceCode.ignoredObjects.push(o);
+                                trm_commons_1.Logger.log(`Excluding ${o.pgmid} ${o.object} ${o.objName} (.abapgit ignore)`, true);
                             }
                         }
                     });
                 }
             });
             if (ignoredPatterns.length > 0) {
-                trm_commons_1.Logger.info(`Excluding ${context.runtime.abapGitData.sourceCode.ignoredObjects.length} object(s) as configured in .abapgit.xml:\n${ignoredPatterns.join('\n ')}`);
+                trm_commons_1.Logger.info(`Excluding ${context.runtime.abapGitData.sourceCode.ignoredObjects.length} object(s) as configured in .abapgit.xml: ${ignoredPatterns.join(', ')}`);
             }
         }
         catch (e) {

package/dist/actions/publish/index.js

@@ -37,6 +37,7 @@ const WORKFLOW_NAME = 'publish';
 function publish(inputData) {
     return __awaiter(this, void 0, void 0, function* () {
         const workflow = [
+            __1.checkServerAuth,
             init_1.init,
             __1.setSystemPackages,
             setTransportTarget_1.setTransportTarget,

package/dist/client/RESTClient.d.ts

@@ -1,7 +1,7 @@
 import * as components from "./components";
 import * as struct from "./struct";
 import { IClient } from "./IClient";
-import { Login, SapMessage } from ".";
+import { Login, RESTClientError, SapMessage } from ".";
 export declare class RESTClient implements IClient {
     endpoint: string;
     rfcdest: components.RFCDEST;
@@ -65,5 +65,5 @@ export declare class RESTClient implements IClient {
         execute?: boolean;
     }>;
     getInstalledPackagesBackend(): Promise<struct.ZTY_TRM_PACKAGE[]>;
-    regenProg(prog: components.PROGNAME): Promise<void>;
+    isServerApisAllowed(): Promise<true | RESTClientError>;
 }

package/dist/client/RESTClient.js

@@ -650,16 +650,21 @@ class RESTClient {
                     transport: {
                         trkorr: o.transport ? o.transport.trkorr : undefined,
                         migration: o.transport ? o.transport.migration === 'X' : undefined
-                    }
+                    },
+                    trkorr: o.trkorr
                 };
             });
         });
     }
-    regenProg(prog) {
+    isServerApisAllowed() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._axiosInstance.post('/regen_prog', {
-                progname: prog
-            });
+            try {
+                yield this._axiosInstance.post('/check_auth');
+                return true;
+            }
+            catch (e) {
+                return e;
+            }
         });
     }
 }

package/dist/client/RFCClient.d.ts

@@ -1,7 +1,7 @@
 import * as components from "./components";
 import * as struct from "./struct";
 import { IClient } from "./IClient";
-import { SapMessage } from ".";
+import { RFCClientError, SapMessage } from ".";
 export declare class RFCClient implements IClient {
     private _rfcClientArgs;
     private _cLangu;
@@ -10,6 +10,7 @@ export declare class RFCClient implements IClient {
     constructor(_rfcClientArgs: any, _cLangu: string, traceDir?: string);
     private getRfcClient;
     open(): Promise<void>;
+    close(): Promise<void>;
     checkConnection(): Promise<boolean>;
     private _call;
     private _getMessage;
@@ -64,5 +65,5 @@ export declare class RFCClient implements IClient {
         execute?: boolean;
     }>;
     getInstalledPackagesBackend(): Promise<struct.ZTY_TRM_PACKAGE[]>;
-    regenProg(prog: components.PROGNAME): Promise<void>;
+    isServerApisAllowed(): Promise<true | RFCClientError>;
 }

package/dist/client/RFCClient.js

@@ -93,6 +93,18 @@ class RFCClient {
             }
         });
     }
+    close() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                trm_commons_1.Logger.loading(`Closing RFC connection`, true);
+                yield (yield this.getRfcClient()).close();
+                trm_commons_1.Logger.success(`RFC closed`, true);
+            }
+            catch (e) {
+                throw new _1.RFCClientError("ZNO_CLOSE", null, e, e.message);
+            }
+        });
+    }
     checkConnection() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._aliveCheck) {
@@ -107,8 +119,8 @@ class RFCClient {
             return (yield this.getRfcClient()).alive;
         });
     }
-    _call(fm, arg, timeout, noErrorParsing) {
-        return __awaiter(this, void 0, void 0, function* () {
+    _call(fm_1, arg_1, timeout_1, noErrorParsing_1) {
+        return __awaiter(this, arguments, void 0, function* (fm, arg, timeout, noErrorParsing, retryCount = 0) {
             var argNormalized;
             if (arg) {
                 var emptyKeys = [];
@@ -139,6 +151,13 @@ class RFCClient {
                 return responseNormalized;
             }
             catch (e) {
+                if (e.message === 'device or resource busy: device or resource busy' && retryCount <= 10) {
+                    trm_commons_1.Logger.log('device or resource busy, retrying', true);
+                    yield new Promise(res => {
+                        setTimeout(res, 1000);
+                    });
+                    return this._call(fm, arg, timeout, noErrorParsing, retryCount + 1);
+                }
                 if (noErrorParsing) {
                     throw e;
                 }
@@ -636,16 +655,21 @@ class RFCClient {
                         trkorr: o['TRANSPORT']['TRKORR']['_text'],
                         migration: o['TRANSPORT']['MIGRATION']['_text'] === 'X',
                     },
-                    tdevc: (0, commons_1.normalize)(flatTdevc)
+                    tdevc: (0, commons_1.normalize)(flatTdevc),
+                    trkorr: o['TRKORR']['_text']
                 };
             });
         });
     }
-    regenProg(prog) {
+    isServerApisAllowed() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this._call("ZTRM_REGEN_PROG", {
-                iv_progname: prog
-            });
+            try {
+                yield this._call("ZTRM_CHECK_AUTH");
+                return true;
+            }
+            catch (e) {
+                return e;
+            }
         });
     }
 }

package/dist/client/struct/ZTY_TRM_PACKAGE.d.ts

@@ -10,4 +10,5 @@ export type ZTY_TRM_PACKAGE = {
         trkorr?: TRKORR;
         migration?: boolean;
     };
+    trkorr?: TRKORR;
 };

package/dist/commons/TrmServerUpgradeService.d.ts

@@ -12,5 +12,4 @@ export declare class TrmServerUpgrade {
     executePostActivities(): boolean;
     removeComments(): boolean;
     refreshTmsTxt(): boolean;
-    getInstalledPackagesBackend(): boolean;
 }

package/dist/commons/TrmServerUpgradeService.js

@@ -77,13 +77,5 @@ class TrmServerUpgrade {
             return !((0, semver_1.lt)(this.currentVersion, '2.2.0') && (0, semver_1.gte)(this.installVersion, '2.2.0'));
         }
     }
-    getInstalledPackagesBackend() {
-        if (this.dummy) {
-            return true;
-        }
-        else {
-            return !((0, semver_1.lt)(this.currentVersion, '3.0.0') && (0, semver_1.gte)(this.installVersion, '3.0.0'));
-        }
-    }
 }
 exports.TrmServerUpgrade = TrmServerUpgrade;

package/dist/manifest/PostActivity.js

@@ -65,7 +65,6 @@ class PostActivity {
             if (description) {
                 trm_commons_1.Logger.loading(`Post activity: ${description}`, silent);
             }
-            yield systemConnector_1.SystemConnector.regenProg('SAPLZTRM');
             const pre = yield systemConnector_1.SystemConnector.executePostActivity(data, true);
             if (pre.messages) {
                 yield this.printMessages(pre.messages, silent);

package/dist/systemConnector/ISystemConnector.d.ts

@@ -1,4 +1,4 @@
-import { SapMessage } from "../client";
+import { ClientError, SapMessage } from "../client";
 import * as components from "../client/components";
 import * as struct from "../client/struct";
 import { ISystemConnectorBase } from "./ISystemConnectorBase";
@@ -58,5 +58,5 @@ export interface ISystemConnector extends ISystemConnectorBase {
         messages: struct.SYMSG[];
         execute?: boolean;
     }>;
-    regenProg: (prog: components.PROGNAME) => Promise<void>;
+    isServerApisAllowed: () => Promise<true | ClientError>;
 }

package/dist/systemConnector/RESTSystemConnector.d.ts

@@ -6,7 +6,7 @@ import * as components from "../client/components";
 import * as struct from "../client/struct";
 import { SystemConnectorBase } from "./SystemConnectorBase";
 import { RESTConnection } from "./RESTConnection";
-import { SapMessage } from "../client";
+import { ClientError, SapMessage } from "../client";
 import { SystemConnectorSupportedBulk } from "./SystemConnectorSupportedBulk";
 export declare class RESTSystemConnector extends SystemConnectorBase implements ISystemConnector {
     private _connection;
@@ -15,6 +15,7 @@ export declare class RESTSystemConnector extends SystemConnectorBase implements
     private _lang;
     private _user;
     private _client;
+    private _isServerApisAllowed;
     supportedBulk: SystemConnectorSupportedBulk;
     constructor(_connection: RESTConnection, _login: Login);
     protected getSysname(): string;
@@ -77,5 +78,5 @@ export declare class RESTSystemConnector extends SystemConnectorBase implements
         messages: struct.SYMSG[];
         execute?: boolean;
     }>;
-    regenProg(prog: components.PROGNAME): Promise<void>;
+    isServerApisAllowed(): Promise<true | ClientError>;
 }

package/dist/systemConnector/RESTSystemConnector.js

@@ -319,9 +319,12 @@ class RESTSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
             return this._client.executePostActivity(data, pre);
         });
     }
-    regenProg(prog) {
+    isServerApisAllowed() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._client.regenProg(prog);
+            if (this._isServerApisAllowed === undefined) {
+                this._isServerApisAllowed = yield this._client.isServerApisAllowed();
+            }
+            return this._isServerApisAllowed;
         });
     }
 }

package/dist/systemConnector/RFCSystemConnector.d.ts

@@ -1,4 +1,4 @@
-import { SapMessage } from "../client";
+import { ClientError, SapMessage } from "../client";
 import { DEVCLASS } from "../client/components";
 import { TADIR } from "../client/struct";
 import { RFCConnection } from "./RFCConnection";
@@ -15,6 +15,7 @@ export declare class RFCSystemConnector extends SystemConnectorBase implements I
     private _lang;
     private _user;
     private _client;
+    private _isServerApisAllowed;
     supportedBulk: SystemConnectorSupportedBulk;
     constructor(_connection: RFCConnection, _login: Login, _traceDir?: string);
     protected getSysname(): string;
@@ -30,7 +31,8 @@ export declare class RFCSystemConnector extends SystemConnectorBase implements I
     protected getInstalledPackagesBackend(): Promise<struct.ZTY_TRM_PACKAGE[]>;
     getConnectionData(): RFCConnection;
     getLogonUser(): string;
-    connect(): Promise<void>;
+    connect(silent?: boolean): Promise<void>;
+    close(): Promise<void>;
     checkConnection(): Promise<boolean>;
     ping(): Promise<string>;
     getFileSystem(): Promise<struct.FILESYS>;
@@ -75,5 +77,5 @@ export declare class RFCSystemConnector extends SystemConnectorBase implements I
         messages: struct.SYMSG[];
         execute?: boolean;
     }>;
-    regenProg(prog: components.PROGNAME): Promise<void>;
+    isServerApisAllowed(): Promise<true | ClientError>;
 }

package/dist/systemConnector/RFCSystemConnector.js

@@ -88,18 +88,23 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
         return this._user;
     }
     connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            trm_commons_1.Logger.loading(`Connecting to ${this.getDest()}...`);
+        return __awaiter(this, arguments, void 0, function* (silent = false) {
+            trm_commons_1.Logger.loading(`Connecting to ${this.getDest()}...`, silent);
             try {
                 yield this._client.open();
-                trm_commons_1.Logger.success(`Connected to ${this.getDest()} as ${this._user}.`, false);
+                trm_commons_1.Logger.success(`Connected to ${this.getDest()} as ${this._user}.`, silent);
             }
             catch (e) {
-                trm_commons_1.Logger.error(`Connection to ${this.getDest()} as ${this._user} failed.`, false);
+                trm_commons_1.Logger.error(`Connection to ${this.getDest()} as ${this._user} failed.`, silent);
                 throw e;
             }
         });
     }
+    close() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this._client.close();
+        });
+    }
     checkConnection() {
         return __awaiter(this, void 0, void 0, function* () {
             return this._client.checkConnection();
@@ -290,9 +295,12 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
             return this._client.executePostActivity(data, pre);
         });
     }
-    regenProg(prog) {
+    isServerApisAllowed() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this._client.regenProg(prog);
+            if (this._isServerApisAllowed === undefined) {
+                this._isServerApisAllowed = yield this._client.isServerApisAllowed();
+            }
+            return this._isServerApisAllowed;
         });
     }
 }

package/dist/systemConnector/SystemConnector.d.ts

@@ -1,4 +1,4 @@
-import { TRKORR, DEVCLASS, TDEVC, TMSCSYS, TADIR, PGMID, TROBJTYPE, SOBJ_NAME } from "../client";
+import { TRKORR, DEVCLASS, TDEVC, TMSCSYS, TADIR, PGMID, TROBJTYPE, SOBJ_NAME, ClientError } from "../client";
 import { AbstractRegistry } from "../registry";
 import { Transport } from "../transport";
 import { TrmPackage } from "../trmPackage";
@@ -91,5 +91,5 @@ export declare namespace SystemConnector {
         execute?: boolean;
     }>;
     function readClassDescriptions(clsname: components.SEOCLSNAME): Promise<struct.SEOCLASSTX[]>;
-    function regenProg(prog: components.PROGNAME): Promise<void>;
+    function isServerApisAllowed(): Promise<true | ClientError>;
 }

package/dist/systemConnector/SystemConnector.js

@@ -520,11 +520,11 @@ var SystemConnector;
         });
     }
     SystemConnector.readClassDescriptions = readClassDescriptions;
-    function regenProg(prog) {
+    function isServerApisAllowed() {
         return __awaiter(this, void 0, void 0, function* () {
             yield checkSystemConnector();
-            return SystemConnector.systemConnector.regenProg(prog);
+            return SystemConnector.systemConnector.isServerApisAllowed();
         });
     }
-    SystemConnector.regenProg = regenProg;
+    SystemConnector.isServerApisAllowed = isServerApisAllowed;
 })(SystemConnector || (exports.SystemConnector = SystemConnector = {}));

package/dist/systemConnector/SystemConnectorBase.js

@@ -17,7 +17,6 @@ const transport_1 = require("../transport");
 const trmPackage_1 = require("../trmPackage");
 const registry_1 = require("../registry");
 const node_r3trans_1 = require("node-r3trans");
-const commons_1 = require("../commons");
 exports.TRM_SERVER_PACKAGE_NAME = 'trm-server';
 exports.TRM_SERVER_INTF = 'ZIF_TRM';
 exports.TRM_REST_PACKAGE_NAME = 'trm-rest';
@@ -179,57 +178,60 @@ class SystemConnectorBase {
             }
             trm_commons_1.Logger.log(`Include sources: ${includeSoruces}`, true);
             const aSourceTrkorr = includeSoruces ? (yield this.getSourceTrkorr(refresh)) : [];
-            if (commons_1.TrmServerUpgrade.getInstance().getInstalledPackagesBackend()) {
-                const serverExists = yield this.readTable('TADIR', [{ fieldName: 'OBJ_NAME' }], `PGMID EQ 'R3TR' AND OBJECT EQ 'INTF' AND OBJ_NAME EQ '${exports.TRM_SERVER_INTF}'`);
-                if (serverExists.length === 1) {
-                    trm_commons_1.Logger.log(`INTF ${exports.TRM_SERVER_INTF} exists`, true);
-                    try {
-                        var installedPackagesBackend = yield this.getInstalledPackagesBackend();
-                        if (!includeSoruces) {
-                            installedPackagesBackend = installedPackagesBackend.filter(o => !aSourceTrkorr.includes(o.transport.trkorr));
-                        }
-                        if (!includeLocals) {
-                            installedPackagesBackend = installedPackagesBackend.filter(o => o.registry !== registry_1.LOCAL_RESERVED_KEYWORD);
+            const serverExists = yield this.readTable('TADIR', [{ fieldName: 'OBJ_NAME' }], `PGMID EQ 'R3TR' AND OBJECT EQ 'INTF' AND OBJ_NAME EQ '${exports.TRM_SERVER_INTF}'`);
+            if (serverExists.length === 1) {
+                trm_commons_1.Logger.log(`INTF ${exports.TRM_SERVER_INTF} exists`, true);
+                try {
+                    var installedPackagesBackend = yield this.getInstalledPackagesBackend();
+                    if (!includeSoruces) {
+                        installedPackagesBackend = installedPackagesBackend.filter(o => !aSourceTrkorr.includes(o.transport.trkorr));
+                    }
+                    if (!includeLocals) {
+                        installedPackagesBackend = installedPackagesBackend.filter(o => o.registry !== registry_1.LOCAL_RESERVED_KEYWORD);
+                    }
+                    for (const o of installedPackagesBackend) {
+                        const transport = o.transport.trkorr ? new transport_1.Transport(o.transport.trkorr, null, o.transport.migration) : null;
+                        const manifest = manifest_1.Manifest.fromAbapXml(o.manifest);
+                        if (transport) {
+                            manifest.setLinkedTransport(transport);
                         }
-                        for (const o of installedPackagesBackend) {
-                            const transport = o.transport.trkorr ? new transport_1.Transport(o.transport.trkorr, null, o.transport.migration) : null;
-                            const manifest = manifest_1.Manifest.fromAbapXml(o.manifest);
-                            if (transport) {
-                                manifest.setLinkedTransport(transport);
-                            }
-                            const trmPackage = new trmPackage_1.TrmPackage(o.name, registry_1.RegistryProvider.getRegistry(o.registry), manifest);
-                            if (transport) {
+                        const trmPackage = new trmPackage_1.TrmPackage(o.name, registry_1.RegistryProvider.getRegistry(o.registry), manifest);
+                        if (transport) {
+                            try {
                                 trmPackage.setDevclass(yield transport.getDevclass(o.tdevc));
                             }
-                            else {
-                                if (o.tdevc.length === 1) {
-                                    trmPackage.setDevclass(o.tdevc[0].devclass);
-                                }
+                            catch (x) {
                             }
-                            trmPackages.push(trmPackage);
                         }
-                        fromBackend = true;
-                    }
-                    catch (e) {
-                        trmPackages = [];
-                        trm_commons_1.Logger.error(e.toString(), true);
+                        else {
+                            if (o.tdevc.length === 1) {
+                                trmPackage.setDevclass(o.tdevc[0].devclass);
+                            }
+                        }
+                        trmPackage.setWbTransport(o.trkorr ? new transport_1.Transport(o.trkorr) : null);
+                        trmPackages.push(trmPackage);
                     }
+                    fromBackend = true;
                 }
-                if (fromBackend) {
-                    trm_commons_1.Logger.log(`Packages were fetched from backend`, true);
-                    return trmPackages;
-                }
-                else {
-                    trm_commons_1.Logger.log(`Packages weren't fetched from backend, continue`, true);
+                catch (e) {
+                    trmPackages = [];
+                    trm_commons_1.Logger.error(e.toString(), true);
                 }
             }
+            if (fromBackend) {
+                trm_commons_1.Logger.log(`Packages were fetched from backend`, true);
+                return trmPackages;
+            }
+            else {
+                trm_commons_1.Logger.log(`Packages weren't fetched from backend, continue`, true);
+            }
             var packageTransports = [];
             trm_commons_1.Logger.log(`Ready to read installed packages`, true);
             trm_commons_1.Logger.log(`Source trkorr ${JSON.stringify(aSourceTrkorr)}`, true);
             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}'`)).map(o => o.trkorr);
+            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);
             aActualTrkorr = Array.from(new Set(aActualTrkorr));
             try {
                 aMigrationTrkorr = (yield this.readTable('ZTRM_E070', [{ fieldName: 'TRM_TROKRR' }])).map(o => o.trmTrokrr);

package/dist/transport/Transport.js

@@ -591,10 +591,10 @@ class Transport {
                     }
                 }
                 if (!inQueue) {
-                    throw new Error(`Transport request not found in queue, timed out after ${inQueueAttempts + 1} attempts`);
+                    throw new Error(`${this.trkorr} not found in queue, timed out after ${inQueueAttempts + 1} attempts`);
                 }
                 else {
-                    trm_commons_1.Logger.success(`Transport ${this.trkorr} ${sLog}.`, skipLog);
+                    trm_commons_1.Logger.success(`${this.trkorr} ${sLog}.`, skipLog);
                 }
             }
             else {

package/dist/trmPackage/TrmPackage.d.ts

@@ -3,6 +3,7 @@ import { AbstractRegistry } from "../registry";
 import { TrmArtifact } from "./TrmArtifact";
 import { DEVCLASS } from "../client";
 import { R3transOptions } from "node-r3trans";
+import { Transport } from "../transport";
 export declare const DEFAULT_VERSION: string;
 export declare class TrmPackage {
     packageName: string;
@@ -13,9 +14,12 @@ export declare class TrmPackage {
     private _remoteArtifacts;
     private _remoteContent;
     private _devclass;
+    private _wbTransport;
     constructor(packageName: string, registry: AbstractRegistry, manifest?: Manifest);
     setDevclass(devclass: DEVCLASS): TrmPackage;
     getDevclass(): DEVCLASS;
+    setWbTransport(transport: Transport): TrmPackage;
+    getWbTransport(): Promise<Transport>;
     exists(version?: string): Promise<boolean>;
     canPublishReleases(): Promise<{
         canPublishReleases: boolean;

package/dist/trmPackage/TrmPackage.js

@@ -46,6 +46,7 @@ exports.TrmPackage = exports.DEFAULT_VERSION = void 0;
 const semver = __importStar(require("semver"));
 const trm_commons_1 = require("trm-commons");
 const manifest_1 = require("../manifest");
+const systemConnector_1 = require("../systemConnector");
 exports.DEFAULT_VERSION = "1.0.0";
 class TrmPackage {
     constructor(packageName, registry, manifest) {
@@ -62,6 +63,18 @@ class TrmPackage {
     getDevclass() {
         return this._devclass;
     }
+    setWbTransport(transport) {
+        this._wbTransport = transport;
+        return this;
+    }
+    getWbTransport() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._wbTransport === undefined) {
+                this._wbTransport = yield systemConnector_1.SystemConnector.getPackageWorkbenchTransport(this);
+            }
+            return this._wbTransport;
+        });
+    }
     exists() {
         return __awaiter(this, arguments, void 0, function* (version = 'latest') {
             return (yield this.registry.packageExists(this.packageName, version));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-core",
-  "version": "6.7.2",
+  "version": "6.9.0",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -34,7 +34,7 @@
   },
   "license": "MIT",
   "trmDependencies": {
-    "trm-server": "^3.0.0"
+    "trm-server": "^3.1.0"
   },
   "dependencies": {
     "@esm2cjs/normalize-url": "^8.0.0",