@sap/cds-dk 7.5.0 → 7.5.1

package/lib/bind/cfKeyProvider.js

@@ -4,7 +4,7 @@ const DEBUG = cds.debug('cli')
 const cfUtil = require('../util/cf');
 
 const axios = require('axios');
-require('../util/pruneAxiosErrors');
+require('../util/axios').pruneErrors();
 const { URL } = require('url');
 const { bold, highlight } = require('../util/term');
 

package/lib/build/provider/mtx-extension/index.js

@@ -43,7 +43,8 @@ class MtxExtensionBuildPlugin extends InternalBuildPlugin {
             await this.collectLanguageBundles(extModel, path.join(destExt, 'i18n'))
 
             // perform SQL backend validation to prevent extension deployment problems later on
-            cds.compile.to.sql(model)
+            // REVISIT: disabled - causing stack overflow errors in LinkedCSN for some scenarios
+            // cds.compile.to.sql(model)
 
             const files = Object.keys(await cds.deploy.resources(model))
             if (files.length > 0) {

package/lib/compile/openapi/csdl2openapi.js

@@ -1843,7 +1843,7 @@ see [Expand](http://docs.oasis-open.org/odata/odata/v4.01/odata-v4.01-part1-prot
                     if (suffix === SUFFIX.create)
                         schemaProperties[iName] = getSchema(property, SUFFIX.create);
                     if (suffix === SUFFIX.update)
-                        schemaProperties[iName] = getSchema(property, SUFFIX.update);
+                        schemaProperties[iName] = getSchema(property, SUFFIX.create);
                 }
             } else {
                 if (property[voc.Core.Permissions] === "Read" || property[voc.Core.Computed]) {

package/lib/mtx/activate.js

@@ -5,7 +5,7 @@ const axios = require('axios');
 const cds = require('../cds');
 const AuthManager = require('./auth_manager');
 
-require('../util/pruneAxiosErrors');
+require('../util/axios').pruneErrors().setReqTimeout();
 const { collectFileContent, collectFiles, toUnixPath } = require('./util/fs');
 const { getMessage } = require('./util/logging');
 const { handleHttpError } = require('./util/errors');

package/lib/mtx/auth_manager.js

@@ -4,7 +4,7 @@ const cds = require('../cds');
 const { SettingsManager } = require('./settings_manager');
 const { ParamCollection } = require('./params');
 
-require('../util/pruneAxiosErrors');
+require('../util/axios').pruneErrors().setReqTimeout();
 const { getMessage } = require('./util/logging');
 
 const DEBUG = cds.debug('cli');

package/lib/mtx/download_legacy.js

@@ -4,7 +4,7 @@ const axios = require('axios');
 
 const { login } = require('./auth_manager');
 
-require('../util/pruneAxiosErrors');
+require('../util/axios').pruneErrors().setReqTimeout();
 const { handleHttpError } = require('./util/errors');
 
 const DOWNLOAD_FILE_NAME = 'migrated_projects.tgz'; // TODO try to add tenant later, if possible

package/lib/mtx/extend.js

@@ -4,7 +4,7 @@ const axios = require('axios');
 
 const AuthManager = require('./auth_manager');
 
-require('../util/pruneAxiosErrors');
+require('../util/axios').pruneErrors().setReqTimeout();
 const { normalizePath, isParent } = require('./util/fs');
 const Question = require('./util/question');
 const { getMessage } = require('./util/logging');

package/lib/mtx/pull.js

@@ -7,7 +7,7 @@ const axios = require('axios');
 
 const { login } = require('./auth_manager');
 
-require('../util/pruneAxiosErrors');
+require('../util/axios').pruneErrors().setReqTimeout();
 const { getMessage } = require('./util/logging');
 const { handleHttpError } = require('./util/errors');
 

package/lib/mtx/push.js

@@ -6,7 +6,7 @@ const axios = require('axios');
 const { login } = require('./auth_manager');
 const buildSystem = require('../build')
 
-require('../util/pruneAxiosErrors');
+require('../util/axios').pruneErrors().setReqTimeout();
 const { getMessage } = require('./util/logging');
 const { schemaRegex } = require('./util/urls');
 const { handleHttpError } = require('./util/errors');

package/lib/mtx/tenant_action.js

@@ -2,7 +2,7 @@ const cds = require('../cds');
 const { ParamCollection } = require('./params');
 const AuthManager = require('./auth_manager');
 
-require('../util/pruneAxiosErrors');
+require('../util/axios').pruneErrors().setReqTimeout();
 const { getMessage } = require('./util/logging');
 const { capitalize } = require('./util/strings');
 const { handleHttpError } = require('./util/errors');

package/lib/mtx/util/legacy_ext.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs').promises;
 
 const { concatUrls } = require('./urls');
-require('../../util/pruneAxiosErrors');
+require('../../util/axios').pruneErrors().setReqTimeout();
 
 const MTX_URL_PATH_PREFIX = 'mtx/v1/model/';
 

package/lib/util/axios.js

@@ -0,0 +1,84 @@
+module.exports = {
+    pruneErrors,
+    setReqTimeout
+};
+
+// Will only count the time until the server starts responding, not the time until the request is finished.
+const GENERIC_REQUEST_TIMEOUT_MS = 1500;
+
+function setReqTimeout() {
+    require('axios').interceptors.request.use(
+        config => {
+            config.timeout = GENERIC_REQUEST_TIMEOUT_MS;
+            return config;
+        },
+        error => {
+            return Promise.reject(error)
+        }
+    );
+    return module.exports;
+}
+
+
+function pruneErrors() {
+    function stacklessError(message) {
+        const { stackTraceLimit } = Error;
+        Error.stackTraceLimit = 0;
+        const error = new Error(message);
+        Error.stackTraceLimit = stackTraceLimit;
+        return error;
+    }
+
+    require('axios').interceptors.response.use(
+        response => response,
+        axError => {
+            const { inspect } = require('util');
+            const { url, method } = axError.config ?? {};
+            const { errno, code, response = {}, message: axMessage } = axError;
+            const prefix = (url && method ? `${method.toUpperCase()} ${url}` : 'Request') + ' failed';
+
+            let error;
+            if (errno) {
+                // System error during request.
+                const message = prefix
+                    + `: ${errno} ${code}`
+                    + (/\b(ENOTFOUND|EAI_AGAIN)\b/.test(code) ? `. Make sure the URL is correct and the server is running.` : '');
+                error = stacklessError(message);
+            } else {
+                // Error after request has been made.
+                const { status, statusText } = response;
+                let { data } = response;
+                if (Buffer.isBuffer(data)) {
+                    data = data.toString();
+                    try {
+                        data = JSON.parse(data);
+                    } catch (error) { /* unexpected; data will be included in error below */
+                    }
+                }
+                const inspectData = data && !data.error_description;
+                const reason = !inspectData && data?.error /* RFC 6749 */ && (typeof data.error === 'string' ? data.error : inspect(data.error));
+                const details = inspectData ? inspect(data) : data?.error_description /* RFC 6749 */;
+                const message = prefix + (
+                    status || statusText || reason || details
+                        ? (status || statusText ? ':' : '') +
+                        (status ? ` ${status}` : '') +
+                        (statusText ? ` ${statusText}` : '') +
+                        (reason ? `. ${reason}` : '') +
+                        (details ? `. Details: ${details}` : '')
+                        : (axMessage ? `: ${axMessage}` : '')
+                );
+
+                error = stacklessError(message);
+                if (status) {
+                    error.status = status;
+                }
+            }
+
+            if (require('../').debug('req')) {
+                error.cause = axError;
+            }
+            return Promise.reject(error);
+        }
+    );
+    return module.exports;
+}