@opentermsarchive/engine 10.5.0 → 10.6.1

package/package.json

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

package/scripts/declarations/utils/index.js

@@ -50,6 +50,10 @@ export default class DeclarationUtils {
       if (modifiedFilePath.endsWith('.filters.js') || modifiedFilePath.endsWith('.filters.history.js')) {
         const declaration = await this.getJSONFromFile(this.defaultBranch, `declarations/${serviceId}.json`);
 
+        if (!declaration) { // Happens when the file declaration exists in the branch but not in the default branch
+          return;
+        }
+
         servicesTermsTypes[serviceId] = Object.keys(declaration.terms); // Considering how rarely filters are used, simply return all term types that could potentially be impacted to spare implementing a function change check
 
         return;

package/scripts/declarations/utils/index.test.js

@@ -188,6 +188,23 @@ describe('DeclarationUtils', () => {
       });
     });
 
+    context('when a new declaration has been added along with a filters file', () => {
+      before(async () => {
+        await fs.writeFile(path.resolve(SUBJECT_PATH, COMMIT_PATHS.serviceB), JSON.stringify(FIXTURES.serviceB.content, null, 2));
+        await fs.writeFile(path.resolve(SUBJECT_PATH, './declarations/ServiceB.filters.js'), 'module.exports = {};');
+        await declarationUtils.git.add([ COMMIT_PATHS.serviceB, './declarations/ServiceB.filters.js' ]);
+        await declarationUtils.git.commit('Add declaration with filters for new service');
+      });
+      after(removeLatestCommit);
+
+      it('returns the added service ID along with all its terms types', async () => {
+        expect(await declarationUtils.getModifiedServicesAndTermsTypes()).to.deep.equal({
+          services: ['ServiceB'],
+          servicesTermsTypes: { ServiceB: ['Terms of Service'] },
+        });
+      });
+    });
+
     context('when history file is modified without declaration changes', () => {
       before(() => commitChanges(COMMIT_PATHS.serviceAHistory, FIXTURES.serviceATermsUpdatedHistory.content));
       after(removeLatestCommit);

package/src/archivist/fetcher/errors.js

@@ -10,6 +10,7 @@ export class FetchDocumentError extends Error {
     'EAI_AGAIN', // DNS lookup temporary failure - DNS server is temporarily unavailable or overloaded
     'ETIMEDOUT', // Connection timeout - network latency or server load issues
     'ERR_NAME_NOT_RESOLVED', // DNS lookup temporary failure - DNS server is temporarily unavailable or overloaded
+    'Timed out after', // Navigation timeout - page took too long to load, might be temporary server overload
     'HTTP code 500', // Internal Server Error - server encountered an error while processing the request
     'HTTP code 503', // Service Unavailable - server is temporarily overloaded or down for maintenance
     'HTTP code 504', // Gateway Timeout - upstream server took too long to respond, might be temporary