@saptools/cf-hana 0.3.2 → 0.3.4

package/dist/index.d.ts

@@ -43,7 +43,7 @@ interface ConnectOptions {
     readonly autoLimit?: number | false;
     readonly queryTimeoutMs?: number;
     readonly connectTimeoutMs?: number;
-    /** Bypass the cached credentials and fetch them live from Cloud Foundry. */
+    /** Deprecated compatibility flag. Binding discovery is already live. */
     readonly refresh?: boolean;
     /** SAP BTP email for the live credential fetch (else `SAP_EMAIL`). */
     readonly email?: string;

package/dist/index.js

@@ -625,7 +625,7 @@ async function listColumns(connection, schema, table) {
 }
 
 // src/config.ts
-var CLI_VERSION = "0.3.2";
+var CLI_VERSION = "0.3.4";
 var ENV_PREFIX = "CF_HANA";
 var DEFAULT_QUERY_TIMEOUT_MS = 3e4;
 var DEFAULT_CONNECT_TIMEOUT_MS = 3e4;
@@ -673,40 +673,94 @@ var REGION_API_MAP = {
   ap20: "https://api.cf.ap20.hana.ondemand.com",
   ap21: "https://api.cf.ap21.hana.ondemand.com",
   ap30: "https://api.cf.ap30.hana.ondemand.com",
+  ap31: "https://api.cf.ap31.hana.ondemand.com",
   br10: "https://api.cf.br10.hana.ondemand.com",
   br20: "https://api.cf.br20.hana.ondemand.com",
   br30: "https://api.cf.br30.hana.ondemand.com",
   ca10: "https://api.cf.ca10.hana.ondemand.com",
   ca20: "https://api.cf.ca20.hana.ondemand.com",
   ch20: "https://api.cf.ch20.hana.ondemand.com",
+  cn20: "https://api.cf.cn20.platform.sapcloud.cn",
+  cn40: "https://api.cf.cn40.platform.sapcloud.cn",
+  eu01: "https://api.cf.eu01.hana.ondemand.com",
+  eu02: "https://api.cf.eu02.hana.ondemand.com",
   eu10: "https://api.cf.eu10.hana.ondemand.com",
+  "eu10-002": "https://api.cf.eu10-002.hana.ondemand.com",
+  "eu10-003": "https://api.cf.eu10-003.hana.ondemand.com",
+  "eu10-004": "https://api.cf.eu10-004.hana.ondemand.com",
+  "eu10-005": "https://api.cf.eu10-005.hana.ondemand.com",
+  "eu10-006": "https://api.cf.eu10-006.hana.ondemand.com",
   eu11: "https://api.cf.eu11.hana.ondemand.com",
   eu12: "https://api.cf.eu12.hana.ondemand.com",
+  eu13: "https://api.cf.eu13.hana.ondemand.com",
   eu20: "https://api.cf.eu20.hana.ondemand.com",
+  "eu20-001": "https://api.cf.eu20-001.hana.ondemand.com",
+  "eu20-002": "https://api.cf.eu20-002.hana.ondemand.com",
   eu21: "https://api.cf.eu21.hana.ondemand.com",
+  eu22: "https://api.cf.eu22.hana.ondemand.com",
   eu30: "https://api.cf.eu30.hana.ondemand.com",
-  "eu10-002": "https://api.cf.eu10-002.hana.ondemand.com",
+  eu31: "https://api.cf.eu31.hana.ondemand.com",
+  il30: "https://api.cf.il30.hana.ondemand.com",
+  in30: "https://api.cf.in30.hana.ondemand.com",
+  jp01: "https://api.cf.jp01.hana.ondemand.com",
   jp10: "https://api.cf.jp10.hana.ondemand.com",
   jp20: "https://api.cf.jp20.hana.ondemand.com",
   jp30: "https://api.cf.jp30.hana.ondemand.com",
+  jp31: "https://api.cf.jp31.hana.ondemand.com",
+  sa30: "https://api.cf.sa30.hana.ondemand.com",
+  sa31: "https://api.cf.sa31.hana.ondemand.com",
+  uk20: "https://api.cf.uk20.hana.ondemand.com",
+  us01: "https://api.cf.us01.hana.ondemand.com",
+  us02: "https://api.cf.us02.hana.ondemand.com",
   us10: "https://api.cf.us10.hana.ondemand.com",
+  "us10-001": "https://api.cf.us10-001.hana.ondemand.com",
+  "us10-002": "https://api.cf.us10-002.hana.ondemand.com",
+  "us10-003": "https://api.cf.us10-003.hana.ondemand.com",
   us11: "https://api.cf.us11.hana.ondemand.com",
   us20: "https://api.cf.us20.hana.ondemand.com",
   us21: "https://api.cf.us21.hana.ondemand.com",
+  "us21-001": "https://api.cf.us21-001.hana.ondemand.com",
+  us22: "https://api.cf.us22.hana.ondemand.com",
   us30: "https://api.cf.us30.hana.ondemand.com",
-  in30: "https://api.cf.in30.hana.ondemand.com"
+  us32: "https://api.cf.us32.hana.ondemand.com"
 };
+function normalizeSapCfApiEndpoint(apiEndpoint) {
+  const trimmed = apiEndpoint.trim();
+  let parsed;
+  try {
+    parsed = new URL(trimmed);
+  } catch {
+    throw new Error(`Invalid or untrusted CF API endpoint "${apiEndpoint}".`);
+  }
+  if (/^https:\/\/[^/]*:\d+(?:[/?#]|$)/i.test(trimmed)) {
+    throw new Error(`Invalid or untrusted CF API endpoint "${apiEndpoint}".`);
+  }
+  if (parsed.protocol !== "https:" || parsed.username !== "" || parsed.password !== "" || parsed.port !== "" || parsed.pathname.replace(/\/+$/, "") !== "" || parsed.search !== "" || parsed.hash !== "") {
+    throw new Error(`Invalid or untrusted CF API endpoint "${apiEndpoint}".`);
+  }
+  const hostname = parsed.hostname.toLowerCase();
+  const match = /^api\.cf\.([a-z]{2}\d{2}(?:-\d{3})?)\.(hana\.ondemand\.com|platform\.sapcloud\.cn)$/.exec(hostname);
+  if (!match) {
+    throw new Error(`Invalid or untrusted CF API endpoint "${apiEndpoint}".`);
+  }
+  return `https://${hostname}`;
+}
 function getApiEndpointForRegion(regionKey) {
-  return REGION_API_MAP[regionKey];
+  return REGION_API_MAP[regionKey.trim().toLowerCase()];
 }
 function getRegionKeyForApi(apiEndpoint) {
-  const norm = apiEndpoint.trim().replace(/\/+$/, "").toLowerCase();
+  let normalized;
+  try {
+    normalized = normalizeSapCfApiEndpoint(apiEndpoint);
+  } catch {
+    return void 0;
+  }
   for (const [key, endpoint] of Object.entries(REGION_API_MAP)) {
-    if (endpoint.toLowerCase() === norm) {
+    if (endpoint.toLowerCase() === normalized) {
       return key;
     }
   }
-  return void 0;
+  return /^https:\/\/api\.cf\.([a-z]{2}\d{2}(?:-\d{3})?)\.hana\.ondemand\.com$/.exec(normalized)?.[1];
 }
 async function withCfSession(work) {
   const cfHome = await mkdtemp(join2(tmpdir(), "saptools-cf-hana-"));
@@ -806,9 +860,15 @@ function parseCfTargetOutput(stdout) {
   if (!api || !org || !space) {
     return void 0;
   }
-  const regionKey = getRegionKeyForApi(api);
+  let normalizedApi;
+  try {
+    normalizedApi = normalizeSapCfApiEndpoint(api);
+  } catch {
+    return void 0;
+  }
+  const regionKey = getRegionKeyForApi(normalizedApi);
   return {
-    apiEndpoint: api,
+    apiEndpoint: normalizedApi,
     orgName: org,
     spaceName: space,
     ...regionKey ? { regionKey } : {}
@@ -834,12 +894,8 @@ function formatCurrentCfAppSelector(target, appName) {
   if (!name) {
     throw new Error("App name is required.");
   }
-  if (!target.regionKey) {
-    throw new Error(
-      `Current CF API endpoint "${target.apiEndpoint}" does not match a known SAP region. Pass a full region/org/space/app selector.`
-    );
-  }
-  return `${target.regionKey}/${target.orgName}/${target.spaceName}/${name}`;
+  const region = target.regionKey ?? "current";
+  return `${region}/${target.orgName}/${target.spaceName}/${name}`;
 }
 function extractVcapSection(stdout) {
   const start = stdout.indexOf("VCAP_SERVICES:");
@@ -919,6 +975,9 @@ function classifyCfError(stderr = "", stdout = "") {
 }
 
 // src/credentials.ts
+function errorMessageFromUnknown(error) {
+  return error instanceof Error ? error.message : "Invalid or untrusted CF API endpoint.";
+}
 async function resolveAppBindings(rawSelector, options) {
   const selector = rawSelector.trim();
   if (!selector) {
@@ -937,7 +996,7 @@ async function resolveAppBindings(rawSelector, options) {
     const displaySelector = current.regionKey ? formatCurrentCfAppSelector(current, selector) : `current/${current.orgName}/${current.spaceName}/${selector}`;
     target = {
       selector: displaySelector,
-      apiEndpoint: current.regionKey ? getApiEndpointForRegion(current.regionKey) : void 0,
+      apiEndpoint: current.apiEndpoint,
       orgName: current.orgName,
       spaceName: current.spaceName,
       appName: selector
@@ -955,10 +1014,16 @@ async function resolveAppBindings(rawSelector, options) {
     if (!apiEndpoint) {
       throw new CfHanaError(
         "CONFIG",
-        `Unknown region key "${regionKey}". Use a known region or the current CF target.`
+        `Unknown SAP CF region "${regionKey}". Verify the current SAP region list or use the current CF target.`
       );
     }
-    target = { selector, apiEndpoint, orgName, spaceName, appName };
+    let normalizedApiEndpoint;
+    try {
+      normalizedApiEndpoint = normalizeSapCfApiEndpoint(apiEndpoint);
+    } catch (error) {
+      throw new CfHanaError("CONFIG", errorMessageFromUnknown(error), { cause: error });
+    }
+    target = { selector, apiEndpoint: normalizedApiEndpoint, orgName, spaceName, appName };
   }
   let bindings;
   const source = "live";
@@ -982,9 +1047,6 @@ Run "cf login" + "cf target", or provide SAP_EMAIL + SAP_PASSWORD.`,
             { cause: directError }
           );
         }
-        if (!target.apiEndpoint) {
-          throw new CfHanaError("CONFIG", "Cannot determine API endpoint for fallback auth.");
-        }
         const api = target.apiEndpoint;
         bindings = await withCfSession(async (ctx) => {
           await cfApi(api, ctx);
@@ -1008,9 +1070,6 @@ Run "cf login" + "cf target", or provide SAP_EMAIL + SAP_PASSWORD.`,
         `SAP_EMAIL and SAP_PASSWORD are required to fetch HANA bindings for explicit selector "${selector}".`
       );
     }
-    if (!target.apiEndpoint) {
-      throw new CfHanaError("CONFIG", "Invalid explicit selector.");
-    }
     const api = target.apiEndpoint;
     bindings = await withCfSession(async (ctx) => {
       await cfApi(api, ctx);