refactor progress

This commit is contained in:
Hampus Kraft
2026-02-17 12:22:36 +00:00
parent cb31608523
commit d5abd1a7e4
8257 changed files with 1190207 additions and 761040 deletions

View File

@@ -0,0 +1,168 @@
/*
* Copyright (C) 2026 Fluxer Contributors
*
* This file is part of Fluxer.
*
* Fluxer is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Fluxer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Fluxer. If not, see <https://www.gnu.org/licenses/>.
*/
import {Config} from '@fluxer/api/src/Config';
import {Logger} from '@fluxer/api/src/Logger';
import {DefaultUserOnly, LoginRequired} from '@fluxer/api/src/middleware/AuthMiddleware';
import {RateLimitMiddleware} from '@fluxer/api/src/middleware/RateLimitMiddleware';
import {OpenAPI} from '@fluxer/api/src/middleware/ResponseTypeMiddleware';
import {RateLimitConfigs} from '@fluxer/api/src/RateLimitConfig';
import type {HonoApp, HonoEnv} from '@fluxer/api/src/types/HonoEnv';
import {Validator} from '@fluxer/api/src/Validator';
import {MissingAccessError} from '@fluxer/errors/src/domains/core/MissingAccessError';
import {
KlipyFeaturedResponse,
KlipyGifResponse,
KlipyLocaleQuery,
KlipyRegisterShareRequest,
KlipySearchQuery,
} from '@fluxer/schema/src/domains/klipy/KlipySchemas';
import type {Context} from 'hono';
import {createMiddleware} from 'hono/factory';
import {z} from 'zod';
const klipyApiKeyRequiredMiddleware = createMiddleware<HonoEnv>(async (_ctx, next) => {
if (!Config.klipy.apiKey) {
Logger.debug('KLIPY API key is missing');
throw new MissingAccessError();
}
await next();
});
function getCountry(ctx: Context<HonoEnv>): string {
return ctx.req.header('CF-IPCountry') || 'US';
}
export function KlipyController(app: HonoApp) {
app.get(
'/klipy/search',
RateLimitMiddleware(RateLimitConfigs.KLIPY_SEARCH),
klipyApiKeyRequiredMiddleware,
LoginRequired,
DefaultUserOnly,
OpenAPI({
operationId: 'search_klipy_gifs',
summary: 'Search KLIPY GIFs',
responseSchema: z.array(KlipyGifResponse),
statusCode: 200,
security: ['botToken', 'bearerToken', 'sessionToken'],
tags: ['KLIPY'],
description: 'Searches KLIPY for GIFs matching the given query string and locale.',
}),
Validator('query', KlipySearchQuery),
async (ctx) => {
const {q, locale} = ctx.req.valid('query');
return ctx.json(await ctx.get('klipyService').search({q, locale, country: getCountry(ctx)}));
},
);
app.get(
'/klipy/featured',
RateLimitMiddleware(RateLimitConfigs.KLIPY_FEATURED),
klipyApiKeyRequiredMiddleware,
LoginRequired,
DefaultUserOnly,
OpenAPI({
operationId: 'get_klipy_featured',
summary: 'Get featured KLIPY GIFs',
responseSchema: KlipyFeaturedResponse,
statusCode: 200,
security: ['botToken', 'bearerToken', 'sessionToken'],
tags: ['KLIPY'],
description: 'Retrieves currently featured GIFs from KLIPY based on user locale.',
}),
Validator('query', KlipyLocaleQuery),
async (ctx) => {
return ctx.json(
await ctx.get('klipyService').getFeatured({locale: ctx.req.valid('query').locale, country: getCountry(ctx)}),
);
},
);
app.get(
'/klipy/trending-gifs',
RateLimitMiddleware(RateLimitConfigs.KLIPY_TRENDING),
klipyApiKeyRequiredMiddleware,
LoginRequired,
DefaultUserOnly,
OpenAPI({
operationId: 'get_klipy_trending_gifs',
summary: 'Get trending KLIPY GIFs',
responseSchema: z.array(KlipyGifResponse),
statusCode: 200,
security: ['botToken', 'bearerToken', 'sessionToken'],
tags: ['KLIPY'],
description: 'Retrieves trending GIFs from KLIPY based on user locale and popularity.',
}),
Validator('query', KlipyLocaleQuery),
async (ctx) => {
return ctx.json(
await ctx.get('klipyService').getTrendingGifs({
locale: ctx.req.valid('query').locale,
country: getCountry(ctx),
}),
);
},
);
app.post(
'/klipy/register-share',
RateLimitMiddleware(RateLimitConfigs.KLIPY_REGISTER_SHARE),
klipyApiKeyRequiredMiddleware,
LoginRequired,
DefaultUserOnly,
OpenAPI({
operationId: 'register_klipy_gif_share',
summary: 'Register KLIPY GIF share',
responseSchema: null,
statusCode: 204,
security: ['botToken', 'bearerToken', 'sessionToken'],
tags: ['KLIPY'],
description: 'Registers a shared GIF with KLIPY to track usage and analytics.',
}),
Validator('json', KlipyRegisterShareRequest),
async (ctx) => {
const {id, q, locale} = ctx.req.valid('json');
await ctx.get('klipyService').registerShare({id, q: q ?? '', locale, country: getCountry(ctx)});
return ctx.body(null, 204);
},
);
app.get(
'/klipy/suggest',
RateLimitMiddleware(RateLimitConfigs.KLIPY_SUGGEST),
klipyApiKeyRequiredMiddleware,
LoginRequired,
DefaultUserOnly,
OpenAPI({
operationId: 'get_klipy_search_suggestions',
summary: 'Get KLIPY search suggestions',
responseSchema: z.array(z.string()),
statusCode: 200,
security: ['botToken', 'bearerToken', 'sessionToken'],
tags: ['KLIPY'],
description: 'Returns search term suggestions from KLIPY based on the partial query provided.',
}),
Validator('query', KlipySearchQuery),
async (ctx) => {
const {q, locale} = ctx.req.valid('query');
return ctx.json(await ctx.get('klipyService').suggest({q, locale}));
},
);
}

View File

@@ -0,0 +1,338 @@
/*
* Copyright (C) 2026 Fluxer Contributors
*
* This file is part of Fluxer.
*
* Fluxer is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Fluxer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Fluxer. If not, see <https://www.gnu.org/licenses/>.
*/
import {Config} from '@fluxer/api/src/Config';
import type {IKlipyService} from '@fluxer/api/src/infrastructure/IKlipyService';
import type {IMediaService} from '@fluxer/api/src/infrastructure/IMediaService';
import {Logger} from '@fluxer/api/src/Logger';
import type {ICacheService} from '@fluxer/cache/src/ICacheService';
import {FLUXER_USER_AGENT} from '@fluxer/constants/src/Core';
import type {KlipyCategoryTagResponse, KlipyGifResponse} from '@fluxer/schema/src/domains/klipy/KlipySchemas';
import {ms} from 'itty-time';
const KLIPY_BASE_URL = 'https://api.klipy.com/v2';
const DEFAULT_MEDIA_FILTER = 'webm';
const DEFAULT_CONTENT_FILTER = 'low';
const CLIENT_KEY = 'fluxer';
const MAX_RETRIES = 3;
const BACKOFF_BASE_DELAY = ms('1 second');
const CACHE_EXPIRATION_TIME = ms('5 minutes');
interface KlipyGif {
id: string;
slug?: string;
title: string;
media_formats: {
webm: {
url: string;
dims: [number, number];
};
};
itemurl: string;
}
interface KlipyCategoryTag {
searchterm: string;
}
type CacheEntry<T> = {
data: T;
timestamp: number;
};
interface KlipyPath {
type: 'gif' | 'clip';
slug: string;
}
export class KlipyService implements IKlipyService {
private readonly FEATURED_CACHE_KEY = 'klipy:featured';
private readonly TRENDING_CACHE_KEY = 'klipy:trending';
private refreshingKeys: Map<string, boolean> = new Map();
constructor(
private cacheService: ICacheService,
private mediaService: IMediaService,
) {}
private createURL({endpoint, params}: {endpoint: string; params: Record<string, string | number | undefined>}): URL {
const url = new URL(`${KLIPY_BASE_URL}/${endpoint}`);
const defaultParams = {
client_key: CLIENT_KEY,
contentfilter: DEFAULT_CONTENT_FILTER,
media_filter: DEFAULT_MEDIA_FILTER,
...params,
};
for (const [key, value] of Object.entries(defaultParams)) {
if (value !== undefined) {
url.searchParams.append(key, value.toString());
}
}
return url;
}
private async fetchKlipyData<T>(url: URL): Promise<T> {
for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
try {
const response = await fetch(url.toString(), {
headers: {'User-Agent': FLUXER_USER_AGENT},
signal: AbortSignal.timeout(ms('30 seconds')),
});
if (!response.ok) {
throw new Error(`Failed to fetch KLIPY data: ${response.statusText}`);
}
return response.json() as Promise<T>;
} catch (error) {
if (attempt < MAX_RETRIES - 1) {
const delay = BACKOFF_BASE_DELAY * 2 ** attempt;
await new Promise((resolve) => setTimeout(resolve, delay));
} else {
throw error;
}
}
}
throw new Error('Exceeded maximum retries');
}
private async fetchAndTransformGifs(url: URL): Promise<Array<KlipyGifResponse>> {
const {results} = await this.fetchKlipyData<{results: Array<KlipyGif>}>(url);
return results.map((gif) => this.transformKlipyGif(gif));
}
private async getCache<T>(key: string): Promise<{data: T; isStale: boolean} | null> {
const cached = await this.cacheService.get<CacheEntry<T>>(key);
if (!cached) return null;
const age = Date.now() - cached.timestamp;
const isStale = age > CACHE_EXPIRATION_TIME;
return {data: cached.data, isStale};
}
private async setCache<T>(key: string, data: T): Promise<void> {
const cacheEntry: CacheEntry<T> = {
data,
timestamp: Date.now(),
};
await this.cacheService.set(key, cacheEntry);
}
private triggerBackgroundRefresh<T>(key: string, refreshFn: () => Promise<T>): void {
if (this.refreshingKeys.get(key)) {
return;
}
this.refreshingKeys.set(key, true);
setImmediate(async () => {
try {
const freshData = await refreshFn();
await this.setCache(key, freshData);
} catch (error) {
Logger.debug({key, error}, `Background refresh failed for key ${key}`);
} finally {
this.refreshingKeys.delete(key);
}
});
}
async search(params: {q: string; locale: string; country: string}): Promise<Array<KlipyGifResponse>> {
const url = this.createURL({
endpoint: 'search',
params: {
key: Config.klipy.apiKey,
q: params.q,
country: params.country,
locale: params.locale,
limit: 50,
},
});
return this.fetchAndTransformGifs(url);
}
async registerShare(params: {id: string; q: string; locale: string; country: string}): Promise<void> {
const url = this.createURL({
endpoint: 'registershare',
params: {
key: Config.klipy.apiKey,
id: params.id,
country: params.country,
locale: params.locale,
q: params.q,
},
});
await fetch(url.toString(), {
headers: {'User-Agent': FLUXER_USER_AGENT},
signal: AbortSignal.timeout(ms('30 seconds')),
});
}
async getFeatured(params: {locale: string; country: string}): Promise<{
gifs: Array<KlipyGifResponse>;
categories: Array<KlipyCategoryTagResponse>;
}> {
const cached = await this.getCache<{
gifs: Array<KlipyGifResponse>;
categories: Array<KlipyCategoryTagResponse>;
}>(this.FEATURED_CACHE_KEY);
if (cached) {
if (cached.isStale) {
this.triggerBackgroundRefresh(this.FEATURED_CACHE_KEY, () => this.fetchFeaturedData(params));
}
return cached.data;
}
const data = await this.fetchFeaturedData(params);
await this.setCache(this.FEATURED_CACHE_KEY, data);
return data;
}
private async fetchFeaturedData(params: {locale: string; country: string}): Promise<{
gifs: Array<KlipyGifResponse>;
categories: Array<KlipyCategoryTagResponse>;
}> {
const [gifs, categories] = await Promise.all([this.getFeaturedGifs(params), this.getFeaturedCategories(params)]);
return {gifs, categories};
}
async getTrendingGifs(params: {locale: string; country: string}): Promise<Array<KlipyGifResponse>> {
const cached = await this.getCache<Array<KlipyGifResponse>>(this.TRENDING_CACHE_KEY);
if (cached) {
if (cached.isStale) {
this.triggerBackgroundRefresh(this.TRENDING_CACHE_KEY, () => this.fetchTrendingGifs(params));
}
return cached.data;
}
const gifs = await this.fetchTrendingGifs(params);
await this.setCache(this.TRENDING_CACHE_KEY, gifs);
return gifs;
}
private async fetchTrendingGifs(params: {locale: string; country: string}): Promise<Array<KlipyGifResponse>> {
const url = this.createURL({
endpoint: 'featured',
params: {
key: Config.klipy.apiKey,
country: params.country,
locale: params.locale,
limit: 50,
},
});
return this.fetchAndTransformGifs(url);
}
async suggest(params: {q: string; locale: string}): Promise<Array<string>> {
const url = this.createURL({
endpoint: 'autocomplete',
params: {
key: Config.klipy.apiKey,
q: params.q,
locale: params.locale,
},
});
const {results} = await this.fetchKlipyData<{results: Array<string>}>(url);
return results;
}
private async getFeaturedGifs(params: {locale: string; country: string}): Promise<Array<KlipyGifResponse>> {
const url = this.createURL({
endpoint: 'featured',
params: {
key: Config.klipy.apiKey,
country: params.country,
locale: params.locale,
limit: 1,
},
});
return this.fetchAndTransformGifs(url);
}
private async getFeaturedCategories(params: {
locale: string;
country: string;
}): Promise<Array<KlipyCategoryTagResponse>> {
const url = this.createURL({
endpoint: 'categories',
params: {
key: Config.klipy.apiKey,
country: params.country,
locale: params.locale,
type: 'featured',
},
});
const {tags} = await this.fetchKlipyData<{tags: Array<KlipyCategoryTag>}>(url);
return Promise.all(
tags.map(async (tag) => {
const [gif] = await this.search({q: tag.searchterm, locale: params.locale, country: params.country});
return {
name: tag.searchterm,
src: gif.src,
proxy_src: gif.proxy_src,
};
}),
);
}
private parseKlipyPath(url: string): KlipyPath | null {
try {
const parsedUrl = new URL(url);
const hostname = parsedUrl.hostname.toLowerCase();
if (hostname !== 'klipy.com' && hostname !== 'www.klipy.com') {
return null;
}
const pathMatch = parsedUrl.pathname.match(/^\/(gif|gifs|clip|clips)\/([^/]+)/i);
if (!pathMatch?.[1] || !pathMatch[2]) {
return null;
}
const type = pathMatch[1].toLowerCase().startsWith('clip') ? 'clip' : 'gif';
const slug = decodeURIComponent(pathMatch[2]).trim();
if (!slug) {
return null;
}
return {type, slug};
} catch {
return null;
}
}
private buildKlipyPageUrl(path: KlipyPath): string {
const basePath = path.type === 'clip' ? 'clips' : 'gifs';
return `https://klipy.com/${basePath}/${encodeURIComponent(path.slug)}`;
}
private transformKlipyGif(input: KlipyGif): KlipyGifResponse {
const parsedPath = this.parseKlipyPath(input.itemurl);
const explicitSlug = input.slug?.trim();
const normalizedSlug = explicitSlug || parsedPath?.slug || input.id;
const normalizedType = parsedPath?.type ?? 'gif';
const normalizedUrl =
parsedPath || explicitSlug ? this.buildKlipyPageUrl({type: normalizedType, slug: normalizedSlug}) : input.itemurl;
return {
id: normalizedSlug,
title: input.title,
url: normalizedUrl,
src: input.media_formats.webm.url,
proxy_src: this.mediaService.getExternalMediaProxyURL(input.media_formats.webm.url),
width: input.media_formats.webm.dims[0],
height: input.media_formats.webm.dims[1],
};
}
}