@sap-ux/axios-extension 1.2.2 → 1.2.3

package/dist/abap/message.d.ts

@@ -47,7 +47,7 @@ export declare function prettyPrintMessage({ msg, log, host }: {
     host?: string;
 }): void;
 /**
- * Log a Gateway error.
+ * Log Gateway errors returned from the S_MGW_ODATA_INNER_ERROR table which is a store of OData Inner Error data.
  *
  * @param  options options
  * @param options.error error message returned from gateway

package/dist/abap/message.js

@@ -67,7 +67,7 @@ function logFullURL({ host, path, log }) {
     }
 }
 /**
- * Log a Gateway error.
+ * Log Gateway errors returned from the S_MGW_ODATA_INNER_ERROR table which is a store of OData Inner Error data.
  *
  * @param  options options
  * @param options.error error message returned from gateway

package/dist/abap/ui5-abap-repository-service.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import type { AxiosResponse, AxiosRequestConfig } from 'axios';
+import type { ErrorMessage } from './message';
 import { ODataService } from '../base/odata-service';
 /**
  * Required configuration for the BSP hosting an app.
@@ -159,5 +160,12 @@ export declare class Ui5AbapRepositoryService extends ODataService {
         error: Error;
         host?: string;
     }): void;
+    /**
+     * Get ErrorMessage object from response contain an error as a string.
+     *
+     * @param data string value
+     * @returns undefined if an error object is not found or populated ErrorMessage object
+     */
+    protected getErrorMessageFromString(data: string): ErrorMessage | undefined;
 }
 //# sourceMappingURL=ui5-abap-repository-service.d.ts.map

package/dist/abap/ui5-abap-repository-service.js

@@ -60,14 +60,18 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
      * @returns application information or undefined
      */
     getInfo(app) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const response = yield this.get(`/Repositories('${encodeURIComponent(app)}')`);
                 return response.odata();
             }
             catch (error) {
-                this.log.debug(`Retrieving application ${app}, error found ${error}`);
-                return undefined;
+                this.log.debug(`Retrieving application ${app}, ${error}`);
+                if ((0, odata_request_error_1.isAxiosError)(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 404) {
+                    return undefined;
+                }
+                throw error;
             }
         });
     }
@@ -95,12 +99,21 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
                 if ((_a = response === null || response === void 0 ? void 0 : response.headers) === null || _a === void 0 ? void 0 : _a['sap-message']) {
                     (0, message_1.prettyPrintMessage)({ msg: response.headers['sap-message'], log: this.log, host: frontendUrl });
                 }
-                // log url of created/updated app
-                const path = '/sap/bc/ui5_ui5' + (!bsp.name.startsWith('/') ? '/sap/' : '') + bsp.name.toLowerCase();
-                const query = ((_b = this.defaults.params) === null || _b === void 0 ? void 0 : _b['sap-client'])
-                    ? '?sap-client=' + this.defaults.params['sap-client']
-                    : '';
-                this.log.info(`App available at ${frontendUrl}${path}${query}`);
+                if (!testMode) {
+                    // log url of created/updated app
+                    const path = '/sap/bc/ui5_ui5' + (!bsp.name.startsWith('/') ? '/sap/' : '') + bsp.name.toLowerCase();
+                    const query = ((_b = this.defaults.params) === null || _b === void 0 ? void 0 : _b['sap-client'])
+                        ? '?sap-client=' + this.defaults.params['sap-client']
+                        : '';
+                    this.log.info(`App available at ${frontendUrl}${path}${query}`);
+                }
+                else {
+                    (0, message_1.prettyPrintError)({
+                        error: this.getErrorMessageFromString(response === null || response === void 0 ? void 0 : response.data),
+                        log: this.log,
+                        host: frontendUrl
+                    });
+                }
                 return response;
             }
             catch (error) {
@@ -256,7 +269,8 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
                 }
             }
             catch (error) {
-                if (((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 504) {
+                // Known ABAP timeout exception codes should re-trigger a deployment again to confirm the app was deployed
+                if ([504, 408].includes((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status)) {
                     // Kill the flow after three attempts
                     if (tryCount >= 3) {
                         throw error;
@@ -312,26 +326,39 @@ class Ui5AbapRepositoryService extends odata_service_1.ODataService {
      * @param e.host hostname
      */
     logError({ error, host }) {
-        var _a;
+        var _a, _b;
         this.log.error(error.message);
         if ((0, odata_request_error_1.isAxiosError)(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data)) {
-            let responseData = error.response.data;
-            if (typeof error.response.data === 'string') {
-                try {
-                    responseData = JSON.parse(error.response.data);
-                }
-                catch (_b) {
-                    // Not much we can do!
-                }
-            }
-            if (responseData === null || responseData === void 0 ? void 0 : responseData['error']) {
-                (0, message_1.prettyPrintError)({ error: responseData['error'], host, log: this.log });
+            const errorMessage = this.getErrorMessageFromString((_b = error.response) === null || _b === void 0 ? void 0 : _b.data);
+            if (errorMessage) {
+                (0, message_1.prettyPrintError)({ error: errorMessage, host, log: this.log });
             }
             else {
                 this.log.error(error.response.data);
             }
         }
     }
+    /**
+     * Get ErrorMessage object from response contain an error as a string.
+     *
+     * @param data string value
+     * @returns undefined if an error object is not found or populated ErrorMessage object
+     */
+    getErrorMessageFromString(data) {
+        let error;
+        if (typeof data === 'string') {
+            try {
+                const errorMsg = JSON.parse(data);
+                if (errorMsg.error) {
+                    error = errorMsg.error;
+                }
+            }
+            catch (_a) {
+                // Not much we can do!
+            }
+        }
+        return error;
+    }
 }
 exports.Ui5AbapRepositoryService = Ui5AbapRepositoryService;
 Ui5AbapRepositoryService.PATH = '/sap/opu/odata/UI5/ABAP_REPOSITORY_SRV';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap-ux/axios-extension",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Extension of the Axios module adding convinience methods to interact with SAP systems especially with OData services.",
   "repository": {
     "type": "git",