@marvalt/wadapter 2.3.26 → 2.3.29

package/dist/generators.esm.js

@@ -1,6 +1,5 @@
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { join, extname, dirname } from 'path';
-import { createHash } from 'crypto';
+import { writeFileSync } from 'fs';
+import { join } from 'path';
 
 /**
  * @license GPL-3.0-or-later
@@ -264,13 +263,6 @@ class WordPressClient {
     async getSettings() {
         return this.makeRequest('/wp-custom/v1/settings');
     }
-    /**
-     * Fetch Theme Styles from custom endpoint
-     * @returns Theme customization settings (typography, colors, backgrounds, shadows, layout)
-     */
-    async getThemeStyles() {
-        return this.makeRequest('/wp-custom/v1/theme-styles');
-    }
 }
 
 let document;
@@ -472,101 +464,6 @@ function addBlockFromStack(endOffset) {
   output.push(block);
 }
 
-/**
- * @license GPL-3.0-or-later
- *
- * This file is part of the MarVAlt Open SDK.
- * Copyright (c) 2025 Vibune Pty Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-/**
- * Generate a unique filename for an image based on its URL
- */
-function generateImageFilename(imageUrl) {
-    // Create hash from URL for uniqueness
-    const hash = createHash('md5').update(imageUrl).digest('hex').substring(0, 12);
-    // Try to extract extension from URL
-    const urlPath = new URL(imageUrl).pathname;
-    const ext = extname(urlPath) || '.jpg'; // Default to .jpg if no extension
-    return `${hash}${ext}`;
-}
-/**
- * Download an image from WordPress and save it to public/images
- * Returns the local path relative to public directory (e.g., /images/abc123.jpg)
- * Returns null if download fails
- */
-async function downloadImageToPublic(imageUrl, config) {
-    try {
-        // Generate filename
-        const filename = generateImageFilename(imageUrl);
-        const localPath = join(config.outputDir, filename);
-        const publicPath = `/images/${filename}`;
-        // Check if image already exists
-        if (existsSync(localPath)) {
-            return publicPath;
-        }
-        // Ensure output directory exists
-        mkdirSync(config.outputDir, { recursive: true });
-        // Prepare fetch options with authentication if provided
-        const fetchOptions = {
-            method: 'GET',
-            headers: {
-                'User-Agent': 'MarVAlt-Wadapter/1.0',
-            },
-            signal: AbortSignal.timeout(config.timeout || 30000), // 30 second timeout
-        };
-        // Add Basic Auth if credentials provided
-        if (config.username && config.password) {
-            const auth = Buffer.from(`${config.username}:${config.password}`).toString('base64');
-            fetchOptions.headers = {
-                ...fetchOptions.headers,
-                'Authorization': `Basic ${auth}`,
-            };
-        }
-        // Download image
-        const response = await fetch(imageUrl, fetchOptions);
-        if (!response.ok) {
-            console.warn(`⚠️  Failed to download image: ${imageUrl} (Status: ${response.status})`);
-            return null;
-        }
-        // Get image as buffer
-        const arrayBuffer = await response.arrayBuffer();
-        const buffer = Buffer.from(arrayBuffer);
-        // Write to file
-        writeFileSync(localPath, buffer);
-        return publicPath;
-    }
-    catch (error) {
-        console.warn(`⚠️  Error downloading image ${imageUrl}:`, error instanceof Error ? error.message : String(error));
-        return null;
-    }
-}
-/**
- * Batch download images with concurrency control
- */
-async function downloadImagesBatch(imageUrls, config, concurrency = 5) {
-    const results = new Map();
-    const uniqueUrls = Array.from(new Set(imageUrls)); // Deduplicate
-    // Process in batches
-    for (let i = 0; i < uniqueUrls.length; i += concurrency) {
-        const batch = uniqueUrls.slice(i, i + concurrency);
-        const batchResults = await Promise.all(batch.map(url => downloadImageToPublic(url, config).then(path => ({ url, path }))));
-        batchResults.forEach(({ url, path }) => {
-            results.set(url, path);
-        });
-    }
-    return results;
-}
-
 /**
  * @license GPL-3.0-or-later
  *
@@ -586,233 +483,8 @@ async function downloadImagesBatch(imageUrls, config, concurrency = 5) {
 // WordPress Static Data Generator
 class WordPressGenerator {
     constructor(config) {
-        this.imageDownloadCache = new Map();
         this.config = config;
     }
-    /**
-     * Check if an image has Cloudflare URL available
-     */
-    hasCloudflareImage(item) {
-        return !!(item?.cloudflare_image ||
-            item?.cloudflareImage ||
-            item?._embedded?.['wp:featuredmedia']?.[0]?.cloudflare_image ||
-            item?._embedded?.['wp:featuredmedia']?.[0]?.cloudflareImage);
-    }
-    /**
-     * Extract image URL from various sources (media item, featured media, etc.)
-     */
-    extractImageUrl(item) {
-        // Check for Cloudflare image first
-        if (item?.cloudflare_image)
-            return item.cloudflare_image;
-        if (item?.cloudflareImage)
-            return item.cloudflareImage;
-        // Check embedded featured media
-        const featuredMedia = item?._embedded?.['wp:featuredmedia']?.[0];
-        if (featuredMedia?.cloudflare_image)
-            return featuredMedia.cloudflare_image;
-        if (featuredMedia?.cloudflareImage)
-            return featuredMedia.cloudflareImage;
-        // Fallback to source_url
-        if (item?.source_url)
-            return item.source_url;
-        if (featuredMedia?.source_url)
-            return featuredMedia.source_url;
-        return null;
-    }
-    /**
-     * Process images in blocks recursively
-     */
-    extractImageUrlsFromBlocks(blocks) {
-        const urls = [];
-        const processBlock = (block) => {
-            if (!block || typeof block !== 'object')
-                return;
-            // Check block attributes for image URLs
-            if (block.attributes) {
-                const attrs = block.attributes;
-                // core/image block
-                if (attrs.url)
-                    urls.push(attrs.url);
-                if (attrs.mediaUrl)
-                    urls.push(attrs.mediaUrl);
-                // core/cover block
-                if (attrs.url)
-                    urls.push(attrs.url);
-                if (attrs.backgroundImage)
-                    urls.push(attrs.backgroundImage);
-                // core/media-text block
-                if (attrs.mediaUrl)
-                    urls.push(attrs.mediaUrl);
-                if (attrs.mediaLink)
-                    urls.push(attrs.mediaLink);
-                // core/gallery block
-                if (Array.isArray(attrs.images)) {
-                    attrs.images.forEach((img) => {
-                        if (img.url)
-                            urls.push(img.url);
-                        if (img.source_url)
-                            urls.push(img.source_url);
-                    });
-                }
-            }
-            // Process inner blocks recursively
-            if (Array.isArray(block.innerBlocks)) {
-                block.innerBlocks.forEach(processBlock);
-            }
-        };
-        blocks.forEach(processBlock);
-        return urls;
-    }
-    /**
-     * Process and download images if needed
-     * Downloads images when Cloudflare images are not available (works in both direct and proxy modes)
-     */
-    async processImages(items, itemType, outputDir) {
-        // Collect all image URLs that need downloading
-        const imageUrls = [];
-        // Process media items
-        if (itemType === 'media') {
-            items.forEach((item) => {
-                if (!this.hasCloudflareImage(item)) {
-                    const url = this.extractImageUrl(item);
-                    if (url && !url.includes('imagedelivery.net')) {
-                        imageUrls.push(url);
-                    }
-                }
-            });
-        }
-        // Process posts/pages (featured media and block content)
-        if (itemType === 'posts' || itemType === 'pages') {
-            items.forEach((item) => {
-                // Featured media
-                const featuredMedia = item?._embedded?.['wp:featuredmedia']?.[0];
-                if (featuredMedia && !this.hasCloudflareImage(featuredMedia)) {
-                    const url = this.extractImageUrl(featuredMedia);
-                    if (url && !url.includes('imagedelivery.net')) {
-                        imageUrls.push(url);
-                    }
-                }
-                // Block content images
-                if (Array.isArray(item.blocks)) {
-                    const blockUrls = this.extractImageUrlsFromBlocks(item.blocks);
-                    blockUrls.forEach(url => {
-                        if (url && !url.includes('imagedelivery.net') && !url.startsWith('/images/')) {
-                            imageUrls.push(url);
-                        }
-                    });
-                }
-            });
-        }
-        if (imageUrls.length === 0) {
-            return;
-        }
-        console.log(`📥 Downloading ${imageUrls.length} image(s) for ${itemType}...`);
-        // Download images
-        const downloadConfig = {
-            outputDir,
-            username: this.config.username,
-            password: this.config.password,
-            timeout: 30000,
-        };
-        const downloadResults = await downloadImagesBatch(imageUrls, downloadConfig, 5);
-        // Cache results
-        downloadResults.forEach((path, url) => {
-            this.imageDownloadCache.set(url, path);
-        });
-        const successCount = Array.from(downloadResults.values()).filter(p => p !== null).length;
-        console.log(`✅ Downloaded ${successCount}/${imageUrls.length} image(s) for ${itemType}`);
-    }
-    /**
-     * Replace WordPress image URLs with local paths in an item
-     */
-    replaceImageUrls(item, itemType) {
-        const processed = { ...item };
-        // Process media items
-        if (itemType === 'media') {
-            if (!this.hasCloudflareImage(processed)) {
-                const originalUrl = this.extractImageUrl(processed);
-                if (originalUrl) {
-                    const localPath = this.imageDownloadCache.get(originalUrl);
-                    if (localPath) {
-                        processed.source_url = localPath;
-                        if (processed.media_details?.sizes) {
-                            // Update sizes URLs
-                            Object.keys(processed.media_details.sizes).forEach(size => {
-                                const sizeData = processed.media_details.sizes[size];
-                                if (sizeData.source_url) {
-                                    const sizeLocalPath = this.imageDownloadCache.get(sizeData.source_url);
-                                    if (sizeLocalPath) {
-                                        sizeData.source_url = sizeLocalPath;
-                                    }
-                                }
-                            });
-                        }
-                    }
-                }
-            }
-        }
-        // Process posts/pages
-        if (itemType === 'posts' || itemType === 'pages') {
-            // Featured media
-            if (processed._embedded?.['wp:featuredmedia']?.[0]) {
-                const featuredMedia = { ...processed._embedded['wp:featuredmedia'][0] };
-                if (!this.hasCloudflareImage(featuredMedia)) {
-                    const originalUrl = this.extractImageUrl(featuredMedia);
-                    if (originalUrl) {
-                        const localPath = this.imageDownloadCache.get(originalUrl);
-                        if (localPath) {
-                            featuredMedia.source_url = localPath;
-                            processed._embedded['wp:featuredmedia'] = [featuredMedia];
-                        }
-                    }
-                }
-            }
-            // Block content
-            if (Array.isArray(processed.blocks)) {
-                const replaceBlockUrls = (block) => {
-                    const processedBlock = { ...block };
-                    if (processedBlock.attributes) {
-                        const attrs = { ...processedBlock.attributes };
-                        // Replace various image URL fields
-                        ['url', 'mediaUrl', 'backgroundImage', 'mediaLink'].forEach(field => {
-                            if (attrs[field]) {
-                                const localPath = this.imageDownloadCache.get(attrs[field]);
-                                if (localPath) {
-                                    attrs[field] = localPath;
-                                }
-                            }
-                        });
-                        // Handle gallery images
-                        if (Array.isArray(attrs.images)) {
-                            attrs.images = attrs.images.map((img) => {
-                                const processedImg = { ...img };
-                                if (img.url) {
-                                    const localPath = this.imageDownloadCache.get(img.url);
-                                    if (localPath)
-                                        processedImg.url = localPath;
-                                }
-                                if (img.source_url) {
-                                    const localPath = this.imageDownloadCache.get(img.source_url);
-                                    if (localPath)
-                                        processedImg.source_url = localPath;
-                                }
-                                return processedImg;
-                            });
-                        }
-                        processedBlock.attributes = attrs;
-                    }
-                    // Process inner blocks
-                    if (Array.isArray(processedBlock.innerBlocks)) {
-                        processedBlock.innerBlocks = processedBlock.innerBlocks.map(replaceBlockUrls);
-                    }
-                    return processedBlock;
-                };
-                processed.blocks = processed.blocks.map(replaceBlockUrls);
-            }
-        }
-        return processed;
-    }
     async generateStaticData() {
         const client = new WordPressClient(this.config);
         console.log('🚀 Starting WordPress static data generation...');
@@ -828,7 +500,7 @@ class WordPressGenerator {
         };
         console.log(`📋 Fetching post types: ${postTypes.join(', ')}`);
         console.log(`⚙️  Settings: maxItems=${fetchParams.per_page}, includeEmbedded=${fetchParams._embed}`);
-        // Fetch WordPress Settings (Reading Settings + Site Branding)
+        // Fetch WordPress Settings (Reading Settings + Site Branding + Theme Styles)
         let frontPage;
         let settingsPageId;
         let siteSettings;
@@ -864,53 +536,24 @@ class WordPressGenerator {
                     console.log(`✅ Site name: ${siteSettings.site_name}`);
                 }
             }
-        }
-        catch (error) {
-            console.warn('⚠️  Could not fetch WordPress settings, will use fallback logic:', error);
-        }
-        // Fetch Theme Styles (Typography, Colors, Backgrounds, Shadows, Layout)
-        try {
-            console.log('🎨 Fetching Theme Styles...');
-            const styles = await client.getThemeStyles();
-            if (styles && (styles.typography || styles.colors || styles.backgrounds || styles.shadows || styles.layout || styles.theme_palette)) {
-                themeStyles = styles;
+            // Extract theme styles
+            if (settings.theme_styles) {
+                themeStyles = settings.theme_styles;
                 console.log(`✅ Theme styles found:`, {
-                    typography: !!styles.typography,
-                    colors: !!styles.colors,
-                    theme_palette: !!styles.theme_palette,
-                    theme_palette_keys: styles.theme_palette ? Object.keys(styles.theme_palette) : [],
-                    backgrounds: !!styles.backgrounds,
-                    shadows: !!styles.shadows,
-                    layout: !!styles.layout,
+                    hasTypography: !!themeStyles.typography,
+                    hasColors: !!themeStyles.colors,
+                    hasLayout: !!themeStyles.layout,
                 });
-                if (styles.theme_palette) {
-                    console.log(`🎨 Theme palette colors:`, styles.theme_palette);
-                }
+            }
+            else {
+                console.log('⚠️  No theme_styles found in settings response');
             }
         }
         catch (error) {
-            console.warn('⚠️  Could not fetch theme styles, will use defaults:', error);
+            console.warn('⚠️  Could not fetch WordPress settings, will use fallback logic:', error);
         }
         // Fetch standard post types
         const data = await client.getAllData(fetchParams);
-        // Determine output directory for images (public/images relative to output file)
-        const outputDir = join(process.cwd(), dirname(this.config.outputPath), 'images');
-        // Process and download images if needed (when Cloudflare images are not available)
-        console.log('📸 Processing images for fallback download...');
-        // Process media items
-        if (data.media && data.media.length > 0) {
-            await this.processImages(data.media, 'media', outputDir);
-            data.media = data.media.map(item => this.replaceImageUrls(item, 'media'));
-        }
-        // Process posts
-        if (data.posts && data.posts.length > 0) {
-            await this.processImages(data.posts, 'posts', outputDir);
-            data.posts = data.posts.map(item => this.replaceImageUrls(item, 'posts'));
-        }
-        // Process pages (will be processed again after blocks are fetched)
-        if (data.pages && data.pages.length > 0) {
-            await this.processImages(data.pages, 'pages', outputDir);
-        }
         // Determine front page if not already set from settings
         if (!frontPage) {
             if (settingsPageId) {
@@ -1038,31 +681,7 @@ class WordPressGenerator {
                         }
                     }
                 }
-                // Process images in blocks if needed
-                let processedPage = { ...p, blocks };
-                if (blocks.length > 0) {
-                    // Extract and download any new images from blocks
-                    const blockUrls = this.extractImageUrlsFromBlocks(blocks);
-                    const newUrls = blockUrls.filter(url => url &&
-                        !url.includes('imagedelivery.net') &&
-                        !url.startsWith('/images/') &&
-                        !this.imageDownloadCache.has(url));
-                    if (newUrls.length > 0) {
-                        const downloadConfig = {
-                            outputDir,
-                            username: this.config.username,
-                            password: this.config.password,
-                            timeout: 30000,
-                        };
-                        const downloadResults = await downloadImagesBatch(newUrls, downloadConfig, 5);
-                        downloadResults.forEach((path, url) => {
-                            this.imageDownloadCache.set(url, path);
-                        });
-                    }
-                    // Replace URLs in blocks
-                    processedPage = this.replaceImageUrls(processedPage, 'pages');
-                }
-                return processedPage;
+                return { ...p, blocks };
             })),
             media: data.media,
             categories: data.categories,