querysub 0.107.0 → 0.108.0

package/package.json

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

@@ -275,7 +275,7 @@ async function getHTTPSKeyCertInner(callerIP: string) {
                     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));
+                promises.push(addRecord("A", edgeDomain, callerIP, "proxied"));
                 runInfinitePoll(timeInMinute * 1, async () => {
                     let ips = await getRecords("A", edgeDomain);
                     if (!ips.includes(callerIP)) {

package/src/4-querysub/edge/edgeBootstrap.ts

@@ -306,18 +306,29 @@ async function edgeNodeFunction(config: {
         // We check multiple at a time, so a node being unresponsive doesn't cause lag
         let PARALLEL_FACTOR = 3;
         for (let i = 0; i < edgeNodes.length; i += PARALLEL_FACTOR) {
-            let promises = [];
-            for (let j = 0; j < PARALLEL_FACTOR; j++) {
-                promises.push((async () => {
-                    let node = edgeNodes[i + j];
-                    try {
-                        let alive = await isNodeAlive(node);
-                        if (alive) return node;
-                    } catch { }
-                    return undefined;
-                })());
-            }
-            let node = await Promise.race(promises);
+            let node = await new Promise<EdgeNodeConfig | undefined>(resolve => {
+                for (let j = 0; j < PARALLEL_FACTOR; j++) {
+                    let finished = 0;
+                    ((async () => {
+                        try {
+                            let node = edgeNodes[i + j];
+                            if (!node) return;
+                            let alive = await isNodeAlive(node);
+                            if (alive) {
+                                resolve(node);
+                            }
+                        }
+                        catch { }
+                        finally {
+                            finished++;
+                            if (finished >= PARALLEL_FACTOR) {
+                                resolve(undefined);
+                            }
+                        }
+                        return undefined;
+                    })()).catch(() => { });
+                }
+            });
             if (node) {
                 return node;
             }