wyzie-lib 2.0.5 → 2.0.7

package/README.md

@@ -1,6 +1,6 @@
 # Wyzie Lib
 
-Wyzie Lib is a package made for easily implementing [Wyzie Subs](https://subs.wyzie.ru) into your
+Wyzie Lib is a package made for easily implementing [Wyzie Subs](https://sub.wyzie.ru) into your
 project without all the fuss. [Read our source code!](https://github.com/itzcozi/wyzie-lib)
 
 <sup>2.0 Out Now!</sup>
@@ -36,22 +36,30 @@ yarn add wyzie-lib
 ```ts
 import { type SubtitleData, searchSubtitles } from "wyzie-lib";
 
-// IMDB is faster then TMDB due to less API calls behind the scenes
+// Basic usage - get subtitles
 const data: SubtitleData[] = await searchSubtitles({ tmdb_id: 286217 });
 console.log(data[0]); // Prints the object of the first subtitle provided in the search
+
+// Get subtitles with VTT parsing
+const { subtitles, vttContent } = await searchSubtitles({
+  tmdb_id: 286217,
+  parseVTT: true,
+});
+console.log(vttContent); // Prints the VTT formatted subtitle content
 ```
 
 ### Parameters
 
-| Parameter               | Name              | Description                                                                               |
-| ----------------------- | ----------------- | ----------------------------------------------------------------------------------------- |
-| **tmdb_id** - _number_  | TmdbId            | The TMDB ID of the movie or TV show. _(tmdb_id or imdb_id is required)_                   |
-| **imdb_id** - _number_  | ImdbId            | The IMDB ID of the movie or TV show. _(imdb_id or tmdb_id is required)_                   |
-| **format** - _string_   | format            | The file format of the subtitles returned. _(srt, ass, vtt, txt, sub, mpl, webvtt, dfxp)_ |
-| **season** - _number_   | season            | Disired season of subtites _(this requires episode parameter aswell)_                     |
-| **episode** - _number_  | episode           | The episode of the given season.                                                          |
-| **language** - _string_ | language          | The ISO 3166 code of the provided subtitles.                                              |
-| **hi** - _boolean_      | isHearingImpaired | A boolean indicating if the subtitles are hearing impaired.                               |
+| Parameter                | Name              | Description                                                                               |
+| ------------------------ | ----------------- | ----------------------------------------------------------------------------------------- |
+| **tmdb_id** - _number_   | TmdbId            | The TMDB ID of the movie or TV show. _(tmdb_id or imdb_id is required)_                   |
+| **imdb_id** - _number_   | ImdbId            | The IMDB ID of the movie or TV show. _(imdb_id or tmdb_id is required)_                   |
+| **format** - _string_    | format            | The file format of the subtitles returned. _(srt, ass, vtt, txt, sub, mpl, webvtt, dfxp)_ |
+| **season** - _number_    | season            | Disired season of subtites _(this requires episode parameter aswell)_                     |
+| **episode** - _number_   | episode           | The episode of the given season.                                                          |
+| **language** - _string_  | language          | The ISO 3166 code of the provided subtitles.                                              |
+| **hi** - _boolean_       | isHearingImpaired | A boolean indicating if the subtitles are hearing impaired.                               |
+| **parseVTT** - _boolean_ | parseVTT          | Parse and return the first subtitle in VTT format.                                        |
 
 ### Types
 
@@ -94,6 +102,52 @@ type SubtitleData = {
 };
 ```
 
+### VTT Parsing Features
+
+The VTT parser now includes several improvements for handling subtitle files:
+
+- **Robust Format Handling**: Automatically handles both SRT and VTT input formats
+- **Timestamp Normalization**: Converts all timestamps to WebVTT format (HH:MM:SS.mmm)
+- **Smart Block Processing**:
+  - Maintains proper spacing between subtitle blocks
+  - Removes subtitle numbers
+  - Handles multi-line subtitles
+  - Preserves text formatting
+- **Error Handling**: Gracefully handles malformed input and network errors
+
+Example VTT output:
+
+```vtt
+WEBVTT
+
+00:02:05.872 --> 00:02:08.024
+All right, team,
+stay in sight of each other.
+
+00:02:08.124 --> 00:02:10.484
+Let's make NASA proud today.
+```
+
+### Error Handling
+
+The library provides detailed error messages for common issues:
+
+```ts
+try {
+  const { subtitles, vttContent } = await searchSubtitles({
+    tmdb_id: 286217,
+    parseVTT: true,
+  });
+} catch (error) {
+  // Handles various error cases:
+  // - Network errors
+  // - Invalid subtitle format
+  // - Missing required parameters
+  // - API errors
+  console.error(error);
+}
+```
+
 <hr />
 
 <sup>

package/dist/types/funcs.d.ts

@@ -0,0 +1,7 @@
+import { SearchSubtitlesParams, SubtitleData } from "./types";
+export declare function searchSubtitles(params: SearchSubtitlesParams & {
+    parseVTT?: boolean;
+}): Promise<SubtitleData[] | {
+    subtitles: SubtitleData[];
+    vttContent: string;
+}>;

package/dist/types/main.d.ts

@@ -0,0 +1,4 @@
+import { SearchSubtitlesParams, SubtitleData, QueryParams } from "./types";
+import { searchSubtitles } from "./funcs";
+export { searchSubtitles };
+export type { SubtitleData, SearchSubtitlesParams, QueryParams };

package/dist/types/types.d.ts

@@ -0,0 +1,28 @@
+export interface SearchSubtitlesParams {
+    tmdb_id?: number;
+    imdb_id?: number;
+    season?: number;
+    episode?: number;
+    language?: string;
+    format?: string;
+    hi?: boolean;
+    parseVTT?: boolean;
+}
+export type SubtitleData = {
+    id: string;
+    url: string;
+    format: string;
+    isHearingImpaired: boolean;
+    flagUrl: string;
+    media: string;
+    display: string;
+    language: string;
+};
+export interface QueryParams {
+    id: string;
+    season?: number;
+    episode?: number;
+    language?: string;
+    format?: string;
+    hi?: boolean;
+}

package/dist/wyzie-lib.cjs.js

@@ -0,0 +1,14 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});async function h({tmdb_id:n,imdb_id:t,season:r,episode:o,language:u,format:f,hi:d}){const c=new URL("https://sub.wyzie.ru/search"),s={id:String(n||t),season:r,episode:o,language:u,format:f,hi:d};return Object.entries(s).forEach(([i,a])=>{a!==void 0&&c.searchParams.append(i,a)}),c}async function p(n){const t=await fetch(n.toString());if(!t.ok)throw new Error(`HTTP error! status: ${t.status}`);return t.json()}async function w(n){try{const t=await fetch(n);if(!t.ok)throw new Error(`Failed to fetch subtitle content: ${t.status}`);const o=(await t.text()).replace(/\r\n/g,`
+`).replace(/\r/g,`
+`).trim();let u=`WEBVTT
+
+`;const f=o.split(/\n\n+/);for(const c of f){if(!c.trim())continue;const s=c.split(`
+`).map(e=>e.trim()).filter(e=>e.length>0);if(s.length<2)continue;const i=s.findIndex(e=>/^\d{1,2}:\d{2}(?::\d{2})?[,\.]\d{3}(?:\.|,)?\s*-->\s*\d{1,2}:\d{2}(?::\d{2})?[,\.]\d{3}(?:\.|,)?$/.test(e));if(i===-1)continue;const a=s.slice(i+1).filter(e=>!/^\d+$/.test(e)).filter(e=>e.length>0);if(a.length===0)continue;let l=s[i];l=l.replace(/[,.](?=\s*-->)/,"").replace(/[,.]$/,""),l=l.replace(/,(\d{3})/g,".$1"),u+=`${l}
+${a.join(`
+`)}
+
+`}return u.replace(/\n{3,}/g,`
+
+`).trim()+`
+
+`}catch(t){throw console.error("Error in parseToVTT:",t),t}}async function g(n){try{const t=await h(n),r=await p(t);if(n.parseVTT&&r.length>0){const o=await w(r[0].url);return{subtitles:r,vttContent:o}}return r}catch(t){throw new Error(`Error fetching subtitles: ${t}`)}}exports.searchSubtitles=g;

package/dist/wyzie-lib.es.js

@@ -0,0 +1,85 @@
+async function d({
+  tmdb_id: e,
+  imdb_id: t,
+  season: r,
+  episode: s,
+  language: u,
+  format: f,
+  hi: h
+}) {
+  const c = new URL("https://sub.wyzie.ru/search"), o = {
+    id: String(e || t),
+    season: r,
+    episode: s,
+    language: u,
+    format: f,
+    hi: h
+  };
+  return Object.entries(o).forEach(([i, a]) => {
+    a !== void 0 && c.searchParams.append(i, a);
+  }), c;
+}
+async function p(e) {
+  const t = await fetch(e.toString());
+  if (!t.ok)
+    throw new Error(`HTTP error! status: ${t.status}`);
+  return t.json();
+}
+async function w(e) {
+  try {
+    const t = await fetch(e);
+    if (!t.ok)
+      throw new Error(`Failed to fetch subtitle content: ${t.status}`);
+    const s = (await t.text()).replace(/\r\n/g, `
+`).replace(/\r/g, `
+`).trim();
+    let u = `WEBVTT
+
+`;
+    const f = s.split(/\n\n+/);
+    for (const c of f) {
+      if (!c.trim())
+        continue;
+      const o = c.split(`
+`).map((n) => n.trim()).filter((n) => n.length > 0);
+      if (o.length < 2)
+        continue;
+      const i = o.findIndex(
+        (n) => /^\d{1,2}:\d{2}(?::\d{2})?[,\.]\d{3}(?:\.|,)?\s*-->\s*\d{1,2}:\d{2}(?::\d{2})?[,\.]\d{3}(?:\.|,)?$/.test(n)
+      );
+      if (i === -1)
+        continue;
+      const a = o.slice(i + 1).filter((n) => !/^\d+$/.test(n)).filter((n) => n.length > 0);
+      if (a.length === 0)
+        continue;
+      let l = o[i];
+      l = l.replace(/[,.](?=\s*-->)/, "").replace(/[,.]$/, ""), l = l.replace(/,(\d{3})/g, ".$1"), u += `${l}
+${a.join(`
+`)}
+
+`;
+    }
+    return u.replace(/\n{3,}/g, `
+
+`).trim() + `
+
+`;
+  } catch (t) {
+    throw console.error("Error in parseToVTT:", t), t;
+  }
+}
+async function g(e) {
+  try {
+    const t = await d(e), r = await p(t);
+    if (e.parseVTT && r.length > 0) {
+      const s = await w(r[0].url);
+      return { subtitles: r, vttContent: s };
+    }
+    return r;
+  } catch (t) {
+    throw new Error(`Error fetching subtitles: ${t}`);
+  }
+}
+export {
+  g as searchSubtitles
+};

package/dist/wyzie-lib.iife.js

@@ -0,0 +1,14 @@
+var WyzieLib=function(f){"use strict";async function p({tmdb_id:e,imdb_id:t,season:r,episode:s,language:u,format:d,hi:h}){const c=new URL("https://sub.wyzie.ru/search"),o={id:String(e||t),season:r,episode:s,language:u,format:d,hi:h};return Object.entries(o).forEach(([i,a])=>{a!==void 0&&c.searchParams.append(i,a)}),c}async function w(e){const t=await fetch(e.toString());if(!t.ok)throw new Error(`HTTP error! status: ${t.status}`);return t.json()}async function g(e){try{const t=await fetch(e);if(!t.ok)throw new Error(`Failed to fetch subtitle content: ${t.status}`);const s=(await t.text()).replace(/\r\n/g,`
+`).replace(/\r/g,`
+`).trim();let u=`WEBVTT
+
+`;const d=s.split(/\n\n+/);for(const c of d){if(!c.trim())continue;const o=c.split(`
+`).map(n=>n.trim()).filter(n=>n.length>0);if(o.length<2)continue;const i=o.findIndex(n=>/^\d{1,2}:\d{2}(?::\d{2})?[,\.]\d{3}(?:\.|,)?\s*-->\s*\d{1,2}:\d{2}(?::\d{2})?[,\.]\d{3}(?:\.|,)?$/.test(n));if(i===-1)continue;const a=o.slice(i+1).filter(n=>!/^\d+$/.test(n)).filter(n=>n.length>0);if(a.length===0)continue;let l=o[i];l=l.replace(/[,.](?=\s*-->)/,"").replace(/[,.]$/,""),l=l.replace(/,(\d{3})/g,".$1"),u+=`${l}
+${a.join(`
+`)}
+
+`}return u.replace(/\n{3,}/g,`
+
+`).trim()+`
+
+`}catch(t){throw console.error("Error in parseToVTT:",t),t}}async function b(e){try{const t=await p(e),r=await w(t);if(e.parseVTT&&r.length>0){const s=await g(r[0].url);return{subtitles:r,vttContent:s}}return r}catch(t){throw new Error(`Error fetching subtitles: ${t}`)}}return f.searchSubtitles=b,Object.defineProperty(f,Symbol.toStringTag,{value:"Module"}),f}({});

package/dist/wyzie-lib.umd.js

@@ -0,0 +1,14 @@
+(function(o,i){typeof exports=="object"&&typeof module<"u"?i(exports):typeof define=="function"&&define.amd?define(["exports"],i):(o=typeof globalThis<"u"?globalThis:o||self,i(o.WyzieLib={}))})(this,function(o){"use strict";async function i({tmdb_id:n,imdb_id:t,season:r,episode:c,language:d,format:h,hi:p}){const a=new URL("https://sub.wyzie.ru/search"),s={id:String(n||t),season:r,episode:c,language:d,format:h,hi:p};return Object.entries(s).forEach(([l,u])=>{u!==void 0&&a.searchParams.append(l,u)}),a}async function w(n){const t=await fetch(n.toString());if(!t.ok)throw new Error(`HTTP error! status: ${t.status}`);return t.json()}async function T(n){try{const t=await fetch(n);if(!t.ok)throw new Error(`Failed to fetch subtitle content: ${t.status}`);const c=(await t.text()).replace(/\r\n/g,`
+`).replace(/\r/g,`
+`).trim();let d=`WEBVTT
+
+`;const h=c.split(/\n\n+/);for(const a of h){if(!a.trim())continue;const s=a.split(`
+`).map(e=>e.trim()).filter(e=>e.length>0);if(s.length<2)continue;const l=s.findIndex(e=>/^\d{1,2}:\d{2}(?::\d{2})?[,\.]\d{3}(?:\.|,)?\s*-->\s*\d{1,2}:\d{2}(?::\d{2})?[,\.]\d{3}(?:\.|,)?$/.test(e));if(l===-1)continue;const u=s.slice(l+1).filter(e=>!/^\d+$/.test(e)).filter(e=>e.length>0);if(u.length===0)continue;let f=s[l];f=f.replace(/[,.](?=\s*-->)/,"").replace(/[,.]$/,""),f=f.replace(/,(\d{3})/g,".$1"),d+=`${f}
+${u.join(`
+`)}
+
+`}return d.replace(/\n{3,}/g,`
+
+`).trim()+`
+
+`}catch(t){throw console.error("Error in parseToVTT:",t),t}}async function b(n){try{const t=await i(n),r=await w(t);if(n.parseVTT&&r.length>0){const c=await T(r[0].url);return{subtitles:r,vttContent:c}}return r}catch(t){throw new Error(`Error fetching subtitles: ${t}`)}}o.searchSubtitles=b,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wyzie-lib",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "icon": "https://i.postimg.cc/L5ppKYC5/cclogo.png",
   "license": "MIT",
   "keywords": [
@@ -29,15 +29,15 @@
     }
   },
   "devDependencies": {
-    "@eslint/js": "^9.14.0",
-    "eslint": "^9.14.0",
+    "@eslint/js": "^9.17.0",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.12.0",
-    "prettier": "^3.3.3",
-    "typescript": "^5.6.3",
-    "typescript-eslint": "^8.13.0",
+    "globals": "^15.14.0",
+    "prettier": "^3.4.2",
+    "typescript": "^5.7.2",
+    "typescript-eslint": "^8.19.0",
     "vite": "^4.5.5"
   },
   "scripts": {