add sample realaudio, fix ragen
This commit is contained in:
@@ -16,13 +16,58 @@ if (minisrv_config.config.ServiceVaults) {
|
||||
throw ("ERROR: No Service Vaults defined!");
|
||||
}
|
||||
|
||||
// Detect subdirectory structure of this catchall.js file and strip it from requests
|
||||
// e.g., if at /ServiceVault/wtv-music/ragen/catchall.js, extract "ragen"
|
||||
// if at /ServiceVault/wtv-music/ra/gen/catchall.js, extract "ra/gen"
|
||||
let subDirPath = '';
|
||||
const currentDir = path.dirname(__filename);
|
||||
const serviceVaultIdx = currentDir.indexOf('ServiceVault');
|
||||
console.log("DEBUG: currentDir =", currentDir, "serviceVaultIdx =", serviceVaultIdx);
|
||||
if (serviceVaultIdx !== -1) {
|
||||
const afterVault = currentDir.substring(serviceVaultIdx + 12); // 12 = length of 'ServiceVault'
|
||||
console.log("DEBUG: afterVault =", afterVault);
|
||||
const parts = afterVault.split(path.sep).filter(p => p);
|
||||
console.log("DEBUG: parts =", parts);
|
||||
if (parts.length > 1) {
|
||||
// parts[0] is the service name (e.g., 'wtv-music'), parts[1+] are the subdirs
|
||||
const subdirs = parts.slice(1);
|
||||
subDirPath = '/' + subdirs.join('/');
|
||||
}
|
||||
}
|
||||
console.log("DEBUG: Detected subDirPath =", subDirPath);
|
||||
|
||||
const url_path = request_headers.request_url.split('?')[0];
|
||||
const pathParts = url_path.split('/').filter(p => p);
|
||||
const serviceName = pathParts.length > 0 ? pathParts[0] : '';
|
||||
const remainingPath = '/' + pathParts.slice(1).join('/');
|
||||
const filename = remainingPath.split('/').pop().replace('.ram', '');
|
||||
const directory = remainingPath.endsWith('/') || !filename ? remainingPath.replace(/\/$/, '') : remainingPath.substring(0, remainingPath.lastIndexOf('/'));
|
||||
let remainingPath = '/' + pathParts.slice(1).join('/');
|
||||
const hadTrailingSlash = request_headers.request_url.endsWith('/');
|
||||
|
||||
console.log("DEBUG: Before stripping - subDirPath =", subDirPath, "remainingPath =", remainingPath);
|
||||
|
||||
let strippedSubDir = ''; // Store what was stripped for link rebuilding
|
||||
// Strip the subdirectory structure from the request path
|
||||
if (subDirPath) {
|
||||
if (remainingPath.startsWith(subDirPath + '/')) {
|
||||
// Has something after the subdirectory, e.g., /ragen/classicrom
|
||||
strippedSubDir = subDirPath;
|
||||
remainingPath = remainingPath.substring(subDirPath.length);
|
||||
} else if (remainingPath === subDirPath || remainingPath === subDirPath + '/') {
|
||||
// Just the subdirectory itself, e.g., /ragen or /ragen/
|
||||
strippedSubDir = subDirPath;
|
||||
remainingPath = '/';
|
||||
}
|
||||
}
|
||||
|
||||
console.log("DEBUG: After stripping - remainingPath =", remainingPath, "strippedSubDir =", strippedSubDir);
|
||||
|
||||
// Restore trailing slash if original URL had one
|
||||
if (hadTrailingSlash && !remainingPath.endsWith('/')) {
|
||||
remainingPath += '/';
|
||||
}
|
||||
|
||||
const filename = remainingPath.endsWith('/') ? '' : remainingPath.split('/').pop().replace('.ram', '');
|
||||
const directory = remainingPath.endsWith('/') ? remainingPath.replace(/\/$/, '') : remainingPath.substring(0, remainingPath.lastIndexOf('/'));
|
||||
console.log("DEBUG: Request for service", serviceName, "with filename", filename, "and directory", directory, "remainingPath", remainingPath);
|
||||
|
||||
let fileFound = false;
|
||||
const extensions = ['.ra', '.rm'];
|
||||
@@ -43,6 +88,8 @@ if (!filename || (request_headers.request_url.endsWith('/') && minisrv_config.se
|
||||
if (fs.statSync(fullPath).isFile() && (file.endsWith('.ra') || file.endsWith('.rm'))) {
|
||||
const baseFileName = file.substring(0, file.lastIndexOf('.'));
|
||||
allFiles.push(baseFileName + '.ram');
|
||||
} else if (fs.statSync(fullPath).isDirectory()) {
|
||||
allFiles.push(file + '/');
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -51,7 +98,16 @@ if (!filename || (request_headers.request_url.endsWith('/') && minisrv_config.se
|
||||
if (allFiles.length > 0) {
|
||||
headers = `200 OK
|
||||
Content-type: text/html`;
|
||||
data = `<html><body><h1>RealAudio Files on this minisrv</h1><ul>${allFiles.map(f => `<li><a href="${f}">${f}</a></li>`).join('')}</ul></body></html>`;
|
||||
data = `<html>
|
||||
<body bgcolor="#110e1f" text="#44a1cc" link="36d5ff" vlink="36d5ff" vspace=0>
|
||||
<display nosave nosend>
|
||||
<title>RealAudio Files on this Service</title>
|
||||
<sidebar width=20%>
|
||||
<img src="wtv-tricks:/images/Realaudio_bg.gif">
|
||||
</sidebar>
|
||||
<br>
|
||||
<br>
|
||||
<h1>RealAudio Files on this Service</h1><ul>${(directory === "") ? "" : `<li><a href="../">../</a></li>\n`}${allFiles.map(f => `<li><a href="${(directory === "") ? f : `${strippedSubDir}${directory}/${f}`}">${f}</a></li>`).join("\n")}</ul></body></html>`;
|
||||
} else {
|
||||
headers = `404 Not Found
|
||||
Content-type: text/html`;
|
||||
@@ -61,7 +117,7 @@ Content-type: text/html`;
|
||||
// Original file search logic
|
||||
for (const pnmVault of pnmVaults) {
|
||||
for (const ext of extensions) {
|
||||
const filePath = path.join(pnmVault, filename + ext);
|
||||
const filePath = path.join(pnmVault, directory, filename + ext);
|
||||
console.log("DEBUG: Checking for file", filePath);
|
||||
if (fs.existsSync(filePath)) {
|
||||
fileFound = true;
|
||||
@@ -76,8 +132,11 @@ Content-type: text/html`;
|
||||
headers = `404 Not Found
|
||||
Content-type: text/html`;
|
||||
} else {
|
||||
const filePath = path.join(directory || '/', filename + path.extname(resolvedPath));
|
||||
const pnmURL = `pnm://${minisrv_config.config.service_ip}:${minisrv_config.services['pnm'].port}${filePath.replace(/\\/g, '/')}`;
|
||||
console.log("DEBUG: File found at", resolvedPath, "serving as", pnmURL);
|
||||
headers = `200 OK
|
||||
Content-type: audio/x-pn-realaudio`
|
||||
data = `pnm://${minisrv_config.config.service_ip}:${minisrv_config.services['pnm'].port}/${filename + path.extname(resolvedPath)}`;
|
||||
data = pnmURL;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user