@contentstorage/core 1.2.0 → 1.2.1

package/dist/lib/functions/fetchContent.js

@@ -1,6 +1,12 @@
 import axios from 'axios';
 import { CONTENTSTORAGE_CONFIG } from '../../contentstorage-config.js';
 import { appConfig, setContentLanguage } from '../contentManagement.js';
+// Map of request keys to their debounce timers
+const debounceTimers = new Map();
+// Map of request keys to their cancel token sources
+const cancelTokenSources = new Map();
+// Fixed debounce delay in milliseconds
+const DEBOUNCE_MS = 200;
 export async function fetchContent(language, options = {}) {
     const { withPendingChanges, contentKey } = options;
     const languageToFetch = language || appConfig?.languageCodes?.[0];
@@ -23,12 +29,82 @@ export async function fetchContent(language, options = {}) {
         requestConfig.headers = {
             'X-Content-Key': effectiveContentKey,
         };
+        // Apply debouncing and cancellation only for pending-changes API endpoint
+        const requestKey = `${languageToFetch}:${effectiveContentKey}`;
+        // Cancel any existing in-flight request for the same parameters
+        const existingCancelSource = cancelTokenSources.get(requestKey);
+        if (existingCancelSource) {
+            existingCancelSource.cancel('Request cancelled due to new request');
+            cancelTokenSources.delete(requestKey);
+        }
+        // Clear any existing debounce timer for the same parameters
+        const existingTimer = debounceTimers.get(requestKey);
+        if (existingTimer) {
+            clearTimeout(existingTimer);
+            debounceTimers.delete(requestKey);
+        }
+        // Return a promise that will resolve after debouncing
+        return new Promise((resolve, reject) => {
+            const timer = setTimeout(async () => {
+                debounceTimers.delete(requestKey);
+                // Create a cancel token for this request
+                const cancelTokenSource = axios.CancelToken.source();
+                requestConfig.cancelToken = cancelTokenSource.token;
+                cancelTokenSources.set(requestKey, cancelTokenSource);
+                try {
+                    // Fetch data for the current language
+                    const response = await axios.get(fileUrl, requestConfig);
+                    let jsonData = response.data;
+                    // Handle API response structure - only for pending changes API
+                    if (jsonData && typeof jsonData === 'object' && 'data' in jsonData) {
+                        jsonData = jsonData.data;
+                    }
+                    if (jsonData === undefined || jsonData === null) {
+                        throw new Error(`No data received from ${fileUrl} for language ${languageToFetch}.`);
+                    }
+                    // Validate that jsonData is a single, non-null JSON object (not an array)
+                    if (typeof jsonData !== 'object') {
+                        throw new Error(`Expected a single JSON object from ${fileUrl} for language ${languageToFetch}, but received type ${typeof jsonData}. Cannot proceed.`);
+                    }
+                    console.log(`Received JSON for ${languageToFetch}`);
+                    setContentLanguage({
+                        languageCode: languageToFetch,
+                        contentJson: jsonData,
+                    });
+                    // Clean up cancel token source
+                    cancelTokenSources.delete(requestKey);
+                    resolve();
+                }
+                catch (error) {
+                    // Clean up cancel token source
+                    cancelTokenSources.delete(requestKey);
+                    // Don't log cancelled requests as errors
+                    if (axios.isCancel(error)) {
+                        console.log(`Request cancelled for language ${languageToFetch}`);
+                        resolve();
+                        return;
+                    }
+                    // Catch errors related to fetching or saving a single language file
+                    console.error(`\nError processing language ${languageToFetch} from ${fileUrl}:`);
+                    if (axios.isAxiosError(error)) {
+                        console.error(`  Status: ${error.response?.status}`);
+                        console.error(`Response Data: ${error.response?.data ? JSON.stringify(error.response.data) : 'N/A'}`);
+                        console.error(`  Message: ${error.message}`);
+                    }
+                    else {
+                        console.error(`  Error: ${error.message}`);
+                    }
+                    reject(error);
+                }
+            }, DEBOUNCE_MS);
+            debounceTimers.set(requestKey, timer);
+        });
     }
     else {
         fileUrl = `${CONTENTSTORAGE_CONFIG.BASE_URL}/${effectiveContentKey}/content/${languageToFetch}.json`;
     }
     try {
-        // Fetch data for the current language
+        // Fetch data for the current language (CDN endpoint - no debouncing)
         const response = await axios.get(fileUrl, requestConfig);
         let jsonData = response.data;
         // Handle API response structure - only for pending changes API

package/package.json

@@ -2,7 +2,7 @@
   "name": "@contentstorage/core",
   "author": "Kaido Hussar <kaidohus@gmail.com>",
   "homepage": "https://contentstorage.app",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "module",
   "description": "Fetch content from contentstorage and generate TypeScript types",
   "license": "MIT",