DevComp/fxtwitter-docker
1
0
Fork 0
mirror of https://github.com/CompeyDev/fxtwitter-docker.git synced 2025-04-05 18:40:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix routing and logging

Browse source
This commit is contained in:
dangered wolf 2023-11-10 01:00:25 -05:00
parent e4b9efd793
commit 85eb2cead1
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
3 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/realms/api/router.ts
View file

@ -2,6 +2,7 @@ import { Hono } from 'hono';
import { statusRequest } from '../twitter/routes/status'; import { statusRequest } from '../twitter/routes/status';
import { profileRequest } from '../twitter/routes/profile'; import { profileRequest } from '../twitter/routes/profile';
import { Strings } from '../../strings'; import { Strings } from '../../strings';
import { Constants } from '../../constants';
export const api = new Hono(); export const api = new Hono();
@ -11,3 +12,6 @@ api.get('/:handle/status/:id/:language?', statusRequest);
api.get('/:handle', profileRequest); api.get('/:handle', profileRequest);
api.get('/robots.txt', async (c) => c.text(Strings.ROBOTS_TXT)); api.get('/robots.txt', async (c) => c.text(Strings.ROBOTS_TXT));
api.all('*', async (c) => c.redirect(Constants.API_DOCS_URL, 302));

20
src/realms/twitter/router.ts
View file

@ -26,18 +26,18 @@ export const getBaseRedirectUrl = (c: Context) => {
return Constants.TWITTER_ROOT; return Constants.TWITTER_ROOT;
}; };
/* Workaround for some dumb maybe-build time issue where statusRequest isn't ready or something because none of these trigger*/
const tweetRequest = async (c: Context) => await statusRequest(c);
twitter.get('/status/:id', statusRequest); twitter.get('/:prefix?/:handle?/:endpoint{status(es)?}/:id/:language?', tweetRequest);
twitter.get('/:handle/status/:id', statusRequest); twitter.get(':handle?/:endpoint{status(es)?}/:id/:language?', tweetRequest);
twitter.get('/:prefix/:handle/status/:id/:language?', statusRequest);
twitter.get( twitter.get(
'/:prefix/:handle/status/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?', '/:prefix?/:handle/:endpoint{status(es)?}/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?',
statusRequest tweetRequest
); );
twitter.get('/:handle?/:endpoint{status(es)?}/:id/:language?', statusRequest);
twitter.get( twitter.get(
'/:handle?/:endpoint{status(es)?}/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?', '/:handle/:endpoint{status(es)?}/:id/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/:language?',
statusRequest tweetRequest
); );
twitter.get('/version', versionRoute); twitter.get('/version', versionRoute);
@ -49,4 +49,6 @@ twitter.get('/robots.txt', async (c) => c.text(Strings.ROBOTS_TXT));
twitter.get('/i/events/:id', genericTwitterRedirect); twitter.get('/i/events/:id', genericTwitterRedirect);
twitter.get('/hashtag/:hashtag', genericTwitterRedirect); twitter.get('/hashtag/:hashtag', genericTwitterRedirect);
twitter.get('/:handle', profileRequest); twitter.get('/:handle', profileRequest);
twitter.all('*', async (c) => c.redirect(Constants.REDIRECT_URL, 302));

15
src/worker.ts
View file

@ -25,8 +25,13 @@ const app = new Hono<{ Bindings: { TwitterProxy: Fetcher; AnalyticsEngine: Analy
/* Override if in API_HOST_LIST. Note that we have to check full hostname for this. */ /* Override if in API_HOST_LIST. Note that we have to check full hostname for this. */
if (Constants.API_HOST_LIST.includes(url.hostname)) { if (Constants.API_HOST_LIST.includes(url.hostname)) {
realm = 'api'; realm = 'api';
console.log('API realm');
} else if (Constants.STANDARD_DOMAIN_LIST.includes(baseHostName)) { } else if (Constants.STANDARD_DOMAIN_LIST.includes(baseHostName)) {
console.log()
realm = 'twitter'; realm = 'twitter';
console.log('Twitter realm');
} else {
console.log(`Domain not assigned to realm, falling back to Twitter: ${url.hostname}`);
} }
/* Defaults to Twitter realm if unknown domain specified (such as the *.workers.dev hostname or deprecated domain) */ /* Defaults to Twitter realm if unknown domain specified (such as the *.workers.dev hostname or deprecated domain) */
@ -59,16 +64,18 @@ app.use('*', async (c, next) => {
app.onError((err, c) => { app.onError((err, c) => {
c.get('sentry').captureException(err); c.get('sentry').captureException(err);
/* workaround for silly TypeScript things */ console.error(err.stack);
const error = err as Error;
console.error(error.stack);
c.status(200); c.status(200);
c.header('cache-control', noCache); c.header('cache-control', noCache);
return c.html(Strings.ERROR_HTML); return c.html(Strings.ERROR_HTML);
}); });
// app.use('*', logger()); const customLogger = (message: string, ...rest: string[]) => {
console.log(message, ...rest);
};
app.use('*', logger(customLogger));
app.use('*', async (c, next) => { app.use('*', async (c, next) => {
console.log(`Hello from ⛅ ${c.req.raw.cf?.colo || 'UNK'}`); console.log(`Hello from ⛅ ${c.req.raw.cf?.colo || 'UNK'}`);