@saptools/cf-hana 0.3.4 → 0.3.5

package/dist/index.js

@@ -625,10 +625,10 @@ async function listColumns(connection, schema, table) {
 }
 
 // src/config.ts
-var CLI_VERSION = "0.3.4";
+var CLI_VERSION = "0.3.5";
 var ENV_PREFIX = "CF_HANA";
-var DEFAULT_QUERY_TIMEOUT_MS = 3e4;
-var DEFAULT_CONNECT_TIMEOUT_MS = 3e4;
+var DEFAULT_QUERY_TIMEOUT_MS = 6e4;
+var DEFAULT_CONNECT_TIMEOUT_MS = 6e4;
 var DEFAULT_POOL_MAX = 4;
 var DEFAULT_POOL_IDLE_MS = 6e4;
 var DEFAULT_AUTO_LIMIT = 100;
@@ -661,9 +661,9 @@ import { join as join2 } from "path";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 var MAX_BUFFER = 16 * 1024 * 1024;
-var DEFAULT_TIMEOUT_MS = 3e4;
+var DEFAULT_TIMEOUT_MS = 6e4;
 var CF_RETRY_ATTEMPTS = 3;
-var CF_RETRY_BASE_DELAY_MS = 120;
+var CF_RETRY_BASE_DELAY_MS = 500;
 var REGION_API_MAP = {
   ae01: "https://api.cf.ae01.hana.ondemand.com",
   ap01: "https://api.cf.ap01.hana.ondemand.com",
@@ -785,29 +785,45 @@ function buildEnv(ctx, overrides = {}) {
   env["CF_HOME"] = ctx.cfHome;
   return env;
 }
-async function runCf(args, ctx, overrides = {}) {
-  const { bin, argsPrefix } = resolveCfBin();
-  const env = buildEnv(ctx, overrides);
+async function execWithRetries(bin, args, env, timeoutMs = DEFAULT_TIMEOUT_MS) {
   let lastErr;
   for (let attempt = 0; attempt < CF_RETRY_ATTEMPTS; attempt++) {
     try {
-      const { stdout } = await execFileAsync(bin, [...argsPrefix, ...args], {
+      const { stdout } = await execFileAsync(bin, args, {
         env,
         maxBuffer: MAX_BUFFER,
-        timeout: DEFAULT_TIMEOUT_MS
+        timeout: timeoutMs,
+        killSignal: "SIGKILL"
       });
       return stdout;
     } catch (err) {
       lastErr = err;
+      const e = err;
+      const output = `${e.message ?? ""} ${e.stderr ? String(e.stderr) : ""}`.toLowerCase();
+      const isTimeout = e.killed === true;
+      const isNetworkFlake = output.includes("error performing request") || output.includes("timeout") || output.includes("connection reset") || output.includes("connection refused") || output.includes("eof") || output.includes("502 bad gateway") || output.includes("503 service unavailable") || output.includes("504 gateway timeout") || output.includes("dial tcp") || output.includes("no such host");
+      const isEnoent = e.code === "ENOENT";
+      if (isEnoent || !isTimeout && !isNetworkFlake) {
+        throw err;
+      }
       if (attempt < CF_RETRY_ATTEMPTS - 1) {
         await new Promise((r) => setTimeout(r, CF_RETRY_BASE_DELAY_MS * (attempt + 1)));
       }
     }
   }
-  const e = lastErr;
-  const detail = e?.stderr ? String(e.stderr) : e?.message ?? "";
-  const cmd = args[0] === "auth" ? "cf auth" : `cf ${args.join(" ")}`;
-  throw new Error(`${cmd} failed: ${detail}`.trim(), { cause: lastErr });
+  throw lastErr;
+}
+async function runCf(args, ctx, overrides = {}) {
+  const { bin, argsPrefix } = resolveCfBin();
+  const env = buildEnv(ctx, overrides);
+  try {
+    return await execWithRetries(bin, [...argsPrefix, ...args], env);
+  } catch (lastErr) {
+    const e = lastErr;
+    const detail = e?.stderr ? String(e.stderr) : e?.message ?? "";
+    const cmd = args[0] === "auth" ? "cf auth" : `cf ${args.join(" ")}`;
+    throw new Error(`${cmd} failed: ${detail}`.trim(), { cause: lastErr });
+  }
 }
 async function cfApi(apiEndpoint, ctx) {
   await runCf(["api", apiEndpoint], ctx);
@@ -829,12 +845,7 @@ async function cfEnvDirect(appName) {
   const env = { ...process.env };
   delete env["SAP_EMAIL"];
   delete env["SAP_PASSWORD"];
-  const { stdout } = await execFileAsync(bin, [...argsPrefix, "env", appName], {
-    env,
-    maxBuffer: MAX_BUFFER,
-    timeout: DEFAULT_TIMEOUT_MS
-  });
-  return stdout;
+  return await execWithRetries(bin, [...argsPrefix, "env", appName], env);
 }
 async function readCurrentCfTarget() {
   const { bin, argsPrefix } = resolveCfBin();
@@ -842,11 +853,7 @@ async function readCurrentCfTarget() {
   delete env["SAP_EMAIL"];
   delete env["SAP_PASSWORD"];
   try {
-    const { stdout } = await execFileAsync(bin, [...argsPrefix, "target"], {
-      env,
-      maxBuffer: MAX_BUFFER,
-      timeout: 1e4
-    });
+    const stdout = await execWithRetries(bin, [...argsPrefix, "target"], env);
     return parseCfTargetOutput(stdout);
   } catch {
     return void 0;
@@ -1785,6 +1792,57 @@ function boundedRows(rows, requestedLimit) {
     truncated: rows.length > requestedLimit
   };
 }
+function isBooleanColumn(column) {
+  return column.typeName.trim().toUpperCase() === "BOOLEAN";
+}
+function normalizeBooleanCell(value) {
+  if (value === 0) {
+    return false;
+  }
+  if (value === 1) {
+    return true;
+  }
+  if (typeof value !== "string") {
+    return value;
+  }
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "0") {
+    return false;
+  }
+  if (normalized === "1") {
+    return true;
+  }
+  if (normalized === "false") {
+    return false;
+  }
+  if (normalized === "true") {
+    return true;
+  }
+  return value;
+}
+function normalizeBooleanRow(row, columns) {
+  let normalizedRow;
+  for (const column of columns) {
+    const value = row[column.name];
+    if (value === void 0) {
+      continue;
+    }
+    const normalizedValue = normalizeBooleanCell(value);
+    if (normalizedValue === value) {
+      continue;
+    }
+    normalizedRow ??= { ...row };
+    normalizedRow[column.name] = normalizedValue;
+  }
+  return normalizedRow ?? row;
+}
+function normalizeBooleanRows(rows, columns) {
+  const booleanColumns = columns.filter(isBooleanColumn);
+  if (booleanColumns.length === 0 || rows.length === 0) {
+    return rows;
+  }
+  return rows.map((row) => normalizeBooleanRow(row, booleanColumns));
+}
 async function withTimeout(work, timeoutMs, onTimeout) {
   let timer;
   const timeout = new Promise((_resolve, reject) => {
@@ -1870,7 +1928,8 @@ var Connection = class _Connection {
       }
     );
     const elapsedMs = Date.now() - started;
-    const selected = boundedRows(execResult.rows, limited.requestedLimit);
+    const normalizedRows = normalizeBooleanRows(execResult.rows, execResult.columns);
+    const selected = boundedRows(normalizedRows, limited.requestedLimit);
     return {
       rows: selected.rows,
       columns: execResult.columns,