itube-specs 0.0.288 → 0.0.290

package/composables/use-api-fetcher.ts

@@ -1,22 +1,28 @@
-import { EAsyncData } from '../runtime';
-
 export function useApiFetcher<T>(
-  key: EAsyncData,
-  apiMethod: (...args: any[]) => Promise<T>,
-  ...apiArgs: any[]
+    key: string | null,
+    apiMethod: (...args: any[]) => Promise<T>,
+    ...apiArgs: any[]
 ) {
-  return async function fetchData() {
-    const state = useState<T | null>(`data-${String(key)}`, () => null);
-    try {
-      const result = await apiMethod(...apiArgs);
-      state.value = result;
-      return result;
-    } catch (err) {
-      throw createError({
-        statusCode: 500,
-        statusMessage: `Error fetching ${key}`,
-        message: err instanceof Error ? err.message : 'An unknown error occurred',
-      });
-    }
-  };
+    return async function fetchData() {
+        const hasKey = key?.trim();
+        const state = hasKey ? useState<T | null>(key!, () => null) : null;
+
+        if (state && state.value !== null && state.value !== undefined) {
+            return state.value;
+        }
+
+        try {
+            const result = await apiMethod(...apiArgs);
+
+            if (state) state.value = result;
+
+            return result;
+        } catch (err) {
+            throw createError({
+                statusCode: 500,
+                statusMessage: `Error fetching ${key}`,
+                message: err instanceof Error ? err.message : 'An unknown error occurred',
+            });
+        }
+    };
 }

package/composables/use-fetch-videos-by-categories.ts

@@ -14,7 +14,7 @@ export const useFetchVideosByCategories = async (
     const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
         EAsyncData.VideosByCategory,
         () => useApiFetcher<PaginatedResponse<IVideoCard>>(
-            EAsyncData.VideosByCategory,
+            null,
             apiMethod,
             lang,
             {

package/composables/use-fetch-videos.ts

@@ -1,5 +1,5 @@
 import { selectDurationItems, sortItemsDefault, selectAddedItems } from '../lib';
-import { EAsyncData, getSelectedQuery } from '../runtime';
+import { EAsyncData, getSelectedQuery, ELanguage } from '../runtime';
 import { useRoute } from 'vue-router';
 import type { IVideoCard, PaginatedResponse } from '../types';
 
@@ -7,49 +7,35 @@ export const useFetchVideos = async (
     apiMethod: (...args: any[]) => Promise<PaginatedResponse<IVideoCard>>
 ) => {
     const route = useRoute();
-    const lang = useI18n().locale.value;
-    const PER_PAGE = 48;
+    const perPage = 48;
+    const lang = useI18n().locale.value as ELanguage;
+    const filters = computed(() => useGetVideosFilterRequest(route, selectDurationItems, selectAddedItems));
+    const stateKey = computed(() => `data-${EAsyncData.Videos}-${JSON.stringify(route.query)}-${lang}`);
 
-    const filters = computed(() =>
-        useGetVideosFilterRequest(route, selectDurationItems, selectAddedItems)
-    );
-
-    console.log('useFetchVideos called', route.query);
-    const stateKey = `data-${EAsyncData.Videos}-${JSON.stringify(route.query)}`;
-
-    // глобальный кеш внутри Nuxt SSR/state
-    const cached = useState<PaginatedResponse<IVideoCard> | null>(stateKey, () => null);
-
-    // если значение уже закешировано → не вызываем API
-    if (cached.value) {
-        return {
-            data: cached,
-            status: ref('success'),
-            error: ref(null)
-        };
-    }
-
-    const { data, status, error } = await useAsyncData(
+    const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
         EAsyncData.Videos,
-        () =>
-            useApiFetcher(
-                EAsyncData.Videos,
-                apiMethod,
-                lang,
-                {
-                    page: Number(route.query.page) || 1,
-                    'per-page': PER_PAGE,
+        () => useApiFetcher<PaginatedResponse<IVideoCard>>(
+            stateKey.value,
+            apiMethod,
+            lang,
+            {
+                page: Number(route.query[ 'page' ]) || 1,
+                [ 'per-page' ]: perPage,
+            },
+            filters.value,
+            getSelectedQuery(route, sortItemsDefault) || '-popularity,-primary_thumb_rank'
+        )(),
+        {
+            watch: [
+                () => {
+                    if (route.query) {
+                        const currentQuery = route.query;
+                        return JSON.stringify(currentQuery);
+                    }
                 },
-                filters.value,
-                getSelectedQuery(route, sortItemsDefault) ||
-                    '-popularity,-primary_thumb_rank'
-            )()
+            ],
+        }
     );
 
-    // сохраняем результат в кеш
-    if (data.value) {
-        cached.value = data.value;
-    }
-
-    return { data: cached, status, error };
+    return { data, status, error };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.288",
+  "version": "0.0.290",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {