@pieda/video-dl 1.10.3 → 1.11.0

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

@@ -5,6 +5,7 @@ type TUseInstagram = {
     dest: string;
     tempDir: string;
     ffmpegConfig: {
+        ffmpegDir: string;
         ffmpegPath: string;
         ffmpegProbePath: string;
         ffmpegPlayPath: string;

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

@@ -5,6 +5,7 @@ type TUseVimeo = {
     dest: string;
     tempDir: string;
     ffmpegConfig: {
+        ffmpegDir: string;
         ffmpegPath: string;
         ffmpegProbePath: string;
         ffmpegPlayPath: string;

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

@@ -5,6 +5,7 @@ type TUseYoutube = {
     debug?: boolean;
     tempDir: string;
     ffmpegConfig: {
+        ffmpegDir: string;
         ffmpegPath: string;
         ffmpegProbePath: string;
         ffmpegPlayPath: string;

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

@@ -1,14 +1,14 @@
 type TUseYtdlp = {
     debug?: boolean;
-    ytdlpPath: string;
-    videoUrl: string;
+    command: string;
     dest: string;
     tempDir: string;
     ffmpegConfig: {
+        ffmpegDir: string;
         ffmpegPath: string;
         ffmpegProbePath: string;
         ffmpegPlayPath: string;
     };
 };
-export declare const useYtdlp: ({ debug, ytdlpPath, videoUrl, dest, tempDir, ffmpegConfig, }: TUseYtdlp) => Promise<[Error | null, boolean | null]>;
+export declare const useYtdlp: ({ debug, command, dest, tempDir, ffmpegConfig, }: TUseYtdlp) => Promise<[Error | null, boolean | null]>;
 export {};

package/dist/video-dl.cjs

@@ -1 +1,5 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=(t=!1)=>({log:(...o)=>{t&&console.log(...o)},error:(...o)=>{t&&console.error(...o)}}),u=t=>new Promise((o,s)=>{import(t).then(r=>o(r.default)).catch(s)}),S=async(t,o,s)=>{const r=await u("fs"),e=await u("axios");return console.log(`Downloading ${t} to ${o}`),new Promise((i,n)=>{e.get(t,{responseType:"stream",headers:s}).then(a=>{const g=a.data,l=r.createWriteStream(o);g.pipe(l),l.on("finish",function(){l.close(()=>{i()})})}).catch(n)})},v=async({debug:t=!1,ytdlpPath:o,videoUrl:s,dest:r,tempDir:e,ffmpegConfig:i})=>{const n=d(t);n.log(`Downloading video: ${s} to: ${r}`);const a=await u("fs"),g=await u("path"),{exec:l,execSync:f}=await u("child_process"),w=()=>new Promise((c,m)=>{const p=`${o} -f mergeall --audio-multistreams --video-multistreams ${s} --downloader ffmpeg -o "${e}/%(id)s.%(ext)s" --merge-output-format mp4`;n.log(`[yt-dlp] 執行命令: ${p}`),l(p,(h,$,y)=>{if(n.log(`[yt-dlp] stdout: ${$}`),h){m(h);return}c()})});return a.existsSync(g.dirname(r))||(a.mkdirSync(g.dirname(r),{recursive:!0},777),n.log(`建立 ${g.dirname(r)}`)),new Promise(async(c,m)=>{try{await w();let p=!1;const h=a.readdirSync(e);for(const $ of h){const y=g.join(e,$),M=`${i.ffmpegProbePath} -v error -show_entries stream=codec_type -of csv=p=0 "${y}"`,k=f(M).toString("utf-8"),A=k.includes("video"),D=k.includes("audio");if(A&&D){p=!0,a.copyFileSync(y,r);break}}if(!p)throw new Error("無法下載影音正常的影片");n.log(`下載完成 ${r}`),c([null,!0])}catch(p){n.error(`下載失敗: ${p.message}`),c([p,null])}})},b=async({debug:t=!1,ytdlpPath:o,videoId:s,dest:r,tempDir:e,ffmpegConfig:i})=>{d(t).log(`Downloading video: ${s} to: ${r}`);const a=`https://www.youtube.com/watch?v=${s}`;return v({debug:t,ytdlpPath:o,videoUrl:a,dest:r,tempDir:e,ffmpegConfig:i})},P=async({videoId:t,dest:o,debug:s=!1,headless:r=!0})=>{try{const e=d(s);e.log(`Downloading video: ${t} to: ${o}`);const i=`https://m.facebook.com/watch/?v=${t}`,n=await u("fs"),a=await u("path"),g=await u("puppeteer");n.existsSync(a.dirname(o))||(n.mkdirSync(a.dirname(o),{recursive:!0},777),e.log(`建立 ${a.dirname(o)}`));const l={};r||(l.headless=!1);const f=await g.launch(l);e.log("啟動 puppeteer");const w=await f.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'"),e.log("開新分頁"),e.log(`前往 ${i}`),await Promise.race([w.goto(i,{waitUntil:"networkidle0"}),w.waitForSelector("video")]),e.log("找到 video 元素");const c=await w.$eval("video",m=>m.getAttribute("src"));return e.log(`取得 video url: ${c}`),await f.close(),e.log("關閉 puppeteer"),await S(c,o),e.log(`下載完成 ${c}`),[null,!0]}catch(e){return[e,null]}},U=async({debug:t=!1,ytdlpPath:o,videoId:s,dest:r,tempDir:e,ffmpegConfig:i})=>{d(t).log(`Downloading video: ${s} to: ${r}`);const a=`https://vimeo.com/${s}`;return v({debug:t,ytdlpPath:o,videoUrl:a,dest:r,tempDir:e,ffmpegConfig:i})},x=async({debug:t=!1,ytdlpPath:o,videoId:s,dest:r,tempDir:e,ffmpegConfig:i})=>{d(t).log(`Downloading video: ${s} to: ${r}`);const a=`https://www.instagram.com/reel/${s}/`;return v({debug:t,ytdlpPath:o,videoUrl:a,dest:r,tempDir:e,ffmpegConfig:i})},F=async({videoLink:t,dest:o,debug:s=!1,headless:r=!0})=>{try{const e=d(s);e.log(`Downloading video: ${t} to: ${o}`);const i=t,n=await u("fs"),a=await u("path"),g=await u("puppeteer");n.existsSync(a.dirname(o))||(n.mkdirSync(a.dirname(o),{recursive:!0},777),e.log(`建立 ${a.dirname(o)}`));const l={};r||(l.headless=!1);const f=await g.launch(l);e.log("啟動 puppeteer");const w=await f.newPage();e.log("開新分頁"),e.log(`前往 ${i}`),await Promise.race([w.goto(i,{waitUntil:"networkidle0"}),w.waitForSelector("video")]),e.log("找到 video 元素");const c=await w.$eval('video source[src^="https://www.tiktok.com/aweme/v1/play/"]',m=>m.getAttribute("src"));return e.log(`取得 video url: ${c}`),await f.close(),e.log("關閉 puppeteer"),await S(c,o,{"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",Referer:"https://www.tiktok.com/"}),e.log(`下載完成 ${c}`),[null,!0]}catch(e){return[e,null]}},T=({type:t})=>{switch(t){case"youtube":case"yt-short":return b;case"facebook":case"fb-reel":return P;case"vimeo":return U;case"instagram":case"ig":case"ig-reel":return x;case"tiktok":case"tiktok-reel":return F;default:throw new Error(`Invalid video type: ${t}`)}};exports.useDownloader=T;exports.useFacebook=P;exports.useInstagram=x;exports.useTiktok=F;exports.useVimeo=U;exports.useYoutube=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=(t=!1)=>({log:(...o)=>{t&&console.log(...o)},error:(...o)=>{t&&console.error(...o)}}),u=t=>new Promise((o,a)=>{import(t).then(i=>o(i.default)).catch(a)}),P=async(t,o,a)=>{const i=await u("fs"),e=await u("axios");return console.log(`Downloading ${t} to ${o}`),new Promise((n,c)=>{e.get(t,{responseType:"stream",headers:a}).then(s=>{const l=s.data,g=i.createWriteStream(o);l.pipe(g),g.on("finish",function(){g.close(()=>{n()})})}).catch(c)})},x=async({debug:t=!1,command:o,dest:a,tempDir:i,ffmpegConfig:e})=>{const n=v(t),c=await u("fs"),s=await u("path"),{exec:l,execSync:g}=await u("child_process"),d=()=>new Promise((r,p)=>{n.log(`[yt-dlp] 執行命令: ${o}`),l(o,(w,b,f)=>{if(n.log(`[yt-dlp] stdout: ${b}`),w){p(w);return}r()})});return c.existsSync(s.dirname(a))||(c.mkdirSync(s.dirname(a),{recursive:!0},777),n.log(`建立 ${s.dirname(a)}`)),new Promise(async(r,p)=>{try{await d();let w=!1;const b=c.readdirSync(i);for(const f of b){const h=s.join(i,f),y=`${e.ffmpegProbePath} -v error -show_entries stream=codec_type -of csv=p=0 "${h}"`,m=g(y).toString("utf-8"),$=m.includes("video"),S=m.includes("audio");if($&&S){w=!0,c.copyFileSync(h,a);break}}if(!w)throw new Error("無法下載影音正常的影片");n.log(`下載完成 ${a}`),r([null,!0])}catch(w){n.error(`下載失敗: ${w.message}`),r([w,null])}})},T=async({debug:t=!1,ytdlpPath:o,videoId:a,dest:i,tempDir:e,ffmpegConfig:n})=>{const c=v(t);c.log(`Downloading video: ${a} to: ${i}`);const s=await u("fs"),l=await u("path"),g=await u("puppeteer"),d=`https://www.youtube.com/watch?v=${a}`,r=l.join(l.dirname(o),"cookies.txt"),p=(f=[])=>{const h=["# Netscape HTTP Cookie File","# https://curl.se/docs/http-cookies.html","# This file was generated by Puppeteer",""].join(`
+`),y=f.map(m=>{const $=m.domain.startsWith(".")?m.domain:`.${m.domain}`,S="TRUE",k=m.path||"/",A=m.secure?"TRUE":"FALSE",M=m.expires?Math.floor(m.expires):Math.floor(Date.now()/1e3)+3600*24*365,E=m.name,_=m.value;return[$,S,k,A,M,E,_].join("	")});return h+`
+`+y.join(`
+`)+`
+`};await(async()=>{const f=l.join(l.dirname(o),"chrome-profile");if(s.existsSync(f)||s.mkdirSync(f,{recursive:!0},777),s.existsSync(r)&&s.statSync(r).mtimeMs+6e5>Date.now()){c.log("Using existing cookies.txt");return}console.log("Launching Chrome…");const h=await g.launch({headless:!1,userDataDir:f,defaultViewport:null,args:["--disable-blink-features=AutomationControlled"]}),y=await h.newPage();await y.goto("https://www.youtube.com",{waitUntil:"networkidle2"}),console.log("If not logged in, please log in manually."),console.log("Waiting 30 seconds…"),await new Promise(k=>setTimeout(k,3e4));const $=(await y.cookies()).filter(k=>k.domain.includes("youtube.com")||k.domain.includes("google.com"));$.length===0&&(console.error("No YouTube cookies found. Are you logged in?"),process.exit(1));const S=p($);s.writeFileSync(r,S,{encoding:"utf8"}),console.log(`cookies.txt written to ${r}`),console.log(`Cookies count: ${$.length}`),await h.close()})();const b=[`${o}`,'-f "bv*[vcodec^=avc1][acodec^=mp4a][height<=1080]/ba/b"',"--js-runtimes node",`${d}`,`-o "${e}/%(id)s.%(ext)s"`,`--cookies ${r}`,n.ffmpegDir?`--ffmpeg-location "${n.ffmpegDir}"`:""];return x({debug:t,command:b.join(" "),dest:i,tempDir:e,ffmpegConfig:n})},U=async({videoId:t,dest:o,debug:a=!1,headless:i=!0})=>{try{const e=v(a);e.log(`Downloading video: ${t} to: ${o}`);const n=`https://m.facebook.com/watch/?v=${t}`,c=await u("fs"),s=await u("path"),l=await u("puppeteer");c.existsSync(s.dirname(o))||(c.mkdirSync(s.dirname(o),{recursive:!0},777),e.log(`建立 ${s.dirname(o)}`));const g={};i||(g.headless=!1);const d=await l.launch(g);e.log("啟動 puppeteer");const r=await d.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'"),e.log("開新分頁"),e.log(`前往 ${n}`),await r.goto(n,{waitUntil:"networkidle2"}),await r.waitForSelector("video"),e.log("找到 video 元素");const p=await r.$eval("video",w=>w.getAttribute("src"));return e.log(`取得 video url: ${p}`),await d.close(),e.log("關閉 puppeteer"),await P(p,o),e.log(`下載完成 ${p}`),[null,!0]}catch(e){return[e,null]}},j=async({debug:t=!1,ytdlpPath:o,videoId:a,dest:i,tempDir:e,ffmpegConfig:n})=>{v(t).log(`Downloading video: ${a} to: ${i}`);const s=`https://vimeo.com/${a}`,l=[`${o}`,'-f "bv*[vcodec^=avc1][acodec^=mp4a][height<=1080]/ba/b"',"--js-runtimes node",`${s}`,`-o "${e}/%(id)s.%(ext)s"`];return x({debug:t,command:l.join(" "),dest:i,tempDir:e,ffmpegConfig:n})},D=async({debug:t=!1,ytdlpPath:o,videoId:a,dest:i,tempDir:e,ffmpegConfig:n})=>{v(t).log(`Downloading video: ${a} to: ${i}`);const s=`https://www.instagram.com/reel/${a}/`,l=[`${o}`,"-f mergeall","--audio-multistreams","--video-multistreams","--js-runtimes node",`${s}`,"--downloader ffmpeg",`-o "${e}/%(id)s.%(ext)s"`,"--merge-output-format mp4",n.ffmpegDir?`--ffmpeg-location "${n.ffmpegDir}"`:""];return x({debug:t,command:l.join(" "),dest:i,tempDir:e,ffmpegConfig:n})},F=async({videoLink:t,dest:o,debug:a=!1,headless:i=!0})=>{try{const e=v(a);e.log(`Downloading video: ${t} to: ${o}`);const n=t,c=await u("fs"),s=await u("path"),l=await u("puppeteer");c.existsSync(s.dirname(o))||(c.mkdirSync(s.dirname(o),{recursive:!0},777),e.log(`建立 ${s.dirname(o)}`));const g={};i||(g.headless=!1);const d=await l.launch(g);e.log("啟動 puppeteer");const r=await d.newPage();e.log("開新分頁"),e.log(`前往 ${n}`),await r.goto(n,{waitUntil:"networkidle2"}),await r.waitForSelector("video"),e.log("找到 video 元素");const p=await r.$eval('video source[src^="https://www.tiktok.com/aweme/v1/play/"]',w=>w.getAttribute("src"));return e.log(`取得 video url: ${p}`),await d.close(),e.log("關閉 puppeteer"),await P(p,o,{"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",Referer:"https://www.tiktok.com/"}),e.log(`下載完成 ${p}`),[null,!0]}catch(e){return[e,null]}},W=({type:t})=>{switch(t){case"youtube":case"yt-short":return T;case"facebook":case"fb-reel":return U;case"vimeo":return j;case"instagram":case"ig":case"ig-reel":return D;case"tiktok":case"tiktok-reel":return F;default:throw new Error(`Invalid video type: ${t}`)}};exports.useDownloader=W;exports.useFacebook=U;exports.useInstagram=D;exports.useTiktok=F;exports.useVimeo=j;exports.useYoutube=T;

package/dist/video-dl.js

@@ -1,209 +1,261 @@
-const d = (t = !1) => ({
+const v = (t = !1) => ({
   log: (...o) => {
     t && console.log(...o);
   },
   error: (...o) => {
     t && console.error(...o);
   }
-}), u = (t) => new Promise((o, n) => {
-  import(t).then((r) => o(r.default)).catch(n);
-}), S = async (t, o, n) => {
-  const r = await u("fs"), e = await u("axios");
-  return console.log(`Downloading ${t} to ${o}`), new Promise((i, s) => {
+}), u = (t) => new Promise((o, a) => {
+  import(t).then((i) => o(i.default)).catch(a);
+}), U = async (t, o, a) => {
+  const i = await u("fs"), e = await u("axios");
+  return console.log(`Downloading ${t} to ${o}`), new Promise((s, c) => {
     e.get(t, {
       responseType: "stream",
-      headers: n
-    }).then((a) => {
-      const g = a.data, l = r.createWriteStream(o);
-      g.pipe(l), l.on("finish", function() {
-        l.close(() => {
-          i();
+      headers: a
+    }).then((n) => {
+      const l = n.data, g = i.createWriteStream(o);
+      l.pipe(g), g.on("finish", function() {
+        g.close(() => {
+          s();
         });
       });
-    }).catch(s);
+    }).catch(c);
   });
-}, v = async ({
+}, x = async ({
   debug: t = !1,
-  ytdlpPath: o,
-  videoUrl: n,
-  dest: r,
-  tempDir: e,
-  ffmpegConfig: i
+  command: o,
+  dest: a,
+  tempDir: i,
+  ffmpegConfig: e
 }) => {
-  const s = d(t);
-  s.log(`Downloading video: ${n} to: ${r}`);
-  const a = await u("fs"), g = await u("path"), { exec: l, execSync: f } = await u("child_process"), w = () => new Promise((c, m) => {
-    const p = `${o} -f mergeall --audio-multistreams --video-multistreams ${n} --downloader ffmpeg -o "${e}/%(id)s.%(ext)s" --merge-output-format mp4`;
-    s.log(`[yt-dlp] 執行命令: ${p}`), l(p, (h, $, y) => {
-      if (s.log(`[yt-dlp] stdout: ${$}`), h) {
-        m(h);
+  const s = v(t), c = await u("fs"), n = await u("path"), { exec: l, execSync: g } = await u("child_process"), d = () => new Promise((r, m) => {
+    s.log(`[yt-dlp] 執行命令: ${o}`), l(o, (w, b, f) => {
+      if (s.log(`[yt-dlp] stdout: ${b}`), w) {
+        m(w);
         return;
       }
-      c();
+      r();
     });
   });
-  return a.existsSync(g.dirname(r)) || (a.mkdirSync(g.dirname(r), { recursive: !0 }, 777), s.log(`建立 ${g.dirname(r)}`)), new Promise(async (c, m) => {
+  return c.existsSync(n.dirname(a)) || (c.mkdirSync(n.dirname(a), { recursive: !0 }, 777), s.log(`建立 ${n.dirname(a)}`)), new Promise(async (r, m) => {
     try {
-      await w();
-      let p = !1;
-      const h = a.readdirSync(e);
-      for (const $ of h) {
-        const y = g.join(e, $), P = `${i.ffmpegProbePath} -v error -show_entries stream=codec_type -of csv=p=0 "${y}"`, k = f(P).toString("utf-8"), b = k.includes("video"), x = k.includes("audio");
-        if (b && x) {
-          p = !0, a.copyFileSync(y, r);
+      await d();
+      let w = !1;
+      const b = c.readdirSync(i);
+      for (const f of b) {
+        const h = n.join(i, f), y = `${e.ffmpegProbePath} -v error -show_entries stream=codec_type -of csv=p=0 "${h}"`, p = g(y).toString("utf-8"), $ = p.includes("video"), S = p.includes("audio");
+        if ($ && S) {
+          w = !0, c.copyFileSync(h, a);
           break;
         }
       }
-      if (!p)
+      if (!w)
         throw new Error("無法下載影音正常的影片");
-      s.log(`下載完成 ${r}`), c([null, !0]);
-    } catch (p) {
-      s.error(`下載失敗: ${p.message}`), c([p, null]);
+      s.log(`下載完成 ${a}`), r([null, !0]);
+    } catch (w) {
+      s.error(`下載失敗: ${w.message}`), r([w, null]);
     }
   });
-}, U = async ({
+}, D = async ({
   debug: t = !1,
   ytdlpPath: o,
-  videoId: n,
-  dest: r,
+  videoId: a,
+  dest: i,
   tempDir: e,
-  ffmpegConfig: i
+  ffmpegConfig: s
 }) => {
-  d(t).log(`Downloading video: ${n} to: ${r}`);
-  const a = `https://www.youtube.com/watch?v=${n}`;
-  return v({
+  const c = v(t);
+  c.log(`Downloading video: ${a} to: ${i}`);
+  const n = await u("fs"), l = await u("path"), g = await u("puppeteer"), d = `https://www.youtube.com/watch?v=${a}`, r = l.join(l.dirname(o), "cookies.txt"), m = (f = []) => {
+    const h = [
+      "# Netscape HTTP Cookie File",
+      "# https://curl.se/docs/http-cookies.html",
+      "# This file was generated by Puppeteer",
+      ""
+    ].join(`
+`), y = f.map((p) => {
+      const $ = p.domain.startsWith(".") ? p.domain : `.${p.domain}`, S = "TRUE", k = p.path || "/", A = p.secure ? "TRUE" : "FALSE", P = p.expires ? Math.floor(p.expires) : Math.floor(Date.now() / 1e3) + 3600 * 24 * 365, T = p.name, j = p.value;
+      return [$, S, k, A, P, T, j].join("	");
+    });
+    return h + `
+` + y.join(`
+`) + `
+`;
+  };
+  await (async () => {
+    const f = l.join(l.dirname(o), "chrome-profile");
+    if (n.existsSync(f) || n.mkdirSync(f, { recursive: !0 }, 777), n.existsSync(r) && n.statSync(r).mtimeMs + 6e5 > Date.now()) {
+      c.log("Using existing cookies.txt");
+      return;
+    }
+    console.log("Launching Chrome…");
+    const h = await g.launch({
+      headless: !1,
+      // 必須 false
+      userDataDir: f,
+      // 關鍵
+      defaultViewport: null,
+      args: ["--disable-blink-features=AutomationControlled"]
+    }), y = await h.newPage();
+    await y.goto("https://www.youtube.com", {
+      waitUntil: "networkidle2"
+    }), console.log("If not logged in, please log in manually."), console.log("Waiting 30 seconds…"), await new Promise((k) => setTimeout(k, 3e4));
+    const $ = (await y.cookies()).filter((k) => k.domain.includes("youtube.com") || k.domain.includes("google.com"));
+    $.length === 0 && (console.error("No YouTube cookies found. Are you logged in?"), process.exit(1));
+    const S = m($);
+    n.writeFileSync(r, S, { encoding: "utf8" }), console.log(`cookies.txt written to ${r}`), console.log(`Cookies count: ${$.length}`), await h.close();
+  })();
+  const b = [
+    `${o}`,
+    '-f "bv*[vcodec^=avc1][acodec^=mp4a][height<=1080]/ba/b"',
+    "--js-runtimes node",
+    `${d}`,
+    `-o "${e}/%(id)s.%(ext)s"`,
+    `--cookies ${r}`,
+    s.ffmpegDir ? `--ffmpeg-location "${s.ffmpegDir}"` : ""
+  ];
+  return x({
     debug: t,
-    ytdlpPath: o,
-    videoUrl: a,
-    dest: r,
+    command: b.join(" "),
+    dest: i,
     tempDir: e,
-    ffmpegConfig: i
+    ffmpegConfig: s
   });
-}, A = async ({
+}, F = async ({
   videoId: t,
   dest: o,
-  debug: n = !1,
-  headless: r = !0
+  debug: a = !1,
+  headless: i = !0
 }) => {
   try {
-    const e = d(n);
+    const e = v(a);
     e.log(`Downloading video: ${t} to: ${o}`);
-    const i = `https://m.facebook.com/watch/?v=${t}`, s = await u("fs"), a = await u("path"), g = await u("puppeteer");
-    s.existsSync(a.dirname(o)) || (s.mkdirSync(a.dirname(o), { recursive: !0 }, 777), e.log(`建立 ${a.dirname(o)}`));
-    const l = {};
-    r || (l.headless = !1);
-    const f = await g.launch(l);
+    const s = `https://m.facebook.com/watch/?v=${t}`, c = await u("fs"), n = await u("path"), l = await u("puppeteer");
+    c.existsSync(n.dirname(o)) || (c.mkdirSync(n.dirname(o), { recursive: !0 }, 777), e.log(`建立 ${n.dirname(o)}`));
+    const g = {};
+    i || (g.headless = !1);
+    const d = await l.launch(g);
     e.log("啟動 puppeteer");
-    const w = await f.newPage();
-    await w.setUserAgent(
+    const r = await d.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'"
-    ), e.log("開新分頁"), e.log(`前往 ${i}`), await Promise.race([
-      w.goto(i, {
-        waitUntil: "networkidle0"
-      }),
-      w.waitForSelector("video")
-    ]), e.log("找到 video 元素");
-    const c = await w.$eval("video", (m) => m.getAttribute("src"));
-    return e.log(`取得 video url: ${c}`), await f.close(), e.log("關閉 puppeteer"), await S(c, o), e.log(`下載完成 ${c}`), [null, !0];
+    ), e.log("開新分頁"), e.log(`前往 ${s}`), await r.goto(s, {
+      waitUntil: "networkidle2"
+    }), await r.waitForSelector("video"), e.log("找到 video 元素");
+    const m = await r.$eval("video", (w) => w.getAttribute("src"));
+    return e.log(`取得 video url: ${m}`), await d.close(), e.log("關閉 puppeteer"), await U(m, o), e.log(`下載完成 ${m}`), [null, !0];
   } catch (e) {
     return [e, null];
   }
-}, F = async ({
+}, M = async ({
   debug: t = !1,
   ytdlpPath: o,
-  videoId: n,
-  dest: r,
+  videoId: a,
+  dest: i,
   tempDir: e,
-  ffmpegConfig: i
+  ffmpegConfig: s
 }) => {
-  d(t).log(`Downloading video: ${n} to: ${r}`);
-  const a = `https://vimeo.com/${n}`;
-  return v({
+  v(t).log(`Downloading video: ${a} to: ${i}`);
+  const n = `https://vimeo.com/${a}`, l = [
+    `${o}`,
+    '-f "bv*[vcodec^=avc1][acodec^=mp4a][height<=1080]/ba/b"',
+    "--js-runtimes node",
+    `${n}`,
+    `-o "${e}/%(id)s.%(ext)s"`
+  ];
+  return x({
     debug: t,
-    ytdlpPath: o,
-    videoUrl: a,
-    dest: r,
+    command: l.join(" "),
+    dest: i,
     tempDir: e,
-    ffmpegConfig: i
+    ffmpegConfig: s
   });
-}, M = async ({
+}, E = async ({
   debug: t = !1,
   ytdlpPath: o,
-  videoId: n,
-  dest: r,
+  videoId: a,
+  dest: i,
   tempDir: e,
-  ffmpegConfig: i
+  ffmpegConfig: s
 }) => {
-  d(t).log(`Downloading video: ${n} to: ${r}`);
-  const a = `https://www.instagram.com/reel/${n}/`;
-  return v({
+  v(t).log(`Downloading video: ${a} to: ${i}`);
+  const n = `https://www.instagram.com/reel/${a}/`, l = [
+    `${o}`,
+    "-f mergeall",
+    "--audio-multistreams",
+    "--video-multistreams",
+    "--js-runtimes node",
+    `${n}`,
+    "--downloader ffmpeg",
+    `-o "${e}/%(id)s.%(ext)s"`,
+    "--merge-output-format mp4",
+    s.ffmpegDir ? `--ffmpeg-location "${s.ffmpegDir}"` : ""
+  ];
+  return x({
     debug: t,
-    ytdlpPath: o,
-    videoUrl: a,
-    dest: r,
+    command: l.join(" "),
+    dest: i,
     tempDir: e,
-    ffmpegConfig: i
+    ffmpegConfig: s
   });
-}, D = async ({
+}, _ = async ({
   videoLink: t,
   dest: o,
-  debug: n = !1,
-  headless: r = !0
+  debug: a = !1,
+  headless: i = !0
 }) => {
   try {
-    const e = d(n);
+    const e = v(a);
     e.log(`Downloading video: ${t} to: ${o}`);
-    const i = t, s = await u("fs"), a = await u("path"), g = await u("puppeteer");
-    s.existsSync(a.dirname(o)) || (s.mkdirSync(a.dirname(o), { recursive: !0 }, 777), e.log(`建立 ${a.dirname(o)}`));
-    const l = {};
-    r || (l.headless = !1);
-    const f = await g.launch(l);
+    const s = t, c = await u("fs"), n = await u("path"), l = await u("puppeteer");
+    c.existsSync(n.dirname(o)) || (c.mkdirSync(n.dirname(o), { recursive: !0 }, 777), e.log(`建立 ${n.dirname(o)}`));
+    const g = {};
+    i || (g.headless = !1);
+    const d = await l.launch(g);
     e.log("啟動 puppeteer");
-    const w = await f.newPage();
-    e.log("開新分頁"), e.log(`前往 ${i}`), await Promise.race([
-      w.goto(i, {
-        waitUntil: "networkidle0"
-      }),
-      w.waitForSelector("video")
-    ]), e.log("找到 video 元素");
-    const c = await w.$eval(
+    const r = await d.newPage();
+    e.log("開新分頁"), e.log(`前往 ${s}`), await r.goto(s, {
+      waitUntil: "networkidle2"
+    }), await r.waitForSelector("video"), e.log("找到 video 元素");
+    const m = await r.$eval(
       'video source[src^="https://www.tiktok.com/aweme/v1/play/"]',
-      (m) => m.getAttribute("src")
+      (w) => w.getAttribute("src")
     );
-    return e.log(`取得 video url: ${c}`), await f.close(), e.log("關閉 puppeteer"), await S(c, o, {
+    return e.log(`取得 video url: ${m}`), await d.close(), e.log("關閉 puppeteer"), await U(m, o, {
       "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
       Referer: "https://www.tiktok.com/"
       // 設定 Referer
-    }), e.log(`下載完成 ${c}`), [null, !0];
+    }), e.log(`下載完成 ${m}`), [null, !0];
   } catch (e) {
     return [e, null];
   }
-}, T = ({ type: t }) => {
+}, W = ({ type: t }) => {
   switch (t) {
     case "youtube":
     case "yt-short":
-      return U;
+      return D;
     case "facebook":
     case "fb-reel":
-      return A;
-    case "vimeo":
       return F;
+    case "vimeo":
+      return M;
     case "instagram":
     case "ig":
     case "ig-reel":
-      return M;
+      return E;
     case "tiktok":
     case "tiktok-reel":
-      return D;
+      return _;
     default:
       throw new Error(`Invalid video type: ${t}`);
   }
 };
 export {
-  T as useDownloader,
-  A as useFacebook,
-  M as useInstagram,
-  D as useTiktok,
-  F as useVimeo,
-  U as useYoutube
+  W as useDownloader,
+  F as useFacebook,
+  E as useInstagram,
+  _ as useTiktok,
+  M as useVimeo,
+  D as useYoutube
 };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@pieda/video-dl",
     "private": false,
-    "version": "1.10.3",
+    "version": "1.11.0",
     "type": "module",
     "main": "dist/video-dl.cjs",
     "module": "dist/video-dl.js",