web & api: rename stream to tunnel

- updated the endpoint to /tunnel
- updated status to tunnel
- fixed one incorrectly named error in web
This commit is contained in:
wukko
2024-09-05 00:26:48 +06:00
parent 49460bd16d
commit fff1c6c7a6
13 changed files with 99 additions and 99 deletions

View File

@ -141,7 +141,7 @@ export const runAPI = (express, app, __dirname) => {
});
app.post('/', apiLimiter);
app.use('/stream', apiLimiterStream);
app.use('/tunnel', apiLimiterStream);
app.use('/', express.json({ limit: 1024 }));
app.use('/', (err, _, res, next) => {
@ -225,7 +225,7 @@ export const runAPI = (express, app, __dirname) => {
}
})
app.get('/stream', (req, res) => {
app.get('/tunnel', (req, res) => {
const id = String(req.query.id);
const exp = String(req.query.exp);
const sig = String(req.query.sig);
@ -256,7 +256,7 @@ export const runAPI = (express, app, __dirname) => {
return stream(res, streamInfo);
})
app.get('/istream', (req, res) => {
app.get('/itunnel', (req, res) => {
if (!req.ip.endsWith('127.0.0.1')) {
return res.sendStatus(403);
}

View File

@ -38,7 +38,7 @@ export async function runTest(url, params, expect) {
throw error.join('\n');
}
if (result.body.status === 'stream') {
if (result.body.status === 'tunnel') {
// TODO: stream testing
}
}

View File

@ -6,7 +6,7 @@ import { createStream } from "../stream/manage.js";
export default function({ r, host, audioFormat, isAudioOnly, isAudioMuted, disableMetadata, filenameStyle, twitterGif, requestIP, audioBitrate, alwaysProxy }) {
let action,
responseType = "stream",
responseType = "tunnel",
defaultParams = {
u: r.urls,
headers: r.headers,
@ -197,7 +197,7 @@ export default function({ r, host, audioFormat, isAudioOnly, isAudioMuted, disab
}
if (alwaysProxy && responseType === "redirect") {
responseType = "stream";
responseType = "tunnel";
params.type = "proxy";
}

View File

@ -41,7 +41,7 @@ export function createResponse(responseType, responseData) {
}
break;
case "stream":
case "tunnel":
response = {
url: createStream(responseData),
}

View File

@ -118,7 +118,7 @@ export default async function(obj) {
}
return {
typeId: "stream",
typeId: "tunnel",
type: "merge",
urls: [video, audioFileLink],
audioFilename: `reddit_${id}_audio`,

View File

@ -53,7 +53,7 @@ export function createStream(obj) {
encryptStream(streamData, iv, secret)
)
let streamLink = new URL('/stream', env.apiURL);
let streamLink = new URL('/tunnel', env.apiURL);
const params = {
'id': streamID,
@ -103,7 +103,7 @@ export function createInternalStream(url, obj = {}) {
dispatcher
};
let streamLink = new URL('/istream', `http://127.0.0.1:${env.apiPort}`);
let streamLink = new URL('/itunnel', `http://127.0.0.1:${env.apiPort}`);
streamLink.searchParams.set('id', streamID);
const cleanup = () => {

View File

@ -62,7 +62,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -74,7 +74,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -86,7 +86,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -98,7 +98,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -168,7 +168,7 @@
"canFail": true,
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -203,7 +203,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -215,7 +215,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -226,7 +226,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -238,7 +238,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -250,7 +250,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -259,7 +259,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -268,7 +268,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -277,7 +277,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -291,7 +291,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -303,7 +303,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -315,7 +315,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -327,7 +327,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -340,7 +340,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -353,7 +353,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -367,7 +367,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -381,7 +381,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -393,7 +393,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -404,7 +404,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -416,7 +416,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -436,7 +436,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -448,7 +448,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -457,7 +457,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -477,7 +477,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -488,7 +488,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -499,7 +499,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -508,7 +508,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -519,7 +519,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -528,7 +528,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -548,7 +548,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -586,7 +586,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -597,7 +597,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -606,7 +606,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -617,7 +617,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -626,7 +626,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -635,7 +635,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -673,7 +673,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -684,7 +684,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -759,7 +759,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -770,7 +770,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -781,7 +781,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -808,7 +808,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -857,7 +857,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -868,7 +868,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -953,7 +953,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -964,7 +964,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -986,7 +986,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -997,7 +997,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1082,7 +1082,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1093,7 +1093,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1113,7 +1113,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1124,7 +1124,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1135,7 +1135,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -1146,7 +1146,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1157,7 +1157,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1175,7 +1175,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1185,7 +1185,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1194,7 +1194,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1205,7 +1205,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1216,7 +1216,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1225,7 +1225,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -1236,7 +1236,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -1247,7 +1247,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1256,7 +1256,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1265,7 +1265,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
}
],
@ -1316,7 +1316,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1405,7 +1405,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1414,7 +1414,7 @@
"params": {},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1425,7 +1425,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{
@ -1436,7 +1436,7 @@
},
"expected": {
"code": 200,
"status": "stream"
"status": "tunnel"
}
},
{