From 0ce11b1ef603676d600cabf03b5d47f55b8fb11c Mon Sep 17 00:00:00 2001 From: bourgeoa Date: Tue, 11 Feb 2025 23:30:20 +0100 Subject: [PATCH 1/3] replace res.set() --- lib/handlers/get.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/handlers/get.js b/lib/handlers/get.js index 3bc7fbfb..1b73bcf1 100644 --- a/lib/handlers/get.js +++ b/lib/handlers/get.js @@ -101,7 +101,7 @@ async function handler (req, res, next) { RDFs.includes(contentType) && !isHtmlResource && !ldp.suppressDataBrowser) if (useDataBrowser) { - res.set('Content-Type', 'text/html') + res.setHeader('Content-Type', 'text/html') const defaultDataBrowser = require.resolve('mashlib/dist/databrowser.html') const dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath debug(' sending data browser file: ' + dataBrowserPath) @@ -118,6 +118,7 @@ async function handler (req, res, next) { let headers = { 'Content-Type': contentType } + let statusCode = 200 if (contentRange) { headers = { ...headers, @@ -125,16 +126,17 @@ async function handler (req, res, next) { 'Accept-Ranges': 'bytes', 'Content-Length': chunksize } - res.statusCode = 206 + statusCode = 206 } - if (prep & isRdf(contentType) && !res.sendEvents({ + if (prep && isRdf(contentType) && !res.sendEvents({ config: { prep: prepConfig }, body: stream, isBodyStream: true, headers })) return - res.set(headers) + + res.writeHead(statusCode, headers) return stream.pipe(res) } From edd5a52a6aff641e48b13049cc3fe500d5b30f7a Mon Sep 17 00:00:00 2001 From: bourgeoa Date: Wed, 12 Feb 2025 12:03:11 +0100 Subject: [PATCH 2/3] add res.statusCode for prep --- lib/handlers/get.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/handlers/get.js b/lib/handlers/get.js index 1b73bcf1..311c7735 100644 --- a/lib/handlers/get.js +++ b/lib/handlers/get.js @@ -129,6 +129,8 @@ async function handler (req, res, next) { statusCode = 206 } + // prep use res status + res.statusCode = statusCode if (prep && isRdf(contentType) && !res.sendEvents({ config: { prep: prepConfig }, body: stream, @@ -136,7 +138,7 @@ async function handler (req, res, next) { headers })) return - res.writeHead(statusCode, headers) + res.writeHead(statusCode, headers) // res.set sneds 'charset' return stream.pipe(res) } From 887a94e97478574be8e5d58a7671a6d1ac381094 Mon Sep 17 00:00:00 2001 From: Rahul Gupta Date: Wed, 12 Feb 2025 19:59:09 +0530 Subject: [PATCH 3/3] Clean up status code Clean up status code for 206 case. --- lib/handlers/get.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/handlers/get.js b/lib/handlers/get.js index 311c7735..a108bcc6 100644 --- a/lib/handlers/get.js +++ b/lib/handlers/get.js @@ -118,7 +118,7 @@ async function handler (req, res, next) { let headers = { 'Content-Type': contentType } - let statusCode = 200 + if (contentRange) { headers = { ...headers, @@ -126,11 +126,9 @@ async function handler (req, res, next) { 'Accept-Ranges': 'bytes', 'Content-Length': chunksize } - statusCode = 206 + res.status(206) } - // prep use res status - res.statusCode = statusCode if (prep && isRdf(contentType) && !res.sendEvents({ config: { prep: prepConfig }, body: stream, @@ -138,7 +136,7 @@ async function handler (req, res, next) { headers })) return - res.writeHead(statusCode, headers) // res.set sneds 'charset' + res.writeHead(res.statusCode, headers) // res.set sneds 'charset' return stream.pipe(res) }