catalyst-relay 0.5.12 → 0.5.14

package/dist/index.mjs

@@ -1579,7 +1579,9 @@ async function updateObject(client, object, lockHandle, transport) {
 
 // src/core/adt/craud/activation.ts
 var MAX_POLL_ATTEMPTS = 30;
+var POLL_RETRY_DELAY_MS = 1e3;
 var RUN_ID_REGEX = /\/activation\/runs\/([^?/]+)/;
+var BACKGROUND_RUN_MEDIA_TYPE = "application/vnd.sap.adt.backgroundrun.v1+xml";
 async function activateObjects(client, objects) {
   if (objects.length === 0) {
     return ok([]);
@@ -1605,7 +1607,7 @@ async function activateObjects(client, objects) {
     },
     headers: {
       "Content-Type": "application/xml",
-      "Accept": "application/xml"
+      "Accept": BACKGROUND_RUN_MEDIA_TYPE
     },
     body
   });
@@ -1623,22 +1625,25 @@ async function activateObjects(client, objects) {
   }
   const runId = runIdMatch[1];
   debug(`Activation run ID: ${runId}`);
-  let pollAttempt = 0;
-  while (pollAttempt < MAX_POLL_ATTEMPTS) {
+  for (let pollAttempt = 1; pollAttempt <= MAX_POLL_ATTEMPTS; pollAttempt++) {
     const [pollRes, pollErr] = await client.request({
       method: "GET",
       path: `/sap/bc/adt/activation/runs/${runId}`,
       params: { "withLongPolling": "true" },
-      headers: { "Accept": "application/xml" }
+      headers: { "Accept": BACKGROUND_RUN_MEDIA_TYPE }
     });
     if (pollErr) return err(pollErr);
-    debug(`Activation poll attempt ${pollAttempt + 1} status: ${pollRes.status}`);
+    debug(`Activation poll attempt ${pollAttempt} status: ${pollRes.status}`);
     if (pollRes.ok) break;
-    pollAttempt++;
+    if (pollRes.status >= 400 && pollRes.status < 500) {
+      const errText = await pollRes.text();
+      return err(new Error(`Activation run ${runId} polling rejected (${pollRes.status}): ${extractError(errText)}`));
+    }
     if (pollAttempt >= MAX_POLL_ATTEMPTS) {
       const errText = await pollRes.text();
-      return err(new Error(`Activation run ${runId} did not complete: ${extractError(errText)}`));
+      return err(new Error(`Activation run ${runId} did not complete after ${MAX_POLL_ATTEMPTS} attempts: ${extractError(errText)}`));
     }
+    await new Promise((resolve) => setTimeout(resolve, POLL_RETRY_DELAY_MS));
   }
   const [resultsRes, resultsErr] = await client.request({
     method: "GET",
@@ -2341,16 +2346,64 @@ function parseDataPreview(xml, maxRows, isTable) {
   const namespace = "http://www.sap.com/adt/dataPreview";
   const metadataElements = doc.getElementsByTagNameNS(namespace, "metadata");
   const columns = [];
+  const SAP_TYPE_MAP = {
+    "8": "integer",
+    // Int8
+    "I": "integer",
+    // Integer
+    "P": "decimal",
+    // Packed decimal
+    "F": "float",
+    // Floating point
+    "D": "date",
+    // Date (YYYYMMDD)
+    "T": "time",
+    // Time (HHMMSS)
+    "S": "timestamp",
+    // Timestamp
+    "C": "string",
+    // Character
+    "N": "string",
+    // Numeric character string
+    "V": "string",
+    // Variable-length character
+    "X": "binary"
+    // Raw binary/hex
+  };
   for (let i = 0; i < metadataElements.length; i++) {
     const meta = metadataElements[i];
     if (!meta) continue;
     const nameAttr = isTable ? "name" : "camelCaseName";
     const name = meta.getAttributeNS(namespace, nameAttr) || meta.getAttribute("name");
-    const dataType = meta.getAttributeNS(namespace, "colType") || meta.getAttribute("colType");
+    const colType = meta.getAttributeNS(namespace, "colType") || meta.getAttribute("colType");
+    const rawType = meta.getAttributeNS(namespace, "type") || meta.getAttribute("type");
+    const isKeyFigure = meta.getAttributeNS(namespace, "isKeyFigure") === "true";
+    let dataType;
+    if (colType && colType.trim() !== "") {
+      dataType = colType;
+    } else if (isKeyFigure) {
+      dataType = "decimal";
+    } else if (rawType && SAP_TYPE_MAP[rawType]) {
+      dataType = SAP_TYPE_MAP[rawType];
+    } else {
+      dataType = "string";
+    }
+    const allAttrs = {};
+    for (let j = 0; j < meta.attributes.length; j++) {
+      const attr = meta.attributes[j];
+      if (!attr) {
+        continue;
+      }
+      allAttrs[attr.name] = attr.value;
+    }
     if (!name || !dataType) continue;
     columns.push({ name, dataType });
   }
   const dataSetElements = doc.getElementsByTagNameNS(namespace, "dataSet");
+  for (let i = 0; i < dataSetElements.length; i++) {
+    const dataSet = dataSetElements[i];
+    if (!dataSet) continue;
+  }
   if (columns.length === 0 && dataSetElements.length > 0) {
     for (let i = 0; i < dataSetElements.length; i++) {
       const dataSet = dataSetElements[i];
@@ -2433,7 +2486,7 @@ async function previewData(client, query) {
 
 // src/core/adt/data_extraction/freestyle.ts
 var DEFAULT_ROW_LIMIT = 100;
-async function freestyleQuery(client, sqlQuery, limit = DEFAULT_ROW_LIMIT) {
+async function freestyleQuery(client, sqlQuery, limit = DEFAULT_ROW_LIMIT, timeout) {
   debug(`Freestyle query: ${sqlQuery}`);
   const [response, requestErr] = await client.request({
     method: "POST",
@@ -2443,16 +2496,21 @@ async function freestyleQuery(client, sqlQuery, limit = DEFAULT_ROW_LIMIT) {
     },
     headers: {
       "Accept": "application/xml, application/vnd.sap.adt.datapreview.table.v1+xml",
-      "Content-Type": "text/plain"
+      "Content-Type": "text/plain",
+      // Override stateful base header: each preview request is independent; stateless
+      // lets SAP route to any work process and recycle it after the request, preventing
+      // GENERATE_SUBPOOL_DIR_FULL (36-pool limit per work process).
+      "X-sap-adt-sessiontype": "stateless"
     },
-    body: sqlQuery
+    body: sqlQuery,
+    ...timeout !== void 0 && { timeout }
   });
   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}`));
+    return err(new Error(`Freestyle query failed: ${errorMsg}`, { cause: text2 }));
   }
   const text = await response.text();
   const [dataFrame, parseErr] = parseDataPreview(text, limit, true);
@@ -2713,7 +2771,16 @@ function parseTransportTasks(doc) {
         position: el.getAttribute("tm:position") || ""
       });
     }
-    tasks.push({ taskId, objects });
+    const owner = taskEl.getAttribute("tm:owner");
+    const description = taskEl.getAttribute("tm:desc");
+    const status = taskEl.getAttribute("tm:status");
+    tasks.push({
+      taskId,
+      ...owner ? { owner } : {},
+      ...description ? { description } : {},
+      ...status ? { status } : {},
+      objects
+    });
   }
   return tasks;
 }
@@ -3107,6 +3174,12 @@ async function countRows2(state, requestor, objectName, objectType, parameters =
   return countRows(requestor, objectName, objectType, parameters);
 }
 
+// src/client/methods/preview/freestyleQuery.ts
+async function freestyleQuery2(state, requestor, sqlQuery, limit, timeout) {
+  if (!state.session) return err(new Error("Not logged in"));
+  return freestyleQuery(requestor, sqlQuery, limit, timeout);
+}
+
 // src/client/methods/search/search.ts
 async function search(state, requestor, query, options) {
   if (!state.session) return err(new Error("Not logged in"));
@@ -3290,7 +3363,7 @@ function buildUrl2(baseUrl, path, params) {
 // src/client/methods/internal/request.ts
 async function executeRequest(deps, options, selfRequest) {
   const { state, ssoCerts, getCookieHeader, storeCookies: storeCookies2 } = deps;
-  const { method, path, params, headers: customHeaders, body } = options;
+  const { method, path, params, headers: customHeaders, body, timeout: requestTimeout } = options;
   const { config } = state;
   debug(`Request ${method} ${path} - CSRF token in state: ${state.csrfToken?.substring(0, 20) || "null"}...`);
   const headers = buildRequestHeaders(
@@ -3317,7 +3390,7 @@ async function executeRequest(deps, options, selfRequest) {
       cert: ssoCerts?.cert,
       key: ssoCerts?.key,
       rejectUnauthorized: !config.insecure,
-      timeout: config.timeout ?? DEFAULT_TIMEOUT
+      timeout: requestTimeout ?? config.timeout ?? DEFAULT_TIMEOUT
     });
     storeCookies2(response);
     if (response.status === 403) {
@@ -3340,7 +3413,7 @@ async function executeRequest(deps, options, selfRequest) {
           cert: ssoCerts?.cert,
           key: ssoCerts?.key,
           rejectUnauthorized: !config.insecure,
-          timeout: config.timeout ?? DEFAULT_TIMEOUT
+          timeout: requestTimeout ?? config.timeout ?? DEFAULT_TIMEOUT
         });
         storeCookies2(retryResponse);
         return ok(retryResponse);
@@ -3511,6 +3584,9 @@ var ADTClientImpl = class {
   async countRows(objectName, objectType, parameters = []) {
     return countRows2(this.state, this.requestor, objectName, objectType, parameters);
   }
+  async freestyleQuery(sqlQuery, limit, timeout) {
+    return freestyleQuery2(this.state, this.requestor, sqlQuery, limit, timeout);
+  }
   // --- Search ---
   async search(query, options) {
     return search(this.state, this.requestor, query, options);