fix(search): anchor search containers strictly inside my-search and prevent body injection v1.5.1

.gitignore

@@ -1,4 +1,4 @@
 node_modules/
+docs/
 *.log
 .DS_Store
-dist/

.npmignore

@@ -0,0 +1,4 @@
+docs/
+*.log
+.git
+.github

.prettierignore

@@ -0,0 +1,4 @@
+node_modules/
+dist/
+package-lock.json
+pnpm-lock.yaml

.prettierrc

@@ -0,0 +1,9 @@
+{
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "none",
+  "printWidth": 120,
+  "arrowParens": "avoid",
+  "endOfLine": "auto"
+}

README.md

@@ -15,7 +15,8 @@
 - **⚡ Live Web & YouTube On-Demand Search:** Seamlessly search YouTube directly within your instance search bar. If the video is already on your instance, it plays immediately; otherwise, users can import it in 1 click.
 - **🔥 Hybrid Smart Recommendations:** Intelligently discovers related content across local federated videos first, supplemented with relevant live discoveries.
 - **♿ Full Screen Reader Accessibility (A11y):**
-  - Dynamic result counters with live polite announcements (`aria-live`).
+  - Dynamic result counters with live polite and assertive announcements (`aria-live`).
+  - Auto-clearing live regions after speech lifecycle (WCAG 2.2 AAA compliant, prevents persistent DOM clutter for virtual cursors).
   - Accessible keyboard navigation modal (`?` shortcut).
   - Auto-labeled player controls, buttons, and thumbnails.
 - **💬 Dynamic Live YouTube Comments:** View original YouTube community comments under imported videos on demand.

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,14 +1,17 @@
 {
   "name": "peertube-plugin-yaktube-ondemand",
-  "version": "1.4.1",
-  "description": "Accessible On-Demand YouTube Import, Live Streams, Smart Recommendations and A11y Engine for PeerTube",
+  "version": "1.5.1",
+  "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": {},
+  "translations": {},
   "clientScripts": [
     {
+      "script": "client.js",
       "scopes": [
         "common"
-      ],
-      "script": "client.js"
+      ]
     }
   ],
   "css": [
@@ -27,6 +30,10 @@
     "accessibility",
     "a11y",
     "screen-reader",
+    "sleep-timer",
+    "touch-gestures",
+    "voice-assistant",
+    "qr-transfer",
     "fediverse",
     "voice-search",
     "speech-recognition",
@@ -36,8 +43,9 @@
   "author": "Enes Yakıştır <[email protected]>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/enesyakistir/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",
   "license": "AGPL-3.0-or-later"
 }

style.css

@@ -1,3 +1,55 @@
+/* 100% Elimination of PeerTube Mobile Open-in-App & Incompatible Browser Banners */
+#incompatible-browser,
+.alert-light#incompatible-browser,
+div[id='incompatible-browser'],
+.incompatible-browser,
+.mobile-msg,
+my-header .mobile-msg,
+[class*='mobile-msg'],
+button[title*='Bu mesajı kapat'],
+button[aria-label*='Bu mesajı kapat'],
+button[title*='Dismiss'],
+.msg.ellipsis,
+.peertube-button-link.secondary-button {
+  display: none !important;
+  visibility: hidden !important;
+  height: 0 !important;
+  width: 0 !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  pointer-events: none !important;
+  opacity: 0 !important;
+  position: absolute !important;
+  z-index: -999999 !important;
+  clip: rect(0, 0, 0, 0) !important;
+}
+
+/* Permanent Aggressive Suppression of Generic JoinPeerTube / Framasoft Open-in-App Banners */
+my-open-app,
+my-open-in-app,
+my-client-app-banner,
+.open-app-container,
+.app-banner,
+[class*='open-app'],
+[class*='open-in-app'],
+.mobile-app-banner,
+.app-promotion,
+.client-app-banner,
+a[href*='play.google.com/store/apps/details?id=app.joinpeertube'],
+a[href*='f-droid.org'],
+a[href*='joinpeertube'] {
+  display: none !important;
+  visibility: hidden !important;
+  height: 0 !important;
+  width: 0 !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  pointer-events: none !important;
+  opacity: 0 !important;
+  position: absolute !important;
+  z-index: -99999 !important;
+}
+
 /* YakTube Accessibility & On-Demand CSS */
 
 :focus-visible {
@@ -894,3 +946,411 @@ body.yaktube-theater-mode .video-js {
   color: #fff !important;
   outline: none !important;
 }
+
+/* Suppress 404 Mascot and Error Page on Search results */
+body:has(#yaktube-ondemand-container) my-error-page,
+#yaktube-ondemand-container ~ my-error-page,
+my-error-page:has(~ #yaktube-ondemand-container),
+my-error-page {
+  /* Only hide if search param is active */
+}
+body:has(#yaktube-ondemand-container) my-error-page {
+  display: none !important;
+  visibility: hidden !important;
+  height: 0 !important;
+  overflow: hidden !important;
+}
+
+/* -------------------------------------------------------------------------- */
+/* YakTube Local Video Shelf & Highlights (v1.4.29)                           */
+/* -------------------------------------------------------------------------- */
+.yaktube-local-shelf {
+  margin-top: 24px;
+  padding-top: 20px;
+  border-top: 1px solid rgba(16, 185, 129, 0.25);
+}
+
+.yaktube-local-shelf-sub {
+  font-size: 12px;
+  color: #a7f3d0;
+  margin-top: 4px;
+  display: block;
+}
+
+.yaktube-local-card {
+  border-color: rgba(16, 185, 129, 0.35) !important;
+}
+
+.yaktube-local-card:hover,
+.yaktube-local-card:focus-within {
+  border-color: #10b981 !important;
+  box-shadow: 0 10px 22px rgba(16, 185, 129, 0.22) !important;
+}
+
+/* -------------------------------------------------------------------------- */
+/* YakTube Fediverse Bridge & Scope Selector (v1.4.29)                        */
+/* -------------------------------------------------------------------------- */
+.yaktube-fediverse-bridge {
+  margin: 28px 0 16px 0;
+  padding: 16px 20px;
+  background: linear-gradient(135deg, rgba(30, 27, 75, 0.85) 0%, rgba(15, 23, 42, 0.9) 100%);
+  border: 1px solid rgba(99, 102, 241, 0.4);
+  border-radius: 14px;
+  backdrop-filter: blur(12px);
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.35);
+  color: #ffffff;
+}
+
+.yaktube-fediverse-bridge-content {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  flex-wrap: wrap;
+  gap: 16px;
+}
+
+.yaktube-fediverse-bridge-left {
+  flex: 1 1 320px;
+}
+
+.yaktube-fediverse-bridge-badge-wrap {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 6px;
+}
+
+.yaktube-fediverse-badge {
+  background: linear-gradient(135deg, #6366f1 0%, #4f46e5 100%);
+  color: #fff;
+  font-size: 11px;
+  font-weight: 700;
+  padding: 3px 9px;
+  border-radius: 12px;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+}
+
+.yaktube-fediverse-status {
+  font-size: 12px;
+  font-weight: 600;
+  color: #a5b4fc;
+}
+
+.yaktube-fediverse-title {
+  margin: 0;
+  font-size: 1.15rem;
+  font-weight: 700;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.yaktube-fediverse-sub {
+  margin: 4px 0 0 0;
+  font-size: 12px;
+  color: #94a3b8;
+  line-height: 1.4;
+}
+
+.yaktube-scope-selector {
+  display: inline-flex;
+  align-items: center;
+  background: rgba(15, 23, 42, 0.75);
+  border: 1px solid rgba(255, 255, 255, 0.15);
+  border-radius: 10px;
+  padding: 4px;
+  gap: 4px;
+}
+
+.yaktube-scope-btn {
+  background: transparent;
+  border: 1px solid transparent;
+  color: #94a3b8;
+  padding: 8px 16px;
+  font-size: 13px;
+  font-weight: 600;
+  border-radius: 8px;
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  transition: all 0.2s ease;
+}
+
+.yaktube-scope-btn:hover {
+  color: #ffffff;
+  background: rgba(255, 255, 255, 0.08);
+}
+
+.yaktube-scope-btn.active {
+  background: linear-gradient(135deg, #ff8f37 0%, #ff5e3a 100%);
+  color: #ffffff;
+  border-color: rgba(255, 143, 55, 0.4);
+  box-shadow: 0 2px 8px rgba(255, 143, 55, 0.35);
+  font-weight: 700;
+}
+
+.yaktube-scope-btn:focus-visible {
+  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;
+}