catalyst-relay 0.4.5 → 0.4.6

package/dist/index.js

@@ -255,7 +255,7 @@ var DEFAULT_SESSION_CONFIG = {
 };
 
 // src/core/session/login.ts
-async function fetchCsrfToken(state, request3) {
+async function fetchCsrfToken(state, request4) {
   const endpoint = state.config.auth.type === "saml" ? "/sap/bc/adt/core/http/sessions" : "/sap/bc/adt/compatibility/graph";
   const contentType = state.config.auth.type === "saml" ? "application/vnd.sap.adt.core.http.session.v3+xml" : "application/xml";
   const headers = {
@@ -263,7 +263,7 @@ async function fetchCsrfToken(state, request3) {
     "Content-Type": contentType,
     "Accept": contentType
   };
-  const [response, requestErr] = await request3({
+  const [response, requestErr] = await request4({
     method: "GET",
     path: endpoint,
     headers
@@ -313,8 +313,8 @@ function extractUsername(auth) {
     }
   }
 }
-async function login(state, request3) {
-  const [token, tokenErr] = await fetchCsrfToken(state, request3);
+async function login(state, request4) {
+  const [token, tokenErr] = await fetchCsrfToken(state, request4);
   if (tokenErr) {
     return err(new Error(`Login failed: ${tokenErr.message}`));
   }
@@ -328,8 +328,8 @@ async function login(state, request3) {
   state.session = session;
   return ok(session);
 }
-async function logout(state, request3) {
-  const [response, requestErr] = await request3({
+async function logout(state, request4) {
+  const [response, requestErr] = await request4({
     method: "POST",
     path: "/sap/public/bc/icf/logoff"
   });
@@ -344,11 +344,11 @@ async function logout(state, request3) {
   state.session = null;
   return ok(void 0);
 }
-async function sessionReset(state, request3) {
-  await logout(state, request3);
+async function sessionReset(state, request4) {
+  await logout(state, request4);
   state.csrfToken = null;
   state.session = null;
-  const [, loginErr] = await login(state, request3);
+  const [, loginErr] = await login(state, request4);
   if (loginErr) {
     return err(loginErr);
   }
@@ -357,12 +357,12 @@ async function sessionReset(state, request3) {
 
 // src/core/session/refresh.ts
 var REENTRANCE_TICKET_PATH = "/sap/bc/adt/security/reentranceticket";
-async function refreshSession(state, request3) {
+async function refreshSession(state, request4) {
   if (!state.session) {
     return err(new Error("Not logged in"));
   }
   debug("Fetching reentrance ticket to refresh session...");
-  const [response, reqErr] = await request3({
+  const [response, reqErr] = await request4({
     method: "GET",
     path: REENTRANCE_TICKET_PATH,
     headers: { "Accept": "text/plain" }
@@ -1242,6 +1242,35 @@ async function previewData(client, query) {
   return ok(dataFrame);
 }
 
+// src/core/adt/data_extraction/freestyle.ts
+var DEFAULT_ROW_LIMIT = 100;
+async function freestyleQuery(client, sqlQuery, limit = DEFAULT_ROW_LIMIT) {
+  debug(`Freestyle query: ${sqlQuery}`);
+  const [response, requestErr] = await client.request({
+    method: "POST",
+    path: "/sap/bc/adt/datapreview/freestyle",
+    params: {
+      "rowNumber": limit
+    },
+    headers: {
+      "Accept": "application/xml, application/vnd.sap.adt.datapreview.table.v1+xml",
+      "Content-Type": "text/plain"
+    },
+    body: sqlQuery
+  });
+  if (requestErr) return err(requestErr);
+  if (!response.ok) {
+    const text2 = await response.text();
+    debug(`Freestyle query error response: ${text2.substring(0, 500)}`);
+    const errorMsg = extractError(text2);
+    return err(new Error(`Freestyle query failed: ${errorMsg}`));
+  }
+  const text = await response.text();
+  const [dataFrame, parseErr] = parseDataPreview(text, limit, true);
+  if (parseErr) return err(parseErr);
+  return ok(dataFrame);
+}
+
 // src/core/adt/data_extraction/queryBuilder.ts
 function quoteString(value) {
   return typeof value == "string" ? "'" + value + "'" : "" + value;
@@ -1316,15 +1345,10 @@ from ${query.objectName}${parametersToSQLParams(parameters)} as main
 
 // src/core/adt/data_extraction/distinct.ts
 var MAX_ROW_COUNT = 5e4;
-async function getDistinctValues(client, objectName, parameters, column, objectType = "view") {
+async function getDistinctValues(client, objectName, parameters, column, _objectType = "view") {
   const columnName = column.toUpperCase();
-  const sqlQuery = `SELECT ${columnName} AS value, COUNT(*) AS ValueCount FROM ${objectName}${parametersToSQLParams(parameters)} GROUP BY ${columnName} ORDER BY ValueCount DESCENDING`;
-  const [dataFrame, error] = await previewData(client, {
-    objectName,
-    objectType,
-    sqlQuery,
-    limit: MAX_ROW_COUNT
-  });
+  const sqlQuery = `SELECT ${columnName} AS value, COUNT(*) AS value_count FROM ${objectName}${parametersToSQLParams(parameters)} GROUP BY ${columnName} ORDER BY value_count DESCENDING`;
+  const [dataFrame, error] = await freestyleQuery(client, sqlQuery, MAX_ROW_COUNT);
   if (error) {
     return err(new Error(`Distinct values query failed: ${error.message}`));
   }
@@ -1336,14 +1360,9 @@ async function getDistinctValues(client, objectName, parameters, column, objectT
 }
 
 // src/core/adt/data_extraction/count.ts
-async function countRows(client, objectName, objectType) {
-  const sqlQuery = `SELECT COUNT(*) AS count FROM ${objectName}`;
-  const [dataFrame, error] = await previewData(client, {
-    objectName,
-    objectType,
-    sqlQuery,
-    limit: 1
-  });
+async function countRows(client, objectName, _objectType) {
+  const sqlQuery = `SELECT COUNT(*) AS row_count FROM ${objectName}`;
+  const [dataFrame, error] = await freestyleQuery(client, sqlQuery, 1);
   if (error) {
     return err(new Error(`Row count query failed: ${error.message}`));
   }
@@ -2246,13 +2265,22 @@ function createAuthStrategy(options) {
 }
 
 // src/core/client.ts
+var http = __toESM(require("http"));
 var https2 = __toESM(require("https"));
-async function httpsRequest2(url, options) {
+var MAX_REDIRECTS = 5;
+var REDIRECT_STATUSES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+async function httpRequest(url, options, redirectCount = 0) {
+  if (redirectCount > MAX_REDIRECTS) {
+    throw new Error(`Too many redirects (max ${MAX_REDIRECTS})`);
+  }
   const urlObj = new URL(url);
+  const isHttps = urlObj.protocol === "https:";
+  const requestFn = isHttps ? https2.request : http.request;
+  const defaultPort = isHttps ? 443 : 80;
   return new Promise((resolve, reject) => {
-    const req = https2.request({
+    const req = requestFn({
       hostname: urlObj.hostname,
-      port: urlObj.port || 443,
+      port: urlObj.port || defaultPort,
       path: urlObj.pathname + urlObj.search,
       method: options.method,
       headers: options.headers,
@@ -2261,6 +2289,14 @@ async function httpsRequest2(url, options) {
       rejectUnauthorized: options.rejectUnauthorized ?? true,
       timeout: options.timeout
     }, (res) => {
+      const statusCode = res.statusCode || 0;
+      if (REDIRECT_STATUSES.has(statusCode) && res.headers.location) {
+        const redirectUrl = new URL(res.headers.location, url).toString();
+        const redirectMethod = statusCode === 303 ? "GET" : options.method;
+        const redirectBody = statusCode === 303 ? void 0 : options.body;
+        httpRequest(redirectUrl, { ...options, method: redirectMethod, body: redirectBody }, redirectCount + 1).then(resolve).catch(reject);
+        return;
+      }
       const chunks = [];
       res.on("data", (chunk) => chunks.push(chunk));
       res.on("end", () => {
@@ -2276,7 +2312,7 @@ async function httpsRequest2(url, options) {
           }
         }
         resolve(new Response(body, {
-          status: res.statusCode || 0,
+          status: statusCode,
           statusText: res.statusMessage || "",
           headers
         }));
@@ -2395,7 +2431,7 @@ var ADTClientImpl = class {
     try {
       debug(`Fetching URL: ${url}`);
       debug(`mTLS: ${!!this.ssoCerts}, insecure: ${config.insecure}`);
-      const response = await httpsRequest2(url, {
+      const response = await httpRequest(url, {
         method,
         headers,
         body,
@@ -2418,7 +2454,7 @@ var ADTClientImpl = class {
             headers["Cookie"] = retryCookieHeader;
           }
           debug(`Retrying with new CSRF token: ${newToken.substring(0, 20)}...`);
-          const retryResponse = await httpsRequest2(url, {
+          const retryResponse = await httpRequest(url, {
             method,
             headers,
             body,