wavesconv 1.6.0 → 1.7.0

package/README.md

@@ -1,12 +1,10 @@
 <div align="center">
 
-<img src="https://raw.githubusercontent.com/idunnowhytf/wavesconvsite/main/docs/og.png" alt="WavesConverter" width="100%"/>
+<img src="https://res.cloudinary.com/dyozzp82h/image/upload/v1780341159/Gemini_Generated_Image_ve6asxve6asxve6a-Photoroom_clfoi2.png" alt="WavesConverter" width="100%"/>
 
 <br/>
 
-<h1>
-  <img src="https://img.shields.io/badge/WavesConverter-v1.2.0-7c3aed?style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMiAxMyBRNCA3IDYgMTMgUTggMTkgMTAgMTMgUTEyIDcgMTQgMTMgUTE2IDE5IDE4IDEzIFEyMCA3IDIyIDEzIiBzdHJva2U9IiNjMDg0ZmMiIHN0cm9rZS13aWR0aD0iMi41IiBzdHJva2UtbGluZWNhcD0icm91bmQiLz48L3N2Zz4=" alt="WavesConverter v1.2.0"/>
-</h1>
+
 
 **Download anything. Convert everything.**
 
@@ -15,9 +13,9 @@ converts any media file — all offline, no account needed, completely free.
 
 <br/>
 
-[![Download](https://img.shields.io/badge/⬇_Download-macOS_&_Windows-7c3aed?style=for-the-badge)](https://idunnowhytf.github.io/wavesconvsite/#download)
-[![Website](https://img.shields.io/badge/🌐_Website-wavesconverter-a855f7?style=for-the-badge)](https://idunnowhytf.github.io/wavesconvsite/)
-[![Releases](https://img.shields.io/github/v/release/idunnowhytf/wavesconvsite?style=for-the-badge&color=d946ef&label=Latest)](https://github.com/idunnowhytf/wavesconvsite/releases)
+[![Download](https://img.shields.io/badge/⬇_Download-macOS_&_Windows-7c3aed?style=for-the-badge)](https://idunnowhytf.github.io/WavesConverter/#download)
+[![Website](https://img.shields.io/badge/🌐_Website-wavesconverter-a855f7?style=for-the-badge)](https://idunnowhytf.github.io/WavesConverter/)
+[![Releases](https://img.shields.io/github/v/release/idunnowhytf/WavesConverter?style=for-the-badge&color=d946ef&label=Latest)](https://github.com/idunnowhytf/WavesConverter/releases)
 [![License](https://img.shields.io/badge/License-ISC-6d28d9?style=for-the-badge)](LICENSE)
 
 <br/>
@@ -48,9 +46,9 @@ converts any media file — all offline, no account needed, completely free.
 
 | Platform | Link |
 |---|---|
-| 🍎 **macOS Apple Silicon** (M1/M2/M3/M4) | [WavesConverter-arm64.dmg](https://github.com/idunnowhytf/wavesconvsite/releases/latest/download/WavesConverter-1.0.0-arm64.dmg) |
-| 🍎 **macOS Intel** (x64) | [WavesConverter.dmg](https://github.com/idunnowhytf/wavesconvsite/releases/latest/download/WavesConverter-1.0.0.dmg) |
-| 🪟 **Windows 10+** (x64) | [WavesConverter-Setup.exe](https://github.com/idunnowhytf/wavesconvsite/releases/latest/download/WavesConverter.Setup.1.0.0.exe) |
+| 🍎 **macOS Apple Silicon** (M1/M2/M3/M4) | [WavesConverter-arm64.dmg](https://github.com/idunnowhytf/WavesConverter/releases/latest/download/WavesConverter-1.0.0-arm64.dmg) |
+| 🍎 **macOS Intel** (x64) | [WavesConverter.dmg](https://github.com/idunnowhytf/WavesConverter/releases/latest/download/WavesConverter-1.0.0.dmg) |
+| 🪟 **Windows 10+** (x64) | [WavesConverter-Setup.exe](https://github.com/idunnowhytf/WavesConverter/releases/latest/download/WavesConverter.Setup.1.0.0.exe) |
 
 > **Windows users:** SmartScreen may show a warning since the app isn't signed with a paid certificate.
 > Click **"More info" → "Run anyway"** to proceed. The source code is fully open and auditable here.
@@ -144,19 +142,12 @@ wavesconvsite/
 
 ## 📋 Changelog
 
-See [**Releases →**](https://github.com/idunnowhytf/wavesconvsite/releases) for full version history.
-
-| Version | Highlights |
-|---|---|
-| **v1.2.0** | Batch paste for multiple URLs, ETA & speed display on downloads |
-| **v1.1.0** | Download history tab, keyboard shortcuts, native notifications, drag & drop, Windows support |
-| **v1.0.0** | Initial release — macOS only |
+See [**Releases →**](https://github.com/idunnowhytf/WavesConverter/releases) for full version history.
 
----
 
 ## 🤝 Contributing
 
-Found a bug or have a feature idea? [Open an issue](https://github.com/idunnowhytf/wavesconvsite/issues) — all feedback welcome.
+Found a bug or have a feature idea? [Open an issue](https://github.com/idunnowhytf/WavesConverter/issues) — all feedback welcome.
 
 ---
 
@@ -170,7 +161,7 @@ This tool is intended for downloading content you own or have permission to down
 
 <div align="center">
 
-**[Website](https://idunnowhytf.github.io/wavesconvsite/) · [Releases](https://github.com/idunnowhytf/wavesconvsite/releases) · [Docs](https://idunnowhytf.github.io/wavesconvsite/docs.html) · [Changelog](https://idunnowhytf.github.io/wavesconvsite/changelog.html)**
+**[Website](https://idunnowhytf.github.io/WavesConverter/) · [Releases](https://github.com/idunnowhytf/WavesConverter/releases) · [Docs](https://idunnowhytf.github.io/WavesConverter/docs.html) · [Changelog](https://idunnowhytf.github.io/WavesConverter/changelog.html)**
 
 <br/>
 

package/cli.js

@@ -72,7 +72,7 @@ async function cmdInfo(url, flags, color) {
   spin.start();
   let items;
   try {
-    items = await engine.fetchInfo(url);
+    items = await engine.fetchInfo(url, { cookiesPath: process.env.WAVESCONVERTER_COOKIES || '' });
     spin.succeed(`${items.length} element(ów)`);
   } catch (e) {
     spin.fail(e.message);
@@ -101,8 +101,8 @@ async function cmdInfo(url, flags, color) {
 }
 
 async function cmdDownload(url, flags, color) {
-  if (!engine.isYouTubeUrl(url)) {
-    throw new Error('Nieprawidłowy URL YouTube: ' + url);
+  if (!engine.isSupportedMediaUrl(url)) {
+    throw new Error('Nieobsługiwany URL. Użyj linku YouTube lub Instagram (post / Reel / Stories).');
   }
 
   const setupSpin = new ui.Spinner('Przygotowanie yt-dlp', color);
@@ -125,7 +125,7 @@ async function cmdDownload(url, flags, color) {
   const metaSpin = new ui.Spinner('Wczytywanie metadanych', color);
   metaSpin.start();
   try {
-    const items = await engine.fetchInfo(url);
+    const items = await engine.fetchInfo(url, { cookiesPath: process.env.WAVESCONVERTER_COOKIES || '' });
     if (items[0]) title = items[0].title || items[0].id || title;
     metaSpin.succeed(title.slice(0, 52) + (title.length > 52 ? '…' : ''));
   } catch (_) {
@@ -136,6 +136,8 @@ async function cmdDownload(url, flags, color) {
     id: 'cli-' + Date.now(),
     title,
     url,
+    platform: engine.getMediaPlatform(url),
+    cookiesPath: process.env.WAVESCONVERTER_COOKIES || '',
     audioOnly,
     outputFormat: format,
     quality: flags.quality || 'best',

package/lib/cli-interactive.js

@@ -29,17 +29,7 @@ function sessionToFlags(session) {
 }
 
 function extractYouTubeUrls(text) {
-  const found = new Set();
-  const re = /https?:\/\/(?:www\.)?(?:youtube\.com\/[^\s]+|youtu\.be\/[^\s]+)/gi;
-  let m;
-  while ((m = re.exec(text)) !== null) {
-    found.add(m[0].replace(/[)\]},.;]+$/, ''));
-  }
-  const parts = text.trim().split(/\s+/).filter(Boolean);
-  for (const p of parts) {
-    if (engine.isYouTubeUrl(p)) found.add(p.replace(/[)\]},.;]+$/, ''));
-  }
-  return [...found];
+  return engine.extractMediaUrls(text);
 }
 
 function printSession(color, session) {
@@ -202,8 +192,8 @@ async function runInteractive(handlers, version, color) {
       case 'info':
       case 'i': {
         const url = arg || '';
-        if (!url || !engine.isYouTubeUrl(url)) {
-          ui.warn(color, 'Użyj: /info <url>');
+        if (!url || !engine.isSupportedMediaUrl(url)) {
+          ui.warn(color, 'Użyj: /info <url> (YouTube lub Instagram)');
           return;
         }
         await handlers.info(url, {}, color);
@@ -252,7 +242,7 @@ async function runInteractive(handlers, version, color) {
 
         const urls = extractYouTubeUrls(trimmed);
         if (!urls.length) {
-          ui.warn(color, 'Nie wykryto linku YouTube. Wklej URL lub wpisz /help');
+          ui.warn(color, 'Nie wykryto linku YouTube/Instagram. Wklej URL lub wpisz /help');
           rl.resume();
           loop();
           return;

package/lib/engine.js

@@ -3,6 +3,7 @@ const fs = require('fs');
 const os = require('os');
 const https = require('https');
 const { spawn, exec } = require('child_process');
+const urls = require('./urls');
 
 const APP_FOLDER = 'waves-converter';
 
@@ -78,13 +79,25 @@ async function ensureYtDlp(onStatus) {
   return binFile;
 }
 
-function fetchInfo(url) {
+function appendCookiesArgs(args, options = {}) {
+  const cookiesPath = options.cookiesPath;
+  if (cookiesPath && fs.existsSync(cookiesPath)) {
+    args.push('--cookies', cookiesPath);
+  }
+}
+
+function fetchInfo(url, options = {}) {
   const activeYtDlp = findYtDlp();
   if (!activeYtDlp) {
     return Promise.reject(new Error('yt-dlp nie znaleziony. Uruchom: wavesconv tools install'));
   }
+  if (!urls.isSupportedMediaUrl(url)) {
+    return Promise.reject(new Error('Nieobsługiwany link. Wklej URL YouTube lub Instagram (post, Reel, Stories).'));
+  }
   return new Promise((resolve, reject) => {
-    const args = ['--dump-json', '--flat-playlist', '--no-warnings', url];
+    const args = ['--dump-json', '--flat-playlist', '--no-warnings'];
+    appendCookiesArgs(args, options);
+    args.push(url);
     let out = '';
     let err = '';
     const proc = spawn(activeYtDlp, args);
@@ -104,14 +117,20 @@ function fetchInfo(url) {
 
 function buildDownloadArgs(job) {
   const ffmpeg = findFfmpeg();
-  const { url, outputFormat, quality, bitrate, outputDir, filename, audioOnly } = job;
+  const { url, outputFormat, quality, bitrate, outputDir, filename, audioOnly, cookiesPath } = job;
+  const platform = job.platform || urls.getMediaPlatform(url);
   const safeName = (filename || '%(title)s').replace(/[<>:"/\\|?*]/g, '_');
   const outTpl = path.join(outputDir, safeName + '.%(ext)s');
   const args = ['--no-warnings', '--newline'];
+  appendCookiesArgs(args, { cookiesPath });
   if (ffmpeg) args.push('--ffmpeg-location', path.dirname(ffmpeg));
   if (audioOnly) {
     args.push('-x', '--audio-format', outputFormat || 'mp3');
     if (bitrate) args.push('--audio-quality', bitrate.replace('k', '') + 'K');
+  } else if (platform === 'instagram') {
+    args.push('-f', 'best');
+    args.push('--merge-output-format', outputFormat || 'mp4');
+    if (bitrate) args.push('--postprocessor-args', `ffmpeg:-b:v ${bitrate}`);
   } else {
     const h = quality && quality !== 'best' ? quality.replace('p', '') : null;
     args.push('-f', h ? `bestvideo[height<=${h}]+bestaudio/best[height<=${h}]/best` : 'bestvideo+bestaudio/best');
@@ -282,7 +301,19 @@ function runConvert(job, callbacks = {}) {
 }
 
 function isYouTubeUrl(str) {
-  return /^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.be)\/.+/i.test((str || '').trim());
+  return urls.isYouTubeUrl(str);
+}
+
+function isSupportedMediaUrl(str) {
+  return urls.isSupportedMediaUrl(str);
+}
+
+function getMediaPlatform(str) {
+  return urls.getMediaPlatform(str);
+}
+
+function extractMediaUrls(text) {
+  return urls.extractMediaUrls(text);
 }
 
 function parseDeepLink(raw) {
@@ -343,6 +374,10 @@ module.exports = {
   runDownload,
   runConvert,
   isYouTubeUrl,
+  isSupportedMediaUrl,
+  getMediaPlatform,
+  extractMediaUrls,
+  getInstagramContentKind: urls.getInstagramContentKind,
   parseDeepLink,
   findDeepLinkInArgv,
 };

package/lib/urls.js

@@ -0,0 +1,67 @@
+'use strict';
+
+const YOUTUBE_RE = /^(https?:\/\/)?(www\.)?(youtube\.com\/(watch(\?.*)?|shorts\/|playlist\?|embed\/|live\/)|youtu\.be\/|music\.youtube\.com\/)/i;
+const INSTAGRAM_RE = /^(https?:\/\/)?(www\.)?instagram\.com\/(p\/|reel\/|reels\/|tv\/|stories\/)/i;
+const INSTAGRAM_ANY_RE = /^(https?:\/\/)?(www\.)?instagram\.com\//i;
+
+function normalizeUrl(str) {
+  return (str || '').trim().replace(/[)\]},.;]+$/g, '');
+}
+
+function getMediaPlatform(url) {
+  const u = normalizeUrl(url);
+  if (!u) return null;
+  if (YOUTUBE_RE.test(u) || /^(https?:\/\/)?(www\.)?(youtube\.com|youtu\.be)\/.+/i.test(u)) {
+    return 'youtube';
+  }
+  if (INSTAGRAM_ANY_RE.test(u) || /^(https?:\/\/)?(www\.)?instagr\.am\//i.test(u)) {
+    return 'instagram';
+  }
+  return null;
+}
+
+function isSupportedMediaUrl(url) {
+  return !!getMediaPlatform(url);
+}
+
+function isYouTubeUrl(url) {
+  return getMediaPlatform(url) === 'youtube';
+}
+
+function isInstagramUrl(url) {
+  return getMediaPlatform(url) === 'instagram';
+}
+
+function getInstagramContentKind(url) {
+  const u = normalizeUrl(url).toLowerCase();
+  if (u.includes('/stories/')) return 'story';
+  if (u.includes('/reel/') || u.includes('/reels/')) return 'reel';
+  if (u.includes('/p/') || u.includes('/tv/')) return 'post';
+  return 'post';
+}
+
+function extractMediaUrls(text) {
+  const found = new Set();
+  const raw = text || '';
+  const re = /https?:\/\/[^\s<>"']+/gi;
+  let m;
+  while ((m = re.exec(raw)) !== null) {
+    const cleaned = normalizeUrl(m[0]);
+    if (isSupportedMediaUrl(cleaned)) found.add(cleaned);
+  }
+  raw.split(/\s+/).filter(Boolean).forEach(part => {
+    const cleaned = normalizeUrl(part);
+    if (isSupportedMediaUrl(cleaned)) found.add(cleaned);
+  });
+  return [...found];
+}
+
+module.exports = {
+  normalizeUrl,
+  getMediaPlatform,
+  isSupportedMediaUrl,
+  isYouTubeUrl,
+  isInstagramUrl,
+  getInstagramContentKind,
+  extractMediaUrls,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wavesconv",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "CLI: pobieranie YouTube (yt-dlp) i konwersja mediów (ffmpeg) — WavesConverter",
   "main": "cli.js",
   "bin": {