mirror of
https://github.com/koala73/worldmonitor.git
synced 2026-04-25 17:14:57 +02:00
encodeURIComponent() is applied before URLSearchParams.set(), which already percent-encodes its value. This double-encodes special chars (e.g., space becomes %2520 instead of %20), causing relay queries with special characters in topic/channel to return wrong or empty results. Co-authored-by: warren618 <warren618@users.noreply.github.com> Co-authored-by: Elie Habib <elie.habib@gmail.com>
62 lines
2.3 KiB
JavaScript
62 lines
2.3 KiB
JavaScript
import { getRelayBaseUrl, getRelayHeaders, fetchWithTimeout, buildRelayResponse } from './_relay.js';
|
|
import { getCorsHeaders, isDisallowedOrigin } from './_cors.js';
|
|
import { jsonResponse } from './_json-response.js';
|
|
|
|
export const config = { runtime: 'edge' };
|
|
|
|
export default async function handler(req) {
|
|
const corsHeaders = getCorsHeaders(req, 'GET, OPTIONS');
|
|
|
|
if (isDisallowedOrigin(req)) {
|
|
return jsonResponse({ error: 'Origin not allowed' }, 403, corsHeaders);
|
|
}
|
|
if (req.method === 'OPTIONS') {
|
|
return new Response(null, { status: 204, headers: corsHeaders });
|
|
}
|
|
if (req.method !== 'GET') {
|
|
return jsonResponse({ error: 'Method not allowed' }, 405, corsHeaders);
|
|
}
|
|
|
|
const relayBaseUrl = getRelayBaseUrl();
|
|
if (!relayBaseUrl) {
|
|
return jsonResponse({ error: 'WS_RELAY_URL is not configured' }, 503, corsHeaders);
|
|
}
|
|
|
|
try {
|
|
const url = new URL(req.url);
|
|
const limit = Math.max(1, Math.min(200, parseInt(url.searchParams.get('limit') || '50', 10) || 50));
|
|
const topic = (url.searchParams.get('topic') || '').trim();
|
|
const channel = (url.searchParams.get('channel') || '').trim();
|
|
const params = new URLSearchParams();
|
|
params.set('limit', String(limit));
|
|
if (topic) params.set('topic', topic);
|
|
if (channel) params.set('channel', channel);
|
|
|
|
const relayUrl = `${relayBaseUrl}/telegram/feed?${params}`;
|
|
const response = await fetchWithTimeout(relayUrl, {
|
|
headers: getRelayHeaders({ Accept: 'application/json' }),
|
|
}, 15000);
|
|
|
|
const body = await response.text();
|
|
|
|
let cacheControl = 'public, max-age=30, s-maxage=120, stale-while-revalidate=60, stale-if-error=120';
|
|
try {
|
|
const parsed = JSON.parse(body);
|
|
if (!parsed || parsed.count === 0 || !parsed.items || parsed.items.length === 0) {
|
|
cacheControl = 'public, max-age=0, s-maxage=15, stale-while-revalidate=10';
|
|
}
|
|
} catch {}
|
|
|
|
return buildRelayResponse(response, body, {
|
|
'Cache-Control': response.ok ? cacheControl : 'no-store',
|
|
...corsHeaders,
|
|
});
|
|
} catch (error) {
|
|
const isTimeout = error?.name === 'AbortError';
|
|
return jsonResponse({
|
|
error: isTimeout ? 'Relay timeout' : 'Relay request failed',
|
|
details: error?.message || String(error),
|
|
}, isTimeout ? 504 : 502, { 'Cache-Control': 'no-store', ...corsHeaders });
|
|
}
|
|
}
|