trm-core 6.8.0 → 6.9.1

package/changelog.txt

@@ -8,7 +8,18 @@ Legend
 + : added
 - : removed
 
-2025-05-27 v6.7.2
+2025-05-29 v6.9.1
+-------------------
+* remote function for updating server
++ confirm if objects exists but no root sap package found
+
+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

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/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...`);

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");
@@ -47,6 +48,7 @@ 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,

package/dist/actions/install/readTadir.js

@@ -35,23 +35,41 @@ exports.readTadir = {
                 const rootPackage = context.rawInput.contextData.systemPackages.find(o => o.packageName === context.rawInput.packageData.name);
                 if (rootPackage) {
                     const rootDevclass = rootPackage.getDevclass();
-                    const subpackages = (yield systemConnector_1.SystemConnector.getSubpackages(rootDevclass)).map(o => o.devclass);
-                    existingObjects.find(o => {
-                        if (subpackages.includes(o.devclass) || rootDevclass === o.devclass) {
-                            trm_commons_1.Logger.log(`${o.pgmid} ${o.object} ${o.objName} already in system but devclass ${o.devclass} is part of the same trm package in update`, true);
-                        }
-                        else {
-                            if (context.rawInput.installData.checks.noExistingObjects) {
-                                trm_commons_1.Logger.warning(`${o.pgmid} ${o.object} ${o.objName} already exist on target system ${systemConnector_1.SystemConnector.getDest()}`);
+                    if (rootDevclass) {
+                        const subpackages = (yield systemConnector_1.SystemConnector.getSubpackages(rootDevclass)).map(o => o.devclass);
+                        existingObjects.find(o => {
+                            if (subpackages.includes(o.devclass) || rootDevclass === o.devclass) {
+                                trm_commons_1.Logger.log(`${o.pgmid} ${o.object} ${o.objName} already in system but devclass ${o.devclass} is part of the same trm package in update`, true);
                             }
                             else {
-                                trm_commons_1.Logger.error(`${o.pgmid} ${o.object} ${o.objName} already exist on target system ${systemConnector_1.SystemConnector.getDest()}`);
+                                if (context.rawInput.installData.checks.noExistingObjects) {
+                                    trm_commons_1.Logger.warning(`${o.pgmid} ${o.object} ${o.objName} already exist on target system ${systemConnector_1.SystemConnector.getDest()}`);
+                                }
+                                else {
+                                    trm_commons_1.Logger.error(`${o.pgmid} ${o.object} ${o.objName} already exist on target system ${systemConnector_1.SystemConnector.getDest()}`);
+                                }
+                                throwExistingObjectsError = true;
+                            }
+                        });
+                        if (throwExistingObjectsError && !context.rawInput.installData.checks.noExistingObjects) {
+                            throw new Error(`Cannot overwrite existing objects.`);
+                        }
+                    }
+                    else {
+                        if (context.rawInput.installData.checks.noExistingObjects || context.rawInput.contextData.noInquirer) {
+                            trm_commons_1.Logger.warning(`${existingObjects.length} object(s) already exist on target system ${systemConnector_1.SystemConnector.getDest()}:\n${sObjs}`);
+                        }
+                        else {
+                            const ow = (yield trm_commons_1.Inquirer.prompt({
+                                message: `Couldn't determine root SAP package for "${rootPackage.packageName}", ${existingObjects.length} object(s) already exist on target system ${systemConnector_1.SystemConnector.getDest()}. Continue?`,
+                                type: 'confirm',
+                                name: 'ow',
+                                default: true
+                            })).ow;
+                            if (!ow) {
+                                throw new Error(`${existingObjects.length} object(s) already exist on target system ${systemConnector_1.SystemConnector.getDest()}:\n${sObjs}`);
                             }
-                            throwExistingObjectsError = true;
                         }
-                    });
-                    if (throwExistingObjectsError && !context.rawInput.installData.checks.noExistingObjects) {
-                        throw new Error(`Cannot overwrite existing objects.`);
                     }
                 }
                 else {

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,4 +65,5 @@ export declare class RESTClient implements IClient {
         execute?: boolean;
     }>;
     getInstalledPackagesBackend(): Promise<struct.ZTY_TRM_PACKAGE[]>;
+    isServerApisAllowed(): Promise<true | RESTClientError>;
 }

package/dist/client/RESTClient.js

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

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;
@@ -65,4 +65,5 @@ export declare class RFCClient implements IClient {
         execute?: boolean;
     }>;
     getInstalledPackagesBackend(): Promise<struct.ZTY_TRM_PACKAGE[]>;
+    isServerApisAllowed(): Promise<true | RFCClientError>;
 }

package/dist/client/RFCClient.js

@@ -655,10 +655,27 @@ 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']
                 };
             });
         });
     }
+    isServerApisAllowed() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this._call("ZTRM_CHECK_AUTH");
+                return true;
+            }
+            catch (e) {
+                if (e.exceptionType !== 'CALL_FUNCTION_NOT_REMOTE') {
+                    return e;
+                }
+                else {
+                    return true;
+                }
+            }
+        });
+    }
 }
 exports.RFCClient = RFCClient;

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/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,4 +58,5 @@ export interface ISystemConnector extends ISystemConnectorBase {
         messages: struct.SYMSG[];
         execute?: boolean;
     }>;
+    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,4 +78,5 @@ export declare class RESTSystemConnector extends SystemConnectorBase implements
         messages: struct.SYMSG[];
         execute?: boolean;
     }>;
+    isServerApisAllowed(): Promise<true | ClientError>;
 }

package/dist/systemConnector/RESTSystemConnector.js

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

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;
@@ -76,4 +77,5 @@ export declare class RFCSystemConnector extends SystemConnectorBase implements I
         messages: struct.SYMSG[];
         execute?: boolean;
     }>;
+    isServerApisAllowed(): Promise<true | ClientError>;
 }

package/dist/systemConnector/RFCSystemConnector.js

@@ -295,5 +295,13 @@ class RFCSystemConnector extends SystemConnectorBase_1.SystemConnectorBase {
             return this._client.executePostActivity(data, pre);
         });
     }
+    isServerApisAllowed() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._isServerApisAllowed === undefined) {
+                this._isServerApisAllowed = yield this._client.isServerApisAllowed();
+            }
+            return this._isServerApisAllowed;
+        });
+    }
 }
 exports.RFCSystemConnector = RFCSystemConnector;

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,4 +91,5 @@ export declare namespace SystemConnector {
         execute?: boolean;
     }>;
     function readClassDescriptions(clsname: components.SEOCLSNAME): Promise<struct.SEOCLASSTX[]>;
+    function isServerApisAllowed(): Promise<true | ClientError>;
 }

package/dist/systemConnector/SystemConnector.js

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

package/dist/systemConnector/SystemConnectorBase.js

@@ -208,6 +208,7 @@ class SystemConnectorBase {
                                 trmPackage.setDevclass(o.tdevc[0].devclass);
                             }
                         }
+                        trmPackage.setWbTransport(o.trkorr ? new transport_1.Transport(o.trkorr) : null);
                         trmPackages.push(trmPackage);
                     }
                     fromBackend = true;

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.8.0",
+  "version": "6.9.1",
   "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",