internal-hls: correctly handle URL concatenation of all types (#560)

imputnet · Jun 8, 2024 · 04d6694 · 04d6694
1 parent f3056c6
commit 04d6694
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/modules/stream/internal-hls.js b/src/modules/stream/internal-hls.js
@@ -1,16 +1,27 @@
 import { createInternalStream } from './manage.js';
 import HLS from 'hls-parser';
-import path from "node:path";
+
+function getURL(url) {
+    try {
+        return new URL(url);
+    } catch {
+        return null;
+    }
+}
 
 function transformObject(streamInfo, hlsObject) {
     if (hlsObject === undefined) {
         return (object) => transformObject(streamInfo, object);
     }
 
-    const fullUrl = hlsObject.uri.startsWith("/")
-        ? new URL(hlsObject.uri, streamInfo.url).toString()
-        : new URL(path.join(streamInfo.url, "/../", hlsObject.uri)).toString();
-    hlsObject.uri = createInternalStream(fullUrl, streamInfo);
+    let fullUrl;
+    if (getURL(hlsObject.uri)) {
+        fullUrl = hlsObject.uri;
+    } else {
+        fullUrl = new URL(hlsObject.uri, streamInfo.url);
+    }
+
+    hlsObject.uri = createInternalStream(fullUrl.toString(), streamInfo);
 
     return hlsObject;
 }