sb-mig 6.1.0-beta.2 → 6.1.0-beta.3

package/dist/api/stories/language-publish-state.d.ts

@@ -39,6 +39,7 @@ export interface LanguagePublishStateMap {
     statesByLanguage?: Record<string, Record<string, number>>;
     stories?: Record<string, LanguagePublishStateMapEntry>;
 }
+export declare const createStatusPreservingFetch: (baseFetch?: typeof fetch) => typeof fetch;
 export declare const loadLanguagePublishStateMap: (languagePublishStatePath: string) => LanguagePublishStateMap;
 export declare const buildLanguagePublishStateMap: (args: BuildLanguagePublishStateMapArgs, config: RequestBaseConfig) => Promise<LanguagePublishStateMap>;
 export declare const buildLanguagePublishStateMapFromStories: (args: BuildLanguagePublishStateMapFromStoriesArgs, config: RequestBaseConfig) => Promise<LanguagePublishStateMap>;

package/dist/api/stories/language-publish-state.js

@@ -1,12 +1,93 @@
 import { createHash } from "crypto";
 import fs from "fs";
 import path from "path";
+import StoryblokClient from "storyblok-js-client";
 import { mapWithConcurrency } from "../../utils/async-utils.js";
 import { createAndSaveToFile } from "../../utils/files.js";
 import Logger from "../../utils/logger.js";
 import { getAllStories, getStoryBySlug } from "./stories.js";
 const DEFAULT_LANGUAGE = "[default]";
 const DELIVERY_CHECK_CONCURRENCY = 5;
+const DELIVERY_API_DEFAULT_RATE_LIMIT = 5;
+const DELIVERY_API_MAX_RETRIES = 10;
+const DELIVERY_API_TIMEOUT_SECONDS = 60;
+export const createStatusPreservingFetch = (baseFetch = fetch) => async (input, init) => {
+    const response = await baseFetch(input, init);
+    if (response.ok) {
+        return response;
+    }
+    const responseText = await response
+        .clone()
+        .text()
+        .catch(() => "");
+    if (responseText.trim().length === 0) {
+        return new Response("{}", {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+        });
+    }
+    try {
+        JSON.parse(responseText);
+        return response;
+    }
+    catch {
+        return new Response(JSON.stringify({ error: responseText }), {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers,
+        });
+    }
+};
+const createDeliveryClient = ({ accessToken, deliveryApiUrl, rateLimit, }) => new StoryblokClient({
+    accessToken,
+    rateLimit: rateLimit ?? DELIVERY_API_DEFAULT_RATE_LIMIT,
+    maxRetries: DELIVERY_API_MAX_RETRIES,
+    timeout: DELIVERY_API_TIMEOUT_SECONDS,
+    fetch: createStatusPreservingFetch(),
+    cache: {
+        clear: "auto",
+        type: "none",
+    },
+}, deliveryApiUrl);
+const resolveStoryblokErrorStatus = (error) => error?.status ??
+    error?.response?.status ??
+    error?.response?.response?.status ??
+    error?.response?.data?.status ??
+    error?.message?.status ??
+    error?.message?.response?.status ??
+    error?.message?.response?.response?.status ??
+    error?.message?.response?.data?.status ??
+    0;
+const resolveStoryblokErrorMessage = (error) => {
+    const responseData = error?.response?.data;
+    if (Array.isArray(responseData)) {
+        return responseData.filter(Boolean).join(", ") || null;
+    }
+    if (typeof responseData === "string") {
+        return responseData;
+    }
+    if (responseData && typeof responseData === "object") {
+        return (responseData.error ||
+            responseData.message ||
+            error?.response?.message ||
+            error?.message?.message ||
+            error?.message ||
+            null);
+    }
+    if (error?.message && typeof error.message === "object") {
+        return (error.message.message ||
+            error.message.response?.message ||
+            error.message.response?.data?.error ||
+            null);
+    }
+    return error?.message || null;
+};
+const isStoryblokNotFoundMessage = (message) => {
+    const normalized = message?.trim().toLowerCase();
+    return (normalized === "not found" ||
+        normalized === "this record could not be found");
+};
 const cleanStoryblokContent = (value) => {
     if (Array.isArray(value)) {
         return value.map(cleanStoryblokContent);
@@ -89,24 +170,45 @@ const classifyTranslatedLanguageState = ({ published, draft, }) => {
     }
     return "error";
 };
-const fetchDeliveryStory = async ({ deliveryApiUrl, accessToken, slug, version, language, }) => {
-    const url = new URL(`${deliveryApiUrl.replace(/\/$/, "")}/cdn/stories/${slug}`);
-    url.searchParams.set("token", accessToken);
-    url.searchParams.set("version", version);
-    url.searchParams.set("cv", String(Date.now()));
+const fetchDeliveryStory = async ({ deliveryClient, slug, version, language, }) => {
+    const params = {
+        version,
+        cv: String(Date.now()),
+    };
     if (language && language !== DEFAULT_LANGUAGE) {
-        url.searchParams.set("language", language);
+        params.language = language;
+    }
+    try {
+        const response = await deliveryClient.get(`cdn/stories/${slug}`, params);
+        const story = response?.data?.story;
+        return {
+            status: 200,
+            ok: true,
+            fullSlug: story?.full_slug || null,
+            publishedAt: story?.published_at || null,
+            contentHash: story?.content ? hashContent(story.content) : null,
+        };
+    }
+    catch (error) {
+        const errorMessage = resolveStoryblokErrorMessage(error);
+        const status = resolveStoryblokErrorStatus(error) ||
+            (isStoryblokNotFoundMessage(errorMessage) ? 404 : 0);
+        const story = error?.response?.data?.story;
+        if (status === 429) {
+            throw new Error(`Storyblok Delivery API rate limit did not recover after retries for '${slug}' (${version}${language ? `, ${language}` : ""}).`);
+        }
+        if (status === 0) {
+            throw new Error(`Storyblok Delivery API request failed without an HTTP status for '${slug}' (${version}${language ? `, ${language}` : ""})${errorMessage ? `: ${errorMessage}` : "."}`);
+        }
+        return {
+            status,
+            ok: false,
+            fullSlug: story?.full_slug || null,
+            publishedAt: story?.published_at || null,
+            contentHash: story?.content ? hashContent(story.content) : null,
+            errorMessage,
+        };
     }
-    const response = await fetch(url);
-    const data = await response.json().catch(() => null);
-    const story = data?.story;
-    return {
-        status: response.status,
-        ok: response.ok,
-        fullSlug: story?.full_slug || null,
-        publishedAt: story?.published_at || null,
-        contentHash: story?.content ? hashContent(story.content) : null,
-    };
 };
 const loadStoriesForLanguageState = async ({ startsWith, withSlug, }, config) => {
     if (withSlug && withSlug.length > 0) {
@@ -184,7 +286,20 @@ export const buildLanguagePublishStateMapFromStories = async (args, config) => {
     const deliveryAccessToken = accessToken || "";
     const deliveryApiUrl = config.storyblokDeliveryApiUrl || "https://api.storyblok.com/v2";
     const uniqueLanguages = Array.from(new Set(args.languages));
+    const translatedLanguages = uniqueLanguages.filter((language) => language !== DEFAULT_LANGUAGE);
     const stories = args.stories.filter((item) => item?.story && item.story.is_folder !== true);
+    const deliveryClient = needsDeliveryApi
+        ? createDeliveryClient({
+            accessToken: deliveryAccessToken,
+            deliveryApiUrl,
+            rateLimit: config.rateLimit,
+        })
+        : null;
+    const totalDeliveryChecks = stories.length * translatedLanguages.length * 2;
+    if (needsDeliveryApi) {
+        Logger.log(`Resolving translated language publish state for ${stories.length} stories and ${translatedLanguages.length} language(s). Up to ${totalDeliveryChecks} Delivery API check(s) will run through StoryblokClient at ${config.rateLimit ?? DELIVERY_API_DEFAULT_RATE_LIMIT} req/s.`);
+    }
+    let processedStories = 0;
     const storyEntries = await mapWithConcurrency(stories, DELIVERY_CHECK_CONCURRENCY, async (item) => {
         const story = item.story;
         const languagesByCode = {};
@@ -202,15 +317,13 @@ export const buildLanguagePublishStateMapFromStories = async (args, config) => {
             }
             const [published, draft] = await Promise.all([
                 fetchDeliveryStory({
-                    deliveryApiUrl,
-                    accessToken: deliveryAccessToken,
+                    deliveryClient: deliveryClient,
                     slug: story.full_slug,
                     version: "published",
                     language,
                 }),
                 fetchDeliveryStory({
-                    deliveryApiUrl,
-                    accessToken: deliveryAccessToken,
+                    deliveryClient: deliveryClient,
                     slug: story.full_slug,
                     version: "draft",
                     language,
@@ -226,7 +339,7 @@ export const buildLanguagePublishStateMapFromStories = async (args, config) => {
                 draft,
             };
         }
-        return {
+        const storyEntry = {
             id: story.id,
             uuid: story.uuid,
             name: story.name,
@@ -236,6 +349,13 @@ export const buildLanguagePublishStateMapFromStories = async (args, config) => {
                 .filter(([, value]) => value.state === "published_clean")
                 .map(([language]) => language),
         };
+        processedStories++;
+        if (needsDeliveryApi &&
+            (processedStories % 10 === 0 ||
+                processedStories === stories.length)) {
+            Logger.success(`Resolved translated language publish state for ${processedStories}/${stories.length} stories.`);
+        }
+        return storyEntry;
     });
     return {
         generatedAt: new Date().toISOString(),

package/dist/api/stories/stories.js

@@ -166,10 +166,21 @@ const subtractLanguages = (allLanguages, publishLanguages) => {
     return allLanguages.filter((language) => !publishSet.has(language));
 };
 const formatLanguageList = (languages) => languages && languages.length > 0 ? languages.join(",") : "none";
+const resolveStoryblokErrorStatus = (err) => err?.status ??
+    err?.response?.status ??
+    err?.response?.response?.status ??
+    err?.message?.status ??
+    err?.message?.response?.status;
 const resolveStoryblokErrorResponse = (err) => {
     if (typeof err?.response === "string" && err.response.trim().length > 0) {
         return err.response.trim();
     }
+    if (Array.isArray(err?.response?.data)) {
+        const message = err.response.data.filter(Boolean).join(", ").trim();
+        if (message.length > 0) {
+            return message;
+        }
+    }
     if (typeof err?.response?.data === "string" &&
         err.response.data.trim().length > 0) {
         return err.response.data.trim();
@@ -178,6 +189,23 @@ const resolveStoryblokErrorResponse = (err) => {
         err.response.message.trim().length > 0) {
         return err.response.message.trim();
     }
+    if (typeof err?.message?.message === "string" &&
+        err.message.message.trim().length > 0) {
+        return err.message.message.trim();
+    }
+    if (Array.isArray(err?.message?.response?.data)) {
+        const message = err.message.response.data
+            .filter(Boolean)
+            .join(", ")
+            .trim();
+        if (message.length > 0) {
+            return message;
+        }
+    }
+    if (typeof err?.message?.response?.data === "string" &&
+        err.message.response.data.trim().length > 0) {
+        return err.message.response.data.trim();
+    }
     if (typeof err?.message === "string" && err.message.trim().length > 0) {
         return err.message.trim();
     }
@@ -257,7 +285,16 @@ export const getStoryById = (storyId, config) => {
         }
         return res.data;
     })
-        .catch((err) => Logger.error(err));
+        .catch((err) => {
+        const status = resolveStoryblokErrorStatus(err);
+        const responseMessage = resolveStoryblokErrorResponse(err);
+        const statusLabel = status ? `status ${status}` : "unknown status";
+        const responseLabel = responseMessage
+            ? ` Response: ${responseMessage}`
+            : "";
+        Logger.error(`Failed to fetch story '${storyId}' with full content from space '${spaceId}' (${statusLabel}).${responseLabel}`);
+        return undefined;
+    });
 };
 export const getStoryBySlug = async (slug, config) => {
     const { spaceId, sbApi } = config;

package/dist-cjs/api/stories/stories.js

@@ -175,10 +175,21 @@ const subtractLanguages = (allLanguages, publishLanguages) => {
     return allLanguages.filter((language) => !publishSet.has(language));
 };
 const formatLanguageList = (languages) => languages && languages.length > 0 ? languages.join(",") : "none";
+const resolveStoryblokErrorStatus = (err) => err?.status ??
+    err?.response?.status ??
+    err?.response?.response?.status ??
+    err?.message?.status ??
+    err?.message?.response?.status;
 const resolveStoryblokErrorResponse = (err) => {
     if (typeof err?.response === "string" && err.response.trim().length > 0) {
         return err.response.trim();
     }
+    if (Array.isArray(err?.response?.data)) {
+        const message = err.response.data.filter(Boolean).join(", ").trim();
+        if (message.length > 0) {
+            return message;
+        }
+    }
     if (typeof err?.response?.data === "string" &&
         err.response.data.trim().length > 0) {
         return err.response.data.trim();
@@ -187,6 +198,23 @@ const resolveStoryblokErrorResponse = (err) => {
         err.response.message.trim().length > 0) {
         return err.response.message.trim();
     }
+    if (typeof err?.message?.message === "string" &&
+        err.message.message.trim().length > 0) {
+        return err.message.message.trim();
+    }
+    if (Array.isArray(err?.message?.response?.data)) {
+        const message = err.message.response.data
+            .filter(Boolean)
+            .join(", ")
+            .trim();
+        if (message.length > 0) {
+            return message;
+        }
+    }
+    if (typeof err?.message?.response?.data === "string" &&
+        err.message.response.data.trim().length > 0) {
+        return err.message.response.data.trim();
+    }
     if (typeof err?.message === "string" && err.message.trim().length > 0) {
         return err.message.trim();
     }
@@ -269,7 +297,16 @@ const getStoryById = (storyId, config) => {
         }
         return res.data;
     })
-        .catch((err) => logger_js_1.default.error(err));
+        .catch((err) => {
+        const status = resolveStoryblokErrorStatus(err);
+        const responseMessage = resolveStoryblokErrorResponse(err);
+        const statusLabel = status ? `status ${status}` : "unknown status";
+        const responseLabel = responseMessage
+            ? ` Response: ${responseMessage}`
+            : "";
+        logger_js_1.default.error(`Failed to fetch story '${storyId}' with full content from space '${spaceId}' (${statusLabel}).${responseLabel}`);
+        return undefined;
+    });
 };
 exports.getStoryById = getStoryById;
 const getStoryBySlug = async (slug, config) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sb-mig",
-  "version": "6.1.0-beta.2",
+  "version": "6.1.0-beta.3",
   "description": "CLI to rule the world. (and handle stuff related to Storyblok CMS)",
   "author": "Marcin Krawczyk <marckraw@icloud.com>",
   "license": "MIT",