From 57aaad78b038fda95aefcb29dfb7ee6d1da44076 Mon Sep 17 00:00:00 2001 From: Nulo Date: Tue, 28 Jan 2025 15:40:41 -0300 Subject: [PATCH] Revert "usar socks proxy" This reverts commit 67623acb310eae652f079acce39449ed8f2e566e. --- .github/workflows/sepa-precios-archiver.yml | 3 +-- sepa/archiver.ts | 10 +++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sepa-precios-archiver.yml b/.github/workflows/sepa-precios-archiver.yml index 62a0011..ac65a47 100644 --- a/.github/workflows/sepa-precios-archiver.yml +++ b/.github/workflows/sepa-precios-archiver.yml @@ -27,8 +27,7 @@ jobs: B2_BUCKET_NAME: ${{ secrets.B2_BUCKET_NAME }} B2_BUCKET_KEY_ID: ${{ secrets.B2_BUCKET_KEY_ID }} B2_BUCKET_KEY: ${{ secrets.B2_BUCKET_KEY }} - # DATOS_PRODUCCION_GOB_AR: https://proxy-datos-produccion-gob-ar.nulo.in - PROXY_URI: ${{ secrets.PROXY_URI }} + DATOS_PRODUCCION_GOB_AR: https://proxy-datos-produccion-gob-ar.nulo.in run: | cd sepa bun install --frozen-lockfile diff --git a/sepa/archiver.ts b/sepa/archiver.ts index 8094ad0..fce9fec 100644 --- a/sepa/archiver.ts +++ b/sepa/archiver.ts @@ -37,16 +37,12 @@ const s3 = new S3Client({ }, }); -const CURL_PROXY_ARG = process.env.PROXY_URI - ? { raw: `-x ${process.env.PROXY_URI}` } - : ""; - async function getRawDatasetInfo(attempts = 0) { try { const url = processUrl( "https://datos.produccion.gob.ar/api/3/action/package_show?id=sepa-precios" ); - return await $`curl ${CURL_PROXY_ARG} -L ${url}`.json(); + return await $`curl -L ${url}`.json(); } catch (error) { if (attempts >= 4) { console.error( @@ -150,7 +146,7 @@ for (const resource of datasetInfo.result.resources) { try { const zip = join(dir, "zip"); const url = processUrl(resource.url); - await $`curl ${CURL_PROXY_ARG} --retry 8 --retry-delay 5 --retry-all-errors -L -o ${zip} ${url}`; + await $`curl --retry 8 --retry-delay 5 --retry-all-errors -L -o ${zip} ${url}`; await $`unzip ${zip} -d ${dir}`; await rm(zip); @@ -178,7 +174,7 @@ for (const resource of datasetInfo.result.resources) { const fileName = `${resource.id}-${basename(resource.url)}`; if (await checkFileExistsInB2(fileName)) continue; console.log(`⬇️ Downloading and reuploading ${resource.url}`); - const response = await $`curl ${CURL_PROXY_ARG} -L ${resource.url}`.blob(); + const response = await $`curl -L ${resource.url}`.blob(); await uploadToB2Bucket(fileName, response); }