@coraltravelcenter/b2c-landing-builder 2.7.0 → 2.8.0

package/README.md

@@ -24,6 +24,7 @@ b2c-landing-vite build
 b2c-landing-vite deploy
 b2c-landing-vite deploy --dry-run
 b2c-landing-vite deploy --update
+b2c-landing-vite deploy --relink
 b2c-landing-vite deploy --assets-only
 b2c-landing-vite block:add hero
 b2c-landing-vite block:rename hero main-hero
@@ -38,6 +39,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-версия.
@@ -46,6 +50,12 @@ b2c-landing-vite update
   Страница, виджеты, ассеты и локальный deploy-state при этом не изменяются.
 - `deploy --assets-only --dry-run` показывает только план синхронизации ассетов.
 - `deploy --update` обновляет сохранённую версию страницы без создания новой.
+- `deploy --relink` восстанавливает или меняет привязку проекта к существующей
+  CMS-странице. Builder предлагает application, поиск страницы по названию или
+  URL, версию, HTML-зону и точную позицию. Обычный запуск создаёт checkout для
+  опубликованной версии; вместе с `--update` выбранная версия меняется на месте.
+- `deploy --relink --dry-run` проходит тот же интерактивный выбор и показывает
+  план, но не сохраняет новую привязку и не изменяет CMS.
 - `block:add` создаёт файлы в выбранных форматах разметки и стилей.
 - `block:rename` атомарно переименовывает все файлы блока и обновляет порядок.
 - `update` проверяет npm registry и показывает команду ручного обновления.

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@coraltravelcenter/b2c-landing-builder",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@coraltravelcenter/b2c-landing-builder",
-      "version": "2.7.0",
+      "version": "2.8.0",
       "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.8.0",
   "description": "CLI and build toolkit for B2C landing projects",
   "type": "module",
   "bin": {

package/src/cli/index.mjs

@@ -10,6 +10,7 @@ Commands:
   deploy                    Build, sync assets, and deploy CMS widgets
   deploy --dry-run          Show the exact deploy plan without changing CMS
   deploy --update           Update the current CMS version in place
+  deploy --relink           Attach the project to an existing CMS page
   deploy --assets-only      Build and sync assets with the B2C CDN
   check                     Validate project configuration
   block:add <key>           Create a block
@@ -78,11 +79,11 @@ export async function runCli(args) {
     return;
   }
   if (command === "deploy") {
-    const allowed = new Set(["--assets-only", "--update", "--dry-run"]);
+    const allowed = new Set(["--assets-only", "--update", "--dry-run", "--relink"]);
     const flags = new Set(rest);
     if (rest.some((argument) => !allowed.has(argument)) || flags.size !== rest.length ||
-      (flags.has("--assets-only") && flags.has("--update"))) {
-      throw new Error("Usage: b2c-landing-vite deploy [--assets-only | --update] [--dry-run]");
+      (flags.has("--assets-only") && (flags.has("--update") || flags.has("--relink")))) {
+      throw new Error("Usage: b2c-landing-vite deploy [--assets-only | --update] [--relink] [--dry-run]");
     }
     const config = await loadConfig();
     validateProject(config);
@@ -98,10 +99,17 @@ export async function runCli(args) {
         token,
         update: flags.has("--update"),
         assetsOnly: flags.has("--assets-only"),
+        relink: flags.has("--relink"),
       });
     }
     if (rest.includes("--assets-only")) return deployAssetsOnly({config, preset, token});
-    return deployProject({config, preset, token, update: rest.includes("--update")});
+    return deployProject({
+      config,
+      preset,
+      token,
+      update: flags.has("--update"),
+      relink: flags.has("--relink"),
+    });
   }
   if (command === "block:add" || command === "block:rename") {
     const config = await loadConfig();

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) {
@@ -57,6 +140,17 @@ export class BackofficeClient {
     return result?.versions || [];
   }
 
+  async getPages(applicationId, {keyword = "", url = ""} = {}) {
+    const result = await this.request("GET", "/Page/GetAll", {query: {
+      pageIndex: 1,
+      pageSize: 100,
+      ApplicationId: applicationId,
+      Keyword: keyword,
+      Url: url,
+    }});
+    return result?.result || result || [];
+  }
+
   createPage(body) {
     return this.request("POST", "/Page/Create", {body});
   }

package/src/deploy/deploy.mjs

@@ -2,7 +2,7 @@ import {planAssetChanges, uploadChangedAssets} from "./assets.mjs";
 import {BackofficeClient} from "./backoffice-client.mjs";
 import {readBuildManifest} from "./manifest.mjs";
 import {readDeploymentState, writeDeploymentState} from "./state.mjs";
-import {createPagePlacement, prepareExistingPage, selectNewPagePlacement} from "./page.mjs";
+import {createPagePlacement, prepareExistingPage, selectExistingPagePlacement, selectNewPagePlacement} from "./page.mjs";
 import {planWidgetChanges, syncWidgets} from "./widgets.mjs";
 
 function paths(items) {
@@ -21,6 +21,7 @@ export async function planDeployment({
   client,
   update = false,
   assetsOnly = false,
+  relink = false,
   prompts,
   log = console.log,
 }) {
@@ -43,7 +44,13 @@ export async function planDeployment({
   let placement;
   let pageContent;
   let page;
-  if (previous.placement) {
+  if (relink) {
+    const selected = await selectExistingPagePlacement({client: api, domain: preset.domain, prompts});
+    placement = selected.placement;
+    pageContent = selected.pageContent;
+    const checkout = !update && [1, 4].includes(pageContent.status);
+    page = {action: checkout ? "relink and create checkout version" : "relink and update selected version", pageContentId: placement.pageContentId};
+  } else if (previous.placement) {
     placement = previous.placement;
     pageContent = await api.getContent(placement.pageContentId);
     const checkout = !update && [1, 4].includes(pageContent.status);
@@ -106,6 +113,7 @@ export async function deployProject({
   token,
   client,
   update = false,
+  relink = false,
   prompts,
   log = console.log,
 }) {
@@ -121,7 +129,10 @@ export async function deployProject({
     uploadFile: api.uploadFile.bind(api),
     listFiles: api.listFiles?.bind(api),
   });
-  const page = previous.placement
+  const linked = relink ? await selectExistingPagePlacement({client: api, domain: preset.domain, prompts}) : null;
+  const page = linked
+    ? await prepareExistingPage({client: api, placement: linked.placement, update})
+    : previous.placement
     ? await prepareExistingPage({client: api, placement: previous.placement, update})
     : await createPagePlacement({client: api, manifest, prompts});
   const widgets = await syncWidgets({

package/src/deploy/page.mjs

@@ -1,4 +1,4 @@
-import {HTML_WIDGET_ID, STATUS} from "./backoffice-client.mjs";
+import {HTML_WIDGET_ID, RU_LANGUAGE_ID, STATUS} from "./backoffice-client.mjs";
 
 function suitableAreas(scheme) {
   return scheme.flatMap((row, rowIndex) => (row.children || []).map((column, columnIndex) => ({
@@ -10,6 +10,10 @@ function suitableAreas(scheme) {
   );
 }
 
+function pageWidgets(pageContent) {
+  return pageContent.pageContents?.find((content) => String(content.languageId) === RU_LANGUAGE_ID)?.widgets || [];
+}
+
 function widgetNames(area) {
   return (area.usedWidgets || []).map((widget, index) =>
     widget.widgetName || widget.cmsTitle || widget.name || `widget ${index + 1}`
@@ -24,6 +28,31 @@ function areaLabel({area, rowIndex, columnIndex}) {
   return `Row ${rowIndex + 1}, column ${columnIndex + 1}${width}: ${name} — ${summary}`;
 }
 
+
+function existingAreaLabel(descriptor, widgets) {
+  const areaId = descriptor.area.layoutAreaId || descriptor.area.id;
+  const actual = widgets.filter((widget) => widget.layoutAreaId === areaId);
+  return areaLabel({
+    ...descriptor,
+    area: {...descriptor.area, usedWidgets: actual.map((widget) => ({widgetName: widget.cmsTitle || widget.widgetName}))},
+  });
+}
+
+function pageLabel(page, domain) {
+  const preview = page.contents?.[0]?.uniqueId;
+  const published = page.publishedUrls?.[RU_LANGUAGE_ID];
+  const link = published
+    ? `https://${domain}/${String(published).replace(/^\/+/, "")}`
+    : preview ? `https://${domain}/preview/${preview}/` : "no link";
+  return `${page.pageTitle || page.name || page.pageId} — ${link}`;
+}
+
+function versionLabel(content) {
+  const details = [content.statusName, content.version != null ? `v${content.version}` : null, content.author]
+    .filter(Boolean).join(", ");
+  return `${details || content.pageContentId}${content.modifiedTime ? ` — ${content.modifiedTime}` : ""}`;
+}
+
 async function defaultPrompts() {
   const {isCancel, select, text} = await import("@clack/prompts");
   const answer = async (promise) => {
@@ -94,6 +123,62 @@ export async function selectNewPagePlacement({client, manifest, prompts}) {
   };
 }
 
+export async function selectExistingPagePlacement({client, domain, prompts}) {
+  prompts ||= await defaultPrompts();
+  const applications = (await client.getApplications()).filter((app) => !/backoffice/i.test(app.name));
+  if (!applications.length) throw new Error("No backoffice applications are available");
+  const applicationId = await prompts.select({
+    message: "Application",
+    options: applications.map((app) => ({label: app.name, value: app.id})),
+  });
+  const searchBy = await prompts.select({
+    message: "Find an existing page by",
+    options: [{label: "Title", value: "title"}, {label: "URL", value: "url"}],
+  });
+  const query = await prompts.text({
+    message: searchBy === "title" ? "Page title (at least 3 characters)" : "Page URL (at least 3 characters)",
+    validate: (value) => value?.trim().length >= 3 ? undefined : "Enter at least 3 characters",
+  });
+  const pages = await client.getPages(applicationId, searchBy === "title"
+    ? {keyword: query.trim()}
+    : {url: query.trim()});
+  if (!pages.length) throw new Error(`No CMS pages found for ${JSON.stringify(query.trim())}`);
+  const pageId = await prompts.select({
+    message: "Existing CMS page",
+    options: pages.map((page) => ({label: pageLabel(page, domain), value: page.pageId || page.id, page})),
+  });
+  const page = pages.find((candidate) => (candidate.pageId || candidate.id) === pageId);
+  const versions = page.contents?.length ? page.contents : await client.getContentVersions(pageId);
+  if (!versions?.length) throw new Error("The selected CMS page has no versions");
+  const pageContentId = await prompts.select({
+    message: "Page version",
+    options: versions.map((content) => ({label: versionLabel(content), value: content.pageContentId || content.contentId})),
+  });
+  const pageContent = await client.getContent(pageContentId);
+  const areas = suitableAreas(pageContent.layout?.schema || []);
+  if (!areas.length) throw new Error("The selected page layout has no HTML widget area");
+  const widgets = pageWidgets(pageContent);
+  const layoutAreaId = await prompts.select({
+    message: "Where on the existing page should the landing blocks go?",
+    options: areas.map((descriptor) => ({
+      label: existingAreaLabel(descriptor, widgets),
+      value: descriptor.area.layoutAreaId || descriptor.area.id,
+    })),
+  });
+  const names = widgets.filter((widget) => widget.layoutAreaId === layoutAreaId)
+    .map((widget, index) => widget.cmsTitle || widget.widgetName || `widget ${index + 1}`);
+  const orderIndex = await prompts.select({
+    message: "Exact insertion point",
+    options: Array.from({length: names.length + 1}, (_, index) => ({
+      label: index === 0
+        ? names.length ? `At the beginning, before “${names[0]}”` : "Into the empty area"
+        : `After “${names[index - 1]}”`,
+      value: index,
+    })),
+  });
+  return {pageContent, placement: {pageContentId, layoutAreaId, orderIndex}};
+}
+
 export async function createPagePlacement(options) {
   const selected = await selectNewPagePlacement(options);
   const {client} = options;