@tryghost/domain-validator 1.5.2 → 2.0.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2013-2022 Ghost Foundation
+Copyright (c) 2013-2026 Ghost Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -18,4 +18,4 @@
 
 # Copyright & License
 
-Copyright (c) 2013-2022 Ghost Foundation - Released under the [MIT license](LICENSE).
+Copyright (c) 2013-2026 Ghost Foundation - Released under the [MIT license](LICENSE).

package/lib/pro.js

@@ -150,19 +150,19 @@ _private.isCertificateError = error => /certificate/.test(error.context);
 
 // Checks a Pro site using the provided details, and returning a responseObject
 module.exports.validate = (proto, subdomain, customdomain, subdirectory, prodomain) => {
-    const url = _private.buildUrl(proto, customdomain, subdirectory);
+    const firstAttemptUrl = _private.buildUrl(proto, customdomain, subdirectory);
 
-    debug('Validating ' + url);
-    return request.domain(url)
+    debug('Validating ' + firstAttemptUrl);
+    return request.domain(firstAttemptUrl)
         .then((result) => {
             debug('Response received');
             return _private.buildResponse(result, proto, subdomain, customdomain, subdirectory, prodomain);
         })
         .catch(() => {
-            const url = _private.buildUrl('http', customdomain, subdirectory);
+            const secondAttemptUrl = _private.buildUrl('http', customdomain, subdirectory);
 
-            debug('Validating ' + url);
-            return request.domain(url)
+            debug('Validating ' + secondAttemptUrl);
+            return request.domain(secondAttemptUrl)
                 .then((result) => {
                     debug('HTTP response received');
                     const response = _private.buildResponse(result, 'http', subdomain, customdomain, subdirectory, prodomain);

package/lib/request.js

@@ -10,36 +10,51 @@ const https = require('https');
 const {Resolver} = require('dns').promises;
 const resolver = new Resolver();
 resolver.setServers(['1.1.1.1', '1.0.0.1']);
+const semverMajor = require('semver/functions/major');
+const nodeVersion = semverMajor(process.versions.node);
 
 const staticLookup = () => async (hostname, _options, callback) => {
     try {
         const ips = await resolver.resolve(hostname);
 
         if (ips.length === 0) {
-            return callback(new Error(`Unable to resolve ${hostname}`));
+            return callback(new errors.InternalServerError({message: `Unable to resolve ${hostname}`}));
         }
 
-        callback(null, ips[0], 4);
+        if (nodeVersion >= 20) {
+            // Node 20+ uses a different callback signature
+            callback(null, [{address: ips[0], family: 4}]);
+        } else {
+            // Node 18 and below use the old callback signature
+            callback(null, ips[0], 4);
+        }
     } catch (err) {
         return callback(err);
     }
 };
 
 module.exports.domain = (url) => {
-    const httpModule = new URL(url).protocol === 'https:' ? https : http;
-    const httpAgent = new httpModule.Agent({lookup: staticLookup()});
-
+    /**
+     * @type {import('got').Options}
+     */
     const options = {
         // We want to capture details of different hops
         followRedirect: false,
         // Don't allow the request to go on for more than 15 seconds
-        timeout: 15000,
+        timeout: {
+            request: 15000
+        },
         // If the network errors, retry 1 time:
-        retries: 1,
+        retry: {
+            limit: 1
+        },
         headers: {
             'X-Ghost-Proxy': true
         },
-        agent: httpAgent
+        agent: {
+            http: new http.Agent({lookup: staticLookup()}),
+            https: new https.Agent({lookup: staticLookup()})
+        }
     };
 
     const responses = [];
@@ -51,11 +66,11 @@ module.exports.domain = (url) => {
         const statusCode = res.statusCode;
         const headers = {};
 
-        _.reduce(res.headers, (headers, value, name) => {
+        _.reduce(res.headers, (updatedHeaders = {}, value, name) => {
             if (_.startsWith(name, 'x-ghost') || _.includes(['server', 'location', 'x-amz-cf-id'], name)) {
-                headers[name] = value;
+                updatedHeaders[name] = value;
             }
-            return headers;
+            return updatedHeaders;
         }, headers);
 
         responses.push({statusCode, headers});
@@ -78,9 +93,12 @@ module.exports.domain = (url) => {
             .then(handleResponse)
             .then(() => resolve(responses))
             .catch((error) => {
-                reject(new errors.BadRequestError(
-                    _.merge({message: 'Domain could not be requested', property: url, context: error.message}, error)
-                ));
+                reject(new errors.BadRequestError({
+                    message: 'Domain could not be requested',
+                    property: url,
+                    context: error.message,
+                    code: error.code
+                }));
             });
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryghost/domain-validator",
-  "version": "1.5.2",
+  "version": "2.0.0",
   "repository": {
     "type": "git",
     "url": "ssh://git@github.com/TryGhost/Pro",
@@ -25,18 +25,18 @@
     "test": "NODE_ENV=testing mocha -- $(find test -name '*.test.js')"
   },
   "devDependencies": {
-    "mocha": "8.4.0",
+    "mocha": "11.7.5",
     "should": "13.2.3",
-    "sinon": "9.2.4"
+    "sinon": "21.0.3"
   },
   "dependencies": {
-    "@tryghost/debug": "0.1.17",
-    "@tryghost/dns": "^0.5.0",
-    "@tryghost/errors": "1.2.14",
-    "@tryghost/pretty-cli": "1.2.9",
+    "@tryghost/debug": "2.0.3",
+    "@tryghost/dns": "^0.6.0",
+    "@tryghost/errors": "3.0.3",
+    "@tryghost/pretty-cli": "3.0.3",
     "bluebird": "3.7.2",
-    "got": "8.3.2",
-    "lodash": "4.17.21"
+    "got": "11.8.6",
+    "lodash": "4.17.23"
   },
-  "gitHead": "d66598b08a0088858aaf9e15a37dfa22d1872e26"
+  "gitHead": "ef060c71be33d265e7d97e4579ed83c3e3fdac09"
 }