v1.5.6: Eliminate duplicate playback controls from secondary bar, rename to Video Araçları

main.js

@@ -1,10 +1,95 @@
 const { execFile } = require('child_process');
 const path = require('path');
 const http = require('http');
+const fs = require('fs');
 
 const searchCache = new Map();
 const CACHE_TTL = 30 * 60 * 1000; // 30 minutes
 
+let cachedYtDlpPath = null;
+function resolveYtDlpPath(logger) {
+  if (cachedYtDlpPath && (cachedYtDlpPath === 'yt-dlp' || fs.existsSync(cachedYtDlpPath))) {
+    return cachedYtDlpPath;
+  }
+
+  // 1. Environment variable override
+  if (process.env.YTDLP_PATH && fs.existsSync(process.env.YTDLP_PATH)) {
+    cachedYtDlpPath = process.env.YTDLP_PATH;
+    return cachedYtDlpPath;
+  }
+
+  // 2. Cross-platform candidates
+  const isWin = process.platform === 'win32';
+  const candidates = isWin
+    ? [
+        'D:\\yaktube_storage\\bin\\yt-dlp.exe',
+        'C:\\laragon\\bin\\yt-dlp.exe',
+        path.join(process.cwd(), 'bin', 'yt-dlp.exe'),
+        'yt-dlp.exe'
+      ]
+    : ['/usr/local/bin/yt-dlp', '/usr/bin/yt-dlp', '/bin/yt-dlp', path.join(process.cwd(), 'bin', 'yt-dlp'), 'yt-dlp'];
+
+  for (const candidate of candidates) {
+    try {
+      if (candidate.includes(path.sep) && fs.existsSync(candidate)) {
+        cachedYtDlpPath = candidate;
+        if (logger) logger.info(`[YakTube OnDemand] Auto-detected yt-dlp binary at: ${cachedYtDlpPath}`);
+        return cachedYtDlpPath;
+      }
+    } catch (e) {}
+  }
+
+  cachedYtDlpPath = isWin ? 'D:\\yaktube_storage\\bin\\yt-dlp.exe' : 'yt-dlp';
+  return cachedYtDlpPath;
+}
+
+let cachedChannels = null;
+let channelsExpiresAt = 0;
+
+async function getDefaultChannelId(category) {
+  // Category mapping defaults
+  const cat = String(category || '').toLowerCase();
+  if (cat.includes('tekno') || cat.includes('tech') || cat.includes('egitim')) return '3299';
+  if (cat.includes('podcast') || cat.includes('sohbet')) return '3298';
+  if (cat.includes('genel') || cat.includes('haber')) return '1';
+  if (cat.includes('muzik') || cat.includes('music')) return '1146';
+
+  if (cachedChannels && Date.now() < channelsExpiresAt) {
+    return cachedChannels.defaultId || '1146';
+  }
+
+  return new Promise(resolve => {
+    const req = http.request(
+      {
+        hostname: '127.0.0.1',
+        port: 9000,
+        path: '/api/v1/accounts/yaktube/video-channels',
+        method: 'GET',
+        headers: { Host: 'yaktube.yakhub.com.tr' }
+      },
+      res => {
+        let body = '';
+        res.on('data', c => (body += c));
+        res.on('end', () => {
+          try {
+            const data = JSON.parse(body);
+            if (data && Array.isArray(data.data) && data.data.length > 0) {
+              const musicCh = data.data.find(c => c.name && c.name.includes('muzik'));
+              const defaultId = musicCh ? String(musicCh.id) : String(data.data[0].id);
+              cachedChannels = { defaultId, list: data.data };
+              channelsExpiresAt = Date.now() + 60 * 60 * 1000;
+              return resolve(defaultId);
+            }
+          } catch (e) {}
+          resolve('1146');
+        });
+      }
+    );
+    req.on('error', () => resolve('1146'));
+    req.end();
+  });
+}
+
 function getCached(q) {
   const item = searchCache.get(q);
   if (item && Date.now() - item.time < CACHE_TTL) {
@@ -99,7 +184,7 @@ async function getAdminToken() {
 
 async function register({ getRouter, peertubeHelpers, logger }) {
   const router = getRouter();
-  const ytdlpPath = 'D:\\yaktube_storage\\bin\\yt-dlp.exe';
+  const ytdlpPath = resolveYtDlpPath(logger);
 
   router.get('/search', async (req, res) => {
     const query = (req.query.q || '').trim();
@@ -157,16 +242,17 @@ async function register({ getRouter, peertubeHelpers, logger }) {
   });
 
   router.post('/import', async (req, res) => {
-    const { targetUrl } = req.body;
+    const { targetUrl, channelId, category } = req.body;
     if (!targetUrl || (!targetUrl.includes('youtube.com') && !targetUrl.includes('youtu.be'))) {
       return res.status(400).json({ error: 'Invalid YouTube URL' });
     }
 
     try {
       const token = await getAdminToken();
+      const resolvedChannelId = channelId ? String(channelId) : await getDefaultChannelId(category);
       const postData = new URLSearchParams({
         targetUrl: targetUrl,
-        channelId: '1146', // Türkçe Müzik channel
+        channelId: resolvedChannelId,
         privacy: '1'
       }).toString();
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "peertube-plugin-yaktube-ondemand",
-  "version": "1.4.31",
+  "version": "1.5.6",
-  "description": "Accessible On-Demand YouTube Import, Live Streams, Smart Recommendations and A11y Engine for PeerTube",
+  "description": "Accessible On-Demand YouTube Import, Live Streams, Smart Recommendations, Sleep Timer, Touch Gestures, Voice Assistant & A11y Engine for PeerTube",
   "main": "main.js",
   "library": "./main.js",
   "staticDirs": {},
@@ -30,6 +30,10 @@
     "accessibility",
     "a11y",
     "screen-reader",
+    "sleep-timer",
+    "touch-gestures",
+    "voice-assistant",
+    "qr-transfer",
     "fediverse",
     "voice-search",
     "speech-recognition",
@@ -39,7 +43,7 @@
   "author": "Enes Yakıştır <[email protected]>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/yakistir98/peertube-plugin-yaktube-ondemand.git"
+    "url": "git+https://github.com/yakistir98/peertube-plugin-yaktube-ondemand.git"
   },
   "homepage": "https://yaktube.yakhub.com.tr",
   "bugs": "https://github.com/yakistir98/peertube-plugin-yaktube-ondemand/issues",

style.css

@@ -1097,3 +1097,466 @@ body:has(#yaktube-ondemand-container) my-error-page {
   outline: 2px solid #ff8f37;
   outline-offset: 2px;
 }
+
+/* -------------------------------------------------------------------------- */
+/* YAKTUBE TOUCH & MOBILE DOUBLE-TAP TO SEEK (v1.5.0)                         */
+/* -------------------------------------------------------------------------- */
+.yaktube-doubletap-overlay {
+  position: absolute !important;
+  top: 0 !important;
+  bottom: 0 !important;
+  width: 40% !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  pointer-events: none !important;
+  z-index: 9999 !important;
+  opacity: 0;
+  transition: opacity 0.25s ease-out !important;
+}
+
+.yaktube-doubletap-left {
+  left: 0 !important;
+  background: radial-gradient(circle at left center, rgba(255, 143, 55, 0.35) 0%, transparent 70%) !important;
+  border-top-left-radius: 16px;
+  border-bottom-left-radius: 16px;
+}
+
+.yaktube-doubletap-right {
+  right: 0 !important;
+  background: radial-gradient(circle at right center, rgba(255, 143, 55, 0.35) 0%, transparent 70%) !important;
+  border-top-right-radius: 16px;
+  border-bottom-right-radius: 16px;
+}
+
+.yaktube-doubletap-overlay.yaktube-ripple-active {
+  opacity: 1 !important;
+}
+
+.yaktube-ripple-content {
+  display: flex !important;
+  flex-direction: column !important;
+  align-items: center !important;
+  justify-content: center !important;
+  background: rgba(0, 0, 0, 0.75) !important;
+  border: 1px solid rgba(255, 143, 55, 0.6) !important;
+  border-radius: 50px !important;
+  padding: 12px 24px !important;
+  color: #fff !important;
+  font-size: 16px !important;
+  font-weight: 700 !important;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.6) !important;
+  transform: scale(0.85);
+  animation: yaktube-ripple-bounce 0.45s cubic-bezier(0.175, 0.885, 0.32, 1.275) forwards !important;
+}
+
+@keyframes yaktube-ripple-bounce {
+  0% {
+    transform: scale(0.7);
+    opacity: 0.5;
+  }
+  50% {
+    transform: scale(1.1);
+    opacity: 1;
+  }
+  100% {
+    transform: scale(1);
+    opacity: 1;
+  }
+}
+
+/* -------------------------------------------------------------------------- */
+/* YAKTUBE SLEEP TIMER & QR CODE MODALS (v1.5.0)                              */
+/* -------------------------------------------------------------------------- */
+.yaktube-feature-modal-backdrop {
+  position: fixed !important;
+  top: 0 !important;
+  left: 0 !important;
+  width: 100vw !important;
+  height: 100vh !important;
+  background: rgba(0, 0, 0, 0.82) !important;
+  backdrop-filter: blur(10px) !important;
+  z-index: 999999 !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  padding: 16px !important;
+  animation: yaktube-fade-in 0.2s ease-out !important;
+}
+
+.yaktube-feature-modal-card {
+  background: #18181f !important;
+  border: 1px solid rgba(255, 143, 55, 0.4) !important;
+  border-radius: 20px !important;
+  width: 100% !important;
+  max-width: 440px !important;
+  box-shadow: 0 20px 60px rgba(0, 0, 0, 0.85) !important;
+  color: #fff !important;
+  overflow: hidden !important;
+  display: flex !important;
+  flex-direction: column !important;
+  animation: yaktube-slide-up 0.25s cubic-bezier(0.16, 1, 0.3, 1) !important;
+}
+
+.yaktube-feature-modal-header {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: space-between !important;
+  padding: 18px 24px !important;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1) !important;
+  background: rgba(255, 143, 55, 0.08) !important;
+}
+
+.yaktube-feature-modal-title {
+  margin: 0 !important;
+  font-size: 18px !important;
+  font-weight: 700 !important;
+  color: #ff8f37 !important;
+  display: flex !important;
+  align-items: center !important;
+  gap: 8px !important;
+}
+
+.yaktube-feature-modal-close {
+  background: transparent !important;
+  border: none !important;
+  color: #94a3b8 !important;
+  font-size: 22px !important;
+  cursor: pointer !important;
+  padding: 4px 8px !important;
+  border-radius: 8px !important;
+  transition: all 0.2s ease !important;
+}
+
+.yaktube-feature-modal-close:hover,
+.yaktube-feature-modal-close:focus {
+  color: #fff !important;
+  background: rgba(255, 255, 255, 0.1) !important;
+  outline: 2px solid #ff8f37 !important;
+}
+
+.yaktube-feature-modal-body {
+  padding: 24px !important;
+  display: flex !important;
+  flex-direction: column !important;
+  gap: 16px !important;
+}
+
+.yaktube-timer-options {
+  display: grid !important;
+  grid-template-columns: 1fr 1fr !important;
+  gap: 10px !important;
+}
+
+.yaktube-timer-btn {
+  background: #23232c !important;
+  border: 1px solid rgba(255, 255, 255, 0.12) !important;
+  color: #f1f5f9 !important;
+  border-radius: 12px !important;
+  padding: 14px 12px !important;
+  font-size: 14px !important;
+  font-weight: 600 !important;
+  cursor: pointer !important;
+  transition: all 0.2s ease !important;
+  text-align: center !important;
+}
+
+.yaktube-timer-btn:hover,
+.yaktube-timer-btn:focus-visible {
+  background: #2d2d38 !important;
+  border-color: #ff8f37 !important;
+  color: #ff8f37 !important;
+  transform: translateY(-2px) !important;
+  outline: none !important;
+  box-shadow: 0 4px 12px rgba(255, 143, 55, 0.25) !important;
+}
+
+.yaktube-timer-btn.active {
+  background: linear-gradient(135deg, #ff8f37 0%, #ff5e3a 100%) !important;
+  color: #fff !important;
+  border-color: transparent !important;
+  font-weight: 700 !important;
+  box-shadow: 0 4px 15px rgba(255, 143, 55, 0.4) !important;
+}
+
+.yaktube-timer-badge {
+  display: inline-flex !important;
+  align-items: center !important;
+  gap: 6px !important;
+  background: rgba(255, 143, 55, 0.2) !important;
+  border: 1px solid #ff8f37 !important;
+  color: #ff8f37 !important;
+  padding: 4px 10px !important;
+  border-radius: 20px !important;
+  font-size: 12px !important;
+  font-weight: 700 !important;
+  animation: yaktube-pulse 2s infinite !important;
+}
+
+@keyframes yaktube-pulse {
+  0% {
+    transform: scale(1);
+  }
+  50% {
+    transform: scale(1.04);
+  }
+  100% {
+    transform: scale(1);
+  }
+}
+
+.yaktube-qr-wrapper {
+  display: flex !important;
+  flex-direction: column !important;
+  align-items: center !important;
+  justify-content: center !important;
+  padding: 16px !important;
+  background: #ffffff !important;
+  border-radius: 16px !important;
+  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.4) !important;
+  width: fit-content !important;
+  margin: 0 auto !important;
+}
+
+.yaktube-qr-wrapper svg {
+  display: block !important;
+  width: 190px !important;
+  height: 190px !important;
+}
+
+.yaktube-qr-desc {
+  font-size: 13px !important;
+  color: #94a3b8 !important;
+  text-align: center !important;
+  margin: 0 !important;
+  line-height: 1.5 !important;
+}
+
+.yaktube-qr-copy-btn {
+  background: linear-gradient(135deg, #ff8f37 0%, #ff5e3a 100%) !important;
+  color: #ffffff !important;
+  border: none !important;
+  border-radius: 12px !important;
+  padding: 12px 20px !important;
+  font-size: 14px !important;
+  font-weight: 700 !important;
+  cursor: pointer !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  gap: 8px !important;
+  transition: all 0.2s ease !important;
+}
+
+.yaktube-qr-copy-btn:hover,
+.yaktube-qr-copy-btn:focus-visible {
+  transform: translateY(-2px) !important;
+  box-shadow: 0 6px 20px rgba(255, 143, 55, 0.4) !important;
+  outline: none !important;
+}
+
+/* ==========================================================================
+   YAKTUBE ACCESSIBLE PLAYER & WATCH PAGE STYLES (W3C WAI-ARIA)
+   ========================================================================== */
+
+/* 1. Accessible Skip Link (Top of Page) */
+.yaktube-skip-link {
+  position: fixed !important;
+  top: -120px !important;
+  left: 16px !important;
+  background: linear-gradient(135deg, #ff8f37 0%, #ff5e3a 100%) !important;
+  color: #ffffff !important;
+  padding: 12px 22px !important;
+  border-radius: 12px !important;
+  font-weight: 800 !important;
+  font-size: 14px !important;
+  text-decoration: none !important;
+  box-shadow: 0 8px 30px rgba(255, 143, 55, 0.5) !important;
+  z-index: 999999 !important;
+  transition: top 0.2s cubic-bezier(0.16, 1, 0.3, 1) !important;
+  display: inline-flex !important;
+  align-items: center !important;
+  gap: 8px !important;
+}
+
+.yaktube-skip-link:focus,
+.yaktube-skip-link:focus-visible {
+  top: 16px !important;
+  outline: 3px solid #ffffff !important;
+  outline-offset: 3px !important;
+}
+
+/* 2. Accessible Video Player Container Focus States */
+#videojs-wrapper:focus,
+#videojs-wrapper:focus-visible,
+.video-js:focus-visible {
+  outline: 3px solid #ff8f37 !important;
+  outline-offset: 4px !important;
+  box-shadow: 0 0 25px rgba(255, 143, 55, 0.65) !important;
+  border-radius: 8px !important;
+}
+
+/* 3. Accessible Player Action Toolbar */
+.yaktube-player-action-bar {
+  display: flex !important;
+  align-items: center !important;
+  flex-wrap: wrap !important;
+  gap: 8px !important;
+  margin: 12px 0 18px 0 !important;
+  padding: 10px 16px !important;
+  background: rgba(24, 24, 32, 0.95) !important;
+  border: 1px solid rgba(255, 143, 55, 0.3) !important;
+  border-radius: 12px !important;
+  backdrop-filter: blur(10px) !important;
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.4) !important;
+  width: 100% !important;
+  box-sizing: border-box !important;
+}
+
+.yaktube-player-bar-label {
+  font-size: 13px !important;
+  font-weight: 700 !important;
+  color: #ff8f37 !important;
+  margin-right: 6px !important;
+  user-select: none !important;
+}
+
+.yaktube-player-action-btn {
+  background: rgba(255, 255, 255, 0.08) !important;
+  color: #eeeeee !important;
+  border: 1px solid rgba(255, 255, 255, 0.15) !important;
+  padding: 7px 14px !important;
+  border-radius: 8px !important;
+  font-size: 12.5px !important;
+  font-weight: 600 !important;
+  cursor: pointer !important;
+  transition: all 0.2s ease !important;
+  display: inline-flex !important;
+  align-items: center !important;
+  gap: 5px !important;
+}
+
+.yaktube-player-action-btn:hover,
+.yaktube-player-action-btn:focus-visible {
+  background: rgba(255, 143, 55, 0.25) !important;
+  border-color: #ff8f37 !important;
+  color: #ffffff !important;
+  transform: translateY(-1px) !important;
+  outline: 2px solid #ff8f37 !important;
+  outline-offset: 2px !important;
+}
+
+/* 4. Rate Buttons Distinct Separation (Like & Dislike) */
+my-video-rate .video-actions,
+my-video-rate .video-actions-rates,
+my-video-rate {
+  display: inline-flex !important;
+  align-items: center !important;
+  gap: 8px !important;
+}
+
+my-video-rate button.action-button {
+  margin-right: 6px !important;
+  border-radius: 8px !important;
+  transition: all 0.2s ease !important;
+}
+
+my-video-rate button.action-button:focus-visible {
+  outline: 2px solid #ff8f37 !important;
+  outline-offset: 2px !important;
+}
+
+/* 5. Date Toggle Button Clarity */
+my-date-toggle .date-toggle {
+  cursor: pointer !important;
+  border-radius: 6px !important;
+  padding: 2px 6px !important;
+  transition: background 0.2s ease !important;
+}
+
+my-date-toggle .date-toggle:hover,
+my-date-toggle .date-toggle:focus-visible {
+  background: rgba(255, 143, 55, 0.15) !important;
+  color: #ff8f37 !important;
+  outline: 2px solid #ff8f37 !important;
+  outline-offset: 1px !important;
+}
+
+/* 6. Video.js Native Control Bar 10s Seek Buttons (Mobile & Desktop) */
+.video-js .vjs-control-bar .yaktube-vjs-seek-btn {
+  display: inline-flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  width: 44px !important;
+  height: 100% !important;
+  min-width: 44px !important;
+  min-height: 44px !important;
+  cursor: pointer !important;
+  color: #f1f1f1 !important;
+  font-size: 13px !important;
+  font-weight: 700 !important;
+  position: relative !important;
+  user-select: none !important;
+  background: transparent !important;
+  border: none !important;
+  padding: 0 !important;
+  margin: 0 2px !important;
+  transition:
+    color 0.2s ease,
+    transform 0.15s ease !important;
+}
+
+.video-js .vjs-control-bar .yaktube-vjs-seek-btn:hover,
+.video-js .vjs-control-bar .yaktube-vjs-seek-btn:focus-visible {
+  color: #ff8f37 !important;
+  transform: scale(1.1) !important;
+  outline: 2px solid #ff8f37 !important;
+  outline-offset: -2px !important;
+}
+
+.video-js .vjs-control-bar .yaktube-vjs-seek-btn:active {
+  transform: scale(0.92) !important;
+}
+
+.yaktube-vjs-seek-icon {
+  display: inline-flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  gap: 1px !important;
+  font-size: 13px !important;
+  line-height: 1 !important;
+}
+
+.yaktube-vjs-seek-num {
+  font-size: 10px !important;
+  font-weight: 800 !important;
+  font-family:
+    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    sans-serif !important;
+  color: #ff8f37 !important;
+  margin-top: 1px !important;
+}
+
+/* 7. Mobile Watch Page & Action Bar Touch Optimizations */
+@media (max-width: 768px) {
+  .video-js .vjs-control-bar .yaktube-vjs-seek-btn {
+    width: 46px !important;
+    min-width: 46px !important;
+    font-size: 14px !important;
+  }
+  .yaktube-player-action-bar {
+    padding: 8px 10px !important;
+    gap: 6px !important;
+  }
+  .yaktube-player-action-btn {
+    padding: 9px 12px !important;
+    font-size: 12px !important;
+    flex: 1 1 calc(50% - 6px) !important;
+    justify-content: center !important;
+    min-height: 42px !important;
+  }
+}