itube-specs 0.0.690 → 0.0.691

package/components/ui/s-img.vue

@@ -1,7 +1,8 @@
 <template>
   <img
       v-bind="$attrs"
-      :src="src"
+      :src="imgSrc"
+      :srcset="srcset"
       :loading="loading"
       :width="width"
       :height="height"
@@ -14,11 +15,15 @@
 </template>
 
 <script setup lang="ts">
+import type { IThumbUrls } from '~/types/thumbs-urls';
+import { ThumbSize } from '~/runtime/enums/thumb-size';
+
 const props = withDefaults(defineProps<{
-  src: string | Blob,
+  src?: string,
   width: string | number,
   height: string | number,
   sizes: string,
+  urls?: IThumbUrls,
   alt?: string,
   loading?: 'lazy' | 'eager',
   fit?: 'cover' | 'contain' | 'fill' | 'inside' | 'outside',
@@ -28,6 +33,21 @@ const props = withDefaults(defineProps<{
   fit: 'cover',
 })
 
+const imgSrc = computed(() => {
+  if (props.src) return props.src
+  if (props.urls) return props.urls.webp[ThumbSize.Medium]
+  return undefined
+})
+
+const srcset = computed(() => {
+  if (!props.urls) return undefined
+  const entries = Object.entries(props.urls.webp)
+  if (!entries.length) return undefined
+  return entries
+    .map(([size, url]) => `${url} ${size.split('x')[0]}w`)
+    .join(', ')
+})
+
 const emit = defineEmits<{
   (e: 'error', event: Event): void
 }>()

package/package.json

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

package/runtime/utils/cleaners/clean-video-card.ts

@@ -14,8 +14,12 @@ export const cleanVideoCard = (card: IRawVideoCard): IVideoCard => ({
   channelName: card.channel?.name || '',
   url: card.url || '',
   previewUrl: card.preview_url || '',
-  thumbUrl: card.thumb_urls?.webp?.[ThumbSize.Medium] || '',
-  thumbUrls: card.thumb_urls || {},
+  thumbUrls: card.thumb_urls ? {
+    webp: {
+      [ThumbSize.Small]: card.thumb_urls.webp?.[ThumbSize.Small] || '',
+      [ThumbSize.Medium]: card.thumb_urls.webp?.[ThumbSize.Medium] || '',
+    },
+  } : undefined,
   md5: card.md5 || '',
   thumbNum: card.thumb_number || 0,
   models: card.models?.map(item => item.title) || [],

package/runtime/utils/cleaners/clean-video-data.ts

@@ -1,5 +1,4 @@
 import type { IRawVideoData, IVideoData } from '../../../types';
-import { ThumbSize } from '../../enums/thumb-size';
 
 export const cleanVideoData = (data: IRawVideoData): IVideoData => ({
     guid: data.guid || '',
@@ -19,7 +18,9 @@ export const cleanVideoData = (data: IRawVideoData): IVideoData => ({
     channelAvatar: data.channel?.avatar_url || '',
     url: data.url || '',
     previewUrl: data.preview_url || '',
-    thumbUrl: data.thumb_urls?.webp?.[ThumbSize.Big] || '',
+    thumbUrls: data.thumb_urls ? {
+        webp: data.thumb_urls.webp,
+    } : undefined,
     vttUrl: data.vtt_url || '',
     vttSpriteUrl: data.vtt_sprite_url || '',
     created: data.created || 0,

package/types/index.d.ts

@@ -1,6 +1,7 @@
 export * from './video-data.d.ts';
 export * from './video-card.d.ts';
 export * from './thumbs-urls.d.ts';
+export * from './raw/raw-thumbs-urls.d.ts';
 export * from './raw/raw-category-info.d.ts';
 export * from './raw/raw-category-card.d.ts';
 export * from './raw/raw-channel-card.d.ts';

package/types/raw/raw-category-card.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 
 export interface IRawCategoryCard {
   guid: string; // unused
@@ -19,7 +19,7 @@ export interface IRawCategoryCard {
   thumb_number: number; // unused
   description: string;
   header: string; // unused
-  video_thumb_urls: IThumbUrls; // ✅ used (для card.videoThumbUrls.webp['480X270'])
+  video_thumb_urls: IRawThumbUrls; // ✅ used (для card.videoThumbUrls.webp['480X270'])
   files?: Record<string, string>;
   icon?: string;
 }

package/types/raw/raw-category-info.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 import type { IRawCategoryCard } from './raw-category-card';
 
 export interface IRawCategoryInfo {
@@ -21,6 +21,6 @@ export interface IRawCategoryInfo {
   description: string;
   header: string;
   fullDescription: string;
-  video_thumb_urls: IThumbUrls;
+  video_thumb_urls: IRawThumbUrls;
   related: IRawCategoryCard[]
 }

package/types/raw/raw-channel-card.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 
 export interface IRawChannelCard {
   guid: string;
@@ -25,5 +25,5 @@ export interface IRawChannelCard {
   avatar_url: string;
   mobile_banner_image_url: string; // unused
   desktop_banner_image_url: string; // unused
-  video_thumb_urls: IThumbUrls;
+  video_thumb_urls: IRawThumbUrls;
 }

package/types/raw/raw-channel-info.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 
 export interface IRawChannelInfo {
   guid: string;
@@ -25,5 +25,5 @@ export interface IRawChannelInfo {
   avatar_url: string;
   mobile_banner_image_url: string; // unused
   desktop_banner_image_url: string; // unused
-  video_thumb_urls: IThumbUrls;
+  video_thumb_urls: IRawThumbUrls;
 }

package/types/raw/raw-model-card.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 import type { IModelParameter } from '~/types';
 
 export interface IRawModelCard {
@@ -26,7 +26,7 @@ export interface IRawModelCard {
   video_guid: string;
   video_md5: string;
 
-  video_thumb_urls: IThumbUrls;
+  video_thumb_urls: IRawThumbUrls;
 
   videos_count: number;
   views: number;

package/types/raw/raw-model-info.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 import type { IParameterModel } from '~/types';
 
 export interface IRawModelInfo {
@@ -31,7 +31,7 @@ export interface IRawModelInfo {
   primary_image_md5: string;
   rank: number;
   number_of_videos_in_recent_days: number;
-  video_thumb_urls: IThumbUrls;
+  video_thumb_urls: IRawThumbUrls;
   parameters: IParameterModel[];
   relatedNames: string[];
 }

package/types/raw/raw-playlist-card.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 import type { EPlaylistType } from '../../runtime';
 
 export interface IRawPlaylistCard {
@@ -15,7 +15,7 @@ export interface IRawPlaylistCard {
   thumbs: {
     video_md5: string; // unused
     thumb_num: number; // unused
-    urls: IThumbUrls;
+    urls: IRawThumbUrls;
   }[];
   videos_count: number;
   first_video_id: string;

package/types/raw/raw-playlist-data.d.ts

@@ -1,10 +1,10 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 import type { EPlaylistType } from '../../runtime';
 
 export interface IPlaylistThumb {
   video_md5: string;
   thumb_num: number;
-  urls: IThumbUrls;
+  urls: IRawThumbUrls;
 }
 
 export interface IRawPlaylistData {

package/types/raw/raw-playlist-video.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '~/types';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 
 export interface IRawPlaylistVideo {
   actions: IAction[];
@@ -36,7 +36,7 @@ export interface IRawPlaylistVideo {
   referer_phrases: string[];
   tags: string[];
   thumb_number: number;
-  thumb_urls: IThumbUrls;
+  thumb_urls: IRawThumbUrls;
   title: string;
   uploader: IUploader;
   url: string;
@@ -95,7 +95,7 @@ export interface IChannel {
   url: string;
   video_guid: string;
   video_md5: string;
-  video_thumb_urls: IThumbUrls;
+  video_thumb_urls: IRawThumbUrls;
   videos_count: number;
 }
 

package/types/raw/raw-thumbs-urls.d.ts

@@ -0,0 +1,7 @@
+import type { ThumbSize } from '../../runtime/enums/thumb-size';
+
+/** Raw тумбы из API */
+export interface IRawThumbUrls {
+    jpeg: Record<ThumbSize, string>;
+    webp: Record<ThumbSize, string>;
+}

package/types/raw/raw-video-card.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 import type { ICategoryCard } from '../category-short';
 
 interface IVideoAction {
@@ -30,7 +30,7 @@ interface IChannelVideo {
     url: string;
     video_guid: string;
     video_md5: string;
-    video_thumb_urls: IThumbUrls;
+    video_thumb_urls: IRawThumbUrls;
     videos_count: number;
 }
 
@@ -74,7 +74,7 @@ export interface IRawVideoCard {
     cdn_video_domain: string; // unused
     preview_url: string;
     video_url: string; // unused
-    thumb_urls: IThumbUrls;
+    thumb_urls: IRawThumbUrls;
     reels_url: string; // unused
     vtt_url: string; // unused
     vtt_sprite_url: string; // unused

package/types/raw/raw-video-data.d.ts

@@ -1,4 +1,4 @@
-import type { IThumbUrls } from '../thumbs-urls';
+import type { IRawThumbUrls } from './raw-thumbs-urls';
 
 export interface IRawVideoData {
     guid: string;
@@ -47,7 +47,7 @@ export interface IRawVideoData {
     cdn_video_domain: string;   // unused
     preview_url: string;
     video_url: string;          // unused
-    thumb_urls: IThumbUrls;
+    thumb_urls: IRawThumbUrls;
     reels_url: string;          // unused
     vtt_url: string;
     vtt_sprite_url: string;

package/types/thumbs-urls.d.ts

@@ -1,7 +1,6 @@
 import type { ThumbSize } from '../runtime/enums/thumb-size';
 
-/** Интерфейс для работы с тумбами */
+/** Очищенные тумбы — только webp */
 export interface IThumbUrls {
-    jpeg: Record<ThumbSize, string>;
-    webp: Record<ThumbSize, string>;
+    webp: Partial<Record<ThumbSize, string>>;
 }

package/types/video-card.d.ts

@@ -13,7 +13,6 @@ export interface IVideoCard {
   channelName?: string;
   url?: string;
   previewUrl?: string;
-  thumbUrl: string;
   playlistId?: string;
   md5?: string;
   thumbNum?: number;

package/types/video-data.d.ts

@@ -1,3 +1,5 @@
+import type { IThumbUrls } from '~/types/thumbs-urls';
+
 export interface ITimestamp {
   duration: number;
   title: string;
@@ -28,7 +30,7 @@ export interface IVideoData {
     channelAvatar: string;
     url: string;
     previewUrl: string;
-    thumbUrl: string;
+    thumbUrls?: IThumbUrls;
     vttUrl: string;
     vttSpriteUrl: string;
     created: number;