querysub 0.314.0 → 0.316.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.314.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;
@@ -168,7 +147,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(timeInMinute, checkEdgeDomainsAlive);
+    runInfinitePoll(timeInMinute * 3, checkEdgeDomainsAlive);
 });
 async function checkEdgeDomainsAlive() {
     if (isNoNetwork()) return;
@@ -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);
         }
@@ -207,55 +192,51 @@ async function publishEdgeDomain() {
     if (callerIP === "0.0.0.0") {
         callerIP = await getExternalIP();
     }
+    if (!callerIP) {
+        console.warn(`publishEdgeDomain called before SocketFunction.mount was called, so we don't know the public ip.`);
+        return;
+    }
     // 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 && !isBootstrapOnly()) {
-        try {
-            let promises: Promise<void>[] = [];
-            let existingIPs = await getRecords("A", edgeDomain);
-            if (!isPublic()) {
+    console.log(`Starting publish check for A record for ${edgeDomain} to ${callerIP}`);
+    try {
+        let promises: Promise<void>[] = [];
+        let existingIPs = await getRecords("A", edgeDomain);
+        if (!isPublic()) {
+            if (existingIPs.length === 0) {
+                promises.push(addRecord("A", edgeDomain, callerIP));
+            } else if (existingIPs.length === 1 && existingIPs[0] === "127.0.0.1") {
+                // Good, do nothing
+            } else {
+                // Don't remove the public servers, this is probably just us accidentally running a
+                //  test script for a public domain.
+                /*
+                // Maybe they took down all the public servers?
+                await removeDeadARecords();
+                existingIPs = await getRecords("A", edgeDomain);
                 if (existingIPs.length === 0) {
-                    promises.push(addRecord("A", edgeDomain, callerIP));
-                } else if (existingIPs.length === 1 && existingIPs[0] === "127.0.0.1") {
-                    // Good, do nothing
+                    await addRecord("A", edgeDomain, callerIP);
                 } else {
-                    // Don't remove the public servers, this is probably just us accidentally running a
-                    //  test script for a public domain.
-                    /*
-                    // Maybe they took down all the public servers?
-                    await removeDeadARecords();
-                    existingIPs = await getRecords("A", edgeDomain);
-                    if (existingIPs.length === 0) {
-                        await addRecord("A", edgeDomain, callerIP);
-                    } else {
-                        await addRecord("A", "127-0-0-1." + edgeDomain, "127.0.0.1");
-                        console.warn(`Tried to serve an edge node on the local domain, but SocketFunction.mount did NOT specify a public ip (ex, { ip: "0.0.0.0" }) AND there are already existing public servers. You can't load balance between real ips and 127.0.0.1! ${existingIPs.join(", ")}. You will need to use 127-0-0-1.${edgeDomain} to access the local server (instead of just ${edgeDomain}).`);
-                    }
-                    */
-                    console.log(yellow(`Current process is not marked as public, but machine previous had public services. NOT setting ${edgeDomain} to 127.0.0.1, as this would make the public services inaccessible. Assuming the current process is for development, I recommend using 127-0-0-1.${edgeDomain} or 127-0-0-1.${edgeDomain} to access the server.`));
+                    await addRecord("A", "127-0-0-1." + edgeDomain, "127.0.0.1");
+                    console.warn(`Tried to serve an edge node on the local domain, but SocketFunction.mount did NOT specify a public ip (ex, { ip: "0.0.0.0" }) AND there are already existing public servers. You can't load balance between real ips and 127.0.0.1! ${existingIPs.join(", ")}. You will need to use 127-0-0-1.${edgeDomain} to access the local server (instead of just ${edgeDomain}).`);
                 }
-            } else {
-                if (existingIPs.includes("127.0.0.1")) {
-                    console.log(magenta(`Switching from local development to production development (removing A record for 127.0.0.1, and using a real ip)`));
-                    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();
-                    }
-                });
+                */
+                console.log(yellow(`Current process is not marked as public, but machine previous had public services. NOT setting ${edgeDomain} to 127.0.0.1, as this would make the public services inaccessible. Assuming the current process is for development, I recommend using 127-0-0-1.${edgeDomain} or 127-0-0-1.${edgeDomain} to access the server.`));
+            }
+        } else {
+            if (existingIPs.includes("127.0.0.1")) {
+                console.log(magenta(`Switching from local development to production development (removing A record for 127.0.0.1, and using a real ip)`));
+                promises.push(deleteRecord("A", edgeDomain, "127.0.0.1"));
             }
-            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
-            await Promise.all(promises);
-        } catch (e) {
-            console.error(`Error updating DNS records, continuing without updating them`, e);
+            promises.push(addRecord("A", edgeDomain, callerIP, "proxied"));
         }
+        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
+        await Promise.all(promises);
+    } catch (e) {
+        console.error(`Error updating DNS records, continuing without updating them`, e);
     }
 }
 

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/src/diagnostics/logs/errorNotifications/ErrorWarning.tsx

@@ -179,7 +179,6 @@ export class ErrorWarning extends qreact.Component {
                             }
                         }}
                         className={css.fontSize(12).pad2(4, 6)}
-                        disabled={!this.state.suppressionInput.trim()}
                     >
                         Fixed
                     </Button>
@@ -196,7 +195,6 @@ export class ErrorWarning extends qreact.Component {
                             }
                         }}
                         className={css.fontSize(12).pad2(4, 6)}
-                        disabled={!this.state.suppressionInput.trim()}
                     >
                         Not a bug
                     </Button>

package/src/diagnostics/logs/lifeCycleAnalysis/spec.md

@@ -21,6 +21,7 @@ yarn setup-machine 176.9.2.136
     - Reset filter in FastArchiveViewer
         - First observe the overlap with it and the BookOverview
         - If we are actually on the book overview page and we close the management page then that shouldn't reset it. We just want to reset it when you change pages. Because we want you to be able to hide and show the management page quickly if you want to double check something. Generally speaking though, you won't be on a page with filter and then going back and forth. And if you are, whatever. That's just the management page. We just want to avoid the overall confusion and annoyance of having lots of pre-filled values (And mostly the confusion of having filter prefilled all the time because it's always going to be set because everyone uses it and no one resets it at the moment. 
+    - DON'T reset tab. It's useful to remember the tab? Hmm... sometimes at least...
 
 
 

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++) {