Factorize code

Author: Ndpnt

src/archivist/index.js

@@ -129,49 +129,39 @@ export default class Archivist extends events.EventEmitter {
   }
 
   async track({ services: servicesIds = this.servicesIds, types: termsTypes = [] } = {}) {
-    const numberOfTerms = Service.getNumberOfTerms(this.services, servicesIds, termsTypes);
-
-    this.emit('trackingStarted', servicesIds.length, numberOfTerms, false);
-
-    await Promise.all([ launchHeadlessBrowser(), this.recorder.initialize() ]);
-
-    this.trackingQueue.concurrency = MAX_PARALLEL_TRACKING;
-
-    servicesIds.forEach(serviceId => {
-      this.services[serviceId].getTermsTypes().forEach(termsType => {
-        if (termsTypes.length && !termsTypes.includes(termsType)) {
-          return;
-        }
-
-        this.trackingQueue.push({ terms: this.services[serviceId].getTerms({ type: termsType }), technicalUpgradeOnly: false });
-      });
+    await this.processTerms({
+      servicesIds,
+      termsTypes,
+      technicalUpgradeOnly: false,
+      concurrency: MAX_PARALLEL_TRACKING,
     });
-
-    if (this.trackingQueue.length()) {
-      await this.trackingQueue.drain();
-    }
-
-    await Promise.all([ stopHeadlessBrowser(), this.recorder.finalize() ]);
-
-    this.emit('trackingCompleted', servicesIds.length, numberOfTerms, false);
   }
 
   async applyTechnicalUpgrades({ services: servicesIds = this.servicesIds, types: termsTypes = [] } = {}) {
+    await this.processTerms({
+      servicesIds,
+      termsTypes,
+      technicalUpgradeOnly: true,
+      concurrency: MAX_PARALLEL_TECHNICAL_UPGRADES,
+    });
+  }
+
+  async processTerms({ servicesIds, termsTypes, technicalUpgradeOnly, concurrency }) {
     const numberOfTerms = Service.getNumberOfTerms(this.services, servicesIds, termsTypes);
 
-    this.emit('trackingStarted', servicesIds.length, numberOfTerms, true);
+    this.emit('trackingStarted', servicesIds.length, numberOfTerms, technicalUpgradeOnly);
 
     await Promise.all([ launchHeadlessBrowser(), this.recorder.initialize() ]);
 
-    this.trackingQueue.concurrency = MAX_PARALLEL_TECHNICAL_UPGRADES;
+    this.trackingQueue.concurrency = concurrency;
 
     servicesIds.forEach(serviceId => {
       this.services[serviceId].getTermsTypes().forEach(termsType => {
         if (termsTypes.length && !termsTypes.includes(termsType)) {
           return;
         }
 
-        this.trackingQueue.push({ terms: this.services[serviceId].getTerms({ type: termsType }), technicalUpgradeOnly: true });
+        this.trackingQueue.push({ terms: this.services[serviceId].getTerms({ type: termsType }), technicalUpgradeOnly });
       });
     });
 
@@ -181,7 +171,7 @@ export default class Archivist extends events.EventEmitter {
 
     await Promise.all([ stopHeadlessBrowser(), this.recorder.finalize() ]);
 
-    this.emit('trackingCompleted', servicesIds.length, numberOfTerms, true);
+    this.emit('trackingCompleted', servicesIds.length, numberOfTerms, technicalUpgradeOnly);
   }
 
   async trackTermsChanges({ terms, technicalUpgradeOnly = false }) {

src/index.js

@@ -13,7 +13,7 @@ import Reporter from './reporter/index.js';
 const require = createRequire(import.meta.url);
 const { version: PACKAGE_VERSION } = require('../package.json');
 
-export default async function track({ services, types, schedule }) {
+async function initialize(services) {
   const archivist = new Archivist({
     recorderConfig: config.get('@opentermsarchive/engine.recorder'),
     fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
@@ -40,11 +40,17 @@ export default async function track({ services, types, schedule }) {
     });
   }
 
+  return { archivist, services };
+}
+
+export default async function track({ services, types, schedule }) {
+  const { archivist, services: filteredServices } = await initialize(services);
+
   // Technical upgrade pass: apply changes from engine, dependency, or declaration upgrades.
   // This regenerates versions from existing snapshots with updated extraction logic.
   // For terms with combined source documents, if a new document was added to the declaration, it will be fetched and combined with existing snapshots to regenerate the complete version.
   // All versions from this pass are labeled as technical upgrades to avoid false notifications about content changes.
-  await archivist.applyTechnicalUpgrades({ services, types });
+  await archivist.applyTechnicalUpgrades({ services: filteredServices, types });
 
   if (process.env.OTA_ENGINE_SENDINBLUE_API_KEY) {
     try {
@@ -70,7 +76,7 @@ export default async function track({ services, types, schedule }) {
   }
 
   if (!schedule) {
-    await archivist.track({ services, types });
+    await archivist.track({ services: filteredServices, types });
 
     return;
   }
@@ -84,36 +90,12 @@ export default async function track({ services, types, schedule }) {
   new Cron( // eslint-disable-line no-new
     trackingSchedule,
     { protect: job => logger.warn(`Tracking scheduled at ${new Date().toISOString()} were blocked by an unfinished tracking started at ${job.currentRun().toISOString()}`) },
-    () => archivist.track({ services, types }),
+    () => archivist.track({ services: filteredServices, types }),
   );
 }
 
 export async function applyTechnicalUpgrades({ services, types }) {
-  const archivist = new Archivist({
-    recorderConfig: config.get('@opentermsarchive/engine.recorder'),
-    fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
-  });
-
-  archivist.attach(logger);
-
-  await archivist.initialize();
-
-  const collection = await getCollection();
-  const collectionName = collection?.name ? ` with ${collection.name} collection` : '';
-
-  logger.info(`Start engine v${PACKAGE_VERSION}${collectionName}\n`);
-
-  if (services?.length) {
-    services = services.filter(serviceId => {
-      const isServiceDeclared = archivist.services[serviceId];
-
-      if (!isServiceDeclared) {
-        logger.warn(`Parameter "${serviceId}" was interpreted as a service ID to update, but no matching declaration was found; it will be ignored`);
-      }
-
-      return isServiceDeclared;
-    });
-  }
+  const { archivist, services: filteredServices } = await initialize(services);
 
-  await archivist.applyTechnicalUpgrades({ services, types });
+  await archivist.applyTechnicalUpgrades({ services: filteredServices, types });
 }