@agenzo/merchant-cli 0.8.4 → 0.8.5

package/dist/index.js

@@ -314,6 +314,25 @@ function compareVersions(a, b) {
 function isBelow(current, minimum) {
   return compareVersions(current, minimum) < 0;
 }
+var TRACEPARENT_PATTERN = /^[0-9a-f]{2}-[0-9a-f]{32}-[0-9a-f]{16}-[0-9a-f]{2}$/;
+var DEFAULT_HTTP_TIMEOUT_MS = 7e4;
+function httpTimeoutFromEnv(env = process.env) {
+  const raw = env.AGENZO_CLI_HTTP_TIMEOUT_MS;
+  if (raw === void 0 || raw.trim() === "") return null;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed) || parsed <= 0) return null;
+  return parsed;
+}
+var DEADLINE_HEADER = "x-deadline-ms";
+var DEADLINE_RESERVE_MS = 200;
+function deadlineFromEnv(env = process.env) {
+  const raw = env.DEADLINE_MS;
+  if (raw === void 0 || raw.trim() === "") return null;
+  if (!/^\d+$/.test(raw.trim())) return null;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed) || parsed <= 0) return null;
+  return parsed;
+}
 var ApiClient = class {
   baseUrl;
   timeout;
@@ -329,16 +348,43 @@ var ApiClient = class {
    * a single trace_id server-side and can be followed as one chain in logs.
    */
   requestId;
+  /**
+   * 上游给的剩余预算（毫秒），来自 `DEADLINE_MS`；未注入时为 null。
+   *
+   * 进程启动时读一次而不是每请求读：一次 CLI 调用就是链路上的一跳，预算属于这一跳
+   * 整体。每请求重读会让多步流程（如 `payment-methods add` 的 create + poll + get）
+   * 各自拿到完整预算，等于凭空放大了本跳的时间上限。
+   */
+  deadlineMs;
+  /** 本进程开始时刻（单调时钟），用于算已用时间。 */
+  startedAt;
   constructor(config) {
     this.baseUrl = config.baseUrl.replace(/\/+$/, "");
-    this.timeout = config.timeout ?? 6e4;
+    this.deadlineMs = deadlineFromEnv();
+    this.startedAt = performance.now();
+    const configured = config.timeout ?? httpTimeoutFromEnv() ?? DEFAULT_HTTP_TIMEOUT_MS;
+    this.timeout = this.deadlineMs === null ? configured : Math.min(configured, Math.max(1, this.deadlineMs - DEADLINE_RESERVE_MS));
     this.requestId = crypto.randomUUID();
   }
+  /** 交给下游的剩余毫秒：扣掉本进程已用时间与回程预留；无预算时返回 null。 */
+  remainingDeadlineMs() {
+    if (this.deadlineMs === null) return null;
+    const elapsed = performance.now() - this.startedAt;
+    return Math.max(0, Math.round(this.deadlineMs - elapsed - DEADLINE_RESERVE_MS));
+  }
   buildHeaders(auth) {
     const headers = {
       "User-Agent": `agenzo-admin-cli/${getCurrentVersion()}`,
       "X-Request-Id": this.requestId
     };
+    const remaining = this.remainingDeadlineMs();
+    if (remaining !== null) {
+      headers[DEADLINE_HEADER] = String(remaining);
+    }
+    const traceparent = process.env.TRACEPARENT;
+    if (traceparent && TRACEPARENT_PATTERN.test(traceparent.trim())) {
+      headers["traceparent"] = traceparent.trim();
+    }
     if (auth.type === "bearer") {
       headers["Authorization"] = `Bearer ${auth.token}`;
     } else if (auth.type === "api-key") {
@@ -1291,6 +1337,11 @@ var hotelCreateOrderSchema = {
       required: false,
       description: "Product bed-type code from the chosen quote rate's beds[].code (e.g. 'L000000' King / '1000000' Queen). Forwarded verbatim to upstream createOrder bedType; upstream recommends passing the product-dimension bed type at booking."
     },
+    "payment-method-id": {
+      type: "string",
+      required: false,
+      description: "Optional bound-card id (pay_per_call / EVO path). When set, the platform settles this order by pre-authorizing + capturing on that specific bound card; omit to let billing_mode decide."
+    },
     "payment-token-id": {
       type: "string",
       required: false,
@@ -3380,19 +3431,6 @@ function parseTips(raw) {
   }
   return parsed;
 }
-function parseCancellation(raw) {
-  const INVALID = "--cancellation must be a JSON object.";
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    throw new CliError("PARAM_INVALID", INVALID);
-  }
-  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-    throw new CliError("PARAM_INVALID", INVALID);
-  }
-  return parsed;
-}
 function need7(value, flag) {
   if (value === void 0) {
     throw new CliError("PARAM_INVALID", `Missing required --${flag}.`);
@@ -3447,14 +3485,11 @@ function registerHotelCreateOrderCommand(parent, deps) {
     "--tips <json>",
     "\u5BA2\u6237\u81EA\u6D4B\u70B95 \u63D0\u793A\u4FE1\u606F: the chosen quote rate's tips as a JSON array [{title,text}]. Stored on the order for the order-detail page ONLY \u2014 platform-local, not sent upstream."
   ).option("--hotel-name <name>", "Hotel name (display-only, stored for order summary)").option(
-    "--cancellation <json>",
-    "Cancellation policy JSON from the chosen rate ({restriction_type,restriction_day,restriction_time,penalties[]}); stored on the order for cancellation gating and free-cancel deadline display. Not sent upstream."
-  ).option(
-    "--hotel-timezone <tz>",
-    "Hotel timezone from quote (e.g. 'UTC-5'); stored to compute the free-cancellation deadline in hotel-local time."
-  ).option(
     "--bed-type <code>",
     "Product bed-type code from the chosen quote rate's beds[].code (e.g. 'L000000' King / '1000000' Queen); forwarded verbatim to upstream createOrder bedType."
+  ).option(
+    "--payment-method-id <id>",
+    "Optional bound-card id (pay_per_call / EVO path). When set, the platform settles this order by pre-authorizing + capturing on that specific bound card. Omit to let the platform pick by billing_mode."
   ).option(
     "--payment-token-id <id>",
     "UPI Agent Pay: payment token id from an already-completed UnionPay network-token capture. When set, the platform skips EVO preauth/capture and only locks the order + records this credential (funds already charged)."
@@ -3503,10 +3538,9 @@ function registerHotelCreateOrderCommand(parent, deps) {
     if (opts.arriveTime !== void 0) body.arrive_time = opts.arriveTime;
     if (opts.specialRequests !== void 0) body.special_requests = opts.specialRequests;
     if (opts.tips !== void 0) body.tips = parseTips(opts.tips);
-    if (opts.cancellation !== void 0) body.cancellation = parseCancellation(opts.cancellation);
-    if (opts.hotelTimezone !== void 0) body.hotel_timezone = opts.hotelTimezone;
     if (opts.hotelName !== void 0) body.hotel_name = opts.hotelName;
     if (opts.bedType !== void 0) body.bed_type = opts.bedType;
+    if (opts.paymentMethodId !== void 0) body.payment_method_id = opts.paymentMethodId;
     if (opts.paymentTokenId !== void 0) body.payment_token_id = opts.paymentTokenId;
     if (!isYes) {
       const chargeNote = opts.paymentTokenId !== void 0 ? "Payment has already been captured via UPI Agent Pay; this only locks the room." : "This locks the rate but does NOT charge anything yet.";