diff --git a/bun.lock b/bun.lock index c3ddafc..4e2cd14 100644 --- a/bun.lock +++ b/bun.lock @@ -11,7 +11,6 @@ "crypto": "^1.0.1", "dotenv": "^16.5.0", "express": "^5.1.0", - "p-limit": "^6.2.0", "pangu": "^4.0.7", "sharp": "^0.34.1", "uuid": "^11.1.0", @@ -202,8 +201,6 @@ "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="], - "p-limit": ["p-limit@6.2.0", "", { "dependencies": { "yocto-queue": "^1.1.1" } }, "sha512-kuUqqHNUqoIWp/c467RI4X6mmyuojY5jGutNU0wVTmEOOfcuwLqyMVoAi9MKi2Ak+5i9+nhmrK4ufZE8069kHA=="], - "pangu": ["pangu@4.0.7", "", { "bin": { "pangu": "./dist/node/cli.js" } }, "sha512-weZKJIwwy5gjt4STGVUH9bix3BGk7wZ2ahtIypwe3e/mllsrIZIvtfLx1dPX56GcpZFOCFKmeqI1qVuB9enRzA=="], "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="], @@ -272,8 +269,6 @@ "wrappy": ["wrappy@1.0.2", "", {}, "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="], - "yocto-queue": ["yocto-queue@1.2.1", "", {}, "sha512-AyeEbWOu/TAXdxlV9wmGcR0+yh2j3vYPGOECcIj2S7MkrLyC7ne+oye2BKTItt0ii2PHk4cDy+95+LshzbXnGg=="], - "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="], "form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="], diff --git a/docker-compose.yaml b/docker-compose.yaml index 7597684..a723e7b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,16 +1,4 @@ services: - warp-proxy: - image: ghcr.io/mon-ius/docker-warp-socks:v5 - container_name: dsas-cca-warp-proxy - restart: unless-stopped - ports: - - "9091:9091" - logging: - driver: "json-file" - options: - max-size: "15m" - max-file: "3" - app: build: context: . @@ -26,19 +14,10 @@ services: environment: - NODE_ENV=production - PLAYWRIGHT_BROWSERS_PATH=/ms-playwright - # Proxy configuration (only active when USE_PROXY=true) - - USE_PROXY=${USE_PROXY:-false} - - HTTP_PROXY=${HTTP_PROXY:-} - - HTTPS_PROXY=${HTTPS_PROXY:-} - - ALL_PROXY=${ALL_PROXY:-} restart: unless-stopped - extra_hosts: - - "host.docker.internal:host-gateway" depends_on: redis: condition: service_healthy - warp-proxy: - condition: service_started logging: driver: "json-file" options: diff --git a/package.json b/package.json index bfa11de..41bfe89 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "crypto": "^1.0.1", "dotenv": "^16.5.0", "express": "^5.1.0", - "p-limit": "^6.2.0", "pangu": "^4.0.7", "sharp": "^0.34.1", "uuid": "^11.1.0" diff --git a/services/playwright-auth.ts b/services/playwright-auth.ts index 6045b4b..e30227b 100644 --- a/services/playwright-auth.ts +++ b/services/playwright-auth.ts @@ -11,10 +11,6 @@ let _inMemoryCookies: Cookie[] | null = null; // Login lock to prevent concurrent login attempts let _loginLock: Promise | null = null; -// Proxy configuration -const USE_PROXY = process.env.USE_PROXY === 'true'; -const PROXY_SERVER = process.env.ALL_PROXY || process.env.HTTP_PROXY || `http://host.docker.internal:9091`; - /** * Ensure only one login process runs at a time */ @@ -48,15 +44,6 @@ export async function loginWithPlaywright(username: string, password: string): P args: ['--no-sandbox', '--disable-setuid-sandbox'] }; - // Configure proxy if enabled - if (USE_PROXY) { - logger.info(`Using proxy: ${PROXY_SERVER}`); - browserLaunchOptions.proxy = { - server: PROXY_SERVER, - bypass: 'localhost,127.0.0.1,::1' - }; - } - const browser = await chromium.launch(browserLaunchOptions); try {