itube-specs 0.0.219 → 0.0.222

package/composables/use-fetch-videos.ts

@@ -0,0 +1,77 @@
+import { selectDurationItems, sortItemsDefault, selectAddedItems } from '../lib/';
+import { EAsyncData, ELanguage, getSelectedQuery, ApiHelper } from '../runtime';
+import { useRoute } from 'vue-router';
+import type { IVideoCard, PaginatedResponse, RequestPagination, IRequestVideoFilter } from '../types';
+
+async function getListByNiche(
+    pagination: RequestPagination,
+    videosFilter: IRequestVideoFilter,
+    lang: ELanguage,
+    order: string,
+    niche = 'gay',
+): Promise<PaginatedResponse<IVideoCard>> {
+    return await ApiHelper.fetch(
+        '/videos/list-by-niche',
+        {
+            method: 'POST',
+            headers: {
+                'X-Niche': niche,
+                'X-Language': lang,
+                'X-Cache-Time': '259200',
+                'Content-Type': 'application/json',
+            },
+            params: {
+                ...pagination,
+                order,
+            },
+            body: {
+                filter_request: videosFilter,
+                max_limit: 0,
+            }
+        },
+    );
+}
+
+export const useFetchVideos = async () => {
+    const route = useRoute();
+    const { locale } = useI18n();
+    const lang = locale.value as ELanguage;
+    const perPage = 48;
+
+    const { data, status, error } = await useAsyncData<PaginatedResponse<IVideoCard>>(
+        EAsyncData.Videos,
+        fetchData,
+        {
+            watch: [
+                () => {
+                    if (route.query) {
+                        const currentQuery = route.query;
+                        return JSON.stringify(currentQuery);
+                    }
+                },
+            ],
+        }
+    );
+
+    async function fetchData() {
+        try {
+            return await getListByNiche(
+                {
+                    page: Number(route.query[ 'page' ]) || 1,
+                    [ 'per-page' ]: perPage,
+                },
+                useGetVideosFilterRequest(route, selectDurationItems, selectAddedItems),
+                lang,
+                getSelectedQuery(route, sortItemsDefault) || '-popularity,-primary_thumb_rank'
+            );
+        } catch (err) {
+            throw createError({
+                statusCode: 500,
+                statusMessage: 'Error fetching videos',
+                message: err instanceof Error ? err.message : 'An unknown error occurred',
+            });
+        }
+    }
+
+    return { data, status, error };
+};

package/lib/index.ts

@@ -5,3 +5,9 @@ export * from './contacts/report-wrong-items';
 export * from './report-forms-scheme';
 export * from './contact-forms-scheme';
 export * from './alphabet-items';
+export * from './scheme/select-duration-items';
+export * from './scheme/select-added-items';
+export * from './scheme/sort-channels';
+export * from './scheme/sort-models';
+export * from './scheme/sort-playlists';
+export * from './scheme/sort-items-default';

package/lib/scheme/select-added-items.ts

@@ -0,0 +1,45 @@
+import type { ISelectItem } from 'itube-specs/types';
+
+export const selectAddedItems: Array<ISelectItem> = [
+    {
+        title: 'all',
+        key: 'added',
+        value: 'all',
+    },
+    {
+        title: '1 day ago',
+        key: 'added',
+        value: '1d',
+        query: '1d',
+    },
+    {
+        title: '3 day ago',
+        key: 'added',
+        value: '3d',
+        query: '3d',
+    },
+    {
+        title: '7 day ago',
+        key: 'added',
+        value: '7d',
+        query: '7d',
+    },
+    {
+        title: '1 month ago',
+        key: 'added',
+        value: '30d',
+        query: '30d',
+    },
+    {
+        title: '3 months ago',
+        key: 'added',
+        value: '90d',
+        query: '90d',
+    },
+    {
+        title: 'other 1 year ago',
+        key: 'added',
+        value: '360d',
+        query: '360d',
+    },
+];

package/lib/scheme/select-duration-items.ts

@@ -0,0 +1,39 @@
+import type { ISelectItem } from 'itube-specs/types';
+
+export const selectDurationItems: Array<ISelectItem> = [
+    {
+        title: 'all',
+        key: 'duration',
+        value: 'all',
+    },
+    {
+        title: '< 10 minutes',
+        key: 'duration',
+        value: '600',
+        query: '599s',
+    },
+    {
+        title: '10 - 30 minutes',
+        key: 'duration',
+        value: '1800',
+        query: ['600s', '1800s'],
+    },
+    {
+        title: '30 - 45 minutes',
+        key: 'duration',
+        value: '2700',
+        query: ['1800s', '2700s'],
+    },
+    {
+        title: '45 - 1 hours',
+        key: 'duration',
+        value: '3600',
+        query: ['2700s', '3600s'],
+    },
+    {
+        title: 'other 1 hours',
+        key: 'duration',
+        value: '3601',
+        query: '3601s',
+    },
+];

package/lib/scheme/sort-channels.ts

@@ -0,0 +1,28 @@
+import { IChipsItem } from 'itube-specs/types';
+
+export const sortChannels: Array<IChipsItem> =  [
+  {
+    title: 'sort.trending',
+    value: 'trending',
+    key: 'sort',
+    query: '',
+  },
+  {
+    title: 'sort.new_videos',
+    value: 'new-videos',
+    key: 'sort',
+    query: '-updated',
+  },
+  {
+    title: 'A-Z',
+    value: 'alphabet',
+    key: 'sort',
+    query: 'name',
+  },
+  {
+    title: 'sort.network',
+    value: 'network',
+    key: 'sort',
+    query: '-is_network',
+  },
+];

package/lib/scheme/sort-items-default.ts

@@ -0,0 +1,22 @@
+import { IChipsItem } from 'itube-specs/types';
+
+export const sortItemsDefault: Array<IChipsItem> = [
+  {
+    title: 'sort.trending',
+    value: 'trending',
+    key: 'sort',
+    query: '-popularity',
+  },
+  {
+    title: 'sort.new',
+    value: 'new-videos',
+    key: 'sort',
+    query: '-created',
+  },
+  {
+    title: 'sort.longest',
+    value: 'longest',
+    key: 'sort',
+    query: '-duration',
+  },
+];

package/lib/scheme/sort-models.ts

@@ -0,0 +1,22 @@
+import type { IChipsItem } from 'itube-specs/types';
+
+export const sortModels: Array<IChipsItem> =  [
+  {
+    title: 'sort.trending',
+    value: 'trending',
+    key: 'sort',
+    query: '-popularity',
+  },
+  {
+    title: 'sort.new_videos',
+    value: 'created',
+    key: 'sort',
+    query: '-created',
+  },
+  {
+    title: 'sort.az',
+    value: 'title',
+    key: 'sort',
+    query: 'title',
+  },
+];

package/lib/scheme/sort-playlists.ts

@@ -0,0 +1,22 @@
+import type { IChipsItem } from 'itube-specs/types';
+
+export const sortPlaylists: Array<IChipsItem> =  [
+  {
+    title: 'sort.trending',
+    value: 'trending',
+    key: 'sort',
+    query: '-views',
+  },
+  {
+    title: 'sort.most_videos',
+    value: 'most-videos',
+    key: 'sort',
+    query: '-videos_count',
+  },
+  {
+    title: 'sort.last_updated',
+    value: 'updated',
+    key: 'sort',
+    query: '-updated',
+  },
+];

package/package.json

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

package/runtime/utils/normalize-url.ts

@@ -14,6 +14,11 @@ export function normalizeUrl(to: { path: string; query: Record<string, any> }) {
     query = rest
   }
 
+  // Удаляем query без значений
+  query = Object.fromEntries(
+    Object.entries(query).filter(([_, v]) => v !== '' && v !== null && v !== undefined)
+  )
+
   // Приводим query к нижнему регистру (ключи и строковые значения)
   const loweredQuery: Record<string, any> = {}
   for (const [key, value] of Object.entries(query)) {