diff --git a/src/caches.ts b/src/caches.ts index e967e64..6b94213 100644 --- a/src/caches.ts +++ b/src/caches.ts @@ -23,13 +23,12 @@ export const cacheMiddleware = (): MiddlewareHandler => async (c, next) => { try { cacheKey = new Request(cacheUrl.toString(), request); - } catch(e) { + } catch (e) { /* In Miniflare, you can't really create requests like this, so we ignore caching in the test environment */ await next(); return c.res.clone(); } - const cache = caches.default; switch (request.method) { @@ -58,8 +57,7 @@ export const cacheMiddleware = (): MiddlewareHandler => async (c, next) => { Use waitUntil so you can return the response without blocking on writing to cache */ try { - c.executionCtx && - c.executionCtx.waitUntil(cache.put(cacheKey, response.clone())); + c.executionCtx && c.executionCtx.waitUntil(cache.put(cacheKey, response.clone())); } catch (error) { console.error((error as Error).stack); } diff --git a/src/fetch.ts b/src/fetch.ts index f0ed0c4..0581362 100644 --- a/src/fetch.ts +++ b/src/fetch.ts @@ -138,20 +138,25 @@ export const twitterFetch = async ( if (useElongator && typeof c.env?.TwitterProxy !== 'undefined') { console.log('Fetching using elongator'); const performanceStart = performance.now(); - apiRequest = await withTimeout((signal: AbortSignal) => c.env?.TwitterProxy.fetch(url, { - method: 'GET', - headers: headers, - signal: signal - })); + apiRequest = await withTimeout( + (signal: AbortSignal) => + c.env?.TwitterProxy.fetch(url, { + method: 'GET', + headers: headers, + signal: signal + }) + ); const performanceEnd = performance.now(); console.log(`Elongator request successful after ${performanceEnd - performanceStart}ms`); } else { const performanceStart = performance.now(); - apiRequest = await withTimeout((signal: AbortSignal) => fetch(url, { - method: 'GET', - headers: headers, - signal: signal - })); + apiRequest = await withTimeout((signal: AbortSignal) => + fetch(url, { + method: 'GET', + headers: headers, + signal: signal + }) + ); const performanceEnd = performance.now(); console.log(`Guest API request successful after ${performanceEnd - performanceStart}ms`); } @@ -166,7 +171,7 @@ export const twitterFetch = async ( console.log('Tweet was not found'); return null; } - try{ + try { !useElongator && c.executionCtx && c.executionCtx.waitUntil( @@ -184,7 +189,6 @@ export const twitterFetch = async ( continue; } - if ( !wasElongatorDisabled && !useElongator && diff --git a/src/helpers/author.ts b/src/helpers/author.ts index 5a8e95c..03a5de3 100644 --- a/src/helpers/author.ts +++ b/src/helpers/author.ts @@ -3,7 +3,12 @@ import { formatNumber } from './utils'; /* The embed "author" text we populate with replies, retweets, and likes unless it's a video */ export const getAuthorText = (tweet: APITweet): string | null => { /* Build out reply, retweet, like counts */ - if (tweet.likes > 0 || tweet.reposts > 0 || tweet.replies > 0 || (tweet.views ? tweet.views > 0 : false)) { + if ( + tweet.likes > 0 || + tweet.reposts > 0 || + tweet.replies > 0 || + (tweet.views ? tweet.views > 0 : false) + ) { let authorText = ''; if (tweet.replies > 0) { authorText += `${formatNumber(tweet.replies)} 💬 `; diff --git a/src/helpers/translate.ts b/src/helpers/translate.ts index c9682f6..4e88de5 100644 --- a/src/helpers/translate.ts +++ b/src/helpers/translate.ts @@ -54,11 +54,14 @@ export const translateTweet = async ( try { const url = `${Constants.TWITTER_ROOT}/i/api/1.1/strato/column/None/tweetId=${tweet.rest_id},destinationLanguage=None,translationSource=Some(Google),feature=None,timeout=None,onlyCached=None/translation/service/translateTweet`; console.log(url, headers); - translationApiResponse = await withTimeout((signal: AbortSignal) => c.env?.TwitterProxy.fetch(url, { - method: 'GET', - headers: headers, - signal: signal - })) as Response; + translationApiResponse = (await withTimeout( + (signal: AbortSignal) => + c.env?.TwitterProxy.fetch(url, { + method: 'GET', + headers: headers, + signal: signal + }) + )) as Response; translationResults = (await translationApiResponse.json()) as TranslationPartial; console.log(`translationResults`, translationResults); diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts index fb734f2..91e626b 100644 --- a/src/helpers/utils.ts +++ b/src/helpers/utils.ts @@ -33,24 +33,24 @@ export const truncateWithEllipsis = (str: string, maxLength: number): string => }; export async function withTimeout( - asyncTask: (signal: AbortSignal) => Promise, + asyncTask: (signal: AbortSignal) => Promise, timeout: number = 3000 ): Promise { const controller = new AbortController(); const timeoutId = setTimeout(() => controller.abort(), timeout); try { - const result = await asyncTask(controller.signal); - /* Clear the timeout if the task completes in time */ - clearTimeout(timeoutId); - return result; + const result = await asyncTask(controller.signal); + /* Clear the timeout if the task completes in time */ + clearTimeout(timeoutId); + return result; } catch (error) { - if ((error as Error).name === 'AbortError') { - throw new Error('Asynchronous task was aborted due to timeout'); - } else { - /* Re-throw other errors for further handling */ - throw error as Error; - } + if ((error as Error).name === 'AbortError') { + throw new Error('Asynchronous task was aborted due to timeout'); + } else { + /* Re-throw other errors for further handling */ + throw error as Error; + } } } diff --git a/src/providers/twitter/conversation.ts b/src/providers/twitter/conversation.ts index 1d55e4f..6764ced 100644 --- a/src/providers/twitter/conversation.ts +++ b/src/providers/twitter/conversation.ts @@ -69,7 +69,8 @@ export const fetchTweetDetail = async ( } console.log('invalid graphql tweet', conversation); const firstInstruction = ( - conversation?.data?.threaded_conversation_with_injections_v2?.instructions?.[0] as TimelineAddEntriesInstruction + conversation?.data?.threaded_conversation_with_injections_v2 + ?.instructions?.[0] as TimelineAddEntriesInstruction )?.entries?.[0]; if ( ( @@ -296,7 +297,8 @@ export const constructTwitterThread = async ( console.log(response); const firstInstruction = ( - response?.data?.threaded_conversation_with_injections_v2?.instructions?.[0] as TimelineAddEntriesInstruction + response?.data?.threaded_conversation_with_injections_v2 + ?.instructions?.[0] as TimelineAddEntriesInstruction )?.entries?.[0]; if ( ( diff --git a/src/providers/twitter/profile.ts b/src/providers/twitter/profile.ts index 8edd16f..c8c63e9 100644 --- a/src/providers/twitter/profile.ts +++ b/src/providers/twitter/profile.ts @@ -75,7 +75,7 @@ const populateUserProperties = async ( if (user) { return convertToApiUser(user, legacyAPI); } - + return null; }; diff --git a/src/realms/api/router.ts b/src/realms/api/router.ts index 104c56c..da5a967 100644 --- a/src/realms/api/router.ts +++ b/src/realms/api/router.ts @@ -16,4 +16,4 @@ api.get('/robots.txt', async c => c.text(Strings.ROBOTS_TXT_API)); api.get('/:handle', profileRequest); api.get('/:handle/', profileRequest); -api.get('/', async c => c.redirect(Constants.API_DOCS_URL, 302)); \ No newline at end of file +api.get('/', async c => c.redirect(Constants.API_DOCS_URL, 302)); diff --git a/src/realms/twitter/router.ts b/src/realms/twitter/router.ts index f84a287..73b51d7 100644 --- a/src/realms/twitter/router.ts +++ b/src/realms/twitter/router.ts @@ -32,10 +32,19 @@ const _profileRequest = async (c: Context) => await profileRequest(c); twitter.get('/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?', tweetRequest); twitter.get('/:endpoint{status(es)?}/:id{.+}/', tweetRequest); -twitter.get('/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?', tweetRequest); +twitter.get( + '/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?', + tweetRequest +); twitter.get('/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/', tweetRequest); -twitter.get('/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?', tweetRequest); -twitter.get('/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/', tweetRequest); +twitter.get( + '/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:language{[a-z]+}?', + tweetRequest +); +twitter.get( + '/:prefix{(dir|dl)}/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/', + tweetRequest +); twitter.get( '/:handle{[0-9a-zA-Z_]+}/:endpoint{status(es)?}/:id{.+}/:mediaType{(photos?|videos?)}/:mediaNumber{[1-4]}/', tweetRequest diff --git a/src/realms/twitter/routes/status.ts b/src/realms/twitter/routes/status.ts index db02b93..783f11a 100644 --- a/src/realms/twitter/routes/status.ts +++ b/src/realms/twitter/routes/status.ts @@ -80,9 +80,7 @@ export const statusRequest = async (c: Context) => { const baseUrl = getBaseRedirectUrl(c); - if ( - Constants.API_HOST_LIST.includes(url.hostname) - ) { + if (Constants.API_HOST_LIST.includes(url.hostname)) { console.log('JSON API request'); flags.api = true; } @@ -136,7 +134,7 @@ export const statusRequest = async (c: Context) => { /* A human has clicked a fxtwitter.com/:screen_name/status/:id link! Obviously we just need to redirect to the Tweet directly.*/ console.log('Matched human UA', userAgent); - + return c.redirect(`${baseUrl}/${handle || 'i'}/status/${id?.match(/\d{2,20}/)?.[0]}`, 302); } }; diff --git a/src/strings.ts b/src/strings.ts index f2dbefa..36b95f5 100644 --- a/src/strings.ts +++ b/src/strings.ts @@ -31,7 +31,7 @@ export const Strings = { ███ Worker build ${RELEASE_NAME} -->{headers}{body}`, -ERROR_HTML: ` + ERROR_HTML: ` @@ -63,8 +63,8 @@ This may be caused by API downtime or a new bug. Try again in a little while." p

${RELEASE_NAME}

` - .replace(/( {2})/g, '') - .replace(/>\s+<'), + .replace(/( {2})/g, '') + .replace(/>\s+<'), TIMEOUT_ERROR_HTML: ` @@ -156,8 +156,8 @@ This may be caused by API downtime or a new bug. Try again in a little while." p {ua} ` - .replace(/( {2})/g, '') - .replace(/>\s+<'), + .replace(/( {2})/g, '') + .replace(/>\s+<'), MESSAGE_HTML: ` @@ -190,8 +190,8 @@ This may be caused by API downtime or a new bug. Try again in a little while." p

{message}

` - .replace(/( {2})/g, '') - .replace(/>\s+<'), + .replace(/( {2})/g, '') + .replace(/>\s+<'), DEFAULT_AUTHOR_TEXT: 'Twitter', QUOTE_TEXT: `↘️ Quoting {name} (@{screen_name})`, diff --git a/src/types/env.d.ts b/src/types/env.d.ts index 1e4051b..d38e132 100644 --- a/src/types/env.d.ts +++ b/src/types/env.d.ts @@ -12,4 +12,4 @@ declare const MOSAIC_DOMAIN_LIST: string; declare const API_HOST_LIST: string; declare const SENTRY_DSN: string; -declare const RELEASE_NAME: string; \ No newline at end of file +declare const RELEASE_NAME: string; diff --git a/src/worker.ts b/src/worker.ts index bda68c1..5f5a74b 100644 --- a/src/worker.ts +++ b/src/worker.ts @@ -85,7 +85,11 @@ app.onError((err, c) => { errorCode = 504; } /* We return it as a 200 so embedded applications can display the error */ - if (c.req.header('User-Agent')?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)) { + if ( + c.req + .header('User-Agent') + ?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi) + ) { errorCode = 200; } c.status(errorCode); @@ -116,8 +120,12 @@ app.route(`/twitter`, twitter); app.all('/error', async c => { c.header('cache-control', noCache); - - if (c.req.header('User-Agent')?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)) { + + if ( + c.req + .header('User-Agent') + ?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi) + ) { c.status(200); return c.html(Strings.ERROR_HTML); } @@ -140,18 +148,25 @@ export default { errorCode = 504; } /* We return it as a 200 so embedded applications can display the error */ - if (request.headers.get('user-agent')?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi)) { + if ( + request.headers + .get('user-agent') + ?.match(/(discordbot|telegrambot|facebook|whatsapp|firefox\/92|vkshare)/gi) + ) { errorCode = 200; } - return new Response(e.name === 'AbortError' ? Strings.TIMEOUT_ERROR_HTML : Strings.ERROR_HTML, { - headers: { - ...Constants.RESPONSE_HEADERS, - 'content-type': 'text/html;charset=utf-8', - 'cache-control': noCache - }, - status: errorCode - }); + return new Response( + e.name === 'AbortError' ? Strings.TIMEOUT_ERROR_HTML : Strings.ERROR_HTML, + { + headers: { + ...Constants.RESPONSE_HEADERS, + 'content-type': 'text/html;charset=utf-8', + 'cache-control': noCache + }, + status: errorCode + } + ); } } -}; \ No newline at end of file +};