diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml new file mode 100644 index 0000000..765e7a0 --- /dev/null +++ b/.github/workflows/build-docker.yml @@ -0,0 +1,62 @@ +name: Docker + +on: + push: + paths-ignore: + - "README.md" + branches: + - master + +jobs: + tests: + uses: ./.github/workflows/run-tests.yml + build-docker-amd64: + needs: [tests] + runs-on: buildjet-2vcpu-ubuntu-2204 + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v2 + with: + version: latest + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Build and push AMD64 Docker image + uses: docker/build-push-action@v3 + with: + context: . + file: ./Dockerfile + platforms: linux/amd64 + push: true + tags: zedeus/nitter:latest,zedeus/nitter:${{ github.sha }} + build-docker-arm64: + needs: [tests] + runs-on: buildjet-2vcpu-ubuntu-2204-arm + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v2 + with: + version: latest + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Build and push ARM64 Docker image + uses: docker/build-push-action@v3 + with: + context: . + file: ./Dockerfile.arm64 + platforms: linux/arm64 + push: true + tags: zedeus/nitter:latest-arm64,zedeus/nitter:${{ github.sha }}-arm64 diff --git a/.github/workflows/build-publish-docker.yml b/.github/workflows/build-publish-docker.yml deleted file mode 100644 index d32a220..0000000 --- a/.github/workflows/build-publish-docker.yml +++ /dev/null @@ -1,60 +0,0 @@ -name: Build and Publish Docker - -on: - push: - branches: ["master"] - paths-ignore: ["README.md"] - pull_request: - branches: ["master"] - paths-ignore: ["README.md"] - -env: - IMAGE_NAME: ${{ github.repository }} - -permissions: - contents: read - packages: write - -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up QEMU - id: qemu - uses: docker/setup-qemu-action@v2 - with: - platforms: arm64 - - - name: Setup Docker buildx - id: buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to GHCR - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@v4 - with: - images: | - ghcr.io/${{ env.IMAGE_NAME }} - - - - name: Build and push all platforms Docker image - id: build-and-push - uses: docker/build-push-action@v4 - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64,linux/arm64 - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/README.md b/README.md index d1b8fc9..4f8235d 100644 --- a/README.md +++ b/README.md @@ -33,10 +33,6 @@ XMR: 42hKayRoEAw4D6G6t8mQHPJHQcXqofjFuVfavqKeNMNUZfeJLJAcNU19i1bGdDvcdN6romiSscW - Archiving tweets/profiles - Developer API -## New Features - -- Likes tab - ## Resources The wiki contains @@ -103,12 +99,6 @@ $ nimble md $ cp nitter.example.conf nitter.conf ``` -Edit `twitter_oauth.sh` with your Twitter account name and password. - -``` -$ ./twitter_oauth.sh | tee -a guest_accounts.jsonl -``` - Set your hostname, port, HMAC key, https (must be correct for cookies), and Redis info in `nitter.conf`. To run Redis, either run `redis-server --daemonize yes`, or `systemctl enable --now redis` (or diff --git a/docker-compose.yml b/docker-compose.yml index cbfb722..2c4625e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,34 @@ version: "3" +networks: + nitter: + services: + # proxy: + # hostname: nitter-proxy + # container_name: nitter-proxy + # build: + # context: ./proxy + # dockerfile: Dockerfile + # environment: + # HOST: "0.0.0.0" + # PORT: "8080" + # NITTER_BASE_URL: "http://nitter:8080" + # CONCURRENCY: "1" + # ports: + # - "8002:8080" + # networks: + # - nitter nitter: - image: ghcr.io/privacydevel/nitter:master + build: . container_name: nitter + hostname: nitter ports: - - "127.0.0.1:8080:8080" # Replace with "8080:8080" if you don't use a reverse proxy + - "8002:8080" # Replace with "8080:8080" if you don't use a reverse proxy volumes: - ./nitter.conf:/src/nitter.conf:Z,ro + - ./guest_accounts.json:/src/guest_accounts.json:Z,ro depends_on: - nitter-redis restart: unless-stopped @@ -23,6 +43,8 @@ services: - no-new-privileges:true cap_drop: - ALL + networks: + - nitter nitter-redis: image: redis:6-alpine @@ -42,6 +64,8 @@ services: - no-new-privileges:true cap_drop: - ALL + networks: + - nitter volumes: nitter-redis: diff --git a/proxy/.prettierignore b/proxy/.prettierignore deleted file mode 100644 index 18f1a04..0000000 --- a/proxy/.prettierignore +++ /dev/null @@ -1,2 +0,0 @@ -**/*.md -pnpm-lock.yaml diff --git a/proxy/.prettierrc.yaml b/proxy/.prettierrc.yaml deleted file mode 100644 index 88e0a15..0000000 --- a/proxy/.prettierrc.yaml +++ /dev/null @@ -1,6 +0,0 @@ -proseWrap: always -semi: false -singleQuote: true -printWidth: 80 -trailingComma: none -htmlWhitespaceSensitivity: ignore diff --git a/proxy/package.json b/proxy/package.json index 0aa594b..0092699 100644 --- a/proxy/package.json +++ b/proxy/package.json @@ -4,7 +4,6 @@ "scripts": { "clean": "rm -rf build", "prebuild": "npm run clean", - "format": "prettier -w --cache --check .", "build": "tsc --build" }, "author": "", @@ -23,7 +22,6 @@ }, "devDependencies": { "@types/node": "^20.12.12", - "dotenv": "^16.4.4", - "prettier": "^3.2.5" + "dotenv": "^16.4.4" } } diff --git a/proxy/pnpm-lock.yaml b/proxy/pnpm-lock.yaml index 1876821..2d53adc 100644 --- a/proxy/pnpm-lock.yaml +++ b/proxy/pnpm-lock.yaml @@ -45,9 +45,6 @@ importers: dotenv: specifier: ^16.4.4 version: 16.4.4 - prettier: - specifier: ^3.2.5 - version: 3.2.5 packages: @@ -295,11 +292,6 @@ packages: resolution: {integrity: sha512-Mz/gKiRyuXu4HnpHgi1YWdHQCoWMufapzooisvFn78zl4dZciAxS+YeRkUxXl1ee/SzU80YCz1zpECCh4oC6Aw==} hasBin: true - prettier@3.2.5: - resolution: {integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==} - engines: {node: '>=14'} - hasBin: true - process-warning@2.3.2: resolution: {integrity: sha512-n9wh8tvBe5sFmsqlg+XQhaQLumwpqoAUruLwjCopgTmUBjJ/fjtBsJzKleCaIGBOMXYEhp1YfKl4d7rJ5ZKJGA==} @@ -676,8 +668,6 @@ snapshots: sonic-boom: 3.8.0 thread-stream: 2.4.1 - prettier@3.2.5: {} - process-warning@2.3.2: {} process-warning@3.0.0: {} diff --git a/proxy/src/index.ts b/proxy/src/index.ts index b7c121d..020c5ef 100644 --- a/proxy/src/index.ts +++ b/proxy/src/index.ts @@ -1,116 +1,89 @@ + import fastify, { - FastifyInstance, - FastifyListenOptions, - FastifyReply, - FastifyRequest -} from 'fastify' -import { PinoLoggerOptions } from 'fastify/types/logger' -import { Proxy } from './proxy' -import { Logger } from 'pino' + FastifyInstance, + FastifyListenOptions, + FastifyReply, + FastifyRequest, +} from "fastify" +import { PinoLoggerOptions } from "fastify/types/logger" +import { Proxy } from "./proxy" +import { Logger } from "pino" import 'dotenv/config' const host = process.env.HOST -const port = parseInt(process.env.PORT ?? '8080', 10) +const port = parseInt(process.env.PORT ?? "8080", 10) const baseUrl = process.env.NITTER_BASE_URL -const concurrency = parseInt(process.env.CONCURRENCY ?? '1', 10) -const retryAfterMillis = process.env.RETRY_AFTER_MILLIS - ? parseInt(process.env.RETRY_AFTER_MILLIS, 10) - : null -const maxCacheSize = parseInt(process.env.MAX_CACHE_SIZE ?? '100000', 10) -const logLevel = process.env.LOG_LEVEL ?? 'debug' +const concurrency = parseInt(process.env.CONCURRENCY ?? "1", 10) +const retryAfterMillis = process.env.RETRY_AFTER_MILLIS ? parseInt(process.env.RETRY_AFTER_MILLIS, 10) : null +const maxCacheSize = parseInt(process.env.MAX_CACHE_SIZE ?? "100000", 10) +const logLevel = process.env.LOG_LEVEL ?? "debug" const server = fastify({ - logger: { - name: 'app', - level: logLevel, - ...(logLevel == 'trace' ? { transport: { target: 'pino-pretty' } } : {}) - } as PinoLoggerOptions + logger: { + name: "app", + level: logLevel, + ...( logLevel == "trace" ? { transport: { target: 'pino-pretty' } } : {}) + } as PinoLoggerOptions }) const log = server.log as Logger -const proxy = new Proxy( - log, - baseUrl, - concurrency, - retryAfterMillis, - maxCacheSize -) +const proxy = new Proxy(log, baseUrl, concurrency, retryAfterMillis, maxCacheSize) async function main() { - server.register( - (fastify: FastifyInstance, opts, done) => { - fastify.get( - `/user/:username`, - {}, - async (request: FastifyRequest, reply: FastifyReply) => { - log.debug( - { - headers: request.headers, - reqId: request.id, - params: request.params - }, - 'incoming request /user/:username' - ) - const { username } = request.params as any - const { status, data } = await proxy.getUser(username, { - reqId: request.id - }) - reply.status(status).send(data) - } - ) - fastify.get( - `/user/:userId/tweets`, - {}, - async (request: FastifyRequest, reply: FastifyReply) => { - const { userId } = request.params as any - const { cursor } = request.query as any - const { status, data } = await proxy.getUserTweets(userId, cursor, { - reqId: request.id - }) - reply.status(status).send(data) - } - ) + server.register((fastify: FastifyInstance, opts, done) => { - fastify.get( - `/tweet/:id`, - {}, - async (request: FastifyRequest, reply: FastifyReply) => { - const { id } = request.params as any - const { status, data } = await proxy.getTweetById(id, { - reqId: request.id - }) - reply.status(status).send(data) - } - ) + fastify.get(`/user/:username`, {}, + async (request: FastifyRequest, reply: FastifyReply) => { + log.debug({ + headers: request.headers, + reqId: request.id, + params: request.params }, 'incoming request /user/:username') + const { username } = request.params as any + const { status, data } = await proxy.getUser(username, { reqId: request.id }) + reply.status(status).send(data) + }); - done() - }, - { prefix: '/api' } - ) + fastify.get(`/user/:userId/tweets`, {}, + async (request: FastifyRequest, reply: FastifyReply) => { + const { userId } = request.params as any + const { cursor } = request.query as any + const { status, data } = await proxy.getUserTweets(userId, cursor, { reqId: request.id }) + reply.status(status).send(data) + }); - server.setNotFoundHandler((request: FastifyRequest, reply: FastifyReply) => { - reply.status(404).send({ message: `Method not found` }) - }) + fastify.get(`/tweet/:id`, {}, + async (request: FastifyRequest, reply: FastifyReply) => { + const { id } = request.params as any + const { status, data } = await proxy.getTweetById(id, { reqId: request.id }) + reply.status(status).send(data) + }); - server.setErrorHandler( - (err: Error, request: FastifyRequest, reply: FastifyReply) => { - const { log } = request - log.error(err) - // Send error response - reply.status(500).send({ message: `Internal server error` }) - } - ) + done() - // await server.register(import('@fastify/rate-limit'), { - // max: 100, - // timeWindow: '1 minute' - // }) + }, { prefix: '/api' }) - await server.listen({ port, host } as FastifyListenOptions) + server.setNotFoundHandler((request: FastifyRequest, reply: FastifyReply) => { + reply.status(404) + .send({ message: `Method not found` }) + }) + + server.setErrorHandler((err: Error, request: FastifyRequest, reply: FastifyReply) => { + const { log } = request + log.error(err) + // Send error response + reply.status(500).send({ message: `Internal server error` }) + }) + + // await server.register(import('@fastify/rate-limit'), { + // max: 100, + // timeWindow: '1 minute' + // }) + + await server.listen({ port, host } as FastifyListenOptions); } -main().catch((err) => { - log.fatal(err) - process.exit(1) +main().catch(err => { + log.fatal(err) + process.exit(1) }) diff --git a/proxy/src/proxy.ts b/proxy/src/proxy.ts index a9fb9e5..872f481 100644 --- a/proxy/src/proxy.ts +++ b/proxy/src/proxy.ts @@ -1,226 +1,209 @@ // noinspection TypeScriptUnresolvedReference -import axios from 'axios' -import { AxiosInstance, AxiosRequestConfig } from 'axios' -import fastq from 'fastq' -import { Logger } from 'pino' -import retry from 'axios-retry-after' +import axios from "axios" +import { AxiosInstance, AxiosRequestConfig } from "axios" +import fastq from "fastq" +import { Logger } from "pino" +import retry from "axios-retry-after" import { LRUCache } from 'lru-cache' const GET_USER_POSITIVE_TTL_MS = process.env.GET_USER_POSITIVE_TTL - ? parseInt(process.env.GET_USER_POSITIVE_TTL, 10) * 1000 - : 30 * 24 * 3600 * 1000 + ? parseInt(process.env.GET_USER_POSITIVE_TTL, 10) * 1000 + : 30 * 24 * 3600 * 1000 const GET_USER_NEGATIVE_TTL_MS = process.env.GET_USER_NEGATIVE_TTL - ? parseInt(process.env.GET_USER_NEGATIVE_TTL, 10) * 1000 - : 3600 * 1000 + ? parseInt(process.env.GET_USER_NEGATIVE_TTL, 10) * 1000 + : 3600 * 1000 const GET_TWEETS_POSITIVE_TTL_MS = process.env.GET_TWEETS_POSITIVE_TTL - ? parseInt(process.env.GET_TWEETS_POSITIVE_TTL, 10) * 1000 - : 60 * 1000 + ? parseInt(process.env.GET_TWEETS_POSITIVE_TTL, 10) * 1000 + : 60 * 1000 const GET_TWEETS_NEGATIVE_TTL_MS = process.env.GET_TWEETS_NEGATIVE_TTL - ? parseInt(process.env.GET_TWEETS_NEGATIVE_TTL, 10) * 1000 - : 60 * 1000 + ? parseInt(process.env.GET_TWEETS_NEGATIVE_TTL, 10) * 1000 + : 60 * 1000 const GET_TWEET_POSITIVE_TTL_MS = process.env.GET_TWEET_POSITIVE_TTL - ? parseInt(process.env.GET_TWEET_POSITIVE_TTL, 10) * 1000 - : 60 * 1000 + ? parseInt(process.env.GET_TWEET_POSITIVE_TTL, 10) * 1000 + : 60 * 1000 const GET_TWEET_NEGATIVE_TTL_MS = process.env.GET_TWEET_NEGATIVE_TTL - ? parseInt(process.env.GET_TWEET_NEGATIVE_TTL, 10) * 1000 - : 60 * 1000 + ? parseInt(process.env.GET_TWEET_NEGATIVE_TTL, 10) * 1000 + : 60 * 1000 export interface Job { - reqId: string - url: string - params?: Record + reqId: string + url: string + params?: Record } export interface JobResponse { - status: number - data: any + status: number, + data: any } export class Proxy { - private readonly cache: LRUCache - private readonly client: AxiosInstance - private readonly queue: fastq.queueAsPromised - private counter: { requests: number } - private timeWindowMillis = 15 * 60 * 1000 - private maxRequestsPerAccount = 15 * 60 - constructor( - private log: Logger, - private baseUrl: string, - private concurrency: number, - retryAfterMillis: number, - maxCacheSize: number - ) { - this.cache = new LRUCache({ max: maxCacheSize }) - this.queue = fastq.promise(this, this.sendRequest, concurrency) - this.client = axios.create() - this.counter = { - requests: 0 + private readonly cache: LRUCache + private readonly client: AxiosInstance + private readonly queue: fastq.queueAsPromised + private counter: { requests: number } + private timeWindowMillis = 15 * 60 * 1000 + private maxRequestsPerAccount = 15 * 60 + + constructor( + private log: Logger, + private baseUrl: string, + private concurrency: number, + retryAfterMillis: number, + maxCacheSize: number + ) { + this.cache = new LRUCache({ max: maxCacheSize }) + this.queue = fastq.promise(this, this.sendRequest, concurrency) + this.client = axios.create() + this.counter = { + requests: 0 + } + + setInterval(() => { + this.counter.requests = 0 + }, this.timeWindowMillis) + + if ( retryAfterMillis ) { + this.client.interceptors.response.use(null, retry(this.client, { + // Determine when we should attempt to retry + isRetryable (error) { + log.debug({ status: error.response?.status, headers: error.response?.headers }, 'checking retryable') + return ( + error.response && error.response.status === 429 + // Use X-Retry-After rather than Retry-After, and cap retry delay at 60 seconds + // && error.response.headers['x-retry-after'] && error.response.headers['x-retry-after'] <= 60 + ) + }, + // Customize the wait behavior + wait (error) { + log.debug({ status: error.response?.status, headers: error.response?.headers }, 'waiting for retry') + return new Promise( + // Use X-Retry-After rather than Retry-After + // resolve => setTimeout(resolve, error.response.headers['x-retry-after']) + resolve => setTimeout(resolve, retryAfterMillis) + ) + } + })) + } } - setInterval(() => { - this.counter.requests = 0 - }, this.timeWindowMillis) + async getUser(username: string, options?: { reqId?: string }) { + const key = `usernames:${username}` - if (retryAfterMillis) { - this.client.interceptors.response.use( - null, - retry(this.client, { - // Determine when we should attempt to retry - isRetryable(error) { - log.debug( - { - status: error.response?.status, - headers: error.response?.headers - }, - 'checking retryable' - ) - return ( - error.response && error.response.status === 429 - // Use X-Retry-After rather than Retry-After, and cap retry delay at 60 seconds - // && error.response.headers['x-retry-after'] && error.response.headers['x-retry-after'] <= 60 - ) - }, - // Customize the wait behavior - wait(error) { - log.debug( - { - status: error.response?.status, - headers: error.response?.headers - }, - 'waiting for retry' - ) - return new Promise( - // Use X-Retry-After rather than Retry-After - // resolve => setTimeout(resolve, error.response.headers['x-retry-after']) - (resolve) => setTimeout(resolve, retryAfterMillis) - ) - } + if ( this.cache.has(key)) { + return this.cache.get(key) + } + + const result = await this.queue.push({ + url: `/api/user/${ username }`, + reqId: options?.reqId }) - ) - } - } - async getUser(username: string, options?: { reqId?: string }) { - const key = `usernames:${username}` + if ( result.status === 200 ) { + this.cache.set(key, result, { ttl: GET_USER_POSITIVE_TTL_MS }) + } + if ( result.status === 404 ) { + this.cache.set(key, result, { ttl: GET_USER_NEGATIVE_TTL_MS }) + } - if (this.cache.has(key)) { - return this.cache.get(key) + return result } - const result = await this.queue.push({ - url: `/api/user/${username}`, - reqId: options?.reqId - }) + async getUserTweets(userId: string, cursor?: string, options?: { reqId?: string }) { + const key = `users:${userId}:tweets:${cursor ?? 'last'}` - if (result.status === 200) { - this.cache.set(key, result, { ttl: GET_USER_POSITIVE_TTL_MS }) - } - if (result.status === 404) { - this.cache.set(key, result, { ttl: GET_USER_NEGATIVE_TTL_MS }) + if ( this.cache.has(key) ) { + return this.cache.get(key) + } + + const result = await this.queue.push({ + url: `/api/user/${ userId }/tweets`, + params: { cursor }, + reqId: options?.reqId + }) + + if ( result.status === 200 ) { + this.cache.set(key, result, { ttl: GET_TWEETS_POSITIVE_TTL_MS }) + } + if ( result.status === 404 ) { + this.cache.set(key, result, { ttl: GET_TWEETS_NEGATIVE_TTL_MS }) + } + + return result } - return result - } + async getTweetById(tweetId: string, options?: { reqId?: string }) { + const key = `tweets:${tweetId}` - async getUserTweets( - userId: string, - cursor?: string, - options?: { reqId?: string } - ) { - const key = `users:${userId}:tweets:${cursor ?? 'last'}` + if ( this.cache.has(key) ) { + return this.cache.get(key) + } - if (this.cache.has(key)) { - return this.cache.get(key) + const result = await this.queue.push({ + url: `/api/tweet/${ tweetId }`, + reqId: options?.reqId + }) + + if ( result.status === 200 ) { + this.cache.set(key, result, { ttl: GET_TWEET_POSITIVE_TTL_MS }) + } + if ( result.status === 404 ) { + this.cache.set(key, result, { ttl: GET_TWEET_NEGATIVE_TTL_MS }) + } + + return result } - const result = await this.queue.push({ - url: `/api/user/${userId}/tweets`, - params: { cursor }, - reqId: options?.reqId - }) + private async sendRequest(job: Job): Promise { - if (result.status === 200) { - this.cache.set(key, result, { ttl: GET_TWEETS_POSITIVE_TTL_MS }) + const { reqId, url, params } = job + + if ( this.counter.requests > this.concurrency * this.maxRequestsPerAccount ) { + return { + status: 429 + } + } + + let config = { + url, + method: "get", + baseURL: this.baseUrl, + params, + } as AxiosRequestConfig + + this.log.trace({ config, reqId: reqId }, 'sending request to nitter') + + try { + const response = await this.client.request(config) + + this.log.trace({ + status: response.status, + data: response.data, + reqId: reqId + }, 'nitter response') + + return { + status: response.status, + data: response.data, + } as JobResponse + + } catch(err) { + + this.log.warn({ err, reqId }, 'nitter error') + + if ( err.name === "AxiosError" ) { + + this.counter.requests = Number.MAX_SAFE_INTEGER + + return { + status: 429 + } as JobResponse + } + + return { + status: 500 + } + } } - if (result.status === 404) { - this.cache.set(key, result, { ttl: GET_TWEETS_NEGATIVE_TTL_MS }) - } - - return result - } - - async getTweetById(tweetId: string, options?: { reqId?: string }) { - const key = `tweets:${tweetId}` - - if (this.cache.has(key)) { - return this.cache.get(key) - } - - const result = await this.queue.push({ - url: `/api/tweet/${tweetId}`, - reqId: options?.reqId - }) - - if (result.status === 200) { - this.cache.set(key, result, { ttl: GET_TWEET_POSITIVE_TTL_MS }) - } - if (result.status === 404) { - this.cache.set(key, result, { ttl: GET_TWEET_NEGATIVE_TTL_MS }) - } - - return result - } - - private async sendRequest(job: Job): Promise { - const { reqId, url, params } = job - - if (this.counter.requests > this.concurrency * this.maxRequestsPerAccount) { - return { - status: 429 - } - } - - let config = { - url, - method: 'get', - baseURL: this.baseUrl, - params - } as AxiosRequestConfig - - this.log.trace({ config, reqId: reqId }, 'sending request to nitter') - - try { - const response = await this.client.request(config) - - this.log.trace( - { - status: response.status, - data: response.data, - reqId: reqId - }, - 'nitter response' - ) - - return { - status: response.status, - data: response.data - } as JobResponse - } catch (err) { - this.log.warn({ err, reqId }, 'nitter error') - - if (err.name === 'AxiosError') { - this.counter.requests = Number.MAX_SAFE_INTEGER - - return { - status: 429 - } as JobResponse - } - - return { - status: 500 - } - } - } } diff --git a/proxy/src/types.d.ts b/proxy/src/types.d.ts index cd9cf13..a0c18fa 100644 --- a/proxy/src/types.d.ts +++ b/proxy/src/types.d.ts @@ -1,37 +1,39 @@ declare module 'axios-retry-after' { - import { AxiosError, AxiosInstance } from 'axios' - /** - * Function to enhance Axios instance with retry-after functionality. - * @param axios Axios instance to be enhanced. - * @param options Configuration options for retry behavior. - */ - export default function ( - axios: AxiosInstance, - options?: AxiosRetryAfterOptions - ): (error: AxiosError) => Promise - - /** - * Configuration options for axios-retry-after. - */ - export interface AxiosRetryAfterOptions { - /** - * Function to determine if an error response is retryable. - * @param error The Axios error to evaluate. - */ - isRetryable?: (error: AxiosError) => boolean + import { AxiosError, AxiosInstance } from "axios"; /** - * Function to wait for a specified amount of time. - * @param error The Axios error that contains retry-after header. + * Function to enhance Axios instance with retry-after functionality. + * @param axios Axios instance to be enhanced. + * @param options Configuration options for retry behavior. */ - wait?: (error: AxiosError) => Promise + export default function( + axios: AxiosInstance, + options?: AxiosRetryAfterOptions + ): (error: AxiosError) => Promise; /** - * Function to retry the original request. - * @param axios The Axios instance used for retrying the request. - * @param error The Axios error to retry. + * Configuration options for axios-retry-after. */ - retry?: (axios: AxiosInstance, error: AxiosError) => Promise - } + export interface AxiosRetryAfterOptions { + /** + * Function to determine if an error response is retryable. + * @param error The Axios error to evaluate. + */ + isRetryable?: (error: AxiosError) => boolean; + + /** + * Function to wait for a specified amount of time. + * @param error The Axios error that contains retry-after header. + */ + wait?: (error: AxiosError) => Promise; + + /** + * Function to retry the original request. + * @param axios The Axios instance used for retrying the request. + * @param error The Axios error to retry. + */ + retry?: (axios: AxiosInstance, error: AxiosError) => Promise; + } } + diff --git a/proxy/tsconfig.json b/proxy/tsconfig.json index ee6e859..12c5931 100644 --- a/proxy/tsconfig.json +++ b/proxy/tsconfig.json @@ -12,5 +12,7 @@ "outDir": "./build" }, "include": ["src/**/*"], - "exclude": ["node_modules"] + "exclude": [ + "node_modules" + ] } diff --git a/public/css/baguetteBox.min.css b/public/css/baguetteBox.min.css deleted file mode 100644 index f1c5ca9..0000000 --- a/public/css/baguetteBox.min.css +++ /dev/null @@ -1,6 +0,0 @@ -/*! - * baguetteBox.js - * @author feimosi - * @version 1.11.1 - * @url https://github.com/feimosi/baguetteBox.js - */#baguetteBox-overlay{display:none;opacity:0;position:fixed;overflow:hidden;top:0;left:0;width:100%;height:100%;z-index:1000000;background-color:#222;background-color:rgba(0,0,0,.8);-webkit-transition:opacity .5s ease;transition:opacity .5s ease}#baguetteBox-overlay.visible{opacity:1}#baguetteBox-overlay .full-image{display:inline-block;position:relative;width:100%;height:100%;text-align:center}#baguetteBox-overlay .full-image figure{display:inline;margin:0;height:100%}#baguetteBox-overlay .full-image img{display:inline-block;width:auto;height:auto;max-height:100%;max-width:100%;vertical-align:middle;-webkit-box-shadow:0 0 8px rgba(0,0,0,.6);-moz-box-shadow:0 0 8px rgba(0,0,0,.6);box-shadow:0 0 8px rgba(0,0,0,.6)}#baguetteBox-overlay .full-image figcaption{display:block;position:absolute;bottom:0;width:100%;text-align:center;line-height:1.8;white-space:normal;color:#ccc;background-color:#000;background-color:rgba(0,0,0,.6);font-family:sans-serif}#baguetteBox-overlay .full-image:before{content:"";display:inline-block;height:50%;width:1px;margin-right:-1px}#baguetteBox-slider{position:absolute;left:0;top:0;height:100%;width:100%;white-space:nowrap;-webkit-transition:left .4s ease,-webkit-transform .4s ease;transition:left .4s ease,-webkit-transform .4s ease;transition:left .4s ease,transform .4s ease;transition:left .4s ease,transform .4s ease,-webkit-transform .4s ease,-moz-transform .4s ease}#baguetteBox-slider.bounce-from-right{-webkit-animation:bounceFromRight .4s ease-out;animation:bounceFromRight .4s ease-out}#baguetteBox-slider.bounce-from-left{-webkit-animation:bounceFromLeft .4s ease-out;animation:bounceFromLeft .4s ease-out}@-webkit-keyframes bounceFromRight{0%,100%{margin-left:0}50%{margin-left:-30px}}@keyframes bounceFromRight{0%,100%{margin-left:0}50%{margin-left:-30px}}@-webkit-keyframes bounceFromLeft{0%,100%{margin-left:0}50%{margin-left:30px}}@keyframes bounceFromLeft{0%,100%{margin-left:0}50%{margin-left:30px}}.baguetteBox-button#next-button,.baguetteBox-button#previous-button{top:50%;top:calc(50% - 30px);width:44px;height:60px}.baguetteBox-button{position:absolute;cursor:pointer;outline:0;padding:0;margin:0;border:0;-moz-border-radius:15%;border-radius:15%;background-color:#323232;background-color:rgba(50,50,50,.5);color:#ddd;font:1.6em sans-serif;-webkit-transition:background-color .4s ease;transition:background-color .4s ease}.baguetteBox-button:focus,.baguetteBox-button:hover{background-color:rgba(50,50,50,.9)}.baguetteBox-button#next-button{right:2%}.baguetteBox-button#previous-button{left:2%}.baguetteBox-button#close-button{top:20px;right:2%;right:calc(2% + 6px);width:30px;height:30px}.baguetteBox-button svg{position:absolute;left:0;top:0}.baguetteBox-spinner{width:40px;height:40px;display:inline-block;position:absolute;top:50%;left:50%;margin-top:-20px;margin-left:-20px}.baguetteBox-double-bounce1,.baguetteBox-double-bounce2{width:100%;height:100%;-moz-border-radius:50%;border-radius:50%;background-color:#fff;opacity:.6;position:absolute;top:0;left:0;-webkit-animation:bounce 2s infinite ease-in-out;animation:bounce 2s infinite ease-in-out}.baguetteBox-double-bounce2{-webkit-animation-delay:-1s;animation-delay:-1s}@-webkit-keyframes bounce{0%,100%{-webkit-transform:scale(0);transform:scale(0)}50%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes bounce{0%,100%{-webkit-transform:scale(0);-moz-transform:scale(0);transform:scale(0)}50%{-webkit-transform:scale(1);-moz-transform:scale(1);transform:scale(1)}} \ No newline at end of file diff --git a/public/js/baguetteBox.min.js b/public/js/baguetteBox.min.js deleted file mode 100644 index a6c7b04..0000000 --- a/public/js/baguetteBox.min.js +++ /dev/null @@ -1,7 +0,0 @@ -/*! - * baguetteBox.js - * @author feimosi - * @version 1.11.1 - * @url https://github.com/feimosi/baguetteBox.js - */ -!function(e,t){"use strict";"function"==typeof define&&define.amd?define(t):"object"==typeof exports?module.exports=t():e.baguetteBox=t()}(this,function(){"use strict";var r,l,u,c,d,f='',g='',p='',b={},v={captions:!0,buttons:"auto",fullScreen:!1,noScrollbars:!1,bodyClass:"baguetteBox-open",titleTag:!1,async:!1,preload:2,animation:"slideIn",afterShow:null,afterHide:null,onChange:null,overlayBackgroundColor:"rgba(0,0,0,.8)"},m={},h=[],o=0,n=!1,i={},a=!1,y=/.+\.(gif|jpe?g|png|webp)/i,w={},k=[],s=null,x=function(e){-1!==e.target.id.indexOf("baguette-img")&&j()},E=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0,D()},C=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0,X()},B=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0,j()},T=function(e){i.count++,1