@pieda/video-dl 1.2.0 → 1.3.1

package/dist/types/composables/useFacebook.d.ts

@@ -3,5 +3,5 @@ type TUseFacebook = {
     dest: string;
     debug?: boolean;
 };
-export declare const useFacebook: ({ videoId, dest, debug, }: TUseFacebook) => Promise<void>;
+export declare const useFacebook: ({ videoId, dest, debug, }: TUseFacebook) => Promise<[Error | null, boolean | null]>;
 export {};

package/dist/types/composables/useVimeo.d.ts

@@ -4,5 +4,5 @@ type TUseVimeo = {
     downloadBtnSelector?: string;
     debug?: boolean;
 };
-export declare const useVimeo: ({ videoId, dest, debug }: TUseVimeo) => Promise<void>;
+export declare const useVimeo: ({ videoId, dest, debug, }: TUseVimeo) => Promise<[Error | null, boolean | null]>;
 export {};

package/dist/types/composables/useYoutube.d.ts

@@ -3,5 +3,5 @@ type TUseYoutube = {
     dest: string;
     debug?: boolean;
 };
-export declare const useYoutube: ({ videoId, dest, debug }: TUseYoutube) => Promise<void>;
+export declare const useYoutube: ({ videoId, dest, debug, }: TUseYoutube) => Promise<[Error | null, boolean | null]>;
 export {};

package/dist/video-dl.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=o=>new Promise((e,c)=>{import(o).then(t=>e(t.default)).catch(c)}),h=async(o,e)=>{const c=await s("fs"),t=await s("axios");return new Promise((l,a)=>{t.get(o,{responseType:"stream"}).then(n=>{const u=n.data,r=c.createWriteStream(e);u.pipe(r),r.on("finish",function(){r.close(()=>{l()})})}).catch(a)})},m=(o=!1)=>({log:(...e)=>{o&&console.log(...e)},error:(...e)=>{o&&console.error(...e)}}),f=async({videoId:o,dest:e,debug:c=!1})=>{const t=m(c);t.log(`Downloading video: ${o} to: ${e}`);const l=`https://www.youtube.com/watch?v=${o}`,a=await s("fs"),n=await s("path"),u=await s("@distube/ytdl-core");return a.existsSync(n.dirname(e))||a.mkdirSync(n.dirname(e),{recursive:!0},777),new Promise((r,i)=>{u(l).pipe(a.createWriteStream(e)).on("finish",()=>{t.log("Downloading finished."),r()})})},y=async({videoId:o,dest:e,debug:c=!1})=>{const t=m(c);t.log(`Downloading video: ${o} to: ${e}`);const l=`https://m.facebook.com/watch/?v=${o}`,a=await s("fs"),n=await s("path"),u=await s("puppeteer");a.existsSync(n.dirname(e))||(a.mkdirSync(n.dirname(e),{recursive:!0},777),t.log(`建立 ${n.dirname(e)}`));const r=await u.launch();t.log("啟動 puppeteer");const i=await r.newPage();await i.setUserAgent("'Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1'"),t.log("開新分頁"),await i.goto(l,{waitUntil:"networkidle0"}),t.log(`前往 ${l}`),await i.waitForSelector("video"),t.log("找到 video 元素");const w=await i.$eval("video",p=>p.getAttribute("src"));t.log(`取得 video url: ${w}`),await r.close(),t.log("關閉 puppeteer"),await h(w,e),t.log(`下載完成 ${w}`)},v=async({videoId:o,dest:e,debug:c=!1})=>{const t=m(c);t.log(`Downloading video: ${o} to: ${e}`);const l=await s("fs"),a=await s("path"),n=await s("axios"),u=async()=>{const i=await n.get("https://vimeo.com/_next/viewer",{responseType:"json",headers:{"X-Requested-With":"XMLHttpRequest"}}),{jwt:w}=i.data;return w||""},r=async(i="",w="")=>{const p=await n.get(`https://api.vimeo.com/videos/${i}?&fields=download`,{responseType:"json",headers:{"X-Requested-With":"XMLHttpRequest",Authorization:`jwt ${w}`}}),{download:g=[]}=p.data,d=g[0]||null;return(d==null?void 0:d.link)||""};return l.existsSync(a.dirname(e))||(l.mkdirSync(a.dirname(e),{recursive:!0},777),t.log(`建立 ${a.dirname(e)}`)),new Promise(async(i,w)=>{const p=await u();t.log(`取得 jwt ${p}`);const g=await r(o,p);t.log(`取得 videoUrl ${g}`),await h(g,e),t.log(`下載完成 ${e}`),i()})},$=({type:o})=>{switch(o){case"youtube":return f;case"facebook":return y;case"vimeo":return v;default:throw new Error(`Invalid video type: ${o}`)}};exports.useDownloader=$;exports.useFacebook=y;exports.useVimeo=v;exports.useYoutube=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=o=>new Promise((e,u)=>{import(o).then(t=>e(t.default)).catch(u)}),h=async(o,e)=>{const u=await c("fs"),t=await c("axios");return new Promise((w,r)=>{t.get(o,{responseType:"stream"}).then(i=>{const p=i.data,s=u.createWriteStream(e);p.pipe(s),s.on("finish",function(){s.close(()=>{w()})})}).catch(r)})},m=(o=!1)=>({log:(...e)=>{o&&console.log(...e)},error:(...e)=>{o&&console.error(...e)}}),f=async({videoId:o,dest:e,debug:u=!1})=>{const t=m(u);t.log(`Downloading video: ${o} to: ${e}`);const w=`https://www.youtube.com/watch?v=${o}`,r=await c("fs"),i=await c("path"),p=await c("@distube/ytdl-core");return r.existsSync(i.dirname(e))||r.mkdirSync(i.dirname(e),{recursive:!0},777),new Promise((s,n)=>{try{const a=p(w).pipe(r.createWriteStream(e));a.on("finish",()=>{t.log("Downloading finished."),s([null,!0])}),a.on("error",l=>{throw l})}catch(a){s([a,null])}})},y=async({videoId:o,dest:e,debug:u=!1})=>{try{const t=m(u);t.log(`Downloading video: ${o} to: ${e}`);const w=`https://m.facebook.com/watch/?v=${o}`,r=await c("fs"),i=await c("path"),p=await c("puppeteer");r.existsSync(i.dirname(e))||(r.mkdirSync(i.dirname(e),{recursive:!0},777),t.log(`建立 ${i.dirname(e)}`));const s=await p.launch();t.log("啟動 puppeteer");const n=await s.newPage();await n.setUserAgent("'Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1'"),t.log("開新分頁"),await n.goto(w,{waitUntil:"networkidle0"}),t.log(`前往 ${w}`),await n.waitForSelector("video"),t.log("找到 video 元素");const a=await n.$eval("video",l=>l.getAttribute("src"));return t.log(`取得 video url: ${a}`),await s.close(),t.log("關閉 puppeteer"),await h(a,e),t.log(`下載完成 ${a}`),[null,!0]}catch(t){return[t,null]}},$=async({videoId:o,dest:e,debug:u=!1})=>{const t=m(u);t.log(`Downloading video: ${o} to: ${e}`);const w=await c("fs"),r=await c("path"),i=await c("axios"),p=async()=>{const n=await i.get("https://vimeo.com/_next/viewer",{responseType:"json",headers:{"X-Requested-With":"XMLHttpRequest"}}),{jwt:a}=n.data;return a||""},s=async(n="",a="")=>{const l=await i.get(`https://api.vimeo.com/videos/${n}?&fields=download`,{responseType:"json",headers:{"X-Requested-With":"XMLHttpRequest",Authorization:`jwt ${a}`}}),{download:g=[]}=l.data,d=g[0]||null;return(d==null?void 0:d.link)||""};return w.existsSync(r.dirname(e))||(w.mkdirSync(r.dirname(e),{recursive:!0},777),t.log(`建立 ${r.dirname(e)}`)),new Promise(async(n,a)=>{try{const l=await p();t.log(`取得 jwt ${l}`);const g=await s(o,l);t.log(`取得 videoUrl ${g}`),await h(g,e),t.log(`下載完成 ${e}`),n([null,!0])}catch(l){n([l,null])}})},v=({type:o})=>{switch(o){case"youtube":return f;case"facebook":return y;case"vimeo":return $;default:throw new Error(`Invalid video type: ${o}`)}};exports.useDownloader=v;exports.useFacebook=y;exports.useVimeo=$;exports.useYoutube=f;

package/dist/video-dl.js

@@ -1,94 +1,117 @@
-const s = (o) => new Promise((e, c) => {
-  import(o).then((t) => e(t.default)).catch(c);
-}), h = async (o, e) => {
-  const c = await s("fs"), t = await s("axios");
-  return new Promise((l, a) => {
-    t.get(o, { responseType: "stream" }).then((n) => {
-      const u = n.data, r = c.createWriteStream(e);
-      u.pipe(r), r.on("finish", function() {
-        r.close(() => {
-          l();
+const c = (o) => new Promise((e, u) => {
+  import(o).then((t) => e(t.default)).catch(u);
+}), m = async (o, e) => {
+  const u = await c("fs"), t = await c("axios");
+  return new Promise((w, r) => {
+    t.get(o, { responseType: "stream" }).then((i) => {
+      const p = i.data, s = u.createWriteStream(e);
+      p.pipe(s), s.on("finish", function() {
+        s.close(() => {
+          w();
         });
       });
-    }).catch(a);
+    }).catch(r);
   });
-}, m = (o = !1) => ({
+}, h = (o = !1) => ({
   log: (...e) => {
     o && console.log(...e);
   },
   error: (...e) => {
     o && console.error(...e);
   }
-}), f = async ({ videoId: o, dest: e, debug: c = !1 }) => {
-  const t = m(c);
+}), f = async ({
+  videoId: o,
+  dest: e,
+  debug: u = !1
+}) => {
+  const t = h(u);
   t.log(`Downloading video: ${o} to: ${e}`);
-  const l = `https://www.youtube.com/watch?v=${o}`, a = await s("fs"), n = await s("path"), u = await s("@distube/ytdl-core");
-  return a.existsSync(n.dirname(e)) || a.mkdirSync(n.dirname(e), { recursive: !0 }, 777), new Promise((r, i) => {
-    u(l).pipe(a.createWriteStream(e)).on("finish", () => {
-      t.log("Downloading finished."), r();
-    });
+  const w = `https://www.youtube.com/watch?v=${o}`, r = await c("fs"), i = await c("path"), p = await c("@distube/ytdl-core");
+  return r.existsSync(i.dirname(e)) || r.mkdirSync(i.dirname(e), { recursive: !0 }, 777), new Promise((s, n) => {
+    try {
+      const a = p(w).pipe(r.createWriteStream(e));
+      a.on("finish", () => {
+        t.log("Downloading finished."), s([null, !0]);
+      }), a.on("error", (l) => {
+        throw l;
+      });
+    } catch (a) {
+      s([a, null]);
+    }
   });
-}, v = async ({
+}, y = async ({
   videoId: o,
   dest: e,
-  debug: c = !1
+  debug: u = !1
 }) => {
-  const t = m(c);
-  t.log(`Downloading video: ${o} to: ${e}`);
-  const l = `https://m.facebook.com/watch/?v=${o}`, a = await s("fs"), n = await s("path"), u = await s("puppeteer");
-  a.existsSync(n.dirname(e)) || (a.mkdirSync(n.dirname(e), { recursive: !0 }, 777), t.log(`建立 ${n.dirname(e)}`));
-  const r = await u.launch();
-  t.log("啟動 puppeteer");
-  const i = await r.newPage();
-  await i.setUserAgent(
-    "'Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1'"
-  ), t.log("開新分頁"), await i.goto(l, {
-    waitUntil: "networkidle0"
-  }), t.log(`前往 ${l}`), await i.waitForSelector("video"), t.log("找到 video 元素");
-  const w = await i.$eval("video", (p) => p.getAttribute("src"));
-  t.log(`取得 video url: ${w}`), await r.close(), t.log("關閉 puppeteer"), await h(w, e), t.log(`下載完成 ${w}`);
-}, y = async ({ videoId: o, dest: e, debug: c = !1 }) => {
-  const t = m(c);
+  try {
+    const t = h(u);
+    t.log(`Downloading video: ${o} to: ${e}`);
+    const w = `https://m.facebook.com/watch/?v=${o}`, r = await c("fs"), i = await c("path"), p = await c("puppeteer");
+    r.existsSync(i.dirname(e)) || (r.mkdirSync(i.dirname(e), { recursive: !0 }, 777), t.log(`建立 ${i.dirname(e)}`));
+    const s = await p.launch();
+    t.log("啟動 puppeteer");
+    const n = await s.newPage();
+    await n.setUserAgent(
+      "'Mozilla/5.0 (iPhone; CPU iPhone OS 16_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.6 Mobile/15E148 Safari/604.1'"
+    ), t.log("開新分頁"), await n.goto(w, {
+      waitUntil: "networkidle0"
+    }), t.log(`前往 ${w}`), await n.waitForSelector("video"), t.log("找到 video 元素");
+    const a = await n.$eval("video", (l) => l.getAttribute("src"));
+    return t.log(`取得 video url: ${a}`), await s.close(), t.log("關閉 puppeteer"), await m(a, e), t.log(`下載完成 ${a}`), [null, !0];
+  } catch (t) {
+    return [t, null];
+  }
+}, $ = async ({
+  videoId: o,
+  dest: e,
+  debug: u = !1
+}) => {
+  const t = h(u);
   t.log(`Downloading video: ${o} to: ${e}`);
-  const l = await s("fs"), a = await s("path"), n = await s("axios"), u = async () => {
-    const i = await n.get("https://vimeo.com/_next/viewer", {
+  const w = await c("fs"), r = await c("path"), i = await c("axios"), p = async () => {
+    const n = await i.get("https://vimeo.com/_next/viewer", {
       responseType: "json",
       headers: {
         "X-Requested-With": "XMLHttpRequest"
       }
-    }), { jwt: w } = i.data;
-    return w || "";
-  }, r = async (i = "", w = "") => {
-    const p = await n.get(`https://api.vimeo.com/videos/${i}?&fields=download`, {
+    }), { jwt: a } = n.data;
+    return a || "";
+  }, s = async (n = "", a = "") => {
+    const l = await i.get(`https://api.vimeo.com/videos/${n}?&fields=download`, {
       responseType: "json",
       headers: {
         "X-Requested-With": "XMLHttpRequest",
-        Authorization: `jwt ${w}`
+        Authorization: `jwt ${a}`
       }
-    }), { download: g = [] } = p.data, d = g[0] || null;
+    }), { download: g = [] } = l.data, d = g[0] || null;
     return (d == null ? void 0 : d.link) || "";
   };
-  return l.existsSync(a.dirname(e)) || (l.mkdirSync(a.dirname(e), { recursive: !0 }, 777), t.log(`建立 ${a.dirname(e)}`)), new Promise(async (i, w) => {
-    const p = await u();
-    t.log(`取得 jwt ${p}`);
-    const g = await r(o, p);
-    t.log(`取得 videoUrl ${g}`), await h(g, e), t.log(`下載完成 ${e}`), i();
+  return w.existsSync(r.dirname(e)) || (w.mkdirSync(r.dirname(e), { recursive: !0 }, 777), t.log(`建立 ${r.dirname(e)}`)), new Promise(async (n, a) => {
+    try {
+      const l = await p();
+      t.log(`取得 jwt ${l}`);
+      const g = await s(o, l);
+      t.log(`取得 videoUrl ${g}`), await m(g, e), t.log(`下載完成 ${e}`), n([null, !0]);
+    } catch (l) {
+      n([l, null]);
+    }
   });
-}, $ = ({ type: o }) => {
+}, v = ({ type: o }) => {
   switch (o) {
     case "youtube":
       return f;
     case "facebook":
-      return v;
-    case "vimeo":
       return y;
+    case "vimeo":
+      return $;
     default:
       throw new Error(`Invalid video type: ${o}`);
   }
 };
 export {
-  $ as useDownloader,
-  v as useFacebook,
-  y as useVimeo,
+  v as useDownloader,
+  y as useFacebook,
+  $ as useVimeo,
   f as useYoutube
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@pieda/video-dl",
     "private": false,
-    "version": "1.2.0",
+    "version": "1.3.1",
     "type": "module",
     "main": "dist/video-dl.cjs",
     "module": "dist/video-dl.js",
@@ -10,7 +10,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "https://github.com/piedasing/-pieda-video-dl.git"
+        "url": "https://github.com/piedasing/video-dl"
     },
     "author": "piedasing",
     "license": "MIT",
@@ -36,7 +36,7 @@
         "version:patch": "npm version patch"
     },
     "dependencies": {
-        "@distube/ytdl-core": "^4.13.5",
+        "@distube/ytdl-core": "^4.15.1",
         "axios": "^1.7.2",
         "puppeteer": "^22.13.1"
     },
@@ -48,7 +48,6 @@
         "vue-tsc": "^1.4.2"
     },
     "peerDependencies": {
-        "@distube/ytdl-core": "^4.13.5",
         "axios": "^1.7.2",
         "puppeteer": "^22.13.1"
     }