fix: various fixes to things + simply app proxy sentry setup

This commit is contained in:
Hampus Kraft
2026-02-19 00:29:58 +00:00
parent ff1d15f7aa
commit 528e4e0d7f
44 changed files with 441 additions and 1042 deletions

View File

@@ -20,98 +20,19 @@
import {loadConfig} from '@fluxer/config/src/ConfigLoader';
import {extractBaseServiceConfig} from '@fluxer/config/src/ServiceConfigSlices';
function normalizeProxyPath(value: string | undefined): string {
const defaultPath = '/error-reporting-proxy';
let clean = (value ?? '').trim();
if (clean === '') {
return defaultPath;
}
if (!clean.startsWith('/')) {
clean = `/${clean}`;
}
if (clean !== '/') {
clean = clean.replace(/\/+$/, '');
if (clean === '') {
return '/';
}
}
return clean;
}
function parseSentryDsn(dsn: string | undefined): {
project_id: string;
public_key: string;
target_url: string;
path_prefix: string;
} | null {
if (!dsn?.trim()) {
return null;
}
try {
const parsed = new URL(dsn.trim());
if (!parsed.protocol || !parsed.host) {
return null;
}
const pathPart = parsed.pathname.replace(/^\/+|\/+$/g, '');
const segments = pathPart ? pathPart.split('/') : [];
if (segments.length === 0) {
return null;
}
const projectId = segments[segments.length - 1]!;
const prefixSegments = segments.slice(0, -1);
const pathPrefix = prefixSegments.length > 0 ? `/${prefixSegments.join('/')}` : '';
const publicKey = parsed.username;
if (!publicKey) {
return null;
}
return {
project_id: projectId,
public_key: publicKey,
target_url: `${parsed.protocol}//${parsed.host}`,
path_prefix: pathPrefix,
};
} catch {
return null;
}
}
const master = await loadConfig();
const appProxy = master.services.app_proxy;
if (!appProxy?.kv) {
throw new Error('Application proxy requires `kv` configuration');
}
if (!appProxy.rate_limit) {
throw new Error('Application proxy requires `rate_limit` configuration');
if (!appProxy) {
throw new Error('Application proxy requires `services.app_proxy` configuration');
}
export const Config = {
...extractBaseServiceConfig(master),
port: appProxy.port,
static_cdn_endpoint: appProxy.static_cdn_endpoint,
sentry_proxy_path: normalizeProxyPath(appProxy.sentry_proxy_path),
sentry_report_host: appProxy.sentry_report_host.replace(/\/+$/, ''),
sentry_proxy: parseSentryDsn(appProxy.sentry_dsn),
sentry_dsn: master.app_public.sentry_dsn,
assets_dir: appProxy.assets_dir,
kv: {
url: appProxy.kv.url,
timeout_ms: appProxy.kv.timeout_ms ?? 5000,
},
rate_limit: {
sentry: appProxy.rate_limit.sentry,
},
};
export type Config = typeof Config;

View File

@@ -22,53 +22,22 @@ import {shutdownInstrumentation} from '@app/Instrument';
import {Logger} from '@app/Logger';
import {createAppProxyApp} from '@fluxer/app_proxy/src/App';
import {buildFluxerCSPOptions} from '@fluxer/app_proxy/src/app_server/utils/CSP';
import {KVCacheProvider} from '@fluxer/cache/src/providers/KVCacheProvider';
import {createServiceTelemetry} from '@fluxer/hono/src/middleware/TelemetryAdapters';
import {createServer, setupGracefulShutdown} from '@fluxer/hono/src/Server';
import {KVClient} from '@fluxer/kv_client/src/KVClient';
import {throwKVRequiredError} from '@fluxer/rate_limit/src/KVRequiredError';
import {RateLimitService} from '@fluxer/rate_limit/src/RateLimitService';
const telemetry = createServiceTelemetry({
serviceName: 'fluxer-app-proxy',
skipPaths: ['/_health'],
});
let rateLimitService: RateLimitService | null = null;
async function main(): Promise<void> {
if (Config.kv.url) {
const kvClient = new KVClient({url: Config.kv.url, timeoutMs: Config.kv.timeout_ms});
const cacheService = new KVCacheProvider({client: kvClient});
rateLimitService = new RateLimitService(cacheService);
Logger.info({kvUrl: Config.kv.url}, 'KV-backed rate limiting enabled');
} else {
throwKVRequiredError({
serviceName: 'fluxer_app_proxy',
configPath: 'Config.kv.url',
});
}
const cspDirectives = buildFluxerCSPOptions({
sentryProxy: Config.sentry_proxy
? {
projectId: Config.sentry_proxy.project_id,
publicKey: Config.sentry_proxy.public_key,
targetUrl: Config.sentry_proxy.target_url,
pathPrefix: Config.sentry_proxy.path_prefix,
}
: null,
sentryProxyPath: Config.sentry_proxy_path,
sentryReportHost: Config.sentry_report_host,
});
const cspDirectives = buildFluxerCSPOptions({sentryDsn: Config.sentry_dsn});
const {app, shutdown} = await createAppProxyApp({
config: Config,
cspDirectives,
logger: Logger,
rateLimitService,
metricsCollector: telemetry.metricsCollector,
sentryProxyPath: Config.sentry_proxy_path,
staticCDNEndpoint: Config.static_cdn_endpoint,
staticDir: Config.assets_dir,
tracing: telemetry.tracing,