Merge branch 'current' into improvement/hls-istream

src/modules/pageRender/page.js

@@ -594,7 +594,7 @@ export default function(obj) {
                 <div id="download-area">
                     <div id="top">
                         <div id="link-icon">${linkSVG}</div>
-                        <input id="url-input-area" class="mono" type="text" autocomplete="off" spellcheck="false" maxlength="256" autocapitalize="off" placeholder="${t('LinkInput')}" aria-label="${t('AccessibilityInputArea')}" oninput="button()">
+                        <input id="url-input-area" class="mono" type="text" autocomplete="off" data-form-type="other" spellcheck="false" maxlength="256" autocapitalize="off" placeholder="${t('LinkInput')}" aria-label="${t('AccessibilityInputArea')}" oninput="button()">
                         <button id="url-clear" onclick="clearInput()" style="display:none;">x</button>
                         <input id="download-button" class="mono dontRead" onclick="download(document.getElementById('url-input-area').value)" type="submit" value="" disabled aria-label="${t('AccessibilityDownloadButton')}">
                     </div>

src/modules/processing/services/youtube.js

@@ -61,7 +61,7 @@ export default async function(o) {
     }
 
     try {
-        info = await yt.getBasicInfo(o.id, 'WEB');
+        info = await yt.getBasicInfo(o.id, 'IOS');
     } catch(e) {
         if (e?.message === 'This video is unavailable') {
             return { error: 'ErrorCouldntFetch' };

src/modules/processing/servicesConfig.json

@@ -15,7 +15,7 @@
             "alias": "reddit videos & gifs",
             "patterns": ["r/:sub/comments/:id/:title", "user/:user/comments/:id/:title"],
             "subdomains": "*",
-            "enabled": true
+            "enabled": false
         },
         "twitter": {
             "alias": "twitter videos & voice",

src/modules/stream/internal.js

@@ -1,7 +1,7 @@
 import { request } from 'undici';
 import { Readable } from 'node:stream';
 import { assert } from 'console';
-import { getHeaders } from './shared.js';
+import { getHeaders, pipe } from './shared.js';
 import { handleHlsPlaylist, isHlsRequest } from './internal-hls.js';
 
 const CHUNK_SIZE = BigInt(8e6); // 8 MB
@@ -67,8 +67,7 @@ async function handleYoutubeStream(streamInfo, res) {
             if (headerValue) res.setHeader(headerName, headerValue);
         }
 
-        stream.pipe(res);
+        pipe(stream, res, () => res.end());
-        stream.on('error', () => res.end());
     } catch {
         res.end();
     }
@@ -101,8 +100,7 @@ export async function internalStream(streamInfo, res) {
         if (isHlsRequest(req)) {
             await handleHlsPlaylist(streamInfo, req, res);
         } else {
-            req.body.pipe(res);
+            pipe(req.body, res, () => res.end());
-            req.body.on('error', () => res.end());
         }
     } catch {
         streamInfo.controller.abort();

src/modules/stream/shared.js

@@ -29,3 +29,13 @@ export function getHeaders(service) {
     return Object.entries({ ...defaultHeaders, ...serviceHeaders[service] })
         .reduce((p, [key, val]) => ({ ...p, [key]: String(val) }), {})
 }
+
+export function pipe(from, to, done) {
+    from.on('error', done)
+        .on('close', done);
+
+    to.on('error', done)
+      .on('close', done);
+
+    from.pipe(to);
+}

src/modules/stream/types.js

@@ -6,7 +6,7 @@ import { create as contentDisposition } from "content-disposition-header";
 import { metadataManager } from "../sub/utils.js";
 import { destroyInternalStream } from "./manage.js";
 import { env, ffmpegArgs, hlsExceptions } from "../config.js";
-import { getHeaders, closeResponse } from "./shared.js";
+import { getHeaders, closeResponse, pipe } from "./shared.js";
 
 function toRawHeaders(headers) {
     return Object.entries(headers)
@@ -28,16 +28,6 @@ function killProcess(p) {
     }, 5000);
 }
 
-function pipe(from, to, done) {
-    from.on('error', done)
-        .on('close', done);
-
-    to.on('error', done)
-      .on('close', done);
-
-    from.pipe(to);
-}
-
 function getCommand(args) {
     if (!isNaN(env.processingPriority)) {
         return ['nice', ['-n', env.processingPriority.toString(), ffmpeg, ...args]]