@coraltravelcenter/b2c-landing-builder 2.7.0 → 2.7.1

package/README.md

@@ -38,6 +38,9 @@ b2c-landing-vite update
   скрытый пароль через ADFS. На диск сохраняется только токен (не пароль), токен
   автоматически используется до истечения. Для CI можно передать
   `B2C_BACKOFFICE_TOKEN`.
+- Backoffice-запросы ограничены 30 секундами. Безопасные GET-запросы повторяются
+  до двух раз при сетевом сбое, timeout, HTTP 429, 502, 503 или 504. Изменяющие
+  CMS запросы автоматически не повторяются, чтобы не создать дубликаты.
 - `deploy` при первом запуске предлагает выбрать application, layout и HTML-зону,
   создаёт CMS-страницу и размещает блоки в порядке `order.json`. При повторном
   запуске для опубликованной страницы создаётся checkout-версия.

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@coraltravelcenter/b2c-landing-builder",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coraltravelcenter/b2c-landing-builder",
-      "version": "2.7.0",
+      "version": "2.7.1",
       "license": "MIT",
       "dependencies": {
         "@clack/prompts": "1.7.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coraltravelcenter/b2c-landing-builder",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "CLI and build toolkit for B2C landing projects",
   "type": "module",
   "bin": {

package/src/deploy/backoffice-client.mjs

@@ -4,15 +4,62 @@ import path from "node:path";
 export const RU_LANGUAGE_ID = "1049";
 export const HTML_WIDGET_ID = "d400b0e7-918d-4d4c-bea3-8522253b6544";
 export const STATUS = Object.freeze({published: 1, checkout: 2, unpublished: 4});
+const RETRYABLE_STATUSES = new Set([429, 502, 503, 504]);
+
+export class BackofficeRequestError extends Error {
+  constructor(message, {code, status, method, endpoint, retryable = false, cause} = {}) {
+    super(message, {cause});
+    this.name = "BackofficeRequestError";
+    this.code = code;
+    this.status = status;
+    this.method = method;
+    this.endpoint = endpoint;
+    this.retryable = retryable;
+  }
+}
+
+function errorCode(status) {
+  if (status === 400 || status === 422) return "VALIDATION";
+  if (status === 401 || status === 403) return "AUTH";
+  if (status === 404) return "NOT_FOUND";
+  if (status === 429) return "RATE_LIMIT";
+  if (status >= 500) return "SERVER";
+  return "HTTP";
+}
+
+function retryDelay(response, attempt) {
+  const header = response?.headers.get("retry-after");
+  if (header) {
+    const seconds = Number(header);
+    if (Number.isFinite(seconds)) return Math.max(0, seconds * 1000);
+    const timestamp = Date.parse(header);
+    if (Number.isFinite(timestamp)) return Math.max(0, timestamp - Date.now());
+  }
+  return 500 * (2 ** attempt);
+}
+
+const defaultSleep = (milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds));
 
 export class BackofficeClient {
-  constructor({brand, token, fetchImpl = globalThis.fetch}) {
+  constructor({
+    brand,
+    token,
+    fetchImpl = globalThis.fetch,
+    timeoutMs = 30_000,
+    maxRetries = 2,
+    sleep = defaultSleep,
+    log = console.warn,
+  }) {
     if (!new Set(["coral", "sunmar"]).has(brand)) throw new Error(`Unsupported backoffice brand: ${brand}`);
     if (!token) throw new Error("Backoffice token is required");
     if (typeof fetchImpl !== "function") throw new Error("Fetch API is unavailable");
     this.baseUrl = `https://b2capi.${brand}.ru/BackOffice`;
     this.token = token;
     this.fetchImpl = fetchImpl;
+    this.timeoutMs = timeoutMs;
+    this.maxRetries = maxRetries;
+    this.sleep = sleep;
+    this.log = log;
   }
 
   async request(method, endpoint, {query, body, form} = {}) {
@@ -20,17 +67,53 @@ export class BackofficeClient {
     for (const [key, value] of Object.entries(query || {})) url.searchParams.set(key, value);
     const headers = {token: this.token, authorization: `Bearer ${this.token}`};
     if (body !== undefined) headers["content-type"] = "application/json";
-    const response = await this.fetchImpl(url, {
-      method,
-      headers,
-      body: form || (body === undefined ? undefined : JSON.stringify(body)),
-    });
-    if (!response.ok) {
-      const detail = await response.text().catch(() => "");
-      throw new Error(`Backoffice ${method} ${endpoint} failed with HTTP ${response.status}${detail ? `: ${detail}` : ""}`);
+    const canRetry = method === "GET";
+    for (let attempt = 0; ; attempt += 1) {
+      let response;
+      try {
+        response = await this.fetchImpl(url, {
+          method,
+          headers,
+          body: form || (body === undefined ? undefined : JSON.stringify(body)),
+          signal: AbortSignal.timeout(this.timeoutMs),
+        });
+      } catch (cause) {
+        const timeout = cause?.name === "TimeoutError" || cause?.name === "AbortError";
+        const retryable = canRetry && attempt < this.maxRetries;
+        if (retryable) {
+          const delay = 500 * (2 ** attempt);
+          this.log(`[backoffice] ${timeout ? "timeout" : "network error"}; retrying GET ${endpoint} in ${delay}ms`);
+          await this.sleep(delay);
+          continue;
+        }
+        throw new BackofficeRequestError(
+          `Backoffice ${method} ${endpoint} ${timeout ? `timed out after ${this.timeoutMs}ms` : `failed: ${cause?.message || "network error"}`}`,
+          {code: timeout ? "TIMEOUT" : "NETWORK", method, endpoint, retryable: canRetry, cause}
+        );
+      }
+      if (!response.ok) {
+        const detail = await response.text().catch(() => "");
+        const retryableStatus = RETRYABLE_STATUSES.has(response.status);
+        if (canRetry && retryableStatus && attempt < this.maxRetries) {
+          const delay = retryDelay(response, attempt);
+          this.log(`[backoffice] HTTP ${response.status}; retrying GET ${endpoint} in ${delay}ms`);
+          await this.sleep(delay);
+          continue;
+        }
+        throw new BackofficeRequestError(
+          `Backoffice ${method} ${endpoint} failed with HTTP ${response.status}${detail ? `: ${detail}` : ""}`,
+          {
+            code: errorCode(response.status),
+            status: response.status,
+            method,
+            endpoint,
+            retryable: canRetry && retryableStatus,
+          }
+        );
+      }
+      const payload = await response.json();
+      return payload?.result;
     }
-    const payload = await response.json();
-    return payload?.result;
   }
 
   getContent(contentId) {