Skip to content

fix(proxy): propagate origin status code and handle 304 correctly #2197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
K1ngfish3r merged 12 commits into from
May 19, 2026
Merged

fix(proxy): propagate origin status code and handle 304 correctly #2197

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b820c8b
fix(novelbuddy): fix watermark regex and bump version to 2.1.2
7ui77 May 17, 2026
4fa119d
fix(novelbuddy): fix watermark regex, remove chapter api fetch and bu…
7ui77 May 17, 2026
1f18fcd
fix(proxy): propagate origin status code and handle 304 Not Modified …
7ui77 May 17, 2026
0c01a0d
Add API call for fetching manga chapters
7ui77 May 17, 2026
b7d6413
revert(novelbuddy): revert novelbuddy to version 2.1.1 and simple wat…
7ui77 May 17, 2026
c47f58d
fix(proxy): improve redirect handling, status propagation, and 304 ha…
7ui77 May 18, 2026
7007798
Merge branch 'master' into fix-proxy-status-propagation
7ui77 May 18, 2026
4486f56
Merge branch 'master' into fix-proxy-status-propagation
7ui77 May 18, 2026
a24e637
fix: type errors for buffer and redact sensitive logs
7ui77 May 18, 2026
305a42c
Merge branch 'master' into fix-proxy-status-propagation
7ui77 May 18, 2026
b413708
fix: replace any with strictly typed separate variables
7ui77 May 18, 2026
facb93a
chore(proxy): revert log redaction and run prettier
7ui77 May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 87 additions & 112 deletions proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ const proxyHandlerMiddle: Connect.NextHandleFunction = (req, res) => {
res.setHeader('Access-Control-Allow-Origin', settings.CLIENT_HOST);
res.setHeader('Access-Control-Allow-Credentials', 'true');
req.headers.referer = rawUrl;

if (req.method === 'OPTIONS') {
res.statusCode = 200;
res.end();
Expand All @@ -90,21 +91,17 @@ const proxyHandlerMiddle: Connect.NextHandleFunction = (req, res) => {
}
}
req.headers['sec-fetch-mode'] = 'cors';
if (settings.cookies) {
req.headers['cookie'] = settings.cookies;
}
if (!settings.useUserAgent) {
delete req.headers['user-agent'];
}
if (settings.cookies) req.headers['cookie'] = settings.cookies;
if (!settings.useUserAgent) delete req.headers['user-agent'];
req.headers.host = _url.host;
req.url = _url.toString();
res.statusCode = 200;
proxyRequest(req, res);
} catch (err) {
console.log('\x1b[31m', '----------ERRROR----------');
console.error(err);
console.log('\x1b[31m', '----------ERRROR----------');
if (!res.closed) {
res.statusCode = 500;
res.end();
}
}
Expand All @@ -123,17 +120,14 @@ const proxyRequest: Connect.SimpleHandleFunction = (req, res) => {
console.log('\t', '\x1b[32m', name + ':', '\x1b[37m', value);
});
console.log('\x1b[36m', '----------------');

if (settings.fetchMode === FetchMode.CURL) {
//i mean if it works it works i guess, better than nothing
let curl = `curl '${_url.href}'`;
if (settings.useUserAgent) {
let curl = `curl -L '${_url.href}'`;
if (settings.useUserAgent)
curl += ` -H 'User-Agent: ${req.headers['user-agent']}'`;
}
if (settings.cookies) curl += ` -H 'Cookie: ${settings.cookies}'`;
if (req.headers.origin2) curl += ` -H 'Origin: ${req.headers.origin2}'`;

console.log('Running curl command:', curl);

const isWindows = process.platform === 'win32';
const options = isWindows
? {
Expand All @@ -143,37 +137,27 @@ const proxyRequest: Connect.SimpleHandleFunction = (req, res) => {
}
: {};

exec(curl, options, (error, stdout, stderr) => {
exec(curl, options, (error, stdout) => {
if (error) {
console.error(`exec error: ${error}`);
res.statusCode = 500;
res.write(`exec error: ${error}`);
res.end();
return;
}
if (stderr) {
console.error(`stderr: ${stderr}`);
}
res.statusCode = 200;
res.write(stdout);
res.end();
});
} else if (settings.fetchMode === FetchMode.NODE_FETCH) {
const headers = new Headers();
if (settings.useUserAgent) {
if (settings.useUserAgent)
headers.append('user-agent', req.headers['user-agent'] as string);
}
if (settings.cookies) {
headers.append('cookie', settings.cookies);
}
if (req.headers.origin2) {
if (settings.cookies) headers.append('cookie', settings.cookies);
if (req.headers.origin2)
headers.append('origin', req.headers.origin2 as string);
}
fetch(_url.href, {
headers: headers,
})
.then(async res2 => [res2, await res2.text()] as const)
.then(([res2, text]) => {

fetch(_url.href, { headers })
.then(async res2 => {
res.statusCode = res2.status;
res2.headers.forEach((val, key) => {
if (
Expand All @@ -184,7 +168,7 @@ const proxyRequest: Connect.SimpleHandleFunction = (req, res) => {
res.setHeader(key, val);
}
});
res.write(text);
res.write(await res2.text());
res.end();
})
.catch(err => {
Expand All @@ -196,13 +180,9 @@ const proxyRequest: Connect.SimpleHandleFunction = (req, res) => {
proxy.web(
req,
res,
{
target: _url.origin,
selfHandleResponse: true,
followRedirects: true,
},
{ target: _url.origin, selfHandleResponse: true, followRedirects: true },
err => {
console.error(err);
console.error('Proxy target error:', err);
res.statusCode = 500;
res.end();
},
Expand All @@ -211,94 +191,89 @@ const proxyRequest: Connect.SimpleHandleFunction = (req, res) => {
};

proxy.on('proxyRes', function (proxyRes, req, res) {
const statusCode = proxyRes.statusCode;
// Redirect
if (
statusCode === 301 ||
statusCode === 302 ||
statusCode === 303 ||
statusCode === 307 ||
statusCode === 308
) {
req.method = 'GET';
req.headers['content-length'] = '0';
delete req.headers['content-type'];
// Remove all listeners (=reset events to initial state)
req.removeAllListeners();
const statusCode = proxyRes.statusCode || 200;

// Initiate a new proxy request.
proxyRequest(req, res);
return false;
}
// Redirect handling
if ([301, 302, 303, 307, 308].includes(statusCode)) {
const location = proxyRes.headers['location'];
if (location) {
try {
const _url = new URL(req.url || '');
const redirectUrl = new URL(location, _url.href);
req.url = redirectUrl.toString();

const contentEncoding = proxyRes.headers['content-encoding'];
const isBrotli =
contentEncoding &&
(Array.isArray(contentEncoding)
? contentEncoding.some(enc => enc.includes('br'))
: contentEncoding.includes('br'));
// Prevent infinite loops
const reqWithRedirect = req as Connect.IncomingMessage & {
_redirectCount?: number;
};
const redirectCount = reqWithRedirect._redirectCount || 0;
if (redirectCount >= 5) {
res.statusCode = 508;
res.end('Too many redirects');
return;
}
reqWithRedirect._redirectCount = redirectCount + 1;

const isGzip =
contentEncoding &&
(Array.isArray(contentEncoding)
? contentEncoding.some(enc => enc.includes('gzip'))
: contentEncoding.includes('gzip'));
// Update method for 301/302/303 to GET as per spec
if ([301, 302, 303].includes(statusCode)) {
req.method = 'GET';
req.headers['content-length'] = '0';
delete req.headers['content-type'];
}

const isZstd =
contentEncoding &&
(Array.isArray(contentEncoding)
? contentEncoding.some(enc => enc.includes('zstd'))
: contentEncoding.includes('zstd'));
req.removeAllListeners();
proxyRequest(req, res);
return;
} catch (err) {
console.error('Redirect parsing error:', err);
}
}
}

if (isBrotli || isGzip || isZstd) {
delete proxyRes.headers['content-encoding'];
delete proxyRes.headers['content-length'];
res.statusCode = statusCode;

for (const _header in proxyRes.headers) {
if (!settings.disAllowResponseHeaders.includes(_header)) {
res.setHeader(_header, proxyRes.headers[_header] as string);
}
// Propagate headers but filter restricted ones
Object.keys(proxyRes.headers).forEach(key => {
if (
!settings.disAllowResponseHeaders.includes(key) &&
key !== 'content-encoding' &&
key !== 'content-length'
Comment on lines +239 to +240
Copy link
Copy Markdown
Collaborator

@K1ngfish3r K1ngfish3r May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason why these two keys were specified here?

Copy link
Copy Markdown
Contributor Author

@7ui77 7ui77 May 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

client is now raw data. If you keep 'content-encoding: gzip', the browser will attempt to decompress it again, causing an error.
The data size after decompression will definitely change compared to the original. If you keep the old 'content-length', the browser will either freeze—waiting to receive the full original byte count—or throw an 'Unexpected end of data' error.

) {
res.setHeader(key, proxyRes.headers[key] as string);
}
});

const chunks: Buffer[] = [];
proxyRes.on('data', chunk => chunks.push(Buffer.from(chunk)));
proxyRes.on('end', async function () {
try {
const buffer = Buffer.concat(chunks);
let decompressed;
if (statusCode === 304) {
res.end();
return;
}

if (isBrotli) {
decompressed = brotliDecompressSync(buffer);
} else if (isZstd) {
decompressed = zstdDecompressSync(buffer);
const contentEncoding = proxyRes.headers['content-encoding'] || '';
const chunks: Buffer[] = [];
proxyRes.on('data', chunk => chunks.push(Buffer.from(chunk)));
proxyRes.on('end', () => {
try {
const compressedBuffer = Buffer.concat(chunks);
if (compressedBuffer.length > 0) {
let decompressedBuffer: Buffer;
if (contentEncoding.includes('br')) {
decompressedBuffer = brotliDecompressSync(compressedBuffer);
} else if (contentEncoding.includes('gzip')) {
decompressedBuffer = gunzipSync(compressedBuffer);
} else if (contentEncoding.includes('zstd')) {
decompressedBuffer = zstdDecompressSync(compressedBuffer);
} else {
decompressed = gunzipSync(buffer);
decompressedBuffer = compressedBuffer;
}

res.write(Buffer.from(decompressed));
res.end();
} catch (err) {
console.error(err);
res.statusCode = 500;
res.end(`Error decompressing ${isBrotli ? 'Brotli' : 'GZIP'} content`);
res.write(decompressedBuffer);
}
});
} else {
for (const _header in proxyRes.headers) {
if (!settings.disAllowResponseHeaders.includes(_header)) {
res.setHeader(_header, proxyRes.headers[_header] as string);
}
}
for (const _header in settings.disAllowedRequestHeaders) {
delete proxyRes.headers[_header];
}
proxyRes.on('data', function (chunk) {
res.write(chunk);
});
proxyRes.on('end', function () {
res.end();
});
}
} catch (err) {
console.error('Decompression error:', err);
res.statusCode = 500;
res.end('Decompression error');
}
});
});

export { proxyHandlerMiddle, proxySettingMiddleware };
Loading