volver a descargar separado por host

Containerfile

@@ -1,6 +1,7 @@
 FROM docker.io/alpine:3.18 as build
 RUN apk add --no-cache npm esbuild
-COPY package.json download_json.js /tmp/build
+RUN npm install -g esbuild
+COPY package.json download_json.js /tmp/build/
 RUN cd /tmp/build && \
     npm install && \
     esbuild --bundle --format=cjs --platform=node --outfile=build.js download_json.js
@@ -12,3 +13,24 @@ COPY --from=build /tmp/build/build.js /usr/local/bin/download_json.js
 ENV NODE_EXTRA_CA_CERTS=/usr/lib/ca_intermediate_root_bundle.pem
 WORKDIR /data
 CMD ["/sbin/tini", "node", "/usr/local/bin/download_json.js", "https://datos.gob.ar/data.json"]
+
+# https://datos.gob.ar/data.json
+# http://datos.energia.gob.ar/data.json
+# https://datos.magyp.gob.ar/data.json
+# https://datos.acumar.gov.ar/data.json
+# https://datasets.datos.mincyt.gob.ar/data.json
+# https://datos.arsat.com.ar/data.json
+# https://datos.cultura.gob.ar/data.json
+# https://datos.mininterior.gob.ar/data.json
+# https://datos.produccion.gob.ar/data.json
+# https://datos.salud.gob.ar/data.json
+# https://datos.transporte.gob.ar/data.json
+# https://ckan.ciudaddemendoza.gov.ar/data.json
+# https://datos.santafe.gob.ar/data.json
+# https://datosabiertos.chaco.gob.ar/data.json
+# https://datosabiertos.gualeguaychu.gov.ar/data.json
+# https://datosabiertos.mercedes.gob.ar/data.json
+# http://luj-bue-datos.paisdigital.innovacion.gob.ar/data.json
+
+#https://datos.mindef.gov.ar
+#https://datosabiertos.desarrollosocial.gob.ar

download_json.js

@@ -2,6 +2,7 @@
 import { mkdir, open, writeFile } from "node:fs/promises";
 import { Agent, fetch, request, setGlobalDispatcher } from "undici";
 import { join, normalize } from "node:path";
+import pLimit from "p-limit";
 
 // FYI: al menos los siguientes dominios no tienen la cadena completa de certificados en HTTPS. tenemos que usar un hack (node_extra_ca_certs_mozilla_bundle) para conectarnos a estos sitios. (se puede ver con ssllabs.com) ojalá lxs administradorxs de estos servidores lo arreglen.
 // www.enargas.gov.ar, transparencia.enargas.gov.ar, www.energia.gob.ar, www.economia.gob.ar, datos.yvera.gob.ar
@@ -12,6 +13,11 @@ setGlobalDispatcher(
   })
 );
 
+/** key es host
+ * @type {Map<string, import("p-limit").LimitFunction>} */
+const limiters = new Map();
+const nThreads = process.env.N_THREADS ? parseInt(process.env.N_THREADS) : 16;
+
 class StatusCodeError extends Error {
   /**
    * @param {number} code
@@ -63,14 +69,44 @@ async function downloadFromData(jsonUrlString) {
 
   shuffleArray(jobs);
 
-  const nThreads = process.env.N_THREADS ? parseInt(process.env.N_THREADS) : 64;
+  const promises = jobs.map((job) => {
-  const greens = Array(nThreads)
+    let limit = limiters.get(job.url.host);
-    .fill(0)
+    if (!limit) {
-    .map(() =>
+      limit = pLimit(nThreads);
-      (async () => {
+      limiters.set(job.url.host, limit);
-        let job;
+    }
-        while ((job = jobs.pop())) {
+    return limit(async () => {
-          if (job.waitUntil) await waitUntil(job.waitUntil);
+      try {
+        await downloadDistWithRetries(job);
+      } catch (error) {
+        await errorFile.write(
+          JSON.stringify({
+            url: job.url.toString(),
+            ...encodeError(error),
+          }) + "\n"
+        );
+        nErrors++;
+      } finally {
+        nFinished++;
+      }
+    });
+  });
+
+  process.stderr.write(`info: 0/${totalJobs} done\n`);
+  const interval = setInterval(() => {
+    process.stderr.write(`info: ${nFinished}/${totalJobs} done\n`);
+  }, 30000);
+  await Promise.all(promises);
+  clearInterval(interval);
+  if (nErrors > 0) console.error(`Finished with ${nErrors} errors`);
+}
+
+/**
+ * @argument {DownloadJob} job
+ * @argument {number} attempts
+ */
+async function downloadDistWithRetries(job, attempts = 0) {
+  const { url } = job;
   try {
     await downloadDist(job);
   } catch (error) {
@@ -79,50 +115,22 @@ async function downloadFromData(jsonUrlString) {
     if (
       error instanceof StatusCodeError &&
       error.code === 403 &&
-              job.url.host === "minsegar-my.sharepoint.com" &&
+      url.host === "minsegar-my.sharepoint.com" &&
-              job.attempts < 15
+      attempts < 15
     ) {
-              jobs.unshift({
+      await wait(15000);
-                ...job,
+      return await downloadDistWithRetries(job, attempts + 1);
-                attempts: job.attempts + 1,
-                waitUntil: nowPlusNSeconds(15),
-              });
-              continue;
     }
     // si no fue un error de http, reintentar hasta 5 veces con 5 segundos de por medio
     else if (
       !(error instanceof StatusCodeError) &&
       !(error instanceof TooManyRedirectsError) &&
-              job.attempts < 5
+      attempts < 5
     ) {
-              jobs.unshift({
+      await wait(5000);
-                ...job,
+      return await downloadDistWithRetries(job, attempts + 1);
-                attempts: job.attempts + 1,
+    } else throw error;
-                waitUntil: nowPlusNSeconds(5),
-              });
-              continue;
-            } else {
-              await errorFile.write(
-                JSON.stringify({
-                  url: job.url.toString(),
-                  ...encodeError(error),
-                }) + "\n"
-              );
-              nErrors++;
   }
-          }
-          nFinished++;
-        }
-      })()
-    );
-  process.stderr.write(`greens: ${greens.length}\n`);
-
-  const interval = setInterval(() => {
-    process.stderr.write(`info: ${nFinished}/${totalJobs} done\n`);
-  }, 30000);
-  await Promise.all(greens);
-  clearInterval(interval);
-  if (nErrors > 0) console.error(`Finished with ${nErrors} errors`);
 }
 
 /**
@@ -210,19 +218,6 @@ function hasDuplicates(array) {
 function wait(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
-/** @argument {Date} date */
-function waitUntil(date) {
-  return wait(Math.max(+new Date() - +date, 0));
-}
-/**
- * genera una Date de ahora+n segundos
- * @param {number} seconds
- */
-function nowPlusNSeconds(seconds) {
-  let d = new Date();
-  d.setSeconds(d.getSeconds() + seconds);
-  return d;
-}
 
 function encodeError(error) {
   if (error instanceof StatusCodeError)

package.json

@@ -11,6 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "p-limit": "^5.0.0",
     "undici": "^5.28.0"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -5,6 +5,9 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
+  p-limit:
+    specifier: ^5.0.0
+    version: 5.0.0
   undici:
     specifier: ^5.28.0
     version: 5.28.0
@@ -27,6 +30,13 @@ packages:
       undici-types: 5.26.5
     dev: true
 
+  /p-limit@5.0.0:
+    resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
+    engines: {node: '>=18'}
+    dependencies:
+      yocto-queue: 1.0.0
+    dev: false
+
   /undici-types@5.26.5:
     resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
     dev: true
@@ -37,3 +47,8 @@ packages:
     dependencies:
       '@fastify/busboy': 2.1.0
     dev: false
+
+  /yocto-queue@1.0.0:
+    resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
+    engines: {node: '>=12.20'}
+    dev: false