update again

metadata.user.js

@@ -1,8 +1,8 @@
 // ==UserScript==
 // @name         M3U8 HLS Downloader
 // @namespace    http://tampermonkey.net/
-// @version      1.0.4
+// @version      1.0.8
-// @description  자동 탐지 및 다운로드: HLS(m3u8) 스트림의 세그먼트를 병합하여 단일 파일로 저장
+// @description  자동 탐지 및 다운로드: HLS(m3u8) 스트림의 세그먼트를 병합하여 단일 파일로 저장. 활성화된 동안 모든 트래픽을 모니터링하고 접근하기 때문에, 사용하지 않을때는 비활성화 필요.
 // @author       kyush
 // @match        *://*/*
 // @grant        GM_xmlhttpRequest

package.json

@@ -1,6 +1,6 @@
 {
   "name": "m3u8-monkey-script",
-  "version": "1.0.4",
+  "version": "1.0.8",
   "description": "",
   "main": "index.js",
   "scripts": {

src/index.ts

@@ -1,5 +1,5 @@
 import { log } from './logger';
-import { normalizeReferer } from './utils/uri';
+import { normalizeReferer, resolveUri } from './utils/uri';
 import { interceptXHR } from './detection/xhr-intercept';
 import { interceptFetch } from './detection/fetch-intercept';
 import { monitorDOM } from './detection/dom-monitor';
@@ -252,13 +252,16 @@ async function downloadVttStream(url: string, entry: { url: string; type: 'vtt';
 }
 
 function onStreamDetected(url: string, headers?: Record<string, string>): void {
-  if (detectedStreams.has(url)) return;
+  const base = headers?.Referer || location.href;
+  const resolvedUrl = resolveUri(base, url);
 
-  const type = isVttUrl(url) ? 'vtt' : 'm3u8';
+  if (detectedStreams.has(resolvedUrl)) return;
-  log.info(`onStreamDetected: ${url} type=${type} headers=${JSON.stringify(headers)}`);
-  detectedStreams.set(url, { url, type, headers });
 
-  notifyTopFrame(url, headers);
+  const type = isVttUrl(resolvedUrl) ? 'vtt' : 'm3u8';
+  log.info(`onStreamDetected: ${resolvedUrl} type=${type} headers=${JSON.stringify(headers)}`);
+  detectedStreams.set(resolvedUrl, { url: resolvedUrl, type, headers });
+
+  notifyTopFrame(resolvedUrl, headers);
 
   if (isTopFrame() && !panel && type === 'm3u8') {
     panel = createPanel();
@@ -275,20 +278,20 @@ function onStreamDetected(url: string, headers?: Record<string, string>): void {
   }
 
   if (isTopFrame() && panel) {
-    addStreamToUI(url);
+    addStreamToUI(resolvedUrl);
   }
 
-  if (isTopFrame() && type === 'm3u8') {
+  if (isTopFrame() && type === 'm3u8' && !detectedStreams.get(resolvedUrl)?.parsed) {
-    parseM3U8(url, headers?.Referer, headers?.Origin).then(parsed => {
+    parseM3U8(resolvedUrl, headers?.Referer, headers?.Origin, false).then(parsed => {
-      detectedStreams.get(url)!.parsed = parsed;
+      detectedStreams.get(resolvedUrl)!.parsed = parsed;
       if (panel) {
-        addStreamToUI(url, parsed);
+        addStreamToUI(resolvedUrl, parsed);
       }
     }).catch(e => {
-      log.error(`onStreamDetected: pre-parse failed for ${url}: ${e}`);
+      log.error(`onStreamDetected: pre-parse failed for ${resolvedUrl}: ${e}`);
     });
   } else if (!isTopFrame() && type === 'm3u8') {
-    log.info(`onStreamDetected: iframe detected ${url}, skipping parse (top frame will handle)`);
+    log.info(`onStreamDetected: iframe detected ${resolvedUrl}, skipping parse (top frame will handle)`);
   }
 }
 

src/logger.ts

@@ -1,12 +1,24 @@
 export const log = (() => {
-  let targetConsole: Console;
   let prefix: string;
 
-  try {
+  // Collect all reachable consoles: page, unsafeWindow, top, parent, native
-    const uW = (typeof unsafeWindow !== 'undefined' ? unsafeWindow : null) as any;
+  const consoles: Console[] = [];
-    targetConsole = uW && uW.console ? uW.console : console;
+  const seen = new Set<any>();
-  } catch {
+
-    targetConsole = console;
+  function addConsole(c: any) {
+    if (c && c.log && consoles.length < 5 && !seen.has(c)) {
+      seen.add(c);
+      consoles.push(c);
+    }
+  }
+
+  try { addConsole(console); } catch { /* ignore */ }
+  try { addConsole((typeof unsafeWindow !== 'undefined' ? unsafeWindow : null)?.console); } catch { /* ignore */ }
+  try { addConsole(window.top?.console); } catch { /* ignore */ }
+  try { addConsole(window.parent?.console); } catch { /* ignore */ }
+
+  if (consoles.length === 0) {
+    try { addConsole(console); } catch { /* ignore */ }
   }
 
   try {
@@ -16,9 +28,24 @@ export const log = (() => {
     prefix = '[M3U8-DL]';
   }
 
+  function formatMsg(level: string, ...args: unknown[]): string {
+    return `${prefix} [${level}] ${args.map(a => typeof a === 'object' ? JSON.stringify(a) : String(a)).join(' ')}`;
+  }
+
+  function teeLog(level: string, method: string, ...args: unknown[]) {
+    const msg = formatMsg(level, ...args);
+    for (const c of consoles) {
+      try {
+        if (c[method]) {
+          (c[method] as any)(msg);
+        }
+      } catch { /* console may be broken */ }
+    }
+  }
+
   return {
-    info: (...args: unknown[]) => targetConsole.log(`${prefix} [INFO]`, ...args),
+    info: (...args: unknown[]) => teeLog('INFO', 'log', ...args),
-    warn: (...args: unknown[]) => targetConsole.warn(`${prefix} [WARN]`, ...args),
+    warn: (...args: unknown[]) => teeLog('WARN', 'warn', ...args),
-    error: (...args: unknown[]) => targetConsole.error(`${prefix} [ERROR]`, ...args),
+    error: (...args: unknown[]) => teeLog('ERROR', 'error', ...args),
   };
 })();

src/parser/m3u8-parse.ts

@@ -102,7 +102,7 @@ export async function parseM3U8(
   }
 
   const segments = manifest.segments || [];
-  const keyCache = new Map<string, Uint8Array>();
+  const keyCache = new Map<string, Uint8Array | undefined>();
   const resolvedSegments: SegmentInfo[] = [];
   const seen = new Set<string>();
 
@@ -122,13 +122,16 @@ export async function parseM3U8(
 
       let keyBytes: Uint8Array | null = null;
       if (fetchKeys) {
-        keyBytes = keyCache.get(keyUri);
+        const cached = keyCache.get(keyUri);
-        if (!keyBytes) {
+        if (cached !== undefined) {
+          keyBytes = cached;
+        } else {
           try {
             keyBytes = await fetchKey(keyUri, referer, origin);
             keyCache.set(keyUri, keyBytes);
           } catch (e) {
-            log.error(`parseM3U8: failed to fetch key ${keyUri}: ${e}`);
+            log.warn(`parseM3U8: failed to fetch key ${keyUri}: ${e}`);
+            keyCache.set(keyUri, undefined);
           }
         }
       }

src/utils/filename.ts

@@ -28,7 +28,7 @@ export function guessFilename(url: string, mime?: string): string {
 function extractTitleParts(): { name: string; volume: string } | null {
   try {
     const title = document.title || '';
-    const match = title.match(/^(.+?)\s+😜\s+(\d+)\s+-\s+Anime\s+-\s+Linkkf/);
+    const match = title.match(/^(.+?)\s+😜\s+(\d+)\s+-\s+Ani\S+\s+-\s+Linkkf/);
     if (match) {
       return { name: match[1].trim(), volume: match[2].trim() };
     }