@itpay/cli 2.1.19 → 2.1.29

package/dist/src/commands/rail_catalog.js

@@ -1,16 +1,28 @@
-// shared_rows.v1 catalog decode for the rail planning full-catalog read.
-// The committed rail.catalog.v3 may ship positional rows (journeys, plans,
-// profiles keyed by journey_columns plus shared ride_table / *_index tables)
-// instead of per-journey objects. The summary path needs only ref + route
-// text + default layer; the full packed document is passed through verbatim
-// for JSON output — decoding is for the human-readable summary and selectors.
+import { CLI_VERSION, cliDistribution } from "../state/config.js";
 export class RailCatalogEncodingError extends Error {
     constructor(encoding) {
-        super(`catalog encoding ${JSON.stringify(encoding)} is not supported by this CLI — ` +
-            `run npm install -g @itpay/cli to upgrade; the committed catalog is intact`);
+        super(`catalog encoding ${JSON.stringify(encoding)} is not supported by CLI ${CLI_VERSION} ` +
+            `(${cliDistribution()}); obtain a compatible exact version through this installation channel. ` +
+            `The committed catalog is intact`);
         this.name = "rail_catalog_encoding";
     }
 }
+function scopeFromProfiles(value) {
+    const profiles = Array.isArray(value) ? value : [];
+    const selected = profiles.find((p) => Array.isArray(p) && Array.isArray(p[1]) && p[1].includes("balanced")) ?? profiles[0];
+    if (!Array.isArray(selected))
+        return { origin: "legacy_unknown", destination: "legacy_unknown",
+            duration_basis: "legacy_unknown", arrival_basis: "legacy_unknown", cost_basis: "legacy_unknown",
+            duration_minutes: null, estimated_total_cost: null, cost_incomplete: true };
+    const extras = selected[10] && typeof selected[10] === "object" ? selected[10] : {};
+    const total = typeof selected[9] === "number" && extras.ci !== true ? selected[9] / 100 : null;
+    return {
+        origin: extras.os ?? "legacy_unknown", destination: extras.ds ?? "legacy_unknown",
+        duration_basis: extras.db ?? "legacy_unknown", arrival_basis: extras.ab ?? "legacy_unknown",
+        cost_basis: extras.cb ?? "legacy_unknown", duration_minutes: selected[8] ?? null,
+        estimated_total_cost: total, cost_incomplete: extras.ci === true,
+    };
+}
 function asString(v) {
     return typeof v === "string" && v.length > 0 ? v : undefined;
 }
@@ -20,6 +32,125 @@ function asIndex(v, bound) {
     }
     return v;
 }
+function asObject(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+function datedTime(date, value) {
+    const raw = asString(value);
+    if (!raw)
+        return null;
+    if (/^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}/.test(raw))
+        return raw.replace("T", " ").slice(0, 16);
+    const short = raw.match(/^(\d{2}:\d{2})(?:\+(\d+))?$/);
+    const day = asString(date);
+    if (!short || !day)
+        return null;
+    if (!short[2])
+        return `${day} ${short[1]}`;
+    const shifted = new Date(`${day}T00:00:00Z`);
+    if (Number.isNaN(shifted.getTime()))
+        return null;
+    shifted.setUTCDate(shifted.getUTCDate() + Number(short[2]));
+    return `${shifted.toISOString().slice(0, 10)} ${short[1]}`;
+}
+function elapsedMinutes(departure, arrival) {
+    if (!departure || !arrival)
+        return null;
+    const start = Date.parse(departure.replace(" ", "T") + "Z");
+    const end = Date.parse(arrival.replace(" ", "T") + "Z");
+    return Number.isFinite(start) && Number.isFinite(end) && end >= start ? (end - start) / 60_000 : null;
+}
+function seatOffer(row, names) {
+    if (!Array.isArray(row))
+        return null;
+    const extras = asObject(row[7]);
+    const code = asString(row[1]);
+    return {
+        offer_ref: row[0], seat_type: code ?? null, seat_name: code ? names[code] ?? code : null,
+        inventory_status: row[2] ?? null, quantity: row[3] ?? null, unit_price_fen: row[4] ?? null,
+        eligible: row[5] === true, requires_quote: row[6] === true,
+        price_source: extras.s ?? "sale_price", quote_price_unverified: extras.u === true,
+        conflicted: extras.c === true,
+        ...(Array.isArray(extras.o) ? { price_observations_fen: extras.o } : {}),
+    };
+}
+function decodeRide(row, wait, stations, services) {
+    if (!Array.isArray(row)) {
+        const ride = asObject(row);
+        if (!Object.keys(ride).length)
+            throw new Error("rail catalog: malformed ride row");
+        const refs = Array.isArray(ride.service_refs) ? ride.service_refs : [];
+        const codes = [...new Set(refs.map((ref) => asObject(services[asString(ref) ?? ""]).tc)
+                .filter((code) => typeof code === "string" && code.length > 0))];
+        const departure = datedTime(ride.boarding_date, ride.departure_at ?? ride.departure);
+        const arrival = datedTime(ride.boarding_date, ride.arrival_at ?? ride.arrival);
+        return { train_codes: codes, train_code: codes.join("/"),
+            from_station: stations[asString(ride.from_station_code) ?? ""] ?? ride.from_station ?? null,
+            to_station: stations[asString(ride.to_station_code) ?? ""] ?? ride.to_station ?? null,
+            boarding_date: ride.boarding_date ?? null,
+            departure, arrival, duration_minutes: elapsedMinutes(departure, arrival),
+            wait_minutes: typeof wait === "number" ? wait : ride.wait_minutes ?? null,
+            same_run: ride.same_run === true, onboard_stops: Array.isArray(ride.onboard_stops) ? ride.onboard_stops : [],
+        };
+    }
+    const extras = asObject(row[8]);
+    const refs = Array.isArray(row[4]) ? row[4] : [];
+    const codes = [...new Set(refs.map((ref) => asObject(services[asString(ref) ?? ""]).tc)
+            .filter((code) => typeof code === "string" && code.length > 0))];
+    const base = row[0];
+    const departure = datedTime(base, extras.dep);
+    const arrival = datedTime(base, extras.arr);
+    return {
+        train_codes: codes, train_code: codes.join("/"),
+        from_station: stations[asString(row[2]) ?? ""] ?? row[2] ?? null,
+        to_station: stations[asString(row[3]) ?? ""] ?? row[3] ?? null,
+        boarding_date: base ?? null,
+        departure, arrival, duration_minutes: elapsedMinutes(departure, arrival),
+        wait_minutes: typeof wait === "number" ? wait : typeof row[5] === "number" ? row[5] : null,
+        same_run: row[6] === true, onboard_stops: Array.isArray(row[7]) ? row[7] : [],
+    };
+}
+function decodePlans(rawPlans, rawProfiles, packed, catalog, services, names, stations) {
+    const plans = Array.isArray(rawPlans) ? rawPlans : [];
+    const profiles = Array.isArray(rawProfiles) ? rawProfiles : [];
+    const preferred = profiles.find((profile) => Array.isArray(profile) && Array.isArray(profile[1]) && profile[1].includes("balanced")) ?? profiles[0];
+    const profile = Array.isArray(preferred) ? preferred : [];
+    const serviceIndex = Array.isArray(catalog.service_index) ? catalog.service_index : [];
+    const selectedPlan = packed && typeof profile[2] === "number" ? plans[asIndex(profile[2], plans.length)] :
+        plans.find((plan) => Array.isArray(plan) && plan[0] === profile[2]);
+    const selectedRef = Array.isArray(selectedPlan) ? selectedPlan[0] : null;
+    const decoded = plans.map((plan) => {
+        if (!Array.isArray(plan))
+            throw new Error("rail catalog: malformed ticket plan");
+        const refs = (Array.isArray(plan[1]) ? plan[1] : []).map((ref) => packed && typeof ref === "number" ? serviceIndex[asIndex(ref, serviceIndex.length)] : ref);
+        const extras = asObject(plan[7]);
+        const legs = refs.map((ref, index) => {
+            const service = asObject(services[asString(ref) ?? ""]);
+            const offers = Array.isArray(service.of) ? service.of : [];
+            const selectedOffer = plan[0] === selectedRef && Array.isArray(profile[3]) ? profile[3][index] : undefined;
+            const chosen = packed && typeof selectedOffer === "number" ? offers[asIndex(selectedOffer, offers.length)] :
+                offers.find((offer) => Array.isArray(offer) && offer[0] === selectedOffer);
+            return {
+                service_ref: ref ?? null, train_code: service.tc ?? null,
+                from_station: stations[asString(service.f) ?? ""] ?? service.f ?? null,
+                to_station: stations[asString(service.t) ?? ""] ?? service.t ?? null,
+                departure: datedTime(service.d, service.dep), arrival: datedTime(service.d, service.arr),
+                seat_options: offers.map((offer) => seatOffer(offer, names)).filter((offer) => offer !== null),
+                ...(chosen ? { selected_seat: seatOffer(chosen, names) } : {}),
+            };
+        });
+        const amount = asObject(plan[3]);
+        return {
+            ticket_plan_ref: plan[0], passenger_count: plan[2] ?? null,
+            purchase_support: plan[6] ?? "none", rail_amount_verified: plan[4] === true,
+            rail_amount_fen: { default: amount.def ?? null, minimum: amount.min ?? null, maximum: amount.max ?? null },
+            service_fee_fen: plan[5] ?? null, quote_price_unverified: extras.qu === true,
+            legs,
+        };
+    });
+    const selected = decoded.find((plan) => plan.ticket_plan_ref === selectedRef);
+    return { plans: decoded, ...(selected ? { selected } : {}) };
+}
 // _cn_route_text port: "南头 C7608 → 广州南换乘71分 → G2944 重庆西" — kept
 // byte-identical with the planner so a packed journey renders the same text
 // its object form carried.
@@ -72,6 +203,9 @@ export function decodeRailCatalogJourneys(catalog) {
     const encoding = catalog["encoding"];
     const layerMap = catalog["choice_layers"]?.["journey_layer"] ?? {};
     const layerOf = (ref) => layerMap[ref] === "backup" ? "backup" : "main";
+    const stations = asObject(catalog.stations);
+    const services = asObject(catalog.services);
+    const seatNames = asObject(catalog.seat_names);
     if (encoding === undefined || encoding === null) {
         const rows = Array.isArray(catalog["journeys"]) ? catalog["journeys"] : [];
         return {
@@ -79,10 +213,17 @@ export function decodeRailCatalogJourneys(catalog) {
             journeys: rows.map((j) => {
                 const rec = (j ?? {});
                 const ref = asString(rec["ref"]) ?? asString(rec["journey_id"]) ?? "?";
+                const calculationScope = scopeFromProfiles(rec["profiles"]);
+                const rides = (Array.isArray(rec.rides) ? rec.rides : []).map((ride) => decodeRide(ride, null, stations, services));
+                const ticketPlans = decodePlans(rec.plans, rec.profiles, false, catalog, services, seatNames, stations);
                 return {
                     ref,
                     route: asString(rec["route"]) ?? asString(rec["route_text"]) ?? asString(rec["summary"]) ?? "",
                     defaultLayer: layerOf(ref),
+                    rides,
+                    ...(calculationScope ? { calculation_scope: calculationScope } : {}),
+                    ticket_plans: ticketPlans.plans,
+                    ...(ticketPlans.selected ? { selected_plan: ticketPlans.selected } : {}),
                 };
             }),
         };
@@ -95,8 +236,6 @@ export function decodeRailCatalogJourneys(catalog) {
         throw new RailCatalogEncodingError(`${String(encoding)} (unexpected journey_columns)`);
     }
     const rideTable = (Array.isArray(catalog["ride_table"]) ? catalog["ride_table"] : []);
-    const stations = (catalog["stations"] ?? {});
-    const services = (catalog["services"] ?? {});
     const journeys = (Array.isArray(catalog["journeys"]) ? catalog["journeys"] : []);
     return {
         packed: true,
@@ -106,7 +245,17 @@ export function decodeRailCatalogJourneys(catalog) {
             const ref = asString(row[0]) ?? "?";
             const route = asString(row[1]) ??
                 (Array.isArray(row[2]) ? regenerateRoute(row[2], rideTable, stations, services) : "");
-            return { ref, route, defaultLayer: layerOf(ref) };
+            const rides = (Array.isArray(row[2]) ? row[2] : []).map((pair) => {
+                if (!Array.isArray(pair) || pair.length !== 2)
+                    throw new Error("shared_rows: malformed ride pair");
+                return decodeRide(rideTable[asIndex(pair[0], rideTable.length)], pair[1], stations, services);
+            });
+            const calculationScope = scopeFromProfiles(row[6]);
+            const ticketPlans = decodePlans(row[3], row[6], true, catalog, services, seatNames, stations);
+            return { ref, route, defaultLayer: layerOf(ref), rides,
+                ...(calculationScope ? { calculation_scope: calculationScope } : {}),
+                ticket_plans: ticketPlans.plans,
+                ...(ticketPlans.selected ? { selected_plan: ticketPlans.selected } : {}) };
         }),
     };
 }

package/dist/src/commands/refund.js

@@ -12,11 +12,11 @@ export async function runRefund(backend, config, options) {
         plainResult: Object.entries(envelope.result).map(([key, value]) => `${key}: ${typeof value === "string" ? value : JSON.stringify(value)}`),
     });
 }
-function refundStateEnvelope(refund, status) {
+export function refundStateEnvelope(refund, status) {
     const terminal = ["succeeded", "failed", "cancelled", "rejected"].includes(refund.status);
     let instruction = refund.decision_mode === "manual"
         ? "先告诉用户退款已进入人工审核，原交付保持冻结；人工审核不等于拒绝，等待服务器决定，不要重复申请或承诺结果。"
-        : "先告诉用户退款申请已经记录，原交付已冻结；自动路径表示系统会继续处理，但只有最终 succeeded 才能确认退款成功。然后只跟踪同一退款，不要重复申请、reveal、授权或读取结果。";
+        : "先告诉用户退款申请已经记录，原交付已冻结；自动路径表示系统会继续处理，但只有最终 succeeded 才能确认退款成功。然后只跟踪同一退款，不读取交付、不创建授权或重复申请。";
     if (!refund.access_locked)
         instruction = "先告诉用户退款当前没有锁定交付；按服务器事实解释当前状态，不要自行推断退款结果、到账时间或交付资格。";
     if (refund.status === "succeeded")
@@ -73,7 +73,7 @@ export async function runListRefunds(backend, options) {
                 : "该订单没有退款记录；确认用户确实要求退款后再创建。",
         next: selected
             ? { command: `itpay refund get ${selected.refund_request_id} --json`, reason: active ? "读取活跃退款" : "读取最新退款" }
-            : { command: `itpay refund create --order ${options.orderID} --json`, reason: "为该订单创建退款" },
+            : null,
         recovery: [],
     };
     writeCommandEnvelope(envelope, {
@@ -96,13 +96,13 @@ export async function runGetRefund(backend, refundID, options = {}) {
 export async function runCancelRefund(backend, refundID, reason, options = {}) {
     const refund = await backend.cancelRefund(refundID, reason?.trim() || "buyer_cancelled");
     const envelope = {
-        status: "cancelled",
+        status: refund.status,
         result: {
             refund_request_id: refund.refund_request_id,
             order_id: refund.order_id,
             access_locked: refund.access_locked,
         },
-        instruction: "退款已取消；如需交付，重新进入订单并取得新的授权。",
+        instruction: refund.status === "cancelled" ? "Backend确认退款已取消；如需交付，重新进入原订单核对当前权限，旧grant不自动复活；后端要求时取得新的授权。" : "Backend未确认取消；按返回的退款权威状态核对原订单，不重复提交取消。",
         next: { command: `itpay order ${refund.order_id} --json`, reason: "确认订单访问状态" },
         recovery: [],
     };