querysub 0.315.0 → 0.316.0

package/package.json

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

@@ -71,27 +71,6 @@ export async function getSNICerts(config: {
     return certs;
 }
 
-function createGetBaseCert() {
-    return async () => {
-        /*
-        // Code to create a self signed cert, for testing of expiration dates
-        let keyPair = generateKeyPair();
-        let certPair = createX509({
-            keyPair,
-            domain: rootCertDomain,
-            // Very short duration for testing
-            lifeSpan: 1000 * 60 * 15,
-            issuer: "self",
-        });
-        return { key: certPair.key.toString(), cert: certPair.cert.toString() };
-        //*/
-
-        return getHTTPSKeyCert(getDomain());
-    };
-}
-
-let getBaseCert = lazy(createGetBaseCert()) as () => Promise<{ key: string, cert: string }>;
-
 const certUpdateLoop = lazy(() => {
     logErrors((async () => {
         let firstLoop = true;
@@ -187,6 +166,12 @@ async function checkEdgeDomainsAlive() {
         for (let i = 0; i < 3; i++) {
             let isListening = await testTCPIsListening(ip, publicPort);
             if (isListening) return true;
+            let areWeOnline = await testTCPIsListening("1.1.1.1", publicPort);
+            if (!areWeOnline) {
+                // NOTE: I mean, while this case can happen, it also won't matter because we can't really delete the A record if we're not on the internet. I guess it's useful if we're offline when we check the IPs, but then we come back online right before we delete the records. But I doubt that will happen.t
+                console.warn(`Ignoring down ip, as we cannot even connect to 1.1.1.1:${publicPort}, so the other node isn't down, we're down!`);
+                return true;
+            }
             console.warn(`IP ${ip}:${publicPort} is not listening, waiting 10 seconds before retrying. If it fails 3 times in a row, the A record will be removed.`);
             await delay(timeInSecond * 10);
         }
@@ -215,6 +200,7 @@ async function publishEdgeDomain() {
     //  with our A record public while we create our cert.
     runEdgeDomainAliveLoop();
     const edgeDomain = getDomain();
+    console.log(`Starting publish check for A record for ${edgeDomain} to ${callerIP}`);
     try {
         let promises: Promise<void>[] = [];
         let existingIPs = await getRecords("A", edgeDomain);
@@ -245,13 +231,6 @@ async function publishEdgeDomain() {
                 promises.push(deleteRecord("A", edgeDomain, "127.0.0.1"));
             }
             promises.push(addRecord("A", edgeDomain, callerIP, "proxied"));
-            runInfinitePoll(timeInMinute * 1, async () => {
-                let ips = await getRecords("A", edgeDomain);
-                if (!ips.includes(callerIP)) {
-                    console.error(`Our A record for ${edgeDomain} is no longer pointing to our ip (${callerIP}, as it is now pointing to ${JSON.stringify(ips)}). Terminating, hopefully when we restart we will fix it. This SHOULDN'T happen often!`);
-                    await shutdown();
-                }
-            });
         }
         promises.push(addRecord("A", "127-0-0-1." + edgeDomain, "127.0.0.1"));
         // Add records in parallel, so we can wait for DNS propagation in parallel

package/src/diagnostics/logs/LogViewer2.tsx

@@ -121,16 +121,16 @@ export class LogViewer2 extends qreact.Component {
                 </div>
 
                 {!errorNotifyToggleURL.value && <div className={css.hbox(10)}>
-                    <Button hue={enableLogsURL.value ? 120 : undefined} onClick={() => enableLogsURL.value = !enableLogsURL.value}>
+                    <Button hue={enableLogsURL.value ? 120 : undefined} onClick={() => { enableLogsURL.value = !enableLogsURL.value; this.rerun(); }}>
                         Logs
                     </Button>
-                    <Button hue={enableInfosURL.value ? 120 : undefined} onClick={() => enableInfosURL.value = !enableInfosURL.value}>
+                    <Button hue={enableInfosURL.value ? 120 : undefined} onClick={() => { enableInfosURL.value = !enableInfosURL.value; this.rerun(); }}>
                         Infos
                     </Button>
-                    <Button hue={enableWarningsURL.value ? 120 : undefined} onClick={() => enableWarningsURL.value = !enableWarningsURL.value}>
+                    <Button hue={enableWarningsURL.value ? 120 : undefined} onClick={() => { enableWarningsURL.value = !enableWarningsURL.value; this.rerun(); }}>
                         Warnings
                     </Button>
-                    <Button hue={enableErrorsURL.value ? 120 : undefined} onClick={() => enableErrorsURL.value = !enableErrorsURL.value}>
+                    <Button hue={enableErrorsURL.value ? 120 : undefined} onClick={() => { enableErrorsURL.value = !enableErrorsURL.value; this.rerun(); }}>
                         Errors
                     </Button>
                 </div>}

package/testEntry2.ts

@@ -2,13 +2,16 @@ import { delay } from "socket-function/src/batching";
 import { getOwnMachineId } from "./src/-a-auth/certs";
 import { getOwnThreadId } from "./src/-f-node-discovery/NodeDiscovery";
 import { shutdown } from "./src/diagnostics/periodic";
+import { testTCPIsListening } from "socket-function/src/networking";
 
 export async function testMain() {
-    await delay(0);
-    console.log(getOwnThreadId());
-    console.error(`Test warning for ErrorWarning testing`);
-    console.log(getOwnThreadId());
-    await shutdown();
+    let test = await testTCPIsListening("1.1.1.1", 443);
+    console.log(test);
+    // await delay(0);
+    // console.log(getOwnThreadId());
+    // console.error(`Test warning for ErrorWarning testing`);
+    // console.log(getOwnThreadId());
+    // await shutdown();
     //await Querysub.hostService("test");
     // for (let i = 0; i < 1000 * 10; i++) {
     //     for (let j = 0; j < 1000; j++) {