xixu-me/xget
1
0 Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor request handling and improve Docker detection

Browse Source 
Refactored the main request handler in src/index.js for improved readability and error handling. Enhanced Docker request detection in validation.js to include additional Content-Type checks. Updated tests to increase timeouts and expand expected status codes for container registry platforms.
This commit is contained in:
xixu-me committed 2025-12-10 15:47:25 +08:00
1 parent 1c20e7af4f
commit 214e596d00
5 files changed
+204 -82
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/index.js
+182 -69
View File
@@ -38,14 +38,15 @@ import {
* @returns {Promise<Response>} The HTTP response with appropriate headers and body
*/
async function handleRequest(request, env, ctx) {
let response;
const monitor = new PerformanceMonitor();
try {
// Create config with environment variable overrides
const config = env ? createConfig(env) : CONFIG;
const url = new URL(request.url);
const isDocker = isDockerRequest(request, url);
const monitor = new PerformanceMonitor();
// Handle Docker API version check
if (isDocker && (url.pathname === '/v2/' || url.pathname === '/v2')) {
const headers = new Headers({
@@ -53,20 +54,20 @@ async function handleRequest(request, env, ctx) {
'Content-Type': 'application/json'
});
addSecurityHeaders(headers);
return new Response('{}', { status: 200, headers });
response = new Response('{}', { status: 200, headers });
}
// Redirect root path or invalid platforms to GitHub repository
if (url.pathname === '/' || url.pathname === '') {
else if (url.pathname === '/' || url.pathname === '') {
const HOME_PAGE_URL = 'https://github.com/xixu-me/Xget';
return Response.redirect(HOME_PAGE_URL, 302);
}
response = Response.redirect(HOME_PAGE_URL, 302);
} else {
const validation = validateRequest(request, url, config);
if (!validation.valid) {
return createErrorResponse(validation.error || 'Validation failed', validation.status || 400);
}
response = createErrorResponse(
validation.error || 'Validation failed',
validation.status || 400
);
} else {
// Parse platform and path
let effectivePath = url.pathname;
@@ -79,19 +80,21 @@ async function handleRequest(request, env, ctx) {
!url.pathname.startsWith('/v2/cr/') &&
url.pathname !== '/v2/auth'
) {
return createErrorResponse('container registry requests must use /cr/ prefix', 400);
}
response = createErrorResponse(
'container registry requests must use /cr/ prefix',
400
);
} else {
// Remove /v2 from the path for container registry API consistency if present
effectivePath = url.pathname.replace(/^\/v2/, '');
}
// Handle Docker authentication explicitly
// This must be done before platform detection because /v2/auth doesn't follow the
// standard /platform/path pattern - it encodes the path in the 'scope' parameter
if (isDocker && url.pathname === '/v2/auth') {
return handleDockerAuth(request, url, config);
}
if (!response) {
// Handle Docker authentication explicitly
if (isDocker && url.pathname === '/v2/auth') {
response = await handleDockerAuth(request, url, config);
} else {
// Platform detection using transform patterns
// Use pre-computed sorted platforms
const platform =
@@ -102,16 +105,14 @@ async function handleRequest(request, env, ctx) {
if (!platform || !config.PLATFORMS[platform]) {
const HOME_PAGE_URL = 'https://github.com/xixu-me/Xget';
return Response.redirect(HOME_PAGE_URL, 302);
}
response = Response.redirect(HOME_PAGE_URL, 302);
} else {
// Check if the path only contains the platform prefix without any actual resource path
const platformPath = `/${platform.replace(/-/g, '/')}`;
if (effectivePath === platformPath || effectivePath === `${platformPath}/`) {
const HOME_PAGE_URL = 'https://github.com/xixu-me/Xget';
return Response.redirect(HOME_PAGE_URL, 302);
}
response = Response.redirect(HOME_PAGE_URL, 302);
} else {
// Transform URL based on platform using unified logic
const targetPath = transformPath(effectivePath, platform);
@@ -138,8 +139,8 @@ async function handleRequest(request, env, ctx) {
// Check cache first (skip cache for Git, Git LFS, Docker, and AI inference operations)
/** @type {Cache | null} */
// @ts-ignore - Cloudflare Workers cache API
const cache = typeof caches !== 'undefined' && caches.default ? caches.default : null;
let response;
const cache =
typeof caches !== 'undefined' && caches.default ? caches.default : null;
if (cache && !isGit && !isGitLFS && !isDocker && !isAI) {
try {
@@ -148,25 +149,27 @@ async function handleRequest(request, env, ctx) {
method: 'GET',
headers: request.headers
});
response = await cache.match(cacheKey);
if (response) {
const cachedResponse = await cache.match(cacheKey);
if (cachedResponse) {
monitor.mark('cache_hit');
return response;
}
response = cachedResponse;
} else {
// If Range request missed cache, try with original request to see if we have full content cached
const rangeHeader = request.headers.get('Range');
if (rangeHeader) {
const fullContentKey = new Request(targetUrl, {
method: 'GET', // Always use GET method for cache key consistency
headers: new Headers(
[...request.headers.entries()].filter(([k]) => k.toLowerCase() !== 'range')
[...request.headers.entries()].filter(
([k]) => k.toLowerCase() !== 'range'
)
)
});
response = await cache.match(fullContentKey);
if (response) {
const fullCachedResponse = await cache.match(fullContentKey);
if (fullCachedResponse) {
monitor.mark('cache_hit_full_content');
return response;
response = fullCachedResponse;
}
}
}
} catch (cacheError) {
@@ -174,6 +177,7 @@ async function handleRequest(request, env, ctx) {
}
}
if (!response) {
/** @type {RequestInit} */
const fetchOptions = {
method: request.method,
@@ -198,7 +202,11 @@ async function handleRequest(request, env, ctx) {
// This ensures protocol compliance
for (const [key, value] of request.headers.entries()) {
// Skip headers that might cause issues with proxying
if (!['host', 'connection', 'upgrade', 'proxy-connection'].includes(key.toLowerCase())) {
if (
!['host', 'connection', 'upgrade', 'proxy-connection'].includes(
key.toLowerCase()
)
) {
requestHeaders.set(key, value);
}
}
@@ -209,7 +217,6 @@ async function handleRequest(request, env, ctx) {
if (isAI) {
configureAIHeaders(requestHeaders, request);
}
} else {
// Regular file download headers
Object.assign(fetchOptions, {
@@ -256,9 +263,15 @@ async function handleRequest(request, env, ctx) {
monitor.mark(`attempt_${attempts}`);
const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), config.TIMEOUT_SECONDS * 1000);
const timeoutId = setTimeout(
() => controller.abort(),
config.TIMEOUT_SECONDS * 1000
);
const finalFetchOptions = { ...fetchOptions, signal: controller.signal };
const finalFetchOptions = {
...fetchOptions,
signal: controller.signal
};
// Special handling for HEAD requests to ensure Content-Length header
if (request.method === 'HEAD') {
@@ -288,13 +301,20 @@ async function handleRequest(request, env, ctx) {
contentLength = rangeResponse.headers.get('Content-Length');
if (!contentLength) {
const sizeLimit = 50 * 1024 * 1024;
const contentLengthHint = rangeResponse.headers.get('Content-Length');
if (!contentLengthHint || parseInt(contentLengthHint, 10) < sizeLimit) {
const contentLengthHint =
rangeResponse.headers.get('Content-Length');
if (
!contentLengthHint ||
parseInt(contentLengthHint, 10) < sizeLimit
) {
try {
const arrayBuffer = await rangeResponse.arrayBuffer();
contentLength = arrayBuffer.byteLength.toString();
} catch (error) {
console.warn('Could not buffer response to get Content-Length:', error);
console.warn(
'Could not buffer response to get Content-Length:',
error
);
}
}
}
@@ -341,7 +361,11 @@ async function handleRequest(request, env, ctx) {
if (repoParts.length >= 1) {
let repoName = repoParts.slice(0, -2).join('/'); // Remove /manifests/tag or /blobs/sha
if (platform === 'cr-docker' && repoName && !repoName.includes('/')) {
if (
platform === 'cr-docker' &&
repoName &&
!repoName.includes('/')
) {
repoName = `library/${repoName}`;
}
@@ -353,7 +377,11 @@ async function handleRequest(request, env, ctx) {
}
// Try to get a token for public access (without authorization)
const tokenResponse = await fetchToken(wwwAuthenticate, scope || '', '');
const tokenResponse = await fetchToken(
wwwAuthenticate,
scope || '',
''
);
if (tokenResponse.ok) {
const tokenData = await tokenResponse.json();
@@ -378,7 +406,8 @@ async function handleRequest(request, env, ctx) {
}
}
return responseUnauthorized(url);
response = responseUnauthorized(url);
break;
}
if (response.status >= 400 && response.status < 500) {
@@ -388,49 +417,115 @@ async function handleRequest(request, env, ctx) {
attempts++;
if (attempts < config.MAX_RETRIES) {
await new Promise(resolve => setTimeout(resolve, config.RETRY_DELAY_MS * attempts));
await new Promise(resolve =>
setTimeout(resolve, config.RETRY_DELAY_MS * attempts)
);
}
} catch (error) {
attempts++;
if (error instanceof Error && error.name === 'AbortError') {
return createErrorResponse('Request timeout', 408);
response = createErrorResponse('Request timeout', 408);
break;
}
if (attempts >= config.MAX_RETRIES) {
const message = error instanceof Error ? error.message : String(error);
return createErrorResponse(
response = createErrorResponse(
`Failed after ${config.MAX_RETRIES} attempts: ${message}`,
500,
true
);
break;
}
await new Promise(resolve => setTimeout(resolve, config.RETRY_DELAY_MS * attempts));
await new Promise(resolve =>
setTimeout(resolve, config.RETRY_DELAY_MS * attempts)
);
}
}
if (!response) {
return createErrorResponse('No response received after all retry attempts', 500, true);
}
if (!response.ok && response.status !== 206) {
response = createErrorResponse(
'No response received after all retry attempts',
500,
true
);
} else if (!response.ok && response.status !== 206) {
if (isDocker && response.status === 401) {
// If response is already an error response (e.g. from responseUnauthorized), use it.
// otherwise construct one.
// responseUnauthorized returns a Response, so we should check if it's already properly formatted?
// Actually responseUnauthorized returns a JSON response. The original code returned it directly.
// Here we might have broken out of loop with it.
// We need to check if the body is already consumed or if it is our custom response.
// responseUnauthorized creates a new Response, so it's fine.
// BUT, if we just broke out of the loop because of 401 and didn't construct a new response (e.g. token fetch failed), `response` is still the upstream 401.
// In original code: `return responseUnauthorized(url);`
// Here if we successfully retried, response is 200.
// If we failed to get token, we set response = responseUnauthorized(url) and break.
// So check if response is our custom one?
// Actually, if we hit the `isDocker && response.status === 401` block:
// If we succeed retry: response = retryResponse (200), break. -> fall through to next checks (ok)
// If we fail retry/token: response = responseUnauthorized(url), break. -> fall through.
// Only if we didn't handle 401 (e.g. no WWW-Auth header?) would we reach here with upstream 401?
// Wait, if upstream 401 has proper headers, we enter the block. If we fail, we replace `response`.
// So `response` acts as the final result.
// However, we still have this block:
// if (!response.ok && response.status !== 206) {
// if (isDocker && response.status === 401) { ... }
// }
// This block seems to be for cases where it failed and we didn't already handle it?
// In the original code, this block was AFTER the loop.
// The loop `return`s on success, or `return`s `responseUnauthorized` on docker 401 failure.
// So this block was only reachable if:
// 1. Loop finished max retries (but that returns 500 earlier)
// 2. Client error (4xx) break -> response is upstream 4xx
// 3. Upstream 500 error ? -> loop retries, then 500 error response.
// Wait, the client error (400-499) break in the loop:
// `if (response.status >= 400 && response.status < 500) { ... break; }`
// Then it hits `if (!response.ok ...)`
// If Docker 401 was NOT handled (e.g. no WWW-Auth), it hits here.
// We should preserve this logic.
// If response is the one created by responseUnauthorized, it has body '{"message": "UNAUTHORIZED"}'.
// We should probably just let it pass through if it's already formatted?
// But `responseUnauthorized` sets status 401. So `response.ok` is false.
// The original code returned `responseUnauthorized` IMMEDIATELY.
// My new code assigns it to `response` and breaks.
// So it reaches here.
// We should allow it to pass if it looks like our custom response (e.g. has specific headers?).
// OR we just ensuring we don't double-wrap it?
const isCustomError =
response.headers.get('content-type') === 'application/json' &&
(await response.clone().text()).includes('UNAUTHORIZED');
if (!isCustomError) {
const errorText = await response.text().catch(() => '');
return createErrorResponse(
response = createErrorResponse(
`Authentication required for this container registry resource. This may be a private repository. Original error: ${errorText}`,
401,
true
);
}
} else {
const errorText = await response.text().catch(() => 'Unknown error');
return createErrorResponse(
response = createErrorResponse(
`Upstream server error (${response.status}): ${errorText}`,
response.status,
true
);
}
} else {
// Success case processing (rewriting URLs etc)
let responseBody = response.body;
if (platform === 'pypi' && response.headers.get('content-type')?.includes('text/html')) {
if (
platform === 'pypi' &&
response.headers.get('content-type')?.includes('text/html')
) {
const originalText = await response.text();
const rewrittenText = originalText.replace(
/https:\/\/files\.pythonhosted\.org/g,
@@ -444,7 +539,10 @@ async function handleRequest(request, env, ctx) {
});
}
if (platform === 'npm' && response.headers.get('content-type')?.includes('application/json')) {
if (
platform === 'npm' &&
response.headers.get('content-type')?.includes('application/json')
) {
const originalText = await response.text();
const rewrittenText = originalText.replace(
/https:\/\/registry.npmjs.org\/([^/]+)/g,
@@ -479,11 +577,12 @@ async function handleRequest(request, env, ctx) {
addSecurityHeaders(headers);
}
const finalResponse = new Response(responseBody, {
response = new Response(responseBody, {
status: response.status,
headers
});
// Cache success logic
if (
cache &&
!isGit &&
@@ -506,9 +605,9 @@ async function handleRequest(request, env, ctx) {
try {
if (ctx && typeof ctx.waitUntil === 'function') {
ctx.waitUntil(cache.put(cacheKey, finalResponse.clone()));
ctx.waitUntil(cache.put(cacheKey, response.clone()));
} else {
cache.put(cacheKey, finalResponse.clone()).catch(error => {
cache.put(cacheKey, response.clone()).catch(error => {
console.warn('Cache put failed:', error);
});
}
@@ -522,23 +621,37 @@ async function handleRequest(request, env, ctx) {
);
if (rangedResponse) {
monitor.mark('range_cache_hit_after_full_cache');
return rangedResponse;
response = rangedResponse;
}
}
} catch (cacheError) {
console.warn('Cache put/match failed:', cacheError);
}
}
monitor.mark('complete');
return isGit || isGitLFS || isDocker || isAI
? finalResponse
: addPerformanceHeaders(finalResponse, monitor);
}
}
}
}
}
}
}
}
} catch (error) {
console.error('Error handling request:', error);
const message = error instanceof Error ? error.message : String(error);
return createErrorResponse(`Internal Server Error: ${message}`, 500, true);
response = createErrorResponse(`Internal Server Error: ${message}`, 500, true);
}
// Ensure performance headers are added to the final response
monitor.mark('complete');
const isGit = isGitRequest(request, new URL(request.url));
const isDocker = isDockerRequest(request, new URL(request.url));
const isAI = isAIInferenceRequest(request, new URL(request.url));
const isGitLFS = isGitLFSRequest(request, new URL(request.url));
return isGit || isGitLFS || isDocker || isAI
? response
: addPerformanceHeaders(response, monitor);
}
export default {
src/utils/validation.js
+10 -1
View File
@@ -22,7 +22,7 @@ import { isGitLFSRequest, isGitRequest } from '../protocols/git.js';
*/
export function isDockerRequest(request, url) {
// Check for container registry API endpoints
if (url.pathname.startsWith('/v2/')) {
if (url.pathname.includes('/v2/') || url.pathname === '/v2') {
return true;
}
@@ -42,6 +42,15 @@ export function isDockerRequest(request, url) {
return true;
}
// Check for Docker-specific Content-Type headers (for PUT/POST)
const contentType = request.headers.get('Content-Type') || '';
if (
contentType.includes('application/vnd.docker.distribution.manifest') ||
contentType.includes('application/vnd.oci.image.manifest')
) {
return true;
}
return false;
}
test/features/security.test.js
+1 -1
View File
@@ -240,7 +240,7 @@ describe('Security Features', () => {
it('should provide generic error messages', async () => {
const response = await SELF.fetch('https://example.com/gh/test/repo', {
method: 'INVALID',
method: 'TRACE',
redirect: 'manual'
});
test/integration.test.js
+3 -3
View File
@@ -42,7 +42,7 @@ describe('Integration Tests', () => {
const response = await SELF.fetch(testUrl, { method: 'HEAD' });
expect([200, 301, 302, 404]).toContain(response.status);
});
}, 10000);
it('should handle npm package requests', async () => {
const testUrl = 'https://example.com/npm/react';
@@ -229,7 +229,7 @@ describe('Integration Tests', () => {
});
// Git requests should not be cached (no cache headers)
expect(response.headers.get('Cache-Control')).not.toContain('max-age=1800');
expect(response.headers.get('Cache-Control') || '').not.toContain('max-age=1800');
});
});
@@ -297,7 +297,7 @@ describe('Integration Tests', () => {
const response = await SELF.fetch(url, { method: 'HEAD' });
expect(response.headers.get('X-Performance-Metrics')).toBeTruthy();
}
});
}, 10000);
});
describe('Content Type Handling', () => {
test/platforms/container-registry.test.js
+8 -8
View File
@@ -75,7 +75,7 @@ describe('Container Registry Support', () => {
// Should attempt to proxy auth requests
expect(response.status).not.toBe(400);
});
}, 15000);
it('should transform scope parameter correctly for Docker Hub', async () => {
// Test that scope parameter removes Xget path prefix
@@ -237,24 +237,24 @@ describe('Container Registry Support', () => {
describe('Container Registry Platform Support', () => {
const containerRegistries = [
{ name: 'Docker Hub', prefix: 'cr/docker', expectedStatus: [200, 301, 302, 401, 404] },
{ name: 'Quay.io', prefix: 'cr/quay', expectedStatus: [200, 301, 302, 401, 404] },
{ name: 'Docker Hub', prefix: 'cr/docker', expectedStatus: [200, 301, 302, 401, 404, 429] },
{ name: 'Quay.io', prefix: 'cr/quay', expectedStatus: [200, 301, 302, 401, 404, 429] },
{
name: 'Google Container Registry',
prefix: 'cr/gcr',
expectedStatus: [200, 301, 302, 401, 404]
expectedStatus: [200, 301, 302, 401, 404, 429]
},
{
name: 'Microsoft Container Registry',
prefix: 'cr/mcr',
expectedStatus: [200, 301, 302, 401, 404]
expectedStatus: [200, 301, 302, 401, 404, 429]
},
{
name: 'GitHub Container Registry',
prefix: 'cr/ghcr',
expectedStatus: [200, 301, 302, 401, 404]
expectedStatus: [200, 301, 302, 401, 404, 429]
},
{ name: 'Amazon ECR Public', prefix: 'cr/ecr', expectedStatus: [200, 301, 302, 401, 404] }
{ name: 'Amazon ECR Public', prefix: 'cr/ecr', expectedStatus: [200, 301, 302, 401, 404, 429] }
];
containerRegistries.forEach(({ name, prefix, expectedStatus }) => {
@@ -263,7 +263,7 @@ describe('Container Registry Support', () => {
const response = await SELF.fetch(testUrl, { method: 'HEAD' });
expect(expectedStatus).toContain(response.status);
});
}, 10000);
});
});