@opentermsarchive/engine 1.3.0 → 2.0.0

package/bin/env.js

@@ -1,3 +1,5 @@
+import 'dotenv/config';
+
 import path from 'path';
 import { fileURLToPath } from 'url';
 

package/bin/ota-dataset.js

@@ -11,7 +11,7 @@ program
   .name('ota dataset')
   .description('Export the versions dataset into a ZIP file and optionally publish it to GitHub releases')
   .option('-f, --file <filename>', 'file name of the generated dataset')
-  .option('-p, --publish', 'publish dataset to GitHub releases on versions repository. Mandatory authentication to GitHub is provided through the `GITHUB_TOKEN` environment variable')
+  .option('-p, --publish', 'publish dataset to GitHub releases on versions repository. Mandatory authentication to GitHub is provided through the `OTA_ENGINE_GITHUB_TOKEN` environment variable')
   .option('-r, --remove-local-copy', 'remove local copy of dataset after publishing. Works only in combination with --publish option')
   .option('--schedule', 'schedule automatic dataset generation');
 

package/bin/ota-serve.js

@@ -6,4 +6,4 @@ import { fileURLToPath, pathToFileURL } from 'url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-await import(pathToFileURL(path.resolve(__dirname, '../src/api/server.js'))); // load asynchronously to ensure env.js is loaded before
+await import(pathToFileURL(path.resolve(__dirname, '../src/collection-api/server.js'))); // load asynchronously to ensure env.js is loaded before

package/config/ci.json

@@ -1,5 +1,7 @@
 {
-  "services": {
-    "declarationsPath": "./demo-declarations/declarations"
+  "@opentermsarchive/engine": {
+    "services": {
+      "declarationsPath": "./demo-declarations/declarations"
+    }
   }
 }

package/config/default.json

@@ -1,65 +1,63 @@
 {
-  "services": {
-    "declarationsPath": "./declarations"
-  },
-  "recorder": {
-    "versions": {
-      "storage": {
-        "type": "git",
-        "git": {
-          "path": "./data/versions",
-          "publish": false,
-          "snapshotIdentiferTemplate": "./data/snapshots/%SNAPSHOT_ID",
-          "author": {
-            "name": "Open Terms Archive Bot",
-            "email": "bot@opentermsarchive.org"
+  "@opentermsarchive/engine": {
+    "services": {
+      "declarationsPath": "./declarations"
+    },
+    "recorder": {
+      "versions": {
+        "storage": {
+          "type": "git",
+          "git": {
+            "path": "./data/versions",
+            "publish": false,
+            "snapshotIdentiferTemplate": "./data/snapshots/%SNAPSHOT_ID",
+            "author": {
+              "name": "Open Terms Archive Bot",
+              "email": "bot@opentermsarchive.org"
+            }
           }
         }
-      }
-    },
-    "snapshots": {
-      "storage": {
-        "type": "git",
-        "git": {
-          "path": "./data/snapshots",
-          "publish": false,
-          "author": {
-            "name": "Open Terms Archive Bot",
-            "email": "bot@opentermsarchive.org"
+      },
+      "snapshots": {
+        "storage": {
+          "type": "git",
+          "git": {
+            "path": "./data/snapshots",
+            "publish": false,
+            "author": {
+              "name": "Open Terms Archive Bot",
+              "email": "bot@opentermsarchive.org"
+            }
+          },
+          "mongo": {
+            "connectionURI": "mongodb://127.0.0.1:27017",
+            "database": "open-terms-archive",
+            "collection": "snapshots"
           }
-        },
-        "mongo": {
-          "connectionURI": "mongodb://127.0.0.1:27017",
-          "database": "open-terms-archive",
-          "collection": "snapshots"
         }
       }
-    }
-  },
-  "fetcher": {
-    "waitForElementsTimeout": 10000,
-    "navigationTimeout": 30000,
-    "language": "en"
-  },
-  "logger": {
-    "smtp": {
-      "host": "smtp-relay.sendinblue.com",
-      "username": "admin@opentermsarchive.org"
     },
-    "sendMailOnError": false
-  },
-  "notifier": {
-    "sendInBlue": {
-      "updatesListId": 850,
-      "updateTemplateId": 7
+    "fetcher": {
+      "waitForElementsTimeout": 10000,
+      "navigationTimeout": 30000,
+      "language": "en"
+    },
+    "logger": {
+      "smtp": {
+        "host": "smtp-relay.sendinblue.com",
+        "username": "admin@opentermsarchive.org"
+      },
+      "sendMailOnError": false
+    },
+    "notifier": {
+      "sendInBlue": {
+        "updatesListId": 850,
+        "updateTemplateId": 7
+      }
+    },
+    "dataset": {
+      "title": "sandbox",
+      "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox"
     }
-  },
-  "dataset": {
-    "title": "sandbox",
-    "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox"
-  },
-  "api": {
-    "port": 3000,
-    "basePath": "/api"
   }
 }

package/config/production.json

@@ -1,27 +1,29 @@
 {
-  "recorder": {
-    "versions": {
-      "storage": {
-        "git": {
-          "path": "../versions",
-          "publish": true
+  "@opentermsarchive/engine": {
+    "recorder": {
+      "versions": {
+        "storage": {
+          "git": {
+            "path": "../versions",
+            "publish": true
+          }
+        }
+      },
+      "snapshots": {
+        "storage": {
+          "git": {
+            "path": "../snapshots",
+            "publish": true
+          }
         }
       }
     },
-    "snapshots": {
-      "storage": {
-        "git": {
-          "path": "../snapshots",
-          "publish": true
-        }
+    "logger": {
+      "sendMailOnError": {
+        "to": "admin@opentermsarchive.org",
+        "from": "noreply@opentermsarchive.org",
+        "sendWarnings": false
       }
     }
-  },
-  "logger": {
-    "sendMailOnError": {
-      "to": "admin@opentermsarchive.org",
-      "from": "noreply@opentermsarchive.org",
-      "sendWarnings": false
-    }
   }
 }

package/config/test.json

@@ -1,49 +1,55 @@
 {
-  "services": {
-    "declarationsPath": "./test/services"
-  },
-  "recorder": {
-    "versions": {
-      "storage": {
-        "git": {
-          "path": "./test/data/versions",
-          "publish": false,
-          "snapshotIdentiferTemplate": "https://github.com/OpenTermsArchive/sandbox-snapshots/commit/%SNAPSHOT_ID",
-          "author": {
-            "name": "Open Terms Archive Testing Bot",
-            "email": "bot@opentermsarchive.org"
+  "@opentermsarchive/engine": {
+    "services": {
+      "declarationsPath": "./test/services"
+    },
+    "recorder": {
+      "versions": {
+        "storage": {
+          "git": {
+            "path": "./test/data/versions",
+            "publish": false,
+            "snapshotIdentiferTemplate": "https://github.com/OpenTermsArchive/sandbox-snapshots/commit/%SNAPSHOT_ID",
+            "author": {
+              "name": "Open Terms Archive Testing Bot",
+              "email": "bot@opentermsarchive.org"
+            }
+          },
+          "mongo": {
+            "connectionURI": "mongodb://127.0.0.1:27017",
+            "database": "open-terms-archive-test",
+            "collection": "versions"
           }
-        },
-        "mongo": {
-          "connectionURI": "mongodb://127.0.0.1:27017",
-          "database": "open-terms-archive-test",
-          "collection": "versions"
         }
-      }
-    },
-    "snapshots": {
-      "storage": {
-        "git": {
-          "path": "./test/data/snapshots",
-          "publish": false,
-          "author": {
-            "name": "Open Terms Archive Testing Bot",
-            "email": "bot@opentermsarchive.org"
+      },
+      "snapshots": {
+        "storage": {
+          "git": {
+            "path": "./test/data/snapshots",
+            "publish": false,
+            "author": {
+              "name": "Open Terms Archive Testing Bot",
+              "email": "bot@opentermsarchive.org"
+            }
+          },
+          "mongo": {
+            "connectionURI": "mongodb://127.0.0.1:27017",
+            "database": "open-terms-archive-test",
+            "collection": "snapshots"
           }
-        },
-        "mongo": {
-          "connectionURI": "mongodb://127.0.0.1:27017",
-          "database": "open-terms-archive-test",
-          "collection": "snapshots"
         }
       }
+    },
+    "fetcher": {
+      "waitForElementsTimeout": 1000
+    },
+    "dataset": {
+      "title": "sandbox",
+      "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox-versions"
+    },
+    "collection-api": {
+      "port": 3000,
+      "basePath": "/collection-api"
     }
-  },
-  "fetcher": {
-    "waitForElementsTimeout": 1000
-  },
-  "dataset": {
-    "title": "sandbox",
-    "versionsRepositoryURL": "https://github.com/OpenTermsArchive/sandbox-versions"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {
@@ -40,7 +40,7 @@
     "declarations:validate:schema": "npm run declarations:validate -- --schema-only",
     "lint": "eslint src test scripts bin",
     "lint:fix": "npm run lint -- --fix",
-    "start": "node --max-http-header-size=32768 bin/ota.js track",
+    "start": "node -r dotenv/config --max-http-header-size=32768 bin/ota.js track",
     "start:api": "node bin/ota.js serve",
     "start:scheduler": "npm start -- --schedule",
     "test": "cross-env NODE_ENV=test mocha --recursive \"./src/**/*.test.js\" \"./scripts/**/*.test.js\" --exit",
@@ -72,7 +72,7 @@
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-json-format": "^2.0.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
-    "express": "^4.18.2",
+    "express": "^4.19.2",
     "express-async-errors": "^3.1.1",
     "fs-extra": "^10.0.0",
     "helmet": "^6.0.1",
@@ -97,7 +97,7 @@
     "sib-api-v3-sdk": "^8.2.1",
     "simple-git": "^3.8.0",
     "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "4.6.2",
+    "swagger-ui-express": "^5.0.0",
     "winston": "^3.3.3",
     "winston-mail": "^2.0.0"
   },

package/scripts/dataset/assets/README.template.js

@@ -12,7 +12,7 @@ ${body({ servicesCount, firstVersionDate, lastVersionDate })}`;
 export function title({ releaseDate }) {
   releaseDate = releaseDate.toLocaleDateString(LOCALE, DATE_OPTIONS);
 
-  const title = config.get('dataset.title');
+  const title = config.get('@opentermsarchive/engine.dataset.title');
 
   return `${title} — ${releaseDate} dataset`;
 }
@@ -21,7 +21,7 @@ export function body({ servicesCount, firstVersionDate, lastVersionDate }) {
   firstVersionDate = firstVersionDate.toLocaleDateString(LOCALE, DATE_OPTIONS);
   lastVersionDate = lastVersionDate.toLocaleDateString(LOCALE, DATE_OPTIONS);
 
-  const versionsRepositoryURL = config.get('dataset.versionsRepositoryURL');
+  const versionsRepositoryURL = config.get('@opentermsarchive/engine.dataset.versionsRepositoryURL');
 
   return `This dataset consolidates the contractual documents of ${servicesCount} service providers, in all their versions that were accessible online between ${firstVersionDate} and ${lastVersionDate}.
 

package/scripts/dataset/export/index.js

@@ -17,7 +17,7 @@ const fs = fsApi.promises;
 const ARCHIVE_FORMAT = 'zip'; // for supported formats, see https://www.archiverjs.com/docs/archive-formats
 
 export default async function generate({ archivePath, releaseDate }) {
-  const versionsRepository = await RepositoryFactory.create(config.get('recorder.versions.storage')).initialize();
+  const versionsRepository = await RepositoryFactory.create(config.get('@opentermsarchive/engine.recorder.versions.storage')).initialize();
 
   const archive = await initializeArchive(archivePath);
 

package/scripts/dataset/export/index.test.js

@@ -48,8 +48,8 @@ describe('Export', () => {
     before(async function () {
       this.timeout(10000);
       repository = new GitRepository({
-        ...config.get('recorder.versions.storage.git'),
-        path: path.resolve(__dirname, '../../../', config.get('recorder.versions.storage.git.path')),
+        ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
+        path: path.resolve(__dirname, '../../../', config.get('@opentermsarchive/engine.recorder.versions.storage.git.path')),
       });
 
       await repository.initialize();

package/scripts/dataset/index.js

@@ -9,7 +9,7 @@ import publishRelease from './publish/index.js';
 
 export async function release({ shouldPublish, shouldRemoveLocalCopy, fileName }) {
   const releaseDate = new Date();
-  const archiveName = fileName || `dataset-${config.get('dataset.title')}-${releaseDate.toISOString().replace(/T.*/, '')}`;
+  const archiveName = fileName || `dataset-${config.get('@opentermsarchive/engine.dataset.title')}-${releaseDate.toISOString().replace(/T.*/, '')}`;
   const archivePath = `${path.basename(archiveName, '.zip')}.zip`; // allow to pass filename or filename.zip as the archive name and have filename.zip as the result name
 
   logger.info('Start exporting dataset…');

package/scripts/dataset/publish/index.js

@@ -3,17 +3,14 @@ import path from 'path';
 import url from 'url';
 
 import config from 'config';
-import dotenv from 'dotenv';
 import { Octokit } from 'octokit';
 
 import * as readme from '../assets/README.template.js';
 
-dotenv.config();
-
 export default async function publish({ archivePath, releaseDate, stats }) {
-  const octokit = new Octokit({ auth: process.env.GITHUB_TOKEN });
+  const octokit = new Octokit({ auth: process.env.OTA_ENGINE_GITHUB_TOKEN });
 
-  const [ owner, repo ] = url.parse(config.get('dataset.versionsRepositoryURL')).pathname.split('/').filter(component => component);
+  const [ owner, repo ] = url.parse(config.get('@opentermsarchive/engine.dataset.versionsRepositoryURL')).pathname.split('/').filter(component => component);
 
   const tagName = `${path.basename(archivePath, path.extname(archivePath))}`; // use archive filename as Git tag
 

package/scripts/declarations/lint/index.mocha.js

@@ -16,7 +16,7 @@ const ESLINT_CONFIG_PATH = path.join(ROOT_PATH, '.eslintrc.yaml');
 const eslint = new ESLint({ overrideConfigFile: ESLINT_CONFIG_PATH, fix: false });
 const eslintWithFix = new ESLint({ overrideConfigFile: ESLINT_CONFIG_PATH, fix: true });
 
-const declarationsPath = path.resolve(process.cwd(), config.get('services.declarationsPath'));
+const declarationsPath = path.resolve(process.cwd(), config.get('@opentermsarchive/engine.services.declarationsPath'));
 const instancePath = path.resolve(declarationsPath, '../');
 
 export default async options => {

package/scripts/declarations/validate/index.mocha.js

@@ -19,7 +19,7 @@ const fs = fsApi.promises;
 const MIN_DOC_LENGTH = 100;
 const SLOW_DOCUMENT_THRESHOLD = 10 * 1000; // number of milliseconds after which a document fetch is considered slow
 
-const declarationsPath = path.resolve(process.cwd(), config.get('services.declarationsPath'));
+const declarationsPath = path.resolve(process.cwd(), config.get('@opentermsarchive/engine.services.declarationsPath'));
 const instancePath = path.resolve(declarationsPath, '../');
 
 export default async options => {
@@ -114,7 +114,7 @@ export default async options => {
                         url: location,
                         executeClientScripts,
                         cssSelectors: sourceDocument.cssSelectors,
-                        config: config.get('fetcher'),
+                        config: config.get('@opentermsarchive/engine.fetcher'),
                       }));
                     });
 
@@ -160,7 +160,7 @@ export default async options => {
                         url: sourceDocument.location,
                         executeClientScripts: sourceDocument.executeClientScripts,
                         cssSelectors: sourceDocument.cssSelectors,
-                        config: config.get('fetcher'),
+                        config: config.get('@opentermsarchive/engine.fetcher'),
                       }));
                       const secondFilteredContent = await extract(sourceDocument);
 

package/scripts/history/migrate-services.js

@@ -41,22 +41,22 @@ const counters = {
     from: {
       snapshots: {
         source: new GitRepository({
-          ...config.get('recorder.snapshots.storage.git'),
+          ...config.get('@opentermsarchive/engine.recorder.snapshots.storage.git'),
           path: path.resolve(ROOT_PATH, `./data/${CONFIG.from.snapshots}`),
         }),
         destination: new GitRepository({
-          ...config.get('recorder.snapshots.storage.git'),
+          ...config.get('@opentermsarchive/engine.recorder.snapshots.storage.git'),
           path: path.resolve(ROOT_PATH, `./data/${CONFIG.from.snapshots}-migrated`),
         }),
         logger: winston.createLogger({ transports: [ new (winston.transports.File)({ filename: `${__dirname}/logs/${CONFIG.from.snapshots}.log` }), new winston.transports.Console() ], format }),
       },
       versions: {
         source: new GitRepository({
-          ...config.get('recorder.versions.storage.git'),
+          ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
           path: path.resolve(ROOT_PATH, `./data/${CONFIG.from.versions}`),
         }),
         destination: new GitRepository({
-          ...config.get('recorder.versions.storage.git'),
+          ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
           path: path.resolve(ROOT_PATH, `./data/${CONFIG.from.versions}-migrated`),
           prefixMessageToSnapshotId: CONFIG.from.prefixMessageToSnapshotId,
         }),
@@ -66,22 +66,22 @@ const counters = {
     to: {
       snapshots: {
         source: new GitRepository({
-          ...config.get('recorder.snapshots.storage.git'),
+          ...config.get('@opentermsarchive/engine.recorder.snapshots.storage.git'),
           path: path.resolve(ROOT_PATH, `./data/${CONFIG.to.snapshots}`),
         }),
         destination: new GitRepository({
-          ...config.get('recorder.snapshots.storage.git'),
+          ...config.get('@opentermsarchive/engine.recorder.snapshots.storage.git'),
           path: path.resolve(ROOT_PATH, `./data/${CONFIG.to.snapshots}-migrated`),
         }),
         logger: winston.createLogger({ transports: [ new (winston.transports.File)({ filename: `${__dirname}/logs/${CONFIG.to.snapshots}.log` }), new winston.transports.Console() ], format }),
       },
       versions: {
         source: new GitRepository({
-          ...config.get('recorder.versions.storage.git'),
+          ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
           path: path.resolve(ROOT_PATH, `./data/${CONFIG.to.versions}`),
         }),
         destination: new GitRepository({
-          ...config.get('recorder.versions.storage.git'),
+          ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
           path: path.resolve(ROOT_PATH, `./data/${CONFIG.to.versions}-migrated`),
           prefixMessageToSnapshotId: CONFIG.to.prefixMessageToSnapshotId,
         }),

package/scripts/history/update-to-full-hash.js

@@ -15,18 +15,18 @@ const ROOT_PATH = path.resolve(__dirname, '../../');
   console.time('Total time');
 
   const versionsRepository = new GitRepository({
-    ...config.get('recorder.versions.storage.git'),
+    ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
     path: path.resolve(ROOT_PATH, './data/france-elections-versions'),
   });
 
   const versionsTargetRepository = new GitRepository({
-    ...config.get('recorder.versions.storage.git'),
+    ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
     prefixMessageToSnapshotId: 'This version was recorded after filtering snapshot https://github.com/OpenTermsArchive/france-elections-snapshots/commit/',
     path: path.resolve(ROOT_PATH, './data/france-elections-versions-hash-updated-test'),
   });
 
   const snapshotsRepository = new GitRepository({
-    ...config.get('recorder.snapshots.storage.git'),
+    ...config.get('@opentermsarchive/engine.recorder.snapshots.storage.git'),
     path: path.resolve(ROOT_PATH, './data/france-elections-snapshots'),
   });
 

package/scripts/import/index.js

@@ -53,15 +53,15 @@ let client;
 }());
 
 async function initialize() {
-  client = new MongoClient(config.get('import.mongo.connectionURI'));
+  client = new MongoClient(config.get('@opentermsarchive/engine.import.mongo.connectionURI'));
 
   await client.connect();
-  const db = client.db(config.get('import.mongo.database'));
+  const db = client.db(config.get('@opentermsarchive/engine.import.mongo.database'));
 
-  snapshotsCollection = db.collection(config.get('import.mongo.snapshotsCollection'));
-  commitsCollection = db.collection(config.get('import.mongo.commitsCollection'));
+  snapshotsCollection = db.collection(config.get('@opentermsarchive/engine.import.mongo.snapshotsCollection'));
+  commitsCollection = db.collection(config.get('@opentermsarchive/engine.import.mongo.commitsCollection'));
 
-  sourceRepository = new Git({ path: path.resolve(ROOT_PATH, config.get('import.sourcePath')) });
+  sourceRepository = new Git({ path: path.resolve(ROOT_PATH, config.get('@opentermsarchive/engine.import.sourcePath')) });
 
   await sourceRepository.initialize();
   await renamer.loadRules();
@@ -119,7 +119,7 @@ function queueDrainHandler(totalToTreat) {
 
 async function getCommitContent({ sha, serviceId, termsType, extension }) {
   const start = performance.now();
-  const url = `https://raw.githubusercontent.com/${config.get('import.githubRepository')}/${sha}/${encodeURI(serviceId)}/${encodeURI(termsType)}.${extension}`;
+  const url = `https://raw.githubusercontent.com/${config.get('@opentermsarchive/engine.import.githubRepository')}/${sha}/${encodeURI(serviceId)}/${encodeURI(termsType)}.${extension}`;
   const response = await nodeFetch(url);
   const end = performance.now();
 

package/scripts/import/loadCommits.js

@@ -54,13 +54,13 @@ let client;
 }());
 
 async function initialize() {
-  client = new MongoClient(config.get('import.mongo.connectionURI'));
+  client = new MongoClient(config.get('@opentermsarchive/engine.import.mongo.connectionURI'));
 
   await client.connect();
-  const db = client.db(config.get('import.mongo.database'));
+  const db = client.db(config.get('@opentermsarchive/engine.import.mongo.database'));
 
-  collection = db.collection(config.get('import.mongo.commitsCollection'));
-  sourceRepository = new Git({ path: path.resolve(ROOT_PATH, config.get('import.sourcePath')) });
+  collection = db.collection(config.get('@opentermsarchive/engine.import.mongo.commitsCollection'));
+  sourceRepository = new Git({ path: path.resolve(ROOT_PATH, config.get('@opentermsarchive/engine.import.sourcePath')) });
 
   await sourceRepository.initialize();
 }

package/scripts/rewrite/initializer/index.js

@@ -36,7 +36,7 @@ export async function initTargetRepo(targetRepoPath) {
   }
   await fs.mkdir(targetRepoPath);
 
-  const targetRepo = await new Git({ path: targetRepoPath, author: config.get('recorder.versions.storage.git.author') });
+  const targetRepo = await new Git({ path: targetRepoPath, author: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author') });
 
   await targetRepo.initialize();
 

package/scripts/rewrite/rewrite-snapshots.js

@@ -15,9 +15,9 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const ROOT_PATH = path.resolve(__dirname, '../../');
 
-export const SNAPSHOTS_SOURCE_PATH = path.resolve(ROOT_PATH, config.get('rewrite.snapshotsSourcePath'));
-export const SNAPSHOTS_TARGET_PATH = path.resolve(ROOT_PATH, config.get('recorder.snapshots.storage.git.path'));
-export const VERSIONS_TARGET_PATH = path.resolve(ROOT_PATH, config.get('recorder.versions.storage.git.path'));
+export const SNAPSHOTS_SOURCE_PATH = path.resolve(ROOT_PATH, config.get('@opentermsarchive/engine.rewrite.snapshotsSourcePath'));
+export const SNAPSHOTS_TARGET_PATH = path.resolve(ROOT_PATH, config.get('@opentermsarchive/engine.recorder.snapshots.storage.git.path'));
+export const VERSIONS_TARGET_PATH = path.resolve(ROOT_PATH, config.get('@opentermsarchive/engine.recorder.versions.storage.git.path'));
 
 const initialize = process.argv.includes('--init');
 
@@ -33,7 +33,7 @@ let recorder;
   console.log('Start rewritting history.');
 
   await renamer.loadRules();
-  const sourceRepo = new Git({ path: SNAPSHOTS_SOURCE_PATH, author: config.get('recorder.snapshots.storage.git.author') });
+  const sourceRepo = new Git({ path: SNAPSHOTS_SOURCE_PATH, author: config.get('@opentermsarchive/engine.recorder.snapshots.storage.git.author') });
 
   await sourceRepo.initialize();
 
@@ -51,11 +51,11 @@ let recorder;
 
   recorder = new Recorder({
     versionsRepository: new GitRepository({
-      ...config.get('recorder.versions.storage.git'),
+      ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
       path: VERSIONS_TARGET_PATH,
     }),
     snapshotsRepository: new GitRepository({
-      ...config.get('recorder.snapshots.storage.git'),
+      ...config.get('@opentermsarchive/engine.recorder.snapshots.storage.git'),
       path: SNAPSHOTS_TARGET_PATH,
     }),
   });

package/scripts/rewrite/rewrite-versions.js

@@ -21,9 +21,9 @@ const MARKDOWN_MIME_TYPE = 'text/markdown';
 
 export const SNAPSHOTS_SOURCE_PATH = path.resolve(
   ROOT_PATH,
-  config.get('rewrite.snapshotsSourcePath'),
+  config.get('@opentermsarchive/engine.rewrite.snapshotsSourcePath'),
 );
-export const VERSIONS_TARGET_PATH = path.resolve(ROOT_PATH, config.get('recorder.versions.storage.git.path'));
+export const VERSIONS_TARGET_PATH = path.resolve(ROOT_PATH, config.get('@opentermsarchive/engine.recorder.versions.storage.git.path'));
 
 const initialize = process.argv.includes('--init');
 
@@ -42,7 +42,7 @@ let recorder;
 
   await renamer.loadRules();
   const servicesDeclarations = await services.loadWithHistory();
-  const sourceRepo = new Git({ path: SNAPSHOTS_SOURCE_PATH, author: config.get('recorder.snapshots.storage.git.author') });
+  const sourceRepo = new Git({ path: SNAPSHOTS_SOURCE_PATH, author: config.get('@opentermsarchive/engine.recorder.snapshots.storage.git.author') });
 
   await sourceRepo.initialize();
 
@@ -60,11 +60,11 @@ let recorder;
 
   recorder = new Recorder({
     versionsRepository: new GitRepository({
-      ...config.get('recorder.versions.storage.git'),
+      ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
       path: VERSIONS_TARGET_PATH,
     }),
     snapshotsRepository: new GitRepository({
-      ...config.get('recorder.snapshots.storage.git'),
+      ...config.get('@opentermsarchive/engine.recorder.snapshots.storage.git'),
       path: SNAPSHOTS_SOURCE_PATH,
     }),
   });

package/src/archivist/fetcher/index.js

@@ -24,9 +24,9 @@ export { FetchDocumentError } from './errors.js';
 export default async function fetch({
   url, executeClientScripts, cssSelectors,
   config: {
-    navigationTimeout = config.get('fetcher.navigationTimeout'),
-    language = config.get('fetcher.language'),
-    waitForElementsTimeout = config.get('fetcher.waitForElementsTimeout'),
+    navigationTimeout = config.get('@opentermsarchive/engine.fetcher.navigationTimeout'),
+    language = config.get('@opentermsarchive/engine.fetcher.language'),
+    waitForElementsTimeout = config.get('@opentermsarchive/engine.fetcher.waitForElementsTimeout'),
   } = {},
 }) {
   try {

package/src/archivist/index.test.js

@@ -20,8 +20,8 @@ const { expect } = chai;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const ROOT_PATH = path.resolve(__dirname, '../../');
-const SNAPSHOTS_PATH = path.resolve(ROOT_PATH, config.get('recorder.snapshots.storage.git.path'));
-const VERSIONS_PATH = path.resolve(ROOT_PATH, config.get('recorder.versions.storage.git.path'));
+const SNAPSHOTS_PATH = path.resolve(ROOT_PATH, config.get('@opentermsarchive/engine.recorder.snapshots.storage.git.path'));
+const VERSIONS_PATH = path.resolve(ROOT_PATH, config.get('@opentermsarchive/engine.recorder.versions.storage.git.path'));
 
 const MIME_TYPE = 'text/html';
 const FETCH_DATE = new Date('2000-01-02T12:00:00.000Z');
@@ -55,8 +55,8 @@ describe('Archivist', function () {
     gitVersion = new Git({
       path: VERSIONS_PATH,
       author: {
-        name: config.get('recorder.versions.storage.git.author.name'),
-        email: config.get('recorder.versions.storage.git.author.email'),
+        name: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author.name'),
+        email: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author.email'),
       },
     });
     await gitVersion.initialize();
@@ -72,8 +72,8 @@ describe('Archivist', function () {
       nock('https://www.servicea.example').get('/tos').reply(200, serviceASnapshotExpectedContent, { 'Content-Type': 'text/html' });
       nock('https://www.serviceb.example').get('/privacy').reply(200, serviceBSnapshotExpectedContent, { 'Content-Type': 'application/pdf' });
       app = new Archivist({
-        recorderConfig: config.get('recorder'),
-        fetcherConfig: config.get('fetcher'),
+        recorderConfig: config.get('@opentermsarchive/engine.recorder'),
+        fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
       });
       await app.initialize();
     });
@@ -152,8 +152,8 @@ describe('Archivist', function () {
             nock('https://www.servicea.example').get('/tos').reply(200, serviceASnapshotExpectedContent, { 'Content-Type': 'text/html' });
             nock('https://www.serviceb.example').get('/privacy').reply(200, serviceBSnapshotExpectedContent, { 'Content-Type': 'application/pdf' });
             app = new Archivist({
-              recorderConfig: config.get('recorder'),
-              fetcherConfig: config.get('fetcher'),
+              recorderConfig: config.get('@opentermsarchive/engine.recorder'),
+              fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
             });
 
             await app.initialize();
@@ -212,8 +212,8 @@ describe('Archivist', function () {
             nock('https://www.servicea.example').get('/tos').reply(200, serviceASnapshotExpectedContent, { 'Content-Type': 'text/html' });
             nock('https://www.serviceb.example').get('/privacy').reply(200, serviceBSnapshotExpectedContent, { 'Content-Type': 'application/pdf' });
             app = new Archivist({
-              recorderConfig: config.get('recorder'),
-              fetcherConfig: config.get('fetcher'),
+              recorderConfig: config.get('@opentermsarchive/engine.recorder'),
+              fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
             });
 
             await app.initialize();
@@ -251,8 +251,8 @@ describe('Archivist', function () {
     describe('#attach', () => {
       before(async () => {
         app = new Archivist({
-          recorderConfig: config.get('recorder'),
-          fetcherConfig: config.get('fetcher'),
+          recorderConfig: config.get('@opentermsarchive/engine.recorder'),
+          fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
         });
         await app.initialize();
 
@@ -287,8 +287,8 @@ describe('Archivist', function () {
         nock('https://www.servicea.example').get('/tos').reply(200, serviceASnapshotExpectedContent, { 'Content-Type': 'text/html' });
 
         app = new Archivist({
-          recorderConfig: config.get('recorder'),
-          fetcherConfig: config.get('fetcher'),
+          recorderConfig: config.get('@opentermsarchive/engine.recorder'),
+          fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
         });
         await app.initialize();
 
@@ -338,8 +338,8 @@ describe('Archivist', function () {
 
     before(async () => {
       app = new Archivist({
-        recorderConfig: config.get('recorder'),
-        fetcherConfig: config.get('fetcher'),
+        recorderConfig: config.get('@opentermsarchive/engine.recorder'),
+        fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
       });
       await app.initialize();
 

package/src/archivist/recorder/index.test.js

@@ -21,7 +21,7 @@ describe('Recorder', () => {
       let recorder;
 
       before(async () => {
-        const options = config.util.cloneDeep(config.recorder);
+        const options = config.util.cloneDeep(config.get('@opentermsarchive/engine.recorder'));
 
         options.versions.storage.type = repositoryType;
         options.snapshots.storage.type = repositoryType;
@@ -323,7 +323,7 @@ describe('Recorder', () => {
                 record = await recorder.versionsRepository.findLatest(SERVICE_ID, TYPE);
               });
 
-              after(() => recorder.versionsRepository.removeAll()); after(() => recorder.versionsRepository.removeAll());
+              after(() => recorder.versionsRepository.removeAll());
 
               it('records the version with the proper content', async () => {
                 expect(await record.content).to.equal(CONTENT);

package/src/archivist/recorder/repositories/git/git.test.js

@@ -8,7 +8,7 @@ import config from 'config';
 import Git from './git.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const RECORDER_PATH = path.resolve(__dirname, '../../../../../', config.get('recorder.versions.storage.git.path'));
+const RECORDER_PATH = path.resolve(__dirname, '../../../../../', config.get('@opentermsarchive/engine.recorder.versions.storage.git.path'));
 
 describe('Git', () => {
   const DEFAULT_CONTENT = 'default content';
@@ -19,8 +19,8 @@ describe('Git', () => {
     subject = new Git({
       path: RECORDER_PATH,
       author: {
-        name: config.get('recorder.versions.storage.git.author.name'),
-        email: config.get('recorder.versions.storage.git.author.email'),
+        name: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author.name'),
+        email: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author.email'),
       },
     });
 

package/src/archivist/recorder/repositories/git/index.test.js

@@ -18,7 +18,7 @@ const { expect } = chai;
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const RECORDER_PATH = path.resolve(__dirname, '../../../../..', config.get('recorder.versions.storage.git.path'));
+const RECORDER_PATH = path.resolve(__dirname, '../../../../..', config.get('@opentermsarchive/engine.recorder.versions.storage.git.path'));
 
 const SERVICE_PROVIDER_ID = 'test_service';
 const TERMS_TYPE = 'Terms of Service';
@@ -52,15 +52,15 @@ describe('GitRepository', () => {
       git = new Git({
         path: RECORDER_PATH,
         author: {
-          name: config.get('recorder.versions.storage.git.author.name'),
-          email: config.get('recorder.versions.storage.git.author.email'),
+          name: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author.name'),
+          email: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author.email'),
         },
       });
 
       await git.initialize();
 
       subject = new GitRepository({
-        ...config.get('recorder.versions.storage.git'),
+        ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
         path: RECORDER_PATH,
       });
 
@@ -266,7 +266,7 @@ describe('GitRepository', () => {
         after(() => subject.removeAll());
 
         it('stores snapshot ID', () => {
-          expect(commit.body).to.include(config.get('recorder.versions.storage.git.snapshotIdentiferTemplate').replace(SNAPSHOT_ID_MARKER, SNAPSHOT_ID));
+          expect(commit.body).to.include(config.get('@opentermsarchive/engine.recorder.versions.storage.git.snapshotIdentiferTemplate').replace(SNAPSHOT_ID_MARKER, SNAPSHOT_ID));
         });
 
         it('stores the service ID', () => {
@@ -298,8 +298,8 @@ describe('GitRepository', () => {
         after(() => subject.removeAll());
 
         it('stores snapshots IDs', () => {
-          expect(commit.body).to.include(config.get('recorder.versions.storage.git.snapshotIdentiferTemplate').replace(SNAPSHOT_ID_MARKER, SNAPSHOT_ID_1));
-          expect(commit.body).to.include(config.get('recorder.versions.storage.git.snapshotIdentiferTemplate').replace(SNAPSHOT_ID_MARKER, SNAPSHOT_ID_2));
+          expect(commit.body).to.include(config.get('@opentermsarchive/engine.recorder.versions.storage.git.snapshotIdentiferTemplate').replace(SNAPSHOT_ID_MARKER, SNAPSHOT_ID_1));
+          expect(commit.body).to.include(config.get('@opentermsarchive/engine.recorder.versions.storage.git.snapshotIdentiferTemplate').replace(SNAPSHOT_ID_MARKER, SNAPSHOT_ID_2));
         });
 
         it('stores the number of source documents', () => {
@@ -676,15 +676,15 @@ describe('GitRepository', () => {
       git = new Git({
         path: RECORDER_PATH,
         author: {
-          name: config.get('recorder.snapshots.storage.git.author.name'),
-          email: config.get('recorder.snapshots.storage.git.author.email'),
+          name: config.get('@opentermsarchive/engine.recorder.snapshots.storage.git.author.name'),
+          email: config.get('@opentermsarchive/engine.recorder.snapshots.storage.git.author.email'),
         },
       });
 
       await git.initialize();
 
       subject = new GitRepository({
-        ...config.get('recorder.snapshots.storage.git'),
+        ...config.get('@opentermsarchive/engine.recorder.snapshots.storage.git'),
         path: RECORDER_PATH,
       });
 
@@ -1257,14 +1257,14 @@ describe('GitRepository', () => {
       git = new Git({
         path: RECORDER_PATH,
         author: {
-          name: config.get('recorder.versions.storage.git.author.name'),
-          email: config.get('recorder.versions.storage.git.author.email'),
+          name: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author.name'),
+          email: config.get('@opentermsarchive/engine.recorder.versions.storage.git.author.email'),
         },
       });
 
       await git.initialize();
       subject = new GitRepository({
-        ...config.get('recorder.versions.storage.git'),
+        ...config.get('@opentermsarchive/engine.recorder.versions.storage.git'),
         path: RECORDER_PATH,
       });
 

package/src/archivist/recorder/repositories/mongo/index.test.js

@@ -15,7 +15,7 @@ import MongoRepository from './index.js';
 const { expect } = chai;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const { connectionURI } = config.get('recorder.snapshots.storage.mongo');
+const { connectionURI } = config.get('@opentermsarchive/engine.recorder.snapshots.storage.mongo');
 const client = new MongoClient(connectionURI);
 
 const SERVICE_PROVIDER_ID = 'test_service';
@@ -41,12 +41,12 @@ describe('MongoRepository', () => {
 
   context('Version', () => {
     before(async () => {
-      subject = new MongoRepository(config.get('recorder.versions.storage.mongo'));
+      subject = new MongoRepository(config.get('@opentermsarchive/engine.recorder.versions.storage.mongo'));
       await subject.initialize();
       await client.connect();
-      const db = client.db(config.get('recorder.versions.storage.mongo.database'));
+      const db = client.db(config.get('@opentermsarchive/engine.recorder.versions.storage.mongo.database'));
 
-      collection = db.collection(config.get('recorder.versions.storage.mongo.collection'));
+      collection = db.collection(config.get('@opentermsarchive/engine.recorder.versions.storage.mongo.collection'));
     });
 
     describe('#save', () => {
@@ -652,12 +652,12 @@ describe('MongoRepository', () => {
 
   context('Snapshot', () => {
     before(async () => {
-      subject = new MongoRepository(config.get('recorder.snapshots.storage.mongo'));
+      subject = new MongoRepository(config.get('@opentermsarchive/engine.recorder.snapshots.storage.mongo'));
       await subject.initialize();
       await client.connect();
-      const db = client.db(config.get('recorder.snapshots.storage.mongo.database'));
+      const db = client.db(config.get('@opentermsarchive/engine.recorder.snapshots.storage.mongo.database'));
 
-      collection = db.collection(config.get('recorder.snapshots.storage.mongo.collection'));
+      collection = db.collection(config.get('@opentermsarchive/engine.recorder.snapshots.storage.mongo.collection'));
     });
 
     describe('#save', () => {

package/src/archivist/services/index.js

@@ -9,7 +9,7 @@ import SourceDocument from './sourceDocument.js';
 import Terms from './terms.js';
 
 const fs = fsApi.promises;
-const declarationsPath = path.resolve(process.cwd(), config.get('services.declarationsPath'));
+const declarationsPath = path.resolve(process.cwd(), config.get('@opentermsarchive/engine.services.declarationsPath'));
 
 export async function load(servicesIdsToLoad = []) {
   let servicesIds = await getDeclaredServicesIds();

package/src/{api → collection-api}/logger.js

@@ -11,12 +11,12 @@ const { combine, timestamp, printf, colorize } = winston.format;
 
 const transports = [new winston.transports.Console()];
 
-if (config.get('logger.sendMailOnError')) {
+if (config.get('@opentermsarchive/engine.logger.sendMailOnError')) {
   transports.push(new winston.transports.Mail({
-    to: config.get('logger.sendMailOnError.to'),
-    from: config.get('logger.sendMailOnError.from'),
-    host: config.get('logger.smtp.host'),
-    username: config.get('logger.smtp.username'),
+    to: config.get('@opentermsarchive/engine.logger.sendMailOnError.to'),
+    from: config.get('@opentermsarchive/engine.logger.sendMailOnError.from'),
+    host: config.get('@opentermsarchive/engine.logger.smtp.host'),
+    username: config.get('@opentermsarchive/engine.logger.smtp.username'),
     password: process.env.SMTP_PASSWORD,
     ssl: true,
     timeout: 30 * 1000,

package/src/{api → collection-api}/routes/docs.test.js

@@ -4,7 +4,7 @@ import request from 'supertest';
 
 import app from '../server.js';
 
-const basePath = config.get('api.basePath');
+const basePath = config.get('@opentermsarchive/engine.collection-api.basePath');
 
 describe('Docs API', () => {
   describe('GET /docs', () => {

package/src/{api → collection-api}/routes/services.test.js

@@ -4,7 +4,7 @@ import request from 'supertest';
 
 import app from '../server.js';
 
-const basePath = config.get('api.basePath');
+const basePath = config.get('@opentermsarchive/engine.collection-api.basePath');
 
 describe('Services API', () => {
   describe('GET /services', () => {

package/src/{api → collection-api}/routes/versions.js

@@ -28,7 +28,7 @@ import { toISODateWithoutMilliseconds } from '../../archivist/utils/date.js';
  */
 const router = express.Router();
 
-const versionsRepository = await RepositoryFactory.create(config.get('recorder.versions.storage')).initialize();
+const versionsRepository = await RepositoryFactory.create(config.get('@opentermsarchive/engine.recorder.versions.storage')).initialize();
 
 /**
  * @swagger

package/src/{api → collection-api}/routes/versions.test.js

@@ -7,7 +7,7 @@ import Version from '../../archivist/recorder/version.js';
 import { toISODateWithoutMilliseconds } from '../../archivist/utils/date.js';
 import app from '../server.js';
 
-const basePath = config.get('api.basePath');
+const basePath = config.get('@opentermsarchive/engine.collection-api.basePath');
 
 const { expect } = chai;
 const request = supertest(app);
@@ -24,7 +24,7 @@ describe('Versions API', () => {
     };
 
     before(async () => {
-      versionsRepository = RepositoryFactory.create(config.get('recorder.versions.storage'));
+      versionsRepository = RepositoryFactory.create(config.get('@opentermsarchive/engine.recorder.versions.storage'));
 
       await versionsRepository.initialize();
 

package/src/{api → collection-api}/server.js

@@ -13,12 +13,12 @@ if (process.env.NODE_ENV !== 'test') {
   app.use(loggerMiddleware);
 }
 
-const BASE_PATH = `${config.get('api.basePath')}/v1`;
+const BASE_PATH = `/${config.get('@opentermsarchive/engine.collection-api.basePath')}/v1`.replace(/\/\/+/g, '/'); // ensure there are no double slashes
 
 app.use(BASE_PATH, apiRouter(BASE_PATH));
 app.use(errorsMiddleware);
 
-const port = config.get('api.port');
+const port = config.get('@opentermsarchive/engine.collection-api.port');
 
 app.listen(port);
 

package/src/index.js

@@ -8,8 +8,8 @@ import Reporter from './reporter/index.js';
 
 export default async function track({ services, types, extractOnly, schedule }) {
   const archivist = new Archivist({
-    recorderConfig: config.get('recorder'),
-    fetcherConfig: config.get('fetcher'),
+    recorderConfig: config.get('@opentermsarchive/engine.recorder'),
+    fetcherConfig: config.get('@opentermsarchive/engine.fetcher'),
   });
 
   archivist.attach(logger);
@@ -38,20 +38,20 @@ export default async function track({ services, types, extractOnly, schedule })
     return;
   }
 
-  if (process.env.SENDINBLUE_API_KEY) {
+  if (process.env.OTA_ENGINE_SENDINBLUE_API_KEY) {
     try {
       archivist.attach(new Notifier(archivist.services));
     } catch (error) {
       logger.error('Cannot instantiate the Notifier module; it will be ignored:', error);
     }
   } else {
-    logger.warn('Environment variable "SENDINBLUE_API_KEY" was not found; the Notifier module will be ignored');
+    logger.warn('Environment variable "OTA_ENGINE_SENDINBLUE_API_KEY" was not found; the Notifier module will be ignored');
   }
 
-  if (process.env.GITHUB_TOKEN) {
+  if (process.env.OTA_ENGINE_GITHUB_TOKEN) {
     if (config.has('reporter.githubIssues.repositories.declarations')) {
       try {
-        const reporter = new Reporter(config.get('reporter'));
+        const reporter = new Reporter(config.get('@opentermsarchive/engine.reporter'));
 
         await reporter.initialize();
         archivist.attach(reporter);
@@ -62,7 +62,7 @@ export default async function track({ services, types, extractOnly, schedule })
       logger.warn('Configuration key "reporter.githubIssues.repositories.declarations" was not found; issues on the declarations repository cannot be created');
     }
   } else {
-    logger.warn('Environment variable "GITHUB_TOKEN" was not found; the Reporter module will be ignored');
+    logger.warn('Environment variable "OTA_ENGINE_GITHUB_TOKEN" was not found; the Reporter module will be ignored');
   }
 
   if (!schedule) {

package/src/logger/index.js

@@ -1,11 +1,9 @@
 import os from 'os';
 
 import config from 'config';
-import dotenv from 'dotenv';
 import winston from 'winston';
 import 'winston-mail';
 
-dotenv.config();
 const { combine, timestamp, printf, colorize } = winston.format;
 
 const alignedWithColorsAndTime = combine(
@@ -40,16 +38,16 @@ const logger = winston.createLogger({
   rejectionHandlers: transports,
 });
 
-if (config.get('logger.sendMailOnError')) {
-  if (process.env.SMTP_PASSWORD === undefined) {
-    logger.warn('Environment variable "SMTP_PASSWORD" was not found; log emails cannot be sent');
+if (config.get('@opentermsarchive/engine.logger.sendMailOnError')) {
+  if (process.env.OTA_ENGINE_SMTP_PASSWORD === undefined) {
+    logger.warn('Environment variable "OTA_ENGINE_SMTP_PASSWORD" was not found; log emails cannot be sent');
   } else {
     const mailerOptions = {
-      to: config.get('logger.sendMailOnError.to'),
-      from: config.get('logger.sendMailOnError.from'),
-      host: config.get('logger.smtp.host'),
-      username: config.get('logger.smtp.username'),
-      password: process.env.SMTP_PASSWORD,
+      to: config.get('@opentermsarchive/engine.logger.sendMailOnError.to'),
+      from: config.get('@opentermsarchive/engine.logger.sendMailOnError.from'),
+      host: config.get('@opentermsarchive/engine.logger.smtp.host'),
+      username: config.get('@opentermsarchive/engine.logger.smtp.username'),
+      password: process.env.OTA_ENGINE_SMTP_PASSWORD,
       ssl: true,
       timeout: 30 * 1000,
       formatter: args => args[Object.getOwnPropertySymbols(args)[1]], // Returns the full error message, the same visible in the console. It is referenced in the argument object with a Symbol of which we do not have the reference but we know it is the second one.
@@ -62,7 +60,7 @@ if (config.get('logger.sendMailOnError')) {
       subject: `[OTA] Error Report — ${os.hostname()}`,
     }));
 
-    if (config.get('logger.sendMailOnError.sendWarnings')) {
+    if (config.get('@opentermsarchive/engine.logger.sendMailOnError.sendWarnings')) {
       transports.push(new winston.transports.Mail({
         ...mailerOptions,
         level: 'warn',

package/src/notifier/index.js

@@ -1,14 +1,12 @@
 import config from 'config';
-import dotenv from 'dotenv';
 import sendInBlue from 'sib-api-v3-sdk';
 
-dotenv.config();
 export default class Notifier {
   constructor(passedServiceProviders) {
     const defaultClient = sendInBlue.ApiClient.instance;
     const authentication = defaultClient.authentications['api-key'];
 
-    authentication.apiKey = process.env.SENDINBLUE_API_KEY;
+    authentication.apiKey = process.env.OTA_ENGINE_SENDINBLUE_API_KEY;
 
     this.apiInstance = new sendInBlue.TransactionalEmailsApi();
     this.contactsInstance = new sendInBlue.ContactsApi();
@@ -35,7 +33,7 @@ export default class Notifier {
 
   async notifyVersionRecorded(serviceProviderId, termsType, versionId) {
     const sendParams = {
-      templateId: config.get('notifier.sendInBlue.updateTemplateId'),
+      templateId: config.get('@opentermsarchive/engine.notifier.sendInBlue.updateTemplateId'),
       params: {
         SERVICE_PROVIDER_NAME: this.serviceProviders[serviceProviderId].name,
         DOCUMENT_TYPE: termsType,
@@ -44,7 +42,7 @@ export default class Notifier {
     };
 
     const lists = [
-      config.get('notifier.sendInBlue.updatesListId'),
+      config.get('@opentermsarchive/engine.notifier.sendInBlue.updatesListId'),
     ];
 
     const notificationListName = `${this.serviceProviders[serviceProviderId].name} - ${termsType} - Update`;

package/src/reporter/github.js

@@ -16,7 +16,7 @@ export default class GitHub {
   constructor(repository) {
     const { version } = require('../../package.json');
 
-    this.octokit = new Octokit({ auth: process.env.GITHUB_TOKEN, userAgent: `opentermsarchive/${version}` });
+    this.octokit = new Octokit({ auth: process.env.OTA_ENGINE_GITHUB_TOKEN, userAgent: `opentermsarchive/${version}` });
 
     const [ owner, repo ] = repository.split('/');