querysub 0.76.0 → 0.78.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.76.0",
+  "version": "0.78.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/-e-certs/EdgeCertController.ts

@@ -185,7 +185,7 @@ const runEdgeDomainAliveLoop = lazy(() => {
     // NOTE: Our DNS TTL is 1 minute, which means no matter how fast we poll,
     //  we can't get below that. Of course the worst case is that + our poll rate,
     //  but still, this means there is less and less benefit the lower this value is.
-    runInfinitePoll(1000 * 60, checkEdgeDomainsAlive);
+    runInfinitePoll(timeInMinute, checkEdgeDomainsAlive);
 });
 async function checkEdgeDomainsAlive() {
     if (isNoNetwork()) return;
@@ -200,7 +200,12 @@ async function checkEdgeDomainsAlive() {
     ips = ips.filter(ip => ip !== "127.0.0.1");
 
     let results = await Promise.all(ips.map(async ip => {
-        return await testTCPIsListening(ip, publicPort);
+        // It must be not listening for 3 times in a row
+        for (let i = 0; i < 3; i++) {
+            let isListening = await testTCPIsListening(ip, publicPort);
+            if (isListening) return true;
+        }
+        return false;
     }));
 
     let deadIPs = ips.filter((ip, i) => !results[i]);
@@ -213,6 +218,25 @@ async function checkEdgeDomainsAlive() {
 }
 
 async function getHTTPSKeyCertInner(callerIP: string) {
+    let cert = await getBaseCert();
+    // If the cert is 50% expired generate a new one
+    let certObj = parseCert(cert.cert);
+
+    // Get expiration date
+    let expirationTime = +new Date(certObj.validity.notAfter);
+    let createTime = +new Date(certObj.validity.notBefore);
+
+    // If 50% of the lifetime has passed, renew the cert
+    let renewDate = createTime + (expirationTime - createTime) * 0.5;
+    if (renewDate < Date.now()) {
+        console.log(`HTTPS certificate is looking too old, forcefully renewing`);
+        getHTTPSKeyCert.clear(getDomain());
+        getBaseCert = createGetBaseCert();
+        cert = await getBaseCert();
+    }
+
+    // IMPORTANT! We have to set our A record AFTER we create our cert, otherwise we might wait a while
+    //  with our A record public while we create our cert.
     runEdgeDomainAliveLoop();
     const edgeDomain = getDomain();
     if (callerIP) {
@@ -262,23 +286,6 @@ async function getHTTPSKeyCertInner(callerIP: string) {
         }
     }
 
-    let cert = await getBaseCert();
-    // If the cert is 50% expired generate a new one
-    let certObj = parseCert(cert.cert);
-
-    // Get expiration date
-    let expirationTime = +new Date(certObj.validity.notAfter);
-    let createTime = +new Date(certObj.validity.notBefore);
-
-    // If 50% of the lifetime has passed, renew the cert
-    let renewDate = createTime + (expirationTime - createTime) * 0.5;
-    if (renewDate < Date.now()) {
-        console.log(`HTTPS certificate is looking too old, forcefully renewing`);
-        getHTTPSKeyCert.clear(getDomain());
-        getBaseCert = createGetBaseCert();
-        cert = await getBaseCert();
-    }
-
     return cert;
 }