@opentermsarchive/engine 5.4.0 → 5.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "5.4.0",
+  "version": "5.4.2",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {

package/src/archivist/fetcher/htmlOnlyFetcher.js

@@ -49,6 +49,10 @@ export default async function fetch(url, config) {
       content,
     };
   } catch (error) {
+    if (error.type == 'system') { // Node-fetch wraps system-level errors (ENOTFOUND, ECONNREFUSED, ECONNRESET, etc.) with type 'system' and includes the original error code
+      throw new Error(`Network system error ${error.code} occurred when trying to fetch '${url}'`);
+    }
+
     if (error instanceof AbortError) {
       throw new Error(`Timed out after ${config.navigationTimeout / 1000} seconds when trying to fetch '${url}'`);
     }

package/src/archivist/index.js

@@ -1,4 +1,5 @@
 import events from 'events';
+import { createRequire } from 'module';
 
 import async from 'async';
 
@@ -11,6 +12,9 @@ import Version from './recorder/version.js';
 import * as services from './services/index.js';
 import Service from './services/service.js';
 
+const require = createRequire(import.meta.url);
+const { version: PACKAGE_VERSION } = require('../../package.json');
+
 // The parallel handling feature is currently set to a parallelism of 1 on terms tracking
 // because when it's higher there are two issues:
 // - too many requests on the same endpoint yield 403
@@ -249,7 +253,7 @@ export default class Archivist extends events.EventEmitter {
       termsType: terms.type,
       fetchDate: terms.fetchDate,
       isExtractOnly: extractOnly,
-      metadata: { 'x-engine-version': process.env.npm_package_version },
+      metadata: { 'x-engine-version': PACKAGE_VERSION },
     });
 
     await this.recorder.record(record);
@@ -275,7 +279,7 @@ export default class Archivist extends events.EventEmitter {
         content: sourceDocument.content,
         mimeType: sourceDocument.mimeType,
         metadata: {
-          'x-engine-version': process.env.npm_package_version,
+          'x-engine-version': PACKAGE_VERSION,
           'x-fetcher': sourceDocument.fetcher,
           'x-source-document-location': sourceDocument.location,
         },

package/src/collection-api/routes/metadata.js

@@ -1,7 +1,12 @@
+import { createRequire } from 'module';
+
 import express from 'express';
 
 import Service from '../../archivist/services/service.js';
 
+const require = createRequire(import.meta.url);
+const { version: PACKAGE_VERSION } = require('../../../package.json');
+
 /**
  * @param   {object}         collection The collection
  * @param   {object}         services   The services of the collection
@@ -170,7 +175,6 @@ import Service from '../../archivist/services/service.js';
  */
 export default function metadataRouter(collection, services) {
   const router = express.Router();
-  const engineVersion = process.env.npm_package_version;
 
   /**
    * @swagger
@@ -188,7 +192,7 @@ export default function metadataRouter(collection, services) {
     const dynamicMetadata = {
       totalServices: Object.keys(services).length,
       totalTerms: Service.getNumberOfTerms(services),
-      engineVersion,
+      engineVersion: PACKAGE_VERSION,
     };
 
     res.json({

package/src/collection-api/routes/metadata.test.js

@@ -1,11 +1,15 @@
+import { createRequire } from 'module';
+
 import { expect } from 'chai';
 import config from 'config';
 import request from 'supertest';
 
 import app from '../server.js';
 
+const require = createRequire(import.meta.url);
+const { version: PACKAGE_VERSION } = require('../../../package.json');
+
 const basePath = config.get('@opentermsarchive/engine.collection-api.basePath');
-const engineVersion = process.env.npm_package_version;
 
 const EXPECTED_RESPONSE = {
   totalServices: 7,
@@ -80,7 +84,7 @@ describe('Metadata API', () => {
     it('returns expected metadata object', () => {
       expect(response.body).to.deep.equal({
         ...EXPECTED_RESPONSE,
-        engineVersion,
+        engineVersion: PACKAGE_VERSION,
       });
     });
   });

package/src/index.js

@@ -1,3 +1,5 @@
+import { createRequire } from 'module';
+
 import config from 'config';
 import cron from 'croner';
 import cronstrue from 'cronstrue';
@@ -8,6 +10,9 @@ import logger from './logger/index.js';
 import Notifier from './notifier/index.js';
 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, extractOnly, schedule }) {
   const archivist = new Archivist({
     recorderConfig: config.get('@opentermsarchive/engine.recorder'),
@@ -21,7 +26,7 @@ export default async function track({ services, types, extractOnly, schedule })
   const collection = await getCollection();
   const collectionName = collection?.name ? ` with ${collection.name} collection` : '';
 
-  logger.info(`Start engine v${process.env.npm_package_version}${collectionName}\n`);
+  logger.info(`Start engine v${PACKAGE_VERSION}${collectionName}\n`);
 
   if (services?.length) {
     services = services.filter(serviceId => {