querysub 0.222.0 → 0.224.0

package/package.json

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

package/src/deployManager/components/ServicesListPage.tsx

@@ -75,7 +75,7 @@ export class ServicesListPage extends qreact.Component {
                     });
                     let totalLaunches = config.machineIds.reduce((acc, machineId) => {
                         let machineInfo = getMachineInfo(machineId);
-                        return acc + (machineInfo?.services[serviceId].totalTimesLaunched || 0);
+                        return acc + (machineInfo?.services[serviceId]?.totalTimesLaunched || 0);
                     }, 0);
                     let unknown = config.machineIds.length - runningMachines.length - failingMachines.length - missingMachines.length;
                     return <div key={serviceId}
@@ -96,7 +96,7 @@ export class ServicesListPage extends qreact.Component {
                                 <div className={css.fontSize(14).boldStyle}>{config.info.title}</div>
                                 <div>{config.parameters.key}</div>
                                 <div>
-                                    {config.machineIds.length} configured {failingMachines.length > 0 && `(${failingMachines.length} failing)`} {missingMachines.length > 0 && `(${missingMachines.length} missing machines)`} {unknown > 0 && `(${unknown} unknown)`} • {totalLaunches} launches •
+                                    {config.machineIds.length} configured {failingMachines.length > 0 && `(${failingMachines.length} failing)`} {missingMachines.length > 0 && `(${missingMachines.length} machine hasn't run service yet)`} {unknown > 0 && `(${unknown} unknown)`} • {totalLaunches} launches •
                                     Deploy: {config.parameters.deploy ? "enabled" : "disabled"}
                                 </div>
                             </div>

package/src/deployManager/machineApplyMainCode.ts

@@ -201,8 +201,9 @@ const ensureGitSynced = measureWrap(async function ensureGitSynced(config: {
 
 
 let launchesPerService = new Map<string, number>();
+let lastLaunchedTimePerService = new Map<string, number>();
 
-const resyncServices = runInSerial(measureWrap(async function resyncServices() {
+const resyncServicesBase = runInSerial(measureWrap(async function resyncServices() {
     console.log(magenta("Resyncing services"));
     let machineId = getOwnMachineId();
     let configs = await serviceConfigs.values();
@@ -219,9 +220,12 @@ const resyncServices = runInSerial(measureWrap(async function resyncServices() {
         for (let i = 0; i < matchedCount; i++) {
 
             let launchCount = launchesPerService.get(config.serviceId) || 0;
-            // Always increase, as this is the only way to detect if a service is repeatedly crashing. If this is really high for one service, but not others... it's crashing a lot.
-            launchCount++;
-            launchesPerService.set(config.serviceId, launchCount);
+            let lastLaunchedTime = lastLaunchedTimePerService.get(config.serviceId) || 0;
+            machineInfo.services[config.serviceId] = {
+                lastLaunchedTime,
+                errorFromLastRun: "",
+                totalTimesLaunched: launchCount,
+            };
             try {
                 let folder = root + config.parameters.key + "-" + i + "/";
                 let screenName = getScreenName({
@@ -276,19 +280,19 @@ const resyncServices = runInSerial(measureWrap(async function resyncServices() {
                 }
                 console.log(green(`Service ${magenta(screenName)} is verified to be running after starting.`));
 
-                machineInfo.services[config.serviceId] = {
-                    lastLaunchedTime: Date.now(),
-                    errorFromLastRun: "",
-                    totalTimesLaunched: launchCount,
-                };
+                launchCount++;
+                lastLaunchedTime = Date.now();
             } catch (e: any) {
+                // Increase on failures too, as this is the only way to detect if a service is repeatedly crashing. If this is really high for one service, but not others... it's crashing a lot.
+                launchCount++;
+                lastLaunchedTime = Date.now();
                 console.error(`Error resyncing service ${magenta(config.serviceId)} (${config.parameters?.key}): ${e.stack}`);
-                machineInfo.services[config.serviceId] = {
-                    lastLaunchedTime: Date.now(),
-                    errorFromLastRun: e.stack,
-                    totalTimesLaunched: launchCount,
-                };
+                machineInfo.services[config.serviceId].errorFromLastRun = e.stack;
             }
+            machineInfo.services[config.serviceId].totalTimesLaunched = launchCount;
+            machineInfo.services[config.serviceId].lastLaunchedTime = lastLaunchedTime;
+            lastLaunchedTimePerService.set(config.serviceId, lastLaunchedTime);
+            launchesPerService.set(config.serviceId, launchCount);
         }
     }
 
@@ -300,10 +304,18 @@ const resyncServices = runInSerial(measureWrap(async function resyncServices() {
     }
 
     await machineInfos.set(machineId, machineInfo);
+    console.log(`${magenta(`Resynced ${relevantConfigs.length} services`)}:\n${JSON.stringify(machineInfo, null, 2)}`);
 
     // Don't resync TOO often, so always wait a bit
     await delay(5000);
 }));
+async function resyncServices() {
+    try {
+        await resyncServicesBase();
+    } catch (e: any) {
+        console.error(`Error resyncing services: ${e.stack}`);
+    }
+}
 
 
 async function isPIDRunning(pid: string) {

package/src/deployManager/spec.txt

@@ -1,26 +1,3 @@
-4.1) Requisition script
-    - yarn setup-machine 153.34.64.2
-
-    - I guess a nodejs script, with runPromise it should be easy...
-    - Given remote IP, SSHes in, copies backblaze config from current machine, clones repo, setups crontab for always up wrapper, and then runs it
-        - OH, also installs nodejs, yarn, etc
-        - Maybe ansible, although... probably not. Especially because we can just get the AI to write this script anyway. We'll probably just have it copy over a bash script and then run that. 
-            git
-            nodejs
-            yarn
-            add git permissions
-                - Ugh... we need to use github API for this
-            clones
-            copies backblaze.json
-            copy startup.sh
-            setup crontab to startup.sh
-            run startup.sh
-    - We might need to have it use to github API to give the remote machine access to the repo?
-
-4) Test on a new server, that we run temporarily with some test scripts
-
-5) OH! Also setup swap usage on the machine, as it isn't by default often?
-
 6) Test again on a new server... I think something might be blocking on user input? Hmm...