querysub 0.71.0 → 0.73.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.71.0",
+  "version": "0.73.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

@@ -178,13 +178,13 @@ export async function publishMachineARecords() {
     await setRecord("A", "*." + machineAddress, ip);
 }
 
-export const verifyServicesAlive = lazy(() => {
-
-    // NOTE: Our DNS TTL of 1 minute means we can't avoid downtime of 1 minute,
-    //  so shorter polling intervals will have very little benefit.
-    runInfinitePoll(1000 * 60, removeDeadARecords);
+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);
 });
-async function removeDeadARecords() {
+async function checkEdgeDomainsAlive() {
     if (isNoNetwork()) return;
     if (publicPort === -1) return;
     const edgeDomain = getDomain();
@@ -193,23 +193,29 @@ async function removeDeadARecords() {
     //  and it will be removed when we leave development
     ips = ips.filter(ip => ip !== "127.0.0.1");
 
+    console.log(`Checking for dead records ${JSON.stringify(ips)}`);
+
     let results = await Promise.all(ips.map(async ip => {
         return await testTCPIsListening(ip, publicPort);
     }));
 
     let deadIPs = ips.filter((ip, i) => !results[i]);
+    if (deadIPs.length > 0) {
+        console.log(`Found dead IPs for ${edgeDomain}:${publicPort}, removing their A records: ${JSON.stringify(deadIPs)}`);
+    }
     for (let deadIP of deadIPs) {
         await deleteRecord("A", edgeDomain, deadIP);
     }
 }
 
 async function getHTTPSKeyCertInner(callerIP: string) {
+    runEdgeDomainAliveLoop();
     const edgeDomain = getDomain();
     if (callerIP) {
         try {
             let promises: Promise<void>[] = [];
             let existingIPs = await getRecords("A", edgeDomain);
-            if (callerIP === "127.0.0.1") {
+            if (!isPublic()) {
                 if (existingIPs.length === 0) {
                     promises.push(addRecord("A", edgeDomain, callerIP));
                 } else if (existingIPs.length === 1 && existingIPs[0] === "127.0.0.1") {

package/src/server.ts

@@ -5,7 +5,7 @@ import { deepCloneJSON, isBufferType, isNode, isNodeTrue } from "socket-function
 import { SocketFunction } from "socket-function/SocketFunction";
 import { getOwnMachineId, getThreadKeyCert } from "./-a-auth/certs";
 import { logErrors } from "./errors";
-import { publishMachineARecords, verifyServicesAlive } from "./-e-certs/EdgeCertController";
+import { publishMachineARecords } from "./-e-certs/EdgeCertController";
 import { getPathStr, getPathStr1, prependToPathStr, rootPathStr } from "./path";
 import { authorityStorage, debugCoreMode, debugRejections, enableDebugRejections, pathValueArchives } from "./0-path-value-core/pathValueCore";
 import { listenOnDebugger } from "./diagnostics/listenOnDebugger";
@@ -67,7 +67,5 @@ async function main() {
         autoForwardPort: true,
     });
 
-    verifyServicesAlive();
-
     await publishMachineARecords();
 }