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

Revert "Moved some headers out of fetch function"

Browse source 
This reverts commit a410c0c044.
This commit is contained in:
dangered wolf 2022-08-18 16:50:26 -04:00
parent a410c0c044
commit 6b4ab57f17
No known key found for this signature in database
GPG key ID: 41E4D37680ED8B58
1 changed files with 34 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/fetch.ts
View file

@ -1,16 +1,18 @@
import { Constants } from './constants'; import { Constants } from './constants';
const invalidateTokenCache = (event: FetchEvent, cache: Cache) => { export const fetchUsingGuest = async (
console.log('Invalidating token cache'); status: string,
event && event.waitUntil(cache.delete(guestTokenRequestCacheDummy)); event: FetchEvent
} ): Promise<TimelineBlobPartial> => {
let apiAttempts = 0;
let newTokenGenerated = false;
const tokenHeaders: { [header: string]: string } = { const tokenHeaders: { [header: string]: string } = {
Authorization: Constants.GUEST_BEARER_TOKEN, Authorization: Constants.GUEST_BEARER_TOKEN,
...Constants.BASE_HEADERS ...Constants.BASE_HEADERS
}; };
const guestTokenRequest = new Request( const guestTokenRequest = new Request(
`${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`, `${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`,
{ {
method: 'POST', method: 'POST',
@ -21,9 +23,9 @@ const guestTokenRequest = new Request(
}, },
body: '' body: ''
} }
); );
/* A dummy version of the request only used for Cloudflare caching purposes. /* A dummy version of the request only used for Cloudflare caching purposes.
The reason it exists at all is because Cloudflare won't cache POST requests. */ The reason it exists at all is because Cloudflare won't cache POST requests. */
const guestTokenRequestCacheDummy = new Request( const guestTokenRequestCacheDummy = new Request(
`${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`, `${Constants.TWITTER_API_ROOT}/1.1/guest/activate.json`,
@ -34,14 +36,7 @@ const guestTokenRequest = new Request(
cacheTtl: Constants.GUEST_TOKEN_MAX_AGE cacheTtl: Constants.GUEST_TOKEN_MAX_AGE
} }
} }
); );
export const fetchUsingGuest = async (
status: string,
event: FetchEvent
): Promise<TimelineBlobPartial> => {
let apiAttempts = 0;
let newTokenGenerated = false;
const cache = caches.default; const cache = caches.default;
@ -80,7 +75,7 @@ export const fetchUsingGuest = async (
This can effectively mean virtually unlimited (read) access to Twitter's API, This can effectively mean virtually unlimited (read) access to Twitter's API,
which is very funny. */ which is very funny. */
activate = await fetch(guestTokenRequest.clone()); activate = await fetch(guestTokenRequest);
} }
/* Let's grab that guest_token so we can use it */ /* Let's grab that guest_token so we can use it */
@ -128,7 +123,7 @@ export const fetchUsingGuest = async (
/* We'll usually only hit this if we get an invalid response from Twitter. /* We'll usually only hit this if we get an invalid response from Twitter.
It's uncommon, but it happens */ It's uncommon, but it happens */
console.error('Unknown error while fetching conversation from API'); console.error('Unknown error while fetching conversation from API');
invalidateTokenCache(event, cache); event && event.waitUntil(cache.delete(guestTokenRequestCacheDummy));
newTokenGenerated = true; newTokenGenerated = true;
continue; continue;
} }
@ -140,7 +135,7 @@ export const fetchUsingGuest = async (
/* Running out of requests within our rate limit, let's purge the cache */ /* Running out of requests within our rate limit, let's purge the cache */
if (remainingRateLimit < 20) { if (remainingRateLimit < 20) {
console.log(`Purging token on this edge due to low rate limit remaining`); console.log(`Purging token on this edge due to low rate limit remaining`);
invalidateTokenCache(event, cache); event && event.waitUntil(cache.delete(guestTokenRequestCacheDummy));
} }
if ( if (