@pieda/video-dl 1.1.0 → 1.3.0

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, downloadBtnSelector, 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 i=o=>new Promise((e,c)=>{import(o).then(t=>e(t.default)).catch(c)}),$=async(o,e)=>{const c=await i("fs"),t=await i("axios");return new Promise((a,n)=>{t.get(o,{responseType:"stream"}).then(r=>{const l=r.data,s=c.createWriteStream(e);l.pipe(s),s.on("finish",function(){s.close(()=>{a()})})}).catch(n)})},v=(o=!1)=>({log:(...e)=>{o&&console.log(...e)},error:(...e)=>{o&&console.error(...e)}}),k=async({videoId:o,dest:e,debug:c=!1})=>{const t=v(c);t.log(`Downloading video: ${o} to: ${e}`);const a=`https://www.youtube.com/watch?v=${o}`,n=await i("fs"),r=await i("path"),l=await i("@distube/ytdl-core");return n.existsSync(r.dirname(e))||n.mkdirSync(r.dirname(e),{recursive:!0},777),new Promise((s,u)=>{l(a).pipe(n.createWriteStream(e)).on("finish",()=>{t.log("Downloading finished."),s()})})},S=async({videoId:o,dest:e,debug:c=!1})=>{const t=v(c);t.log(`Downloading video: ${o} to: ${e}`);const a=`https://m.facebook.com/watch/?v=${o}`,n=await i("fs"),r=await i("path"),l=await i("puppeteer");n.existsSync(r.dirname(e))||(n.mkdirSync(r.dirname(e),{recursive:!0},777),t.log(`建立 ${r.dirname(e)}`));const s=await l.launch();t.log("啟動 puppeteer");const u=await s.newPage();await u.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 u.goto(a,{waitUntil:"networkidle0"}),t.log(`前往 ${a}`),await u.waitForSelector("video"),t.log("找到 video 元素");const w=await u.$eval("video",p=>p.getAttribute("src"));t.log(`取得 video url: ${w}`),await s.close(),t.log("關閉 puppeteer"),await $(w,e),t.log(`下載完成 ${w}`)},P=async({videoId:o,dest:e,downloadBtnSelector:c,debug:t=!1})=>{const a=v(t);a.log(`Downloading video: ${o} to: ${e}`);const n=`https://vimeo.com/${o}`,r=await i("fs"),l=await i("path"),s=await i("axios"),u=await i("puppeteer"),w=async p=>{var m;const y=await s.get(p,{responseType:"json",headers:{"X-Requested-With":"XMLHttpRequest"}}),d=Array.from(((m=y.data)==null?void 0:m.files)||[]);return d[d.length-1].download_url};return r.existsSync(l.dirname(e))||(r.mkdirSync(l.dirname(e),{recursive:!0},777),a.log(`建立 ${l.dirname(e)}`)),new Promise(async(p,y)=>{const d=await u.launch({headless:!1,defaultViewport:{width:1920,height:1080}});a.log("啟動 puppeteer");const g=await d.newPage();a.log("開新分頁"),await g.setRequestInterception(!0),g.on("request",async m=>{const h=m.url();if(h.indexOf("action=load_download_config")>-1){a.log(`攔截下載請求 ${h}`);const b=await w(h);a.log(`正在開始下載 ${b}`),await $(b,e),a.log(`下載完成 ${e}`),await d.close(),a.log("關閉 puppeteer"),p();return}m.continue()}),await g.goto(n,{waitUntil:"networkidle0"}),a.log(`前往 ${n}`);const f=c||"#main > div > main > div > div > div > div._1cCXb.sc-kEmuub.bmHlZQ > div._3oHHF.sc-bbkauy.fmFDPY > div > button:nth-child(1)";await g.waitForSelector(f),a.log(`找到下載按鈕 ${f}`),await g.click(f),a.log("點擊下載按鈕")})},U=({type:o})=>{switch(o){case"youtube":return k;case"facebook":return S;case"vimeo":return P;default:throw new Error(`Invalid video type: ${o}`)}};exports.useDownloader=U;exports.useFacebook=S;exports.useVimeo=P;exports.useYoutube=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=o=>new Promise((e,l)=>{import(o).then(t=>e(t.default)).catch(l)}),h=async(o,e)=>{const l=await c("fs"),t=await c("axios");return new Promise((u,a)=>{t.get(o,{responseType:"stream"}).then(n=>{const p=n.data,i=l.createWriteStream(e);p.pipe(i),i.on("finish",function(){i.close(()=>{u()})})}).catch(a)})},m=(o=!1)=>({log:(...e)=>{o&&console.log(...e)},error:(...e)=>{o&&console.error(...e)}}),f=async({videoId:o,dest:e,debug:l=!1})=>{const t=m(l);t.log(`Downloading video: ${o} to: ${e}`);const u=`https://www.youtube.com/watch?v=${o}`,a=await c("fs"),n=await c("path"),p=await c("@distube/ytdl-core");return a.existsSync(n.dirname(e))||a.mkdirSync(n.dirname(e),{recursive:!0},777),new Promise((i,r)=>{try{p(u).pipe(a.createWriteStream(e)).on("finish",()=>{t.log("Downloading finished."),i([null,!0])})}catch(s){i([s,null])}})},y=async({videoId:o,dest:e,debug:l=!1})=>{try{const t=m(l);t.log(`Downloading video: ${o} to: ${e}`);const u=`https://m.facebook.com/watch/?v=${o}`,a=await c("fs"),n=await c("path"),p=await c("puppeteer");a.existsSync(n.dirname(e))||(a.mkdirSync(n.dirname(e),{recursive:!0},777),t.log(`建立 ${n.dirname(e)}`));const i=await p.launch();t.log("啟動 puppeteer");const r=await i.newPage();await r.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 r.goto(u,{waitUntil:"networkidle0"}),t.log(`前往 ${u}`),await r.waitForSelector("video"),t.log("找到 video 元素");const s=await r.$eval("video",w=>w.getAttribute("src"));return t.log(`取得 video url: ${s}`),await i.close(),t.log("關閉 puppeteer"),await h(s,e),t.log(`下載完成 ${s}`),[null,!0]}catch(t){return[t,null]}},$=async({videoId:o,dest:e,debug:l=!1})=>{const t=m(l);t.log(`Downloading video: ${o} to: ${e}`);const u=await c("fs"),a=await c("path"),n=await c("axios"),p=async()=>{const r=await n.get("https://vimeo.com/_next/viewer",{responseType:"json",headers:{"X-Requested-With":"XMLHttpRequest"}}),{jwt:s}=r.data;return s||""},i=async(r="",s="")=>{const w=await n.get(`https://api.vimeo.com/videos/${r}?&fields=download`,{responseType:"json",headers:{"X-Requested-With":"XMLHttpRequest",Authorization:`jwt ${s}`}}),{download:g=[]}=w.data,d=g[0]||null;return(d==null?void 0:d.link)||""};return u.existsSync(a.dirname(e))||(u.mkdirSync(a.dirname(e),{recursive:!0},777),t.log(`建立 ${a.dirname(e)}`)),new Promise(async(r,s)=>{try{const w=await p();t.log(`取得 jwt ${w}`);const g=await i(o,w);t.log(`取得 videoUrl ${g}`),await h(g,e),t.log(`下載完成 ${e}`),r([null,!0])}catch(w){r([w,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,110 +1,114 @@
-const i = (t) => new Promise((e, c) => {
-  import(t).then((o) => e(o.default)).catch(c);
-}), b = async (t, e) => {
-  const c = await i("fs"), o = await i("axios");
-  return new Promise((a, n) => {
-    o.get(t, { responseType: "stream" }).then((r) => {
-      const l = r.data, s = c.createWriteStream(e);
-      l.pipe(s), s.on("finish", function() {
-        s.close(() => {
-          a();
+const c = (o) => new Promise((e, l) => {
+  import(o).then((t) => e(t.default)).catch(l);
+}), h = async (o, e) => {
+  const l = await c("fs"), t = await c("axios");
+  return new Promise((u, a) => {
+    t.get(o, { responseType: "stream" }).then((r) => {
+      const p = r.data, i = l.createWriteStream(e);
+      p.pipe(i), i.on("finish", function() {
+        i.close(() => {
+          u();
         });
       });
-    }).catch(n);
+    }).catch(a);
   });
-}, v = (t = !1) => ({
+}, m = (o = !1) => ({
   log: (...e) => {
-    t && console.log(...e);
+    o && console.log(...e);
   },
   error: (...e) => {
-    t && console.error(...e);
+    o && console.error(...e);
   }
-}), k = async ({ videoId: t, dest: e, debug: c = !1 }) => {
-  const o = v(c);
-  o.log(`Downloading video: ${t} to: ${e}`);
-  const a = `https://www.youtube.com/watch?v=${t}`, n = await i("fs"), r = await i("path"), l = await i("@distube/ytdl-core");
-  return n.existsSync(r.dirname(e)) || n.mkdirSync(r.dirname(e), { recursive: !0 }, 777), new Promise((s, w) => {
-    l(a).pipe(n.createWriteStream(e)).on("finish", () => {
-      o.log("Downloading finished."), s();
-    });
+}), f = async ({
+  videoId: o,
+  dest: e,
+  debug: l = !1
+}) => {
+  const t = m(l);
+  t.log(`Downloading video: ${o} to: ${e}`);
+  const u = `https://www.youtube.com/watch?v=${o}`, a = await c("fs"), r = await c("path"), p = await c("@distube/ytdl-core");
+  return a.existsSync(r.dirname(e)) || a.mkdirSync(r.dirname(e), { recursive: !0 }, 777), new Promise((i, n) => {
+    try {
+      p(u).pipe(a.createWriteStream(e)).on("finish", () => {
+        t.log("Downloading finished."), i([null, !0]);
+      });
+    } catch (s) {
+      i([s, null]);
+    }
   });
-}, S = async ({
-  videoId: t,
+}, y = async ({
+  videoId: o,
   dest: e,
-  debug: c = !1
+  debug: l = !1
 }) => {
-  const o = v(c);
-  o.log(`Downloading video: ${t} to: ${e}`);
-  const a = `https://m.facebook.com/watch/?v=${t}`, n = await i("fs"), r = await i("path"), l = await i("puppeteer");
-  n.existsSync(r.dirname(e)) || (n.mkdirSync(r.dirname(e), { recursive: !0 }, 777), o.log(`建立 ${r.dirname(e)}`));
-  const s = await l.launch();
-  o.log("啟動 puppeteer");
-  const w = await s.newPage();
-  await w.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'"
-  ), o.log("開新分頁"), await w.goto(a, {
-    waitUntil: "networkidle0"
-  }), o.log(`前往 ${a}`), await w.waitForSelector("video"), o.log("找到 video 元素");
-  const u = await w.$eval("video", (g) => g.getAttribute("src"));
-  o.log(`取得 video url: ${u}`), await s.close(), o.log("關閉 puppeteer"), await b(u, e), o.log(`下載完成 ${u}`);
-}, P = async ({
-  videoId: t,
+  try {
+    const t = m(l);
+    t.log(`Downloading video: ${o} to: ${e}`);
+    const u = `https://m.facebook.com/watch/?v=${o}`, a = await c("fs"), r = await c("path"), p = await c("puppeteer");
+    a.existsSync(r.dirname(e)) || (a.mkdirSync(r.dirname(e), { recursive: !0 }, 777), t.log(`建立 ${r.dirname(e)}`));
+    const i = await p.launch();
+    t.log("啟動 puppeteer");
+    const n = await i.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(u, {
+      waitUntil: "networkidle0"
+    }), t.log(`前往 ${u}`), await n.waitForSelector("video"), t.log("找到 video 元素");
+    const s = await n.$eval("video", (w) => w.getAttribute("src"));
+    return t.log(`取得 video url: ${s}`), await i.close(), t.log("關閉 puppeteer"), await h(s, e), t.log(`下載完成 ${s}`), [null, !0];
+  } catch (t) {
+    return [t, null];
+  }
+}, $ = async ({
+  videoId: o,
   dest: e,
-  downloadBtnSelector: c,
-  debug: o = !1
+  debug: l = !1
 }) => {
-  const a = v(o);
-  a.log(`Downloading video: ${t} to: ${e}`);
-  const n = `https://vimeo.com/${t}`, r = await i("fs"), l = await i("path"), s = await i("axios"), w = await i("puppeteer"), u = async (g) => {
-    var m;
-    const y = await s.get(g, {
+  const t = m(l);
+  t.log(`Downloading video: ${o} to: ${e}`);
+  const u = await c("fs"), a = await c("path"), r = await c("axios"), p = async () => {
+    const n = await r.get("https://vimeo.com/_next/viewer", {
       responseType: "json",
       headers: {
         "X-Requested-With": "XMLHttpRequest"
       }
-    }), d = Array.from(((m = y.data) == null ? void 0 : m.files) || []);
-    return d[d.length - 1].download_url;
-  };
-  return r.existsSync(l.dirname(e)) || (r.mkdirSync(l.dirname(e), { recursive: !0 }, 777), a.log(`建立 ${l.dirname(e)}`)), new Promise(async (g, y) => {
-    const d = await w.launch({
-      headless: !1,
-      defaultViewport: {
-        width: 1920,
-        height: 1080
-      }
-    });
-    a.log("啟動 puppeteer");
-    const p = await d.newPage();
-    a.log("開新分頁"), await p.setRequestInterception(!0), p.on("request", async (m) => {
-      const h = m.url();
-      if (h.indexOf("action=load_download_config") > -1) {
-        a.log(`攔截下載請求 ${h}`);
-        const $ = await u(h);
-        a.log(`正在開始下載 ${$}`), await b($, e), a.log(`下載完成 ${e}`), await d.close(), a.log("關閉 puppeteer"), g();
-        return;
+    }), { jwt: s } = n.data;
+    return s || "";
+  }, i = async (n = "", s = "") => {
+    const w = await r.get(`https://api.vimeo.com/videos/${n}?&fields=download`, {
+      responseType: "json",
+      headers: {
+        "X-Requested-With": "XMLHttpRequest",
+        Authorization: `jwt ${s}`
       }
-      m.continue();
-    }), await p.goto(n, {
-      waitUntil: "networkidle0"
-    }), a.log(`前往 ${n}`);
-    const f = c || "#main > div > main > div > div > div > div._1cCXb.sc-kEmuub.bmHlZQ > div._3oHHF.sc-bbkauy.fmFDPY > div > button:nth-child(1)";
-    await p.waitForSelector(f), a.log(`找到下載按鈕 ${f}`), await p.click(f), a.log("點擊下載按鈕");
+    }), { download: g = [] } = w.data, d = g[0] || null;
+    return (d == null ? void 0 : d.link) || "";
+  };
+  return u.existsSync(a.dirname(e)) || (u.mkdirSync(a.dirname(e), { recursive: !0 }, 777), t.log(`建立 ${a.dirname(e)}`)), new Promise(async (n, s) => {
+    try {
+      const w = await p();
+      t.log(`取得 jwt ${w}`);
+      const g = await i(o, w);
+      t.log(`取得 videoUrl ${g}`), await h(g, e), t.log(`下載完成 ${e}`), n([null, !0]);
+    } catch (w) {
+      n([w, null]);
+    }
   });
-}, x = ({ type: t }) => {
-  switch (t) {
+}, v = ({ type: o }) => {
+  switch (o) {
     case "youtube":
-      return k;
+      return f;
     case "facebook":
-      return S;
+      return y;
     case "vimeo":
-      return P;
+      return $;
     default:
-      throw new Error(`Invalid video type: ${t}`);
+      throw new Error(`Invalid video type: ${o}`);
   }
 };
 export {
-  x as useDownloader,
-  S as useFacebook,
-  P as useVimeo,
-  k as useYoutube
+  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.1.0",
+    "version": "1.3.0",
     "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"
     }