diff --git a/src/constants.ts b/src/constants.ts index dada8b7..0c2c911 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -61,7 +61,6 @@ export const Constants = { 'content-type': 'text/html;charset=UTF-8', 'x-powered-by': `${RELEASE_NAME}`, 'x-trans-rights': 'true', - 'cache-control': 'max-age=3600', // Can be overriden in some cases, like unfinished poll tweets 'Vary': 'Accept-Encoding, User-Agent' }, API_RESPONSE_HEADERS: { diff --git a/src/embed/status.ts b/src/embed/status.ts index 8340bbc..10cfcb1 100644 --- a/src/embed/status.ts +++ b/src/embed/status.ts @@ -77,7 +77,7 @@ export const handleStatus = async ( for (const [header, value] of Object.entries(Constants.API_RESPONSE_HEADERS)) { c.header(header, value); } - return c.text(JSON.stringify(api)); + return c.json(api); } if (tweet === null) { @@ -423,7 +423,7 @@ export const handleStatus = async ( const lang = tweet.lang === null ? 'en' : tweet.lang || 'en'; /* Finally, after all that work we return the response HTML! */ - return c.text(Strings.BASE_HTML.format({ + return c.html(Strings.BASE_HTML.format({ lang: `lang="${lang}"`, headers: headers.join(''), body: ivbody diff --git a/src/providers/twitter/conversation.ts b/src/providers/twitter/conversation.ts index 4e1473f..4e8cdf3 100644 --- a/src/providers/twitter/conversation.ts +++ b/src/providers/twitter/conversation.ts @@ -519,5 +519,5 @@ export const threadAPIProvider = async (c: Context) => { for (const [header, value] of Object.entries(Constants.API_RESPONSE_HEADERS)) { c.header(header, value); } - return c.text(JSON.stringify(processedResponse)); + return c.json(processedResponse); }; diff --git a/src/realms/api/router.ts b/src/realms/api/router.ts index 365ce6a..22d2e2b 100644 --- a/src/realms/api/router.ts +++ b/src/realms/api/router.ts @@ -6,19 +6,8 @@ import { Strings } from '../../strings'; export const api = new Hono(); /* Current v1 API endpoints. Currently, these still go through the Twitter embed requests. API v2+ won't do this. */ -api.get('/:handle?/status/:id/:language?', statusRequest); -api.get( - '/:handle?/status/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?', - statusRequest -); +api.get('/status/:id/:language?', statusRequest); +api.get('/:handle/status/:id/:language?', statusRequest); api.get('/:handle', profileRequest); - -api.get( - '/robots.txt', - async (c) => { - c.header('cache-control', 'max-age=0, no-cache, no-store, must-revalidate'); - c.status(200); - return c.text(Strings.ROBOTS_TXT); - } -); +api.get('/robots.txt', async (c) => c.text(Strings.ROBOTS_TXT)); diff --git a/src/realms/common/version.ts b/src/realms/common/version.ts index 0555431..4ecae97 100644 --- a/src/realms/common/version.ts +++ b/src/realms/common/version.ts @@ -1,29 +1,20 @@ import { Context } from 'hono'; -import { Constants } from '../../constants'; import { sanitizeText } from '../../helpers/utils'; import { Strings } from '../../strings'; -export const versionRoute = async (context: Context) => { - const request = context.req; - return new Response( - Strings.VERSION_HTML.format({ - rtt: request.raw.cf?.clientTcpRtt ? `🏓 ${request.raw.cf.clientTcpRtt} ms RTT` : '', - colo: (request.raw.cf?.colo as string) ?? '??', - httpversion: (request.raw.cf?.httpProtocol as string) ?? 'Unknown HTTP Version', - tlsversion: (request.raw.cf?.tlsVersion as string) ?? 'Unknown TLS Version', - ip: request.header('x-real-ip') ?? request.header('cf-connecting-ip') ?? 'Unknown IP', - city: (request.raw.cf?.city as string) ?? 'Unknown City', - region: (request.raw.cf?.region as string) ?? request.raw.cf?.country ?? 'Unknown Region', - country: (request.raw.cf?.country as string) ?? 'Unknown Country', - asn: `AS${request.raw.cf?.asn ?? '??'} (${request.raw.cf?.asOrganization ?? 'Unknown ASN'})`, - ua: sanitizeText(request.header('user-agent') ?? 'Unknown User Agent') - }), - { - headers: { - ...Constants.RESPONSE_HEADERS, - 'cache-control': 'max-age=0, no-cache, no-store, must-revalidate' - }, - status: 200 - } - ); +export const versionRoute = async (c: Context) => { + c.header('cache-control', 'max-age=0, no-cache, no-store, must-revalidate'); + const req = c.req; + return c.html(Strings.VERSION_HTML.format({ + rtt: req.raw.cf?.clientTcpRtt ? `🏓 ${req.raw.cf.clientTcpRtt} ms RTT` : '', + colo: (req.raw.cf?.colo as string) ?? '??', + httpversion: (req.raw.cf?.httpProtocol as string) ?? 'Unknown HTTP Version', + tlsversion: (req.raw.cf?.tlsVersion as string) ?? 'Unknown TLS Version', + ip: req.header('x-real-ip') ?? req.header('cf-connecting-ip') ?? 'Unknown IP', + city: (req.raw.cf?.city as string) ?? 'Unknown City', + region: (req.raw.cf?.region as string) ?? req.raw.cf?.country ?? 'Unknown Region', + country: (req.raw.cf?.country as string) ?? 'Unknown Country', + asn: `AS${req.raw.cf?.asn ?? '??'} (${req.raw.cf?.asOrganization ?? 'Unknown ASN'})`, + ua: sanitizeText(req.header('user-agent') ?? 'Unknown User Agent') + })) }; diff --git a/src/realms/twitter/router.ts b/src/realms/twitter/router.ts index c19ad00..28bc83d 100644 --- a/src/realms/twitter/router.ts +++ b/src/realms/twitter/router.ts @@ -10,37 +10,6 @@ import { oembed } from './routes/oembed'; export const twitter = new Hono(); -twitter.get('/status/:id', statusRequest); -// twitter.get('/:handle/status/:id', statusRequest); -// twitter.get('/:prefix/:handle/status/:id/:language?', statusRequest); -// twitter.get( -// '/:prefix/:handle/status/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?', -// statusRequest -// ); -// twitter.get('/:handle?/:endpoint{status(es)?}/:id/:language?', statusRequest); -// twitter.get( -// '/:handle?/:endpoint{status(es)?}/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?', -// statusRequest -// ); - -twitter.get('/version', versionRoute); -twitter.get('/set_base_redirect', setRedirectRequest); -twitter.get('/oembed', oembed); - -twitter.get( - '/robots.txt', - async (c) => { - c.header('cache-control', 'max-age=0, no-cache, no-store, must-revalidate'); - c.status(200); - return c.text(Strings.ROBOTS_TXT); - } -); - -twitter.get('/i/events/:id', genericTwitterRedirect); -twitter.get('/hashtag/:hashtag', genericTwitterRedirect); - -twitter.get('/:handle', profileRequest); - export const getBaseRedirectUrl = (c: Context) => { const baseRedirect = c.req.header('cookie')?.match(/(?<=base_redirect=)(.*?)(?=;|$)/)?.[0]; @@ -56,3 +25,28 @@ export const getBaseRedirectUrl = (c: Context) => { return Constants.TWITTER_ROOT; }; + + +twitter.get('/status/:id', statusRequest); +twitter.get('/:handle/status/:id', statusRequest); +twitter.get('/:prefix/:handle/status/:id/:language?', statusRequest); +twitter.get( + '/:prefix/:handle/status/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?', + statusRequest +); +twitter.get('/:handle?/:endpoint{status(es)?}/:id/:language?', statusRequest); +twitter.get( + '/:handle?/:endpoint{status(es)?}/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?', + statusRequest +); + +twitter.get('/version', versionRoute); +twitter.get('/set_base_redirect', setRedirectRequest); +twitter.get('/oembed', oembed); + +twitter.get('/robots.txt', async (c) => c.text(Strings.ROBOTS_TXT)); + +twitter.get('/i/events/:id', genericTwitterRedirect); +twitter.get('/hashtag/:hashtag', genericTwitterRedirect); + +twitter.get('/:handle', profileRequest); \ No newline at end of file diff --git a/src/realms/twitter/routes/redirects.ts b/src/realms/twitter/routes/redirects.ts index f026d01..51b208a 100644 --- a/src/realms/twitter/routes/redirects.ts +++ b/src/realms/twitter/routes/redirects.ts @@ -27,7 +27,7 @@ export const setRedirectRequest = async (c: Context) => { if (origin && !Constants.STANDARD_DOMAIN_LIST.includes(new URL(origin).hostname)) { c.status(403); - return c.text(Strings.MESSAGE_HTML.format({ + return c.html(Strings.MESSAGE_HTML.format({ message: `Failed to set base redirect: Your request seems to be originating from another domain, please open this up in a new tab if you are trying to set your base redirect.` })) } @@ -40,7 +40,7 @@ export const setRedirectRequest = async (c: Context) => { // eslint-disable-next-line sonarjs/no-duplicate-string c.header('content-security-policy', `frame-ancestors ${Constants.STANDARD_DOMAIN_LIST.join(' ')};`); c.status(200); - return c.text(Strings.MESSAGE_HTML.format({ + return c.html(Strings.MESSAGE_HTML.format({ message: `Your base redirect has been cleared. To set one, please pass along the url parameter.` })) } @@ -57,7 +57,7 @@ export const setRedirectRequest = async (c: Context) => { c.header('set-cookie', `base_redirect=; path=/; max-age=0; expires=Thu, 01 Jan 1970 00:00:00 GMT; secure; HttpOnly`); c.header('content-security-policy', `frame-ancestors ${Constants.STANDARD_DOMAIN_LIST.join(' ')};`); c.status(200); - return c.text(Strings.MESSAGE_HTML.format({ + return c.html(Strings.MESSAGE_HTML.format({ message: `Your URL does not appear to be well-formed. Example: ?url=https://nitter.net` })) } @@ -68,7 +68,7 @@ export const setRedirectRequest = async (c: Context) => { c.header('set-cookie', `base_redirect=${url}; path=/; max-age=63072000; secure; HttpOnly`); c.header('content-security-policy', `frame-ancestors ${Constants.STANDARD_DOMAIN_LIST.join(' ')};`); - return c.text(Strings.MESSAGE_HTML.format({ + return c.html(Strings.MESSAGE_HTML.format({ message: `Successfully set base redirect, you will now be redirected to ${sanitizeText(url)} rather than ${Constants.TWITTER_ROOT}` })) }; diff --git a/src/realms/twitter/routes/status.ts b/src/realms/twitter/routes/status.ts index 50e07e2..64d84aa 100644 --- a/src/realms/twitter/routes/status.ts +++ b/src/realms/twitter/routes/status.ts @@ -6,11 +6,7 @@ import { Strings } from '../../../strings'; /* Handler for status (Tweet) request */ export const statusRequest = async (c: Context) => { - const handle = c.req.param('handle'); - const id = c.req.param('id'); - const mediaNumber = c.req.param('mediaNumber'); - const language = c.req.param('language'); - const prefix = c.req.param('prefix'); + const { handle, id, mediaNumber, language, prefix } = c.req.param(); const url = new URL(c.req.url); const flags: InputFlags = {}; diff --git a/src/user.ts b/src/user.ts index 2ea3dda..005d977 100644 --- a/src/user.ts +++ b/src/user.ts @@ -4,7 +4,7 @@ import { Strings } from './strings'; import { userAPI } from './providers/twitter/profile'; export const returnError = (c: Context, error: string): Response => { - return c.text(Strings.BASE_HTML.format({ + return c.html(Strings.BASE_HTML.format({ lang: '', headers: [ ``, @@ -32,7 +32,7 @@ export const handleProfile = async ( for (const [header, value] of Object.entries(Constants.API_RESPONSE_HEADERS)) { c.header(header, value); } - return c.text(JSON.stringify(api)); + return c.json(api); } /* If there was any errors fetching the User, we'll return it */ @@ -51,7 +51,7 @@ export const handleProfile = async ( // TODO Add card creation logic here /* Finally, after all that work we return the response HTML! */ - return c.text(Strings.BASE_HTML.format({ + return c.html(Strings.BASE_HTML.format({ lang: `lang="en"`, headers: headers.join('') })); diff --git a/src/worker.ts b/src/worker.ts index d4f7e76..b8d3a75 100644 --- a/src/worker.ts +++ b/src/worker.ts @@ -64,13 +64,11 @@ app.onError((err, c) => { console.error(error.stack); c.status(200); c.header('cache-control', noCache); - c.header('content-type', 'text/html'); - - return c.text(Strings.ERROR_HTML); + return c.html(Strings.ERROR_HTML); }); -app.use('*', logger()); +// app.use('*', logger()); app.use('*', async (c, next) => { console.log(`Hello from ⛅ ${c.req.raw.cf?.colo || 'UNK'}`); @@ -81,8 +79,8 @@ app.use('*', async (c, next) => { app.use('*', cacheMiddleware()); app.use('*', timing({ enabled: false })); -app.route(`/api`, api); app.route(`/twitter`, twitter); +app.route(`/api`, api); app.all( '/error', @@ -104,7 +102,7 @@ export default { return new Response(Strings.ERROR_HTML, { headers: { ...Constants.RESPONSE_HEADERS, - 'content-type': 'text/html', + 'content-type': 'text/html;charset=utf-8', 'cache-control': noCache }, status: 200