wyzie-lib 2.0.9 → 2.1.1

package/dist/wyzie-lib.cjs.js

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

package/dist/wyzie-lib.es.js

@@ -1,65 +1,68 @@
-async function d({
+async function p({
   tmdb_id: e,
   imdb_id: t,
-  season: r,
-  episode: s,
-  language: u,
-  format: f,
+  season: u,
+  episode: f,
+  language: c,
+  format: a,
   hi: h
 }) {
-  const c = new URL("https://sub.wyzie.ru/search"), o = {
+  const o = new URL("https://sub.wyzie.ru/search"), i = {
     id: String(e || t),
-    season: r,
-    episode: s,
-    language: u,
-    format: f,
+    season: u,
+    episode: f,
+    language: c,
+    format: a,
     hi: h
   };
-  return Object.entries(o).forEach(([i, a]) => {
-    a !== void 0 && c.searchParams.append(i, a);
-  }), c;
+  return Object.entries(i).forEach(([r, n]) => {
+    n !== void 0 && o.searchParams.append(r, n);
+  }), o;
 }
-async function p(e) {
+async function m(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 p(e);
+    return await m(t);
+  } catch (t) {
+    throw new Error(`Error fetching subtitles: ${t}`);
+  }
+}
+async function T(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)
+    const c = (await t.text()).replace(/\r\n|\r/g, `
+`).trim().split(/\n\n+/), a = /^\d{1,2}:\d{2}:\d{2}[,.]\d{3}\s*-->\s*\d{1,2}:\d{2}:\d{2}[,.]\d{3}$/;
+    if (!c.some((i) => i.split(`
+`).map((n) => n.trim()).some((n) => a.test(n))))
+      throw new Error("Invalid subtitle format: not SRT");
+    const o = ["WEBVTT", ""];
+    for (const i of c) {
+      const r = i.split(`
+`).map((s) => s.trim()).filter((s) => s.length > 0);
+      if (r.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)
+      const n = r.findIndex((s) => a.test(s));
+      if (n === -1)
         continue;
-      const a = o.slice(i + 1).filter((n) => !/^\d+$/.test(n)).filter((n) => n.length > 0);
-      if (a.length === 0)
+      const d = r.slice(n + 1).filter((s) => !/^\d+$/.test(s));
+      if (d.length === 0)
         continue;
-      let l = o[i];
-      l = l.replace(/[,.](?=\s*-->)/, "").replace(/[,.]$/, ""), l = l.replace(/,(\d{3})/g, ".$1"), u += `${l}
-${a.join(`
+      let l = r[n];
+      l = l.replace(/[,.](?=\s*-->)/, "").replace(/[,.]$/, "").replace(/,(\d{3})/g, ".$1"), o.push(`${l}
+${d.join(`
 `)}
-
-`;
+`);
     }
-    return u.replace(/\n{3,}/g, `
+    return o.join(`
+`).replace(/\n{3,}/g, `
 
 `).trim() + `
 
@@ -68,18 +71,7 @@ ${a.join(`
     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
+  T as parseToVTT,
+  w as searchSubtitles
 };

package/dist/wyzie-lib.iife.js

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

package/dist/wyzie-lib.umd.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wyzie-lib",
-  "version": "2.0.9",
+  "version": "2.1.1",
   "icon": "https://i.postimg.cc/L5ppKYC5/cclogo.png",
   "license": "MIT",
   "keywords": [
@@ -18,6 +18,7 @@
   "main": "dist/wyzie-lib.cjs.js",
   "module": "dist/wyzie-lib.es.js",
   "browser": "dist/wyzie-lib.iife.js",
+  "type": "module",
   "files": [
     "dist"
   ],
@@ -38,7 +39,8 @@
     "prettier": "^3.4.2",
     "typescript": "^5.7.2",
     "typescript-eslint": "^8.19.0",
-    "vite": "^4.5.5"
+    "vite": "^4.5.5",
+    "vitest": "^2.1.8"
   },
   "scripts": {
     "dev": "vite",

package/dist/types/funcs.d.ts

@@ -1,7 +0,0 @@
-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

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

package/dist/types/types.d.ts

@@ -1,28 +0,0 @@
-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;
-}